From bcb61f29e809e788c45dea7186d4844c4007637e Mon Sep 17 00:00:00 2001
From: j-puri <jaspal.puri@zopa.com>
Date: Wed, 29 Nov 2023 13:25:43 +0000
Subject: [PATCH] Fix Auth secrets in Vault.yaml

---
 .../allure-testops/templates/infra/vault.yaml | 31 +++++++++++++++++--
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/charts/allure-testops/templates/infra/vault.yaml b/charts/allure-testops/templates/infra/vault.yaml
index ecf7bef..0cb61f8 100644
--- a/charts/allure-testops/templates/infra/vault.yaml
+++ b/charts/allure-testops/templates/infra/vault.yaml
@@ -48,6 +48,22 @@ spec:
           key: "smtpUsername"
         - objectName: "smtpPassword"
           key: "smtpPassword"
+
+{{- if .Values.allure.auth.oidc.enabled }}
+        - objectName: "clientId"
+          key: "clientId"
+
+        - objectName: "clientSecret"
+          key: "clientSecret"
+{{- end }}
+{{- if .Values.allure.auth.ldap.enabled }}
+        - objectName: "ldapUser"
+          key: "ldapUser"
+
+        - objectName: "ldapPass"
+          key: "ldapPass"
+
+{{- end }}
   parameters:
 {{- if .Values.vault.url }}
     vaultAddress: {{ .Values.vault.url }}
@@ -127,14 +143,23 @@ spec:
       - objectName: "smtpPassword"
         secretPath: "{{ .Values.vault.smtpPath }}"
         secretKey: "password"
-        
+
 {{- if .Values.allure.auth.oidc.enabled }}
       - objectName: "clientId"
         secretPath: "{{ .Values.vault.secretPath }}"
-        secretKey: "clientId"
+        secretKey: "client_id"
 
       - objectName: "clientSecret"
         secretPath: "{{ .Values.vault.secretPath }}"
-        secretKey: "clientSecret"
+        secretKey: "client_secret"
+{{- end }}
+{{- if .Values.allure.auth.ldap.enabled }}
+      - objectName: "ldapUser"
+        secretPath: "{{ .Values.vault.secretPath }}"
+        secretKey: "ldap_user"
+
+      - objectName: "ldapPass"
+        secretPath: "{{ .Values.vault.secretPath }}"
+        secretKey: "ldap_pass"
 {{- end }}
 {{- end }}