Remove the SetId("") from deletes

newrelic · Mar 26, 2019 · d6979ca · d6979ca
1 parent 649908c
commit d6979ca
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 19 deletions.
diff --git a/newrelic/resource_newrelic_alert_channel.go b/newrelic/resource_newrelic_alert_channel.go
@@ -162,7 +162,5 @@ func resourceNewRelicAlertChannelDelete(d *schema.ResourceData, meta interface{}
 		return err
 	}
 
-	d.SetId("")
-
 	return nil
 }
diff --git a/newrelic/resource_newrelic_alert_condition.go b/newrelic/resource_newrelic_alert_condition.go
@@ -361,7 +361,5 @@ func resourceNewRelicAlertConditionDelete(d *schema.ResourceData, meta interface
 		return err
 	}
 
-	d.SetId("")
-
 	return nil
 }
diff --git a/newrelic/resource_newrelic_alert_policy.go b/newrelic/resource_newrelic_alert_policy.go
@@ -148,7 +148,5 @@ func resourceNewRelicAlertPolicyDelete(d *schema.ResourceData, meta interface{})
 		return err
 	}
 
-	d.SetId("")
-
 	return nil
 }
diff --git a/newrelic/resource_newrelic_alert_policy_channel.go b/newrelic/resource_newrelic_alert_policy_channel.go
@@ -131,7 +131,5 @@ func resourceNewRelicAlertPolicyChannelDelete(d *schema.ResourceData, meta inter
 		}
 	}
 
-	d.SetId("")
-
 	return nil
 }
diff --git a/newrelic/resource_newrelic_dashboard.go b/newrelic/resource_newrelic_dashboard.go
@@ -326,14 +326,11 @@ func resourceNewRelicDashboardDelete(d *schema.ResourceData, meta interface{}) e
 
 	if err := client.DeleteDashboard(id); err != nil {
 		if err == newrelic.ErrNotFound {
-			d.SetId("")
 			return nil
 		}
 		return err
 	}
 
-	d.SetId("")
-
 	return nil
 }
 

diff --git a/newrelic/resource_newrelic_infra_alert_condition.go b/newrelic/resource_newrelic_infra_alert_condition.go
@@ -290,8 +290,6 @@ func resourceNewRelicInfraAlertConditionDelete(d *schema.ResourceData, meta inte
 		return err
 	}
 
-	d.SetId("")
-
 	return nil
 }
 

diff --git a/newrelic/resource_newrelic_nrql_alert_condition.go b/newrelic/resource_newrelic_nrql_alert_condition.go
@@ -265,7 +265,5 @@ func resourceNewRelicNrqlAlertConditionDelete(d *schema.ResourceData, meta inter
 		return err
 	}
 
-	d.SetId("")
-
 	return nil
 }
diff --git a/newrelic/resource_newrelic_synthetics_alert_condition.go b/newrelic/resource_newrelic_synthetics_alert_condition.go
@@ -162,7 +162,5 @@ func resourceNewRelicSyntheticsAlertConditionDelete(d *schema.ResourceData, meta
 		return err
 	}
 
-	d.SetId("")
-
 	return nil
 }
diff --git a/newrelic/resource_newrelic_synthetics_monitor.go b/newrelic/resource_newrelic_synthetics_monitor.go
@@ -247,6 +247,5 @@ func resourceNewRelicSyntheticsMonitorDelete(d *schema.ResourceData, meta interf
 		return err
 	}
 
-	d.SetId("")
 	return nil
 }
diff --git a/newrelic/resource_newrelic_synthetics_monitor_script.go b/newrelic/resource_newrelic_synthetics_monitor_script.go
@@ -106,6 +106,5 @@ func resourceNewRelicSyntheticsMonitorScriptDelete(d *schema.ResourceData, meta
 		return err
 	}
 
-	d.SetId("")
 	return nil
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     	}
-    	d.SetId("")
     	return nil
     }