From 022805b56b19e779006d98272a5e941470598172 Mon Sep 17 00:00:00 2001
From: Morten Torkildsen <mortent@google.com>
Date: Sat, 4 Apr 2020 18:42:15 -0700
Subject: [PATCH] Fix issue with kyaml json unmarshalling

---
 kyaml/yaml/types.go      | 12 +++++++-
 kyaml/yaml/types_test.go | 61 ++++++++++++++++++++++++++++++++--------
 2 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/kyaml/yaml/types.go b/kyaml/yaml/types.go
index f09f7ade2..63c25e701 100644
--- a/kyaml/yaml/types.go
+++ b/kyaml/yaml/types.go
@@ -697,7 +697,17 @@ func (rn *RNode) MarshalJSON() ([]byte, error) {
 }
 
 func (rn *RNode) UnmarshalJSON(b []byte) error {
-	r, err := Parse(string(b))
+	m := map[string]interface{}{}
+	if err := json.Unmarshal(b, &m); err != nil {
+		return err
+	}
+
+	c, err := Marshal(m)
+	if err != nil {
+		return err
+	}
+
+	r, err := Parse(string(c))
 	if err != nil {
 		return err
 	}
diff --git a/kyaml/yaml/types_test.go b/kyaml/yaml/types_test.go
index 7805295b0..983cd9bc8 100644
--- a/kyaml/yaml/types_test.go
+++ b/kyaml/yaml/types_test.go
@@ -50,20 +50,57 @@ spec:
 }
 
 func TestRNode_UnmarshalJSON(t *testing.T) {
-	instance := &RNode{}
-	err := instance.UnmarshalJSON([]byte(`{"hello":"world"}`))
-	if !assert.NoError(t, err) {
-		t.FailNow()
-	}
-	actual, err := instance.String()
-	if !assert.NoError(t, err) {
-		t.FailNow()
+	testCases := []struct {
+		testName string
+		input    string
+		output   string
+	}{
+		{
+			testName: "simple document",
+			input:    `{"hello":"world"}`,
+			output:   `hello: world`,
+		},
+		{
+			testName: "nested structure",
+			input: `
+{
+  "apiVersion": "apps/v1",
+  "kind": "Deployment",
+  "metadata": {
+    "name": "my-deployment",
+    "namespace": "default"
+  }
+}
+`,
+			output: `
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: my-deployment
+  namespace: default
+`,
+		},
 	}
 
-	expected := `{"hello": "world"}`
-	if !assert.Equal(t,
-		strings.TrimSpace(expected), strings.TrimSpace(actual)) {
-		t.FailNow()
+	for i := range testCases {
+		tc := testCases[i]
+		t.Run(tc.testName, func(t *testing.T) {
+			instance := &RNode{}
+			err := instance.UnmarshalJSON([]byte(tc.input))
+			if !assert.NoError(t, err) {
+				t.FailNow()
+			}
+
+			actual, err := instance.String()
+			if !assert.NoError(t, err) {
+				t.FailNow()
+			}
+
+			if !assert.Equal(t,
+				strings.TrimSpace(tc.output), strings.TrimSpace(actual)) {
+				t.FailNow()
+			}
+		})
 	}
 }