oops missing error check

honeycombio · Nov 16, 2023 · 3cc485d · 3cc485d
1 parent b852f1a
commit 3cc485d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 22 deletions.
diff --git a/internal/provider/burn_alert_resource.go b/internal/provider/burn_alert_resource.go
@@ -437,18 +437,20 @@ func (r *burnAlertResource) Delete(ctx context.Context, req resource.DeleteReque
 	// Delete the burn alert, using the values from state
 	var detailedErr client.DetailedError
 	err := r.client.BurnAlerts.Delete(ctx, state.Dataset.ValueString(), state.ID.ValueString())
-	if errors.As(err, &detailedErr) {
-		// if not found consider it deleted -- so don't error
-		if !detailedErr.IsNotFound() {
-			resp.Diagnostics.Append(helper.NewDetailedErrorDiagnostic(
+	if err != nil {
+		if errors.As(err, &detailedErr) {
+			// if not found consider it deleted -- so don't error
+			if !detailedErr.IsNotFound() {
+				resp.Diagnostics.Append(helper.NewDetailedErrorDiagnostic(
+					"Error Deleting Honeycomb Burn Alert",
+					&detailedErr,
+				))
+			}
+		} else {
+			resp.Diagnostics.AddError(
 				"Error Deleting Honeycomb Burn Alert",
-				&detailedErr,
-			))
+				"Could not delete Burn Alert ID "+state.ID.ValueString()+": "+err.Error(),
+			)
 		}
-	} else {
-		resp.Diagnostics.AddError(
-			"Error Deleting Honeycomb Burn Alert",
-			"Could not delete Burn Alert ID "+state.ID.ValueString()+": "+err.Error(),
-		)
 	}
 }
diff --git a/internal/provider/trigger_resource.go b/internal/provider/trigger_resource.go
@@ -379,19 +379,21 @@ func (r *triggerResource) Delete(ctx context.Context, req resource.DeleteRequest
 
 	var detailedErr client.DetailedError
 	err := r.client.Triggers.Delete(ctx, state.Dataset.ValueString(), state.ID.ValueString())
-	if errors.As(err, &detailedErr) {
-		// if not found consider it deleted -- so don't error
-		if !detailedErr.IsNotFound() {
-			resp.Diagnostics.Append(helper.NewDetailedErrorDiagnostic(
+	if err != nil {
+		if errors.As(err, &detailedErr) {
+			// if not found consider it deleted -- so don't error
+			if !detailedErr.IsNotFound() {
+				resp.Diagnostics.Append(helper.NewDetailedErrorDiagnostic(
+					"Error Deleting Honeycomb Trigger",
+					&detailedErr,
+				))
+			}
+		} else {
+			resp.Diagnostics.AddError(
 				"Error Deleting Honeycomb Trigger",
-				&detailedErr,
-			))
+				"Could not delete Trigger ID "+state.ID.ValueString()+": "+err.Error(),
+			)
 		}
-	} else {
-		resp.Diagnostics.AddError(
-			"Error Deleting Honeycomb Trigger",
-			"Could not delete Trigger ID "+state.ID.ValueString()+": "+err.Error(),
-		)
 	}
 }