Skip to content

Commit dc10c5d

Browse files
daemitusdaemitus
committed
convert fleet fwdiag to diag
1 parent e94a8b8 commit dc10c5d

File tree

1 file changed

+51
-51
lines changed

1 file changed

+51
-51
lines changed

‎internal/clients/fleet/fleet.go

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ import (
88
"net/http"
99

1010
fleetapi "github.com/elastic/terraform-provider-elasticstack/generated/fleet"
11-
fwdiag "github.com/hashicorp/terraform-plugin-framework/diag"
11+
"github.com/hashicorp/terraform-plugin-framework/diag"
1212
)
1313

1414
var (
1515
ErrPackageNotFound = errors.New("package not found")
1616
)
1717

1818
// AllEnrollmentTokens reads all enrollment tokens from the API.
19-
func AllEnrollmentTokens(ctx context.Context, client *Client) ([]fleetapi.EnrollmentApiKey, fwdiag.Diagnostics) {
19+
func AllEnrollmentTokens(ctx context.Context, client *Client) ([]fleetapi.EnrollmentApiKey, diag.Diagnostics) {
2020
resp, err := client.API.GetEnrollmentApiKeysWithResponse(ctx)
2121
if err != nil {
2222
return nil, fromErr(err)
@@ -25,11 +25,11 @@ func AllEnrollmentTokens(ctx context.Context, client *Client) ([]fleetapi.Enroll
2525
if resp.StatusCode() == http.StatusOK {
2626
return resp.JSON200.Items, nil
2727
}
28-
return nil, reportUnknownErrorFw(resp.StatusCode(), resp.Body)
28+
return nil, reportUnknownError(resp.StatusCode(), resp.Body)
2929
}
3030

3131
// GetEnrollmentTokensByPolicy Get enrollment tokens by given policy ID
32-
func GetEnrollmentTokensByPolicy(ctx context.Context, client *Client, policyID string) ([]fleetapi.EnrollmentApiKey, fwdiag.Diagnostics) {
32+
func GetEnrollmentTokensByPolicy(ctx context.Context, client *Client, policyID string) ([]fleetapi.EnrollmentApiKey, diag.Diagnostics) {
3333
resp, err := client.API.GetEnrollmentApiKeysWithResponse(ctx, func(ctx context.Context, req *http.Request) error {
3434
q := req.URL.Query()
3535
q.Set("kuery", "policy_id:"+policyID)
@@ -44,11 +44,11 @@ func GetEnrollmentTokensByPolicy(ctx context.Context, client *Client, policyID s
4444
if resp.StatusCode() == http.StatusOK {
4545
return resp.JSON200.Items, nil
4646
}
47-
return nil, reportUnknownErrorFw(resp.StatusCode(), resp.Body)
47+
return nil, reportUnknownError(resp.StatusCode(), resp.Body)
4848
}
4949

5050
// ReadAgentPolicy reads a specific agent policy from the API.
51-
func ReadAgentPolicy(ctx context.Context, client *Client, id string) (*fleetapi.AgentPolicy, fwdiag.Diagnostics) {
51+
func ReadAgentPolicy(ctx context.Context, client *Client, id string) (*fleetapi.AgentPolicy, diag.Diagnostics) {
5252
resp, err := client.API.AgentPolicyInfoWithResponse(ctx, id)
5353
if err != nil {
5454
return nil, fromErr(err)
@@ -60,12 +60,12 @@ func ReadAgentPolicy(ctx context.Context, client *Client, id string) (*fleetapi.
6060
case http.StatusNotFound:
6161
return nil, nil
6262
default:
63-
return nil, reportUnknownErrorFw(resp.StatusCode(), resp.Body)
63+
return nil, reportUnknownError(resp.StatusCode(), resp.Body)
6464
}
6565
}
6666

6767
// CreateAgentPolicy creates a new agent policy.
68-
func CreateAgentPolicy(ctx context.Context, client *Client, req fleetapi.AgentPolicyCreateRequest, sysMonitoring bool) (*fleetapi.AgentPolicy, fwdiag.Diagnostics) {
68+
func CreateAgentPolicy(ctx context.Context, client *Client, req fleetapi.AgentPolicyCreateRequest, sysMonitoring bool) (*fleetapi.AgentPolicy, diag.Diagnostics) {
6969
resp, err := client.API.CreateAgentPolicyWithResponse(ctx, req, func(ctx context.Context, req *http.Request) error {
7070
if sysMonitoring {
7171
qs := req.URL.Query()
@@ -83,12 +83,12 @@ func CreateAgentPolicy(ctx context.Context, client *Client, req fleetapi.AgentPo
8383
case http.StatusOK:
8484
return resp.JSON200.Item, nil
8585
default:
86-
return nil, reportUnknownErrorFw(resp.StatusCode(), resp.Body)
86+
return nil, reportUnknownError(resp.StatusCode(), resp.Body)
8787
}
8888
}
8989

9090
// UpdateAgentPolicy updates an existing agent policy.
91-
func UpdateAgentPolicy(ctx context.Context, client *Client, id string, req fleetapi.AgentPolicyUpdateRequest) (*fleetapi.AgentPolicy, fwdiag.Diagnostics) {
91+
func UpdateAgentPolicy(ctx context.Context, client *Client, id string, req fleetapi.AgentPolicyUpdateRequest) (*fleetapi.AgentPolicy, diag.Diagnostics) {
9292
resp, err := client.API.UpdateAgentPolicyWithResponse(ctx, id, req)
9393
if err != nil {
9494
return nil, fromErr(err)
@@ -98,12 +98,12 @@ func UpdateAgentPolicy(ctx context.Context, client *Client, id string, req fleet
9898
case http.StatusOK:
9999
return &resp.JSON200.Item, nil
100100
default:
101-
return nil, reportUnknownErrorFw(resp.StatusCode(), resp.Body)
101+
return nil, reportUnknownError(resp.StatusCode(), resp.Body)
102102
}
103103
}
104104

105105
// DeleteAgentPolicy deletes an existing agent policy
106-
func DeleteAgentPolicy(ctx context.Context, client *Client, id string) fwdiag.Diagnostics {
106+
func DeleteAgentPolicy(ctx context.Context, client *Client, id string) diag.Diagnostics {
107107
body := fleetapi.DeleteAgentPolicyJSONRequestBody{
108108
AgentPolicyId: id,
109109
}
@@ -119,12 +119,12 @@ func DeleteAgentPolicy(ctx context.Context, client *Client, id string) fwdiag.Di
119119
case http.StatusNotFound:
120120
return nil
121121
default:
122-
return reportUnknownErrorFw(resp.StatusCode(), resp.Body)
122+
return reportUnknownError(resp.StatusCode(), resp.Body)
123123
}
124124
}
125125

126126
// ReadOutput reads a specific output from the API.
127-
func ReadOutput(ctx context.Context, client *Client, id string) (*fleetapi.OutputCreateRequest, fwdiag.Diagnostics) {
127+
func ReadOutput(ctx context.Context, client *Client, id string) (*fleetapi.OutputCreateRequest, diag.Diagnostics) {
128128
resp, err := client.API.GetOutputWithResponse(ctx, id)
129129
if err != nil {
130130
return nil, fromErr(err)
@@ -136,12 +136,12 @@ func ReadOutput(ctx context.Context, client *Client, id string) (*fleetapi.Outpu
136136
case http.StatusNotFound:
137137
return nil, nil
138138
default:
139-
return nil, reportUnknownErrorFw(resp.StatusCode(), resp.Body)
139+
return nil, reportUnknownError(resp.StatusCode(), resp.Body)
140140
}
141141
}
142142

143143
// CreateOutput creates a new output.
144-
func CreateOutput(ctx context.Context, client *Client, req fleetapi.PostOutputsJSONRequestBody) (*fleetapi.OutputCreateRequest, fwdiag.Diagnostics) {
144+
func CreateOutput(ctx context.Context, client *Client, req fleetapi.PostOutputsJSONRequestBody) (*fleetapi.OutputCreateRequest, diag.Diagnostics) {
145145
resp, err := client.API.PostOutputsWithResponse(ctx, req)
146146
if err != nil {
147147
return nil, fromErr(err)
@@ -151,12 +151,12 @@ func CreateOutput(ctx context.Context, client *Client, req fleetapi.PostOutputsJ
151151
case http.StatusOK:
152152
return resp.JSON200.Item, nil
153153
default:
154-
return nil, reportUnknownErrorFw(resp.StatusCode(), resp.Body)
154+
return nil, reportUnknownError(resp.StatusCode(), resp.Body)
155155
}
156156
}
157157

158158
// UpdateOutput updates an existing output.
159-
func UpdateOutput(ctx context.Context, client *Client, id string, req fleetapi.UpdateOutputJSONRequestBody) (*fleetapi.OutputUpdateRequest, fwdiag.Diagnostics) {
159+
func UpdateOutput(ctx context.Context, client *Client, id string, req fleetapi.UpdateOutputJSONRequestBody) (*fleetapi.OutputUpdateRequest, diag.Diagnostics) {
160160
resp, err := client.API.UpdateOutputWithResponse(ctx, id, req)
161161
if err != nil {
162162
return nil, fromErr(err)
@@ -166,12 +166,12 @@ func UpdateOutput(ctx context.Context, client *Client, id string, req fleetapi.U
166166
case http.StatusOK:
167167
return resp.JSON200.Item, nil
168168
default:
169-
return nil, reportUnknownErrorFw(resp.StatusCode(), resp.Body)
169+
return nil, reportUnknownError(resp.StatusCode(), resp.Body)
170170
}
171171
}
172172

173173
// DeleteOutput deletes an existing output
174-
func DeleteOutput(ctx context.Context, client *Client, id string) fwdiag.Diagnostics {
174+
func DeleteOutput(ctx context.Context, client *Client, id string) diag.Diagnostics {
175175
resp, err := client.API.DeleteOutputWithResponse(ctx, id)
176176
if err != nil {
177177
return fromErr(err)
@@ -183,12 +183,12 @@ func DeleteOutput(ctx context.Context, client *Client, id string) fwdiag.Diagnos
183183
case http.StatusNotFound:
184184
return nil
185185
default:
186-
return reportUnknownErrorFw(resp.StatusCode(), resp.Body)
186+
return reportUnknownError(resp.StatusCode(), resp.Body)
187187
}
188188
}
189189

190190
// ReadFleetServerHost reads a specific fleet server host from the API.
191-
func ReadFleetServerHost(ctx context.Context, client *Client, id string) (*fleetapi.FleetServerHost, fwdiag.Diagnostics) {
191+
func ReadFleetServerHost(ctx context.Context, client *Client, id string) (*fleetapi.FleetServerHost, diag.Diagnostics) {
192192
resp, err := client.API.GetOneFleetServerHostsWithResponse(ctx, id)
193193
if err != nil {
194194
return nil, fromErr(err)
@@ -200,12 +200,12 @@ func ReadFleetServerHost(ctx context.Context, client *Client, id string) (*fleet
200200
case http.StatusNotFound:
201201
return nil, nil
202202
default:
203-
return nil, reportUnknownErrorFw(resp.StatusCode(), resp.Body)
203+
return nil, reportUnknownError(resp.StatusCode(), resp.Body)
204204
}
205205
}
206206

207207
// CreateFleetServerHost creates a new fleet server host.
208-
func CreateFleetServerHost(ctx context.Context, client *Client, req fleetapi.PostFleetServerHostsJSONRequestBody) (*fleetapi.FleetServerHost, fwdiag.Diagnostics) {
208+
func CreateFleetServerHost(ctx context.Context, client *Client, req fleetapi.PostFleetServerHostsJSONRequestBody) (*fleetapi.FleetServerHost, diag.Diagnostics) {
209209
resp, err := client.API.PostFleetServerHostsWithResponse(ctx, req)
210210
if err != nil {
211211
return nil, fromErr(err)
@@ -215,12 +215,12 @@ func CreateFleetServerHost(ctx context.Context, client *Client, req fleetapi.Pos
215215
case http.StatusOK:
216216
return resp.JSON200.Item, nil
217217
default:
218-
return nil, reportUnknownErrorFw(resp.StatusCode(), resp.Body)
218+
return nil, reportUnknownError(resp.StatusCode(), resp.Body)
219219
}
220220
}
221221

222222
// UpdateFleetServerHost updates an existing fleet server host.
223-
func UpdateFleetServerHost(ctx context.Context, client *Client, id string, req fleetapi.UpdateFleetServerHostsJSONRequestBody) (*fleetapi.FleetServerHost, fwdiag.Diagnostics) {
223+
func UpdateFleetServerHost(ctx context.Context, client *Client, id string, req fleetapi.UpdateFleetServerHostsJSONRequestBody) (*fleetapi.FleetServerHost, diag.Diagnostics) {
224224
resp, err := client.API.UpdateFleetServerHostsWithResponse(ctx, id, req)
225225
if err != nil {
226226
return nil, fromErr(err)
@@ -230,12 +230,12 @@ func UpdateFleetServerHost(ctx context.Context, client *Client, id string, req f
230230
case http.StatusOK:
231231
return &resp.JSON200.Item, nil
232232
default:
233-
return nil, reportUnknownErrorFw(resp.StatusCode(), resp.Body)
233+
return nil, reportUnknownError(resp.StatusCode(), resp.Body)
234234
}
235235
}
236236

237237
// DeleteFleetServerHost deletes an existing fleet server host.
238-
func DeleteFleetServerHost(ctx context.Context, client *Client, id string) fwdiag.Diagnostics {
238+
func DeleteFleetServerHost(ctx context.Context, client *Client, id string) diag.Diagnostics {
239239
resp, err := client.API.DeleteFleetServerHostsWithResponse(ctx, id)
240240
if err != nil {
241241
return fromErr(err)
@@ -247,12 +247,12 @@ func DeleteFleetServerHost(ctx context.Context, client *Client, id string) fwdia
247247
case http.StatusNotFound:
248248
return nil
249249
default:
250-
return reportUnknownErrorFw(resp.StatusCode(), resp.Body)
250+
return reportUnknownError(resp.StatusCode(), resp.Body)
251251
}
252252
}
253253

254254
// ReadPackagePolicy reads a specific package policy from the API.
255-
func ReadPackagePolicy(ctx context.Context, client *Client, id string) (*fleetapi.PackagePolicy, fwdiag.Diagnostics) {
255+
func ReadPackagePolicy(ctx context.Context, client *Client, id string) (*fleetapi.PackagePolicy, diag.Diagnostics) {
256256
format := fleetapi.GetPackagePolicyParamsFormatSimplified
257257
params := fleetapi.GetPackagePolicyParams{
258258
Format: &format,
@@ -269,12 +269,12 @@ func ReadPackagePolicy(ctx context.Context, client *Client, id string) (*fleetap
269269
case http.StatusNotFound:
270270
return nil, nil
271271
default:
272-
return nil, reportUnknownErrorFw(resp.StatusCode(), resp.Body)
272+
return nil, reportUnknownError(resp.StatusCode(), resp.Body)
273273
}
274274
}
275275

276276
// CreatePackagePolicy creates a new package policy.
277-
func CreatePackagePolicy(ctx context.Context, client *Client, req fleetapi.CreatePackagePolicyJSONRequestBody) (*fleetapi.PackagePolicy, fwdiag.Diagnostics) {
277+
func CreatePackagePolicy(ctx context.Context, client *Client, req fleetapi.CreatePackagePolicyJSONRequestBody) (*fleetapi.PackagePolicy, diag.Diagnostics) {
278278
format := fleetapi.CreatePackagePolicyParamsFormatSimplified
279279
params := fleetapi.CreatePackagePolicyParams{
280280
Format: &format,
@@ -289,12 +289,12 @@ func CreatePackagePolicy(ctx context.Context, client *Client, req fleetapi.Creat
289289
case http.StatusOK:
290290
return &resp.JSON200.Item, nil
291291
default:
292-
return nil, reportUnknownErrorFw(resp.StatusCode(), resp.Body)
292+
return nil, reportUnknownError(resp.StatusCode(), resp.Body)
293293
}
294294
}
295295

296296
// UpdatePackagePolicy updates an existing package policy.
297-
func UpdatePackagePolicy(ctx context.Context, client *Client, id string, req fleetapi.UpdatePackagePolicyJSONRequestBody) (*fleetapi.PackagePolicy, fwdiag.Diagnostics) {
297+
func UpdatePackagePolicy(ctx context.Context, client *Client, id string, req fleetapi.UpdatePackagePolicyJSONRequestBody) (*fleetapi.PackagePolicy, diag.Diagnostics) {
298298
format := fleetapi.UpdatePackagePolicyParamsFormatSimplified
299299
params := fleetapi.UpdatePackagePolicyParams{
300300
Format: &format,
@@ -309,12 +309,12 @@ func UpdatePackagePolicy(ctx context.Context, client *Client, id string, req fle
309309
case http.StatusOK:
310310
return &resp.JSON200.Item, nil
311311
default:
312-
return nil, reportUnknownErrorFw(resp.StatusCode(), resp.Body)
312+
return nil, reportUnknownError(resp.StatusCode(), resp.Body)
313313
}
314314
}
315315

316316
// DeletePackagePolicy deletes an existing package policy.
317-
func DeletePackagePolicy(ctx context.Context, client *Client, id string, force bool) fwdiag.Diagnostics {
317+
func DeletePackagePolicy(ctx context.Context, client *Client, id string, force bool) diag.Diagnostics {
318318
params := fleetapi.DeletePackagePolicyParams{Force: &force}
319319
resp, err := client.API.DeletePackagePolicyWithResponse(ctx, id, &params)
320320
if err != nil {
@@ -327,12 +327,12 @@ func DeletePackagePolicy(ctx context.Context, client *Client, id string, force b
327327
case http.StatusNotFound:
328328
return nil
329329
default:
330-
return reportUnknownErrorFw(resp.StatusCode(), resp.Body)
330+
return reportUnknownError(resp.StatusCode(), resp.Body)
331331
}
332332
}
333333

334334
// ReadPackage reads a specific package from the API.
335-
func ReadPackage(ctx context.Context, client *Client, name, version string) fwdiag.Diagnostics {
335+
func ReadPackage(ctx context.Context, client *Client, name, version string) diag.Diagnostics {
336336
params := fleetapi.GetPackageParams{}
337337

338338
resp, err := client.API.GetPackage(ctx, name, version, &params)
@@ -352,12 +352,12 @@ func ReadPackage(ctx context.Context, client *Client, name, version string) fwdi
352352
return fromErr(err)
353353
}
354354

355-
return reportUnknownErrorFw(resp.StatusCode, errData)
355+
return reportUnknownError(resp.StatusCode, errData)
356356
}
357357
}
358358

359359
// InstallPackage installs a package.
360-
func InstallPackage(ctx context.Context, client *Client, name, version string, force bool) fwdiag.Diagnostics {
360+
func InstallPackage(ctx context.Context, client *Client, name, version string, force bool) diag.Diagnostics {
361361
params := fleetapi.InstallPackageParams{}
362362
body := fleetapi.InstallPackageJSONRequestBody{
363363
Force: &force,
@@ -379,12 +379,12 @@ func InstallPackage(ctx context.Context, client *Client, name, version string, f
379379
return fromErr(err)
380380
}
381381

382-
return reportUnknownErrorFw(resp.StatusCode, errData)
382+
return reportUnknownError(resp.StatusCode, errData)
383383
}
384384
}
385385

386386
// Uninstall uninstalls a package.
387-
func Uninstall(ctx context.Context, client *Client, name, version string, force bool) fwdiag.Diagnostics {
387+
func Uninstall(ctx context.Context, client *Client, name, version string, force bool) diag.Diagnostics {
388388
params := fleetapi.DeletePackageParams{}
389389
body := fleetapi.DeletePackageJSONRequestBody{
390390
Force: &force,
@@ -401,12 +401,12 @@ func Uninstall(ctx context.Context, client *Client, name, version string, force
401401
case http.StatusNotFound:
402402
return nil
403403
default:
404-
return reportUnknownErrorFw(resp.StatusCode(), resp.Body)
404+
return reportUnknownError(resp.StatusCode(), resp.Body)
405405
}
406406
}
407407

408408
// AllPackages returns information about the latest packages known to Fleet.
409-
func AllPackages(ctx context.Context, client *Client, prerelease bool) ([]fleetapi.SearchResult, fwdiag.Diagnostics) {
409+
func AllPackages(ctx context.Context, client *Client, prerelease bool) ([]fleetapi.SearchResult, diag.Diagnostics) {
410410
params := fleetapi.ListAllPackagesParams{
411411
Prerelease: &prerelease,
412412
}
@@ -420,23 +420,23 @@ func AllPackages(ctx context.Context, client *Client, prerelease bool) ([]fleeta
420420
case http.StatusOK:
421421
return resp.JSON200.Items, nil
422422
default:
423-
return nil, reportUnknownErrorFw(resp.StatusCode(), resp.Body)
423+
return nil, reportUnknownError(resp.StatusCode(), resp.Body)
424424
}
425425
}
426426

427427
// fromErr recreates the sdkdiag.FromErr functionality.
428-
func fromErr(err error) fwdiag.Diagnostics {
428+
func fromErr(err error) diag.Diagnostics {
429429
if err == nil {
430430
return nil
431431
}
432-
return fwdiag.Diagnostics{
433-
fwdiag.NewErrorDiagnostic(err.Error(), ""),
432+
return diag.Diagnostics{
433+
diag.NewErrorDiagnostic(err.Error(), ""),
434434
}
435435
}
436436

437-
func reportUnknownErrorFw(statusCode int, body []byte) fwdiag.Diagnostics {
438-
return fwdiag.Diagnostics{
439-
fwdiag.NewErrorDiagnostic(
437+
func reportUnknownError(statusCode int, body []byte) diag.Diagnostics {
438+
return diag.Diagnostics{
439+
diag.NewErrorDiagnostic(
440440
fmt.Sprintf("Unexpected status code from server: got HTTP %d", statusCode),
441441
string(body),
442442
),

0 commit comments

Comments
 (0)