fix: unify secret handling for hydra (#657)

ory · Dec 1, 2023 · 5a36d40 · 5a36d40
1 parent ac2b530
commit 5a36d40
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/hacks/values/hydra.yaml b/hacks/values/hydra.yaml
@@ -28,6 +28,13 @@ hydra:
         - "foo bar 123 456 lorem 1"
         - "foo bar 123 456 lorem 2"
         - "foo bar 123 456 lorem 3"
+      cookie:
+        - "OG5XbmxXa3dYeGplQXpQanYxeEFuRUFa"
+        - "foo bar 123 456 lorem"
+        - "foo bar 123 456 lorem 1"
+        - "foo bar 123 456 lorem 2"
+        - "foo bar 123 456 lorem 3"
+
 maester:
   enabled: false
 

diff --git a/helm/charts/hydra/templates/_helpers.tpl b/helm/charts/hydra/templates/_helpers.tpl
@@ -103,11 +103,19 @@ Generate the secrets.system value
 Generate the secrets.cookie value
 */}}
 {{- define "hydra.secrets.cookie" -}}
-{{- if (.Values.hydra.config.secrets).cookie -}}
-{{- .Values.hydra.config.secrets.cookie }}
-{{- else -}}
-{{- include "hydra.secrets.system" . }}
-{{- end -}}
+  {{- if (.Values.hydra.config.secrets).cookie -}}
+    {{- if kindIs "slice" .Values.hydra.config.secrets.cookie -}}
+      {{- if gt (len .Values.hydra.config.secrets.cookie) 1 -}}
+        "{{- join "\",\"" .Values.hydra.config.secrets.cookie -}}"
+      {{- else -}}
+        {{- join "" .Values.hydra.config.secrets.cookie -}}
+      {{- end -}}
+    {{- else -}}
+      {{- fail "Expected hydra.config.secrets.cookie to be a list of strings" -}}
+    {{- end -}}
+  {{- else -}}
+    {{- include "hydra.secrets.system" . }}
+  {{- end -}}
 {{- end -}}
 
 {{/*