Merge pull request 'OZG-3184 check if sso url contains https' (#24) from...

Merge pull request 'OZG-3184 check if sso url contains https' (#24) from OZG-3184-fix-helmchart into master

Reviewed-on: https://git.ozg-sh.de/mgm/user-manager/pulls/24

src/main/helm/README.md

@@ -8,7 +8,7 @@ Das Helm Chart für das Deployment des UserManager.
 ## Unit-Tests
 Für Unit-Tests wird das helm [helm-unittest](https://github.com/quintush/helm-unittest) plugin benötigt. Die Unit-Tests liegen im Verzeichnis src/test/helm
 
-`helm unittest -f '../../test/helm/*.yaml' .`
+`helm unittest -f '../../test/helm/*.yaml' -v '../../test/unit-values.yaml' .`
 ## SyntaxCheck
 `helm template --debug -f test-values.yaml .`
 

src/main/helm/templates/_helpers.tpl

@@ -105,8 +105,12 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- end -}}
 
 {{- define "app.ssoServerUrl" -}}
+{{- if contains "https://" .Values.sso.serverUrl -}}
+{{- .Values.sso.serverUrl -}}
+{{- else -}}
 {{- printf "https://%s" .Values.sso.serverUrl -}}
 {{- end -}}
+{{- end -}}
 
 {{- define "app.kopBundesland" -}}
 {{- required "kop.bundesland must be set " (.Values.kop).bundesland }}

src/test/helm/deployment-keycloak-values-test.yaml

@@ -68,3 +68,37 @@ tests:
           content: 
             name: KOP_KEYCLOAK_API_CLIENT
             value: sh-helm-test-goofy
+  - it: sso.serverurl with https
+    template: deployment.yaml
+    release:
+      namespace: sh-helm-test
+    set:
+      sso.serverUrl: https://sso.test.by.kop-cloud.de
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content: 
+            name: QUARKUS_OIDC_AUTH_SERVER_URL
+            value: https://sso.test.by.kop-cloud.de/realms/sh-helm-test
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content: 
+            name: KEYCLOAK_URL
+            value: https://sso.test.by.kop-cloud.de
+  - it: sso.serverurl without https
+    template: deployment.yaml
+    release:
+      namespace: sh-helm-test
+    set:
+      sso.serverUrl: sso.test.by.kop-cloud.de
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content: 
+            name: QUARKUS_OIDC_AUTH_SERVER_URL
+            value: https://sso.test.by.kop-cloud.de/realms/sh-helm-test
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content: 
+            name: KEYCLOAK_URL
+            value: https://sso.test.by.kop-cloud.de