From d972201abb0954022894d3f3b80c61ab94de1d96 Mon Sep 17 00:00:00 2001
From: Ivan P <2119240+i5okie@users.noreply.github.com>
Date: Tue, 3 Sep 2024 13:57:35 -0700
Subject: [PATCH] Remove not function, cleanup definitions

Signed-off-by: Ivan P <2119240+i5okie@users.noreply.github.com>
---
 charts/vc-authn-oidc/templates/_helpers.tpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/vc-authn-oidc/templates/_helpers.tpl b/charts/vc-authn-oidc/templates/_helpers.tpl
index 150f13ff..bd2f7db0 100644
--- a/charts/vc-authn-oidc/templates/_helpers.tpl
+++ b/charts/vc-authn-oidc/templates/_helpers.tpl
@@ -337,7 +337,7 @@ Create a default fully qualified app name for the postgres requirement.
 Generate acapy wallet storage config
 */}}
 {{- define "acapy.walletStorageConfig" -}}
-{{- if and .Values.acapy.walletStorageConfig (not .Values.postgresql.enabled) -}}
+{{- if .Values.acapy.walletStorageConfig -}}
 {{- if .Values.acapy.walletStorageConfig.json -}}
 {{- .Values.acapy.walletStorageConfig.json -}}
 {{- else -}}
@@ -354,13 +354,13 @@ Generate acapy wallet storage config
 Generate acapy wallet storage credentials
 */}}
 {{- define "acapy.walletStorageCredentials" -}}
-{{- if and .Values.acapy.walletStorageCredentials (not .Values.postgresql.enabled) -}}
+{{- if .Values.acapy.walletStorageCredentials -}}
 {{- if .Values.acapy.walletStorageCredentials.json -}}
 {{- .Values.acapy.walletStorageCredentials.json -}}
 {{- else -}}
 '{"account":"{{ .Values.acapy.walletStorageCredentials.account | default "acapy" }}","password":"{{ .Values.acapy.walletStorageCredentials.password }}", "admin_account":"{{ .Values.acapy.walletStorageCredentials.admin_account }}", "admin_password":"{{ .Values.acapy.walletStorageCredentials.admin_password }}"}'
 {{- end -}}
-{{- else if and .Values.postgresql.enabled -}}
+{{- else if .Values.postgresql.enabled -}}
 '{"account":"{{ .Values.postgresql.auth.username }}","password":"$(POSTGRES_PASSWORD)", "admin_account":"{{ .Values.acapy.walletStorageCredentials.admin_account }}", "admin_password":"$(POSTGRES_POSTGRES_PASSWORD)"}'
 {{- end -}}
 {{- end -}}