From 5f6dc4c5ec6da1d0708a33dd1df9311fb48bb417 Mon Sep 17 00:00:00 2001
From: Riley Karson <rileykarson@google.com>
Date: Tue, 20 Nov 2018 09:36:01 -0800
Subject: [PATCH] Fix tests by stabilising rolling_update_policy, making
 update_policy Computed, and ImportStateVerifyIgnore-ing update_strategy for
 rigm.

---
 .../resource_compute_instance_group_manager.go.erb         | 2 ++
 .../resource_compute_region_instance_group_manager.go.erb  | 2 ++
 ...ource_compute_region_instance_group_manager_test.go.erb | 7 ++++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/third_party/terraform/resources/resource_compute_instance_group_manager.go.erb b/third_party/terraform/resources/resource_compute_instance_group_manager.go.erb
index 4808247fcbd4..5477ea90c913 100644
--- a/third_party/terraform/resources/resource_compute_instance_group_manager.go.erb
+++ b/third_party/terraform/resources/resource_compute_instance_group_manager.go.erb
@@ -234,6 +234,7 @@ func resourceComputeInstanceGroupManager() *schema.Resource {
 				Computed:   true,
 <% else -%>
 			"update_policy": &schema.Schema{
+				Computed:   true,
 <% end -%>
 				Type:       schema.TypeList,
 				Optional:   true,
@@ -538,6 +539,7 @@ func resourceComputeInstanceGroupManagerRead(d *schema.ResourceData, meta interf
 
 	// When we make a list Removed, we see a permadiff from `field_name.#: "" => "<computed>"`. Set to nil in Read so we see no diff.
 	d.Set("version" , nil)
+	d.Set("rolling_update_policy" , nil)
 <% else -%>
 	if err = d.Set("auto_healing_policies", flattenAutoHealingPolicies(manager.AutoHealingPolicies)); err != nil {
 		return fmt.Errorf("Error setting auto_healing_policies in state: %s", err.Error())
diff --git a/third_party/terraform/resources/resource_compute_region_instance_group_manager.go.erb b/third_party/terraform/resources/resource_compute_region_instance_group_manager.go.erb
index 527d0aadf3ad..f31c321422c8 100644
--- a/third_party/terraform/resources/resource_compute_region_instance_group_manager.go.erb
+++ b/third_party/terraform/resources/resource_compute_region_instance_group_manager.go.erb
@@ -250,6 +250,7 @@ func resourceComputeRegionInstanceGroupManager() *schema.Resource {
 				Computed:   true,
 <% else -%>
 			"update_policy": &schema.Schema{
+				Computed:   true,
 <% end -%>
 				Type:       schema.TypeList,
 				Optional:   true,
@@ -477,6 +478,7 @@ func resourceComputeRegionInstanceGroupManagerRead(d *schema.ResourceData, meta
 <% if version.nil? || version == 'ga' -%>
 	// When we make a list Removed, we see a permadiff from `field_name.#: "" => "<computed>"`. Set to nil in Read so we see no diff.
 	d.Set("version" , nil)
+	d.Set("rolling_update_policy" , nil)
 <% else -%>
 	if err := d.Set("auto_healing_policies", flattenAutoHealingPolicies(manager.AutoHealingPolicies)); err != nil {
 		return fmt.Errorf("Error setting auto_healing_policies in state: %s", err.Error())
diff --git a/third_party/terraform/tests/resource_compute_region_instance_group_manager_test.go.erb b/third_party/terraform/tests/resource_compute_region_instance_group_manager_test.go.erb
index d4ab9c4fd86e..24a36299339e 100644
--- a/third_party/terraform/tests/resource_compute_region_instance_group_manager_test.go.erb
+++ b/third_party/terraform/tests/resource_compute_region_instance_group_manager_test.go.erb
@@ -145,9 +145,10 @@ func TestAccRegionInstanceGroupManager_updateStrategy(t *testing.T) {
 				Config: testAccRegionInstanceGroupManager_updateStrategy(igm),
 			},
 			{
-				ResourceName:      "google_compute_region_instance_group_manager.igm-update-strategy",
-				ImportState:       true,
-				ImportStateVerify: true,
+				ResourceName:            "google_compute_region_instance_group_manager.igm-update-strategy",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"update_strategy"},
 			},
 		},
 	})