github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 03:11:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #61354 from schylek/master

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 61354, 61366, 61386, 61394, 60755). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

vendor: Update github.com/evanphx/json-patch

Updates github.com/evanphx/json-patch dependency
to fix handling tests against empty objects/arrays.

Includes fix from evanphx/json-patch#50
This commit is contained in:
Kubernetes Submit Queue 2018-03-21 23:44:07 -07:00 committed by GitHub
commit 18a7ea703b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Godeps/Godeps.json generated
View File

@ -1212,7 +1212,7 @@
}, },
{ {
"ImportPath": "github.com/evanphx/json-patch", "ImportPath": "github.com/evanphx/json-patch",
"Rev": "944e07253867aacae43c04b2e6a239005443f33a" "Rev": "ed7cfbae1fffc071f71e068df27bf4f0521402d8"
}, },
{ {
"ImportPath": "github.com/exponent-io/jsonpath", "ImportPath": "github.com/exponent-io/jsonpath",

2
staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json generated
View File

@ -372,7 +372,7 @@
}, },
{ {
"ImportPath": "github.com/evanphx/json-patch", "ImportPath": "github.com/evanphx/json-patch",
"Rev": "944e07253867aacae43c04b2e6a239005443f33a" "Rev": "ed7cfbae1fffc071f71e068df27bf4f0521402d8"
}, },
{ {
"ImportPath": "github.com/ghodss/yaml", "ImportPath": "github.com/ghodss/yaml",

2
staging/src/k8s.io/apimachinery/Godeps/Godeps.json generated
View File

@ -24,7 +24,7 @@
}, },
{ {
"ImportPath": "github.com/evanphx/json-patch", "ImportPath": "github.com/evanphx/json-patch",
"Rev": "944e07253867aacae43c04b2e6a239005443f33a" "Rev": "ed7cfbae1fffc071f71e068df27bf4f0521402d8"
}, },
{ {
"ImportPath": "github.com/ghodss/yaml", "ImportPath": "github.com/ghodss/yaml",

2
staging/src/k8s.io/apiserver/Godeps/Godeps.json generated
View File

@ -372,7 +372,7 @@
}, },
{ {
"ImportPath": "github.com/evanphx/json-patch", "ImportPath": "github.com/evanphx/json-patch",
"Rev": "944e07253867aacae43c04b2e6a239005443f33a" "Rev": "ed7cfbae1fffc071f71e068df27bf4f0521402d8"
}, },
{ {
"ImportPath": "github.com/ghodss/yaml", "ImportPath": "github.com/ghodss/yaml",

2
staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json generated
View File

@ -112,7 +112,7 @@
}, },
{ {
"ImportPath": "github.com/evanphx/json-patch", "ImportPath": "github.com/evanphx/json-patch",
"Rev": "944e07253867aacae43c04b2e6a239005443f33a" "Rev": "ed7cfbae1fffc071f71e068df27bf4f0521402d8"
}, },
{ {
"ImportPath": "github.com/ghodss/yaml", "ImportPath": "github.com/ghodss/yaml",

2
staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json generated
View File

@ -104,7 +104,7 @@
}, },
{ {
"ImportPath": "github.com/evanphx/json-patch", "ImportPath": "github.com/evanphx/json-patch",
"Rev": "944e07253867aacae43c04b2e6a239005443f33a" "Rev": "ed7cfbae1fffc071f71e068df27bf4f0521402d8"
}, },
{ {
"ImportPath": "github.com/ghodss/yaml", "ImportPath": "github.com/ghodss/yaml",

20
vendor/github.com/evanphx/json-patch/patch.go generated vendored
View File

@ -66,6 +66,10 @@ func (n *lazyNode) intoDoc() (*partialDoc, error) {
return &n.doc, nil return &n.doc, nil
} }
if n.raw == nil {
return nil, fmt.Errorf("Unable to unmarshal nil pointer as partial document")
}
err := json.Unmarshal(*n.raw, &n.doc) err := json.Unmarshal(*n.raw, &n.doc)
if err != nil { if err != nil {
@ -81,6 +85,10 @@ func (n *lazyNode) intoAry() (*partialArray, error) {
return &n.ary, nil return &n.ary, nil
} }
if n.raw == nil {
return nil, fmt.Errorf("Unable to unmarshal nil pointer as partial array")
}
err := json.Unmarshal(*n.raw, &n.ary) err := json.Unmarshal(*n.raw, &n.ary)
if err != nil { if err != nil {
@ -94,6 +102,10 @@ func (n *lazyNode) intoAry() (*partialArray, error) {
func (n *lazyNode) compact() []byte { func (n *lazyNode) compact() []byte {
buf := &bytes.Buffer{} buf := &bytes.Buffer{}
if n.raw == nil {
return nil
}
err := json.Compact(buf, *n.raw) err := json.Compact(buf, *n.raw)
if err != nil { if err != nil {
@ -104,6 +116,10 @@ func (n *lazyNode) compact() []byte {
} }
func (n *lazyNode) tryDoc() bool { func (n *lazyNode) tryDoc() bool {
if n.raw == nil {
return false
}
err := json.Unmarshal(*n.raw, &n.doc) err := json.Unmarshal(*n.raw, &n.doc)
if err != nil { if err != nil {
@ -115,6 +131,10 @@ func (n *lazyNode) tryDoc() bool {
} }
func (n *lazyNode) tryAry() bool { func (n *lazyNode) tryAry() bool {
if n.raw == nil {
return false
}
err := json.Unmarshal(*n.raw, &n.ary) err := json.Unmarshal(*n.raw, &n.ary)
if err != nil { if err != nil {