diff --git a/internal/clients/api_client.go b/internal/clients/api_client.go index ba0b4dcf3..c57719165 100644 --- a/internal/clients/api_client.go +++ b/internal/clients/api_client.go @@ -53,7 +53,7 @@ func CompositeIdFromStr(id string) (*CompositeId, diag.Diagnostics) { func CompositeIdFromStrFw(id string) (*CompositeId, fwdiags.Diagnostics) { composite, diags := CompositeIdFromStr(id) - return composite, utils.ConvertSDKDiagnosticsToFramework(diags) + return composite, utils.FrameworkDiagsFromSDK(diags) } func ResourceIDFromStr(id string) (string, diag.Diagnostics) { diff --git a/internal/utils/diag.go b/internal/utils/diag.go index 7e7011911..47d48914c 100644 --- a/internal/utils/diag.go +++ b/internal/utils/diag.go @@ -10,20 +10,6 @@ import ( sdkdiag "github.com/hashicorp/terraform-plugin-sdk/v2/diag" ) -func ConvertSDKDiagnosticsToFramework(sdkDiags sdkdiag.Diagnostics) fwdiag.Diagnostics { - var fwDiags fwdiag.Diagnostics - - for _, sdkDiag := range sdkDiags { - if sdkDiag.Severity == sdkdiag.Error { - fwDiags.AddError(sdkDiag.Summary, sdkDiag.Detail) - } else { - fwDiags.AddWarning(sdkDiag.Summary, sdkDiag.Detail) - } - } - - return fwDiags -} - func CheckError(res *esapi.Response, errMsg string) sdkdiag.Diagnostics { var diags sdkdiag.Diagnostics