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

Adds handleNotFoundError to all resource's Delete methods. (#1581)

Browse Source
This commit is contained in:
The Magician 2018-06-02 13:33:30 -07:00 committed by Nathan McKinley
parent 3f9a5da0af
commit dd92a3732e
13 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
google/resource_compute_backend_bucket.go
View File

@ -268,7 +268,7 @@ func resourceComputeBackendBucketDelete(d *schema.ResourceData, meta interface{}
log.Printf("[DEBUG] Deleting BackendBucket %q", d.Id())
res, err := Delete(config, url)
if err != nil {
return fmt.Errorf("Error deleting BackendBucket %q: %s", d.Id(), err)
return handleNotFoundError(err, d, "BackendBucket")
}
op := &compute.Operation{}

2
google/resource_compute_disk.go
View File

@ -772,7 +772,7 @@ func resourceComputeDiskDelete(d *schema.ResourceData, meta interface{}) error {
log.Printf("[DEBUG] Deleting Disk %q", d.Id())
res, err := Delete(config, url)
if err != nil {
return fmt.Errorf("Error deleting Disk %q: %s", d.Id(), err)
return handleNotFoundError(err, d, "Disk")
}
op := &compute.Operation{}

2
google/resource_compute_global_address.go
View File

@ -203,7 +203,7 @@ func resourceComputeGlobalAddressDelete(d *schema.ResourceData, meta interface{}
log.Printf("[DEBUG] Deleting GlobalAddress %q", d.Id())
res, err := Delete(config, url)
if err != nil {
return fmt.Errorf("Error deleting GlobalAddress %q: %s", d.Id(), err)
return handleNotFoundError(err, d, "GlobalAddress")
}
op := &compute.Operation{}

2
google/resource_compute_http_health_check.go
View File

@ -359,7 +359,7 @@ func resourceComputeHttpHealthCheckDelete(d *schema.ResourceData, meta interface
log.Printf("[DEBUG] Deleting HttpHealthCheck %q", d.Id())
res, err := Delete(config, url)
if err != nil {
return fmt.Errorf("Error deleting HttpHealthCheck %q: %s", d.Id(), err)
return handleNotFoundError(err, d, "HttpHealthCheck")
}
op := &compute.Operation{}

2
google/resource_compute_https_health_check.go
View File

@ -359,7 +359,7 @@ func resourceComputeHttpsHealthCheckDelete(d *schema.ResourceData, meta interfac
log.Printf("[DEBUG] Deleting HttpsHealthCheck %q", d.Id())
res, err := Delete(config, url)
if err != nil {
return fmt.Errorf("Error deleting HttpsHealthCheck %q: %s", d.Id(), err)
return handleNotFoundError(err, d, "HttpsHealthCheck")
}
op := &compute.Operation{}

2
google/resource_compute_ssl_policy.go
View File

@ -335,7 +335,7 @@ func resourceComputeSslPolicyDelete(d *schema.ResourceData, meta interface{}) er
log.Printf("[DEBUG] Deleting SslPolicy %q", d.Id())
res, err := Delete(config, url)
if err != nil {
return fmt.Errorf("Error deleting SslPolicy %q: %s", d.Id(), err)
return handleNotFoundError(err, d, "SslPolicy")
}
op := &compute.Operation{}

2
google/resource_compute_target_http_proxy.go
View File

@ -258,7 +258,7 @@ func resourceComputeTargetHttpProxyDelete(d *schema.ResourceData, meta interface
log.Printf("[DEBUG] Deleting TargetHttpProxy %q", d.Id())
res, err := Delete(config, url)
if err != nil {
return fmt.Errorf("Error deleting TargetHttpProxy %q: %s", d.Id(), err)
return handleNotFoundError(err, d, "TargetHttpProxy")
}
op := &compute.Operation{}

2
google/resource_compute_target_https_proxy.go
View File

@ -353,7 +353,7 @@ func resourceComputeTargetHttpsProxyDelete(d *schema.ResourceData, meta interfac
log.Printf("[DEBUG] Deleting TargetHttpsProxy %q", d.Id())
res, err := Delete(config, url)
if err != nil {
return fmt.Errorf("Error deleting TargetHttpsProxy %q: %s", d.Id(), err)
return handleNotFoundError(err, d, "TargetHttpsProxy")
}
op := &compute.Operation{}

2
google/resource_compute_target_ssl_proxy.go
View File

@ -402,7 +402,7 @@ func resourceComputeTargetSslProxyDelete(d *schema.ResourceData, meta interface{
log.Printf("[DEBUG] Deleting TargetSslProxy %q", d.Id())
res, err := Delete(config, url)
if err != nil {
return fmt.Errorf("Error deleting TargetSslProxy %q: %s", d.Id(), err)
return handleNotFoundError(err, d, "TargetSslProxy")
}
op := &compute.Operation{}

2
google/resource_compute_target_tcp_proxy.go
View File

@ -306,7 +306,7 @@ func resourceComputeTargetTcpProxyDelete(d *schema.ResourceData, meta interface{
log.Printf("[DEBUG] Deleting TargetTcpProxy %q", d.Id())
res, err := Delete(config, url)
if err != nil {
return fmt.Errorf("Error deleting TargetTcpProxy %q: %s", d.Id(), err)
return handleNotFoundError(err, d, "TargetTcpProxy")
}
op := &compute.Operation{}

2
google/resource_compute_vpn_gateway.go
View File

@ -210,7 +210,7 @@ func resourceComputeVpnGatewayDelete(d *schema.ResourceData, meta interface{}) e
log.Printf("[DEBUG] Deleting VpnGateway %q", d.Id())
res, err := Delete(config, url)
if err != nil {
return fmt.Errorf("Error deleting VpnGateway %q: %s", d.Id(), err)
return handleNotFoundError(err, d, "VpnGateway")
}
op := &compute.Operation{}

2
google/resource_redis_instance.go
View File

@ -331,7 +331,7 @@ func resourceRedisInstanceDelete(d *schema.ResourceData, meta interface{}) error
log.Printf("[DEBUG] Deleting Instance %q", d.Id())
res, err := Delete(config, url)
if err != nil {
return fmt.Errorf("Error deleting Instance %q: %s", d.Id(), err)
return handleNotFoundError(err, d, "Instance")
}
op := &redis.Operation{}

2
google/resource_resourcemanager_lien.go
View File

@ -212,7 +212,7 @@ func resourceResourceManagerLienDelete(d *schema.ResourceData, meta interface{})
log.Printf("[DEBUG] Deleting Lien %q", d.Id())
res, err := Delete(config, url)
if err != nil {
return fmt.Errorf("Error deleting Lien %q: %s", d.Id(), err)
return handleNotFoundError(err, d, "Lien")
}
log.Printf("[DEBUG] Finished deleting Lien %q: %#v", d.Id(), res)