From 33e8953c2da51dd89d57e709bd0edaa0eaaeb594 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 19 Mar 2024 17:27:40 +0100
Subject: [PATCH] OZG-5238 Set more values in helm tests

---
 src/test/helm/deployment_database_test.yaml    |  4 ----
 .../helm/deployment_defaults_sso_test.yaml     |  1 -
 .../deployment_image_pull_secret_test.yaml     |  2 --
 src/test/helm/deployment_resources_test.yaml   |  1 -
 .../helm/deployment_spring_profile_test.yaml   |  2 --
 src/test/helm/deployment_volume_test.yaml      | 18 +++++++++++++++---
 6 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/test/helm/deployment_database_test.yaml b/src/test/helm/deployment_database_test.yaml
index 5fc29c4b..4ef00093 100644
--- a/src/test/helm/deployment_database_test.yaml
+++ b/src/test/helm/deployment_database_test.yaml
@@ -32,7 +32,6 @@ tests:
   - it: should have a volume for the mongodb certificate
     set:
       ozgcloud:
-        environment: test
         bundesland: sh
         bezeichner: helm
       sso:
@@ -48,7 +47,6 @@ tests:
   - it: should mount mongodb certificate volume
     set:
       ozgcloud:
-        environment: test
         bundesland: sh
         bezeichner: helm
       sso:
@@ -64,7 +62,6 @@ tests:
   - it: should configure internal mongodb if not useExternal
     set:
       ozgcloud:
-        environment: test
         bundesland: sh
         bezeichner: helm
       sso:
@@ -88,7 +85,6 @@ tests:
   - it: should configure external mongodb if useExternal
     set:
       ozgcloud:
-        environment: test
         bundesland: sh
         bezeichner: helm
       sso:
diff --git a/src/test/helm/deployment_defaults_sso_test.yaml b/src/test/helm/deployment_defaults_sso_test.yaml
index a5122dba..016931a0 100644
--- a/src/test/helm/deployment_defaults_sso_test.yaml
+++ b/src/test/helm/deployment_defaults_sso_test.yaml
@@ -31,7 +31,6 @@ templates:
 set:
   baseUrl: test.company.local
   ozgcloud:
-    environment: test
     bundesland: sh
     bezeichner: helm
   sso:
diff --git a/src/test/helm/deployment_image_pull_secret_test.yaml b/src/test/helm/deployment_image_pull_secret_test.yaml
index eae6b2dc..8c526a2c 100644
--- a/src/test/helm/deployment_image_pull_secret_test.yaml
+++ b/src/test/helm/deployment_image_pull_secret_test.yaml
@@ -31,7 +31,6 @@ tests:
   - it: should use default image pull secret
     set:
       ozgcloud:
-        environment: test
         bundesland: sh
         bezeichner: helm
       sso:
@@ -44,7 +43,6 @@ tests:
   - it: should use customizable image pull secret
     set:
       ozgcloud:
-        environment: test
         bundesland: sh
         bezeichner: helm
       sso:
diff --git a/src/test/helm/deployment_resources_test.yaml b/src/test/helm/deployment_resources_test.yaml
index 753db426..3f18ba3a 100644
--- a/src/test/helm/deployment_resources_test.yaml
+++ b/src/test/helm/deployment_resources_test.yaml
@@ -31,7 +31,6 @@ tests:
   - it: should have customizable resources
     set:
       ozgcloud:
-        environment: test
         bundesland: sh
         bezeichner: helm
       sso:
diff --git a/src/test/helm/deployment_spring_profile_test.yaml b/src/test/helm/deployment_spring_profile_test.yaml
index d01bfc20..3613b3bb 100644
--- a/src/test/helm/deployment_spring_profile_test.yaml
+++ b/src/test/helm/deployment_spring_profile_test.yaml
@@ -32,7 +32,6 @@ tests:
   - it: should override the spring profiles
     set:
       ozgcloud:
-        environment: test
         bundesland: sh
         bezeichner: helm
       sso:
@@ -49,7 +48,6 @@ tests:
   - it: should generate the spring profiles
     set:
       ozgcloud:
-        environment: test
         bundesland: sh
         bezeichner: helm
       sso:
diff --git a/src/test/helm/deployment_volume_test.yaml b/src/test/helm/deployment_volume_test.yaml
index 0625a237..ef1951a4 100644
--- a/src/test/helm/deployment_volume_test.yaml
+++ b/src/test/helm/deployment_volume_test.yaml
@@ -28,10 +28,16 @@ release:
 templates:
   - templates/deployment.yaml
 set:
-   Release.Name: "administration"
-   ozgcloud.environment: "default"
+  Release.Name: "administration"
+  ozgcloud.environment: "default"
 tests:
   - it: should have volumeMounts on it's container
+    set:
+      ozgcloud:
+        bundesland: sh
+        bezeichner: helm
+      sso:
+        serverUrl: https://sso.company.local
     asserts:
       - equal:
           path: spec.template.spec.containers[0].volumeMounts[0].name
@@ -58,6 +64,12 @@ tests:
           path: spec.template.spec.containers[0].volumeMounts[1].readOnly
           value: true
   - it: should have volumes on it's spec
+    set:
+      ozgcloud:
+        bundesland: sh
+        bezeichner: helm
+      sso:
+        serverUrl: https://sso.company.local
     asserts:
       - equal:
           path: spec.template.spec.volumes[0].name
@@ -73,4 +85,4 @@ tests:
           value: "ozg-mongodb-tls-cert"
       - equal:
           path: spec.template.spec.volumes[1].secret.optional
-          value: true
\ No newline at end of file
+          value: true
-- 
GitLab