Allow updating single_cluster_routing in google_bigtable_app_profile (#…

…3967) (#7266) Signed-off-by: Modular Magician <[email protected]>
hashicorp · Sep 14, 2020 · b0bcd0f · b0bcd0f
1 parent bf3ff3a
commit b0bcd0f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/.changelog/3967.txt b/.changelog/3967.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+bigtable: fixed the update behaviour of the `single_cluster_routing` sub-fields in `google_bigtable_app_profile`
+```
diff --git a/google/resource_bigtable_app_profile.go b/google/resource_bigtable_app_profile.go
@@ -79,7 +79,6 @@ consistency to improve availability.`,
 			"single_cluster_routing": {
 				Type:        schema.TypeList,
 				Optional:    true,
-				ForceNew:    true,
 				Description: `Use a single-cluster routing policy.`,
 				MaxItems:    1,
 				Elem: &schema.Resource{
@@ -245,6 +244,12 @@ func resourceBigtableAppProfileUpdate(d *schema.ResourceData, meta interface{})
 	} else if v, ok := d.GetOkExists("description"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, descriptionProp)) {
 		obj["description"] = descriptionProp
 	}
+	singleClusterRoutingProp, err := expandBigtableAppProfileSingleClusterRouting(d.Get("single_cluster_routing"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("single_cluster_routing"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, singleClusterRoutingProp)) {
+		obj["singleClusterRouting"] = singleClusterRoutingProp
+	}
 
 	obj, err = resourceBigtableAppProfileEncoder(d, meta, obj)
 	if err != nil {
@@ -262,6 +267,10 @@ func resourceBigtableAppProfileUpdate(d *schema.ResourceData, meta interface{})
 	if d.HasChange("description") {
 		updateMask = append(updateMask, "description")
 	}
+
+	if d.HasChange("single_cluster_routing") {
+		updateMask = append(updateMask, "singleClusterRouting")
+	}
 	// updateMask is a URL parameter but not present in the schema, so replaceVars
 	// won't set it
 	url, err = addQueryParams(url, map[string]string{"updateMask": strings.Join(updateMask, ",")})

diff --git a/google/resource_bigtable_app_profile_test.go b/google/resource_bigtable_app_profile_test.go
@@ -20,7 +20,7 @@ func TestAccBigtableAppProfile_update(t *testing.T) {
 		CheckDestroy: testAccCheckBigtableAppProfileDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccBigtableAppProfile_multiClusterRouting(instanceName),
+				Config: testAccBigtableAppProfile_update1(instanceName),
 			},
 			{
 				ResourceName:            "google_bigtable_app_profile.ap",
@@ -29,7 +29,7 @@ func TestAccBigtableAppProfile_update(t *testing.T) {
 				ImportStateVerifyIgnore: []string{"ignore_warnings"},
 			},
 			{
-				Config: testAccBigtableAppProfile_update(instanceName),
+				Config: testAccBigtableAppProfile_update2(instanceName),
 			},
 			{
 				ResourceName:            "google_bigtable_app_profile.ap",
@@ -41,7 +41,7 @@ func TestAccBigtableAppProfile_update(t *testing.T) {
 	})
 }
 
-func testAccBigtableAppProfile_multiClusterRouting(instanceName string) string {
+func testAccBigtableAppProfile_update1(instanceName string) string {
 	return fmt.Sprintf(`
 resource "google_bigtable_instance" "instance" {
   name = "%s"
@@ -59,13 +59,17 @@ resource "google_bigtable_app_profile" "ap" {
   instance       = google_bigtable_instance.instance.id
   app_profile_id = "test"
 
-  multi_cluster_routing_use_any = true
+  single_cluster_routing {
+    cluster_id                 = %q
+    allow_transactional_writes = true
+  }
+
   ignore_warnings               = true
 }
-`, instanceName, instanceName)
+`, instanceName, instanceName, instanceName)
 }
 
-func testAccBigtableAppProfile_update(instanceName string) string {
+func testAccBigtableAppProfile_update2(instanceName string) string {
 	return fmt.Sprintf(`
 resource "google_bigtable_instance" "instance" {
   name = "%s"
@@ -84,8 +88,12 @@ resource "google_bigtable_app_profile" "ap" {
   app_profile_id = "test"
   description    = "add a description"
 
-  multi_cluster_routing_use_any = true
+  single_cluster_routing {
+    cluster_id                 = %q
+    allow_transactional_writes = false
+  }
+
   ignore_warnings               = true
 }
-`, instanceName, instanceName)
+`, instanceName, instanceName, instanceName)
 }