Merge pull request #144 from catenax-ng/release/v1.3.0-edc-postgres-c…

…onfiguration [5°] - Release/v1.3.0 edc postgres configuration: Resolve EDC postgres database credentials (user and password)
eclipse-tractusx · Nov 3, 2023 · 150ad03 · 150ad03
2 parents 540ba25 + b1238bf
commit 150ad03
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/publish-dpp-backend-docker-image.yml b/.github/workflows/publish-dpp-backend-docker-image.yml
@@ -139,6 +139,7 @@ jobs:
 
       # Build Java code with Maven
       - name:  Build dpp backend with maven for Docker Hub
+        if: ${{ github.repository == 'eclipse-tractusx/digital-product-pass' }}
         run: |
           cd consumer-backend/productpass
           mvn -B clean install

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -49,7 +49,9 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e
 - Fix IRS job tracker to one single job.
 - Fix bug related to the broadcast search of digital twin registry
 - Fix minor bugs related to the digital twin search and the caching mechanism
-- Implemented check for transfer complete and passport received fixing bug related to the passport retrieval
+- Fix bug related to the passport retrieval by implementing check for transfer complete
+- Fix database credentials in the edc postgres configuration
+- Fix the condition to the publish dpp backend workflow
 
 
 ## [released]

diff --git a/deployment/helm/edc-consumer/README.md b/deployment/helm/edc-consumer/README.md
@@ -253,11 +253,11 @@ A Helm chart for Tractus-X Eclipse Data Space Connector. This chart is a test mo
 | tractusx-connector.nameOverride | string | `""` |  |
 | tractusx-connector.participant.id | string | `"<path:material-pass/data/dev/edc/participant#bpnNumber>"` |  |
 | tractusx-connector.postgresql.auth.database | string | `"edc"` |  |
-| tractusx-connector.postgresql.auth.password | string | `"<path:material-pass/data/dev/edc/database#user>"` |  |
+| tractusx-connector.postgresql.auth.password | string | `"<path:material-pass/data/dev/edc/database#password>"` |  |
 | tractusx-connector.postgresql.auth.username | string | `"<path:material-pass/data/dev/edc/database#user>"` |  |
 | tractusx-connector.postgresql.fullnameOverride | string | `"postgresql"` |  |
 | tractusx-connector.postgresql.jdbcUrl | string | `"jdbc:postgresql://postgresql:5432/edc"` |  |
-| tractusx-connector.postgresql.password | string | `"<path:material-pass/data/dev/edc/database#user>"` |  |
+| tractusx-connector.postgresql.password | string | `"<path:material-pass/data/dev/edc/database#password>"` |  |
 | tractusx-connector.postgresql.username | string | `"<path:material-pass/data/dev/edc/database#user>"` |  |
 | tractusx-connector.serviceAccount.annotations | object | `{}` |  |
 | tractusx-connector.serviceAccount.create | bool | `true` |  |

diff --git a/deployment/helm/edc-consumer/values-beta.yaml b/deployment/helm/edc-consumer/values-beta.yaml
@@ -169,10 +169,10 @@ tractusx-connector:
 
   postgresql:
     username: <path:material-pass/data/beta/edc/database#user>
-    password: <path:material-pass/data/beta/edc/database#user>
+    password: <path:material-pass/data/beta/edc/database#password>
     auth:
       username: <path:material-pass/data/beta/edc/database#user>
-      password: <path:material-pass/data/beta/edc/database#user>
+      password: <path:material-pass/data/beta/edc/database#password>
 
   vault:
 

diff --git a/deployment/helm/edc-provider/README.md b/deployment/helm/edc-provider/README.md
@@ -253,11 +253,11 @@ A Helm chart for Tractus-X Eclipse Data Space Connector. This chart is a test mo
 | tractusx-connector.nameOverride | string | `""` |  |
 | tractusx-connector.participant.id | string | `"<path:material-pass/data/dev/edc/participant#bpnNumber>"` |  |
 | tractusx-connector.postgresql.auth.database | string | `"edc"` |  |
-| tractusx-connector.postgresql.auth.password | string | `"<path:material-pass/data/dev/edc/database#user>"` |  |
+| tractusx-connector.postgresql.auth.password | string | `"<path:material-pass/data/dev/edc/database#password>"` |  |
 | tractusx-connector.postgresql.auth.username | string | `"<path:material-pass/data/dev/edc/database#user>"` |  |
 | tractusx-connector.postgresql.fullnameOverride | string | `"postgresql"` |  |
 | tractusx-connector.postgresql.jdbcUrl | string | `"jdbc:postgresql://postgresqlprovider:5432/edc"` |  |
-| tractusx-connector.postgresql.password | string | `"<path:material-pass/data/dev/edc/database#user>"` |  |
+| tractusx-connector.postgresql.password | string | `"<path:material-pass/data/dev/edc/database#password>"` |  |
 | tractusx-connector.postgresql.username | string | `"<path:material-pass/data/dev/edc/database#user>"` |  |
 | tractusx-connector.serviceAccount.annotations | object | `{}` |  |
 | tractusx-connector.serviceAccount.create | bool | `true` |  |

diff --git a/deployment/helm/edc-provider/values-beta.yaml b/deployment/helm/edc-provider/values-beta.yaml
@@ -163,10 +163,10 @@ tractusx-connector:
           clusterIssuer: ""
   postgresql:
     username: <path:material-pass/data/beta/edc/database#user>
-    password: <path:material-pass/data/beta/edc/database#user>
+    password: <path:material-pass/data/beta/edc/database#password>
     auth:
       username: <path:material-pass/data/beta/edc/database#user>
-      password: <path:material-pass/data/beta/edc/database#user>
+      password: <path:material-pass/data/beta/edc/database#password>
 
   vault:
     fullnameOverride: "vault"

diff --git a/deployment/helm/edc-provider/values-int.yaml b/deployment/helm/edc-provider/values-int.yaml
@@ -163,10 +163,10 @@ tractusx-connector:
           clusterIssuer: ""
   postgresql:
     username: <path:material-pass/data/int/edc/database#user>
-    password: <path:material-pass/data/int/edc/database#user>
+    password: <path:material-pass/data/int/edc/database#password>
     auth:
       username: <path:material-pass/data/int/edc/database#user>
-      password: <path:material-pass/data/int/edc/database#user>
+      password: <path:material-pass/data/int/edc/database#password>
 
   vault:
     fullnameOverride: "vault"

diff --git a/deployment/helm/edc-provider/values.yaml b/deployment/helm/edc-provider/values.yaml
@@ -515,11 +515,11 @@ tractusx-connector:
     jdbcUrl: "jdbc:postgresql://postgresqlprovider:5432/edc"
     fullnameOverride: "postgresql"
     username: <path:material-pass/data/dev/edc/database#user>
-    password: <path:material-pass/data/dev/edc/database#user>
+    password: <path:material-pass/data/dev/edc/database#password>
     auth:
       database: "edc"
       username: <path:material-pass/data/dev/edc/database#user>
-      password: <path:material-pass/data/dev/edc/database#user>
+      password: <path:material-pass/data/dev/edc/database#password>
 
   vault:
     fullnameOverride: "vault"