Skip to content

Commit b702b7a

Browse files
oktalzoktalz
committed
BUILD/MINOR: update go-openapi/swag package
1 parent 9bc3a81 commit b702b7a

File tree

5 files changed

+49
-15
lines changed

5 files changed

+49
-15
lines changed

‎.aspell.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,4 @@ allowed:
5656
- svc
5757
- frontent
5858
- pprof
59+
- openapi

‎crs/api/ingress/v1/tcp.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package v1
1717

1818
import (
19-
"github.com/go-openapi/swag"
19+
"github.com/go-openapi/swag/jsonutils"
2020
"github.com/haproxytech/client-native/v5/models"
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222
)
@@ -161,13 +161,13 @@ func (s *TCPService) MarshalBinary() ([]byte, error) {
161161
if s == nil {
162162
return nil, nil
163163
}
164-
return swag.WriteJSON(s)
164+
return jsonutils.WriteJSON(s)
165165
}
166166

167167
// UnmarshalBinary interface implementation
168168
func (s *TCPService) UnmarshalBinary(b []byte) error {
169169
var res TCPService
170-
if err := swag.ReadJSON(b, &res); err != nil {
170+
if err := jsonutils.ReadJSON(b, &res); err != nil {
171171
return err
172172
}
173173
*s = res

‎crs/api/ingress/v3/tcp.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package v3
1717

1818
import (
19-
"github.com/go-openapi/swag"
19+
"github.com/go-openapi/swag/jsonutils"
2020
"github.com/haproxytech/client-native/v6/models"
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222
)
@@ -87,13 +87,13 @@ func (s *TCPService) MarshalBinary() ([]byte, error) {
8787
if s == nil {
8888
return nil, nil
8989
}
90-
return swag.WriteJSON(s)
90+
return jsonutils.WriteJSON(s)
9191
}
9292

9393
// UnmarshalBinary interface implementation
9494
func (s *TCPService) UnmarshalBinary(b []byte) error {
9595
var res TCPService
96-
if err := swag.ReadJSON(b, &res); err != nil {
96+
if err := jsonutils.ReadJSON(b, &res); err != nil {
9797
return err
9898
}
9999
*s = res

‎go.mod‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/Masterminds/semver/v3 v3.3.1
88
github.com/brianvoe/gofakeit/v7 v7.2.1
99
github.com/fasthttp/router v1.5.4
10-
github.com/go-openapi/swag v0.23.1
10+
github.com/go-openapi/swag/jsonutils v0.24.0
1111
github.com/go-test/deep v1.1.1
1212
github.com/google/go-cmp v0.7.0
1313
github.com/google/renameio v1.0.1
@@ -16,7 +16,7 @@ require (
1616
github.com/jessevdk/go-flags v1.4.0
1717
github.com/pires/go-proxyproto v0.8.1
1818
github.com/prometheus/client_golang v1.22.0
19-
github.com/stretchr/testify v1.10.0
19+
github.com/stretchr/testify v1.11.1
2020
github.com/valyala/fasthttp v1.62.0
2121
go.uber.org/automaxprocs v1.6.0
2222
golang.org/x/text v0.28.0
@@ -32,7 +32,7 @@ require (
3232
)
3333

3434
require (
35-
github.com/andybalholm/brotli v1.1.1 // indirect
35+
github.com/andybalholm/brotli v1.2.0 // indirect
3636
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
3737
github.com/beorn7/perks v1.0.1 // indirect
3838
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -49,6 +49,17 @@ require (
4949
github.com/go-openapi/loads v0.22.0 // indirect
5050
github.com/go-openapi/spec v0.21.0 // indirect
5151
github.com/go-openapi/strfmt v0.23.0 // indirect
52+
github.com/go-openapi/swag v0.24.1 // indirect
53+
github.com/go-openapi/swag/cmdutils v0.24.0 // indirect
54+
github.com/go-openapi/swag/conv v0.24.0 // indirect
55+
github.com/go-openapi/swag/fileutils v0.24.0 // indirect
56+
github.com/go-openapi/swag/jsonname v0.24.0 // indirect
57+
github.com/go-openapi/swag/loading v0.24.0 // indirect
58+
github.com/go-openapi/swag/mangling v0.24.0 // indirect
59+
github.com/go-openapi/swag/netutils v0.24.0 // indirect
60+
github.com/go-openapi/swag/stringutils v0.24.0 // indirect
61+
github.com/go-openapi/swag/typeutils v0.24.0 // indirect
62+
github.com/go-openapi/swag/yamlutils v0.24.0 // indirect
5263
github.com/go-openapi/validate v0.24.0 // indirect
5364
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
5465
github.com/gofrs/flock v0.12.1 // indirect

‎go.sum‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ github.com/GehirnInc/crypt v0.0.0-20230320061759-8cc1b52080c5 h1:IEjq88XO4PuBDcv
22
github.com/GehirnInc/crypt v0.0.0-20230320061759-8cc1b52080c5/go.mod h1:exZ0C/1emQJAw5tHOaUDyY1ycttqBAPcxuzf7QbY6ec=
33
github.com/Masterminds/semver/v3 v3.3.1 h1:QtNSWtVZ3nBfk8mAOu/B6v7FMJ+NHTIgUPi7rj+4nv4=
44
github.com/Masterminds/semver/v3 v3.3.1/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
5-
github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA=
6-
github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA=
5+
github.com/andybalholm/brotli v1.2.0 h1:ukwgCxwYrmACq68yiUqwIWnGY0cTPox/M94sVwToPjQ=
6+
github.com/andybalholm/brotli v1.2.0/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
77
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
88
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
99
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
@@ -46,8 +46,30 @@ github.com/go-openapi/spec v0.21.0 h1:LTVzPc3p/RzRnkQqLRndbAzjY0d0BCL72A6j3CdL9Z
4646
github.com/go-openapi/spec v0.21.0/go.mod h1:78u6VdPw81XU44qEWGhtr982gJ5BWg2c0I5XwVMotYk=
4747
github.com/go-openapi/strfmt v0.23.0 h1:nlUS6BCqcnAk0pyhi9Y+kdDVZdZMHfEKQiS4HaMgO/c=
4848
github.com/go-openapi/strfmt v0.23.0/go.mod h1:NrtIpfKtWIygRkKVsxh7XQMDQW5HKQl6S5ik2elW+K4=
49-
github.com/go-openapi/swag v0.23.1 h1:lpsStH0n2ittzTnbaSloVZLuB5+fvSY/+hnagBjSNZU=
50-
github.com/go-openapi/swag v0.23.1/go.mod h1:STZs8TbRvEQQKUA+JZNAm3EWlgaOBGpyFDqQnDHMef0=
49+
github.com/go-openapi/swag v0.24.1 h1:DPdYTZKo6AQCRqzwr/kGkxJzHhpKxZ9i/oX0zag+MF8=
50+
github.com/go-openapi/swag v0.24.1/go.mod h1:sm8I3lCPlspsBBwUm1t5oZeWZS0s7m/A+Psg0ooRU0A=
51+
github.com/go-openapi/swag/cmdutils v0.24.0 h1:KlRCffHwXFI6E5MV9n8o8zBRElpY4uK4yWyAMWETo9I=
52+
github.com/go-openapi/swag/cmdutils v0.24.0/go.mod h1:uxib2FAeQMByyHomTlsP8h1TtPd54Msu2ZDU/H5Vuf8=
53+
github.com/go-openapi/swag/conv v0.24.0 h1:ejB9+7yogkWly6pnruRX45D1/6J+ZxRu92YFivx54ik=
54+
github.com/go-openapi/swag/conv v0.24.0/go.mod h1:jbn140mZd7EW2g8a8Y5bwm8/Wy1slLySQQ0ND6DPc2c=
55+
github.com/go-openapi/swag/fileutils v0.24.0 h1:U9pCpqp4RUytnD689Ek/N1d2N/a//XCeqoH508H5oak=
56+
github.com/go-openapi/swag/fileutils v0.24.0/go.mod h1:3SCrCSBHyP1/N+3oErQ1gP+OX1GV2QYFSnrTbzwli90=
57+
github.com/go-openapi/swag/jsonname v0.24.0 h1:2wKS9bgRV/xB8c62Qg16w4AUiIrqqiniJFtZGi3dg5k=
58+
github.com/go-openapi/swag/jsonname v0.24.0/go.mod h1:GXqrPzGJe611P7LG4QB9JKPtUZ7flE4DOVechNaDd7Q=
59+
github.com/go-openapi/swag/jsonutils v0.24.0 h1:F1vE1q4pg1xtO3HTyJYRmEuJ4jmIp2iZ30bzW5XgZts=
60+
github.com/go-openapi/swag/jsonutils v0.24.0/go.mod h1:vBowZtF5Z4DDApIoxcIVfR8v0l9oq5PpYRUuteVu6f0=
61+
github.com/go-openapi/swag/loading v0.24.0 h1:ln/fWTwJp2Zkj5DdaX4JPiddFC5CHQpvaBKycOlceYc=
62+
github.com/go-openapi/swag/loading v0.24.0/go.mod h1:gShCN4woKZYIxPxbfbyHgjXAhO61m88tmjy0lp/LkJk=
63+
github.com/go-openapi/swag/mangling v0.24.0 h1:PGOQpViCOUroIeak/Uj/sjGAq9LADS3mOyjznmHy2pk=
64+
github.com/go-openapi/swag/mangling v0.24.0/go.mod h1:Jm5Go9LHkycsz0wfoaBDkdc4CkpuSnIEf62brzyCbhc=
65+
github.com/go-openapi/swag/netutils v0.24.0 h1:Bz02HRjYv8046Ycg/w80q3g9QCWeIqTvlyOjQPDjD8w=
66+
github.com/go-openapi/swag/netutils v0.24.0/go.mod h1:WRgiHcYTnx+IqfMCtu0hy9oOaPR0HnPbmArSRN1SkZM=
67+
github.com/go-openapi/swag/stringutils v0.24.0 h1:i4Z/Jawf9EvXOLUbT97O0HbPUja18VdBxeadyAqS1FM=
68+
github.com/go-openapi/swag/stringutils v0.24.0/go.mod h1:5nUXB4xA0kw2df5PRipZDslPJgJut+NjL7D25zPZ/4w=
69+
github.com/go-openapi/swag/typeutils v0.24.0 h1:d3szEGzGDf4L2y1gYOSSLeK6h46F+zibnEas2Jm/wIw=
70+
github.com/go-openapi/swag/typeutils v0.24.0/go.mod h1:q8C3Kmk/vh2VhpCLaoR2MVWOGP8y7Jc8l82qCTd1DYI=
71+
github.com/go-openapi/swag/yamlutils v0.24.0 h1:bhw4894A7Iw6ne+639hsBNRHg9iZg/ISrOVr+sJGp4c=
72+
github.com/go-openapi/swag/yamlutils v0.24.0/go.mod h1:DpKv5aYuaGm/sULePoeiG8uwMpZSfReo1HR3Ik0yaG8=
5173
github.com/go-openapi/validate v0.24.0 h1:LdfDKwNbpB6Vn40xhTdNZAnfLECL81w+VX3BumrGD58=
5274
github.com/go-openapi/validate v0.24.0/go.mod h1:iyeX1sEufmv3nPbBdX3ieNviWnOZaJ1+zquzJEf2BAQ=
5375
github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
@@ -144,8 +166,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
144166
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
145167
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
146168
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
147-
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
148-
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
169+
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
170+
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
149171
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
150172
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
151173
github.com/valyala/fasthttp v1.62.0 h1:8dKRBX/y2rCzyc6903Zu1+3qN0H/d2MsxPPmVNamiH0=

0 commit comments

Comments
 (0)