Suggested changes

cmd/config/internal/commands/sink_test.go

@@ -33,7 +33,7 @@ items:
     annotations:
       app: nginx2
       config.kubernetes.io/index: '0'
-      config.kubernetes.io/path: 'f1.json'
+      config.kubernetes.io/path: 'f1.yaml'
   spec:
     replicas: 1
 - kind: Service
@@ -42,7 +42,7 @@ items:
     annotations:
       app: nginx
       config.kubernetes.io/index: '1'
-      config.kubernetes.io/path: 'f1.json'
+      config.kubernetes.io/path: 'f1.yaml'
   spec:
     selector:
       app: nginx
@@ -77,13 +77,28 @@ items:
 		t.FailNow()
 	}
 
-	actual, err := ioutil.ReadFile(filepath.Join(d, "f1.json"))
+	actual, err := ioutil.ReadFile(filepath.Join(d, "f1.yaml"))
 	if !assert.NoError(t, err) {
 		t.FailNow()
 	}
-	expected := `'{"kind":"Deployment","metadata":{"annotations":{"app":"nginx2"},"labels":{"app":"nginx2"},"name":"foo"},"spec":{"replicas":1}}'
+	expected := `kind: Deployment
+metadata:
+  labels:
+    app: nginx2
+  name: foo
+  annotations:
+    app: nginx2
+spec:
+  replicas: 1
 ---
-'{"kind":"Service","metadata":{"annotations":{"app":"nginx"},"name":"foo"},"spec":{"selector":{"app":"nginx"}}}'
+kind: Service
+metadata:
+  name: foo
+  annotations:
+    app: nginx
+spec:
+  selector:
+    app: nginx
 `
 	if !assert.Equal(t, expected, string(actual)) {
 		t.FailNow()
@@ -121,6 +136,60 @@ spec:
 	}
 }
 
+func TestSinkCommandJSON(t *testing.T) {
+	d, err := ioutil.TempDir("", "kustomize-source-test")
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+	defer os.RemoveAll(d)
+
+	r := commands.GetSinkRunner("")
+	r.Command.SetIn(bytes.NewBufferString(`apiVersion: config.kubernetes.io/v1alpha1
+kind: ResourceList
+items:
+- kind: Deployment
+  metadata:
+    labels:
+      app: nginx2
+    name: foo
+    annotations:
+      app: nginx2
+      config.kubernetes.io/index: '0'
+      config.kubernetes.io/path: 'f1.json'
+      config.kubernetes.io/format: 'json'
+  spec:
+    replicas: 1
+`))
+	r.Command.SetArgs([]string{d})
+	if !assert.NoError(t, r.Command.Execute()) {
+		t.FailNow()
+	}
+
+	actual, err := ioutil.ReadFile(filepath.Join(d, "f1.json"))
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+	expected := `{
+  "kind": "Deployment",
+  "metadata": {
+    "annotations": {
+      "app": "nginx2"
+    },
+    "labels": {
+      "app": "nginx2"
+    },
+    "name": "foo"
+  },
+  "spec": {
+    "replicas": 1
+  }
+}
+`
+	if !assert.Equal(t, expected, string(actual)) {
+		t.FailNow()
+	}
+}
+
 func TestSinkCommand_Stdout(t *testing.T) {
 	d, err := ioutil.TempDir("", "kustomize-source-test")
 	if !assert.NoError(t, err) {
@@ -234,3 +303,57 @@ spec:
 		t.FailNow()
 	}
 }
+
+func TestSinkCommandJSON_Stdout(t *testing.T) {
+	d, err := ioutil.TempDir("", "kustomize-source-test")
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+	defer os.RemoveAll(d)
+
+	// fmt the files
+	out := &bytes.Buffer{}
+	r := commands.GetSinkRunner("")
+	r.Command.SetIn(bytes.NewBufferString(`apiVersion: config.kubernetes.io/v1alpha1
+kind: ResourceList
+items:
+- kind: Deployment
+  metadata:
+    labels:
+      app: nginx2
+    name: foo
+    annotations:
+      app: nginx2
+      config.kubernetes.io/index: '0'
+      config.kubernetes.io/format: 'json'
+  spec:
+    replicas: 1
+`))
+
+	r.Command.SetOut(out)
+	r.Command.SetArgs([]string{})
+	if !assert.NoError(t, r.Command.Execute()) {
+		t.FailNow()
+	}
+
+	expected := `{
+  "kind": "Deployment",
+  "metadata": {
+    "annotations": {
+      "app": "nginx2"
+    },
+    "labels": {
+      "app": "nginx2"
+    },
+    "name": "foo"
+  },
+  "spec": {
+    "replicas": 1
+  }
+}
+`
+	if !assert.Equal(t, expected, out.String()) {
+		println(out.String())
+		t.FailNow()
+	}
+}