Skip to content

Commit 44cd5d1

Browse files
feat: Update version constraints to allow 4.0 (#149)
* Update version constraints to allow 4.0 * Replace >=3.53 with >=3.53,<5.0 * Update exaples to use 4.0 * Update testint to ~>4.0 * Revert "Update testint to ~>4.0" This reverts commit 4b77e85. * Update testing to ~> 4.0 * Update terraform-google-project-factory to point to master * Update terraform-google-project-factory to point to master * Update main.tf * Update versions.tf * serial create * swap google_kms_* selflink to id Co-authored-by: Bharath KKB <bharathkrishnakb@gmail.com>
1 parent d35e19b commit 44cd5d1

File tree

47 files changed

+83
-113
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+83
-113
lines changed

build/int.cloudbuild.yaml

Lines changed: 9 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ steps:
2323
- 'TF_VAR_billing_account=$_BILLING_ACCOUNT'
2424
- 'TF_VAR_billing_iam_test_account=$_BILLING_IAM_TEST_ACCOUNT'
2525

26-
- id: create member-iam-local
26+
- id: create all
2727
waitFor:
2828
- prepare
2929
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
30-
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do create member-iam-local']
30+
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do create']
3131
- id: converge member-iam-local
3232
waitFor:
33-
- create member-iam-local
33+
- create all
3434
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
3535
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do converge member-iam-local']
3636
- id: verify member-iam-local
@@ -46,14 +46,9 @@ steps:
4646

4747
# ----- SUITE billing-iam-local
4848

49-
- id: create billing-iam-local
50-
waitFor:
51-
- prepare
52-
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
53-
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do create billing-iam-local']
5449
- id: converge billing-iam-local
5550
waitFor:
56-
- create billing-iam-local
51+
- create all
5752
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
5853
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do converge billing-iam-local']
5954
- id: verify billing-iam-local
@@ -69,14 +64,9 @@ steps:
6964

7065
# ----- SUITE custom-role-local
7166

72-
- id: create custom-role-local
73-
waitFor:
74-
- prepare
75-
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
76-
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do create custom-role-local']
7767
- id: converge custom-role-local
7868
waitFor:
79-
- create custom-role-local
69+
- create all
8070
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
8171
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do converge custom-role-local']
8272
- id: verify custom-role-local
@@ -93,16 +83,9 @@ steps:
9383
# ----- SUITE additive-local
9484

9585
# verify additive-local with 2 roles
96-
- id: create additive-local 2 roles
97-
waitFor:
98-
- prepare
99-
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
100-
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do create additive-local']
101-
env:
102-
- 'TF_VAR_roles=2'
10386
- id: converge additive-local 2 roles
10487
waitFor:
105-
- create additive-local 2 roles
88+
- create all
10689
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
10790
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do converge additive-local']
10891
env:
@@ -158,16 +141,9 @@ steps:
158141
# ----- SUITE authoritative-local
159142

160143
# verify authoritative-local with 2 roles
161-
- id: create authoritative-local 2 roles
162-
waitFor:
163-
- prepare
164-
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
165-
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do create authoritative-local']
166-
env:
167-
- 'TF_VAR_roles=2'
168144
- id: converge authoritative-local 2 roles
169145
waitFor:
170-
- create authoritative-local 2 roles
146+
- create all
171147
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
172148
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do converge authoritative-local']
173149
env:
@@ -223,16 +199,10 @@ steps:
223199
# ----- SUITE static-and-dynamic
224200

225201
# verify static-and-dynamic-local with 2 roles
226-
- id: create static-and-dynamic-local 2 roles
227-
waitFor:
228-
- prepare
229-
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
230-
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do create static-and-dynamic-local']
231-
env:
232-
- 'TF_VAR_roles=2'
202+
233203
- id: converge static-and-dynamic-local 2 roles
234204
waitFor:
235-
- create static-and-dynamic-local 2 roles
205+
- create all
236206
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
237207
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do converge static-and-dynamic-local']
238208
env:

examples/bigquery_dataset/versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ terraform {
1919
required_providers {
2020
google = {
2121
source = "hashicorp/google"
22-
version = "~> 3.36"
22+
version = "~> 4.0"
2323
}
2424
google-beta = {
2525
source = "hashicorp/google-beta"
26-
version = "~> 3.36"
26+
version = "~> 4.0"
2727
}
2828
}
2929
}

examples/billing_account/versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ terraform {
1919
required_providers {
2020
google = {
2121
source = "hashicorp/google"
22-
version = "~> 3.36"
22+
version = "~> 4.0"
2323
}
2424
google-beta = {
2525
source = "hashicorp/google-beta"
26-
version = "~> 3.36"
26+
version = "~> 4.0"
2727
}
2828
}
2929
}

examples/custom_role_org/versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ terraform {
1919
required_providers {
2020
google = {
2121
source = "hashicorp/google"
22-
version = "~> 3.36"
22+
version = "~> 4.0"
2323
}
2424
google-beta = {
2525
source = "hashicorp/google-beta"
26-
version = "~> 3.36"
26+
version = "~> 4.0"
2727
}
2828
}
2929
}

examples/custom_role_project/versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ terraform {
1919
required_providers {
2020
google = {
2121
source = "hashicorp/google"
22-
version = "~> 3.36"
22+
version = "~> 4.0"
2323
}
2424
google-beta = {
2525
source = "hashicorp/google-beta"
26-
version = "~> 3.36"
26+
version = "~> 4.0"
2727
}
2828
}
2929
}

examples/folder/versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ terraform {
1919
required_providers {
2020
google = {
2121
source = "hashicorp/google"
22-
version = "~> 3.36"
22+
version = "~> 4.0"
2323
}
2424
google-beta = {
2525
source = "hashicorp/google-beta"
26-
version = "~> 3.36"
26+
version = "~> 4.0"
2727
}
2828
}
2929
}

examples/kms_crypto_key/versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ terraform {
1919
required_providers {
2020
google = {
2121
source = "hashicorp/google"
22-
version = "~> 3.36"
22+
version = "~> 4.0"
2323
}
2424
google-beta = {
2525
source = "hashicorp/google-beta"
26-
version = "~> 3.36"
26+
version = "~> 4.0"
2727
}
2828
}
2929
}

examples/kms_key_ring/versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ terraform {
1919
required_providers {
2020
google = {
2121
source = "hashicorp/google"
22-
version = "~> 3.36"
22+
version = "~> 4.0"
2323
}
2424
google-beta = {
2525
source = "hashicorp/google-beta"
26-
version = "~> 3.36"
26+
version = "~> 4.0"
2727
}
2828
}
2929
}

examples/member_iam/versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ terraform {
1919
required_providers {
2020
google = {
2121
source = "hashicorp/google"
22-
version = "~> 3.36"
22+
version = "~> 4.0"
2323
}
2424
google-beta = {
2525
source = "hashicorp/google-beta"
26-
version = "~> 3.36"
26+
version = "~> 4.0"
2727
}
2828
}
2929
}

examples/organization/versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ terraform {
1919
required_providers {
2020
google = {
2121
source = "hashicorp/google"
22-
version = "~> 3.36"
22+
version = "~> 4.0"
2323
}
2424
google-beta = {
2525
source = "hashicorp/google-beta"
26-
version = "~> 3.36"
26+
version = "~> 4.0"
2727
}
2828
}
2929
}

0 commit comments

Comments
 (0)