From dd92a3732e7082ff29fad1d2e3eb518dc16e19a0 Mon Sep 17 00:00:00 2001 From: The Magician Date: Sat, 2 Jun 2018 13:33:30 -0700 Subject: [PATCH] Adds handleNotFoundError to all resource's Delete methods. (#1581) --- google/resource_compute_backend_bucket.go | 2 +- google/resource_compute_disk.go | 2 +- google/resource_compute_global_address.go | 2 +- google/resource_compute_http_health_check.go | 2 +- google/resource_compute_https_health_check.go | 2 +- google/resource_compute_ssl_policy.go | 2 +- google/resource_compute_target_http_proxy.go | 2 +- google/resource_compute_target_https_proxy.go | 2 +- google/resource_compute_target_ssl_proxy.go | 2 +- google/resource_compute_target_tcp_proxy.go | 2 +- google/resource_compute_vpn_gateway.go | 2 +- google/resource_redis_instance.go | 2 +- google/resource_resourcemanager_lien.go | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/google/resource_compute_backend_bucket.go b/google/resource_compute_backend_bucket.go index 02566cfb..1277b39e 100644 --- a/google/resource_compute_backend_bucket.go +++ b/google/resource_compute_backend_bucket.go @@ -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{} diff --git a/google/resource_compute_disk.go b/google/resource_compute_disk.go index fbf70e5d..2580b0f2 100644 --- a/google/resource_compute_disk.go +++ b/google/resource_compute_disk.go @@ -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{} diff --git a/google/resource_compute_global_address.go b/google/resource_compute_global_address.go index 2861ea1e..1257714f 100644 --- a/google/resource_compute_global_address.go +++ b/google/resource_compute_global_address.go @@ -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{} diff --git a/google/resource_compute_http_health_check.go b/google/resource_compute_http_health_check.go index 3ca4fb86..5cef5bf6 100644 --- a/google/resource_compute_http_health_check.go +++ b/google/resource_compute_http_health_check.go @@ -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{} diff --git a/google/resource_compute_https_health_check.go b/google/resource_compute_https_health_check.go index 8ece63e2..b5c51c4f 100644 --- a/google/resource_compute_https_health_check.go +++ b/google/resource_compute_https_health_check.go @@ -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{} diff --git a/google/resource_compute_ssl_policy.go b/google/resource_compute_ssl_policy.go index fc15df2c..374ca0d5 100644 --- a/google/resource_compute_ssl_policy.go +++ b/google/resource_compute_ssl_policy.go @@ -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{} diff --git a/google/resource_compute_target_http_proxy.go b/google/resource_compute_target_http_proxy.go index 9b441705..bb70d59b 100644 --- a/google/resource_compute_target_http_proxy.go +++ b/google/resource_compute_target_http_proxy.go @@ -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{} diff --git a/google/resource_compute_target_https_proxy.go b/google/resource_compute_target_https_proxy.go index 7b99c164..55fbc4c7 100644 --- a/google/resource_compute_target_https_proxy.go +++ b/google/resource_compute_target_https_proxy.go @@ -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{} diff --git a/google/resource_compute_target_ssl_proxy.go b/google/resource_compute_target_ssl_proxy.go index 03f22fc6..7e3fce5c 100644 --- a/google/resource_compute_target_ssl_proxy.go +++ b/google/resource_compute_target_ssl_proxy.go @@ -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{} diff --git a/google/resource_compute_target_tcp_proxy.go b/google/resource_compute_target_tcp_proxy.go index 21cc13c6..9791eb35 100644 --- a/google/resource_compute_target_tcp_proxy.go +++ b/google/resource_compute_target_tcp_proxy.go @@ -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{} diff --git a/google/resource_compute_vpn_gateway.go b/google/resource_compute_vpn_gateway.go index c947cfb6..cb213c0a 100644 --- a/google/resource_compute_vpn_gateway.go +++ b/google/resource_compute_vpn_gateway.go @@ -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{} diff --git a/google/resource_redis_instance.go b/google/resource_redis_instance.go index 81f27e60..2fcaae14 100644 --- a/google/resource_redis_instance.go +++ b/google/resource_redis_instance.go @@ -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{} diff --git a/google/resource_resourcemanager_lien.go b/google/resource_resourcemanager_lien.go index aa00ec9d..1c6f9586 100644 --- a/google/resource_resourcemanager_lien.go +++ b/google/resource_resourcemanager_lien.go @@ -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)