feat(1765): update tests, move unit test to proper file, improve remo…

…veEmptyInterfaces algo

Signed-off-by: Martin Jirku <[email protected]>

.gitignore

@@ -77,5 +77,8 @@ tags
 
 .DS_Store
 
+# VSCode specific
+.vscode
+
 # Client Test generated files
 client/testdata/generated

pkg/transformer/kubernetes/k8sutils.go

@@ -294,18 +294,30 @@ func removeEmptyInterfaces(obj interface{}) interface{} {
 				v[i] = removeEmptyInterfaces(val)
 			}
 		}
+		return v
 	case map[string]interface{}:
 		for k, val := range v {
-			if valMap, ok := val.(map[string]interface{}); (ok && len(valMap) == 0) || val == nil {
+			if valMap, ok := val.(map[string]interface{}); ok {
+				// It is always map[string]interface{} when passed the map[string]interface{}
+				valMap := removeEmptyInterfaces(valMap).(map[string]interface{})
+				if len(valMap) == 0 {
+					delete(v, k)
+				}
+			} else if val == nil {
 				delete(v, k)
 			} else {
-				v[k] = removeEmptyInterfaces(val)
+				processedInterface := removeEmptyInterfaces(val)
+				if valSlice, ok := processedInterface.([]interface{}); ok && len(valSlice) == 0 {
+					delete(v, k)
+				} else {
+					v[k] = processedInterface
+				}
 			}
 		}
+		return v
 	default:
 		return v
 	}
-	return obj
 }
 
 // Convert JSON to YAML.

pkg/transformer/kubernetes/k8sutils_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package kubernetes
 
 import (
+	"fmt"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -704,3 +705,27 @@ func TestFormatEnvName(t *testing.T) {
 		})
 	}
 }
+
+// Test empty interfaces removal
+func TestRemoveEmptyInterfaces(t *testing.T) {
+	type Obj = map[string]interface{}
+	var testCases = []struct {
+		input  interface{}
+		output interface{}
+	}{
+		{Obj{"useless": Obj{}}, Obj{}},
+		{Obj{"usefull": Obj{"usefull": "usefull"}}, Obj{"usefull": Obj{"usefull": "usefull"}}},
+		{Obj{"usefull": Obj{"usefull": "usefull", "uselessdeep": Obj{}, "uselessnil": nil}}, Obj{"usefull": Obj{"usefull": "usefull"}}},
+		{Obj{"uselessdeep": Obj{"uselessdeep": Obj{}, "uselessnil": nil}}, Obj{}},
+		{Obj{"uselessempty": []interface{}{nil}}, Obj{}},
+		{"test", "test"},
+	}
+	for _, tc := range testCases {
+		t.Run(fmt.Sprintf("Test removeEmptyInterfaces(%s)", tc.input), func(t *testing.T) {
+			result := removeEmptyInterfaces(tc.input)
+			if !reflect.DeepEqual(result, tc.output) {
+				t.Errorf("Expected %v, got %v", tc.output, result)
+			}
+		})
+	}
+}

pkg/transformer/kubernetes/kubernetes_test.go

@@ -1145,25 +1145,3 @@ func TestNamespaceGenerationBlank(t *testing.T) {
 		}
 	}
 }
-
-// Test empty interfaces removal
-func TestRemoveEmptyInterfaces(t *testing.T) {
-	type Obj = map[string]interface{}
-	var testCases = []struct {
-		input  interface{}
-		output interface{}
-	}{
-		{Obj{"useless": Obj{}}, Obj{}},
-		{Obj{"usefull": Obj{"usefull": "usefull"}}, Obj{"usefull": Obj{"usefull": "usefull"}}},
-		{Obj{"usefull": Obj{"usefull": "usefull", "uselessdeep": Obj{}, "uselessnil": nil}}, Obj{"usefull": Obj{"usefull": "usefull"}}},
-		{"test", "test"},
-	}
-	for _, tc := range testCases {
-		t.Run(fmt.Sprintf("Test removeEmptyInterfaces(%s)", tc.input), func(t *testing.T) {
-			result := removeEmptyInterfaces(tc.input)
-			if !reflect.DeepEqual(result, tc.output) {
-				t.Errorf("Expected %v, got %v", tc.output, result)
-			}
-		})
-	}
-}

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

@@ -2,7 +2,6 @@
 apiVersion: v1
 kind: Service
 metadata:
-  creationTimestamp: null
   labels:
     io.kompose.service: redis
   name: redis
@@ -19,7 +18,6 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  creationTimestamp: null
   labels:
     io.kompose.service: web
   name: web
@@ -35,7 +33,6 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  creationTimestamp: null
   labels:
     io.kompose.service: redis
   name: redis
@@ -44,25 +41,21 @@ spec:
   selector:
     matchLabels:
       io.kompose.service: redis
-  strategy: {}
   template:
     metadata:
-      creationTimestamp: null
       labels:
         io.kompose.network/change-in-volume-default: "true"
         io.kompose.service: redis
     spec:
       containers:
         - image: redis
           name: redis
-          resources: {}
       restartPolicy: Always
 
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  creationTimestamp: null
   labels:
     io.kompose.service: web
   name: web
@@ -75,7 +68,6 @@ spec:
     type: Recreate
   template:
     metadata:
-      creationTimestamp: null
       labels:
         io.kompose.network/change-in-volume-default: "true"
         io.kompose.service: web
@@ -90,12 +82,10 @@ spec:
             - containerPort: 5000
               hostPort: 5000
               protocol: TCP
-          resources: {}
           volumeMounts:
             - mountPath: /code
               name: code-volume
       restartPolicy: Always
       volumes:
-        - emptyDir: {}
-          name: code-volume
+        - name: code-volume
 

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

@@ -2,7 +2,6 @@
 apiVersion: v1
 kind: Service
 metadata:
-  creationTimestamp: null
   labels:
     io.kompose.service: redis
   name: redis
@@ -19,7 +18,6 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  creationTimestamp: null
   labels:
     io.kompose.service: web
   name: web
@@ -35,7 +33,6 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  creationTimestamp: null
   labels:
     io.kompose.service: redis
   name: redis
@@ -44,25 +41,21 @@ spec:
   selector:
     matchLabels:
       io.kompose.service: redis
-  strategy: {}
   template:
     metadata:
-      creationTimestamp: null
       labels:
         io.kompose.network/change-in-volume-default: "true"
         io.kompose.service: redis
     spec:
       containers:
         - image: redis
           name: redis
-          resources: {}
       restartPolicy: Always
 
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  creationTimestamp: null
   labels:
     io.kompose.service: web
   name: web
@@ -75,7 +68,6 @@ spec:
     type: Recreate
   template:
     metadata:
-      creationTimestamp: null
       labels:
         io.kompose.network/change-in-volume-default: "true"
         io.kompose.service: web
@@ -90,12 +82,10 @@ spec:
             - containerPort: 5000
               hostPort: 5000
               protocol: TCP
-          resources: {}
           volumeMounts:
             - mountPath: /code
               name: code-volume
       restartPolicy: Always
       volumes:
-        - emptyDir: {}
-          name: code-volume
+        - name: code-volume
 

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

@@ -2,7 +2,6 @@
 apiVersion: v1
 kind: Service
 metadata:
-  creationTimestamp: null
   labels:
     io.kompose.service: redis
   name: redis
@@ -19,7 +18,6 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  creationTimestamp: null
   labels:
     io.kompose.service: web
   name: web
@@ -35,27 +33,22 @@ spec:
 apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
-  creationTimestamp: null
   labels:
     io.kompose.service: redis
   name: redis
 spec:
   replicas: 1
   selector:
     io.kompose.service: redis
-  strategy:
-    resources: {}
   template:
     metadata:
-      creationTimestamp: null
       labels:
         io.kompose.network/change-in-volume-default: "true"
         io.kompose.service: redis
     spec:
       containers:
         - image: ' '
           name: redis
-          resources: {}
       restartPolicy: Always
   test: false
   triggers:
@@ -73,20 +66,16 @@ spec:
 apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
-  creationTimestamp: null
   labels:
     io.kompose.service: redis
   name: redis
 spec:
   lookupPolicy:
     local: false
   tags:
-    - annotations: null
-      from:
+    - from:
         kind: DockerImage
         name: redis
-      generation: null
-      importPolicy: {}
       name: latest
       referencePolicy:
         type: ""
@@ -95,7 +84,6 @@ spec:
 apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
-  creationTimestamp: null
   labels:
     io.kompose.service: web
   name: web
@@ -104,11 +92,9 @@ spec:
   selector:
     io.kompose.service: web
   strategy:
-    resources: {}
     type: Recreate
   template:
     metadata:
-      creationTimestamp: null
       labels:
         io.kompose.network/change-in-volume-default: "true"
         io.kompose.service: web
@@ -123,14 +109,12 @@ spec:
             - containerPort: 5000
               hostPort: 5000
               protocol: TCP
-          resources: {}
           volumeMounts:
             - mountPath: /code
               name: code-volume
       restartPolicy: Always
       volumes:
-        - emptyDir: {}
-          name: code-volume
+        - name: code-volume
   test: false
   triggers:
     - type: ConfigChange
@@ -147,20 +131,16 @@ spec:
 apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
-  creationTimestamp: null
   labels:
     io.kompose.service: web
   name: web
 spec:
   lookupPolicy:
     local: false
   tags:
-    - annotations: null
-      from:
+    - from:
         kind: DockerImage
         name: flask_web
-      generation: null
-      importPolicy: {}
       name: latest
       referencePolicy:
         type: ""