diff --git a/0-bootstrap/cb.tf b/0-bootstrap/cb.tf index 0031cbd8a7..a82a1a9189 100644 --- a/0-bootstrap/cb.tf +++ b/0-bootstrap/cb.tf @@ -70,7 +70,7 @@ resource "random_string" "suffix" { module "gcp_projects_state_bucket" { source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket" - version = "~> 4.0" + version = "~> 5.0" name = "${var.bucket_prefix}-${module.seed_bootstrap.seed_project_id}-gcp-projects-tfstate" project_id = module.seed_bootstrap.seed_project_id diff --git a/0-bootstrap/modules/cb-private-pool/network.tf b/0-bootstrap/modules/cb-private-pool/network.tf index 8c62d210ed..308f56a9f8 100644 --- a/0-bootstrap/modules/cb-private-pool/network.tf +++ b/0-bootstrap/modules/cb-private-pool/network.tf @@ -20,7 +20,7 @@ locals { module "peered_network" { source = "terraform-google-modules/network/google" - version = "~> 8.0" + version = "~> 9.0" count = var.private_worker_pool.create_peered_network ? 1 : 0 project_id = var.project_id @@ -90,7 +90,7 @@ resource "google_compute_network_peering_routes_config" "peering_routes" { module "firewall_rules" { source = "terraform-google-modules/network/google//modules/firewall-rules" - version = "~> 7.0" + version = "~> 9.0" count = var.private_worker_pool.enable_network_peering ? 1 : 0 project_id = var.project_id diff --git a/0-bootstrap/modules/cb-private-pool/vpn_ha.tf b/0-bootstrap/modules/cb-private-pool/vpn_ha.tf index d08a481324..bc75e655c9 100644 --- a/0-bootstrap/modules/cb-private-pool/vpn_ha.tf +++ b/0-bootstrap/modules/cb-private-pool/vpn_ha.tf @@ -28,7 +28,7 @@ data "google_secret_manager_secret_version" "psk" { module "vpn_ha_cb_to_onprem" { source = "terraform-google-modules/vpn/google//modules/vpn_ha" - version = "~> 2.3" + version = "~> 3.0" count = var.vpn_configuration.enable_vpn ? 1 : 0 project_id = var.project_id diff --git a/0-bootstrap/modules/jenkins-agent/main.tf b/0-bootstrap/modules/jenkins-agent/main.tf index 9887e98837..04487b72b7 100644 --- a/0-bootstrap/modules/jenkins-agent/main.tf +++ b/0-bootstrap/modules/jenkins-agent/main.tf @@ -128,7 +128,7 @@ resource "google_tags_tag_value" "jenkins_agents" { module "jenkins_firewall_rules" { source = "terraform-google-modules/network/google//modules/network-firewall-policy" - version = "~> 8.0" + version = "~> 9.0" project_id = module.cicd_project.project_id policy_name = "fp-${google_compute_network.jenkins_agents.name}-jenkins-firewall" description = "Jenkins Agent GCE network firewall rules." diff --git a/0-bootstrap/modules/jenkins-agent/vpn_ha.tf b/0-bootstrap/modules/jenkins-agent/vpn_ha.tf index cd05f36e5c..6ff6f97a59 100644 --- a/0-bootstrap/modules/jenkins-agent/vpn_ha.tf +++ b/0-bootstrap/modules/jenkins-agent/vpn_ha.tf @@ -16,7 +16,7 @@ module "vpn_ha_agent_to_onprem" { source = "terraform-google-modules/vpn/google//modules/vpn_ha" - version = "~> 2.0" + version = "~> 3.0" project_id = module.cicd_project.project_id region = var.default_region diff --git a/0-bootstrap/modules/tfc-agent-gke/main.tf b/0-bootstrap/modules/tfc-agent-gke/main.tf index 40a367361c..dd6e2b8b95 100644 --- a/0-bootstrap/modules/tfc-agent-gke/main.tf +++ b/0-bootstrap/modules/tfc-agent-gke/main.tf @@ -34,7 +34,7 @@ resource "random_string" "suffix" { module "network" { source = "terraform-google-modules/network/google" - version = "~> 5.2" + version = "~> 9.0" project_id = var.project_id network_name = var.network_name @@ -94,7 +94,7 @@ resource "google_service_account" "tfc_agent_service_account" { module "tfc_agent_cluster" { source = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster/" - version = "~> 28.0" + version = "~> 29.0" project_id = var.project_id region = var.region @@ -370,7 +370,7 @@ resource "google_compute_firewall" "allow_private_api_egress" { module "private_service_connect" { source = "terraform-google-modules/network/google//modules/private-service-connect" - version = "~> 5.2" + version = "~> 9.0" project_id = var.project_id dns_code = "dz-${local.vpc_name}" @@ -392,7 +392,7 @@ resource "google_dns_policy" "default_policy" { module "hub" { source = "terraform-google-modules/kubernetes-engine/google//modules/fleet-membership" - version = "~> 28.0" + version = "~> 29.0" project_id = var.project_id location = var.region diff --git a/1-org/modules/cai-monitoring/main.tf b/1-org/modules/cai-monitoring/main.tf index b31da358e6..5518b66d7c 100644 --- a/1-org/modules/cai-monitoring/main.tf +++ b/1-org/modules/cai-monitoring/main.tf @@ -71,7 +71,7 @@ data "archive_file" "function_source_zip" { module "cloudfunction_source_bucket" { source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket" - version = "~>3.4" + version = "~> 5.0" project_id = var.project_id name = "bkt-cai-monitoring-${random_id.suffix.hex}-sources-${data.google_project.project.number}-${var.location}" @@ -121,7 +121,7 @@ resource "google_cloud_asset_organization_feed" "organization_feed" { module "pubsub_cai_feed" { source = "terraform-google-modules/pubsub/google" - version = "~> 5.0" + version = "~> 6.0" topic = "top-cai-monitoring-${random_id.suffix.hex}-event" project_id = var.project_id diff --git a/3-networks-dual-svpc/envs/shared/dns-hub.tf b/3-networks-dual-svpc/envs/shared/dns-hub.tf index c47fa13871..a694787dc5 100644 --- a/3-networks-dual-svpc/envs/shared/dns-hub.tf +++ b/3-networks-dual-svpc/envs/shared/dns-hub.tf @@ -20,7 +20,7 @@ module "dns_hub_vpc" { source = "terraform-google-modules/network/google" - version = "~> 8.0" + version = "~> 9.0" project_id = local.dns_hub_project_id network_name = "vpc-c-dns-hub" @@ -101,7 +101,7 @@ module "dns-forwarding-zone" { module "dns_hub_region1_router1" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 6.0" name = "cr-c-dns-hub-${local.default_region1}-cr1" project = local.dns_hub_project_id @@ -115,7 +115,7 @@ module "dns_hub_region1_router1" { module "dns_hub_region1_router2" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 6.0" name = "cr-c-dns-hub-${local.default_region1}-cr2" project = local.dns_hub_project_id @@ -129,7 +129,7 @@ module "dns_hub_region1_router2" { module "dns_hub_region2_router1" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 6.0" name = "cr-c-dns-hub-${local.default_region2}-cr3" project = local.dns_hub_project_id @@ -143,7 +143,7 @@ module "dns_hub_region2_router1" { module "dns_hub_region2_router2" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 6.0" name = "cr-c-dns-hub-${local.default_region2}-cr4" project = local.dns_hub_project_id diff --git a/3-networks-dual-svpc/modules/base_shared_vpc/firewall.tf b/3-networks-dual-svpc/modules/base_shared_vpc/firewall.tf index 6717511627..23ba8ccaee 100644 --- a/3-networks-dual-svpc/modules/base_shared_vpc/firewall.tf +++ b/3-networks-dual-svpc/modules/base_shared_vpc/firewall.tf @@ -19,7 +19,7 @@ *****************************************/ module "firewall_rules" { source = "terraform-google-modules/network/google//modules/network-firewall-policy" - version = "~> 8.0" + version = "~> 9.0" project_id = var.project_id policy_name = "fp-${var.environment_code}-dual-svpc-base-firewalls" description = "Firewall rules for base dual shared vpc: ${module.main.network_name}." diff --git a/3-networks-dual-svpc/modules/base_shared_vpc/main.tf b/3-networks-dual-svpc/modules/base_shared_vpc/main.tf index b481a37e18..25fb01aa33 100644 --- a/3-networks-dual-svpc/modules/base_shared_vpc/main.tf +++ b/3-networks-dual-svpc/modules/base_shared_vpc/main.tf @@ -26,7 +26,7 @@ locals { module "main" { source = "terraform-google-modules/network/google" - version = "~> 8.0" + version = "~> 9.0" project_id = var.project_id network_name = local.network_name @@ -92,7 +92,7 @@ resource "google_service_networking_connection" "private_vpc_connection" { module "region1_router1" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 6.0" name = "cr-${local.vpc_name}-${var.default_region1}-cr1" project = var.project_id @@ -107,7 +107,7 @@ module "region1_router1" { module "region1_router2" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 6.0" name = "cr-${local.vpc_name}-${var.default_region1}-cr2" project = var.project_id @@ -122,7 +122,7 @@ module "region1_router2" { module "region2_router1" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 6.0" name = "cr-${local.vpc_name}-${var.default_region2}-cr3" project = var.project_id @@ -137,7 +137,7 @@ module "region2_router1" { module "region2_router2" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 6.0" name = "cr-${local.vpc_name}-${var.default_region2}-cr4" project = var.project_id diff --git a/3-networks-dual-svpc/modules/base_shared_vpc/private_service_connect.tf b/3-networks-dual-svpc/modules/base_shared_vpc/private_service_connect.tf index 937330cd63..6840b75877 100644 --- a/3-networks-dual-svpc/modules/base_shared_vpc/private_service_connect.tf +++ b/3-networks-dual-svpc/modules/base_shared_vpc/private_service_connect.tf @@ -17,7 +17,7 @@ module "private_service_connect" { source = "terraform-google-modules/network/google//modules/private-service-connect" - version = "~> 7.0" + version = "~> 9.0" project_id = var.project_id dns_code = "dz-${var.environment_code}-shared-base" diff --git a/3-networks-dual-svpc/modules/dedicated_interconnect/main.tf b/3-networks-dual-svpc/modules/dedicated_interconnect/main.tf index add0af28da..6f28b91d53 100644 --- a/3-networks-dual-svpc/modules/dedicated_interconnect/main.tf +++ b/3-networks-dual-svpc/modules/dedicated_interconnect/main.tf @@ -23,7 +23,7 @@ locals { module "interconnect_attachment1_region1" { source = "terraform-google-modules/cloud-router/google//modules/interconnect_attachment" - version = "~> 4.0" + version = "~> 6.0" name = "vl-${var.region1_interconnect1_onprem_dc}-${var.region1_interconnect1_location}-${var.vpc_name}-${var.region1}-${local.suffix1}" project = var.interconnect_project_id @@ -46,7 +46,7 @@ module "interconnect_attachment1_region1" { module "interconnect_attachment2_region1" { source = "terraform-google-modules/cloud-router/google//modules/interconnect_attachment" - version = "~> 4.0" + version = "~> 6.0" name = "vl-${var.region1_interconnect2_onprem_dc}-${var.region1_interconnect2_location}-${var.vpc_name}-${var.region1}-${local.suffix2}" project = var.interconnect_project_id @@ -69,7 +69,7 @@ module "interconnect_attachment2_region1" { module "interconnect_attachment1_region2" { source = "terraform-google-modules/cloud-router/google//modules/interconnect_attachment" - version = "~> 4.0" + version = "~> 6.0" name = "vl-${var.region2_interconnect1_onprem_dc}-${var.region2_interconnect1_location}-${var.vpc_name}-${var.region2}-${local.suffix3}" project = var.interconnect_project_id @@ -92,7 +92,7 @@ module "interconnect_attachment1_region2" { module "interconnect_attachment2_region2" { source = "terraform-google-modules/cloud-router/google//modules/interconnect_attachment" - version = "~> 4.0" + version = "~> 6.0" name = "vl-${var.region2_interconnect2_onprem_dc}-${var.region2_interconnect2_location}-${var.vpc_name}-${var.region2}-${local.suffix4}" project = var.interconnect_project_id diff --git a/3-networks-dual-svpc/modules/restricted_shared_vpc/firewall.tf b/3-networks-dual-svpc/modules/restricted_shared_vpc/firewall.tf index a74132d0e8..53ee7c453b 100644 --- a/3-networks-dual-svpc/modules/restricted_shared_vpc/firewall.tf +++ b/3-networks-dual-svpc/modules/restricted_shared_vpc/firewall.tf @@ -20,7 +20,7 @@ *****************************************/ module "firewall_rules" { source = "terraform-google-modules/network/google//modules/network-firewall-policy" - version = "~> 8.0" + version = "~> 9.0" project_id = var.project_id policy_name = "fp-${var.environment_code}-dual-svpc-restricted-firewalls" description = "Firewall rules for restricted dual shared vpc: ${module.main.network_name}." diff --git a/3-networks-dual-svpc/modules/restricted_shared_vpc/main.tf b/3-networks-dual-svpc/modules/restricted_shared_vpc/main.tf index a37a4dea18..dfdf7cd503 100644 --- a/3-networks-dual-svpc/modules/restricted_shared_vpc/main.tf +++ b/3-networks-dual-svpc/modules/restricted_shared_vpc/main.tf @@ -26,7 +26,7 @@ locals { module "main" { source = "terraform-google-modules/network/google" - version = "~> 8.0" + version = "~> 9.0" project_id = var.project_id network_name = local.network_name @@ -96,7 +96,7 @@ resource "google_service_networking_connection" "private_vpc_connection" { module "region1_router1" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 6.0" name = "cr-${local.vpc_name}-${var.default_region1}-cr5" project = var.project_id @@ -111,7 +111,7 @@ module "region1_router1" { module "region1_router2" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 6.0" name = "cr-${local.vpc_name}-${var.default_region1}-cr6" project = var.project_id @@ -126,7 +126,7 @@ module "region1_router2" { module "region2_router1" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 6.0" name = "cr-${local.vpc_name}-${var.default_region2}-cr7" project = var.project_id @@ -141,7 +141,7 @@ module "region2_router1" { module "region2_router2" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 6.0" name = "cr-${local.vpc_name}-${var.default_region2}-cr8" project = var.project_id diff --git a/3-networks-dual-svpc/modules/restricted_shared_vpc/private_service_connect.tf b/3-networks-dual-svpc/modules/restricted_shared_vpc/private_service_connect.tf index 9bfc9f738e..f5b6beebac 100644 --- a/3-networks-dual-svpc/modules/restricted_shared_vpc/private_service_connect.tf +++ b/3-networks-dual-svpc/modules/restricted_shared_vpc/private_service_connect.tf @@ -17,7 +17,7 @@ module "private_service_connect" { source = "terraform-google-modules/network/google//modules/private-service-connect" - version = "~> 7.0" + version = "~> 9.0" project_id = var.project_id dns_code = "dz-${var.environment_code}-shared-restricted" diff --git a/3-networks-dual-svpc/modules/restricted_shared_vpc/service_control.tf b/3-networks-dual-svpc/modules/restricted_shared_vpc/service_control.tf index b7cee7eef5..de7a4004cd 100644 --- a/3-networks-dual-svpc/modules/restricted_shared_vpc/service_control.tf +++ b/3-networks-dual-svpc/modules/restricted_shared_vpc/service_control.tf @@ -26,7 +26,7 @@ resource "random_id" "random_access_level_suffix" { module "access_level_members" { source = "terraform-google-modules/vpc-service-controls/google//modules/access_level" - version = "~> 4.0" + version = "~> 5.0" description = "${local.prefix} Access Level" policy = var.access_context_manager_policy_id @@ -61,7 +61,7 @@ resource "time_sleep" "wait_vpc_sc_propagation" { module "regular_service_perimeter" { source = "terraform-google-modules/vpc-service-controls/google//modules/regular_service_perimeter" - version = "~> 4.0" + version = "~> 5.0" policy = var.access_context_manager_policy_id perimeter_name = local.perimeter_name diff --git a/3-networks-dual-svpc/modules/vpn-ha/main.tf b/3-networks-dual-svpc/modules/vpn-ha/main.tf index 2b962f6255..0923d928b5 100755 --- a/3-networks-dual-svpc/modules/vpn-ha/main.tf +++ b/3-networks-dual-svpc/modules/vpn-ha/main.tf @@ -30,7 +30,7 @@ data "google_secret_manager_secret_version" "psk" { module "vpn_ha_region1_router1" { source = "terraform-google-modules/vpn/google//modules/vpn_ha" - version = "~> 2.3" + version = "~> 3.0" project_id = var.project_id region = var.default_region1 @@ -78,7 +78,7 @@ module "vpn_ha_region1_router1" { module "vpn_ha_region1_router2" { source = "terraform-google-modules/vpn/google//modules/vpn_ha" - version = "~> 2.3" + version = "~> 3.0" project_id = var.project_id region = var.default_region1 @@ -126,7 +126,7 @@ module "vpn_ha_region1_router2" { module "vpn_ha_region2_router1" { source = "terraform-google-modules/vpn/google//modules/vpn_ha" - version = "~> 2.3" + version = "~> 3.0" project_id = var.project_id region = var.default_region2 @@ -174,7 +174,7 @@ module "vpn_ha_region2_router1" { module "vpn_ha_region2_router2" { source = "terraform-google-modules/vpn/google//modules/vpn_ha" - version = "~> 2.3" + version = "~> 3.0" project_id = var.project_id region = var.default_region2 diff --git a/3-networks-hub-and-spoke/envs/shared/dns-hub.tf b/3-networks-hub-and-spoke/envs/shared/dns-hub.tf index c377e4f7f6..081205b493 100644 --- a/3-networks-hub-and-spoke/envs/shared/dns-hub.tf +++ b/3-networks-hub-and-spoke/envs/shared/dns-hub.tf @@ -20,7 +20,7 @@ module "dns_hub_vpc" { source = "terraform-google-modules/network/google" - version = "~> 8.0" + version = "~> 9.0" project_id = local.dns_hub_project_id network_name = "vpc-c-dns-hub" @@ -101,7 +101,7 @@ module "dns-forwarding-zone" { module "dns_hub_region1_router1" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 6.0" name = "cr-c-dns-hub-${local.default_region1}-cr1" project = local.dns_hub_project_id @@ -115,7 +115,7 @@ module "dns_hub_region1_router1" { module "dns_hub_region1_router2" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 6.0" name = "cr-c-dns-hub-${local.default_region1}-cr2" project = local.dns_hub_project_id @@ -129,7 +129,7 @@ module "dns_hub_region1_router2" { module "dns_hub_region2_router1" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 6.0" name = "cr-c-dns-hub-${local.default_region2}-cr3" project = local.dns_hub_project_id @@ -143,7 +143,7 @@ module "dns_hub_region2_router1" { module "dns_hub_region2_router2" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 6.0" name = "cr-c-dns-hub-${local.default_region2}-cr4" project = local.dns_hub_project_id diff --git a/3-networks-hub-and-spoke/modules/base_shared_vpc/firewall.tf b/3-networks-hub-and-spoke/modules/base_shared_vpc/firewall.tf index e288c832ff..0386b9a978 100644 --- a/3-networks-hub-and-spoke/modules/base_shared_vpc/firewall.tf +++ b/3-networks-hub-and-spoke/modules/base_shared_vpc/firewall.tf @@ -19,7 +19,7 @@ *****************************************/ module "firewall_rules" { source = "terraform-google-modules/network/google//modules/network-firewall-policy" - version = "~> 8.0" + version = "~> 9.0" project_id = var.project_id policy_name = "fp-${var.environment_code}-hub-and-spoke-base-firewalls" description = "Firewall rules for base hub and spoke shared vpc: ${module.main.network_name}." diff --git a/3-networks-hub-and-spoke/modules/base_shared_vpc/main.tf b/3-networks-hub-and-spoke/modules/base_shared_vpc/main.tf index cfb65759ee..eed177f9fc 100644 --- a/3-networks-hub-and-spoke/modules/base_shared_vpc/main.tf +++ b/3-networks-hub-and-spoke/modules/base_shared_vpc/main.tf @@ -27,7 +27,7 @@ locals { module "main" { source = "terraform-google-modules/network/google" - version = "~> 8.0" + version = "~> 9.0" project_id = var.project_id network_name = local.network_name @@ -74,7 +74,7 @@ data "google_compute_network" "vpc_base_net_hub" { module "peering" { source = "terraform-google-modules/network/google//modules/network-peering" - version = "~> 7.0" + version = "~> 9.0" count = var.mode == "spoke" ? 1 : 0 prefix = "np" @@ -116,7 +116,7 @@ resource "google_service_networking_connection" "private_vpc_connection" { module "region1_router1" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 6.0" count = var.mode != "spoke" ? 1 : 0 name = "cr-${local.vpc_name}-${var.default_region1}-cr1" @@ -132,7 +132,7 @@ module "region1_router1" { module "region1_router2" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 6.0" count = var.mode != "spoke" ? 1 : 0 name = "cr-${local.vpc_name}-${var.default_region1}-cr2" @@ -148,7 +148,7 @@ module "region1_router2" { module "region2_router1" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 6.0" count = var.mode != "spoke" ? 1 : 0 name = "cr-${local.vpc_name}-${var.default_region2}-cr3" @@ -164,7 +164,7 @@ module "region2_router1" { module "region2_router2" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 6.0" count = var.mode != "spoke" ? 1 : 0 name = "cr-${local.vpc_name}-${var.default_region2}-cr4" diff --git a/3-networks-hub-and-spoke/modules/base_shared_vpc/private_service_connect.tf b/3-networks-hub-and-spoke/modules/base_shared_vpc/private_service_connect.tf index 937330cd63..6840b75877 100644 --- a/3-networks-hub-and-spoke/modules/base_shared_vpc/private_service_connect.tf +++ b/3-networks-hub-and-spoke/modules/base_shared_vpc/private_service_connect.tf @@ -17,7 +17,7 @@ module "private_service_connect" { source = "terraform-google-modules/network/google//modules/private-service-connect" - version = "~> 7.0" + version = "~> 9.0" project_id = var.project_id dns_code = "dz-${var.environment_code}-shared-base" diff --git a/3-networks-hub-and-spoke/modules/dedicated_interconnect/main.tf b/3-networks-hub-and-spoke/modules/dedicated_interconnect/main.tf index db99c7045b..90124c1bd8 100644 --- a/3-networks-hub-and-spoke/modules/dedicated_interconnect/main.tf +++ b/3-networks-hub-and-spoke/modules/dedicated_interconnect/main.tf @@ -23,7 +23,7 @@ locals { module "interconnect_attachment1_region1" { source = "terraform-google-modules/cloud-router/google//modules/interconnect_attachment" - version = "~> 4.0" + version = "~> 6.0" name = "vl-${var.region1_interconnect1_onprem_dc}-${var.region1_interconnect1_location}-${var.vpc_name}-${var.region1}-${local.suffix1}" project = var.interconnect_project_id @@ -46,7 +46,7 @@ module "interconnect_attachment1_region1" { module "interconnect_attachment2_region1" { source = "terraform-google-modules/cloud-router/google//modules/interconnect_attachment" - version = "~> 4.0" + version = "~> 6.0" name = "vl-${var.region1_interconnect2_onprem_dc}-${var.region1_interconnect2_location}-${var.vpc_name}-${var.region1}-${local.suffix2}" project = var.interconnect_project_id @@ -69,7 +69,7 @@ module "interconnect_attachment2_region1" { module "interconnect_attachment1_region2" { source = "terraform-google-modules/cloud-router/google//modules/interconnect_attachment" - version = "~> 4.0" + version = "~> 6.0" name = "vl-${var.region2_interconnect1_onprem_dc}-${var.region2_interconnect1_location}-${var.vpc_name}-${var.region2}-${local.suffix3}" project = var.interconnect_project_id @@ -92,7 +92,7 @@ module "interconnect_attachment1_region2" { module "interconnect_attachment2_region2" { source = "terraform-google-modules/cloud-router/google//modules/interconnect_attachment" - version = "~> 4.0" + version = "~> 6.0" name = "vl-${var.region2_interconnect2_onprem_dc}-${var.region2_interconnect2_location}-${var.vpc_name}-${var.region2}-${local.suffix4}" project = var.interconnect_project_id diff --git a/3-networks-hub-and-spoke/modules/restricted_shared_vpc/firewall.tf b/3-networks-hub-and-spoke/modules/restricted_shared_vpc/firewall.tf index 4ccccaff98..77fdff46bc 100644 --- a/3-networks-hub-and-spoke/modules/restricted_shared_vpc/firewall.tf +++ b/3-networks-hub-and-spoke/modules/restricted_shared_vpc/firewall.tf @@ -20,7 +20,7 @@ *****************************************/ module "firewall_rules" { source = "terraform-google-modules/network/google//modules/network-firewall-policy" - version = "~> 8.0" + version = "~> 9.0" project_id = var.project_id policy_name = "fp-${var.environment_code}-hub-and-spoke-restricted-firewalls" description = "Firewall rules for restricted hub and spoke shared vpc: ${module.main.network_name}." diff --git a/3-networks-hub-and-spoke/modules/restricted_shared_vpc/main.tf b/3-networks-hub-and-spoke/modules/restricted_shared_vpc/main.tf index b00723e24a..b81619ea79 100644 --- a/3-networks-hub-and-spoke/modules/restricted_shared_vpc/main.tf +++ b/3-networks-hub-and-spoke/modules/restricted_shared_vpc/main.tf @@ -27,7 +27,7 @@ locals { module "main" { source = "terraform-google-modules/network/google" - version = "~> 8.0" + version = "~> 9.0" project_id = var.project_id network_name = local.network_name @@ -76,7 +76,7 @@ data "google_compute_network" "vpc_restricted_net_hub" { module "peering" { source = "terraform-google-modules/network/google//modules/network-peering" - version = "~> 7.0" + version = "~> 9.0" count = var.mode == "spoke" ? 1 : 0 prefix = "np" @@ -120,7 +120,7 @@ resource "google_service_networking_connection" "private_vpc_connection" { module "region1_router1" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 6.0" count = var.mode != "spoke" ? 1 : 0 name = "cr-${local.vpc_name}-${var.default_region1}-cr5" @@ -136,7 +136,7 @@ module "region1_router1" { module "region1_router2" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 6.0" count = var.mode != "spoke" ? 1 : 0 name = "cr-${local.vpc_name}-${var.default_region1}-cr6" @@ -152,7 +152,7 @@ module "region1_router2" { module "region2_router1" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 6.0" count = var.mode != "spoke" ? 1 : 0 name = "cr-${local.vpc_name}-${var.default_region2}-cr7" @@ -168,7 +168,7 @@ module "region2_router1" { module "region2_router2" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 6.0" count = var.mode != "spoke" ? 1 : 0 name = "cr-${local.vpc_name}-${var.default_region2}-cr8" diff --git a/3-networks-hub-and-spoke/modules/restricted_shared_vpc/private_service_connect.tf b/3-networks-hub-and-spoke/modules/restricted_shared_vpc/private_service_connect.tf index 9bfc9f738e..f5b6beebac 100644 --- a/3-networks-hub-and-spoke/modules/restricted_shared_vpc/private_service_connect.tf +++ b/3-networks-hub-and-spoke/modules/restricted_shared_vpc/private_service_connect.tf @@ -17,7 +17,7 @@ module "private_service_connect" { source = "terraform-google-modules/network/google//modules/private-service-connect" - version = "~> 7.0" + version = "~> 9.0" project_id = var.project_id dns_code = "dz-${var.environment_code}-shared-restricted" diff --git a/3-networks-hub-and-spoke/modules/restricted_shared_vpc/service_control.tf b/3-networks-hub-and-spoke/modules/restricted_shared_vpc/service_control.tf index e95ae8bb26..bcd3dd3ef8 100644 --- a/3-networks-hub-and-spoke/modules/restricted_shared_vpc/service_control.tf +++ b/3-networks-hub-and-spoke/modules/restricted_shared_vpc/service_control.tf @@ -27,7 +27,7 @@ resource "random_id" "random_access_level_suffix" { module "access_level_members" { source = "terraform-google-modules/vpc-service-controls/google//modules/access_level" - version = "~> 4.0" + version = "~> 5.0" description = "${local.prefix} Access Level" policy = var.access_context_manager_policy_id @@ -63,7 +63,7 @@ resource "time_sleep" "wait_vpc_sc_propagation" { module "regular_service_perimeter" { source = "terraform-google-modules/vpc-service-controls/google//modules/regular_service_perimeter" - version = "~> 4.0" + version = "~> 5.0" policy = var.access_context_manager_policy_id perimeter_name = local.perimeter_name diff --git a/3-networks-hub-and-spoke/modules/transitivity/main.tf b/3-networks-hub-and-spoke/modules/transitivity/main.tf index 1014c97c4d..d5451b2fac 100644 --- a/3-networks-hub-and-spoke/modules/transitivity/main.tf +++ b/3-networks-hub-and-spoke/modules/transitivity/main.tf @@ -37,7 +37,7 @@ module "service_account" { module "templates" { source = "terraform-google-modules/vm/google//modules/instance_template" - version = "~> 8.0" + version = "~> 10.0" for_each = toset(var.regions) can_ip_forward = true @@ -65,7 +65,7 @@ module "templates" { module "migs" { source = "terraform-google-modules/vm/google//modules/mig" - version = "~> 8.0" + version = "~> 10.0" for_each = toset(var.regions) project_id = var.project_id diff --git a/3-networks-hub-and-spoke/modules/vpn-ha/main.tf b/3-networks-hub-and-spoke/modules/vpn-ha/main.tf index 9d94673bcb..52f8b7df52 100755 --- a/3-networks-hub-and-spoke/modules/vpn-ha/main.tf +++ b/3-networks-hub-and-spoke/modules/vpn-ha/main.tf @@ -30,7 +30,7 @@ data "google_secret_manager_secret_version" "psk" { module "vpn_ha_region1_router1" { source = "terraform-google-modules/vpn/google//modules/vpn_ha" - version = "~> 2.3" + version = "~> 3.0" project_id = var.project_id region = var.default_region1 @@ -78,7 +78,7 @@ module "vpn_ha_region1_router1" { module "vpn_ha_region1_router2" { source = "terraform-google-modules/vpn/google//modules/vpn_ha" - version = "~> 2.3" + version = "~> 3.0" project_id = var.project_id region = var.default_region1 @@ -126,7 +126,7 @@ module "vpn_ha_region1_router2" { module "vpn_ha_region2_router1" { source = "terraform-google-modules/vpn/google//modules/vpn_ha" - version = "~> 2.3" + version = "~> 3.0" project_id = var.project_id region = var.default_region2 @@ -174,7 +174,7 @@ module "vpn_ha_region2_router1" { module "vpn_ha_region2_router2" { source = "terraform-google-modules/vpn/google//modules/vpn_ha" - version = "~> 2.3" + version = "~> 3.0" project_id = var.project_id region = var.default_region2 diff --git a/4-projects/modules/base_env/example_peering_project.tf b/4-projects/modules/base_env/example_peering_project.tf index 0ca5b13549..e0e387abfb 100644 --- a/4-projects/modules/base_env/example_peering_project.tf +++ b/4-projects/modules/base_env/example_peering_project.tf @@ -74,7 +74,7 @@ module "peering_project" { module "peering_network" { source = "terraform-google-modules/network/google" - version = "~> 8.0" + version = "~> 9.0" project_id = module.peering_project.project_id network_name = "vpc-${local.env_code}-peering-base" @@ -110,7 +110,7 @@ resource "google_dns_policy" "default_policy" { module "peering" { source = "terraform-google-modules/network/google//modules/network-peering" - version = "~> 7.0" + version = "~> 9.0" prefix = "${var.business_code}-${local.env_code}" local_network = module.peering_network.network_self_link @@ -123,7 +123,7 @@ module "peering" { *****************************************/ module "firewall_rules" { source = "terraform-google-modules/network/google//modules/network-firewall-policy" - version = "~> 8.0" + version = "~> 9.0" project_id = module.peering_project.project_id policy_name = "fp-${local.env_code}-peering-project-firewalls" description = "Firewall rules for Peering Network: ${module.peering_network.network_name}." diff --git a/4-projects/modules/base_env/example_storage_cmek.tf b/4-projects/modules/base_env/example_storage_cmek.tf index 9e023228be..5e38e9d34a 100644 --- a/4-projects/modules/base_env/example_storage_cmek.tf +++ b/4-projects/modules/base_env/example_storage_cmek.tf @@ -65,7 +65,7 @@ resource "random_string" "bucket_name" { module "gcs_buckets" { source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket" - version = "~> 4.0" + version = "~> 5.0" project_id = module.base_shared_vpc_project.project_id location = var.location_gcs diff --git a/5-app-infra/modules/env_base/main.tf b/5-app-infra/modules/env_base/main.tf index fccb0d6b6e..360a08cdf5 100644 --- a/5-app-infra/modules/env_base/main.tf +++ b/5-app-infra/modules/env_base/main.tf @@ -60,7 +60,7 @@ resource "google_service_account" "compute_engine_service_account" { module "instance_template" { source = "terraform-google-modules/vm/google//modules/instance_template" - version = "~> 8.0" + version = "~> 10.0" machine_type = var.machine_type region = var.region