fix(terraform): support github repo source url with underscores (#9661)

Co-authored-by: Michael Kriese <michael.kriese@visualon.de> Co-authored-by: Rhys Arkins <rhys@arkins.net>
renovatebot · Apr 23, 2021 · 108a00b · 108a00b
1 parent b255275
commit 108a00b
Show file tree

Hide file tree

Showing 4 changed files with 132 additions and 4 deletions.
diff --git a/lib/manager/terraform/modules.spec.ts b/lib/manager/terraform/modules.spec.ts
@@ -0,0 +1,64 @@
+import { getName } from '../../../test/util';
+import { gitTagsRefMatchRegex, githubRefMatchRegex } from './modules';
+
+describe(getName(__filename), () => {
+  describe('githubRefMatchRegex', () => {
+    it('should split project and tag from source', () => {
+      const { project, tag } = githubRefMatchRegex.exec(
+        'github.com/hashicorp/example?ref=v1.0.0'
+      ).groups;
+      expect(project).toBe('hashicorp/example');
+      expect(tag).toBe('v1.0.0');
+    });
+
+    it('should parse alpha-numeric characters as well as dots, underscores, and dashes in repo names', () => {
+      const { project } = githubRefMatchRegex.exec(
+        'github.com/hashicorp/example.repo-123?ref=v1.0.0'
+      ).groups;
+      expect(project).toBe('hashicorp/example.repo-123');
+    });
+  });
+  describe('gitTagsRefMatchRegex', () => {
+    it('should split project and tag from source', () => {
+      const http = gitTagsRefMatchRegex.exec(
+        'http://github.com/hashicorp/example?ref=v1.0.0'
+      ).groups;
+      const https = gitTagsRefMatchRegex.exec(
+        'https://github.com/hashicorp/example?ref=v1.0.0'
+      ).groups;
+      const ssh = gitTagsRefMatchRegex.exec(
+        'ssh://github.com/hashicorp/example?ref=v1.0.0'
+      ).groups;
+
+      expect(http.project).toBe('hashicorp/example');
+      expect(http.tag).toBe('v1.0.0');
+
+      expect(https.project).toBe('hashicorp/example');
+      expect(https.tag).toBe('v1.0.0');
+
+      expect(ssh.project).toBe('hashicorp/example');
+      expect(ssh.tag).toBe('v1.0.0');
+    });
+
+    it('should parse alpha-numeric characters as well as dots, underscores, and dashes in repo names', () => {
+      const http = gitTagsRefMatchRegex.exec(
+        'http://github.com/hashicorp/example.repo-123?ref=v1.0.0'
+      ).groups;
+      const https = gitTagsRefMatchRegex.exec(
+        'https://github.com/hashicorp/example.repo-123?ref=v1.0.0'
+      ).groups;
+      const ssh = gitTagsRefMatchRegex.exec(
+        'ssh://github.com/hashicorp/example.repo-123?ref=v1.0.0'
+      ).groups;
+
+      expect(http.project).toBe('hashicorp/example.repo-123');
+      expect(http.tag).toBe('v1.0.0');
+
+      expect(https.project).toBe('hashicorp/example.repo-123');
+      expect(https.tag).toBe('v1.0.0');
+
+      expect(ssh.project).toBe('hashicorp/example.repo-123');
+      expect(ssh.tag).toBe('v1.0.0');
+    });
+  });
+});
diff --git a/lib/manager/terraform/modules.ts b/lib/manager/terraform/modules.ts
@@ -7,8 +7,8 @@ import type { PackageDependency } from '../types';
 import { extractTerraformProvider } from './providers';
 import { ExtractionResult, TerraformDependencyTypes } from './util';
 
-const githubRefMatchRegex = /github.com([/:])(?<project>[^/]+\/[a-z0-9-.]+).*\?ref=(?<tag>.*)$/;
-const gitTagsRefMatchRegex = /(?:git::)?(?<url>(?:http|https|ssh):\/\/(?:.*@)?(?<path>.*.*\/(?<project>.*\/.*)))\?ref=(?<tag>.*)$/;
+export const githubRefMatchRegex = /github\.com([/:])(?<project>[^/]+\/[a-z0-9-_.]+).*\?ref=(?<tag>.*)$/i;
+export const gitTagsRefMatchRegex = /(?:git::)?(?<url>(?:http|https|ssh):\/\/(?:.*@)?(?<path>.*.*\/(?<project>.*\/.*)))\?ref=(?<tag>.*)$/;
 const hostnameMatchRegex = /^(?<hostname>([\w|\d]+\.)+[\w|\d]+)/;
 
 export function extractTerraformModule(

diff --git a/lib/manager/terragrunt/modules.spec.ts b/lib/manager/terragrunt/modules.spec.ts
@@ -0,0 +1,64 @@
+import { getName } from '../../../test/util';
+import { gitTagsRefMatchRegex, githubRefMatchRegex } from './modules';
+
+describe(getName(__filename), () => {
+  describe('githubRefMatchRegex', () => {
+    it('should split project and tag from source', () => {
+      const { project, tag } = githubRefMatchRegex.exec(
+        'github.com/hashicorp/example?ref=v1.0.0'
+      ).groups;
+      expect(project).toBe('hashicorp/example');
+      expect(tag).toBe('v1.0.0');
+    });
+
+    it('should parse alpha-numeric characters as well as dots, underscores, and dashes in repo names', () => {
+      const { project } = githubRefMatchRegex.exec(
+        'github.com/hashicorp/example.repo-123?ref=v1.0.0'
+      ).groups;
+      expect(project).toBe('hashicorp/example.repo-123');
+    });
+  });
+  describe('gitTagsRefMatchRegex', () => {
+    it('should split project and tag from source', () => {
+      const http = gitTagsRefMatchRegex.exec(
+        'http://github.com/hashicorp/example?ref=v1.0.0'
+      ).groups;
+      const https = gitTagsRefMatchRegex.exec(
+        'https://github.com/hashicorp/example?ref=v1.0.0'
+      ).groups;
+      const ssh = gitTagsRefMatchRegex.exec(
+        'ssh://github.com/hashicorp/example?ref=v1.0.0'
+      ).groups;
+
+      expect(http.project).toBe('hashicorp/example');
+      expect(http.tag).toBe('v1.0.0');
+
+      expect(https.project).toBe('hashicorp/example');
+      expect(https.tag).toBe('v1.0.0');
+
+      expect(ssh.project).toBe('hashicorp/example');
+      expect(ssh.tag).toBe('v1.0.0');
+    });
+
+    it('should parse alpha-numeric characters as well as dots, underscores, and dashes in repo names', () => {
+      const http = gitTagsRefMatchRegex.exec(
+        'http://github.com/hashicorp/example.repo-123?ref=v1.0.0'
+      ).groups;
+      const https = gitTagsRefMatchRegex.exec(
+        'https://github.com/hashicorp/example.repo-123?ref=v1.0.0'
+      ).groups;
+      const ssh = gitTagsRefMatchRegex.exec(
+        'ssh://github.com/hashicorp/example.repo-123?ref=v1.0.0'
+      ).groups;
+
+      expect(http.project).toBe('hashicorp/example.repo-123');
+      expect(http.tag).toBe('v1.0.0');
+
+      expect(https.project).toBe('hashicorp/example.repo-123');
+      expect(https.tag).toBe('v1.0.0');
+
+      expect(ssh.project).toBe('hashicorp/example.repo-123');
+      expect(ssh.tag).toBe('v1.0.0');
+    });
+  });
+});
diff --git a/lib/manager/terragrunt/modules.ts b/lib/manager/terragrunt/modules.ts
@@ -7,8 +7,8 @@ import type { PackageDependency } from '../types';
 import { extractTerragruntProvider } from './providers';
 import { ExtractionResult, TerragruntDependencyTypes } from './util';
 
-const githubRefMatchRegex = /github.com([/:])(?<project>[^/]+\/[a-z0-9-.]+).*\?ref=(?<tag>.*)$/;
-const gitTagsRefMatchRegex = /(?:git::)?(?<url>(?:http|https|ssh):\/\/(?:.*@)?(?<path>.*.*\/(?<project>.*\/.*)))\?ref=(?<tag>.*)$/;
+export const githubRefMatchRegex = /github\.com([/:])(?<project>[^/]+\/[a-z0-9-_.]+).*\?ref=(?<tag>.*)$/i;
+export const gitTagsRefMatchRegex = /(?:git::)?(?<url>(?:http|https|ssh):\/\/(?:.*@)?(?<path>.*.*\/(?<project>.*\/.*)))\?ref=(?<tag>.*)$/;
 const hostnameMatchRegex = /^(?<hostname>([\w|\d]+\.)+[\w|\d]+)/;
 
 export function extractTerragruntModule(