Skip to content

Commit acd89c0

Browse files
authored
Remove duplicate code (elastic#1193)
1 parent 6c9ba18 commit acd89c0

File tree

2 files changed

+1
-15
lines changed

2 files changed

+1
-15
lines changed

internal/clients/api_client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func CompositeIdFromStr(id string) (*CompositeId, diag.Diagnostics) {
5353

5454
func CompositeIdFromStrFw(id string) (*CompositeId, fwdiags.Diagnostics) {
5555
composite, diags := CompositeIdFromStr(id)
56-
return composite, utils.ConvertSDKDiagnosticsToFramework(diags)
56+
return composite, utils.FrameworkDiagsFromSDK(diags)
5757
}
5858

5959
func ResourceIDFromStr(id string) (string, diag.Diagnostics) {

internal/utils/diag.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,6 @@ import (
1010
sdkdiag "github.com/hashicorp/terraform-plugin-sdk/v2/diag"
1111
)
1212

13-
func ConvertSDKDiagnosticsToFramework(sdkDiags sdkdiag.Diagnostics) fwdiag.Diagnostics {
14-
var fwDiags fwdiag.Diagnostics
15-
16-
for _, sdkDiag := range sdkDiags {
17-
if sdkDiag.Severity == sdkdiag.Error {
18-
fwDiags.AddError(sdkDiag.Summary, sdkDiag.Detail)
19-
} else {
20-
fwDiags.AddWarning(sdkDiag.Summary, sdkDiag.Detail)
21-
}
22-
}
23-
24-
return fwDiags
25-
}
26-
2713
func CheckError(res *esapi.Response, errMsg string) sdkdiag.Diagnostics {
2814
var diags sdkdiag.Diagnostics
2915

0 commit comments

Comments
 (0)