fix(go): Detect repository name from the metadata URL instead of modu…

…le (#30388)
renovatebot · Aug 2, 2024 · 7143d6d · 7143d6d
1 parent bae6f8d
commit 7143d6d
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 23 deletions.
diff --git a/lib/modules/datasource/go/__fixtures__/go-get-submodule-gitlab.html b/lib/modules/datasource/go/__fixtures__/go-get-submodule-gitlab.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta name="go-import" content="gitlab.com/example/module git https://gitlab.com/example/module.git">
+        <meta name="go-source" content="gitlab.com/example/module https://gitlab.com/example/module https://gitlab.com/example/module/-/tree/master{/dir} https://gitlab.com/example/module/-/blob/master{/dir}/{file}#L{line}">
+    </head>
+    <body>go get https://gitlab.com/example/module</body>
+</html>
diff --git a/lib/modules/datasource/go/base.spec.ts b/lib/modules/datasource/go/base.spec.ts
@@ -117,6 +117,23 @@ describe('modules/datasource/go/base', () => {
         });
       });
 
+      it('supports Go submodules in GitLab repo', async () => {
+        httpMock
+          .scope('https://gitlab.com')
+          .get('/example/module/submodule?go-get=1')
+          .reply(200, Fixtures.get('go-get-submodule-gitlab.html'));
+
+        const res = await BaseGoDatasource.getDatasource(
+          'gitlab.com/example/module/submodule',
+        );
+
+        expect(res).toEqual({
+          datasource: GitlabTagsDatasource.id,
+          packageName: 'example/module',
+          registryUrl: 'https://gitlab.com',
+        });
+      });
+
       it('supports GitLab deps', async () => {
         httpMock
           .scope('https://gitlab.com')
@@ -163,7 +180,7 @@ describe('modules/datasource/go/base', () => {
 
         expect(res).toEqual({
           datasource: GitlabTagsDatasource.id,
-          packageName: 'group/subgroup/my.git.module',
+          packageName: 'group/subgroup',
           registryUrl: 'https://gitlab.com',
         });
       });

diff --git a/lib/modules/datasource/go/base.ts b/lib/modules/datasource/go/base.ts
@@ -21,9 +21,6 @@ export class BaseGoDatasource {
   private static readonly gitlabHttpsRegExp = regEx(
     /^(?<httpsRegExpUrl>https:\/\/[^/]*gitlab\.[^/]*)\/(?<httpsRegExpName>.+?)(?:\/v\d+)?[/]?$/,
   );
-  private static readonly gitlabRegExp = regEx(
-    /^(?<regExpUrl>gitlab\.[^/]*)\/(?<regExpPath>.+?)(?:\/v\d+)?[/]?$/,
-  );
   private static readonly gitVcsRegexp = regEx(
     /^(?:[^/]+)\/(?<module>.*)\.git(?:$|\/)/,
   );
@@ -154,30 +151,18 @@ export class BaseGoDatasource {
       };
     }
 
-    const gitlabUrl =
-      BaseGoDatasource.gitlabHttpsRegExp.exec(metadataUrl)?.groups
-        ?.httpsRegExpUrl;
-    const gitlabUrlName =
-      BaseGoDatasource.gitlabHttpsRegExp.exec(metadataUrl)?.groups
-        ?.httpsRegExpName;
-    const gitlabModuleName =
-      BaseGoDatasource.gitlabRegExp.exec(goModule)?.groups?.regExpPath;
     const vcsIndicatedModule =
       BaseGoDatasource.gitVcsRegexp.exec(goModule)?.groups?.module;
-    if (gitlabUrl && gitlabUrlName) {
-      if (gitlabModuleName?.startsWith(gitlabUrlName)) {
-        const packageName = vcsIndicatedModule ?? gitlabModuleName;
-        return {
-          datasource: GitlabTagsDatasource.id,
-          registryUrl: gitlabUrl,
-          packageName,
-        };
-      }
 
+    const metadataUrlMatchGroups =
+      BaseGoDatasource.gitlabHttpsRegExp.exec(metadataUrl)?.groups;
+    if (metadataUrlMatchGroups) {
+      const { httpsRegExpUrl, httpsRegExpName } = metadataUrlMatchGroups;
+      const packageName = vcsIndicatedModule ?? httpsRegExpName;
       return {
         datasource: GitlabTagsDatasource.id,
-        registryUrl: gitlabUrl,
-        packageName: gitlabUrlName,
+        registryUrl: httpsRegExpUrl,
+        packageName,
       };
     }