Skip to content

Commit 8102390

Browse files
authored
Remove tf version ceiling (#515)
* Remove tf version ceiling * Use v2 tf orb * Update to v2 executor * Bump module versions
1 parent cef3ebd commit 8102390

File tree

5 files changed

+9
-13
lines changed

5 files changed

+9
-13
lines changed

.circleci/config.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ defaults: &defaults
2929
version: 2.1
3030

3131
orbs:
32-
terraform: ovotech/terraform@1
32+
terraform: ovotech/terraform-v2@2
3333

3434
jobs:
3535
goreleaser:
@@ -75,7 +75,7 @@ jobs:
7575
pip3 install awscli
7676
aws s3 cp $TARGET_FILE s3://ckr-terraform-module-code --acl public-read
7777
tf_check_aws:
78-
executor: terraform/terraform-0_12
78+
executor: terraform/default
7979
steps:
8080
- checkout
8181
- terraform/fmt-check:
@@ -86,7 +86,7 @@ jobs:
8686
# of the module needs to do that.
8787

8888
tf_check_gcp:
89-
executor: terraform/terraform-0_12
89+
executor: terraform/default
9090
steps:
9191
- checkout
9292
- terraform/fmt-check:
@@ -95,7 +95,7 @@ jobs:
9595
path: tf_module/ckr_gcp
9696

9797
publish_aws_tf_module:
98-
executor: terraform/terraform-0_12
98+
executor: terraform/default
9999
steps:
100100
- checkout
101101
- run:
@@ -108,7 +108,7 @@ jobs:
108108
version_file_path: tf_module/ckr_aws/module_version.txt
109109

110110
publish_gcp_tf_module:
111-
executor: terraform/terraform-0_12
111+
executor: terraform/default
112112
steps:
113113
- checkout
114114
- run:

tf_module/ckr_aws/main.tf

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
terraform {
2-
# version >= 0.15.0 will break as the terraform orb v1 doesn't support it
3-
required_version = "< 0.15.0"
4-
}
1+
terraform {}
52

63
data "aws_caller_identity" "current" {}
74

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.3
1+
0.1.4

tf_module/ckr_gcp/main.tf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
terraform {
2-
# version >= 0.15.0 will break as the terraform orb v1 doesn't support it
3-
required_version = ">= 0.12.6, < 0.15.0"
2+
required_version = ">= 0.12.6"
43
}
54

65
locals {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.0
1+
1.0.1

0 commit comments

Comments
 (0)