Merge branch 'master' into maunope/static_routes

GoogleCloudPlatform · Oct 25, 2022 · ec7adc4 · ec7adc4
2 parents 1b19587 + 10fdde0
commit ec7adc4
Show file tree

Hide file tree

Showing 103 changed files with 259 additions and 251 deletions.
diff --git a/blueprints/cloud-operations/adfs/versions.tf b/blueprints/cloud-operations/adfs/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
   }
 }

diff --git a/blueprints/cloud-operations/asset-inventory-feed-remediation/versions.tf b/blueprints/cloud-operations/asset-inventory-feed-remediation/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
   }
 }

diff --git a/blueprints/cloud-operations/dns-fine-grained-iam/versions.tf b/blueprints/cloud-operations/dns-fine-grained-iam/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
   }
 }

diff --git a/blueprints/cloud-operations/dns-shared-vpc/versions.tf b/blueprints/cloud-operations/dns-shared-vpc/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
   }
 }

diff --git a/blueprints/cloud-operations/iam-delegated-role-grants/versions.tf b/blueprints/cloud-operations/iam-delegated-role-grants/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
   }
 }

diff --git a/blueprints/cloud-operations/onprem-sa-key-management/versions.tf b/blueprints/cloud-operations/onprem-sa-key-management/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
   }
 }

diff --git a/blueprints/cloud-operations/packer-image-builder/versions.tf b/blueprints/cloud-operations/packer-image-builder/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
   }
 }

diff --git a/blueprints/cloud-operations/quota-monitoring/versions.tf b/blueprints/cloud-operations/quota-monitoring/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
   }
 }

diff --git a/blueprints/cloud-operations/scheduled-asset-inventory-export-bq/versions.tf b/blueprints/cloud-operations/scheduled-asset-inventory-export-bq/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
   }
 }

diff --git a/blueprints/data-solutions/cmek-via-centralized-kms/versions.tf b/blueprints/data-solutions/cmek-via-centralized-kms/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
   }
 }

diff --git a/blueprints/data-solutions/data-playground/versions.tf b/blueprints/data-solutions/data-playground/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
   }
 }

diff --git a/blueprints/data-solutions/gcs-to-bq-with-least-privileges/versions.tf b/blueprints/data-solutions/gcs-to-bq-with-least-privileges/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
   }
 }

diff --git a/blueprints/factories/net-vpc-firewall-yaml/versions.tf b/blueprints/factories/net-vpc-firewall-yaml/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
   }
 }

diff --git a/blueprints/networking/decentralized-firewall/main.tf b/blueprints/networking/decentralized-firewall/main.tf
@@ -84,7 +84,7 @@ module "dns-api-prod" {
   domain          = "googleapis.com."
   client_networks = [module.vpc-prod.self_link]
   recordsets = {
-    "CNAME *" = { ttl = 300, records = ["private.googleapis.com."] }
+    "CNAME *" = { records = ["private.googleapis.com."] }
   }
 }
 
@@ -96,7 +96,7 @@ module "dns-api-dev" {
   domain          = "googleapis.com."
   client_networks = [module.vpc-dev.self_link]
   recordsets = {
-    "CNAME *" = { ttl = 300, records = ["private.googleapis.com."] }
+    "CNAME *" = { records = ["private.googleapis.com."] }
   }
 }
 

diff --git a/blueprints/networking/decentralized-firewall/versions.tf b/blueprints/networking/decentralized-firewall/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
   }
 }

diff --git a/blueprints/networking/filtering-proxy/versions.tf b/blueprints/networking/filtering-proxy/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
   }
 }

diff --git a/blueprints/networking/hub-and-spoke-peering/versions.tf b/blueprints/networking/hub-and-spoke-peering/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
   }
 }

diff --git a/blueprints/networking/hub-and-spoke-vpn/net-dev.tf b/blueprints/networking/hub-and-spoke-vpn/net-dev.tf
@@ -63,7 +63,7 @@ module "dev-dns-zone" {
   domain          = "dev.example.com."
   client_networks = [module.landing-vpc.self_link]
   recordsets = {
-    "A localhost" = { ttl = 300, records = ["127.0.0.1"] }
-    "A test-r2"   = { ttl = 300, records = [module.dev-r2-vm.internal_ip] }
+    "A localhost" = { records = ["127.0.0.1"] }
+    "A test-r2"   = { records = [module.dev-r2-vm.internal_ip] }
   }
 }
diff --git a/blueprints/networking/hub-and-spoke-vpn/net-landing.tf b/blueprints/networking/hub-and-spoke-vpn/net-landing.tf
@@ -53,7 +53,7 @@ module "landing-dns-zone" {
   domain          = "example.com."
   client_networks = [module.landing-vpc.self_link]
   recordsets = {
-    "A localhost" = { ttl = 300, records = ["127.0.0.1"] }
-    "A test-r1"   = { ttl = 300, records = [module.landing-r1-vm.internal_ip] }
+    "A localhost" = { records = ["127.0.0.1"] }
+    "A test-r1"   = { records = [module.landing-r1-vm.internal_ip] }
   }
 }
diff --git a/blueprints/networking/hub-and-spoke-vpn/net-prod.tf b/blueprints/networking/hub-and-spoke-vpn/net-prod.tf
@@ -63,7 +63,7 @@ module "prod-dns-zone" {
   domain          = "prd.example.com."
   client_networks = [module.landing-vpc.self_link]
   recordsets = {
-    "A localhost" = { ttl = 300, records = ["127.0.0.1"] }
-    "A test-r1"   = { ttl = 300, records = [module.prod-r1-vm.internal_ip] }
+    "A localhost" = { records = ["127.0.0.1"] }
+    "A test-r1"   = { records = [module.prod-r1-vm.internal_ip] }
   }
 }
diff --git a/blueprints/networking/hub-and-spoke-vpn/versions.tf b/blueprints/networking/hub-and-spoke-vpn/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
   }
 }

diff --git a/blueprints/networking/ilb-next-hop/versions.tf b/blueprints/networking/ilb-next-hop/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
   }
 }

diff --git a/blueprints/networking/nginx-reverse-proxy-cluster/versions.tf b/blueprints/networking/nginx-reverse-proxy-cluster/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
   }
 }

diff --git a/blueprints/networking/onprem-google-access-dns/main.tf b/blueprints/networking/onprem-google-access-dns/main.tf
@@ -169,9 +169,9 @@ module "dns-gcp" {
   domain          = "gcp.example.org."
   client_networks = [module.vpc.self_link]
   recordsets = {
-    "A localhost" = { ttl = 300, records = ["127.0.0.1"] }
-    "A test-1"    = { ttl = 300, records = [module.vm-test1.internal_ip] }
-    "A test-2"    = { ttl = 300, records = [module.vm-test2.internal_ip] }
+    "A localhost" = { records = ["127.0.0.1"] }
+    "A test-1"    = { records = [module.vm-test1.internal_ip] }
+    "A test-2"    = { records = [module.vm-test2.internal_ip] }
   }
 }
 
@@ -183,9 +183,9 @@ module "dns-api" {
   domain          = "googleapis.com."
   client_networks = [module.vpc.self_link]
   recordsets = {
-    "CNAME *"      = { ttl = 300, records = ["private.googleapis.com."] }
-    "A private"    = { ttl = 300, records = local.vips.private }
-    "A restricted" = { ttl = 300, records = local.vips.restricted }
+    "CNAME *"      = { records = ["private.googleapis.com."] }
+    "A private"    = { records = local.vips.private }
+    "A restricted" = { records = local.vips.restricted }
   }
 }
 

diff --git a/blueprints/networking/onprem-google-access-dns/versions.tf b/blueprints/networking/onprem-google-access-dns/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
   }
 }

diff --git a/blueprints/networking/private-cloud-function-from-onprem/main.tf b/blueprints/networking/private-cloud-function-from-onprem/main.tf
@@ -218,7 +218,7 @@ module "private-dns-onprem" {
   domain          = "${var.region}-${module.project.project_id}.cloudfunctions.net."
   client_networks = [module.vpc-onprem.self_link]
   recordsets = {
-    "A " = { ttl = 300, records = [module.addresses.psc_addresses[local.psc_name].address] }
+    "A " = { records = [module.addresses.psc_addresses[local.psc_name].address] }
   }
 }
 

diff --git a/blueprints/networking/private-cloud-function-from-onprem/versions.tf b/blueprints/networking/private-cloud-function-from-onprem/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.36.0" # tftest
+      version = ">= 4.40.0" # tftest
     }
   }
 }

diff --git a/blueprints/networking/shared-vpc-gke/main.tf b/blueprints/networking/shared-vpc-gke/main.tf
@@ -157,8 +157,8 @@ module "host-dns" {
   domain          = "example.com."
   client_networks = [module.vpc-shared.self_link]
   recordsets = {
-    "A localhost" = { ttl = 300, records = ["127.0.0.1"] }
-    "A bastion"   = { ttl = 300, records = [module.vm-bastion.internal_ip] }
+    "A localhost" = { records = ["127.0.0.1"] }
+    "A bastion"   = { records = [module.vm-bastion.internal_ip] }
   }
 }