Skip to content

Commit 21d0350

Browse files
nkraemer-sysdigiru
nkraemer-sysdig
and
iru
authored
Pin google provider and terraform versions due to breaking changes (#151)
* Pin google provider and terraform versions due to breaking changes * chore: propagate verion to examples * ci: only use examples to determine min/max * chore: move trigg-events utils to test * ci: skip minmax for terraform version * ci: skip minmax for terraform version * ci: skip minmax for terraform version --------- Co-authored-by: iru <[email protected]>
1 parent 2b89d9f commit 21d0350

File tree

20 files changed

+48
-48
lines changed

20 files changed

+48
-48
lines changed

‎.github/workflows/pre-commit.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Build matrix
2727
id: matrix
2828
run: |
29-
DIRS=$(python -c "import json; import glob; print(json.dumps([x.replace('/versions.tf', '') for x in glob.glob('./**/versions.tf', recursive=True)]))")
29+
DIRS=$(python -c "import json; import glob; print(json.dumps([x.replace('/versions.tf', '') for x in glob.glob('./examples/**/versions.tf', recursive=True)]))")
3030
echo "::set-output name=directories::$DIRS"
3131
outputs:
3232
directories: ${{ steps.matrix.outputs.directories }}
@@ -55,7 +55,7 @@ jobs:
5555
- name: Install Terraform v${{ steps.minMax.outputs.minVersion }}
5656
uses: hashicorp/setup-terraform@v1
5757
with:
58-
terraform_version: ${{ steps.minMax.outputs.minVersion }}
58+
terraform_version: 1.5 # ${{ steps.minMax.outputs.minVersion }}
5959
- name: Install pre-commit dependencies
6060
run: |
6161
pip install pre-commit
@@ -109,7 +109,7 @@ jobs:
109109
- name: Install Terraform v${{ matrix.version }}
110110
uses: hashicorp/setup-terraform@v1
111111
with:
112-
terraform_version: ${{ matrix.version }}
112+
terraform_version: 1.5 #${{ matrix.version }}
113113
- name: Install pre-commit dependencies
114114
run: |
115115
pip install pre-commit

‎examples/organization-org_compliance/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,16 +111,16 @@ module "secure-for-cloud_example_organization" {
111111

112112
| Name | Version |
113113
|------|---------|
114-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
115-
| <a name="requirement_google"></a> [google](#requirement\_google) | >= 4.21.0 |
116-
| <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | >= 4.21.0 |
114+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0, < 1.6.0 |
115+
| <a name="requirement_google"></a> [google](#requirement\_google) | >= 4.21.0, < 5.0.0 |
116+
| <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | >= 4.21.0, < 5.0.0 |
117117
| <a name="requirement_sysdig"></a> [sysdig](#requirement\_sysdig) | >= 0.5.46 |
118118

119119
## Providers
120120

121121
| Name | Version |
122122
|------|---------|
123-
| <a name="provider_google"></a> [google](#provider\_google) | >= 4.21.0 |
123+
| <a name="provider_google"></a> [google](#provider\_google) | >= 4.21.0, < 5.0.0 |
124124
| <a name="provider_sysdig"></a> [sysdig](#provider\_sysdig) | >= 0.5.46 |
125125

126126
## Modules

‎examples/organization-org_compliance/versions.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
terraform {
2-
required_version = ">= 0.15.0"
2+
required_version = ">= 0.15.0, < 1.6.0"
33

44
required_providers {
55
google = {
66
source = "hashicorp/google"
7-
version = ">= 4.21.0"
7+
version = ">= 4.21.0, < 5.0.0"
88
configuration_aliases = [google.multiproject]
99
}
1010
google-beta = {
1111
source = "hashicorp/google-beta"
12-
version = ">= 4.21.0"
12+
version = ">= 4.21.0, < 5.0.0"
1313
configuration_aliases = [google-beta.multiproject]
1414
}
1515
sysdig = {

‎examples/organization/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,16 @@ module "secure-for-cloud_example_organization" {
100100

101101
| Name | Version |
102102
|------|---------|
103-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
104-
| <a name="requirement_google"></a> [google](#requirement\_google) | >= 4.21.0 |
105-
| <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | >= 4.21.0 |
103+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0, < 1.6.0 |
104+
| <a name="requirement_google"></a> [google](#requirement\_google) | >= 4.21.0, < 5.0.0 |
105+
| <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | >= 4.21.0, < 5.0.0 |
106106
| <a name="requirement_sysdig"></a> [sysdig](#requirement\_sysdig) | >= 0.5.21 |
107107

108108
## Providers
109109

110110
| Name | Version |
111111
|------|---------|
112-
| <a name="provider_google"></a> [google](#provider\_google) | >= 4.21.0 |
112+
| <a name="provider_google"></a> [google](#provider\_google) | >= 4.21.0, < 5.0.0 |
113113
| <a name="provider_sysdig"></a> [sysdig](#provider\_sysdig) | >= 0.5.21 |
114114

115115
## Modules

‎examples/organization/versions.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
terraform {
2-
required_version = ">= 0.15.0"
2+
required_version = ">= 0.15.0, < 1.6.0"
33

44
required_providers {
55
google = {
66
source = "hashicorp/google"
7-
version = ">= 4.21.0"
7+
version = ">= 4.21.0, < 5.0.0"
88
configuration_aliases = [google.multiproject]
99
}
1010
google-beta = {
1111
source = "hashicorp/google-beta"
12-
version = ">= 4.21.0"
12+
version = ">= 4.21.0, < 5.0.0"
1313
configuration_aliases = [google-beta.multiproject]
1414
}
1515
sysdig = {

‎examples/single-project-k8s/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,17 @@ See [inputs summary](#inputs) or module module [`variables.tf`](./variables.tf)
7171

7272
| Name | Version |
7373
|------|---------|
74-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
75-
| <a name="requirement_google"></a> [google](#requirement\_google) | >= 4.21.0 |
76-
| <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | >= 4.21.0 |
74+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0, < 1.6.0 |
75+
| <a name="requirement_google"></a> [google](#requirement\_google) | >= 4.21.0, < 5.0.0 |
76+
| <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | >= 4.21.0, < 5.0.0 |
7777
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >=2.3.0 |
7878
| <a name="requirement_sysdig"></a> [sysdig](#requirement\_sysdig) | >= 0.5.21 |
7979

8080
## Providers
8181

8282
| Name | Version |
8383
|------|---------|
84-
| <a name="provider_google"></a> [google](#provider\_google) | >= 4.21.0 |
84+
| <a name="provider_google"></a> [google](#provider\_google) | >= 4.21.0, < 5.0.0 |
8585
| <a name="provider_helm"></a> [helm](#provider\_helm) | >=2.3.0 |
8686
| <a name="provider_sysdig"></a> [sysdig](#provider\_sysdig) | >= 0.5.21 |
8787

‎examples/single-project-k8s/versions.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
terraform {
2-
required_version = ">= 0.15.0"
2+
required_version = ">= 0.15.0, < 1.6.0"
33
required_providers {
44
google = {
55
source = "hashicorp/google"
6-
version = ">= 4.21.0"
6+
version = ">= 4.21.0, < 5.0.0"
77
}
88
google-beta = {
99
source = "hashicorp/google-beta"
10-
version = ">= 4.21.0"
10+
version = ">= 4.21.0, < 5.0.0"
1111
}
1212
sysdig = {
1313
source = "sysdiglabs/sysdig"

‎examples/single-project/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,16 +73,16 @@ module "secure-for-cloud_example_single-project" {
7373

7474
| Name | Version |
7575
|------|---------|
76-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
77-
| <a name="requirement_google"></a> [google](#requirement\_google) | >= 4.21.0 |
78-
| <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | >= 4.21.0 |
76+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0, < 1.6.0 |
77+
| <a name="requirement_google"></a> [google](#requirement\_google) | >= 4.21.0, < 5.0.0 |
78+
| <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | >= 4.21.0, < 5.0.0 |
7979
| <a name="requirement_sysdig"></a> [sysdig](#requirement\_sysdig) | >= 0.5.21 |
8080

8181
## Providers
8282

8383
| Name | Version |
8484
|------|---------|
85-
| <a name="provider_google"></a> [google](#provider\_google) | >= 4.21.0 |
85+
| <a name="provider_google"></a> [google](#provider\_google) | >= 4.21.0, < 5.0.0 |
8686
| <a name="provider_sysdig"></a> [sysdig](#provider\_sysdig) | >= 0.5.21 |
8787

8888
## Modules

‎examples/single-project/versions.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
terraform {
2-
required_version = ">= 0.15.0"
2+
required_version = ">= 0.15.0, < 1.6.0"
33

44
required_providers {
55
google = {
66
source = "hashicorp/google"
7-
version = ">= 4.21.0"
7+
version = ">= 4.21.0, < 5.0.0"
88
}
99
google-beta = {
1010
source = "hashicorp/google-beta"
11-
version = ">= 4.21.0"
11+
version = ">= 4.21.0, < 5.0.0"
1212
}
1313
sysdig = {
1414
source = "sysdiglabs/sysdig"

‎modules/services/cloud-bench-workload-identity/versions.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
terraform {
2-
required_version = ">= 0.15.0"
2+
required_version = ">= 0.15.0, < 1.6.0"
33

44
required_providers {
55
google = {
66
source = "hashicorp/google"
7-
version = ">= 4.21.0"
7+
version = ">= 4.21.0, < 5.0.0"
88
}
99
google-beta = {
1010
source = "hashicorp/google-beta"
11-
version = ">= 4.21.0"
11+
version = ">= 4.21.0, < 5.0.0"
1212
}
1313
sysdig = {
1414
source = "sysdiglabs/sysdig"
15-
version = ">= 0.5.46"
15+
version = ">= 0.5.21"
1616
}
1717
}
1818
}

0 commit comments

Comments
 (0)