Remove tf version ceiling (#515)

* Remove tf version ceiling * Use v2 tf orb * Update to v2 executor * Bump module versions
ovotech · May 16, 2022 · 8102390 · 8102390
1 parent cef3ebd
commit 8102390
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 13 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -29,7 +29,7 @@ defaults: &defaults
 version: 2.1
 
 orbs:
-  terraform: ovotech/terraform@1
+  terraform: ovotech/terraform-v2@2
 
 jobs:
   goreleaser:
@@ -75,7 +75,7 @@ jobs:
             pip3 install awscli
             aws s3 cp $TARGET_FILE s3://ckr-terraform-module-code --acl public-read
   tf_check_aws:
-    executor: terraform/terraform-0_12
+    executor: terraform/default
     steps:
     - checkout
     - terraform/fmt-check:
@@ -86,7 +86,7 @@ jobs:
     # of the module needs to do that.
 
   tf_check_gcp:
-    executor: terraform/terraform-0_12
+    executor: terraform/default
     steps:
     - checkout
     - terraform/fmt-check:
@@ -95,7 +95,7 @@ jobs:
         path: tf_module/ckr_gcp
 
   publish_aws_tf_module:
-    executor: terraform/terraform-0_12
+    executor: terraform/default
     steps:
     - checkout
     - run:
@@ -108,7 +108,7 @@ jobs:
           version_file_path: tf_module/ckr_aws/module_version.txt
 
   publish_gcp_tf_module:
-    executor: terraform/terraform-0_12
+    executor: terraform/default
     steps:
     - checkout
     - run:

diff --git a/tf_module/ckr_aws/main.tf b/tf_module/ckr_aws/main.tf
@@ -1,7 +1,4 @@
-terraform {
-  # version >= 0.15.0 will break as the terraform orb v1 doesn't support it
-  required_version = "< 0.15.0"
-}
+terraform {}
 
 data "aws_caller_identity" "current" {}
 

diff --git a/tf_module/ckr_aws/module_version.txt b/tf_module/ckr_aws/module_version.txt
@@ -1 +1 @@
-0.1.3
+0.1.4
diff --git a/tf_module/ckr_gcp/main.tf b/tf_module/ckr_gcp/main.tf
@@ -1,6 +1,5 @@
 terraform {
-  # version >= 0.15.0 will break as the terraform orb v1 doesn't support it
-  required_version = ">= 0.12.6, < 0.15.0"
+  required_version = ">= 0.12.6"
 }
 
 locals {

diff --git a/tf_module/ckr_gcp/module_version.txt b/tf_module/ckr_gcp/module_version.txt
@@ -1 +1 @@
-1.0.0
+1.0.1