Handle 404 on deletes

Author: deanhuynh

internal/provider/destination_filter_resource.go

@@ -320,6 +320,12 @@ func (r *destinationFilterResource) Delete(ctx context.Context, req resource.Del
 		defer body.Body.Close()
 	}
 	if err != nil {
+		if body.StatusCode == http.StatusNotFound {
+			resp.State.RemoveResource(ctx)
+
+			return
+		}
+
 		resp.Diagnostics.AddError(
 			fmt.Sprintf("Unable to delete Destination Filter (ID: %s)", state.ID.ValueString()),
 			getError(err, body),

internal/provider/destination_resource.go

@@ -701,6 +701,12 @@ func (r *destinationResource) Delete(ctx context.Context, req resource.DeleteReq
 		defer body.Body.Close()
 	}
 	if err != nil {
+		if body.StatusCode == http.StatusNotFound {
+			resp.State.RemoveResource(ctx)
+
+			return
+		}
+
 		resp.Diagnostics.AddError(
 			fmt.Sprintf("Unable to delete Destination (ID: %s)", state.ID.ValueString()),
 			getError(err, body),

internal/provider/destination_subscription_resource.go

@@ -359,6 +359,12 @@ func (r *destinationSubscriptionResource) Delete(ctx context.Context, req resour
 		defer body.Body.Close()
 	}
 	if err != nil {
+		if body.StatusCode == http.StatusNotFound {
+			resp.State.RemoveResource(ctx)
+
+			return
+		}
+
 		resp.Diagnostics.AddError(
 			fmt.Sprintf("Unable to delete Destination subscription (ID: %s)", config.ID.ValueString()),
 			getError(err, body),

internal/provider/function_resource.go

@@ -290,6 +290,12 @@ func (r *functionResource) Delete(ctx context.Context, req resource.DeleteReques
 		defer body.Body.Close()
 	}
 	if err != nil {
+		if body.StatusCode == http.StatusNotFound || body.StatusCode == http.StatusForbidden {
+			resp.State.RemoveResource(ctx)
+
+			return
+		}
+
 		resp.Diagnostics.AddError(
 			fmt.Sprintf("Unable to delete Function (ID: %s)", config.ID.ValueString()),
 			getError(err, body),

internal/provider/insert_function_instance_resource.go

@@ -277,6 +277,12 @@ func (r *insertFunctionInstanceResource) Delete(ctx context.Context, req resourc
 		defer body.Body.Close()
 	}
 	if err != nil {
+		if body.StatusCode == http.StatusNotFound {
+			resp.State.RemoveResource(ctx)
+
+			return
+		}
+
 		resp.Diagnostics.AddError(
 			fmt.Sprintf("Unable to delete Insert Function instance (ID: %s)", config.ID.ValueString()),
 			getError(err, body),

internal/provider/label_resource.go

@@ -3,6 +3,7 @@ package provider
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"strings"
 
 	"github.com/hashicorp/terraform-plugin-framework/path"
@@ -200,6 +201,12 @@ func (r *labelResource) Delete(ctx context.Context, req resource.DeleteRequest,
 		defer body.Body.Close()
 	}
 	if err != nil {
+		if body.StatusCode == http.StatusNotFound {
+			resp.State.RemoveResource(ctx)
+
+			return
+		}
+
 		resp.Diagnostics.AddError(
 			"Unable to delete Label",
 			getError(err, body),

internal/provider/profiles_warehouse_resource.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"net/http"
 	"strings"
 
 	"github.com/segmentio/terraform-provider-segment/internal/provider/docs"
@@ -281,6 +282,12 @@ func (r *profilesWarehouseResource) Delete(ctx context.Context, req resource.Del
 		defer body.Body.Close()
 	}
 	if err != nil {
+		if body.StatusCode == http.StatusNotFound {
+			resp.State.RemoveResource(ctx)
+
+			return
+		}
+
 		resp.Diagnostics.AddError(
 			fmt.Sprintf("Unable to delete Profiles Warehouse (ID: %s)", config.ID.ValueString()),
 			getError(err, body),

internal/provider/reverse_etl_model_resource.go

@@ -270,6 +270,12 @@ func (r *reverseETLModelResource) Delete(ctx context.Context, req resource.Delet
 		defer body.Body.Close()
 	}
 	if err != nil {
+		if body.StatusCode == http.StatusNotFound {
+			resp.State.RemoveResource(ctx)
+
+			return
+		}
+
 		resp.Diagnostics.AddError(
 			fmt.Sprintf("Unable to delete Reverse ETL model (ID: %s)", config.ID.ValueString()),
 			getError(err, body),

internal/provider/source_resource.go

@@ -552,6 +552,12 @@ func (r *sourceResource) Delete(ctx context.Context, req resource.DeleteRequest,
 		defer body.Body.Close()
 	}
 	if err != nil {
+		if body.StatusCode == http.StatusNotFound {
+			resp.State.RemoveResource(ctx)
+
+			return
+		}
+
 		resp.Diagnostics.AddError(
 			fmt.Sprintf("Unable to delete Source (ID: %s)", config.ID.ValueString()),
 			getError(err, body),

internal/provider/source_tracking_plan_connection_resource.go

@@ -408,6 +408,12 @@ func (r *sourceTrackingPlanConnectionResource) Delete(ctx context.Context, req r
 			defer body.Body.Close()
 		}
 		if err != nil {
+			if body.StatusCode == http.StatusNotFound {
+				resp.State.RemoveResource(ctx)
+
+				return
+			}
+
 			resp.Diagnostics.AddError(
 				"Unable to remove Source-Tracking Plan connection",
 				getError(err, body),