github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #68428 from philips/bump-json-patch 

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here: https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md.

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

Grab important bug fix that can cause a `panic()` from this package on
certain inputs. See 73af7f547e

```release-note
NONE
```
pull/8/head
Kubernetes Submit Queue 2018-09-07 21:14:07 -07:00 committed by GitHub
parent b90ca3e2f9 2fbd47da56
commit 5af5f1e663
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Godeps/Godeps.json generated
View File

@ -1522,8 +1522,8 @@
},
{
"ImportPath": "github.com/evanphx/json-patch",
"Comment": "v3.0.0-23-g94e38aa",
"Rev": "94e38aa1586e8a6c8a75770bddf5ff84c48a106b"
"Comment": "v3.0.0-29-gf195058",
"Rev": "f195058310bd062ea7c754a834f0ff43b4b63afb"
},
{
"ImportPath": "github.com/exponent-io/jsonpath",

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

@ -388,7 +388,7 @@
},
{
"ImportPath": "github.com/evanphx/json-patch",
"Rev": "94e38aa1586e8a6c8a75770bddf5ff84c48a106b"
"Rev": "f195058310bd062ea7c754a834f0ff43b4b63afb"
},
{
"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",
"Rev": "94e38aa1586e8a6c8a75770bddf5ff84c48a106b"
"Rev": "f195058310bd062ea7c754a834f0ff43b4b63afb"
},
{
"ImportPath": "github.com/ghodss/yaml",

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

@ -388,7 +388,7 @@
},
{
"ImportPath": "github.com/evanphx/json-patch",
"Rev": "94e38aa1586e8a6c8a75770bddf5ff84c48a106b"
"Rev": "f195058310bd062ea7c754a834f0ff43b4b63afb"
},
{
"ImportPath": "github.com/ghodss/yaml",

2
staging/src/k8s.io/cli-runtime/Godeps/Godeps.json generated
View File

@ -12,7 +12,7 @@
},
{
"ImportPath": "github.com/evanphx/json-patch",
"Rev": "94e38aa1586e8a6c8a75770bddf5ff84c48a106b"
"Rev": "f195058310bd062ea7c754a834f0ff43b4b63afb"
},
{
"ImportPath": "github.com/ghodss/yaml",

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

@ -128,7 +128,7 @@
},
{
"ImportPath": "github.com/evanphx/json-patch",
"Rev": "94e38aa1586e8a6c8a75770bddf5ff84c48a106b"
"Rev": "f195058310bd062ea7c754a834f0ff43b4b63afb"
},
{
"ImportPath": "github.com/ghodss/yaml",

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

@ -120,7 +120,7 @@
},
{
"ImportPath": "github.com/evanphx/json-patch",
"Rev": "94e38aa1586e8a6c8a75770bddf5ff84c48a106b"
"Rev": "f195058310bd062ea7c754a834f0ff43b4b63afb"
},
{
"ImportPath": "github.com/ghodss/yaml",

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

@ -8,7 +8,7 @@
"Deps": [
{
"ImportPath": "github.com/evanphx/json-patch",
"Rev": "94e38aa1586e8a6c8a75770bddf5ff84c48a106b"
"Rev": "f195058310bd062ea7c754a834f0ff43b4b63afb"
},
{
"ImportPath": "github.com/ghodss/yaml",

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

@ -204,7 +204,7 @@ func (n *lazyNode) equal(o *lazyNode) bool {
}
func (o operation) kind() string {
if obj, ok := o["op"]; ok {
if obj, ok := o["op"]; ok && obj != nil {
var op string
err := json.Unmarshal(*obj, &op)
@ -220,7 +220,7 @@ func (o operation) kind() string {
}
func (o operation) path() string {
if obj, ok := o["path"]; ok {
if obj, ok := o["path"]; ok && obj != nil {
var op string
err := json.Unmarshal(*obj, &op)
@ -236,7 +236,7 @@ func (o operation) path() string {
}
func (o operation) from() string {
if obj, ok := o["from"]; ok {
if obj, ok := o["from"]; ok && obj != nil{
var op string
err := json.Unmarshal(*obj, &op)
@ -450,7 +450,7 @@ func (p Patch) add(doc *container, op operation) error {
con, key := findObject(doc, path)
if con == nil {
return fmt.Errorf("jsonpatch add operation does not apply: doc is missing path: %s", path)
return fmt.Errorf("jsonpatch add operation does not apply: doc is missing path: \"%s\"", path)
}
return con.add(key, op.value())
@ -462,7 +462,7 @@ func (p Patch) remove(doc *container, op operation) error {
con, key := findObject(doc, path)
if con == nil {
return fmt.Errorf("jsonpatch remove operation does not apply: doc is missing path: %s", path)
return fmt.Errorf("jsonpatch remove operation does not apply: doc is missing path: \"%s\"", path)
}
return con.remove(key)
@ -477,8 +477,8 @@ func (p Patch) replace(doc *container, op operation) error {
return fmt.Errorf("jsonpatch replace operation does not apply: doc is missing path: %s", path)
}
val, ok := con.get(key)
if val == nil || ok != nil {
_, ok := con.get(key)
if ok != nil {
return fmt.Errorf("jsonpatch replace operation does not apply: doc is missing key: %s", path)
}