From fb1c6fc66c4bb375f602b2f75c98333fd76e3a3e Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 31 Oct 2024 09:00:31 +0100
Subject: [PATCH] OZG-6513 resolve comments

---
 alfa-client/src/test/helm/ingress_tests.yaml | 65 ++++++++++++++++++--
 1 file changed, 59 insertions(+), 6 deletions(-)

diff --git a/alfa-client/src/test/helm/ingress_tests.yaml b/alfa-client/src/test/helm/ingress_tests.yaml
index 3368c2f8eb..1f1fa4729a 100644
--- a/alfa-client/src/test/helm/ingress_tests.yaml
+++ b/alfa-client/src/test/helm/ingress_tests.yaml
@@ -28,17 +28,21 @@ release:
   namespace: sh-helm-test
 templates:
   - templates/ingress.yaml
-set:  
-  ozgcloud:
-    bezeichner: helm
-  baseUrl: test.by.ozg-cloud.de
 
 tests:
   - it: check ingress kind
+    set:  
+      ozgcloud:
+        bezeichner: helm
+      baseUrl: test.by.ozg-cloud.de
     asserts:
       - isKind:
           of: Ingress
   - it: should create default ingress tls
+    set:  
+      ozgcloud:
+        bezeichner: helm
+      baseUrl: test.by.ozg-cloud.de
     asserts:
       - equal:
           path: spec.tls[0].secretName
@@ -47,12 +51,19 @@ tests:
     set: 
       ingress:
         tlsSecretName: client-tls
+      ozgcloud:
+        bezeichner: helm
+      baseUrl: test.by.ozg-cloud.de
     asserts:
       - equal:
           path: spec.tls[0].secretName
           value: client-tls
 
-  - it: should not create ingress tls/ingressClass by default 
+  - it: should not create ingress tls/ingressClass by default
+    set:  
+      ozgcloud:
+        bezeichner: helm
+      baseUrl: test.by.ozg-cloud.de 
     asserts:
       - isNull:
           path: spec.ingressClassName
@@ -60,6 +71,9 @@ tests:
     set:
       ingress:
         className: ingress
+      ozgcloud:
+        bezeichner: helm
+      baseUrl: test.by.ozg-cloud.de
     asserts:
       - equal:
           path: spec.ingressClassName
@@ -67,6 +81,10 @@ tests:
 
   
   - it: should use default letsencrypt-prod cluster-issuer
+    set:  
+      ozgcloud:
+        bezeichner: helm
+      baseUrl: test.by.ozg-cloud.de
     asserts:
       - equal:
           path: metadata.annotations["cert-manager.io/cluster-issuer"]
@@ -75,6 +93,9 @@ tests:
   - it: should use letsencrypt-staging cluster-issuer
     set:
       ingress.use_staging_cert: true
+      ozgcloud:
+        bezeichner: helm
+      baseUrl: test.by.ozg-cloud.de
     asserts:
       - equal:
           path: metadata.annotations["cert-manager.io/cluster-issuer"]
@@ -82,19 +103,30 @@ tests:
 
   - it: should use letsencrypt-prod cluster-issuer
     set:
-      ingress.use_staging_cert: false
+      ingress.use_staging_cert: false 
+      ozgcloud:
+        bezeichner: helm
+      baseUrl: test.by.ozg-cloud.de
     asserts:
       - equal:
           path: metadata.annotations["cert-manager.io/cluster-issuer"]
           value: letsencrypt-prod
 
   - it: should create tls hosts name correctly
+    set:  
+      ozgcloud:
+        bezeichner: helm
+      baseUrl: test.by.ozg-cloud.de
     asserts:
       - equal:
           path: spec.tls[0].hosts[0]
           value: helm.test.by.ozg-cloud.de
 
   - it: should create rules correctly
+    set:  
+      ozgcloud:
+        bezeichner: helm
+      baseUrl: test.by.ozg-cloud.de
     asserts:
       - equal:
           path: spec.rules[0].http.paths[0]
@@ -109,7 +141,28 @@ tests:
       
 
   - it: should set hostname
+    set:  
+      ozgcloud:
+        bezeichner: helm
+      baseUrl: test.by.ozg-cloud.de
     asserts:
       - equal:
           path: spec.rules[0].host
           value: helm.test.by.ozg-cloud.de
+  - it: should fail template when baseUrl not set
+    set: 
+      ozgcloud:
+        bezeichner: helm
+    asserts:
+      - failedTemplate:
+          errormessage: baseUrl muss angegeben sein
+
+  - it: should fail template when bezeichner not set
+    set: 
+      ozgcloud:
+        baseUrl: test.by.ozg-cloud.de
+    asserts:
+      - failedTemplate:
+          errormessage: ozgcloud.bezeichner muss angegeben sein
+
+          
\ No newline at end of file
-- 
GitLab