Refactor custom error diag

Author: delores-hashicorp

internal/customdiags/error_http_status_code.go

@@ -0,0 +1,63 @@
+package customdiags
+
+import (
+	"net/http"
+
+	"github.com/hashicorp/terraform-plugin-framework/diag"
+)
+
+// ErrorHTTPStatusCode is an error diagnostic that stored the error code.
+type ErrorHTTPStatusCode struct {
+	detail         string
+	summary        string
+	HTTPStatusCode int
+}
+
+// Detail returns the diagnostic detail.
+func (d ErrorHTTPStatusCode) Detail() string {
+	return d.detail
+}
+
+// Equal returns true if the other diagnostic is equivalent.
+func (d ErrorHTTPStatusCode) Equal(o diag.Diagnostic) bool {
+	ed, ok := o.(ErrorHTTPStatusCode)
+
+	if !ok {
+		return false
+	}
+
+	return ed.Summary() == d.Summary() && ed.Detail() == d.Detail() && ed.HTTPStatusCode == d.HTTPStatusCode
+}
+
+// Summary returns the diagnostic summary.
+func (d ErrorHTTPStatusCode) Summary() string {
+	return d.summary
+}
+
+// Severity returns the diagnostic severity.
+func (d ErrorHTTPStatusCode) Severity() diag.Severity {
+	return diag.SeverityError
+}
+
+// NewErrorHTTPStatusCode returns a new error severity diagnostic with the given summary, detail and error code.
+func NewErrorHTTPStatusCode(summary string, detail string, statusCode int) ErrorHTTPStatusCode {
+	return ErrorHTTPStatusCode{
+		detail:         detail,
+		summary:        summary,
+		HTTPStatusCode: statusCode,
+	}
+}
+
+// HasConflictError checks if a diagnostic has a specific error code.
+func HasConflictError(diags diag.Diagnostics) bool {
+	for _, d := range diags {
+		diag, ok := d.(*ErrorHTTPStatusCode)
+		if !ok {
+			return false
+		}
+		if diag.HTTPStatusCode == http.StatusConflict {
+			return true
+		}
+	}
+	return false
+}

internal/customdiags/with_error_code.go

@@ -70,7 +70,7 @@ func (u *orgIAMPolicyUpdater) GetResourceIamPolicy(ctx context.Context) (*models
 			diags.AddError("failed to cast organization IAM policy error", err.Error())
 			return nil, diags
 		}
-		diags.Append(customdiags.NewErrorDiagnosticWithErrorCode("failed to retrieve organization IAM policy", err.Error(), serviceErr.Code()))
+		diags.Append(customdiags.NewErrorHTTPStatusCode("failed to retrieve organization IAM policy", err.Error(), serviceErr.Code()))
 		return nil, diags
 	}
 
@@ -93,7 +93,7 @@ func (u *orgIAMPolicyUpdater) SetResourceIamPolicy(ctx context.Context, policy *
 			diags.AddError("failed to cast organization IAM policy error", err.Error())
 			return nil, diags
 		}
-		diags.Append(customdiags.NewErrorDiagnosticWithErrorCode("failed to update organization IAM policy", err.Error(), serviceErr.Code()))
+		diags.Append(customdiags.NewErrorHTTPStatusCode("failed to update organization IAM policy", err.Error(), serviceErr.Code()))
 		return nil, diags
 	}
 

internal/provider/resourcemanager/resource_organization_iam_policy.go

@@ -92,7 +92,7 @@ func (u *projectIAMPolicyUpdater) GetResourceIamPolicy(ctx context.Context) (*mo
 			diags.AddError("failed to cast project IAM policy error", err.Error())
 			return nil, diags
 		}
-		diags.Append(customdiags.NewErrorDiagnosticWithErrorCode("failed to retrieve project IAM policy", err.Error(), serviceErr.Code()))
+		diags.Append(customdiags.NewErrorHTTPStatusCode("failed to retrieve project IAM policy", err.Error(), serviceErr.Code()))
 		return nil, diags
 	}
 
@@ -115,7 +115,7 @@ func (u *projectIAMPolicyUpdater) SetResourceIamPolicy(ctx context.Context, poli
 			diags.AddError("failed to cast project IAM policy error", err.Error())
 			return nil, diags
 		}
-		diags.Append(customdiags.NewErrorDiagnosticWithErrorCode("failed to update project IAM policy", err.Error(), serviceErr.Code()))
+		diags.Append(customdiags.NewErrorHTTPStatusCode("failed to update project IAM policy", err.Error(), serviceErr.Code()))
 		return nil, diags
 	}
 

internal/provider/resourcemanager/resource_project_iam_policy.go

@@ -93,7 +93,7 @@ func (u *vaultSecretsAppResourceIAMPolicyUpdater) GetResourceIamPolicy(ctx conte
 		if serviceErr.Code() == http.StatusNotFound {
 			return &models.HashicorpCloudResourcemanagerPolicy{}, diags
 		}
-		diags.Append(customdiags.NewErrorDiagnosticWithErrorCode("failed to retrieve resource IAM policy", err.Error(), serviceErr.Code()))
+		diags.Append(customdiags.NewErrorHTTPStatusCode("failed to retrieve resource IAM policy", err.Error(), serviceErr.Code()))
 		return nil, diags
 	}
 
@@ -117,7 +117,7 @@ func (u *vaultSecretsAppResourceIAMPolicyUpdater) SetResourceIamPolicy(ctx conte
 			diags.AddError("failed to cast resource IAM policy error", err.Error())
 			return nil, diags
 		}
-		diags.Append(customdiags.NewErrorDiagnosticWithErrorCode("failed to update resource IAM policy", err.Error(), serviceErr.Code()))
+		diags.Append(customdiags.NewErrorHTTPStatusCode("failed to update resource IAM policy", err.Error(), serviceErr.Code()))
 		return nil, diags
 	}