fix(terraform): Escape literal . in Bitbucket module ref regex (#26452)

renovatebot · Dec 29, 2023 · 831fba0 · 831fba0
1 parent f6cf9a4
commit 831fba0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/modules/manager/terraform/extractors/others/modules.spec.ts b/lib/modules/manager/terraform/extractors/others/modules.spec.ts
@@ -148,6 +148,9 @@ describe('modules/manager/terraform/extractors/others/modules', () => {
       const subfolderWithDoubleSlash = bitbucketRefMatchRegex.exec(
         'bitbucket.org/hashicorp/example.git//terraform?ref=v1.0.0',
       )?.groups;
+      const subfolderWithGitInName = bitbucketRefMatchRegex.exec(
+        'bitbucket.org/hashicorp/example.git//terraform-git?ref=v1.0.0',
+      )?.groups;
       const depth = bitbucketRefMatchRegex.exec(
         'git::https://git@bitbucket.org/hashicorp/example.git?depth=1&ref=v1.0.0',
       )?.groups;
@@ -180,6 +183,11 @@ describe('modules/manager/terraform/extractors/others/modules', () => {
         project: 'example',
         tag: 'v1.0.0',
       });
+      expect(subfolderWithGitInName).toMatchObject({
+        workspace: 'hashicorp',
+        project: 'example',
+        tag: 'v1.0.0',
+      });
       expect(depth).toMatchObject({
         workspace: 'hashicorp',
         project: 'example',

diff --git a/lib/modules/manager/terraform/extractors/others/modules.ts b/lib/modules/manager/terraform/extractors/others/modules.ts
@@ -13,7 +13,7 @@ export const githubRefMatchRegex = regEx(
   /github\.com([/:])(?<project>[^/]+\/[a-z0-9-_.]+).*\?(depth=\d+&)?ref=(?<tag>.*?)(&depth=\d+)?$/i,
 );
 export const bitbucketRefMatchRegex = regEx(
-  /(?:git::)?(?<url>(?:http|https|ssh)?(?::\/\/)?(?:.*@)?(?<path>bitbucket\.org\/(?<workspace>.*)\/(?<project>.*).git\/?(?<subfolder>.*)))\?(depth=\d+&)?ref=(?<tag>.*?)(&depth=\d+)?$/,
+  /(?:git::)?(?<url>(?:http|https|ssh)?(?::\/\/)?(?:.*@)?(?<path>bitbucket\.org\/(?<workspace>.*)\/(?<project>.*)\.git\/?(?<subfolder>.*)))\?(depth=\d+&)?ref=(?<tag>.*?)(&depth=\d+)?$/,
 );
 export const gitTagsRefMatchRegex = regEx(
   /(?:git::)?(?<url>(?:(?:http|https|ssh):\/\/)?(?:.*@)?(?<path>.*\/(?<project>.*\/.*)))\?(depth=\d+&)?ref=(?<tag>.*?)(&depth=\d+)?$/,