Skip to content

Commit ba4af81

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

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/felixge/fgprof v0.9.5
1515
github.com/go-kit/log v0.2.1
1616
github.com/go-openapi/strfmt v0.24.0
17-
github.com/go-openapi/swag v0.25.1
17+
github.com/go-openapi/swag v0.25.1 // indirect
1818
github.com/go-redis/redis/v8 v8.11.5
1919
github.com/gogo/protobuf v1.3.2
2020
github.com/gogo/status v1.1.1
@@ -80,6 +80,7 @@ require (
8080
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1
8181
github.com/bboreham/go-loser v0.0.0-20230920113527-fcc2c21820a3
8282
github.com/cespare/xxhash/v2 v2.3.0
83+
github.com/go-openapi/swag/jsonutils v0.25.1
8384
github.com/google/go-cmp v0.7.0
8485
github.com/google/uuid v1.6.0
8586
github.com/hashicorp/golang-lru/v2 v2.0.7
@@ -168,7 +169,6 @@ require (
168169
github.com/go-openapi/swag/conv v0.25.1 // indirect
169170
github.com/go-openapi/swag/fileutils v0.25.1 // indirect
170171
github.com/go-openapi/swag/jsonname v0.25.1 // indirect
171-
github.com/go-openapi/swag/jsonutils v0.25.1 // indirect
172172
github.com/go-openapi/swag/loading v0.25.1 // indirect
173173
github.com/go-openapi/swag/mangling v0.25.1 // indirect
174174
github.com/go-openapi/swag/netutils v0.25.1 // indirect

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
}

pkg/alertmanager/merger/v2_silences.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"errors"
55
"time"
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
)
@@ -18,7 +18,7 @@ func (V2Silences) MergeResponses(in [][]byte) ([]byte, error) {
1818
silences := make(v2_models.GettableSilences, 0)
1919
for _, body := range in {
2020
parsed := make(v2_models.GettableSilences, 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
silences = append(silences, parsed...)
@@ -29,7 +29,7 @@ func (V2Silences) 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 mergeV2Silences(in v2_models.GettableSilences) (v2_models.GettableSilences, error) {

0 commit comments

Comments
 (0)