mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-10-04 17:51:11 +00:00
Ensure that a terraform plan works if the resource does not exist (but is currently in the tfstate). (#1340)
This commit is contained in:
parent
3628e263e2
commit
b70db7b40a
@ -419,7 +419,7 @@ func resourceComputeInstanceGroupManagerRead(d *schema.ResourceData, meta interf
|
|||||||
}
|
}
|
||||||
|
|
||||||
manager, err := getManager(d, meta)
|
manager, err := getManager(d, meta)
|
||||||
if err != nil {
|
if err != nil || manager == nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -303,6 +303,14 @@ func getRegionalManager(d *schema.ResourceData, meta interface{}) (*computeBeta.
|
|||||||
v1Manager := &compute.InstanceGroupManager{}
|
v1Manager := &compute.InstanceGroupManager{}
|
||||||
v1Manager, err = config.clientCompute.RegionInstanceGroupManagers.Get(project, region, d.Id()).Do()
|
v1Manager, err = config.clientCompute.RegionInstanceGroupManagers.Get(project, region, d.Id()).Do()
|
||||||
|
|
||||||
|
if v1Manager == nil {
|
||||||
|
log.Printf("[WARN] Removing Region Instance Group Manager %q because it's gone", d.Get("name").(string))
|
||||||
|
|
||||||
|
// The resource doesn't exist anymore
|
||||||
|
d.SetId("")
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
err = Convert(v1Manager, manager)
|
err = Convert(v1Manager, manager)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -335,7 +343,7 @@ func waitForInstancesRefreshFunc(f getInstanceManagerFunc, d *schema.ResourceDat
|
|||||||
func resourceComputeRegionInstanceGroupManagerRead(d *schema.ResourceData, meta interface{}) error {
|
func resourceComputeRegionInstanceGroupManagerRead(d *schema.ResourceData, meta interface{}) error {
|
||||||
config := meta.(*Config)
|
config := meta.(*Config)
|
||||||
manager, err := getRegionalManager(d, meta)
|
manager, err := getRegionalManager(d, meta)
|
||||||
if err != nil {
|
if err != nil || manager == nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user