Merge pull request #11521 from c2thorn/main (#771)

Merge 6.0 branch into main [upstream:33e0634155d56642a6c64174a611267eaaedf084] Signed-off-by: Modular Magician <[email protected]>
terraform-google-modules · Aug 21, 2024 · 6862c43 · 6862c43
1 parent e887584
commit 6862c43
Show file tree

Hide file tree

Showing 28 changed files with 51 additions and 20 deletions.
diff --git a/alloydb_backup_basic_test/main.tf b/alloydb_backup_basic_test/main.tf
@@ -9,7 +9,9 @@ resource "google_alloydb_backup" "default" {
 resource "google_alloydb_cluster" "default" {
   cluster_id = "alloydb-cluster-${local.name_suffix}"
   location   = "us-central1"
-  network    = data.google_compute_network.default.id
+  network_config {
+    network = data.google_compute_network.default.id
+  }
 }
 
 resource "google_alloydb_instance" "default" {

diff --git a/alloydb_backup_full_test/main.tf b/alloydb_backup_full_test/main.tf
@@ -14,7 +14,9 @@ resource "google_alloydb_backup" "default" {
 resource "google_alloydb_cluster" "default" {
   cluster_id = "alloydb-cluster-${local.name_suffix}"
   location   = "us-central1"
-  network    = data.google_compute_network.default.id
+  network_config {
+    network = data.google_compute_network.default.id
+  }
 }
 
 resource "google_alloydb_instance" "default" {

diff --git a/alloydb_instance_basic_test/main.tf b/alloydb_instance_basic_test/main.tf
@@ -11,8 +11,9 @@ resource "google_alloydb_instance" "default" {
 resource "google_alloydb_cluster" "default" {
   cluster_id = "alloydb-cluster-${local.name_suffix}"
   location   = "us-central1"
-  network    = data.google_compute_network.default.id
-
+  network_config {
+    network = data.google_compute_network.default.id
+  }
   initial_user {
     password = "alloydb-cluster-${local.name_suffix}"
   }

diff --git a/alloydb_secondary_cluster_basic_test/main.tf b/alloydb_secondary_cluster_basic_test/main.tf
@@ -1,7 +1,9 @@
 resource "google_alloydb_cluster" "primary" {
   cluster_id = "alloydb-primary-cluster-${local.name_suffix}"
   location   = "us-central1"
-  network    = data.google_compute_network.default.id
+  network_config {
+    network = data.google_compute_network.default.id
+  }
 }
 
 resource "google_alloydb_instance" "primary" {
@@ -17,7 +19,9 @@ resource "google_alloydb_instance" "primary" {
 resource "google_alloydb_cluster" "secondary" {
   cluster_id   = "alloydb-secondary-cluster-${local.name_suffix}"
   location     = "us-east1"
-  network      = data.google_compute_network.default.id
+  network_config {
+    network = data.google_compute_network.default.id
+  }
   cluster_type = "SECONDARY"
 
   continuous_backup_config {

diff --git a/alloydb_secondary_instance_basic_test/main.tf b/alloydb_secondary_instance_basic_test/main.tf
@@ -1,7 +1,9 @@
 resource "google_alloydb_cluster" "primary" {
   cluster_id = "alloydb-primary-cluster-${local.name_suffix}"
   location   = "us-central1"
-  network    = data.google_compute_network.default.id
+  network_config {
+    network = data.google_compute_network.default.id
+  }
 }
 
 resource "google_alloydb_instance" "primary" {
@@ -17,7 +19,9 @@ resource "google_alloydb_instance" "primary" {
 resource "google_alloydb_cluster" "secondary" {
   cluster_id   = "alloydb-secondary-cluster-${local.name_suffix}"
   location     = "us-east1"
-  network      = data.google_compute_network.default.id
+  network_config {
+    network = data.google_compute_network.default.id
+  }
   cluster_type = "SECONDARY"
 
   continuous_backup_config {

diff --git a/alloydb_user_builtin_test/main.tf b/alloydb_user_builtin_test/main.tf
@@ -7,8 +7,9 @@ resource "google_alloydb_instance" "default" {
 resource "google_alloydb_cluster" "default" {
   cluster_id = "alloydb-cluster-${local.name_suffix}"
   location   = "us-central1"
-  network    = data.google_compute_network.default.id
-
+  network_config {
+    network = data.google_compute_network.default.id
+  }
   initial_user {
     password = "cluster_secret-${local.name_suffix}"
   }

diff --git a/alloydb_user_iam_test/main.tf b/alloydb_user_iam_test/main.tf
@@ -7,8 +7,9 @@ resource "google_alloydb_instance" "default" {
 resource "google_alloydb_cluster" "default" {
   cluster_id = "alloydb-cluster-${local.name_suffix}"
   location   = "us-central1"
-  network    = data.google_compute_network.default.id
-
+  network_config {
+    network = data.google_compute_network.default.id
+  }
   initial_user {
     password = "cluster_secret-${local.name_suffix}"
   }

diff --git a/backend_service_external_iap/main.tf b/backend_service_external_iap/main.tf
@@ -3,6 +3,7 @@ resource "google_compute_backend_service" "default" {
   protocol              = "HTTP"
   load_balancing_scheme = "EXTERNAL"
   iap {
+    enabled              = true
     oauth2_client_id     = "abc"
     oauth2_client_secret = "xyz"
   }

diff --git a/cloudrunv2_job_basic/main.tf b/cloudrunv2_job_basic/main.tf
@@ -1,6 +1,7 @@
 resource "google_cloud_run_v2_job" "default" {
   name     = "cloudrun-job-${local.name_suffix}"
   location = "us-central1"
+  deletion_protection = false
 
   template {
     template {

diff --git a/cloudrunv2_job_directvpc/main.tf b/cloudrunv2_job_directvpc/main.tf
@@ -1,6 +1,7 @@
 resource "google_cloud_run_v2_job" "default" {
   name     = "cloudrun-job-${local.name_suffix}"
   location = "us-central1"
+  deletion_protection = false
   launch_stage = "GA"
   template {
     template{

diff --git a/cloudrunv2_job_limits/main.tf b/cloudrunv2_job_limits/main.tf
@@ -1,6 +1,7 @@
 resource "google_cloud_run_v2_job" "default" {
   name     = "cloudrun-job-${local.name_suffix}"
   location = "us-central1"
+  deletion_protection = false
 
   template {
     template {

diff --git a/cloudrunv2_job_secret/main.tf b/cloudrunv2_job_secret/main.tf
@@ -1,6 +1,7 @@
 resource "google_cloud_run_v2_job" "default" {
   name     = "cloudrun-job-${local.name_suffix}"
   location = "us-central1"
+  deletion_protection = false
 
   template {
     template {

diff --git a/cloudrunv2_job_sql/main.tf b/cloudrunv2_job_sql/main.tf
@@ -1,7 +1,7 @@
 resource "google_cloud_run_v2_job" "default" {
   name     = "cloudrun-job-${local.name_suffix}"
   location = "us-central1"
-
+  deletion_protection = false
   template {
     template{
       volumes {

diff --git a/cloudrunv2_job_vpcaccess/main.tf b/cloudrunv2_job_vpcaccess/main.tf
@@ -1,6 +1,7 @@
 resource "google_cloud_run_v2_job" "default" {
   name     = "cloudrun-job-${local.name_suffix}"
   location = "us-central1"
+  deletion_protection = false
 
   template {
     template{

diff --git a/cloudrunv2_service_basic/main.tf b/cloudrunv2_service_basic/main.tf
@@ -1,6 +1,7 @@
 resource "google_cloud_run_v2_service" "default" {
   name     = "cloudrun-service-${local.name_suffix}"
   location = "us-central1"
+  deletion_protection = false
   ingress = "INGRESS_TRAFFIC_ALL"
 
   template {

diff --git a/cloudrunv2_service_directvpc/main.tf b/cloudrunv2_service_directvpc/main.tf
@@ -1,6 +1,7 @@
 resource "google_cloud_run_v2_service" "default" {
   name     = "cloudrun-service-${local.name_suffix}"
   location = "us-central1"
+  deletion_protection = false
   launch_stage = "GA"
   template {
     containers {

diff --git a/cloudrunv2_service_limits/main.tf b/cloudrunv2_service_limits/main.tf
@@ -1,6 +1,7 @@
 resource "google_cloud_run_v2_service" "default" {
   name     = "cloudrun-service-${local.name_suffix}"
   location = "us-central1"
+  deletion_protection = false
   ingress = "INGRESS_TRAFFIC_ALL"
 
   template {

diff --git a/cloudrunv2_service_mount_gcs/main.tf b/cloudrunv2_service_mount_gcs/main.tf
@@ -2,6 +2,7 @@ resource "google_cloud_run_v2_service" "default" {
   name     = "cloudrun-service-${local.name_suffix}"
 
   location     = "us-central1"
+  deletion_protection = false
   launch_stage = "BETA"
 
   template {

diff --git a/cloudrunv2_service_mount_nfs/main.tf b/cloudrunv2_service_mount_nfs/main.tf
@@ -2,6 +2,7 @@ resource "google_cloud_run_v2_service" "default" {
   name     = "cloudrun-service-${local.name_suffix}"
 
   location     = "us-central1"
+  deletion_protection = false
   ingress      = "INGRESS_TRAFFIC_ALL"
   launch_stage = "BETA"
 

diff --git a/cloudrunv2_service_probes/main.tf b/cloudrunv2_service_probes/main.tf
@@ -1,6 +1,7 @@
 resource "google_cloud_run_v2_service" "default" {
   name     = "cloudrun-service-${local.name_suffix}"
   location = "us-central1"
+  deletion_protection = false
 
   template {
     containers {

diff --git a/cloudrunv2_service_secret/main.tf b/cloudrunv2_service_secret/main.tf
@@ -1,6 +1,7 @@
 resource "google_cloud_run_v2_service" "default" {
   name     = "cloudrun-service-${local.name_suffix}"
   location = "us-central1"
+  deletion_protection = false
   ingress = "INGRESS_TRAFFIC_ALL"
 
   template {

diff --git a/cloudrunv2_service_sql/main.tf b/cloudrunv2_service_sql/main.tf
@@ -1,6 +1,7 @@
 resource "google_cloud_run_v2_service" "default" {
   name     = "cloudrun-service-${local.name_suffix}"
   location = "us-central1"
+  deletion_protection = false
   ingress = "INGRESS_TRAFFIC_ALL"
 
   template {

diff --git a/cloudrunv2_service_vpcaccess/main.tf b/cloudrunv2_service_vpcaccess/main.tf
@@ -1,6 +1,7 @@
 resource "google_cloud_run_v2_service" "default" {
   name     = "cloudrun-service-${local.name_suffix}"
   location = "us-central1"
+  deletion_protection = false
 
   template {
     containers {

diff --git a/redis_cluster_ha/main.tf b/redis_cluster_ha/main.tf
@@ -12,16 +12,14 @@ resource "google_redis_cluster" "cluster-ha" {
   redis_configs = {
     maxmemory-policy	= "volatile-ttl"
   }
+  deletion_protection_enabled = false
+
   zone_distribution_config {
     mode = "MULTI_ZONE"
   }
   depends_on = [
     google_network_connectivity_service_connection_policy.default
   ]
-
-  lifecycle {
-    prevent_destroy = false
-  }
 }
 
 resource "google_network_connectivity_service_connection_policy" "default" {

diff --git a/redis_cluster_ha_single_zone/main.tf b/redis_cluster_ha_single_zone/main.tf
@@ -9,13 +9,11 @@ resource "google_redis_cluster" "cluster-ha-single-zone" {
     mode = "SINGLE_ZONE"
     zone = "us-central1-f"
   }
+  deletion_protection_enabled = false
   depends_on = [
     google_network_connectivity_service_connection_policy.default
   ]
 
-  lifecycle {
-    prevent_destroy = false
-  }
 }
 
 resource "google_network_connectivity_service_connection_policy" "default" {

diff --git a/region_backend_service_external_iap/main.tf b/region_backend_service_external_iap/main.tf
@@ -4,6 +4,7 @@ resource "google_compute_region_backend_service" "default" {
   protocol              = "HTTP"
   load_balancing_scheme = "EXTERNAL"
   iap {
+    enabled              = true
     oauth2_client_id     = "abc"
     oauth2_client_secret = "xyz"
   }

diff --git a/vpc_access_connector/main.tf b/vpc_access_connector/main.tf
@@ -2,4 +2,6 @@ resource "google_vpc_access_connector" "connector" {
   name          = "vpc-con-${local.name_suffix}"
   ip_cidr_range = "10.8.0.0/28"
   network       = "default-${local.name_suffix}"
+  min_instances = 2
+  max_instances = 3
 }
diff --git a/vpc_access_connector_shared_vpc/main.tf b/vpc_access_connector_shared_vpc/main.tf
@@ -4,6 +4,8 @@ resource "google_vpc_access_connector" "connector" {
     name = google_compute_subnetwork.custom_test.name
   }
   machine_type = "e2-standard-4"
+  min_instances = 2
+  max_instances = 3
 }
 
 resource "google_compute_subnetwork" "custom_test" {