fix: the aipe can return 410 for deleted objects instead of 404, which trips up the provider

Author: Harald Krämer

internal/aipe/api_error.go

@@ -17,10 +17,10 @@ func (e *ApiError) Error() string {
 	return e.Message
 }
 
-func ErrorIs404(err error) bool {
+func ErrorIsNotFound(err error) bool {
 	apiError, ok := errwrap.GetType(err, &ApiError{}).(*ApiError)
 
-	tflog.Info(context.TODO(), "ErrorIs404", map[string]interface{}{"apiError": apiError, "ok": ok})
+	tflog.Info(context.TODO(), "ErrorIsNotFound", map[string]interface{}{"apiError": apiError, "ok": ok})
 
-	return ok && apiError != nil && apiError.StatusCode == http.StatusNotFound
+	return ok && apiError != nil && (apiError.StatusCode == http.StatusNotFound || apiError.StatusCode == http.StatusGone)
 }

internal/provider/data_object_data_source.go

@@ -83,7 +83,7 @@ func (d *DataObjectDataSource) Read(ctx context.Context, req datasource.ReadRequ
 	tflog.Info(ctx, "Reading data source")
 	object, err := d.client.GetObject(ctx, data.Id.ValueString())
 	if err != nil {
-		if aipe.ErrorIs404(err) {
+		if aipe.ErrorIsNotFound(err) {
 			resp.State.RemoveResource(ctx)
 			return
 		}

internal/provider/data_object_resource.go

@@ -115,7 +115,7 @@ func (r *DataObjectResource) Read(ctx context.Context, req resource.ReadRequest,
 	tflog.Info(ctx, "Reading data source", map[string]interface{}{"id": data.Id.ValueString()})
 	object, err := r.client.GetObject(ctx, data.Id.ValueString())
 	if err != nil {
-		if aipe.ErrorIs404(err) {
+		if aipe.ErrorIsNotFound(err) {
 			resp.State.RemoveResource(ctx)
 			return
 		}
@@ -173,7 +173,7 @@ func (r *DataObjectResource) Delete(ctx context.Context, req resource.DeleteRequ
 	tflog.Info(ctx, "Deleting data source", map[string]interface{}{"id": data.Id.ValueString()})
 	err := r.client.DeleteObject(ctx, data.Id.ValueString())
 	if err != nil {
-		if aipe.ErrorIs404(err) {
+		if aipe.ErrorIsNotFound(err) {
 			return
 		}
 		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to delete example, got error: %s", err))