fix: error handling

Author: jianyuan

internal/diagutils/diagutils.go

@@ -10,6 +10,10 @@ func NewClientError(action string, err error) diag.ErrorDiagnostic {
 	return diag.NewErrorDiagnostic("Client error", fmt.Sprintf("Unable to %s, got error: %s", action, err))
 }
 
+func NewClientStatusError(action string, status int, body []byte) diag.ErrorDiagnostic {
+	return diag.NewErrorDiagnostic("Client error", fmt.Sprintf("Unable to %s, got status %d: %s", action, status, string(body)))
+}
+
 func NewNotFoundError(resource string) diag.ErrorDiagnostic {
 	return diag.NewErrorDiagnostic("Not found", fmt.Sprintf("No matching %s found", resource))
 }

internal/provider/data_source_organization.go

@@ -76,12 +76,17 @@ func (d *OrganizationDataSource) Read(ctx context.Context, req datasource.ReadRe
 		ctx,
 		data.Slug.ValueString(),
 	)
+	if err != nil {
+		resp.Diagnostics.Append(diagutils.NewClientError("read", err))
+		return
+	}
+
 	if httpResp.StatusCode() == http.StatusNotFound {
 		resp.Diagnostics.Append(diagutils.NewNotFoundError("organization"))
+		resp.State.RemoveResource(ctx)
 		return
-	}
-	if err != nil {
-		resp.Diagnostics.Append(diagutils.NewClientError("read", err))
+	} else if httpResp.StatusCode() != http.StatusOK {
+		resp.Diagnostics.Append(diagutils.NewClientStatusError("read", httpResp.StatusCode(), httpResp.Body))
 		return
 	}
 

internal/provider/data_source_project.go

@@ -114,13 +114,17 @@ func (d *ProjectDataSource) Read(ctx context.Context, req datasource.ReadRequest
 		data.Organization.ValueString(),
 		data.Slug.ValueString(),
 	)
+	if err != nil {
+		resp.Diagnostics.Append(diagutils.NewClientError("read", err))
+		return
+	}
 
 	if httpResp.StatusCode() == http.StatusNotFound {
 		resp.Diagnostics.Append(diagutils.NewNotFoundError("project"))
+		resp.State.RemoveResource(ctx)
 		return
-	}
-	if err != nil {
-		resp.Diagnostics.Append(diagutils.NewClientError("read", err))
+	} else if httpResp.StatusCode() != http.StatusOK {
+		resp.Diagnostics.Append(diagutils.NewClientStatusError("read", httpResp.StatusCode(), httpResp.Body))
 		return
 	}
 

internal/provider/resource_project_spike_protection.go

@@ -118,13 +118,17 @@ func (r *ProjectSpikeProtectionResource) Read(ctx context.Context, req resource.
 		data.Organization.ValueString(),
 		data.Project.ValueString(),
 	)
+	if err != nil {
+		resp.Diagnostics.Append(diagutils.NewClientError("read", err))
+		return
+	}
+
 	if httpResp.StatusCode() == http.StatusNotFound {
 		resp.Diagnostics.Append(diagutils.NewNotFoundError("project"))
 		resp.State.RemoveResource(ctx)
 		return
-	}
-	if err != nil {
-		resp.Diagnostics.Append(diagutils.NewClientError("read", err))
+	} else if httpResp.StatusCode() != http.StatusOK {
+		resp.Diagnostics.Append(diagutils.NewClientStatusError("read", httpResp.StatusCode(), httpResp.Body))
 		return
 	}