additional fixes for stateful ips (#9965) (#17297)

modular-magician · web-flow · commit dd363b683646 · 2024-02-16T06:58:29.000-08:00
[upstream:8c99637f3dda5efde734c02861e13e98e54bf4b1]

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/.changelog/9965.txt b/.changelog/9965.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+Fix issue that changes only in stateful_(internal|external)_ip will not trigger a Patch call in the GA provider for compute_(region_)instance_group_manager
+```
diff --git a/google/services/compute/resource_compute_instance_group_manager.go b/google/services/compute/resource_compute_instance_group_manager.go
@@ -825,7 +825,7 @@ func resourceComputeInstanceGroupManagerUpdate(d *schema.ResourceData, meta inte
 		change = true
 	}
 
-	if d.HasChange("stateful_disk") {
+	if d.HasChange("stateful_internal_ip") || d.HasChange("stateful_external_ip") || d.HasChange("stateful_disk") {
 		updatedManager.StatefulPolicy = expandStatefulPolicy(d)
 		change = true
 	}
diff --git a/google/services/compute/resource_compute_region_instance_group_manager.go b/google/services/compute/resource_compute_region_instance_group_manager.go
@@ -771,7 +771,7 @@ func resourceComputeRegionInstanceGroupManagerUpdate(d *schema.ResourceData, met
 		change = true
 	}
 
-	if d.HasChange("stateful_disk") {
+	if d.HasChange("stateful_internal_ip") || d.HasChange("stateful_external_ip") || d.HasChange("stateful_disk") {
 		updatedManager.StatefulPolicy = expandStatefulPolicy(d)
 		change = true
 	}
diff --git a/google/services/compute/resource_compute_region_instance_group_manager_test.go b/google/services/compute/resource_compute_region_instance_group_manager_test.go
@@ -324,8 +324,6 @@ func TestAccRegionInstanceGroupManager_distributionPolicy(t *testing.T) {
 }
 
 func TestAccRegionInstanceGroupManager_stateful(t *testing.T) {
-	// TODO: Flaky test due to ordering of IPs https://github.com/hashicorp/terraform-provider-google/issues/13430
-	t.Skip()
 	t.Parallel()
 
 	template := fmt.Sprintf("tf-test-rigm-%s", acctest.RandString(t, 10))

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:bug
	`2`	`+Fix issue that changes only in stateful_(internal\|external)_ip will not trigger a Patch call in the GA provider for compute_(region_)instance_group_manager`
	`3`	+```
Original file line number	Diff line number	Diff line change
`@@ -825,7 +825,7 @@ func resourceComputeInstanceGroupManagerUpdate(d *schema.ResourceData, meta inte`
`825`	`825`	`change = true`
`826`	`826`	`}`
`827`	`827`
`828`		`- if d.HasChange("stateful_disk") {`
	`828`	`+ if d.HasChange("stateful_internal_ip") \|\| d.HasChange("stateful_external_ip") \|\| d.HasChange("stateful_disk") {`
`829`	`829`	`updatedManager.StatefulPolicy = expandStatefulPolicy(d)`
`830`	`830`	`change = true`
`831`	`831`	`}`
Original file line number	Diff line number	Diff line change
`@@ -771,7 +771,7 @@ func resourceComputeRegionInstanceGroupManagerUpdate(d *schema.ResourceData, met`
`771`	`771`	`change = true`
`772`	`772`	`}`
`773`	`773`
`774`		`- if d.HasChange("stateful_disk") {`
	`774`	`+ if d.HasChange("stateful_internal_ip") \|\| d.HasChange("stateful_external_ip") \|\| d.HasChange("stateful_disk") {`
`775`	`775`	`updatedManager.StatefulPolicy = expandStatefulPolicy(d)`
`776`	`776`	`change = true`
`777`	`777`	`}`
Original file line number	Diff line number	Diff line change
`@@ -324,8 +324,6 @@ func TestAccRegionInstanceGroupManager_distributionPolicy(t *testing.T) {`
`324`	`324`	`}`
`325`	`325`
`326`	`326`	`func TestAccRegionInstanceGroupManager_stateful(t *testing.T) {`
`327`		`- // TODO: Flaky test due to ordering of IPs https://github.com/hashicorp/terraform-provider-google/issues/13430`
`328`		`- t.Skip()`
`329`	`327`	`t.Parallel()`
`330`	`328`
`331`	`329`	`template := fmt.Sprintf("tf-test-rigm-%s", acctest.RandString(t, 10))`