fix(pre-commit): Gitlab Custom RegistryUrl not honored (#25682)

Co-authored-by: Rhys Arkins <rhys@arkins.net>
renovatebot · Nov 13, 2023 · c8c0e1b · c8c0e1b
1 parent 53401eb
commit c8c0e1b
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 1 deletion.
diff --git a/lib/modules/manager/pre-commit/__fixtures__/complex.pre-commit-config.yaml b/lib/modules/manager/pre-commit/__fixtures__/complex.pre-commit-config.yaml
@@ -23,6 +23,16 @@ repos:
     rev: 19.3b0
     hooks:
       - id: black
+  - repo: https://gitlab.mycompany.com/my/dep
+    # should also detect custom gitlab registry
+    rev: v42.0
+    hooks:
+      - id: custom-hook
+  - repo: https://gitlab.mycompany.com/my/dep
+    # should also detect http for custom gitlab registry
+    rev: v42.0
+    hooks:
+      - id: custom-hook
   - repo: https://github.com/prettier/pre-commit
     # should accept different order of keys
     hooks:

diff --git a/lib/modules/manager/pre-commit/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/pre-commit/__snapshots__/extract.spec.ts.snap
@@ -31,6 +31,26 @@ exports[`modules/manager/pre-commit/extract extractPackageFile() extracts from c
       "depType": "repository",
       "packageName": "psf/black",
     },
+    {
+      "currentValue": "v42.0",
+      "datasource": "gitlab-tags",
+      "depName": "my/dep",
+      "depType": "repository",
+      "packageName": "my/dep",
+      "registryUrls": [
+        "https://gitlab.mycompany.com",
+      ],
+    },
+    {
+      "currentValue": "v42.0",
+      "datasource": "gitlab-tags",
+      "depName": "my/dep",
+      "depType": "repository",
+      "packageName": "my/dep",
+      "registryUrls": [
+        "https://gitlab.mycompany.com",
+      ],
+    },
     {
       "currentValue": "v2.1.2",
       "datasource": "github-tags",

diff --git a/lib/modules/manager/pre-commit/extract.spec.ts b/lib/modules/manager/pre-commit/extract.spec.ts
@@ -84,6 +84,16 @@ describe('modules/manager/pre-commit/extract', () => {
           { depName: 'psf/black', currentValue: '19.3b0' },
           { depName: 'psf/black', currentValue: '19.3b0' },
           { depName: 'psf/black', currentValue: '19.3b0' },
+          {
+            depName: 'my/dep',
+            currentValue: 'v42.0',
+            registryUrls: ['https://gitlab.mycompany.com'],
+          },
+          {
+            depName: 'my/dep',
+            currentValue: 'v42.0',
+            registryUrls: ['https://gitlab.mycompany.com'],
+          },
           { depName: 'prettier/pre-commit', currentValue: 'v2.1.2' },
           { depName: 'prettier/pre-commit', currentValue: 'v2.1.2' },
           { skipReason: 'invalid-url' },

diff --git a/lib/modules/manager/pre-commit/extract.ts b/lib/modules/manager/pre-commit/extract.ts
@@ -32,10 +32,20 @@ function determineDatasource(
     logger.debug({ repository, hostname }, 'Found github dependency');
     return { datasource: GithubTagsDatasource.id };
   }
-  if (hostname === 'gitlab.com' || detectPlatform(repository) === 'gitlab') {
+  if (hostname === 'gitlab.com') {
     logger.debug({ repository, hostname }, 'Found gitlab dependency');
     return { datasource: GitlabTagsDatasource.id };
   }
+  if (detectPlatform(repository) === 'gitlab') {
+    logger.debug(
+      { repository, hostname },
+      'Found gitlab dependency with custom registryUrl',
+    );
+    return {
+      datasource: GitlabTagsDatasource.id,
+      registryUrls: ['https://' + hostname],
+    };
+  }
   const hostUrl = 'https://' + hostname;
   const res = find({ url: hostUrl });
   if (is.emptyObject(res)) {