Skip to content

Commit 44559d5

Browse files
knative-automationknative-automation
authored
upgrade to latest dependencies (#15840)
bumping knative.dev/networking 5ce28a2...f1b08e6: > f1b08e6 upgrade to latest dependencies (# 1054) > 0d887a8 bump to golangci yaml v2 (# 1057) > a46e5f4 bump to golangci yaml v2 (# 1056) bumping gomodules.xyz/jsonpatch/v2 17d7994...ffbac60: > ffbac60 Merge pull request # 40 from lacroixthomas/bugfixes/fix-lossy-in64 > 4c723fc fix: handle lossy int64 bumping knative.dev/pkg b9bfb45...a8e20d9: > a8e20d9 Bump gomodules.xyz/jsonpatch/v2 from 2.4.0 to 2.5.0 (# 3154) > 7b91ff1 update .golangci.yaml to v2 (# 3167) Signed-off-by: Knative Automation <[email protected]>
1 parent 3d830a0 commit 44559d5

File tree

4 files changed

+24
-17
lines changed

4 files changed

+24
-17
lines changed

‎go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ require (
3535
k8s.io/utils v0.0.0-20241210054802-24370beab758
3636
knative.dev/caching v0.0.0-20250411014313-7889830edd1f
3737
knative.dev/hack v0.0.0-20250331013814-c577ed9f7775
38-
knative.dev/networking v0.0.0-20250331014822-5ce28a23124f
39-
knative.dev/pkg v0.0.0-20250411024212-b9bfb4527367
38+
knative.dev/networking v0.0.0-20250411212114-f1b08e6cfc7f
39+
knative.dev/pkg v0.0.0-20250411133814-a8e20d9db3aa
4040
sigs.k8s.io/yaml v1.4.0
4141
)
4242

@@ -145,7 +145,7 @@ require (
145145
golang.org/x/term v0.30.0 // indirect
146146
golang.org/x/text v0.23.0 // indirect
147147
golang.org/x/tools v0.31.0 // indirect
148-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
148+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
149149
google.golang.org/genproto/googleapis/api v0.0.0-20250207221924-e9438ea467c6 // indirect
150150
google.golang.org/genproto/googleapis/rpc v0.0.0-20250207221924-e9438ea467c6 // indirect
151151
google.golang.org/protobuf v1.36.6 // indirect

‎go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -800,8 +800,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
800800
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
801801
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
802802
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
803-
gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw=
804-
gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
803+
gomodules.xyz/jsonpatch/v2 v2.5.0 h1:JELs8RLM12qJGXU4u/TO3V25KW8GreMKl9pdkk14RM0=
804+
gomodules.xyz/jsonpatch/v2 v2.5.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
805805
gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca h1:PupagGYwj8+I4ubCxcmcBRk3VlUWtTg5huQpZR9flmE=
806806
gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
807807
gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
@@ -960,10 +960,10 @@ knative.dev/caching v0.0.0-20250411014313-7889830edd1f h1:srWl6vy0o7pqiwhB2j68Jk
960960
knative.dev/caching v0.0.0-20250411014313-7889830edd1f/go.mod h1:QkaFb1+ywj3x9nPgwz7iqab3XiCLngfTg9kKUv118zA=
961961
knative.dev/hack v0.0.0-20250331013814-c577ed9f7775 h1:UstB8/aowofYFHjLyZdPh1K7qB9BCx+lP1WuiCspYRE=
962962
knative.dev/hack v0.0.0-20250331013814-c577ed9f7775/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
963-
knative.dev/networking v0.0.0-20250331014822-5ce28a23124f h1:ZF5EnxQ143E3N4tWrEzB23Ri6F8MXFXEYTvwyOqeAow=
964-
knative.dev/networking v0.0.0-20250331014822-5ce28a23124f/go.mod h1:1+ZaT0rv4BHCqjz0Jdtc/wkj47soAkHH1cfbq3fpmIg=
965-
knative.dev/pkg v0.0.0-20250411024212-b9bfb4527367 h1:g9g6oBDmg952q66ozO05j7CDDykDsBbJbWqfDPZlxG8=
966-
knative.dev/pkg v0.0.0-20250411024212-b9bfb4527367/go.mod h1:mGbAft598EkpysGkFqP6p4GVu6pGVuAsxHjdJk5wY00=
963+
knative.dev/networking v0.0.0-20250411212114-f1b08e6cfc7f h1:x1kpIezFHPUqIOUVbT2foQFrLtdwK9krzs4OfLyY5R4=
964+
knative.dev/networking v0.0.0-20250411212114-f1b08e6cfc7f/go.mod h1:rjkDjuJfuA64ABptp9QZjWgOWkdRhuz2dP8KUIbE+PQ=
965+
knative.dev/pkg v0.0.0-20250411133814-a8e20d9db3aa h1:nQpAhhXxSFQ8ZK/D6cF3l354J2XPNMHmswwVZWMx+Ac=
966+
knative.dev/pkg v0.0.0-20250411133814-a8e20d9db3aa/go.mod h1:IRDz/ZbQXmPFg/CHZRTdZgsljmfP7PMv9yY0iEsp03Q=
967967
pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw=
968968
pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
969969
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=

‎vendor/gomodules.xyz/jsonpatch/v2/jsonpatch.go

+12-5
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,14 @@ func CreatePatch(a, b []byte) ([]Operation, error) {
7070
}
7171
var aI interface{}
7272
var bI interface{}
73-
err := json.Unmarshal(a, &aI)
74-
if err != nil {
73+
aDec := json.NewDecoder(bytes.NewReader(a))
74+
aDec.UseNumber()
75+
if err := aDec.Decode(&aI); err != nil {
7576
return nil, errBadJSONDoc
7677
}
77-
err = json.Unmarshal(b, &bI)
78-
if err != nil {
78+
bDec := json.NewDecoder(bytes.NewReader(b))
79+
bDec.UseNumber()
80+
if err := bDec.Decode(&bI); err != nil {
7981
return nil, errBadJSONDoc
8082
}
8183
return handleValues(aI, bI, "", []Operation{})
@@ -94,6 +96,11 @@ func matchesValue(av, bv interface{}) bool {
9496
if ok && bt == at {
9597
return true
9698
}
99+
case json.Number:
100+
bt, ok := bv.(json.Number)
101+
if ok && bt == at {
102+
return true
103+
}
97104
case float64:
98105
bt, ok := bv.(float64)
99106
if ok && bt == at {
@@ -212,7 +219,7 @@ func handleValues(av, bv interface{}, p string, patch []Operation) ([]Operation,
212219
if err != nil {
213220
return nil, err
214221
}
215-
case string, float64, bool:
222+
case string, float64, bool, json.Number:
216223
if !matchesValue(av, bv) {
217224
patch = append(patch, NewOperation("replace", p, bv))
218225
}

‎vendor/modules.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ golang.org/x/tools/internal/stdlib
705705
golang.org/x/tools/internal/typeparams
706706
golang.org/x/tools/internal/typesinternal
707707
golang.org/x/tools/internal/versions
708-
# gomodules.xyz/jsonpatch/v2 v2.4.0
708+
# gomodules.xyz/jsonpatch/v2 v2.5.0
709709
## explicit; go 1.20
710710
gomodules.xyz/jsonpatch/v2
711711
# google.golang.org/api v0.198.0
@@ -1423,7 +1423,7 @@ knative.dev/caching/pkg/client/listers/caching/v1alpha1
14231423
# knative.dev/hack v0.0.0-20250331013814-c577ed9f7775
14241424
## explicit; go 1.21
14251425
knative.dev/hack
1426-
# knative.dev/networking v0.0.0-20250331014822-5ce28a23124f
1426+
# knative.dev/networking v0.0.0-20250411212114-f1b08e6cfc7f
14271427
## explicit; go 1.23.0
14281428
knative.dev/networking/config
14291429
knative.dev/networking/pkg
@@ -1462,7 +1462,7 @@ knative.dev/networking/pkg/http/stats
14621462
knative.dev/networking/pkg/ingress
14631463
knative.dev/networking/pkg/k8s
14641464
knative.dev/networking/pkg/prober
1465-
# knative.dev/pkg v0.0.0-20250411024212-b9bfb4527367
1465+
# knative.dev/pkg v0.0.0-20250411133814-a8e20d9db3aa
14661466
## explicit; go 1.23.0
14671467
knative.dev/pkg/apiextensions/storageversion
14681468
knative.dev/pkg/apiextensions/storageversion/cmd/migrate

0 commit comments

Comments
 (0)