Skip to content

Commit 2839798

Browse files
authored
Add rollback reason to upgrade details metadata (#327)
* Add rollback reason to upgrade details metadata
1 parent aad2c0e commit 2839798

File tree

1 file changed

+19
-18
lines changed

1 file changed

+19
-18
lines changed

kibana/fleet.go

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ func (client *Client) CreatePolicy(ctx context.Context, request AgentPolicy) (r
132132
return r, fmt.Errorf("unable to marshal create policy request into JSON: %w", err)
133133
}
134134

135-
resp, err := client.Connection.SendWithContext(ctx, http.MethodPost, fleetAgentPoliciesAPI, nil, nil, bytes.NewReader(reqBody))
135+
resp, err := client.SendWithContext(ctx, http.MethodPost, fleetAgentPoliciesAPI, nil, nil, bytes.NewReader(reqBody))
136136
if err != nil {
137137
return r, fmt.Errorf("error calling create policy API: %w", err)
138138
}
@@ -166,7 +166,7 @@ func (client *Client) CreateDownloadSource(ctx context.Context, source DownloadS
166166
fmt.Errorf("unable to marshal DownloadSource into JSON: %w", err)
167167
}
168168

169-
resp, err := client.Connection.SendWithContext(
169+
resp, err := client.SendWithContext(
170170
ctx,
171171
http.MethodPost,
172172
fleetAgentDownloadSourcesAPI,
@@ -207,7 +207,7 @@ func (client *Client) CreateDownloadSource(ctx context.Context, source DownloadS
207207
// GetPolicy returns the policy with 'policy_id' id.
208208
func (client *Client) GetPolicy(ctx context.Context, id string) (r PolicyResponse, err error) {
209209
apiURL := fmt.Sprintf(fleetAgentPolicyAPI, id)
210-
resp, err := client.Connection.SendWithContext(ctx, http.MethodGet, apiURL, nil, nil, nil)
210+
resp, err := client.SendWithContext(ctx, http.MethodGet, apiURL, nil, nil, nil)
211211
if err != nil {
212212
return r, fmt.Errorf("error calling get policy API: %w", err)
213213
}
@@ -225,7 +225,7 @@ func (client *Client) UpdatePolicy(ctx context.Context, id string, request Agent
225225
}
226226

227227
apiURL := fmt.Sprintf(fleetAgentPolicyAPI, id)
228-
resp, err := client.Connection.SendWithContext(ctx, http.MethodPut, apiURL, nil, nil, bytes.NewReader(reqBody))
228+
resp, err := client.SendWithContext(ctx, http.MethodPut, apiURL, nil, nil, bytes.NewReader(reqBody))
229229
if err != nil {
230230
return r, fmt.Errorf("error calling update policy API: %w", err)
231231
}
@@ -248,7 +248,7 @@ func (client *Client) DeletePolicy(ctx context.Context, id string) error {
248248
return fmt.Errorf("unable to marshal delete policy request into JSON: %w", err)
249249
}
250250

251-
resp, err := client.Connection.SendWithContext(ctx, http.MethodPost, fleetAgentsDeleteAPI, nil, nil, bytes.NewReader(reqBody))
251+
resp, err := client.SendWithContext(ctx, http.MethodPost, fleetAgentsDeleteAPI, nil, nil, bytes.NewReader(reqBody))
252252
if err != nil {
253253
return fmt.Errorf("error calling delete policy API: %w", err)
254254
}
@@ -290,7 +290,7 @@ func (client *Client) CreateEnrollmentAPIKey(ctx context.Context, request Create
290290
return r, fmt.Errorf("unable to marshal create enrollment API key request into JSON: %w", err)
291291
}
292292

293-
resp, err := client.Connection.SendWithContext(ctx, http.MethodPost, fleetEnrollmentAPIKeysAPI, nil, nil, bytes.NewReader(reqBody))
293+
resp, err := client.SendWithContext(ctx, http.MethodPost, fleetEnrollmentAPIKeysAPI, nil, nil, bytes.NewReader(reqBody))
294294
if err != nil {
295295
return r, fmt.Errorf("error calling create enrollment API key API: %w", err)
296296
}
@@ -342,6 +342,7 @@ type AgentUpgradeDetails struct {
342342
DownloadRate details.DownloadRate `json:"download_rate"`
343343
FailedState string `json:"failed_state"`
344344
ErrorMsg string `json:"error_msg"`
345+
Reason string `json:"reason"`
345346
} `json:"metadata"`
346347
}
347348

@@ -360,7 +361,7 @@ type ListAgentsResponse struct {
360361

361362
// ListAgents returns a list of agents known to Kibana
362363
func (client *Client) ListAgents(ctx context.Context, _ ListAgentsRequest) (r ListAgentsResponse, err error) {
363-
resp, err := client.Connection.SendWithContext(ctx, http.MethodGet, fleetAgentsAPI, nil, nil, nil)
364+
resp, err := client.SendWithContext(ctx, http.MethodGet, fleetAgentsAPI, nil, nil, nil)
364365
if err != nil {
365366
return r, fmt.Errorf("error calling list agents API: %w", err)
366367
}
@@ -380,7 +381,7 @@ type GetAgentResponse AgentExisting
380381
func (client *Client) GetAgent(ctx context.Context, request GetAgentRequest) (r GetAgentResponse, err error) {
381382
apiURL := fmt.Sprintf(fleetAgentAPI, request.ID)
382383

383-
resp, err := client.Connection.SendWithContext(ctx, http.MethodGet, apiURL, nil, nil, nil)
384+
resp, err := client.SendWithContext(ctx, http.MethodGet, apiURL, nil, nil, nil)
384385
if err != nil {
385386
return r, fmt.Errorf("error calling get agent API: %w", err)
386387
}
@@ -416,7 +417,7 @@ func (client *Client) UnEnrollAgent(ctx context.Context, request UnEnrollAgentRe
416417
}
417418
apiURL := fmt.Sprintf(fleetUnEnrollAgentAPI, request.ID)
418419

419-
resp, err := client.Connection.SendWithContext(ctx, http.MethodPost, apiURL, nil, nil, bytes.NewReader(reqBody))
420+
resp, err := client.SendWithContext(ctx, http.MethodPost, apiURL, nil, nil, bytes.NewReader(reqBody))
420421
if err != nil {
421422
return r, fmt.Errorf("error calling unenroll agent API: %w", err)
422423
}
@@ -445,7 +446,7 @@ func (client *Client) UpgradeAgent(ctx context.Context, request UpgradeAgentRequ
445446
}
446447

447448
apiURL := fmt.Sprintf(fleetUpgradeAgentAPI, request.ID)
448-
resp, err := client.Connection.SendWithContext(ctx, http.MethodPost, apiURL, nil, nil, bytes.NewReader(reqBody))
449+
resp, err := client.SendWithContext(ctx, http.MethodPost, apiURL, nil, nil, bytes.NewReader(reqBody))
449450
if err != nil {
450451
return r, fmt.Errorf("error calling upgrade agent API: %w", err)
451452
}
@@ -498,7 +499,7 @@ type FleetServerHostsResponse struct {
498499

499500
// ListFleetServerHosts returns a list of fleet server hosts
500501
func (client *Client) ListFleetServerHosts(ctx context.Context, _ ListFleetServerHostsRequest) (r ListFleetServerHostsResponse, err error) {
501-
resp, err := client.Connection.SendWithContext(ctx, http.MethodGet, fleetFleetServerHostsAPI, nil, nil, nil)
502+
resp, err := client.SendWithContext(ctx, http.MethodGet, fleetFleetServerHostsAPI, nil, nil, nil)
502503
if err != nil {
503504
return r, fmt.Errorf("error calling list fleet server hosts API: %w", err)
504505
}
@@ -516,7 +517,7 @@ func (client *Client) CreateFleetServerHosts(ctx context.Context, req ListFleetS
516517
return FleetServerHostsResponse{}, fmt.Errorf("could not marshal ListFleetServerHostsRequest: %w", err)
517518
}
518519

519-
resp, err := client.Connection.SendWithContext(ctx, http.MethodPost,
520+
resp, err := client.SendWithContext(ctx, http.MethodPost,
520521
fleetFleetServerHostsAPI,
521522
nil, nil, bytes.NewReader(bs))
522523
if err != nil {
@@ -538,7 +539,7 @@ type GetFleetServerHostResponse FleetServerHost
538539
func (client *Client) GetFleetServerHost(ctx context.Context, request GetFleetServerHostRequest) (r GetFleetServerHostResponse, err error) {
539540
apiURL := fleetFleetServerHostsAPI + "/" + request.ID
540541

541-
resp, err := client.Connection.SendWithContext(ctx, http.MethodGet, apiURL, nil, nil, nil)
542+
resp, err := client.SendWithContext(ctx, http.MethodGet, apiURL, nil, nil, nil)
542543
if err != nil {
543544
return r, fmt.Errorf("error calling get fleet server hosts API: %w", err)
544545
}
@@ -603,7 +604,7 @@ func (client *Client) InstallFleetPackage(ctx context.Context, req PackagePolicy
603604
return r, fmt.Errorf("marshalling request json: %w", err)
604605
}
605606

606-
resp, err := client.Connection.SendWithContext(ctx,
607+
resp, err := client.SendWithContext(ctx,
607608
http.MethodPost,
608609
fleetPackagePoliciesAPI,
609610
nil,
@@ -627,7 +628,7 @@ func (client *Client) DeleteFleetPackage(ctx context.Context, packagePolicyID st
627628
return r, err
628629
}
629630

630-
resp, err := client.Connection.SendWithContext(ctx,
631+
resp, err := client.SendWithContext(ctx,
631632
http.MethodDelete,
632633
u,
633634
nil,
@@ -685,7 +686,7 @@ func (client *Client) CreateFleetProxy(ctx context.Context, req ProxiesRequest)
685686
return ProxiesResponse{}, fmt.Errorf("could not marshal ListFleetServerHostsRequest: %w", err)
686687
}
687688

688-
r, err := client.Connection.SendWithContext(ctx, http.MethodPost,
689+
r, err := client.SendWithContext(ctx, http.MethodPost,
689690
fleetProxiesAPI, nil, nil,
690691
bytes.NewReader(bs),
691692
)
@@ -726,7 +727,7 @@ func (client *Client) GetPolicyUninstallTokens(ctx context.Context, policyID str
726727
q.Add("page", "1")
727728
q.Add("perPage", "1000")
728729

729-
resp, err := client.Connection.SendWithContext(ctx,
730+
resp, err := client.SendWithContext(ctx,
730731
http.MethodGet,
731732
fleetUninstallTokensAPI,
732733
q,
@@ -762,7 +763,7 @@ func (client *Client) GetUninstallToken(ctx context.Context, tokenID string) (r
762763
return r, err
763764
}
764765

765-
resp, err := client.Connection.SendWithContext(ctx,
766+
resp, err := client.SendWithContext(ctx,
766767
http.MethodGet,
767768
u,
768769
nil,

0 commit comments

Comments
 (0)