fix(terraform): support subdirectories (#6354)

renovatebot · May 29, 2020 · 0fcd548 · 0fcd548
1 parent 21b606e
commit 0fcd548
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/lib/manager/terraform/__fixtures__/1.tf b/lib/manager/terraform/__fixtures__/1.tf
@@ -147,3 +147,7 @@ module "gittags" {
 module "gittags_badversion" {
   source = "git::https://bitbucket.com/hashicorp/example?ref=next"
 }
+
+module "gittags_subdir" {
+  source = "git::https://bitbucket.com/hashicorp/example//subdir/test?ref=v1.0.0"
+}
diff --git a/lib/manager/terraform/__snapshots__/extract.spec.ts.snap b/lib/manager/terraform/__snapshots__/extract.spec.ts.snap
@@ -168,6 +168,14 @@ Object {
       "lookupName": "https://bitbucket.com/hashicorp/example",
       "skipReason": "unsupported-version",
     },
+    Object {
+      "currentValue": "v1.0.0",
+      "datasource": "git-tags",
+      "depName": "bitbucket.com/hashicorp/example",
+      "depNameShort": "hashicorp/example",
+      "depType": "gitTags",
+      "lookupName": "https://bitbucket.com/hashicorp/example",
+    },
   ],
 }
 `;
diff --git a/lib/manager/terraform/extract.spec.ts b/lib/manager/terraform/extract.spec.ts
@@ -19,7 +19,7 @@ describe('lib/manager/terraform/extract', () => {
     it('extracts', () => {
       const res = extractPackageFile(tf1);
       expect(res).toMatchSnapshot();
-      expect(res.deps).toHaveLength(24);
+      expect(res.deps).toHaveLength(25);
       expect(res.deps.filter((dep) => dep.skipReason)).toHaveLength(6);
     });
     it('returns null if only local deps', () => {

diff --git a/lib/manager/terraform/extract.ts b/lib/manager/terraform/extract.ts
@@ -107,11 +107,19 @@ export function extractPackageFile(content: string): PackageFile | null {
         }
       } else if (gitTagsRefMatch) {
         dep.depType = 'gitTags';
-        dep.depName = gitTagsRefMatch[2].replace('.git', '');
-        dep.depNameShort = gitTagsRefMatch[3].replace('.git', '');
+        if (gitTagsRefMatch[2].includes('//')) {
+          logger.debug('Terraform module contains subdirectory');
+          dep.depName = gitTagsRefMatch[2].split('//')[0];
+          dep.depNameShort = dep.depName.split(/\/(.+)/)[1];
+          const tempLookupName = gitTagsRefMatch[1].split('//');
+          dep.lookupName = tempLookupName[0] + '//' + tempLookupName[1];
+        } else {
+          dep.depName = gitTagsRefMatch[2].replace('.git', '');
+          dep.depNameShort = gitTagsRefMatch[3].replace('.git', '');
+          dep.lookupName = gitTagsRefMatch[1];
+        }
         dep.currentValue = gitTagsRefMatch[4];
         dep.datasource = datasourceGitTags.id;
-        dep.lookupName = gitTagsRefMatch[1];
         dep.managerData.lineNumber = dep.managerData.sourceLine;
         if (!isVersion(dep.currentValue)) {
           dep.skipReason = SkipReason.UnsupportedVersion;