Remove workaround for hashicorp/terraform#452

This has been fixed.
whitepages · Dec 11, 2014 · 1e85f57 · 1e85f57
1 parent 905bd86
commit 1e85f57
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 65 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 	}