From 3b134574c2b999eda140432bb1a9a6b0fb55fc83 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 21 Mar 2024 13:47:18 +0100
Subject: [PATCH] OZG-5238 Correctly construct sso client
---
src/main/helm/templates/_helpers.tpl | 14 +++++++++++---
src/test/helm/deployment_defaults_sso_test.yaml | 17 ++++++++++++++++-
2 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl
index 1bbdc15d..7e9ba5ec 100644
--- a/src/main/helm/templates/_helpers.tpl
+++ b/src/main/helm/templates/_helpers.tpl
@@ -60,13 +60,21 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
{{- end -}}
{{- define "app.ssoClientName" -}}
-{{- if (.Values.sso).client_name -}}
-{{ printf "%s" (.Values.sso).client_name }}
+{{- if (.Values.sso).keycloak_clients -}}
+{{- if (first .Values.sso.keycloak_clients).client_name -}}
+{{ printf "%s" (first .Values.sso.keycloak_clients).client_name }}
{{- else -}}
-{{ printf "admin" }}
+{{ include "app.defaultSsoClientName" . }}
+{{- end -}}
+{{- else -}}
+{{ include "app.defaultSsoClientName" . }}
{{- end -}}
{{- end -}}
+{{- define "app.defaultSsoClientName" -}}
+{{ printf "admin" }}
+{{- end -}}
+
{{- define "app.ssoServerUrl" -}}
{{- required "sso.serverUrl muss angegeben sein" (.Values.sso).serverUrl -}}
{{- end -}}
\ No newline at end of file
diff --git a/src/test/helm/deployment_defaults_sso_test.yaml b/src/test/helm/deployment_defaults_sso_test.yaml
index d5e91d30..53f533fd 100644
--- a/src/test/helm/deployment_defaults_sso_test.yaml
+++ b/src/test/helm/deployment_defaults_sso_test.yaml
@@ -75,7 +75,8 @@ tests:
- it: check different client name
set:
sso:
- client_name: different-client
+ keycloak_clients:
+ - client_name: different-client
asserts:
- isKind:
of: Deployment
@@ -84,3 +85,17 @@ tests:
content:
name: ozgcloud_oauth2_resource
value: different-client
+
+ - it: should have default client name
+ set:
+ sso:
+ keycloak_clients:
+ - client_name_typo: different-client
+ asserts:
+ - isKind:
+ of: Deployment
+ - contains:
+ path: spec.template.spec.containers[0].env
+ content:
+ name: ozgcloud_oauth2_resource
+ value: admin
--
GitLab