Fix: Make the out flag print to one file using seperator

pkg/transformer/kubernetes/k8sutils.go

@@ -148,17 +148,6 @@ func getDirName(opt kobject.ConvertOptions) string {
 	return dirName
 }
 
-func objectToRaw(object runtime.Object) runtime.RawExtension {
-	r := runtime.RawExtension{
-		Object: object,
-	}
-
-	bytes, _ := json.Marshal(object)
-	r.Raw = bytes
-
-	return r
-}
-
 // PrintList will take the data converted and decide on the commandline attributes given
 func PrintList(objects []runtime.Object, opt kobject.ConvertOptions) error {
 	var f *os.File
@@ -192,36 +181,31 @@ func PrintList(objects []runtime.Object, opt kobject.ConvertOptions) error {
 	}
 
 	var files []string
-
 	// if asked to print to stdout or to put in single file
 	// we will create a list
 	if opt.ToStdout || f != nil {
-		list := &api.List{}
 		// convert objects to versioned and add them to list
+		if opt.GenerateJSON {
+			return fmt.Errorf("cannot convert to one file while specifying a json output file or stdout option")
+		}
 		for _, object := range objects {
 			versionedObject, err := convertToVersion(object)
 			if err != nil {
 				return err
 			}
 
-			list.Items = append(list.Items, objectToRaw(versionedObject))
-		}
-		// version list itself
-		list.Kind = "List"
-		list.APIVersion = "v1"
-		convertedList, err := convertToVersion(list)
-		if err != nil {
-			return err
-		}
-		data, err := marshal(convertedList, opt.GenerateJSON, opt.YAMLIndent)
-		if err != nil {
-			return fmt.Errorf("error in marshalling the List: %v", err)
-		}
-		printVal, err := transformer.Print("", dirName, "", data, opt.ToStdout, opt.GenerateJSON, f, opt.Provider)
-		if err != nil {
-			return errors.Wrap(err, "transformer.Print failed")
+			data, err := marshal(versionedObject, opt.GenerateJSON, opt.YAMLIndent)
+			if err != nil {
+				return fmt.Errorf("error in marshalling the List: %v", err)
+			}
+			// this part add --- which unifies the file
+			data = []byte(fmt.Sprintf("---\n%s", data))
+			printVal, err := transformer.Print("", dirName, "", data, opt.ToStdout, opt.GenerateJSON, f, opt.Provider)
+			if err != nil {
+				return errors.Wrap(err, "transformer to print to one single file failed")
+			}
+			files = append(files, printVal)
 		}
-		files = append(files, printVal)
 	} else {
 		finalDirName := dirName
 		if opt.CreateChart {

script/test/cmd/lib.sh

@@ -100,13 +100,11 @@ function convert::match_output() {
     convert::run_cmd $cmd
     exit_status=$?
     if [ $exit_status -ne 0 ]; then FAIL_MSGS=$FAIL_MSGS"exit status: $exit_status\n"; return $exit_status; fi
-
-    match=$(jq --argfile a $TEMP_STDOUT --argfile b $expected_output -n 'def post_recurse(f): def r: (f | select(. != null) | r), .; r; def post_recurse: post_recurse(.[]?); ($a | (post_recurse | arrays) |= sort) as $a | ($b | (post_recurse | arrays) |= sort) as $b | $a == $b')
-    $cmd > /tmp/test.json
-    diff /tmp/test.json $expected_output > /tmp/diff
-    rm /tmp/test.json
-    if [ "$match" = true ]; then SUCCESS_MSGS=$SUCCESS_MSGS"converted output matches\n"; return 0;
-    else FAIL_MSGS=$FAIL_MSGS"converted output does not match\n"; cat /tmp/diff; rm /tmp/diff; return 1; fi
+    match=$(diff <(yq -P 'sort_keys(....)' $expected_output) <(yq -P 'sort_keys(....)' $TEMP_STDOUT))
+    echo "$match" > /tmp/diff
+    if [ "$match" == "" ]; then SUCCESS_MSGS=$SUCCESS_MSGS"converted output matches\n"; return 0;
+    else FAIL_MSGS=$FAIL_MSGS"converted output does not match\n"; cat /tmp/diff; rm /tmp/diff; return 1; 
+    fi
 }
 readonly -f convert::match_output
 
@@ -221,4 +219,4 @@ function convert::check_artifacts_generated() {
     convert::teardown
     return $exit_status
 }
-readonly -f convert::check_artifacts_generated
+readonly -f convert::check_artifacts_generated

script/test/fixtures/change-in-volume/output-k8s-empty-vols-template.yaml

@@ -0,0 +1,108 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.service.type: headless
+  creationTimestamp: null
+  labels:
+    io.kompose.service: redis
+  name: redis
+spec:
+  clusterIP: None
+  ports:
+    - name: headless
+      port: 55555
+      targetPort: 0
+  selector:
+    io.kompose.service: redis
+status:
+  loadBalancer: {}
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: web
+  name: web
+spec:
+  ports:
+    - name: "5000"
+      port: 5000
+      targetPort: 5000
+  selector:
+    io.kompose.service: web
+status:
+  loadBalancer: {}
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.service.type: headless
+  creationTimestamp: null
+  labels:
+    io.kompose.service: redis
+  name: redis
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      io.kompose.service: redis
+  strategy: {}
+  template:
+    metadata:
+      annotations:
+        kompose.service.type: headless
+      creationTimestamp: null
+      labels:
+        io.kompose.service: redis
+    spec:
+      containers:
+        - image: redis
+          name: redis
+          resources: {}
+      restartPolicy: Always
+status: {}
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: web
+  name: web
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      io.kompose.service: web
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      creationTimestamp: null
+      labels:
+        io.kompose.service: web
+    spec:
+      containers:
+        - args:
+            - python
+            - app.py
+          image: flask_web
+          name: web
+          ports:
+            - containerPort: 5000
+          resources: {}
+          volumeMounts:
+            - mountPath: /code
+              name: code-volume
+      restartPolicy: Always
+      volumes:
+        - emptyDir: {}
+          name: code-volume
+status: {}