Update github.com/evanphx/json-patch to e83c0a1c26c884f8ec4fb743f6db92a941f605f1

Signed-off-by: Hiroshi Muraoka <h.muraoka714@gmail.com>
2020-06-12 11:11:08 +00:00
parent e7ca64fbe1
commit 5b06aaa7ab
34 changed files with 259 additions and 152 deletions
--- a/vendor/github.com/evanphx/json-patch/merge.go
+++ b/vendor/github.com/evanphx/json-patch/merge.go
@@ -307,10 +307,8 @@ func matchesValue(av, bv interface{}) bool {
 		return true
 	case map[string]interface{}:
 		bt := bv.(map[string]interface{})
-		for key := range at {
-			if !matchesValue(at[key], bt[key]) {
-				return false
-			}
+		if len(bt) != len(at) {
+			return false
 		}
 		for key := range bt {
 			if !matchesValue(at[key], bt[key]) {