wait for instance status only after create/update (GoogleCloudPlatfor…

…m#5057)

mmv1/third_party/terraform/resources/resource_compute_instance_group_manager.go.erb

@@ -25,8 +25,8 @@ func resourceComputeInstanceGroupManager() *schema.Resource {
 			State: resourceInstanceGroupManagerStateImporter,
 		},
 		Timeouts: &schema.ResourceTimeout{
-			Create: schema.DefaultTimeout(5 * time.Minute),
-			Update: schema.DefaultTimeout(5 * time.Minute),
+			Create: schema.DefaultTimeout(15 * time.Minute),
+			Update: schema.DefaultTimeout(15 * time.Minute),
 			Delete: schema.DefaultTimeout(15 * time.Minute),
 		},
 
@@ -471,6 +471,13 @@ func resourceComputeInstanceGroupManagerCreate(d *schema.ResourceData, meta inte
 		return err
 	}
 
+	if d.Get("wait_for_instances").(bool) {
+		err := computeIGMWaitForInstanceStatus(d, meta)
+		if err != nil {
+			return err
+		}
+	}
+
 	return resourceComputeInstanceGroupManagerRead(d, meta)
 }
 
@@ -637,30 +644,24 @@ func resourceComputeInstanceGroupManagerRead(d *schema.ResourceData, meta interf
 
 	// If unset in state set to default value
 	if d.Get("wait_for_instances_status").(string) == "" {
-		if err = d.Set("wait_for_instances_status", "STABLE"); err != nil {
+		if err := d.Set("wait_for_instances_status", "STABLE"); err != nil {
 			return fmt.Errorf("Error setting wait_for_instances_status in state: %s", err.Error())
 		}
 	}
 
+	return nil
+}
+
+func resourceComputeInstanceGroupManagerUpdate(d *schema.ResourceData, meta interface{}) error {
+	config := meta.(*Config)
+
 	if d.Get("wait_for_instances").(bool) {
-		waitForUpdates := d.Get("wait_for_instances_status").(string) == "UPDATED"
-		conf := resource.StateChangeConf{
-			Pending: []string{"creating", "error", "updating per instance configs", "reaching version target"},
-			Target:  []string{"created"},
-			Refresh: waitForInstancesRefreshFunc(getManager, waitForUpdates, d, meta),
-			Timeout: d.Timeout(schema.TimeoutCreate),
-		}
-		_, err := conf.WaitForState()
+		err := computeIGMWaitForInstanceStatus(d, meta)
 		if err != nil {
 			return err
 		}
 	}
 
-	return nil
-}
-
-func resourceComputeInstanceGroupManagerUpdate(d *schema.ResourceData, meta interface{}) error {
-	config := meta.(*Config)
 	userAgent, err := generateUserAgentString(d, config.userAgent)
 	if err != nil {
 		return err
@@ -767,11 +768,26 @@ func resourceComputeInstanceGroupManagerUpdate(d *schema.ResourceData, meta inte
 
 	d.Partial(false)
 
+	if d.Get("wait_for_instances").(bool) {
+		err := computeIGMWaitForInstanceStatus(d, meta)
+		if err != nil {
+			return err
+		}
+	}
+
 	return resourceComputeInstanceGroupManagerRead(d, meta)
 }
 
 func resourceComputeInstanceGroupManagerDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
+
+	if d.Get("wait_for_instances").(bool) {
+		err := computeIGMWaitForInstanceStatus(d, meta)
+		if err != nil {
+			return err
+		}
+	}
+
 	userAgent, err := generateUserAgentString(d, config.userAgent)
 	if err != nil {
 		return err
@@ -828,6 +844,21 @@ func resourceComputeInstanceGroupManagerDelete(d *schema.ResourceData, meta inte
 	return nil
 }
 
+func computeIGMWaitForInstanceStatus(d *schema.ResourceData, meta interface{}) error {
+	waitForUpdates := d.Get("wait_for_instances_status").(string) == "UPDATED"
+	conf := resource.StateChangeConf{
+		Pending: []string{"creating", "error", "updating per instance configs", "reaching version target"},
+		Target:  []string{"created"},
+		Refresh: waitForInstancesRefreshFunc(getManager, waitForUpdates, d, meta),
+		Timeout: d.Timeout(schema.TimeoutCreate),
+	}
+	_, err := conf.WaitForState()
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 func expandAutoHealingPolicies(configured []interface{}) []*computeBeta.InstanceGroupManagerAutoHealingPolicy {
 	autoHealingPolicies := make([]*computeBeta.InstanceGroupManagerAutoHealingPolicy, 0, len(configured))
 	for _, raw := range configured {

mmv1/third_party/terraform/resources/resource_compute_region_instance_group_manager.go.erb

@@ -24,8 +24,8 @@ func resourceComputeRegionInstanceGroupManager() *schema.Resource {
 			State: resourceRegionInstanceGroupManagerStateImporter,
 		},
 		Timeouts: &schema.ResourceTimeout{
-			Create: schema.DefaultTimeout(5 * time.Minute),
-			Update: schema.DefaultTimeout(5 * time.Minute),
+			Create: schema.DefaultTimeout(15 * time.Minute),
+			Update: schema.DefaultTimeout(15 * time.Minute),
 			Delete: schema.DefaultTimeout(15 * time.Minute),
 		},
 
@@ -453,9 +453,32 @@ func resourceComputeRegionInstanceGroupManagerCreate(d *schema.ResourceData, met
 	if err != nil {
 		return err
 	}
+
+	if d.Get("wait_for_instances").(bool) {
+		err := computeRIGMWaitForInstanceStatus(d, meta)
+		if err != nil {
+			return err
+		}
+	}
+
 	return resourceComputeRegionInstanceGroupManagerRead(d, config)
 }
 
+func computeRIGMWaitForInstanceStatus(d *schema.ResourceData, meta interface{}) error {
+	waitForUpdates := d.Get("wait_for_instances_status").(string) == "UPDATED"
+	conf := resource.StateChangeConf{
+		Pending: []string{"creating", "error", "updating per instance configs", "reaching version target"},
+		Target:  []string{"created"},
+		Refresh: waitForInstancesRefreshFunc(getRegionalManager, waitForUpdates, d, meta),
+		Timeout: d.Timeout(schema.TimeoutCreate),
+	}
+	_, err := conf.WaitForState()
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 type getInstanceManagerFunc func(*schema.ResourceData, interface{}) (*computeBeta.InstanceGroupManager, error)
 
 func getRegionalManager(d *schema.ResourceData, meta interface{}) (*computeBeta.InstanceGroupManager, error) {
@@ -592,25 +615,19 @@ func resourceComputeRegionInstanceGroupManagerRead(d *schema.ResourceData, meta
 		}
 	}
 
+	return nil
+}
+
+func resourceComputeRegionInstanceGroupManagerUpdate(d *schema.ResourceData, meta interface{}) error {
+	config := meta.(*Config)
+
 	if d.Get("wait_for_instances").(bool) {
-		waitForUpdates := d.Get("wait_for_instances_status").(string) == "UPDATED"
-		conf := resource.StateChangeConf{
-			Pending: []string{"creating", "error", "updating per instance configs", "reaching version target"},
-			Target:  []string{"created"},
-			Refresh: waitForInstancesRefreshFunc(getRegionalManager, waitForUpdates, d, meta),
-			Timeout: d.Timeout(schema.TimeoutCreate),
-		}
-		_, err := conf.WaitForState()
+		err := computeRIGMWaitForInstanceStatus(d, meta)
 		if err != nil {
 			return err
 		}
 	}
 
-	return nil
-}
-
-func resourceComputeRegionInstanceGroupManagerUpdate(d *schema.ResourceData, meta interface{}) error {
-	config := meta.(*Config)
 	userAgent, err := generateUserAgentString(d, config.userAgent)
 	if err != nil {
 		return err
@@ -711,11 +728,26 @@ func resourceComputeRegionInstanceGroupManagerUpdate(d *schema.ResourceData, met
 
 	d.Partial(false)
 
+	if d.Get("wait_for_instances").(bool) {
+		err := computeRIGMWaitForInstanceStatus(d, meta)
+		if err != nil {
+			return err
+		}
+	}
+
 	return resourceComputeRegionInstanceGroupManagerRead(d, meta)
 }
 
 func resourceComputeRegionInstanceGroupManagerDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
+
+	if d.Get("wait_for_instances").(bool) {
+		err := computeRIGMWaitForInstanceStatus(d, meta)
+		if err != nil {
+			return err
+		}
+	}
+
 	userAgent, err := generateUserAgentString(d, config.userAgent)
 	if err != nil {
 		return err

mmv1/third_party/terraform/website/docs/r/compute_instance_group_manager.html.markdown

@@ -285,8 +285,8 @@ The `per_instance_configs` block holds:
 This resource provides the following
 [Timeouts](/docs/configuration/resources.html#timeouts) configuration options:
 
-- `create` - Default is 5 minutes.
-- `update` - Default is 5 minutes.
+- `create` - Default is 15 minutes.
+- `update` - Default is 15 minutes.
 - `delete` - Default is 15 minutes.
 
 

mmv1/third_party/terraform/website/docs/r/compute_region_instance_group_manager.html.markdown

@@ -293,8 +293,8 @@ The `per_instance_configs` block holds:
 This resource provides the following
 [Timeouts](/docs/configuration/resources.html#timeouts) configuration options:
 
-- `create` - Default is 5 minutes.
-- `update` - Default is 5 minutes.
+- `create` - Default is 15 minutes.
+- `update` - Default is 15 minutes.
 - `delete` - Default is 15 minutes.