Skip to content

Commit 7fceb66

Browse files
authored
fix(cockpit): add return object for enable/disable alert endpoints (scaleway#2530)
1 parent 6f998f4 commit 7fceb66

File tree

1 file changed

+26
-12
lines changed

1 file changed

+26
-12
lines changed

api/cockpit/v1/cockpit_sdk.go

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -760,6 +760,16 @@ type AlertManager struct {
760760
Region scw.Region `json:"region"`
761761
}
762762

763+
// DisableAlertRulesResponse: disable alert rules response.
764+
type DisableAlertRulesResponse struct {
765+
DisabledRuleIDs []string `json:"disabled_rule_ids"`
766+
}
767+
768+
// EnableAlertRulesResponse: enable alert rules response.
769+
type EnableAlertRulesResponse struct {
770+
EnabledRuleIDs []string `json:"enabled_rule_ids"`
771+
}
772+
763773
// GetConfigResponse: Cockpit configuration.
764774
type GetConfigResponse struct {
765775
// CustomMetricsRetention: custom metrics retention configuration.
@@ -2545,7 +2555,7 @@ func (s *RegionalAPI) DisableManagedAlerts(req *RegionalAPIDisableManagedAlertsR
25452555
}
25462556

25472557
// EnableAlertRules: Enable preconfigured alert rules. Enable alert rules from the list of available preconfigured rules.
2548-
func (s *RegionalAPI) EnableAlertRules(req *RegionalAPIEnableAlertRulesRequest, opts ...scw.RequestOption) error {
2558+
func (s *RegionalAPI) EnableAlertRules(req *RegionalAPIEnableAlertRulesRequest, opts ...scw.RequestOption) (*EnableAlertRulesResponse, error) {
25492559
var err error
25502560

25512561
if req.Region == "" {
@@ -2559,7 +2569,7 @@ func (s *RegionalAPI) EnableAlertRules(req *RegionalAPIEnableAlertRulesRequest,
25592569
}
25602570

25612571
if fmt.Sprint(req.Region) == "" {
2562-
return errors.New("field Region cannot be empty in request")
2572+
return nil, errors.New("field Region cannot be empty in request")
25632573
}
25642574

25652575
scwReq := &scw.ScalewayRequest{
@@ -2569,18 +2579,20 @@ func (s *RegionalAPI) EnableAlertRules(req *RegionalAPIEnableAlertRulesRequest,
25692579

25702580
err = scwReq.SetBody(req)
25712581
if err != nil {
2572-
return err
2582+
return nil, err
25732583
}
25742584

2575-
err = s.client.Do(scwReq, nil, opts...)
2585+
var resp EnableAlertRulesResponse
2586+
2587+
err = s.client.Do(scwReq, &resp, opts...)
25762588
if err != nil {
2577-
return err
2589+
return nil, err
25782590
}
2579-
return nil
2591+
return &resp, nil
25802592
}
25812593

25822594
// DisableAlertRules: Disable preconfigured alert rules. Disable alert rules from the list of available preconfigured rules.
2583-
func (s *RegionalAPI) DisableAlertRules(req *RegionalAPIDisableAlertRulesRequest, opts ...scw.RequestOption) error {
2595+
func (s *RegionalAPI) DisableAlertRules(req *RegionalAPIDisableAlertRulesRequest, opts ...scw.RequestOption) (*DisableAlertRulesResponse, error) {
25842596
var err error
25852597

25862598
if req.Region == "" {
@@ -2594,7 +2606,7 @@ func (s *RegionalAPI) DisableAlertRules(req *RegionalAPIDisableAlertRulesRequest
25942606
}
25952607

25962608
if fmt.Sprint(req.Region) == "" {
2597-
return errors.New("field Region cannot be empty in request")
2609+
return nil, errors.New("field Region cannot be empty in request")
25982610
}
25992611

26002612
scwReq := &scw.ScalewayRequest{
@@ -2604,14 +2616,16 @@ func (s *RegionalAPI) DisableAlertRules(req *RegionalAPIDisableAlertRulesRequest
26042616

26052617
err = scwReq.SetBody(req)
26062618
if err != nil {
2607-
return err
2619+
return nil, err
26082620
}
26092621

2610-
err = s.client.Do(scwReq, nil, opts...)
2622+
var resp DisableAlertRulesResponse
2623+
2624+
err = s.client.Do(scwReq, &resp, opts...)
26112625
if err != nil {
2612-
return err
2626+
return nil, err
26132627
}
2614-
return nil
2628+
return &resp, nil
26152629
}
26162630

26172631
// TriggerTestAlert: Send a test alert to the Alert manager to make sure your contact points get notified.

0 commit comments

Comments
 (0)