Skip to content

Commit 02a4ac5

Browse files
ericyzbharathkkb
ericyz
authored and
bharathkkb
committed
fix: upgrade version for dependant CFT modules (terraform-google-modules#339)
* upgrade version for dependant CFT modules * update terraform version * Remove replicated blocks
1 parent 3e95111 commit 02a4ac5

File tree

39 files changed

+369
-87
lines changed

39 files changed

+369
-87
lines changed

‎0-bootstrap/main.tf

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
provider "google" {
18-
version = "~> 3.38"
19-
}
20-
21-
provider "google-beta" {
22-
version = "~> 3.30"
23-
}
24-
25-
provider "null" {
26-
version = "~> 2.1"
27-
}
28-
29-
provider "random" {
30-
version = "~> 2.2"
31-
}
32-
3317
/*************************************************
3418
Bootstrap GCP Organization.
3519
*************************************************/

‎0-bootstrap/modules/jenkins-agent/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
terraform {
18-
required_version = ">=0.13, <0.14"
18+
required_version = ">= 0.13"
1919

2020
required_providers {
2121
google = "~> 3.5"

‎0-bootstrap/versions.tf

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,20 @@
1515
*/
1616

1717
terraform {
18-
required_version = ">=0.13, <0.14"
18+
required_version = ">= 0.13"
19+
required_providers {
20+
google = {
21+
source = "hashicorp/google"
22+
version = ">= 3.50"
23+
}
24+
null = {
25+
source = "hashicorp/null"
26+
version = "~> 2.1"
27+
}
28+
29+
random = {
30+
source = "hashicorp/random"
31+
version = "~> 2.3"
32+
}
33+
}
1934
}

‎1-org/envs/shared/projects.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ module "org_billing_logs" {
7676

7777
module "org_secrets" {
7878
source = "terraform-google-modules/project-factory/google"
79-
version = "~> 10.0"
79+
version = "~> 10.1"
8080
random_project_id = "true"
8181
impersonate_service_account = var.terraform_service_account
8282
default_service_account = "depriviledge"
@@ -106,7 +106,7 @@ module "org_secrets" {
106106

107107
module "interconnect" {
108108
source = "terraform-google-modules/project-factory/google"
109-
version = "~> 10.0"
109+
version = "~> 10.1"
110110
random_project_id = "true"
111111
impersonate_service_account = var.terraform_service_account
112112
default_service_account = "depriviledge"
@@ -136,7 +136,7 @@ module "interconnect" {
136136

137137
module "scc_notifications" {
138138
source = "terraform-google-modules/project-factory/google"
139-
version = "~> 10.0"
139+
version = "~> 10.1"
140140
random_project_id = "true"
141141
impersonate_service_account = var.terraform_service_account
142142
default_service_account = "depriviledge"
@@ -166,7 +166,7 @@ module "scc_notifications" {
166166

167167
module "dns_hub" {
168168
source = "terraform-google-modules/project-factory/google"
169-
version = "~> 10.0"
169+
version = "~> 10.1"
170170
random_project_id = "true"
171171
impersonate_service_account = var.terraform_service_account
172172
default_service_account = "depriviledge"
@@ -204,7 +204,7 @@ module "dns_hub" {
204204

205205
module "base_network_hub" {
206206
source = "terraform-google-modules/project-factory/google"
207-
version = "~> 10.0"
207+
version = "~> 10.1"
208208
count = var.enable_hub_and_spoke ? 1 : 0
209209
random_project_id = "true"
210210
impersonate_service_account = var.terraform_service_account
@@ -243,7 +243,7 @@ module "base_network_hub" {
243243

244244
module "restricted_network_hub" {
245245
source = "terraform-google-modules/project-factory/google"
246-
version = "~> 10.0"
246+
version = "~> 10.1"
247247
count = var.enable_hub_and_spoke ? 1 : 0
248248
random_project_id = "true"
249249
impersonate_service_account = var.terraform_service_account

‎1-org/envs/shared/providers.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,9 @@ data "google_service_account_access_token" "default" {
3939
*****************************************/
4040
provider "google" {
4141
access_token = data.google_service_account_access_token.default.access_token
42-
version = "~> 3.30"
4342
}
4443

4544
provider "google-beta" {
4645
access_token = data.google_service_account_access_token.default.access_token
47-
version = "~> 3.30"
4846
}
4947

‎1-org/envs/shared/versions.tf

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,14 @@
1616

1717
terraform {
1818
required_version = ">= 0.13"
19+
required_providers {
20+
google = {
21+
source = "hashicorp/google"
22+
version = ">= 3.50"
23+
}
24+
google-beta = {
25+
source = "hashicorp/google"
26+
version = ">= 3.50"
27+
}
28+
}
1929
}

‎2-environments/envs/development/providers.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,9 @@ data "google_service_account_access_token" "default" {
3939
*****************************************/
4040
provider "google" {
4141
access_token = data.google_service_account_access_token.default.access_token
42-
version = "~> 3.30"
4342
}
4443

4544
provider "google-beta" {
4645
access_token = data.google_service_account_access_token.default.access_token
47-
version = "~> 3.30"
4846
}
4947

‎2-environments/envs/development/versions.tf

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/**
2+
* Copyright 2021 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
terraform {
18+
required_version = ">= 0.13"
19+
required_providers {
20+
google = {
21+
source = "hashicorp/google"
22+
version = ">= 3.50"
23+
}
24+
google-beta = {
25+
source = "hashicorp/google"
26+
version = ">= 3.50"
27+
}
28+
}
29+
}

‎2-environments/envs/non-production/providers.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,9 @@ data "google_service_account_access_token" "default" {
3939
*****************************************/
4040
provider "google" {
4141
access_token = data.google_service_account_access_token.default.access_token
42-
version = "~> 3.30"
4342
}
4443

4544
provider "google-beta" {
4645
access_token = data.google_service_account_access_token.default.access_token
47-
version = "~> 3.30"
4846
}
4947

‎2-environments/envs/non-production/versions.tf

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/**
2+
* Copyright 2021 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
terraform {
18+
required_version = ">= 0.13"
19+
required_providers {
20+
google = {
21+
source = "hashicorp/google"
22+
version = ">= 3.50"
23+
}
24+
google-beta = {
25+
source = "hashicorp/google"
26+
version = ">= 3.50"
27+
}
28+
}
29+
}

‎2-environments/envs/production/providers.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,9 @@ data "google_service_account_access_token" "default" {
3939
*****************************************/
4040
provider "google" {
4141
access_token = data.google_service_account_access_token.default.access_token
42-
version = "~> 3.30"
4342
}
4443

4544
provider "google-beta" {
4645
access_token = data.google_service_account_access_token.default.access_token
47-
version = "~> 3.30"
4846
}
4947

‎2-environments/envs/production/versions.tf

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/**
2+
* Copyright 2021 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
terraform {
18+
required_version = ">= 0.13"
19+
required_providers {
20+
google = {
21+
source = "hashicorp/google"
22+
version = ">= 3.50"
23+
}
24+
google-beta = {
25+
source = "hashicorp/google"
26+
version = ">= 3.50"
27+
}
28+
}
29+
}

‎2-environments/modules/env_baseline/monitoring.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
module "monitoring_project" {
2222
source = "terraform-google-modules/project-factory/google"
23-
version = "~> 10.0"
23+
version = "~> 10.1"
2424
random_project_id = "true"
2525
impersonate_service_account = var.terraform_service_account
2626
name = "${var.project_prefix}-${var.environment_code}-monitoring"

‎2-environments/modules/env_baseline/networking.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
module "base_shared_vpc_host_project" {
2222
source = "terraform-google-modules/project-factory/google"
23-
version = "~> 10.0"
23+
version = "~> 10.1"
2424
random_project_id = "true"
2525
impersonate_service_account = var.terraform_service_account
2626
name = format("%s-%s-shared-base", var.project_prefix, var.environment_code)
@@ -53,7 +53,7 @@ module "base_shared_vpc_host_project" {
5353

5454
module "restricted_shared_vpc_host_project" {
5555
source = "terraform-google-modules/project-factory/google"
56-
version = "~> 10.0"
56+
version = "~> 10.1"
5757
random_project_id = "true"
5858
impersonate_service_account = var.terraform_service_account
5959
name = format("%s-%s-shared-restricted", var.project_prefix, var.environment_code)

‎2-environments/modules/env_baseline/secrets.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
module "env_secrets" {
2323
source = "terraform-google-modules/project-factory/google"
24-
version = "~> 10.0"
24+
version = "~> 10.1"
2525
random_project_id = "true"
2626
impersonate_service_account = var.terraform_service_account
2727
default_service_account = "depriviledge"

‎3-networks/envs/development/providers.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,9 @@ data "google_service_account_access_token" "default" {
3939
*****************************************/
4040
provider "google" {
4141
access_token = data.google_service_account_access_token.default.access_token
42-
version = "~> 3.30"
4342
}
4443

4544
provider "google-beta" {
4645
access_token = data.google_service_account_access_token.default.access_token
47-
version = "~> 3.30"
4846
}
4947

‎3-networks/envs/development/versions.tf

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,15 @@
1515
*/
1616

1717
terraform {
18-
required_version = ">= 0.12"
18+
required_version = ">= 0.13"
19+
required_providers {
20+
google = {
21+
source = "hashicorp/google"
22+
version = ">= 3.50"
23+
}
24+
google-beta = {
25+
source = "hashicorp/google"
26+
version = ">= 3.50"
27+
}
28+
}
1929
}

‎3-networks/envs/non-production/providers.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,9 @@ data "google_service_account_access_token" "default" {
3939
*****************************************/
4040
provider "google" {
4141
access_token = data.google_service_account_access_token.default.access_token
42-
version = "~> 3.30"
4342
}
4443

4544
provider "google-beta" {
4645
access_token = data.google_service_account_access_token.default.access_token
47-
version = "~> 3.30"
4846
}
4947

‎3-networks/envs/non-production/versions.tf

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,15 @@
1515
*/
1616

1717
terraform {
18-
required_version = ">= 0.12"
18+
required_version = ">= 0.13"
19+
required_providers {
20+
google = {
21+
source = "hashicorp/google"
22+
version = ">= 3.50"
23+
}
24+
google-beta = {
25+
source = "hashicorp/google"
26+
version = ">= 3.50"
27+
}
28+
}
1929
}

‎3-networks/envs/production/providers.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,9 @@ data "google_service_account_access_token" "default" {
3939
*****************************************/
4040
provider "google" {
4141
access_token = data.google_service_account_access_token.default.access_token
42-
version = "~> 3.30"
4342
}
4443

4544
provider "google-beta" {
4645
access_token = data.google_service_account_access_token.default.access_token
47-
version = "~> 3.30"
4846
}
4947

‎3-networks/envs/production/versions.tf

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,15 @@
1515
*/
1616

1717
terraform {
18-
required_version = ">= 0.12"
18+
required_version = ">= 0.13"
19+
required_providers {
20+
google = {
21+
source = "hashicorp/google"
22+
version = ">= 3.50"
23+
}
24+
google-beta = {
25+
source = "hashicorp/google"
26+
version = ">= 3.50"
27+
}
28+
}
1929
}

‎3-networks/envs/shared/providers.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,9 @@ data "google_service_account_access_token" "default" {
3939
*****************************************/
4040
provider "google" {
4141
access_token = data.google_service_account_access_token.default.access_token
42-
version = "~> 3.30"
4342
}
4443

4544
provider "google-beta" {
4645
access_token = data.google_service_account_access_token.default.access_token
47-
version = "~> 3.30"
4846
}
4947

0 commit comments

Comments
 (0)