Merge pull request #1737 from AhmedGrati/fix-e2e-test

fix e2e test
kubernetes · Oct 17, 2023 · f722bfb · f722bfb
2 parents 1f4b069 + 37a1dc2
commit f722bfb
Show file tree

Hide file tree

Showing 57 changed files with 246 additions and 389 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -28,7 +28,6 @@ jobs:
     - name: Build
       run: make bin
 
-
     - name: Upload a Build Artifact
       uses: actions/upload-artifact@v3
       with:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -20,6 +20,8 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go }}
+      - name: Install dyff
+        run: go install github.com/homeport/dyff/cmd/dyff@v1.5.8
       - name: Run tests
         run: make test
       - name: Perform cross compile
@@ -34,6 +36,8 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: 1.19
+      - name: Install dyff
+        run: go install github.com/homeport/dyff/cmd/dyff@v1.5.8
       - name: Create .coverprofile for each targeted directory by re:running tests
         run: make test
       - name: Collect all .coverprofile files and save it to one file gover.coverprofile

diff --git a/pkg/transformer/openshift/openshift.go b/pkg/transformer/openshift/openshift.go
@@ -428,7 +428,9 @@ func (o *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C
 	// sort all object so Services are first
 	o.SortServicesFirst(&allobjects)
 	o.RemoveDupObjects(&allobjects)
-	transformer.AssignNamespaceToObjects(&allobjects, komposeObject.Namespace)
+	if komposeObject.Namespace != "" {
+		transformer.AssignNamespaceToObjects(&allobjects, komposeObject.Namespace)
+	}
 	// o.FixWorkloadVersion(&allobjects)
 
 	return allobjects, nil

diff --git a/script/test/cmd/lib.sh b/script/test/cmd/lib.sh
@@ -100,10 +100,10 @@ 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=$(diff <(yq ea '[.] | sort_by(.metadata.name) | .[] | splitDoc' $expected_output) <(yq ea '[.] | sort_by(.metadata.name) | .[] | splitDoc' $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; 
+
+    match=$(dyff between --ignore-order-changes --set-exit-code $expected_output $TEMP_STDOUT)
+    if [ $? -eq 0 ]; then SUCCESS_MSGS=$SUCCESS_MSGS"converted output matches\n"; return 0;
+    else FAIL_MSGS=$FAIL_MSGS"converted output does not match\n"; echo $match; return 1; 
     fi
 }
 readonly -f convert::match_output

diff --git a/script/test/cmd/tests_new.sh b/script/test/cmd/tests_new.sh
diff --git a/script/test/fixtures/change-in-volume/output-k8s-empty-vols-template.yaml b/script/test/fixtures/change-in-volume/output-k8s-empty-vols-template.yaml
@@ -8,7 +8,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   clusterIP: None
   ports:
@@ -28,7 +27,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   ports:
     - name: "5000"
@@ -49,7 +47,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -80,7 +77,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   replicas: 1
   selector:

diff --git a/script/test/fixtures/change-in-volume/output-k8s.yaml b/script/test/fixtures/change-in-volume/output-k8s.yaml
@@ -8,7 +8,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   clusterIP: None
   ports:
@@ -28,7 +27,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   ports:
     - name: "5000"
@@ -49,7 +47,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -80,7 +77,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   replicas: 1
   selector:

diff --git a/script/test/fixtures/change-in-volume/output-os-empty-vols-template.yaml b/script/test/fixtures/change-in-volume/output-os-empty-vols-template.yaml
@@ -8,7 +8,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   clusterIP: None
   ports:
@@ -28,7 +27,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   ports:
     - name: "5000"
@@ -49,7 +47,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -95,7 +92,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   lookupPolicy:
     local: false
@@ -120,7 +116,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -180,7 +175,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   lookupPolicy:
     local: false

diff --git a/script/test/fixtures/change-in-volume/output-os.yaml b/script/test/fixtures/change-in-volume/output-os.yaml
@@ -8,7 +8,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   clusterIP: None
   ports:
@@ -28,7 +27,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   ports:
     - name: "5000"
@@ -49,7 +47,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -95,7 +92,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   lookupPolicy:
     local: false
@@ -120,7 +116,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -180,7 +175,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   lookupPolicy:
     local: false

diff --git a/script/test/fixtures/compose-env-interpolation/docker-compose.yaml b/script/test/fixtures/compose-env-interpolation/docker-compose.yaml
@@ -5,3 +5,5 @@ services:
     labels:
       kompose.image-pull-policy: "${IMAGE_PULL_POLICY:-IfNotPresent}"
     build: .
+    ports:
+      - 80:80
diff --git a/script/test/fixtures/compose-env-interpolation/output-k8s.yaml b/script/test/fixtures/compose-env-interpolation/output-k8s.yaml
@@ -1,3 +1,23 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.image-pull-policy: IfNotPresent
+  creationTimestamp: null
+  labels:
+    io.kompose.service: foo
+  name: foo
+spec:
+  ports:
+    - name: "80"
+      port: 80
+      targetPort: 80
+  selector:
+    io.kompose.service: foo
+status:
+  loadBalancer: {}
+
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -27,23 +47,11 @@ spec:
         - image: foo
           imagePullPolicy: IfNotPresent
           name: foo
+          ports:
+            - containerPort: 80
+              hostPort: 80
+              protocol: TCP
           resources: {}
       restartPolicy: Always
 status: {}
 
----
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  creationTimestamp: null
-  name: compose-env-interpolation-default
-spec:
-  ingress:
-    - from:
-        - podSelector:
-            matchLabels:
-              io.kompose.network/compose-env-interpolation-default: "true"
-  podSelector:
-    matchLabels:
-      io.kompose.network/compose-env-interpolation-default: "true"
-
diff --git a/script/test/fixtures/compose-file-support/output-k8s.yaml b/script/test/fixtures/compose-file-support/output-k8s.yaml
@@ -6,7 +6,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   ports:
     - name: "80"
@@ -25,7 +24,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   replicas: 1
   selector:

diff --git a/script/test/fixtures/configmap-volume/output-k8s-withlabel.yaml b/script/test/fixtures/configmap-volume/output-k8s-withlabel.yaml
@@ -8,7 +8,6 @@ metadata:
   labels:
     io.kompose.service: db
   name: db
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -55,7 +54,6 @@ metadata:
   labels:
     io.kompose.service: db
   name: db-cm0
-  namespace: default
 
 ---
 apiVersion: apps/v1
@@ -67,7 +65,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -118,7 +115,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web-cm0
-  namespace: default
 
 ---
 apiVersion: v1
@@ -132,5 +128,4 @@ metadata:
   labels:
     io.kompose.service: web
   name: web-cm1
-  namespace: default
 
diff --git a/script/test/fixtures/configmap-volume/output-k8s.yaml b/script/test/fixtures/configmap-volume/output-k8s.yaml
@@ -6,7 +6,6 @@ metadata:
   labels:
     io.kompose.service: db
   name: db
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -51,7 +50,6 @@ metadata:
   labels:
     io.kompose.service: db
   name: db-cm0
-  namespace: default
 
 ---
 apiVersion: apps/v1
@@ -61,7 +59,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -110,7 +107,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web-cm0
-  namespace: default
 
 ---
 apiVersion: v1
@@ -124,5 +120,4 @@ metadata:
   labels:
     io.kompose.service: web
   name: web-cm1
-  namespace: default
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,3 +5,5 @@ services: @@
         labels:
           kompose.image-pull-policy: "${IMAGE_PULL_POLICY:-IfNotPresent}"
         build: .
+        ports:
+          - 80:80