Merge pull request 'OZG-6105 add netpol required values unittests' (#687) from OZG-6105 into master

alfa-client/apps/admin/src/test/helm/network_policy_test.yaml

@@ -28,20 +28,26 @@ release:
   namespace: by-helm-test
 templates:
   - templates/network_policy.yaml
+
+tests:
+  - it: should match apiVersion
     set:
       networkPolicy:
         dnsServerNamespace: kube-system
-    ssoPublicIp: 1.1.1.1/32
-tests:
-  - it: should match apiVersion
     asserts:
       - isAPIVersion:
           of: networking.k8s.io/v1
   - it: should match kind
+    set:
+      networkPolicy:
+        dnsServerNamespace: kube-system
     asserts:
       - isKind:
           of: NetworkPolicy
   - it: validate metadata
+    set:
+      networkPolicy:
+        dnsServerNamespace: kube-system
     asserts:
       - equal:
           path: metadata
@@ -50,6 +56,9 @@ tests:
             namespace: by-helm-test
 
   - it: should add egress rule to administration service
+    set:
+      networkPolicy:
+        dnsServerNamespace: kube-system
     asserts:
       - contains:
           path: spec.egress
@@ -84,7 +93,6 @@ tests:
   - it: should add additionalIngressConfig local
     set:
       networkPolicy:
-        ssoPublicIp: 51.89.117.53/32
         dnsServerNamespace: test-namespace-dns
         additionalIngressConfigLocal:
         - from:
@@ -102,7 +110,6 @@ tests:
   - it: should add additionalIngressConfig global
     set:
       networkPolicy:
-        ssoPublicIp: 51.89.117.53/32
         dnsServerNamespace: test-namespace-dns
         additionalIngressConfigGlobal:
         - from:
@@ -121,7 +128,6 @@ tests:
   - it: should add additionalEgressConfig local
     set:
       networkPolicy:
-        ssoPublicIp: 51.89.117.53/32
         dnsServerNamespace: test-dns-namespace
         additionalEgressConfigLocal:
         - to:
@@ -138,7 +144,6 @@ tests:
   - it: should add additionalEgressConfig global
     set:
       networkPolicy:
-        ssoPublicIp: 51.89.117.53/32
         dnsServerNamespace: test-dns-namespace
         additionalEgressConfigGlobal:
         - to:
@@ -164,9 +169,23 @@ tests:
   - it: test network policy unset should be disabled
     set:
       networkPolicy:
-        ssoPublicIp: 1.1.1.1
         disabled: false
         dnsServerNamespace: test-dns-server-namespace
     asserts:
       - hasDocuments:
           count: 1
+  - it: test network policy dnsServerNamespace must be set message
+    set:
+      networkPolicy:
+        disabled: false
+    asserts:
+      - failedTemplate:
+          errorMessage: networkPolicy.dnsServerNamespace must be set
+
+  - it: test network policy should be enabled by default
+    set:
+      networkPolicy:
+        dnsServerNamespace: test-dns-server-namespace
+    asserts:
+      - hasDocuments:
+          count: 1
\ No newline at end of file

alfa-client/libs/design-system/test/helm/network_policy_test.yaml

@@ -28,20 +28,26 @@ release:
   namespace: by-helm-test
 templates:
   - templates/network_policy.yaml
+
+tests:
+  - it: should match apiVersion
     set:
       networkPolicy:
         dnsServerNamespace: kube-system
-    ssoPublicIp: 1.1.1.1/32
-tests:
-  - it: should match apiVersion
     asserts:
       - isAPIVersion:
           of: networking.k8s.io/v1
   - it: should match kind
+    set:
+      networkPolicy:
+        dnsServerNamespace: kube-system
     asserts:
       - isKind:
           of: NetworkPolicy
   - it: validate metadata
+    set:
+      networkPolicy:
+        dnsServerNamespace: kube-system
     asserts:
       - equal:
           path: metadata
@@ -75,7 +81,6 @@ tests:
   - it: should add additionalIngressConfig local
     set:
       networkPolicy:
-        ssoPublicIp: 51.89.117.53/32
         dnsServerNamespace: test-namespace-dns
         additionalIngressConfigLocal:
         - from:
@@ -93,7 +98,6 @@ tests:
   - it: should add additionalIngressConfig global
     set:
       networkPolicy:
-        ssoPublicIp: 51.89.117.53/32
         dnsServerNamespace: test-namespace-dns
         additionalIngressConfigGlobal:
         - from:
@@ -112,7 +116,6 @@ tests:
   - it: should add additionalEgressConfig local
     set:
       networkPolicy:
-        ssoPublicIp: 51.89.117.53/32
         dnsServerNamespace: test-dns-namespace
         additionalEgressConfigLocal:
         - to:
@@ -129,7 +132,6 @@ tests:
   - it: should add additionalEgressConfig global
     set:
       networkPolicy:
-        ssoPublicIp: 51.89.117.53/32
         dnsServerNamespace: test-dns-namespace
         additionalEgressConfigGlobal:
         - to:
@@ -155,9 +157,23 @@ tests:
   - it: test network policy unset should be disabled
     set:
       networkPolicy:
-        ssoPublicIp: 1.1.1.1
         disabled: false
         dnsServerNamespace: test-dns-server-namespace
     asserts:
       - hasDocuments:
           count: 1
+  - it: test network policy dnsServerNamespace must be set message
+    set:
+      networkPolicy:
+        disabled: false
+    asserts:
+      - failedTemplate:
+          errorMessage: networkPolicy.dnsServerNamespace must be set
+
+  - it: test network policy should be enabled by default
+    set:
+      networkPolicy:
+        dnsServerNamespace: test-dns-server-namespace
+    asserts:
+      - hasDocuments:
+          count: 1
\ No newline at end of file

src/test/helm/network_policy_test.yaml

@@ -28,21 +28,30 @@ release:
   namespace: by-helm-test
 templates:
   - templates/network_policy.yaml
+
+tests:
+  - it: should match apiVersion
     set:
       networkPolicy:
         dnsServerNamespace: kube-system
         ssoPublicIp: 1.1.1.1/32
-tests:
-  - it: should match apiVersion
     asserts:
       - isAPIVersion:
           of: networking.k8s.io/v1
 
   - it: should match kind
+    set:
+      networkPolicy:
+        dnsServerNamespace: kube-system
+        ssoPublicIp: 1.1.1.1/32
     asserts:
       - isKind:
           of: NetworkPolicy
   - it: validate metadata
+    set:
+      networkPolicy:
+        dnsServerNamespace: kube-system
+        ssoPublicIp: 1.1.1.1/32
     asserts:
       - equal:
           path: metadata
@@ -187,3 +196,31 @@ tests:
     asserts:
       - hasDocuments:
           count: 1
+
+  - it: test network policy dnsServerNamespace must be set message
+    set:
+      networkPolicy:
+        disabled: false
+        ssoPublicIp: 1.1.1.1/32
+    asserts:
+      - failedTemplate:
+          errorMessage: networkPolicy.dnsServerNamespace must be set
+
+
+  - it: test network policy ssoPublicIp must be set message
+    set:
+      networkPolicy:
+        disabled: false
+        dnsServerNamespace: test-dns-server-namespace
+    asserts:
+      - failedTemplate:
+          errorMessage: networkPolicy.ssoPublicIp must be set
+  
+  - it: test network policy should be enabled by default
+    set:
+      networkPolicy:
+        ssoPublicIp: 1.1.1.1
+        dnsServerNamespace: test-dns-server-namespace
+    asserts:
+      - hasDocuments:
+          count: 1
\ No newline at end of file