Merge branch 'main' into renovate/maven-all-minor-patch

.github/CODEOWNERS

@@ -1,7 +1,7 @@
 # Matched against repo root (asterisk)
-*       @jazzgrewal @paulushcgcj @DerekRoberts
+*       @jazzgrewal @paulushcgcj @DerekRoberts @gpascucci
 
 # Matched against directories (e.g. workflows)
-# /.github/workflows/       @jazzgrewal @paulushcgcj @DerekRoberts
+# /.github/workflows/       @jazzgrewal @paulushcgcj @DerekRoberts @gpascucci
 
 # See https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners

.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
 

.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/')
 

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