fix: password update error (#414)

bcgov · Oct 25, 2024 · 159d10d · 159d10d
1 parent 66d6b4c
commit 159d10d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -30,7 +30,8 @@ jobs:
             -p AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }}
             -p AWS_ACCESS_KEY_SECRET='${{ secrets.AWS_ACCESS_KEY_SECRET }}'
             -p ORACLE_DB_USER=${{ secrets.DB_USER }}
-            -p ORACLE_DB_PASSWORD='${{ secrets.DB_PASSWORD }}'
+            -p ORACLE_DB_PASSWORD='${{ secrets.ORACLE_DB_PASSWORD }}'
+            -p POSTGRES_DB_PASSWORD='${{ secrets.POSTGRES_DB_PASSWORD }}'
             -p FORESTCLIENTAPI_KEY='${{ secrets.FORESTCLIENTAPI_KEY }}'
             -p ZONE=test
 
@@ -100,7 +101,8 @@ jobs:
             -p AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }}
             -p AWS_ACCESS_KEY_SECRET='${{ secrets.AWS_ACCESS_KEY_SECRET }}'
             -p ORACLE_DB_USER=${{ secrets.DB_USER }}
-            -p ORACLE_DB_PASSWORD='${{ secrets.DB_PASSWORD }}'
+            -p ORACLE_DB_PASSWORD='${{ secrets.ORACLE_DB_PASSWORD }}'
+            -p POSTGRES_DB_PASSWORD='${{ secrets.POSTGRES_DB_PASSWORD }}'
             -p FORESTCLIENTAPI_KEY='${{ secrets.FORESTCLIENTAPI_KEY }}'
             -p ZONE=prod
 

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
@@ -61,7 +61,8 @@ jobs:
             -p AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }}
             -p AWS_ACCESS_KEY_SECRET='${{ secrets.AWS_ACCESS_KEY_SECRET }}'
             -p ORACLE_DB_USER=${{ secrets.DB_USER }}
-            -p ORACLE_DB_PASSWORD='${{ secrets.DB_PASSWORD }}'
+            -p ORACLE_DB_PASSWORD='${{ secrets.ORACLE_DB_PASSWORD }}'
+            -p POSTGRES_DB_PASSWORD='${{ secrets.POSTGRES_DB_PASSWORD }}'
             -p FORESTCLIENTAPI_KEY='${{ secrets.FORESTCLIENTAPI_KEY }}'
           triggers: ('common/' 'backend/' 'frontend/')
 

diff --git a/common/openshift.init.yml b/common/openshift.init.yml
@@ -31,10 +31,9 @@ parameters:
   - name: PG_DATABASE
     description: Postgres database name
     value: database
-  - name: DB_PASSWORD
+  - name: POSTGRES_DB_PASSWORD
     description: Password for the PostgreSQL connection user.
-    from: "[a-zA-Z0-9]{16}"
-    generate: expression
+    required: true
   - name: FORESTCLIENTAPI_KEY
     description:
     required: true
@@ -70,7 +69,7 @@ objects:
         app: ${NAME}-${ZONE}
     stringData:
       database-name: ${NAME}
-      database-password: ${DB_PASSWORD}
+      database-password: ${POSTGRES_DB_PASSWORD}
       database-user: ${NAME}
   - apiVersion: networking.k8s.io/v1
     kind: NetworkPolicy