Skip to content

Commit 56ba738

Browse files
daniel-citdaniel-cit
authored
fix(deps)!: Update Terraform module dependencies (#1384)
1 parent a91b68d commit 56ba738

File tree

43 files changed

+125
-88
lines changed

Some content is hidden

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

43 files changed

+125
-88
lines changed

‎0-bootstrap/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,7 @@ The following steps will guide you through deploying without using Cloud Build.
533533
| parent\_folder | Optional - for an organization with existing projects or for development/validation. It will place all the example foundation resources under the provided folder instead of the root organization. The value is the numeric folder ID. The folder must already exist. | `string` | `""` | no |
534534
| project\_deletion\_policy | The deletion policy for the project created. | `string` | `"PREVENT"` | no |
535535
| project\_prefix | Name prefix to use for projects created. Should be the same in all steps. Max size is 3 characters. | `string` | `"prj"` | no |
536+
| workflow\_deletion\_protection | Whether Terraform will be prevented from destroying a workflow. When the field is set to true or unset in Terraform state, a `terraform apply` or `terraform destroy` that would delete the workflow will fail. When the field is set to false, deleting the workflow is allowed. | `bool` | `true` | no |
536537

537538
## Outputs
538539

‎0-bootstrap/cb.tf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ resource "random_string" "suffix" {
6868

6969
module "gcp_projects_state_bucket" {
7070
source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket"
71-
version = "~> 8.0"
71+
version = "~> 9.0"
7272

7373
name = "${var.bucket_prefix}-${module.seed_bootstrap.seed_project_id}-gcp-projects-tfstate"
7474
project_id = module.seed_bootstrap.seed_project_id
@@ -84,7 +84,7 @@ module "gcp_projects_state_bucket" {
8484

8585
module "tf_source" {
8686
source = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_source"
87-
version = "~> 9.0"
87+
version = "~> 11.0"
8888

8989
org_id = var.org_id
9090
folder_id = google_folder.bootstrap.id
@@ -164,7 +164,7 @@ module "tf_private_pool" {
164164

165165
module "tf_cloud_builder" {
166166
source = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_builder"
167-
version = "~> 9.0"
167+
version = "~> 11.0"
168168

169169
project_id = module.tf_source.cloudbuild_project_id
170170
dockerfile_repo_uri = module.tf_source.csr_repos[local.cloudbuilder_repo].url
@@ -177,6 +177,7 @@ module "tf_cloud_builder" {
177177
enable_worker_pool = true
178178
worker_pool_id = module.tf_private_pool.private_worker_pool_id
179179
bucket_name = "${var.bucket_prefix}-${module.tf_source.cloudbuild_project_id}-tf-cloudbuilder-build-logs"
180+
workflow_deletion_protection = var.workflow_deletion_protection
180181
}
181182

182183
module "bootstrap_csr_repo" {
@@ -215,7 +216,7 @@ module "build_terraform_image" {
215216

216217
module "tf_workspace" {
217218
source = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_workspace"
218-
version = "~> 9.0"
219+
version = "~> 11.0"
219220
for_each = local.granular_sa
220221

221222
project_id = module.tf_source.cloudbuild_project_id

‎0-bootstrap/github.tf.example

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ locals {
7070

7171
module "gh_cicd" {
7272
source = "terraform-google-modules/project-factory/google"
73-
version = "~> 17.0"
73+
version = "~> 18.0"
7474

7575
name = "${var.project_prefix}-b-cicd-wif-gh"
7676
random_project_id = true
@@ -120,7 +120,7 @@ resource "google_service_account_iam_member" "self_impersonate" {
120120

121121
module "gcp_projects_state_bucket" {
122122
source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket"
123-
version = "~> 8.0"
123+
version = "~> 9.0"
124124

125125
name = "${var.bucket_prefix}-${module.seed_bootstrap.seed_project_id}-gcp-projects-tfstate"
126126
project_id = module.seed_bootstrap.seed_project_id

‎0-bootstrap/gitlab.tf.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ provider "gitlab" {
8181

8282
module "gitlab_cicd" {
8383
source = "terraform-google-modules/project-factory/google"
84-
version = "~> 17.0"
84+
version = "~> 18.0"
8585

8686
name = "${var.project_prefix}-b-cicd-wif-gl"
8787
random_project_id = true

‎0-bootstrap/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ resource "google_folder" "bootstrap" {
4545

4646
module "seed_bootstrap" {
4747
source = "terraform-google-modules/bootstrap/google"
48-
version = "~> 9.0"
48+
version = "~> 11.0"
4949

5050
org_id = var.org_id
5151
folder_id = google_folder.bootstrap.id

‎0-bootstrap/modules/cb-private-pool/network.tf

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

2121
module "peered_network" {
2222
source = "terraform-google-modules/network/google"
23-
version = "~> 9.0"
23+
version = "~> 10.0"
2424
count = var.private_worker_pool.create_peered_network ? 1 : 0
2525

2626
project_id = var.project_id
@@ -90,7 +90,7 @@ resource "google_compute_network_peering_routes_config" "peering_routes" {
9090

9191
module "firewall_rules" {
9292
source = "terraform-google-modules/network/google//modules/firewall-rules"
93-
version = "~> 9.0"
93+
version = "~> 10.0"
9494
count = var.private_worker_pool.enable_network_peering ? 1 : 0
9595

9696
project_id = var.project_id

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ resource "random_id" "suffix" {
2929
*******************************************/
3030
module "cicd_project" {
3131
source = "terraform-google-modules/project-factory/google"
32-
version = "~> 17.0"
32+
version = "~> 18.0"
3333

3434
name = local.cicd_project_name
3535
random_project_id = true
@@ -130,8 +130,9 @@ resource "google_tags_tag_value" "jenkins_agents" {
130130
}
131131

132132
module "jenkins_firewall_rules" {
133-
source = "terraform-google-modules/network/google//modules/network-firewall-policy"
134-
version = "~> 9.0"
133+
source = "terraform-google-modules/network/google//modules/network-firewall-policy"
134+
version = "~> 10.0"
135+
135136
project_id = module.cicd_project.project_id
136137
policy_name = "fp-${google_compute_network.jenkins_agents.name}-jenkins-firewall"
137138
description = "Jenkins Agent GCE network firewall rules."

‎0-bootstrap/modules/tfc-agent-gke/main.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ resource "random_string" "suffix" {
3434

3535
module "network" {
3636
source = "terraform-google-modules/network/google"
37-
version = "~> 9.0"
37+
version = "~> 10.0"
3838

3939
project_id = var.project_id
4040
network_name = var.network_name
@@ -96,7 +96,7 @@ resource "google_service_account" "tfc_agent_service_account" {
9696

9797
module "tfc_agent_cluster" {
9898
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster/"
99-
version = "~> 34.0"
99+
version = "~> 36.0"
100100

101101
project_id = var.project_id
102102
region = var.region
@@ -372,7 +372,7 @@ resource "google_compute_firewall" "allow_private_api_egress" {
372372

373373
module "private_service_connect" {
374374
source = "terraform-google-modules/network/google//modules/private-service-connect"
375-
version = "~> 9.1"
375+
version = "~> 10.0"
376376

377377
project_id = var.project_id
378378
dns_code = "dz-${local.vpc_name}"
@@ -394,7 +394,7 @@ resource "google_dns_policy" "default_policy" {
394394

395395
module "hub" {
396396
source = "terraform-google-modules/kubernetes-engine/google//modules/fleet-membership"
397-
version = "~> 34.0"
397+
version = "~> 36.0"
398398

399399
project_id = var.project_id
400400
location = var.region

‎0-bootstrap/terraform_cloud.tf.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ resource "tfe_run_trigger" "projects_bu2_shared_production" {
230230

231231
module "tfc_cicd" {
232232
source = "terraform-google-modules/project-factory/google"
233-
version = "~> 17.0"
233+
version = "~> 18.0"
234234

235235
name = "${var.project_prefix}-b-cicd-wif-tfc"
236236
random_project_id = true

‎0-bootstrap/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,12 @@ variable "folder_deletion_protection" {
108108
default = true
109109
}
110110

111+
variable "workflow_deletion_protection" {
112+
description = "Whether Terraform will be prevented from destroying a workflow. When the field is set to true or unset in Terraform state, a `terraform apply` or `terraform destroy` that would delete the workflow will fail. When the field is set to false, deleting the workflow is allowed."
113+
type = bool
114+
default = true
115+
}
116+
111117
/* ----------------------------------------
112118
Specific to Groups creation
113119
---------------------------------------- */

‎0-bootstrap/versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ terraform {
2020
google = {
2121
// version 4.31.0 removed because of issue https://github.com/hashicorp/terraform-provider-google/issues/12226
2222
source = "hashicorp/google"
23-
version = ">= 3.50, != 4.31.0, <= 6.10"
23+
version = ">= 3.50, != 4.31.0, < 7.0"
2424
}
2525

2626
google-beta = {
2727
// version 4.31.0 removed because of issue https://github.com/hashicorp/terraform-provider-google/issues/12226
2828
source = "hashicorp/google-beta"
29-
version = ">= 3.50, != 4.31.0, <= 6.10"
29+
version = ">= 3.50, != 4.31.0, < 7.0"
3030
}
3131

3232
// Un-comment gitlab required_providers when using gitlab CI/CD

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ locals {
4646

4747
module "organization_policies_type_boolean" {
4848
source = "terraform-google-modules/org-policy/google"
49-
version = "~> 5.1"
49+
version = "~> 7.0"
5050
for_each = local.boolean_type_organization_policies
5151

5252
organization_id = local.organization_id
@@ -63,7 +63,7 @@ module "organization_policies_type_boolean" {
6363

6464
module "org_vm_external_ip_access" {
6565
source = "terraform-google-modules/org-policy/google"
66-
version = "~> 5.1"
66+
version = "~> 7.0"
6767

6868
organization_id = local.organization_id
6969
folder_id = local.folder_id
@@ -75,7 +75,7 @@ module "org_vm_external_ip_access" {
7575

7676
module "restrict_protocol_fowarding" {
7777
source = "terraform-google-modules/org-policy/google"
78-
version = "~> 5.1"
78+
version = "~> 7.0"
7979

8080
organization_id = local.organization_id
8181
folder_id = local.folder_id
@@ -99,7 +99,7 @@ resource "time_sleep" "wait_logs_export" {
9999

100100
module "org_domain_restricted_sharing" {
101101
source = "terraform-google-modules/org-policy/google//modules/domain_restricted_sharing"
102-
version = "~> 5.1"
102+
version = "~> 7.0"
103103

104104
organization_id = local.organization_id
105105
folder_id = local.folder_id
@@ -117,7 +117,7 @@ module "org_domain_restricted_sharing" {
117117

118118
module "domain_restricted_contacts" {
119119
source = "terraform-google-modules/org-policy/google"
120-
version = "~> 5.1"
120+
version = "~> 7.0"
121121

122122
organization_id = local.organization_id
123123
folder_id = local.folder_id
@@ -134,7 +134,7 @@ module "domain_restricted_contacts" {
134134

135135
module "allowed_worker_pools" {
136136
source = "terraform-google-modules/org-policy/google"
137-
version = "~> 5.1"
137+
version = "~> 7.0"
138138
count = var.enforce_allowed_worker_pools && local.cloud_build_private_worker_pool_id != "" ? 1 : 0
139139

140140
organization_id = local.organization_id

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ locals {
3434

3535
module "org_audit_logs" {
3636
source = "terraform-google-modules/project-factory/google"
37-
version = "~> 17.0"
37+
version = "~> 18.0"
3838

3939
random_project_id = true
4040
random_project_id_length = 4
@@ -68,7 +68,7 @@ module "org_audit_logs" {
6868

6969
module "org_billing_export" {
7070
source = "terraform-google-modules/project-factory/google"
71-
version = "~> 17.0"
71+
version = "~> 18.0"
7272

7373
random_project_id = true
7474
random_project_id_length = 4
@@ -102,7 +102,7 @@ module "org_billing_export" {
102102

103103
module "common_kms" {
104104
source = "terraform-google-modules/project-factory/google"
105-
version = "~> 17.0"
105+
version = "~> 18.0"
106106

107107
random_project_id = true
108108
random_project_id_length = 4
@@ -137,7 +137,7 @@ module "common_kms" {
137137

138138
module "org_secrets" {
139139
source = "terraform-google-modules/project-factory/google"
140-
version = "~> 17.0"
140+
version = "~> 18.0"
141141

142142
random_project_id = true
143143
random_project_id_length = 4
@@ -171,7 +171,7 @@ module "org_secrets" {
171171

172172
module "interconnect" {
173173
source = "terraform-google-modules/project-factory/google"
174-
version = "~> 17.0"
174+
version = "~> 18.0"
175175

176176
random_project_id = true
177177
random_project_id_length = 4
@@ -205,7 +205,7 @@ module "interconnect" {
205205

206206
module "scc_notifications" {
207207
source = "terraform-google-modules/project-factory/google"
208-
version = "~> 17.0"
208+
version = "~> 18.0"
209209

210210
random_project_id = true
211211
random_project_id_length = 4
@@ -239,7 +239,7 @@ module "scc_notifications" {
239239

240240
module "dns_hub" {
241241
source = "terraform-google-modules/project-factory/google"
242-
version = "~> 17.0"
242+
version = "~> 18.0"
243243

244244
random_project_id = true
245245
random_project_id_length = 4
@@ -281,7 +281,7 @@ module "dns_hub" {
281281

282282
module "base_network_hub" {
283283
source = "terraform-google-modules/project-factory/google"
284-
version = "~> 17.0"
284+
version = "~> 18.0"
285285
count = var.enable_hub_and_spoke ? 1 : 0
286286

287287
random_project_id = true
@@ -332,7 +332,7 @@ resource "google_project_iam_member" "network_sa_base" {
332332

333333
module "restricted_network_hub" {
334334
source = "terraform-google-modules/project-factory/google"
335-
version = "~> 17.0"
335+
version = "~> 18.0"
336336
count = var.enable_hub_and_spoke ? 1 : 0
337337

338338
random_project_id = true

‎1-org/modules/cai-monitoring/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ data "archive_file" "function_source_zip" {
7171

7272
module "cloudfunction_source_bucket" {
7373
source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket"
74-
version = "~> 8.0"
74+
version = "~> 9.0"
7575

7676
project_id = var.project_id
7777
name = "bkt-cai-monitoring-${random_id.suffix.hex}-sources-${data.google_project.project.number}"

‎1-org/modules/network/main.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 = "~> 17.0"
23+
version = "~> 18.0"
2424

2525
random_project_id = true
2626
random_project_id_length = 4
@@ -57,7 +57,7 @@ module "base_shared_vpc_host_project" {
5757

5858
module "restricted_shared_vpc_host_project" {
5959
source = "terraform-google-modules/project-factory/google"
60-
version = "~> 17.0"
60+
version = "~> 18.0"
6161

6262
random_project_id = true
6363
random_project_id_length = 4

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

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

2222
module "env_kms" {
2323
source = "terraform-google-modules/project-factory/google"
24-
version = "~> 17.0"
24+
version = "~> 18.0"
2525

2626
random_project_id = true
2727
random_project_id_length = 4

‎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 = "~> 17.0"
24+
version = "~> 18.0"
2525

2626
random_project_id = true
2727
random_project_id_length = 4

‎3-networks-dual-svpc/envs/shared/dns-hub.tf

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

2121
module "dns_hub_vpc" {
2222
source = "terraform-google-modules/network/google"
23-
version = "~> 9.0"
23+
version = "~> 10.0"
2424

2525
project_id = local.dns_hub_project_id
2626
network_name = "vpc-net-dns"

0 commit comments

Comments
 (0)