fix(datasource/go): don't strip api/ from packageName on gitlab (#…

…27635) Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
renovatebot · Feb 29, 2024 · 158fa38 · 158fa38
1 parent 88860db
commit 158fa38
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 1 deletion.
diff --git a/lib/modules/datasource/go/__fixtures__/go-get-gitlab-ee-private-subgroup-api.html b/lib/modules/datasource/go/__fixtures__/go-get-gitlab-ee-private-subgroup-api.html
@@ -0,0 +1,12 @@
+<html>
+
+<head>
+  <meta name="go-import"
+    content="my.custom.domain/group/subgroup-api/myrepo git https://my.custom.domain/group/subgroup-api/myrepo.git" />
+  <meta name="go-source"
+    content="my.custom.domain/group/subgroup-api/myrepo https://my.custom.domain/group/subgroup-api/myrepo https://my.custom.domain/group/subgroup-api/myrepo/-/tree/master{/dir} https://my.custom.domain/group/subgroup-api/myrepo/-/blob/master{/dir}/{file}#L{line}" />
+</head>
+
+<body>go get https://my.custom.domain/group/subgroup-api/myrepo</body>
+
+</html>
diff --git a/lib/modules/datasource/go/base.spec.ts b/lib/modules/datasource/go/base.spec.ts
@@ -240,6 +240,29 @@ describe('modules/datasource/go/base', () => {
         });
       });
 
+      it('supports GitLab EE deps in private subgroup with api/ as part of packageName and api/v4 as part of endpoint', async () => {
+        GlobalConfig.set({ endpoint: 'https://my.custom.domain/api/v4' });
+
+        hostRules.hostType.mockReturnValue('gitlab');
+        httpMock
+          .scope('https://my.custom.domain')
+          .get('/group/subgroup-api/myrepo?go-get=1')
+          .reply(
+            200,
+            Fixtures.get('go-get-gitlab-ee-private-subgroup-api.html'),
+          );
+
+        const res = await BaseGoDatasource.getDatasource(
+          'my.custom.domain/group/subgroup-api/myrepo',
+        );
+
+        expect(res).toEqual({
+          datasource: GitlabTagsDatasource.id,
+          packageName: 'group/subgroup-api/myrepo',
+          registryUrl: 'https://my.custom.domain/',
+        });
+      });
+
       it('supports GitLab EE deps in subgroup with version', async () => {
         hostRules.hostType.mockReturnValue('gitlab');
         httpMock

diff --git a/lib/modules/datasource/go/base.ts b/lib/modules/datasource/go/base.ts
@@ -184,7 +184,7 @@ export class BaseGoDatasource {
         endpoint,
       );
 
-      if (endpointPrefix) {
+      if (endpointPrefix && endpointPrefix[1] !== 'api/') {
         packageName = packageName.replace(endpointPrefix[1], '');
       }