Skip to content

Remove duplicate code #1193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 9, 2025
Merged

Remove duplicate code #1193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/clients/api_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
14 changes: 0 additions & 14 deletions internal/utils/diag.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading