Skip to content

Commit 8cdc522

Browse files
committed
fix lint
Signed-off-by: SungJin1212 <tjdwls1201@gmail.com>
1 parent cb2de19 commit 8cdc522

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

pkg/alertmanager/merger/v2_alert_groups.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"errors"
55
"sort"
66

7-
"github.com/go-openapi/swag"
7+
"github.com/go-openapi/swag/jsonutils"
88
v2 "github.com/prometheus/alertmanager/api/v2"
99
v2_models "github.com/prometheus/alertmanager/api/v2/models"
1010
prom_model "github.com/prometheus/common/model"
@@ -20,7 +20,7 @@ func (V2AlertGroups) MergeResponses(in [][]byte) ([]byte, error) {
2020
groups := make(v2_models.AlertGroups, 0)
2121
for _, body := range in {
2222
parsed := make(v2_models.AlertGroups, 0)
23-
if err := swag.ReadJSON(body, &parsed); err != nil {
23+
if err := jsonutils.ReadJSON(body, &parsed); err != nil {
2424
return nil, err
2525
}
2626
groups = append(groups, parsed...)
@@ -31,7 +31,7 @@ func (V2AlertGroups) MergeResponses(in [][]byte) ([]byte, error) {
3131
return nil, err
3232
}
3333

34-
return swag.WriteJSON(merged)
34+
return jsonutils.WriteJSON(merged)
3535
}
3636

3737
func mergeV2AlertGroups(in v2_models.AlertGroups) (v2_models.AlertGroups, error) {

pkg/alertmanager/merger/v2_alerts.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"sort"
66
"time"
77

8-
"github.com/go-openapi/swag"
8+
"github.com/go-openapi/swag/jsonutils"
99
v2_models "github.com/prometheus/alertmanager/api/v2/models"
1010
)
1111

@@ -18,7 +18,7 @@ func (V2Alerts) MergeResponses(in [][]byte) ([]byte, error) {
1818
alerts := make(v2_models.GettableAlerts, 0)
1919
for _, body := range in {
2020
parsed := make(v2_models.GettableAlerts, 0)
21-
if err := swag.ReadJSON(body, &parsed); err != nil {
21+
if err := jsonutils.ReadJSON(body, &parsed); err != nil {
2222
return nil, err
2323
}
2424
alerts = append(alerts, parsed...)
@@ -29,7 +29,7 @@ func (V2Alerts) MergeResponses(in [][]byte) ([]byte, error) {
2929
return nil, err
3030
}
3131

32-
return swag.WriteJSON(merged)
32+
return jsonutils.WriteJSON(merged)
3333
}
3434

3535
func mergeV2Alerts(in v2_models.GettableAlerts) (v2_models.GettableAlerts, error) {

pkg/alertmanager/merger/v2_silence_id.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package merger
33
import (
44
"errors"
55

6-
"github.com/go-openapi/swag"
6+
"github.com/go-openapi/swag/jsonutils"
77
v2_models "github.com/prometheus/alertmanager/api/v2/models"
88
)
99

@@ -15,7 +15,7 @@ func (V2SilenceID) MergeResponses(in [][]byte) ([]byte, error) {
1515
silences := make(v2_models.GettableSilences, 0)
1616
for _, body := range in {
1717
parsed := &v2_models.GettableSilence{}
18-
if err := swag.ReadJSON(body, parsed); err != nil {
18+
if err := jsonutils.ReadJSON(body, parsed); err != nil {
1919
return nil, err
2020
}
2121
silences = append(silences, parsed)
@@ -30,5 +30,5 @@ func (V2SilenceID) MergeResponses(in [][]byte) ([]byte, error) {
3030
return nil, errors.New("unexpected mismatched silence ids")
3131
}
3232

33-
return swag.WriteJSON(merged[0])
33+
return jsonutils.WriteJSON(merged[0])
3434
}

0 commit comments

Comments
 (0)