Skip to content

Commit 62ea3f7

Browse files
Bump gomodules.xyz/jsonpatch/v2 from 2.4.0 to 2.5.0
Bumps [gomodules.xyz/jsonpatch/v2](https://github.com/gomodules/jsonpatch) from 2.4.0 to 2.5.0. - [Release notes](https://github.com/gomodules/jsonpatch/releases) - [Changelog](https://github.com/gomodules/jsonpatch/blob/release-2.0/CHANGELOG.md) - [Commits](gomodules/jsonpatch@v2.4.0...v2.5.0) --- updated-dependencies: - dependency-name: gomodules.xyz/jsonpatch/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
1 parent 01c6e12 commit 62ea3f7

File tree

4 files changed

+16
-9
lines changed

4 files changed

+16
-9
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/tektoncd/pipeline v0.66.0
1616
github.com/tektoncd/plumbing v0.0.0-20221005220331-b2ddcdddc5e7
1717
go.uber.org/zap v1.27.0
18-
gomodules.xyz/jsonpatch/v2 v2.4.0
18+
gomodules.xyz/jsonpatch/v2 v2.5.0
1919
gotest.tools/v3 v3.5.1
2020
k8s.io/api v0.29.6
2121
k8s.io/apimachinery v0.29.7

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1323,8 +1323,8 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
13231323
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
13241324
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
13251325
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
1326-
gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw=
1327-
gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
1326+
gomodules.xyz/jsonpatch/v2 v2.5.0 h1:JELs8RLM12qJGXU4u/TO3V25KW8GreMKl9pdkk14RM0=
1327+
gomodules.xyz/jsonpatch/v2 v2.5.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
13281328
google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
13291329
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
13301330
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=

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
@@ -463,7 +463,7 @@ golang.org/x/tools/internal/gocommand
463463
golang.org/x/tools/internal/gopathwalk
464464
golang.org/x/tools/internal/imports
465465
golang.org/x/tools/internal/stdlib
466-
# gomodules.xyz/jsonpatch/v2 v2.4.0
466+
# gomodules.xyz/jsonpatch/v2 v2.5.0
467467
## explicit; go 1.20
468468
gomodules.xyz/jsonpatch/v2
469469
# google.golang.org/api v0.181.0

0 commit comments

Comments
 (0)