additional fixes for stateful ips (GoogleCloudPlatform#9965)

BBBmau · Mar 6, 2024 · 3c09df8 · 3c09df8
1 parent cb45ac2
commit 3c09df8
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 16 deletions.
diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_instance_group_manager.go.erb b/mmv1/third_party/terraform/services/compute/resource_compute_instance_group_manager.go.erb
@@ -904,17 +904,10 @@ func resourceComputeInstanceGroupManagerUpdate(d *schema.ResourceData, meta inte
 	}
 	<% end -%>
 
-	<% unless version == "ga" -%>
 	if d.HasChange("stateful_internal_ip") || d.HasChange("stateful_external_ip") || d.HasChange("stateful_disk") {
 		updatedManager.StatefulPolicy = expandStatefulPolicy(d)
 		change = true
 	}
-	<% else -%>
-	if d.HasChange("stateful_disk") {
-		updatedManager.StatefulPolicy = expandStatefulPolicy(d)
-		change = true
-	}
-	<% end -%>
 
 	if d.HasChange("list_managed_instances_results") {
 		updatedManager.ListManagedInstancesResults = d.Get("list_managed_instances_results").(string)

diff --git a/...rd_party/terraform/services/compute/resource_compute_region_instance_group_manager.go.erb b/...rd_party/terraform/services/compute/resource_compute_region_instance_group_manager.go.erb
@@ -847,17 +847,10 @@ func resourceComputeRegionInstanceGroupManagerUpdate(d *schema.ResourceData, met
 		change = true
 	}
 
-	<% unless version == "ga" -%>
 	if d.HasChange("stateful_internal_ip") || d.HasChange("stateful_external_ip") || d.HasChange("stateful_disk") {
 		updatedManager.StatefulPolicy = expandStatefulPolicy(d)
 		change = true
 	}
-	<% else -%>
-	if d.HasChange("stateful_disk") {
-		updatedManager.StatefulPolicy = expandStatefulPolicy(d)
-		change = true
-	}
-	<% end -%>
 
 	<% unless version == "ga" -%>
 	if d.HasChange("all_instances_config") {

diff --git a/...rty/terraform/services/compute/resource_compute_region_instance_group_manager_test.go.erb b/...rty/terraform/services/compute/resource_compute_region_instance_group_manager_test.go.erb
@@ -323,8 +323,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))