Deleted immutable attributes for initialUser and weeklySchedule so th… (#7552) (#14187)

* Deleted immutable attributes for initialUser and weeklySchedule so that deleting/adding these properties doesn't force new cluster creation

* Automated tests for initialUser and automatedBackupPolicy

* Add ImportStateVerifyIgnore for non-changing fields

* gofmt fixes

---------

Signed-off-by: Modular Magician <[email protected]>
Co-authored-by: Stephen Lewis (Burrows) <[email protected]>

Author: modular-magician

.changelog/7552.txt

@@ -0,0 +1,4 @@
+```release-note:bug
+     AlloyDB: Deleted immutable flag for initalUser and weeklySchedule 
+
+```

google/resource_alloydb_cluster.go

@@ -70,7 +70,6 @@ If no policy is provided then the default policy will be used. The default polic
 							Type:        schema.TypeList,
 							Computed:    true,
 							Optional:    true,
-							ForceNew:    true,
 							Description: `Weekly schedule for the Backup.`,
 							MaxItems:    1,
 							Elem: &schema.Resource{
@@ -186,7 +185,6 @@ A duration in seconds with up to nine fractional digits, terminated by 's'. Exam
 			"initial_user": {
 				Type:        schema.TypeList,
 				Optional:    true,
-				ForceNew:    true,
 				Description: `Initial user to setup during cluster creation.`,
 				MaxItems:    1,
 				Elem: &schema.Resource{
@@ -465,6 +463,12 @@ func resourceAlloydbClusterUpdate(d *schema.ResourceData, meta interface{}) erro
 	} else if v, ok := d.GetOkExists("display_name"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, displayNameProp)) {
 		obj["displayName"] = displayNameProp
 	}
+	initialUserProp, err := expandAlloydbClusterInitialUser(d.Get("initial_user"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("initial_user"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, initialUserProp)) {
+		obj["initialUser"] = initialUserProp
+	}
 	automatedBackupPolicyProp, err := expandAlloydbClusterAutomatedBackupPolicy(d.Get("automated_backup_policy"), d, config)
 	if err != nil {
 		return err
@@ -492,6 +496,10 @@ func resourceAlloydbClusterUpdate(d *schema.ResourceData, meta interface{}) erro
 		updateMask = append(updateMask, "displayName")
 	}
 
+	if d.HasChange("initial_user") {
+		updateMask = append(updateMask, "initialUser")
+	}
+
 	if d.HasChange("automated_backup_policy") {
 		updateMask = append(updateMask, "automatedBackupPolicy")
 	}

google/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)
+}