Merge branch 'main' into gh-12276

renovatebot · Oct 24, 2021 · bffd063 · bffd063
2 parents dd308d7 + 1d0bfad
commit bffd063
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 5 deletions.
diff --git a/lib/manager/terraform/__fixtures__/terraformBlock.tf b/lib/manager/terraform/__fixtures__/terraformBlock.tf
@@ -0,0 +1,3 @@
+terraform {
+  required_version = "1.0.0"
+}
diff --git a/lib/manager/terraform/__snapshots__/extract.spec.ts.snap b/lib/manager/terraform/__snapshots__/extract.spec.ts.snap
@@ -390,6 +390,21 @@ Object {
 }
 `;
 
+exports[`manager/terraform/extract extractPackageFile() test terraform block with only requirement_terraform_version 1`] = `
+Object {
+  "deps": Array [
+    Object {
+      "currentValue": "1.0.0",
+      "datasource": "github-tags",
+      "depName": "hashicorp/terraform",
+      "depType": "required_version",
+      "extractVersion": "v(?<version>.*)$",
+      "lineNumber": 1,
+    },
+  ],
+}
+`;
+
 exports[`manager/terraform/extract extractPackageFile() update lockfile constraints with range strategy update-lockfile 1`] = `
 Object {
   "deps": Array [

diff --git a/lib/manager/terraform/extract.spec.ts b/lib/manager/terraform/extract.spec.ts
@@ -12,6 +12,7 @@ const tf2 = `module "relative" {
 const helm = loadFixture('helm.tf');
 const lockedVersion = loadFixture('lockedVersion.tf');
 const lockedVersionLockfile = loadFixture('rangeStrategy.hcl');
+const terraformBlock = loadFixture('terraformBlock.tf');
 
 const adminConfig: RepoGlobalConfig = {
   // `join` fixes Windows CI
@@ -62,5 +63,16 @@ describe('manager/terraform/extract', () => {
       expect(res.deps).toHaveLength(3);
       expect(res.deps.filter((dep) => dep.skipReason)).toHaveLength(0);
     });
+
+    it('test terraform block with only requirement_terraform_version', async () => {
+      const res = await extractPackageFile(
+        terraformBlock,
+        'terraformBlock.tf',
+        {}
+      );
+      expect(res.deps).toHaveLength(1);
+      expect(res.deps.filter((dep) => dep.skipReason)).toHaveLength(0);
+      expect(res).toMatchSnapshot();
+    });
   });
 });
diff --git a/lib/manager/terraform/extract.ts b/lib/manager/terraform/extract.ts
@@ -36,6 +36,7 @@ const contentCheckList = [
   'required_providers ',
   ' "helm_release" ',
   ' "docker_image" ',
+  'required_version',
 ];
 
 export async function extractPackageFile(
@@ -45,6 +46,10 @@ export async function extractPackageFile(
 ): Promise<PackageFile | null> {
   logger.trace({ content }, 'terraform.extractPackageFile()');
   if (!checkFileContainsDependency(content, contentCheckList)) {
+    logger.trace(
+      { fileName },
+      'preflight content check has not found any relevant content'
+    );
     return null;
   }
   let deps: PackageDependency<TerraformManagerData>[] = [];

diff --git a/package.json b/package.json
@@ -272,7 +272,7 @@
     "tmp-promise": "3.0.2",
     "ts-jest": "27.0.7",
     "ts-node": "10.3.0",
-    "type-fest": "2.5.0",
+    "type-fest": "2.5.1",
     "typescript": "4.4.4",
     "unified": "9.2.2"
   },

diff --git a/yarn.lock b/yarn.lock
@@ -9489,10 +9489,10 @@ type-detect@4.0.8:
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
 
-type-fest@2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.5.0.tgz#e5d0ef818d565e8fc442414194a4ac3afc4c42a7"
-  integrity sha512-wB5vE+XXZ2g2mDRo18yZMae1joUhquomLTm+BkxeuRHnwmrNWzVPNrFah9z7pjsKNiVAaJL33+uQbgbPSARyqw==
+type-fest@2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.5.1.tgz#17ba4f36a6abfabf0a92005d045dca77564607b0"
+  integrity sha512-JDcsxbLR6Z6OcL7TnGAAAGQrY4g7Q4EEALMT4Kp6FQuIc0JLQvOF3l7ejFvx8o5GmLlfMseTWUL++sYFP+o8kw==
 
 type-fest@^0.13.1:
   version "0.13.1"