Handle 404s during reads (#180)

Author: deanhuynh

.golangci.yml

@@ -26,7 +26,7 @@ linters:
     - predeclared
     - revive
     - staticcheck
-    - tenv
+    - usetesting
     - unconvert
     - unparam
     - unused

internal/provider/destination_filter_resource.go

@@ -3,6 +3,7 @@ package provider
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"regexp"
 	"strings"
 
@@ -201,6 +202,12 @@ func (r *destinationFilterResource) Read(ctx context.Context, req resource.ReadR
 		defer body.Body.Close()
 	}
 	if err != nil {
+		if body.StatusCode == http.StatusNotFound {
+			resp.State.RemoveResource(ctx)
+
+			return
+		}
+
 		resp.Diagnostics.AddError(
 			fmt.Sprintf("Unable to read Destination Filter (ID: %s)", previousState.ID.ValueString()),
 			getError(err, body),

internal/provider/destination_resource.go

@@ -3,6 +3,7 @@ package provider
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/boolplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/listplanmodifier"
@@ -587,6 +588,12 @@ func (r *destinationResource) Read(ctx context.Context, req resource.ReadRequest
 		defer body.Body.Close()
 	}
 	if err != nil {
+		if body.StatusCode == http.StatusNotFound {
+			resp.State.RemoveResource(ctx)
+
+			return
+		}
+
 		resp.Diagnostics.AddError(
 			fmt.Sprintf("Unable to read Destination (ID: %s)", previousState.ID.ValueString()),
 			getError(err, body),

internal/provider/destination_subscription_resource.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"strings"
 
 	"github.com/segmentio/terraform-provider-segment/internal/provider/docs"
@@ -228,6 +229,12 @@ func (r *destinationSubscriptionResource) Read(ctx context.Context, req resource
 		defer body.Body.Close()
 	}
 	if err != nil {
+		if body.StatusCode == http.StatusNotFound {
+			resp.State.RemoveResource(ctx)
+
+			return
+		}
+
 		resp.Diagnostics.AddError(
 			fmt.Sprintf("Unable to read Destination subscription (ID: %s)", previousState.ID.ValueString()),
 			getError(err, body),

internal/provider/function_resource.go

@@ -3,6 +3,7 @@ package provider
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"regexp"
 
 	"github.com/segmentio/terraform-provider-segment/internal/provider/docs"
@@ -189,6 +190,12 @@ func (r *functionResource) Read(ctx context.Context, req resource.ReadRequest, r
 		defer body.Body.Close()
 	}
 	if err != nil {
+		if body.StatusCode == http.StatusNotFound {
+			resp.State.RemoveResource(ctx)
+
+			return
+		}
+
 		resp.Diagnostics.AddError(
 			fmt.Sprintf("Unable to read Function (ID: %s)", previousState.ID.ValueString()),
 			getError(err, body),

internal/provider/insert_function_instance_resource.go

@@ -3,6 +3,7 @@ package provider
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"strings"
 
 	"github.com/segmentio/terraform-provider-segment/internal/provider/docs"
@@ -159,6 +160,12 @@ func (r *insertFunctionInstanceResource) Read(ctx context.Context, req resource.
 		defer body.Body.Close()
 	}
 	if err != nil {
+		if body.StatusCode == http.StatusNotFound {
+			resp.State.RemoveResource(ctx)
+
+			return
+		}
+
 		resp.Diagnostics.AddError(
 			fmt.Sprintf("Unable to read Insert Function instance (ID: %s)", previousState.ID.ValueString()),
 			getError(err, body),

internal/provider/label_resource.go

@@ -163,10 +163,7 @@ func (r *labelResource) Read(ctx context.Context, req resource.ReadRequest, resp
 	}
 
 	if label == nil {
-		resp.Diagnostics.AddError(
-			"Unable to find Label",
-			fmt.Sprintf("Unable to find Label with key: %q and value: %q", state.Key, state.Value),
-		)
+		resp.State.RemoveResource(ctx)
 
 		return
 	}

internal/provider/profiles_warehouse_resource.go

@@ -167,6 +167,8 @@ func (r *profilesWarehouseResource) Read(ctx context.Context, req resource.ReadR
 
 	warehouse, err := findProfileWarehouse(r.authContext, r.client, previousState.ID.ValueString(), previousState.SpaceID.ValueString())
 	if err != nil {
+		resp.State.RemoveResource(ctx)
+
 		resp.Diagnostics.AddError(
 			fmt.Sprintf("Unable to read Profiles Warehouse (ID: %s)", previousState.ID.ValueString()),
 			err.Error(),
@@ -176,10 +178,7 @@ func (r *profilesWarehouseResource) Read(ctx context.Context, req resource.ReadR
 	}
 
 	if warehouse == nil {
-		resp.Diagnostics.AddError(
-			"Unable to find Profile Warehouse",
-			fmt.Sprintf("Profile Warehouse with id '%s' and space id '%s' not found", previousState.ID.ValueString(), previousState.SpaceID.ValueString()),
-		)
+		resp.State.RemoveResource(ctx)
 
 		return
 	}

internal/provider/reverse_etl_model_resource.go

@@ -3,6 +3,7 @@ package provider
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"github.com/segmentio/terraform-provider-segment/internal/provider/docs"
 	"github.com/segmentio/terraform-provider-segment/internal/provider/models"
@@ -160,6 +161,12 @@ func (r *reverseETLModelResource) Read(ctx context.Context, req resource.ReadReq
 		defer body.Body.Close()
 	}
 	if err != nil {
+		if body.StatusCode == http.StatusNotFound {
+			resp.State.RemoveResource(ctx)
+
+			return
+		}
+
 		resp.Diagnostics.AddError(
 			fmt.Sprintf("Unable to read Reverse ETL model (ID: %s)", previousState.ID.ValueString()),
 			getError(err, body),

internal/provider/source_resource.go

@@ -3,6 +3,7 @@ package provider
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"github.com/hashicorp/terraform-plugin-framework-validators/setvalidator"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/boolplanmodifier"
@@ -387,6 +388,12 @@ func (r *sourceResource) Read(ctx context.Context, req resource.ReadRequest, res
 		defer body.Body.Close()
 	}
 	if err != nil {
+		if body.StatusCode == http.StatusNotFound {
+			resp.State.RemoveResource(ctx)
+
+			return
+		}
+
 		resp.Diagnostics.AddError(
 			fmt.Sprintf("Unable to read Source (ID: %s)", previousState.ID.ValueString()),
 			getError(err, body),