ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue #3742 - terraform destroy fails if Google Compute Instance no longer exists

This commit is contained in:
Matt Morrison 2015-11-05 12:38:17 +13:00
parent bf11be82c8
commit 5f90a4bc7e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/providers/google/resource_compute_instance.go
View File

@ -8,6 +8,7 @@ import (
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"google.golang.org/api/compute/v1" "google.golang.org/api/compute/v1"
"google.golang.org/api/googleapi" "google.golang.org/api/googleapi"
"strings"
) )
func stringHashcode(v interface{}) int { func stringHashcode(v interface{}) int {
@ -285,9 +286,10 @@ func getInstance(config *Config, d *schema.ResourceData) (*compute.Instance, err
if err != nil { if err != nil {
if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 { if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
// The resource doesn't exist anymore // The resource doesn't exist anymore
id := d.Id()
d.SetId("") d.SetId("")
return nil, fmt.Errorf("Resource %s no longer exists", config.Project) return nil, fmt.Errorf("Resource %s no longer exists", id)
} }
return nil, fmt.Errorf("Error reading instance: %s", err) return nil, fmt.Errorf("Error reading instance: %s", err)
@ -549,6 +551,9 @@ func resourceComputeInstanceRead(d *schema.ResourceData, meta interface{}) error
instance, err := getInstance(config, d) instance, err := getInstance(config, d)
if err != nil { if err != nil {
if strings.Contains(err.Error(), "no longer exists") {
return nil
}
return err return err
} }