fix(go): Revert private module URL changes (#31055)

renovatebot · Aug 27, 2024 · 6899eb0 · 6899eb0
1 parent 85c1163
commit 6899eb0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/lib/modules/datasource/go/base.spec.ts b/lib/modules/datasource/go/base.spec.ts
@@ -117,7 +117,8 @@ describe('modules/datasource/go/base', () => {
         });
       });
 
-      it('supports Go submodules in GitLab repo', async () => {
+      // eslint-disable-next-line jest/no-disabled-tests
+      it.skip('supports Go submodules in GitLab repo', async () => {
         httpMock
           .scope('https://gitlab.com')
           .get('/example/module/submodule?go-get=1')
@@ -180,7 +181,7 @@ describe('modules/datasource/go/base', () => {
 
         expect(res).toEqual({
           datasource: GitlabTagsDatasource.id,
-          packageName: 'group/subgroup',
+          packageName: 'group/subgroup/my.git.module',
           registryUrl: 'https://gitlab.com',
         });
       });

diff --git a/lib/modules/datasource/go/base.ts b/lib/modules/datasource/go/base.ts
@@ -21,6 +21,9 @@ 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(?:$|\/)/,
   );
@@ -151,14 +154,17 @@ export class BaseGoDatasource {
       };
     }
 
+    const gitlabModuleName =
+      BaseGoDatasource.gitlabRegExp.exec(goModule)?.groups?.regExpPath;
     const vcsIndicatedModule =
       BaseGoDatasource.gitVcsRegexp.exec(goModule)?.groups?.module;
 
     const metadataUrlMatchGroups =
       BaseGoDatasource.gitlabHttpsRegExp.exec(metadataUrl)?.groups;
     if (metadataUrlMatchGroups) {
       const { httpsRegExpUrl, httpsRegExpName } = metadataUrlMatchGroups;
-      const packageName = vcsIndicatedModule ?? httpsRegExpName;
+      const packageName =
+        vcsIndicatedModule ?? gitlabModuleName ?? httpsRegExpName;
       return {
         datasource: GitlabTagsDatasource.id,
         registryUrl: httpsRegExpUrl,