Merge branch 'GoogleCloudPlatform:main' into add-networksecurity-urlL…

…ists

.ci/containers/membership-checker/membership.go

@@ -30,10 +30,8 @@ var (
 		"NickElliot",
 	}
 
-	// This is for reviewers who are "on vacation" will not receive new review assignments but will still receive re-requests for assigned PRs.
-	onVacationReviewers = []string{
-		"zli82016",
-	}
+	// This is for reviewers who are "on vacation": will not receive new review assignments but will still receive re-requests for assigned PRs.
+	onVacationReviewers = []string{}
 )
 
 // Check if a user is team member to not request a random reviewer

.ci/containers/membership-checker/utils_test.go

@@ -24,6 +24,11 @@ func TestRemovesList(t *testing.T) {
 			Removal:  []string{"a", "A", "d"},
 			Expected: []string{"b", "c", "B"},
 		},
+		"Remove none": {
+			Original: []string{"a", "b", "c", "A", "B"},
+			Removal:  []string{},
+			Expected: []string{"a", "b", "c", "A", "B"},
+		},
 		"Remove all": {
 			Original: []string{"a", "b", "c", "A", "B"},
 			Removal:  []string{"a", "b", "c", "A", "B"},

mmv1/products/alloydb/Cluster.yaml

@@ -104,7 +104,6 @@
         The database engine major version. This is an output-only field and it's populated at the Cluster creation time. This field cannot be changed after cluster creation.
     - !ruby/object:Api::Type::NestedObject
       name: "initialUser"
-      immutable: true
       description: |
         Initial user to setup during cluster creation.
       custom_flatten: "templates/terraform/custom_flatten/alloydb_cluster_input_user_flatten.go.erb"
@@ -145,7 +144,6 @@
           description: "Labels to apply to backups created using this configuration."
         - !ruby/object:Api::Type::NestedObject
           name: "weeklySchedule"
-          immutable: true
           required: true
           description: "Weekly schedule for the Backup."
           default_from_api: true

mmv1/products/firebase/WebApp.yaml

@@ -49,6 +49,8 @@ autogen_async: true
 skip_sweeper: true
 examples:
   - !ruby/object:Provider::Terraform::Examples
+    # TODO: https://github.com/hashicorp/terraform-provider-google/issues/14158
+    skip_vcr: true
     name: "firebase_web_app_basic"
     min_version: "beta"
     primary_resource_id: "basic"

mmv1/products/pubsub/Subscription.yaml

@@ -256,7 +256,7 @@ properties:
         description: |
           Specifies the "time-to-live" duration for an associated resource. The
           resource expires if it is not active for a period of ttl.
-          If ttl is not set, the associated resource never expires.
+          If ttl is set to "", the associated resource never expires.
           A duration in seconds with up to nine fractional digits, terminated by 's'.
           Example - "3.5s".
         diff_suppress_func: 'comparePubsubSubscriptionExpirationPolicy'

mmv1/provider/terraform_validator.rb

@@ -268,6 +268,8 @@ def copy_common_files(output_folder, generate_code, _generate_docs)
                         'third_party/terraform/utils/common_operation.go'],
                        ['converters/google/resources/convert.go',
                         'third_party/terraform/utils/convert.go'],
+                       ['converters/google/resources/extract.go',
+                        'third_party/terraform/utils/extract.go'],
                        ['converters/google/resources/service_scope.go',
                         'third_party/terraform/utils/service_scope.go'],
                        ['converters/google/resources/kms_utils.go',

mmv1/third_party/terraform/framework_utils/framework_provider_test.go.erb

@@ -35,6 +35,8 @@ func GetFwTestProvider(t *testing.T) *frameworkTestProvider {
 }
 
 func TestAccFrameworkProviderMeta_setModuleName(t *testing.T) {
+	// TODO: https://github.com/hashicorp/terraform-provider-google/issues/14158
+	SkipIfVcr(t)
 	t.Parallel()
 
 	moduleName := "my-module"
@@ -128,6 +130,8 @@ func TestAccFrameworkProviderBasePath_setInvalidBasePath(t *testing.T) {
 }
 
 func TestAccFrameworkProviderBasePath_setBasePath(t *testing.T) {
+	// TODO: https://github.com/hashicorp/terraform-provider-google/issues/14158
+	SkipIfVcr(t)
 	t.Parallel()
 
 	VcrTest(t, resource.TestCase{

mmv1/third_party/terraform/tests/data_source_dns_key_test.go.erb

@@ -10,6 +10,8 @@ import (
 )
 
 func TestAccDataSourceDNSKeys_basic(t *testing.T) {
+	// TODO: https://github.com/hashicorp/terraform-provider-google/issues/14158
+	SkipIfVcr(t)
 	t.Parallel()
 
 	dnsZoneName := fmt.Sprintf("tf-test-dnskey-test-%s", RandString(t, 10))
@@ -59,6 +61,8 @@ func TestAccDataSourceDNSKeys_basic(t *testing.T) {
 }
 
 func TestAccDataSourceDNSKeys_noDnsSec(t *testing.T) {
+	// TODO: https://github.com/hashicorp/terraform-provider-google/issues/14158
+	SkipIfVcr(t)
 	t.Parallel()
 
 	dnsZoneName := fmt.Sprintf("tf-test-dnskey-test-%s", RandString(t, 10))

mmv1/third_party/terraform/tests/data_source_dns_managed_zone_test.go.erb

@@ -11,6 +11,8 @@ import (
 )
 
 func TestAccDataSourceDnsManagedZone_basic(t *testing.T) {
+	// TODO: https://github.com/hashicorp/terraform-provider-google/issues/14158
+	SkipIfVcr(t)
 	t.Parallel()
 
 	VcrTest(t, resource.TestCase{

mmv1/third_party/terraform/tests/data_source_dns_record_set_test.go.erb

@@ -11,6 +11,8 @@ import (
 )
 
 func TestAccDataSourceDnsRecordSet_basic(t *testing.T) {
+	// TODO: https://github.com/hashicorp/terraform-provider-google/issues/14158
+	SkipIfVcr(t)
 	t.Parallel()
 
 	var ttl1, ttl2 string // ttl is a computed string-type attribute that is easy to compare in the test

mmv1/third_party/terraform/tests/data_source_google_firebase_apple_app_config_test.go.erb

@@ -10,6 +10,8 @@ import (
 )
 
 func TestAccDataSourceGoogleFirebaseAppleAppConfig(t *testing.T) {
+	// TODO: https://github.com/hashicorp/terraform-provider-google/issues/14158
+	SkipIfVcr(t)
 	t.Parallel()
 
 	context := map[string]interface{}{

mmv1/third_party/terraform/tests/resource_alloydb_cluster_test.go

@@ -67,3 +67,153 @@ resource "google_compute_network" "default" {
 }
 `, context)
 }
+
+// Test if adding automatedBackupPolicy AND initialUser re-creates the cluster.
+// Ideally, cluster shouldn't be re-created. This test will only pass if the cluster
+// isn't re-created but updated in-place.
+func TestAccAlloydbCluster_addAutomatedBackupPolicyAndInitialUser(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"random_suffix": RandString(t, 10),
+	}
+
+	VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { testAccPreCheck(t) },
+		ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckAlloydbClusterDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAlloydbCluster_withoutInitialUserAndAutomatedBackupPolicy(context),
+			},
+			{
+				ResourceName:            "google_alloydb_cluster.default",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"initial_user", "cluster_id", "location"},
+			},
+			{
+				Config: testAccAlloydbCluster_withInitialUserAndAutomatedBackupPolicy(context),
+			},
+			{
+				ResourceName:            "google_alloydb_cluster.default",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"initial_user", "cluster_id", "location"},
+			},
+			{
+				Config: testAccAlloydbCluster_alloydbClusterBasicExample(context),
+			},
+		},
+	})
+}
+
+// Test if deleting automatedBackupPolicy AND initialUser re-creates the cluster.
+// Ideally, cluster shouldn't be re-created. This test will only pass if the cluster
+// isn't re-created but updated in-place.
+func TestAccAlloydbCluster_deleteAutomatedBackupPolicyAndInitialUser(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"random_suffix": RandString(t, 10),
+	}
+
+	VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { testAccPreCheck(t) },
+		ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckAlloydbClusterDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAlloydbCluster_withInitialUserAndAutomatedBackupPolicy(context),
+			},
+			{
+				ResourceName:            "google_alloydb_cluster.default",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"initial_user", "cluster_id", "location"},
+			},
+			{
+				Config: testAccAlloydbCluster_withoutInitialUserAndAutomatedBackupPolicy(context),
+			},
+			{
+				ResourceName:            "google_alloydb_cluster.default",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"initial_user", "cluster_id", "location"},
+			},
+			{
+				Config: testAccAlloydbCluster_alloydbClusterBasicExample(context),
+			},
+		},
+	})
+}
+
+func testAccAlloydbCluster_withInitialUserAndAutomatedBackupPolicy(context map[string]interface{}) string {
+	return Nprintf(`
+resource "google_alloydb_cluster" "default" {
+  cluster_id   = "tf-test-alloydb-cluster%{random_suffix}"
+  location     = "us-central1"
+  network      = "projects/${data.google_project.project.number}/global/networks/${google_compute_network.default.name}"
+
+  initial_user {
+    user     = "tf-test-alloydb-cluster%{random_suffix}"
+    password = "tf-test-alloydb-cluster%{random_suffix}"
+  }
+
+  automated_backup_policy {
+    location      = "us-central1"
+    backup_window = "1800s"
+    enabled       = true
+
+    weekly_schedule {
+      days_of_week = ["MONDAY"]
+
+      start_times {
+        hours   = 23
+        minutes = 0
+        seconds = 0
+        nanos   = 0
+      }
+    }
+
+    quantity_based_retention {
+      count = 1
+    }
+
+    labels = {
+      test = "tf-test-alloydb-cluster%{random_suffix}"
+    }
+  }
+  lifecycle {
+    prevent_destroy = true
+  }  
+}
+
+data "google_project" "project" {
+}
+
+resource "google_compute_network" "default" {
+  name = "tf-test-alloydb-cluster%{random_suffix}"
+}
+`, context)
+}
+
+func testAccAlloydbCluster_withoutInitialUserAndAutomatedBackupPolicy(context map[string]interface{}) string {
+	return Nprintf(`
+resource "google_alloydb_cluster" "default" {
+  cluster_id = "tf-test-alloydb-cluster%{random_suffix}"
+  location   = "us-central1"
+  network    = "projects/${data.google_project.project.number}/global/networks/${google_compute_network.default.name}"
+  lifecycle {
+    prevent_destroy = true
+  }  
+}
+
+data "google_project" "project" {
+}
+
+resource "google_compute_network" "default" {
+  name = "tf-test-alloydb-cluster%{random_suffix}"
+}
+`, context)
+}

mmv1/third_party/terraform/tests/resource_firebase_web_app_test.go.erb

@@ -12,6 +12,8 @@ import (
 )
 
 func TestAccFirebaseWebApp_firebaseWebAppFull(t *testing.T) {
+	// TODO: https://github.com/hashicorp/terraform-provider-google/issues/14158
+	SkipIfVcr(t)
 	t.Parallel()
 
 	context := map[string]interface{}{

mmv1/third_party/terraform/tests/resource_sql_database_instance_sweeper_test.go.erb

@@ -54,6 +54,10 @@ func testSweepSQLDatabaseInstance(region string) error {
 	}
 
 	for _, d := range found.Items {
+		if !IsSweepableTestResource(d.Name) {
+			continue
+		}
+
 		// don't delete replicas, we'll take care of that
 		// when deleting the database they replicate
 		if d.ReplicaConfiguration != nil {