fix(portal): fix escaping of secret values

eclipse-tractusx · Sep 26, 2023 · f73875c · f73875c
1 parent 5d445be
commit f73875c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/charts/portal/templates/secret-backend-external-db.yaml b/charts/portal/templates/secret-backend-external-db.yaml
@@ -36,7 +36,7 @@ data:
 {{ else -}}
 stringData:
   # if secret doesn't exist, use provided value from values file or generate a random one
-  portal-password: {{ ( .Values.externalDatabase.portalPassword | quote ) | default ( randAlphaNum 32 | quote ) }}
-  provisioning-password: {{ ( .Values.externalDatabase.provisioningPassword | quote ) | default ( randAlphaNum 32 | quote ) }}
+  portal-password: {{ .Values.externalDatabase.portalPassword | default ( randAlphaNum 32 ) | quote }}
+  provisioning-password: {{ .Values.externalDatabase.provisioningPassword | default ( randAlphaNum 32) | quote }}
 {{ end }}
 {{- end -}}
diff --git a/charts/portal/templates/secret-backend-interfaces.yaml b/charts/portal/templates/secret-backend-interfaces.yaml
@@ -40,11 +40,11 @@ data:
 {{ else -}}
 stringData:
   # if secret doesn't exist, use provided value from values file or generate a random one
-  bpdm-client-secret: {{ ( .Values.backend.processesworker.bpdm.clientSecret | quote ) | default ( randAlphaNum 32 | quote ) }}
-  clearinghouse-client-secret: {{ ( .Values.backend.processesworker.clearinghouse.clientSecret | quote ) | default ( randAlphaNum 32 | quote ) }}
-  custodian-client-secret: {{ ( .Values.backend.processesworker.custodian.clientSecret | quote ) | default ( randAlphaNum 32 | quote ) }}
-  sdfactory-client-secret: {{ ( .Values.backend.processesworker.sdfactory.clientSecret | quote ) | default ( randAlphaNum 32 | quote ) }}
-  offerprovider-client-secret: {{ ( .Values.backend.processesworker.offerprovider.clientSecret | quote ) | default ( randAlphaNum 32 | quote ) }}
-  onboardingserviceprovider-encryption-key: {{ .Values.backend.administration.onboardingServiceProvider.encryptionKey | quote | default ( randAlphaNum 32 | quote ) }}
-  process-onboardingserviceprovider-encryption-key: {{ .Values.backend.processesworker.onboardingServiceProvider.encryptionKey | quote | default ( randAlphaNum 32 | quote ) }}
+  bpdm-client-secret: {{ .Values.backend.processesworker.bpdm.clientSecret | default ( randAlphaNum 32 ) | quote }}
+  clearinghouse-client-secret: {{ .Values.backend.processesworker.clearinghouse.clientSecret | default ( randAlphaNum 32 ) | quote }}
+  custodian-client-secret: {{ .Values.backend.processesworker.custodian.clientSecret | default ( randAlphaNum 32 ) | quote }}
+  sdfactory-client-secret: {{ .Values.backend.processesworker.sdfactory.clientSecret | default ( randAlphaNum 32 ) | quote }}
+  offerprovider-client-secret: {{ .Values.backend.processesworker.offerprovider.clientSecret | default ( randAlphaNum 32 ) | quote }}
+  onboardingserviceprovider-encryption-key: {{ .Values.backend.administration.onboardingServiceProvider.encryptionKey | default ( randAlphaNum 32 ) | quote }}
+  process-onboardingserviceprovider-encryption-key: {{ .Values.backend.processesworker.onboardingServiceProvider.encryptionKey | default ( randAlphaNum 32 ) | quote }}
 {{ end }}
diff --git a/charts/portal/templates/secret-backend-keycloak.yaml b/charts/portal/templates/secret-backend-keycloak.yaml
@@ -36,7 +36,7 @@ data:
 {{ else -}}
 stringData:
   # if secret doesn't exist, use provided value from values file or generate a random one
-  central-db-password: {{ ( .Values.backend.keycloak.central.dbConnection.password | quote ) | default ( randAlphaNum 32 | quote ) }}
-  central-client-secret: {{ ( .Values.backend.keycloak.central.clientSecret | quote ) | default ( randAlphaNum 32 | quote ) }}
-  shared-client-secret: {{ ( .Values.backend.keycloak.shared.clientSecret | quote ) | default ( randAlphaNum 32 | quote ) }}
+  central-db-password: {{ .Values.backend.keycloak.central.dbConnection.password | default ( randAlphaNum 32 ) | quote }}
+  central-client-secret: {{ .Values.backend.keycloak.central.clientSecret | default ( randAlphaNum 32 ) | quote }}
+  shared-client-secret: {{ .Values.backend.keycloak.shared.clientSecret | default ( randAlphaNum 32 ) | quote }}
 {{ end }}
diff --git a/charts/portal/templates/secret-backend-mailing.yaml b/charts/portal/templates/secret-backend-mailing.yaml
@@ -35,6 +35,6 @@ data:
 {{ else -}}
 stringData:
   # if secret doesn't exist, use provided value from values file or generate a random one
-  password: {{ ( .Values.backend.mailing.password | quote ) | default ( randAlphaNum 32 | quote ) }}
-  provisioning-sharedrealm-password: {{ ( .Values.backend.provisioning.sharedRealm.smtpServer.password | quote ) | default ( randAlphaNum 32 | quote ) }}
+  password: {{ .Values.backend.mailing.password | default ( randAlphaNum 32 ) | quote }}
+  provisioning-sharedrealm-password: {{ .Values.backend.provisioning.sharedRealm.smtpServer.password | default ( randAlphaNum 32 ) | quote }}
 {{ end }}
diff --git a/charts/portal/templates/secret-backend-postgres-init.yaml b/charts/portal/templates/secret-backend-postgres-init.yaml
@@ -38,9 +38,9 @@ data:
 {{ else -}}
 stringData:
   # if secret doesn't exist, use provided value from values file or generate a random one
-  postgres-password: {{ .Values.postgresql.auth.password | default ( randAlphaNum 32 | quote ) }}
-  replication-password: {{ .Values.postgresql.auth.replicationPassword | default ( randAlphaNum 32 | quote ) }}
-  portal-password: {{ .Values.postgresql.auth.portalPassword | default ( randAlphaNum 32 | quote ) }}
-  provisioning-password: {{ .Values.postgresql.auth.provisioningPassword | default ( randAlphaNum 32 | quote ) }}
+  postgres-password: {{ .Values.postgresql.auth.password | default ( randAlphaNum 32 ) | quote }}
+  replication-password: {{ .Values.postgresql.auth.replicationPassword | default ( randAlphaNum 32 ) | quote }}
+  portal-password: {{ .Values.postgresql.auth.portalPassword | default ( randAlphaNum 32 ) | quote }}
+  provisioning-password: {{ .Values.postgresql.auth.provisioningPassword | default ( randAlphaNum 32 ) | quote }}
 {{ end }}
 {{- end -}}