diff --git a/newrelic/resource_newrelic_alert_channel.go b/newrelic/resource_newrelic_alert_channel.go index 0faf728ed..5c4db7c0b 100644 --- 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 index 861125bc8..4a8c85c55 100644 --- 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 index e1eb0aadf..52338f2fd 100644 --- 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 index c797fcae5..5206e0198 100644 --- 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 index 7275b32d6..9984c1538 100644 --- 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 index a7dbdc340..595ea5d4a 100644 --- 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 index f4e471a2d..25e428799 100644 --- 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 index 9ca4b8a1b..f2a438ddd 100644 --- 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 index bd5191615..67ee97e4f 100644 --- 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 index 20ccfb656..a1398caa1 100644 --- 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 }