Merge feature branch major release 7.0.0 (#14962) (#1102)

modular-magician · web-flow · commit 16e839f6827b · 2025-08-22T14:38:43.000-07:00
[upstream:13886db603f7165967bc2b7ad28f656af32a5871]

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/alloydb_backup_basic_test/main.tf b/alloydb_backup_basic_test/main.tf
@@ -12,6 +12,8 @@ resource "google_alloydb_cluster" "default" {
   network_config {
     network = data.google_compute_network.default.id
   }
+
+  deletion_protection = false
 }
 
 resource "google_alloydb_instance" "default" {
diff --git a/alloydb_backup_full_test/main.tf b/alloydb_backup_full_test/main.tf
@@ -17,6 +17,8 @@ resource "google_alloydb_cluster" "default" {
   network_config {
     network = data.google_compute_network.default.id
   }
+
+  deletion_protection = false
 }
 
 resource "google_alloydb_instance" "default" {
diff --git a/alloydb_cluster_after_upgrade/main.tf b/alloydb_cluster_after_upgrade/main.tf
@@ -20,6 +20,8 @@ resource "google_alloydb_cluster" "default" {
   initial_user {
     password = "alloydb-cluster-${local.name_suffix}"
   }
+
+  deletion_protection = false
 }
 
 data "google_compute_network" "default" {
diff --git a/alloydb_cluster_basic/main.tf b/alloydb_cluster_basic/main.tf
@@ -4,6 +4,8 @@ resource "google_alloydb_cluster" "default" {
   network_config {
     network = google_compute_network.default.id
   }
+
+  deletion_protection = false
 }
 
 data "google_project" "project" {}
diff --git a/alloydb_cluster_before_upgrade/main.tf b/alloydb_cluster_before_upgrade/main.tf
@@ -20,6 +20,8 @@ resource "google_alloydb_cluster" "default" {
   initial_user {
     password = "alloydb-cluster-${local.name_suffix}"
   }
+
+  deletion_protection = false
 }
 
 data "google_compute_network" "default" {
diff --git a/alloydb_cluster_full/main.tf b/alloydb_cluster_full/main.tf
@@ -44,6 +44,8 @@ resource "google_alloydb_cluster" "full" {
   labels = {
     test = "alloydb-cluster-full-${local.name_suffix}"
   }
+
+  deletion_protection = false
 }
 
 data "google_project" "project" {}
diff --git a/alloydb_instance_basic_test/main.tf b/alloydb_instance_basic_test/main.tf
@@ -17,6 +17,8 @@ resource "google_alloydb_cluster" "default" {
   initial_user {
     password = "alloydb-cluster-${local.name_suffix}"
   }
+
+  deletion_protection = false
 }
 
 data "google_project" "project" {}
diff --git a/alloydb_instance_psc_test/main.tf b/alloydb_instance_psc_test/main.tf
@@ -18,4 +18,6 @@ resource "google_alloydb_cluster" "default" {
   psc_config {
     psc_enabled = true
   }
+
+  deletion_protection = false
 }
diff --git a/alloydb_secondary_cluster_basic_test/main.tf b/alloydb_secondary_cluster_basic_test/main.tf
@@ -4,6 +4,8 @@ resource "google_alloydb_cluster" "primary" {
   network_config {
     network = data.google_compute_network.default.id
   }
+
+  deletion_protection = false
 }
 
 resource "google_alloydb_instance" "primary" {
@@ -32,6 +34,7 @@ resource "google_alloydb_cluster" "secondary" {
     primary_cluster_name = google_alloydb_cluster.primary.name
   }
 
+  deletion_protection = false
   depends_on = [google_alloydb_instance.primary]
 }
 
diff --git a/alloydb_secondary_instance_basic_test/main.tf b/alloydb_secondary_instance_basic_test/main.tf
@@ -4,6 +4,8 @@ resource "google_alloydb_cluster" "primary" {
   network_config {
     network = data.google_compute_network.default.id
   }
+
+  deletion_protection = false
 }
 
 resource "google_alloydb_instance" "primary" {
@@ -34,6 +36,7 @@ resource "google_alloydb_cluster" "secondary" {
 
   deletion_policy = "FORCE"
 
+  deletion_protection = false
   depends_on = [google_alloydb_instance.primary]
 }
 
diff --git a/alloydb_user_builtin_test/main.tf b/alloydb_user_builtin_test/main.tf
@@ -13,6 +13,8 @@ resource "google_alloydb_cluster" "default" {
   initial_user {
     password = "cluster_secret-${local.name_suffix}"
   }
+
+  deletion_protection = false
 }
 
 data "google_project" "project" {}
diff --git a/alloydb_user_iam_test/main.tf b/alloydb_user_iam_test/main.tf
@@ -13,6 +13,8 @@ resource "google_alloydb_cluster" "default" {
   initial_user {
     password = "cluster_secret-${local.name_suffix}"
   }
+
+  deletion_protection = false
 }
 
 data "google_project" "project" {}
diff --git a/cloudbuild_bitbucket_server_config_peered_network/main.tf b/cloudbuild_bitbucket_server_config_peered_network/main.tf
@@ -2,7 +2,6 @@ data "google_project" "project" {}
 
 resource "google_project_service" "servicenetworking" {
   service = "servicenetworking.googleapis.com"
-  disable_on_destroy = false
 }
 
 resource "google_compute_network" "vpc_network" {
diff --git a/compute_packet_mirroring_full/main.tf b/compute_packet_mirroring_full/main.tf
@@ -68,6 +68,9 @@ resource "google_compute_packet_mirroring" "foobar" {
     instances {
       url = google_compute_instance.mirror.id
     }
+    subnetworks {
+      url = google_compute_subnetwork.default.id
+      }
   }
   filter {
     ip_protocols = ["tcp"]
diff --git a/database_migration_service_connection_profile_existing_alloydb/main.tf b/database_migration_service_connection_profile_existing_alloydb/main.tf
@@ -13,6 +13,8 @@ resource "google_alloydb_cluster" "destination_alloydb" {
     user     = "destination-alloydb-${local.name_suffix}"
     password = "destination-alloydb-${local.name_suffix}"
   }
+
+  deletion_protection = false
 }
 
 resource "google_alloydb_instance" "destination_alloydb_primary" {
diff --git a/database_migration_service_migration_job_postgres_to_alloydb/main.tf b/database_migration_service_migration_job_postgres_to_alloydb/main.tf
@@ -62,6 +62,8 @@ resource "google_alloydb_cluster" "destination_alloydb" {
     user     = "destination-alloydb-${local.name_suffix}"
     password = "destination-alloydb-${local.name_suffix}"
   }
+
+  deletion_protection = false
 }
 
 resource "google_alloydb_instance" "destination_alloydb_primary" {
diff --git a/memorystore_instance_full/main.tf b/memorystore_instance_full/main.tf
@@ -14,7 +14,6 @@ resource "google_memorystore_instance" "instance-full" {
   engine_configs = {     
     maxmemory-policy           = "volatile-ttl"
   }
-  allow_fewer_zones_deployment = true
   zone_distribution_config {
     mode                       = "SINGLE_ZONE"
     zone                       = "us-central1-b"
diff --git a/redis_cluster_aof/main.tf b/redis_cluster_aof/main.tf
@@ -13,7 +13,6 @@ resource "google_redis_cluster" "cluster-aof" {
     maxmemory-policy	= "volatile-ttl"
   }
   deletion_protection_enabled = false
-  allow_fewer_zones_deployment = true
   zone_distribution_config {
     mode = "MULTI_ZONE"
   }
diff --git a/secure_source_manager_instance_private_trusted_cert/main.tf b/secure_source_manager_instance_private_trusted_cert/main.tf
@@ -5,4 +5,5 @@ resource "google_secure_source_manager_instance" "default" {
   private_config {
     is_private = true
   }
+  deletion_policy = "DELETE"
 }
diff --git a/vertex_ai_endpoint_private_service_connect/main.tf b/vertex_ai_endpoint_private_service_connect/main.tf
@@ -12,7 +12,6 @@ resource "google_vertex_ai_endpoint" "endpoint" {
     project_allowlist = [
       "${data.google_project.project.project_id}"
     ]
-    enable_secure_private_service_connect = false
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@ resource "google_alloydb_cluster" "default" {`
`12`	`12`	`network_config {`
`13`	`13`	`network = data.google_compute_network.default.id`
`14`	`14`	`}`
	`15`	`+`
	`16`	`+ deletion_protection = false`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`resource "google_alloydb_instance" "default" {`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@ resource "google_alloydb_cluster" "default" {`
`17`	`17`	`network_config {`
`18`	`18`	`network = data.google_compute_network.default.id`
`19`	`19`	`}`
	`20`	`+`
	`21`	`+ deletion_protection = false`
`20`	`22`	`}`
`21`	`23`
`22`	`24`	`resource "google_alloydb_instance" "default" {`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ resource "google_alloydb_cluster" "default" {`
`20`	`20`	`initial_user {`
`21`	`21`	`password = "alloydb-cluster-${local.name_suffix}"`
`22`	`22`	`}`
	`23`	`+`
	`24`	`+ deletion_protection = false`
`23`	`25`	`}`
`24`	`26`
`25`	`27`	`data "google_compute_network" "default" {`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@ resource "google_alloydb_cluster" "default" {`
`4`	`4`	`network_config {`
`5`	`5`	`network = google_compute_network.default.id`
`6`	`6`	`}`
	`7`	`+`
	`8`	`+ deletion_protection = false`
`7`	`9`	`}`
`8`	`10`
`9`	`11`	`data "google_project" "project" {}`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,8 @@ resource "google_alloydb_cluster" "full" {`
`44`	`44`	`labels = {`
`45`	`45`	`test = "alloydb-cluster-full-${local.name_suffix}"`
`46`	`46`	`}`
	`47`	`+`
	`48`	`+ deletion_protection = false`
`47`	`49`	`}`
`48`	`50`
`49`	`51`	`data "google_project" "project" {}`
Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,6 @@ resource "google_alloydb_cluster" "default" {`
`18`	`18`	`psc_config {`
`19`	`19`	`psc_enabled = true`
`20`	`20`	`}`
	`21`	`+`
	`22`	`+ deletion_protection = false`
`21`	`23`	`}`