fix(gomod): Revert "fix(gomod): non-0.0.0 digest matching" (#19120)

renovatebot · Nov 27, 2022 · 0f2eb5d · 0f2eb5d
1 parent 20ba978
commit 0f2eb5d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 42 deletions.
diff --git a/lib/modules/datasource/go/index.ts b/lib/modules/datasource/go/index.ts
@@ -59,9 +59,8 @@ export class GoDatasource extends Datasource {
       return null;
     }
 
-    // ignore vX.Y.Z-(0.)? pseudo versions that are used Go Modules - look up default branch instead
-    const tag =
-      value && !/^v\d+\.\d+\.\d+-0?\.?.*/.test(value) ? value : undefined;
+    // ignore v0.0.0- pseudo versions that are used Go Modules - look up default branch instead
+    const tag = value && !value.startsWith('v0.0.0-2') ? value : undefined;
 
     switch (source.datasource) {
       case GitTagsDatasource.id: {

diff --git a/lib/modules/manager/gomod/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/gomod/__snapshots__/extract.spec.ts.snap
@@ -605,12 +605,10 @@ exports[`modules/manager/gomod/extract extractPackageFile() extracts multi-line
     },
   },
   {
-    "currentDigest": "43d17e14b714",
     "currentValue": "v4.0.0-20180807092216-43d17e14b714",
     "datasource": "go",
     "depName": "gopkg.in/src-d/go-git.v4",
     "depType": "require",
-    "digestOneAndOnly": true,
     "managerData": {
       "lineNumber": 58,
       "multiLine": true,

diff --git a/lib/modules/manager/gomod/extract.spec.ts b/lib/modules/manager/gomod/extract.spec.ts
@@ -94,39 +94,5 @@ replace (
         ],
       });
     });
-
-    it('extracts digest updates for untagged releases', () => {
-      const goMod = `
-module github.com/omercnet/renovate-go-test
-
-go 1.19
-
-require github.com/omercnet/go-untagged v0.0.2-0.20221125140048-3917a80154e7
-
-`;
-      const res = extractPackageFile(goMod);
-      expect(res).toEqual({
-        deps: [
-          {
-            currentValue: '1.19',
-            datasource: 'golang-version',
-            depName: 'go',
-            depType: 'golang',
-            managerData: { lineNumber: 3 },
-            rangeStrategy: 'replace',
-            versioning: 'npm',
-          },
-          {
-            currentDigest: '3917a80154e7',
-            currentValue: 'v0.0.2-0.20221125140048-3917a80154e7',
-            datasource: 'go',
-            depName: 'github.com/omercnet/go-untagged',
-            depType: 'require',
-            digestOneAndOnly: true,
-            managerData: { lineNumber: 5 },
-          },
-        ],
-      });
-    });
   });
 });
diff --git a/lib/modules/manager/gomod/extract.ts b/lib/modules/manager/gomod/extract.ts
@@ -28,9 +28,7 @@ function getDep(
   } else {
     dep.skipReason = 'unsupported-version';
   }
-  const digestMatch = regEx(/v\d+\.\d+\.\d+-\d?\.?\d{14}-([a-f0-9]{12})/).exec(
-    currentValue
-  );
+  const digestMatch = regEx(/v0\.0.0-\d{14}-([a-f0-9]{12})/).exec(currentValue);
   if (digestMatch) {
     [, dep.currentDigest] = digestMatch;
     dep.digestOneAndOnly = true;