fix(kustomize): Allow port numbers in git URLs (#9921)

Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
renovatebot · May 11, 2021 · dd712a7 · dd712a7
1 parent 9ca604b
commit dd712a7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/manager/kustomize/extract.spec.ts b/lib/manager/kustomize/extract.spec.ts
@@ -57,6 +57,17 @@ describe(getName(), () => {
         lookupName: 'ssh://git@bitbucket.com/user/test-repo',
       });
     });
+    it('should extract the depName if the URL includes a port number', () => {
+      const pkg = extractBase(
+        'ssh://git@bitbucket.com:7999/user/test-repo?ref=v1.2.3'
+      );
+      expect(pkg).toEqual({
+        currentValue: 'v1.2.3',
+        datasource: datasourceGitTags.id,
+        depName: 'bitbucket.com:7999/user/test-repo',
+        lookupName: 'ssh://git@bitbucket.com:7999/user/test-repo',
+      });
+    });
     it('should extract the version of a non http base with subdir', () => {
       const pkg = extractBase(
         'ssh://git@bitbucket.com/user/test-repo/subdir?ref=v1.2.3'

diff --git a/lib/manager/kustomize/extract.ts b/lib/manager/kustomize/extract.ts
@@ -9,7 +9,7 @@ import type { Image, Kustomize } from './types';
 
 // URL specifications should follow the hashicorp URL format
 // https://github.com/hashicorp/go-getter#url-format
-const gitUrl = /^(?:git::)?(?<url>(?:(?:(?:http|https|ssh):\/\/)?(?:.*@)?)?(?<path>(?:[^:/]+[:/])?(?<project>[^/]+\/[^/]+)))(?<subdir>[^?]*)\?ref=(?<currentValue>.+)$/;
+const gitUrl = /^(?:git::)?(?<url>(?:(?:(?:http|https|ssh):\/\/)?(?:.*@)?)?(?<path>(?:[^:/\s]+(?::[0-9]+)?[:/])?(?<project>[^/\s]+\/[^/\s]+)))(?<subdir>[^?\s]*)\?ref=(?<currentValue>.+)$/;
 
 export function extractBase(base: string): PackageDependency | null {
   const match = gitUrl.exec(base);