Fix inputs with empty keys

Signed-off-by: John Howard <howardjohn@google.com>
gomodules · May 16, 2023 · 2c05a51 · 2c05a51
1 parent 1f7eb13
commit 2c05a51
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/v2/jsonpatch.go b/v2/jsonpatch.go
@@ -149,9 +149,6 @@ func makePath(path string, newPart interface{}) string {
 	if path == "" {
 		return "/" + key
 	}
-	if strings.HasSuffix(path, "/") {
-		return path + key
-	}
 	return path + "/" + key
 }
 

diff --git a/v2/jsonpatch_test.go b/v2/jsonpatch_test.go
@@ -836,6 +836,11 @@ var (
 }`
 )
 
+var (
+	emptyKeyA = `{"":[0]}`
+	emptyKeyB = `{"":[]}`
+)
+
 func TestCreatePatch(t *testing.T) {
 	cases := []struct {
 		name string
@@ -881,6 +886,8 @@ func TestCreatePatch(t *testing.T) {
 		{"Array at root", `[{"asdf":"qwerty"}]`, `[{"asdf":"bla"},{"asdf":"zzz"}]`},
 		{"Empty array at root", `[]`, `[{"asdf":"bla"},{"asdf":"zzz"}]`},
 		{"Null Key uses replace operation", nullKeyA, nullKeyB},
+		// empty key
+		{"Empty key", emptyKeyA, emptyKeyB},
 	}
 
 	for _, c := range cases {