public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-07-03 08:42:39 +00:00
Code Issues Projects Releases Wiki Activity

Set wait_for_instances when importing IGMs, make defaults match (#1235)

Browse Source
This commit is contained in:
Dana Hoffman 2018-03-21 12:39:12 -07:00 committed by GitHub
parent 3a197d0550
commit 98baa31a05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
google/resource_compute_instance_group_manager.go
View File

@ -27,7 +27,7 @@ func resourceComputeInstanceGroupManager() *schema.Resource {
Update: resourceComputeInstanceGroupManagerUpdate,
Delete: resourceComputeInstanceGroupManagerDelete,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
State: resourceInstanceGroupManagerStateImporter,
},
Schema: map[string]*schema.Schema{
@ -201,7 +201,7 @@ func resourceComputeInstanceGroupManager() *schema.Resource {
"wait_for_instances": &schema.Schema{
Type: schema.TypeBool,
Optional: true,
Default: true,
Default: false,
},
},
}
@ -902,3 +902,8 @@ func flattenAutoHealingPolicies(autoHealingPolicies []*computeBeta.InstanceGroup
}
return autoHealingPoliciesSchema
}
func resourceInstanceGroupManagerStateImporter(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
d.Set("wait_for_instances", false)
return []*schema.ResourceData{d}, nil
}

7
google/resource_compute_region_instance_group_manager.go
View File

@ -28,7 +28,7 @@ func resourceComputeRegionInstanceGroupManager() *schema.Resource {
Update: resourceComputeRegionInstanceGroupManagerUpdate,
Delete: resourceComputeRegionInstanceGroupManagerDelete,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
State: resourceRegionInstanceGroupManagerStateImporter,
},
Timeouts: &schema.ResourceTimeout{
Create: schema.DefaultTimeout(5 * time.Minute),
@ -568,3 +568,8 @@ func hashZoneFromSelfLinkOrResourceName(value interface{}) int {
return hashcode.String(resource)
}
func resourceRegionInstanceGroupManagerStateImporter(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
d.Set("wait_for_instances", false)
return []*schema.ResourceData{d}, nil
}