From 29d487406f6848ed0a99c729a391fbf0f111a5d5 Mon Sep 17 00:00:00 2001
From: Ayhan Mesin <136314287+ayhanmesin-zf@users.noreply.github.com>
Date: Mon, 12 Jun 2023 16:16:28 +0200
Subject: [PATCH] fix: wrong postgres env vars for deployment templates (#464)

* Fix wrong postgres env vars for deployment templates

* Fix postgres config in helm chart test
---
 .../templates/deployment-controlplane.yaml    | 24 +++++++++----------
 .../templates/deployment-dataplane.yaml       |  4 ++--
 .../templates/deployment-controlplane.yaml    |  4 ++--
 .../templates/deployment-dataplane.yaml       |  4 ++--
 .../tractusx-connector-azure-vault-test.yaml  |  5 ++--
 .../helm/tractusx-connector-test.yaml         |  5 ++--
 6 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
index 3a8ed5fd7..d5d9d0300 100644
--- a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
@@ -178,9 +178,9 @@ spec:
             - name: "EDC_DATASOURCE_ASSET_NAME"
               value: "asset"
             - name: "EDC_DATASOURCE_ASSET_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_ASSET_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_ASSET_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
@@ -188,9 +188,9 @@ spec:
             - name: "EDC_DATASOURCE_CONTRACTDEFINITION_NAME"
               value: "contractdefinition"
             - name: "EDC_DATASOURCE_CONTRACTDEFINITION_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_CONTRACTDEFINITION_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_CONTRACTDEFINITION_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
@@ -198,9 +198,9 @@ spec:
             - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_NAME"
               value: "contractnegotiation"
             - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
@@ -208,9 +208,9 @@ spec:
             - name: "EDC_DATASOURCE_POLICY_NAME"
               value: "policy"
             - name: "EDC_DATASOURCE_POLICY_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_POLICY_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_POLICY_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
@@ -218,9 +218,9 @@ spec:
             - name: "EDC_DATASOURCE_TRANSFERPROCESS_NAME"
               value: "transferprocess"
             - name: "EDC_DATASOURCE_TRANSFERPROCESS_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_TRANSFERPROCESS_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_TRANSFERPROCESS_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
@@ -228,9 +228,9 @@ spec:
             - name: "EDC_DATASOURCE_EDR_NAME"
               value: "edr"
             - name: "EDC_DATASOURCE_EDR_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_EDR_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_EDR_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml
index 468c1c2d9..8626dc512 100644
--- a/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml
@@ -155,9 +155,9 @@ spec:
             - name: "EDC_DATASOURCE_EDR_NAME"
               value: "edr"
             - name: "EDC_DATASOURCE_EDR_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_EDR_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_EDR_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
index f4cc125e1..6229250ae 100644
--- a/charts/tractusx-connector/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -228,9 +228,9 @@ spec:
             - name: "EDC_DATASOURCE_EDR_NAME"
               value: "edr"
             - name: "EDC_DATASOURCE_EDR_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_EDR_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_EDR_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
diff --git a/charts/tractusx-connector/templates/deployment-dataplane.yaml b/charts/tractusx-connector/templates/deployment-dataplane.yaml
index 5a911dea2..9d7e9f50d 100644
--- a/charts/tractusx-connector/templates/deployment-dataplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-dataplane.yaml
@@ -155,9 +155,9 @@ spec:
             - name: "EDC_DATASOURCE_EDR_NAME"
               value: "edr"
             - name: "EDC_DATASOURCE_EDR_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_EDR_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_EDR_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
diff --git a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
index b2c0c3db9..618cc89b0 100644
--- a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
@@ -71,9 +71,10 @@ dataplane:
     accessKeyId: qwerty123
 
 postgresql:
-  username: user
-  password: password
   jdbcUrl: jdbc:postgresql://postgresql:5432/edc
+  auth:
+    username: user
+    password: password
 
 vault:
   azure:
diff --git a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
index 5f2300a53..085db3869 100644
--- a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
@@ -56,9 +56,10 @@ dataplane:
       accessKeyId: qwerty123
 
 postgresql:
-  username: user
-  password: password
   jdbcUrl: jdbc:postgresql://postgresql:5432/edc
+  auth:
+    username: user
+    password: password
 
 vault:
   hashicorp: