From 1e85f57259a527391a6d61a92b884f02e5bde374 Mon Sep 17 00:00:00 2001 From: Svend Sorensen Date: Wed, 10 Dec 2014 17:01:59 -0800 Subject: [PATCH] Remove workaround for hashicorp/terraform#452 This has been fixed. --- resource_action_program.go | 7 ++----- resource_extra_file.go | 7 ++----- resource_license_key.go | 7 ++----- resource_monitor.go | 7 ++----- resource_monitor_script.go | 7 ++----- resource_pool.go | 7 ++----- resource_rate.go | 7 ++----- resource_rule.go | 7 ++----- resource_service_level_monitor.go | 7 ++----- resource_ssl_cas.go | 7 ++----- resource_ssl_server_key.go | 7 ++----- resource_traffic_ip_group.go | 7 ++----- resource_virtual_server.go | 7 ++----- 13 files changed, 26 insertions(+), 65 deletions(-) diff --git a/resource_action_program.go b/resource_action_program.go index 38bd4e1..f4002aa 100644 --- a/resource_action_program.go +++ b/resource_action_program.go @@ -72,11 +72,8 @@ func resourceActionProgramDelete(d *schema.ResourceData, meta interface{}) error c := meta.(*stingray.Client) r := stingray.NewActionProgram(d.Id()) - resp, err := c.Delete(r) - // Deletes happen twice when a resource is recreated due to - // ForceNew, so treat a 404 as a success - // https://github.com/hashicorp/terraform/issues/542 - if err != nil && resp.StatusCode != 404 { + _, err := c.Delete(r) + if err != nil { return err } diff --git a/resource_extra_file.go b/resource_extra_file.go index 4d43e08..b86fb51 100644 --- a/resource_extra_file.go +++ b/resource_extra_file.go @@ -72,11 +72,8 @@ func resourceExtraFileDelete(d *schema.ResourceData, meta interface{}) error { c := meta.(*stingray.Client) r := stingray.NewExtraFile(d.Id()) - resp, err := c.Delete(r) - // Deletes happen twice when a resource is recreated due to - // ForceNew, so treat a 404 as a success - // https://github.com/hashicorp/terraform/issues/542 - if err != nil && resp.StatusCode != 404 { + _, err := c.Delete(r) + if err != nil { return err } diff --git a/resource_license_key.go b/resource_license_key.go index 4fdf561..ba1e00d 100644 --- a/resource_license_key.go +++ b/resource_license_key.go @@ -72,11 +72,8 @@ func resourceLicenseKeyDelete(d *schema.ResourceData, meta interface{}) error { c := meta.(*stingray.Client) r := stingray.NewLicenseKey(d.Id()) - resp, err := c.Delete(r) - // Deletes happen twice when a resource is recreated due to - // ForceNew, so treat a 404 as a success - // https://github.com/hashicorp/terraform/issues/542 - if err != nil && resp.StatusCode != 404 { + _, err := c.Delete(r) + if err != nil { return err } diff --git a/resource_monitor.go b/resource_monitor.go index 79e2b97..8beefbf 100644 --- a/resource_monitor.go +++ b/resource_monitor.go @@ -216,11 +216,8 @@ func resourceMonitorDelete(d *schema.ResourceData, meta interface{}) error { c := meta.(*stingray.Client) r := stingray.NewMonitor(d.Id()) - resp, err := c.Delete(r) - // Deletes happen twice when a resource is recreated due to - // ForceNew, so treat a 404 as a success - // https://github.com/hashicorp/terraform/issues/542 - if err != nil && resp.StatusCode != 404 { + _, err := c.Delete(r) + if err != nil { return err } diff --git a/resource_monitor_script.go b/resource_monitor_script.go index 815e141..c692b72 100644 --- a/resource_monitor_script.go +++ b/resource_monitor_script.go @@ -72,11 +72,8 @@ func resourceMonitorScriptDelete(d *schema.ResourceData, meta interface{}) error c := meta.(*stingray.Client) r := stingray.NewMonitorScript(d.Id()) - resp, err := c.Delete(r) - // Deletes happen twice when a resource is recreated due to - // ForceNew, so treat a 404 as a success - // https://github.com/hashicorp/terraform/issues/542 - if err != nil && resp.StatusCode != 404 { + _, err := c.Delete(r) + if err != nil { return err } diff --git a/resource_pool.go b/resource_pool.go index 7010630..ebab5d4 100644 --- a/resource_pool.go +++ b/resource_pool.go @@ -151,11 +151,8 @@ func resourcePoolDelete(d *schema.ResourceData, meta interface{}) error { c := meta.(*stingray.Client) r := stingray.NewPool(d.Id()) - resp, err := c.Delete(r) - // Deletes happen twice when a resource is recreated due to - // ForceNew, so treat a 404 as a success - // https://github.com/hashicorp/terraform/issues/542 - if err != nil && resp.StatusCode != 404 { + _, err := c.Delete(r) + if err != nil { return err } diff --git a/resource_rate.go b/resource_rate.go index ae02b9a..e402fa8 100644 --- a/resource_rate.go +++ b/resource_rate.go @@ -86,11 +86,8 @@ func resourceRateDelete(d *schema.ResourceData, meta interface{}) error { c := meta.(*stingray.Client) r := stingray.NewRate(d.Id()) - resp, err := c.Delete(r) - // Deletes happen twice when a resource is recreated due to - // ForceNew, so treat a 404 as a success - // https://github.com/hashicorp/terraform/issues/542 - if err != nil && resp.StatusCode != 404 { + _, err := c.Delete(r) + if err != nil { return err } diff --git a/resource_rule.go b/resource_rule.go index 8510cca..91d6ee0 100644 --- a/resource_rule.go +++ b/resource_rule.go @@ -72,11 +72,8 @@ func resourceRuleDelete(d *schema.ResourceData, meta interface{}) error { c := meta.(*stingray.Client) r := stingray.NewRule(d.Id()) - resp, err := c.Delete(r) - // Deletes happen twice when a resource is recreated due to - // ForceNew, so treat a 404 as a success - // https://github.com/hashicorp/terraform/issues/542 - if err != nil && resp.StatusCode != 404 { + _, err := c.Delete(r) + if err != nil { return err } diff --git a/resource_service_level_monitor.go b/resource_service_level_monitor.go index 098c82a..8bb2270 100644 --- a/resource_service_level_monitor.go +++ b/resource_service_level_monitor.go @@ -93,11 +93,8 @@ func resourceServiceLevelMonitorDelete(d *schema.ResourceData, meta interface{}) c := meta.(*stingray.Client) r := stingray.NewServiceLevelMonitor(d.Id()) - resp, err := c.Delete(r) - // Deletes happen twice when a resource is recreated due to - // ForceNew, so treat a 404 as a success - // https://github.com/hashicorp/terraform/issues/542 - if err != nil && resp.StatusCode != 404 { + _, err := c.Delete(r) + if err != nil { return err } diff --git a/resource_ssl_cas.go b/resource_ssl_cas.go index 5768dd0..5c153a6 100644 --- a/resource_ssl_cas.go +++ b/resource_ssl_cas.go @@ -72,11 +72,8 @@ func resourceSSLCAsDelete(d *schema.ResourceData, meta interface{}) error { c := meta.(*stingray.Client) r := stingray.NewSSLCAs(d.Id()) - resp, err := c.Delete(r) - // Deletes happen twice when a resource is recreated due to - // ForceNew, so treat a 404 as a success - // https://github.com/hashicorp/terraform/issues/542 - if err != nil && resp.StatusCode != 404 { + _, err := c.Delete(r) + if err != nil { return err } diff --git a/resource_ssl_server_key.go b/resource_ssl_server_key.go index 1651e1f..4e140b8 100644 --- a/resource_ssl_server_key.go +++ b/resource_ssl_server_key.go @@ -93,11 +93,8 @@ func resourceSSLServerKeyDelete(d *schema.ResourceData, meta interface{}) error c := meta.(*stingray.Client) r := stingray.NewSSLServerKey(d.Id()) - resp, err := c.Delete(r) - // Deletes happen twice when a resource is recreated due to - // ForceNew, so treat a 404 as a success - // https://github.com/hashicorp/terraform/issues/542 - if err != nil && resp.StatusCode != 404 { + _, err := c.Delete(r) + if err != nil { return err } diff --git a/resource_traffic_ip_group.go b/resource_traffic_ip_group.go index 5b0ab14..416bc59 100644 --- a/resource_traffic_ip_group.go +++ b/resource_traffic_ip_group.go @@ -148,11 +148,8 @@ func resourceTrafficIPGroupDelete(d *schema.ResourceData, meta interface{}) erro c := meta.(*stingray.Client) r := stingray.NewTrafficIPGroup(d.Id()) - resp, err := c.Delete(r) - // Deletes happen twice when a resource is recreated due to - // ForceNew, so treat a 404 as a success - // https://github.com/hashicorp/terraform/issues/542 - if err != nil && resp.StatusCode != 404 { + _, err := c.Delete(r) + if err != nil { return err } diff --git a/resource_virtual_server.go b/resource_virtual_server.go index 9983d27..4e40b18 100644 --- a/resource_virtual_server.go +++ b/resource_virtual_server.go @@ -263,11 +263,8 @@ func resourceVirtualServerDelete(d *schema.ResourceData, meta interface{}) error c := meta.(*stingray.Client) r := stingray.NewVirtualServer(d.Id()) - resp, err := c.Delete(r) - // Deletes happen twice when a resource is recreated due to - // ForceNew, so treat a 404 as a success - // https://github.com/hashicorp/terraform/issues/542 - if err != nil && resp.StatusCode != 404 { + _, err := c.Delete(r) + if err != nil { return err }