Skip to content

Commit 2ea9b2d

Browse files
chore(deps): update module gomodules.xyz/jsonpatch/v2 to v2.5.0
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
1 parent 8090654 commit 2ea9b2d

4 files changed

Lines changed: 16 additions & 9 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ require (
184184
golang.org/x/text v0.37.0 // indirect
185185
golang.org/x/time v0.14.0 // indirect
186186
golang.org/x/tools v0.44.0 // indirect
187-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
187+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
188188
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
189189
google.golang.org/grpc v1.79.3 // indirect
190190
google.golang.org/protobuf v1.36.11 // indirect

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -627,8 +627,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
627627
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
628628
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
629629
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
630-
gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw=
631-
gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
630+
gomodules.xyz/jsonpatch/v2 v2.5.0 h1:JELs8RLM12qJGXU4u/TO3V25KW8GreMKl9pdkk14RM0=
631+
gomodules.xyz/jsonpatch/v2 v2.5.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
632632
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 h1:ToEetK57OidYuqD4Q5w+vfEnPvPpuTwedCNVohYJfNk=
633633
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697/go.mod h1:JJrvXBWRZaFMxBufik1a4RpFw4HhgVtBBWQeQgUj2cc=
634634
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 h1:fCvbg86sFXwdrl5LgVcTEvNC+2txB5mgROGmRL5mrls=

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

Lines changed: 12 additions & 5 deletions
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -970,7 +970,7 @@ golang.org/x/tools/internal/stdlib
970970
golang.org/x/tools/internal/typeparams
971971
golang.org/x/tools/internal/typesinternal
972972
golang.org/x/tools/internal/versions
973-
# gomodules.xyz/jsonpatch/v2 v2.4.0
973+
# gomodules.xyz/jsonpatch/v2 v2.5.0
974974
## explicit; go 1.20
975975
gomodules.xyz/jsonpatch/v2
976976
# google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217

0 commit comments

Comments
 (0)