Skip to content

Commit 36840d3

Browse files
author
iru
authored
feat!: upgrade terraform 1.3 and remove experimental (#132)
since sept 21 terraform 1.3 graduated optional usage, and hence, breaks compatibility with `experiments = [module_variable_optional_attrs] experiment opt-in` usage https://www.terraform.io/language/upgrade-guides#concluding-the-optional-attributes-experiment from now on, customers require terraform 1.3, or are required to pin the secure for cloud module to latest compatible version ``` module "secure-for-cloud" { source = "sysdiglabs/secure-for-cloud/aws" version = "0.9.10" } ```
1 parent 4b45b4d commit 36840d3

File tree

11 files changed

+288
-214
lines changed

11 files changed

+288
-214
lines changed

.github/PULL_REQUEST_TEMPLATE.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ Thank you for your contribution!
33
44
## Testing your PR
55
6-
You can pinpoint the pr changes as terraform module source with following format
6+
You can pinpoint the pr changes as terraform module source with following format
77
88
```
9-
source = "github.com/sysdiglabs/terraform-aws-secure-for-cloud//examples/organizational?ref=<BRANCH_NAME>"
9+
source = "github.com/sysdiglabs/terraform-aws-secure-for-cloud//examples/organizational?ref=<BRANCH_NAME>"
1010
```
1111
1212

.github/workflows/ci-integration-tests.yaml

+13
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@ jobs:
2626
TF_VAR_sysdig_secure_api_token: ${{secrets.KUBELAB_SECURE_API_TOKEN}}
2727

2828
steps:
29+
# remove this tf setup with 1.3.1 is released for github runner (it fixes an impacting bug)
30+
# https://github.com/actions/runner-images/pull/6346
31+
# hashicorp/setup-terraform@v2 requires wrapper set to false
32+
# https://github.com/newcontext-oss/kitchen-terraform/issues/411#issuecomment-953920206
33+
- uses: hashicorp/setup-terraform@v2
34+
with:
35+
terraform_wrapper: false
2936
- name: Checkout
3037
uses: actions/checkout@v2
3138

@@ -110,6 +117,9 @@ jobs:
110117
TF_VAR_sysdig_secure_api_token: ${{secrets.KUBELAB_SECURE_API_TOKEN}}
111118

112119
steps:
120+
- uses: hashicorp/setup-terraform@v2
121+
with:
122+
terraform_wrapper: false
113123
- name: Checkout
114124
uses: actions/checkout@v2
115125

@@ -179,6 +189,9 @@ jobs:
179189
TF_VAR_sysdig_secure_api_token: ${{secrets.KUBELAB_SECURE_API_TOKEN}}
180190

181191
steps:
192+
- uses: hashicorp/setup-terraform@v2
193+
with:
194+
terraform_wrapper: false
182195
- name: Checkout
183196
uses: actions/checkout@v2
184197

.github/workflows/ci-pull-request.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
outputs:
3333
directories: ${{ steps.matrix.outputs.directories }}
3434

35-
# Min Terraform version(s)
35+
# min Terraform version(s)
3636
preCommitMinVersions:
3737
name: Min TF validate
3838
needs: getModules
@@ -49,14 +49,14 @@ jobs:
4949

5050
- name: Terraform min/max versions
5151
id: minMax
52-
uses: clowdhaus/terraform-min-max@v1.0.2
52+
uses: clowdhaus/terraform-min-max@v1.1.1
5353
with:
5454
directory: ${{ matrix.directory }}
5555

5656
- name: Echo Terraform min/max versions
5757
run: |
58-
echo "min version ${{ steps.minMax.outputs.minVersion }}"
59-
echo "max version ${{ steps.minMax.outputs.maxVersion }}"
58+
echo "min version for ${{ matrix.directory }}: ${{ steps.minMax.outputs.minVersion }}"
59+
echo "max version for ${{ matrix.directory }}: ${{ steps.minMax.outputs.maxVersion }}"
6060
6161
- name: Install Terraform v${{ steps.minMax.outputs.minVersion }}
6262
uses: hashicorp/setup-terraform@v1
@@ -78,12 +78,12 @@ jobs:
7878
run: |
7979
pre-commit run generate_tf_providers -a
8080
81-
- name: Execute pre-commit min_version 1
81+
- name: Execute pre-commit min_version for non root path
8282
# Run only validate pre-commit check on min version supported
8383
if: ${{ matrix.directory != '.' }}
8484
run: pre-commit run terraform_validate --color=always --show-diff-on-failure --files ${{ matrix.directory }}/*
8585

86-
- name: Execute pre-commit min_version 2
86+
- name: Execute pre-commit min_version for root path
8787
# Run only validate pre-commit check on min version supported
8888
if: ${{ matrix.directory == '.' }}
8989
run: pre-commit run terraform_validate --color=always --show-diff-on-failure --files $(ls *.tf)

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source "https://rubygems.org/"
22

3-
gem "kitchen-terraform", "~> 6.0.0"
3+
gem "kitchen-terraform", "~> 6.1.0"
44
#gem 'aws-sdk', '~> 3.0.1'
55
#gem 'awspec', '~> 1.24.0'
66
#gem 'kitchen-verifier-awspec', '~> 0.2.0'

0 commit comments

Comments
 (0)