fix: check 404 in all resource Read handlers and remove resource if needed

Author: sorccu

internal/provider/alert_channel_resource.go

@@ -341,9 +341,13 @@ func (r *AlertChannelResource) Read(
 		return
 	}
 
-	// TODO: Check if we really have to do the weird 404 handling
 	realizedModel, err := r.client.GetAlertChannel(ctx, id)
 	if err != nil {
+		if SDKIsHTTPNotFoundError(err) {
+			resp.State.RemoveResource(ctx)
+			return
+		}
+
 		resp.Diagnostics.AddError(
 			"Error Reading Checkly Alert Channel",
 			fmt.Sprintf("Could not retrieve alert channel, unexpected error: %s", err),

internal/provider/check_group_resource.go

@@ -234,9 +234,13 @@ func (r *CheckGroupResource) Read(
 		return
 	}
 
-	// TODO: Check if we really have to do the weird 404 handling
 	realizedModel, err := r.client.GetGroup(ctx, id)
 	if err != nil {
+		if SDKIsHTTPNotFoundError(err) {
+			resp.State.RemoveResource(ctx)
+			return
+		}
+
 		resp.Diagnostics.AddError(
 			"Error Reading Checkly Check Group",
 			fmt.Sprintf("Could not retrieve check group, unexpected error: %s", err),

internal/provider/check_resource.go

@@ -300,9 +300,13 @@ func (r *CheckResource) Read(
 		return
 	}
 
-	// TODO: Check if we really have to do the weird 404 handling
 	realizedModel, err := r.client.GetCheck(ctx, state.ID.ValueString())
 	if err != nil {
+		if SDKIsHTTPNotFoundError(err) {
+			resp.State.RemoveResource(ctx)
+			return
+		}
+
 		resp.Diagnostics.AddError(
 			"Error Reading Checkly Check",
 			fmt.Sprintf("Could not retrieve check, unexpected error: %s", err),

internal/provider/dashboard_resource.go

@@ -241,9 +241,13 @@ func (r *DashboardResource) Read(
 		return
 	}
 
-	// TODO: Check if we really have to do the weird 404 handling
 	realizedModel, err := r.client.GetDashboard(ctx, state.ID.ValueString())
 	if err != nil {
+		if SDKIsHTTPNotFoundError(err) {
+			resp.State.RemoveResource(ctx)
+			return
+		}
+
 		resp.Diagnostics.AddError(
 			"Error Reading Checkly Dashboard",
 			fmt.Sprintf("Could not retrieve dashboard, unexpected error: %s", err),

internal/provider/environment_variable_resource.go

@@ -170,12 +170,16 @@ func (r *EnvironmentVariableResource) Read(
 		return
 	}
 
-	// TODO: Check if we really have to do the weird 404 handling
 	realizedModel, err := r.client.GetEnvironmentVariable(
 		ctx,
 		state.ID.ValueString(),
 	)
 	if err != nil {
+		if SDKIsHTTPNotFoundError(err) {
+			resp.State.RemoveResource(ctx)
+			return
+		}
+
 		resp.Diagnostics.AddError(
 			"Error Reading Checkly Environment Variable",
 			fmt.Sprintf("Could not retrieve environment variable, unexpected error: %s", err),

internal/provider/heartbeat_resource.go

@@ -216,9 +216,13 @@ func (r *HeartbeatResource) Read(
 		return
 	}
 
-	// TODO: Check if we really have to do the weird 404 handling
 	realizedModel, err := r.client.GetHeartbeatCheck(ctx, state.ID.ValueString())
 	if err != nil {
+		if SDKIsHTTPNotFoundError(err) {
+			resp.State.RemoveResource(ctx)
+			return
+		}
+
 		resp.Diagnostics.AddError(
 			"Error Reading Checkly Heartbeat",
 			fmt.Sprintf("Could not retrieve heartbeat, unexpected error: %s", err),

internal/provider/maintenance_windows_resource.go

@@ -194,9 +194,13 @@ func (r *MaintenanceWindowsResource) Read(
 		return
 	}
 
-	// TODO: Check if we really have to do the weird 404 handling
 	realizedModel, err := r.client.GetMaintenanceWindow(ctx, id)
 	if err != nil {
+		if SDKIsHTTPNotFoundError(err) {
+			resp.State.RemoveResource(ctx)
+			return
+		}
+
 		resp.Diagnostics.AddError(
 			"Error Reading Checkly Maintenance Window",
 			fmt.Sprintf("Could not retrieve maintenance window, unexpected error: %s", err),

internal/provider/private_location_resource.go

@@ -168,9 +168,13 @@ func (r *PrivateLocationResource) Read(
 		return
 	}
 
-	// TODO: Check if we really have to do the weird 404 handling
 	realizedModel, err := r.client.GetPrivateLocation(ctx, state.ID.ValueString())
 	if err != nil {
+		if SDKIsHTTPNotFoundError(err) {
+			resp.State.RemoveResource(ctx)
+			return
+		}
+
 		resp.Diagnostics.AddError(
 			"Error Reading Checkly Private Location",
 			fmt.Sprintf("Could not retrieve private location, unexpected error: %s", err),

internal/provider/sdk.go

@@ -3,6 +3,7 @@ package provider
 import (
 	"fmt"
 	"strconv"
+	"strings"
 
 	"github.com/hashicorp/terraform-plugin-framework/attr"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
@@ -84,3 +85,19 @@ func SDKKeyValuesIntoMap(values *[]checkly.KeyValue) types.Map {
 
 	return types.MapValueMust(types.StringType, mapValues)
 }
+
+func SDKIsHTTPNotFoundError(err error) bool {
+	// Unfortunately the SDK presents HTTP errors in a completely unusable way,
+	// forcing us to match against string values.
+	msg := err.Error()
+
+	switch {
+	case strings.Contains(msg, "unexpected response status: 404"):
+		return true
+	// Unfortunate inconsistency.
+	case strings.Contains(msg, "unexpected response status 404"):
+		return true
+	}
+
+	return false
+}

internal/provider/snippet_resource.go

@@ -169,9 +169,13 @@ func (r *SnippetResource) Read(
 		return
 	}
 
-	// TODO: Check if we really have to do the weird 404 handling
 	realizedModel, err := r.client.GetSnippet(ctx, id)
 	if err != nil {
+		if SDKIsHTTPNotFoundError(err) {
+			resp.State.RemoveResource(ctx)
+			return
+		}
+
 		resp.Diagnostics.AddError(
 			"Error Reading Checkly Snippet",
 			fmt.Sprintf("Could not retrieve snippet, unexpected error: %s", err),