fix(SILVA-529): setting correct oracle connection info

bcgov · Nov 7, 2024 · 24b8baa · 24b8baa
1 parent 29858c2
commit 24b8baa
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -31,6 +31,8 @@ jobs:
             -p AWS_ACCESS_KEY_SECRET='${{ secrets.AWS_ACCESS_KEY_SECRET }}'
             -p ORACLE_DB_USER=${{ secrets.DB_USER }}
             -p ORACLE_DB_PASSWORD='${{ secrets.ORACLE_DB_PASSWORD }}'
+            -p ORACLE_DB_HOST='${{ secrets.ORACLE_DB_HOST }}'
+            -p ORACLE_DB_SERVICE='${{ secrets.ORACLE_DB_SERVICE }}'
             -p POSTGRES_DB_PASSWORD='${{ secrets.POSTGRES_DB_PASSWORD }}'
             -p FORESTCLIENTAPI_KEY='${{ secrets.FORESTCLIENTAPI_KEY }}'
             -p VITE_USER_POOLS_WEB_CLIENT_ID=${{ vars.VITE_USER_POOLS_WEB_CLIENT_ID }}
@@ -104,6 +106,8 @@ jobs:
             -p AWS_ACCESS_KEY_SECRET='${{ secrets.AWS_ACCESS_KEY_SECRET }}'
             -p ORACLE_DB_USER=${{ secrets.DB_USER }}
             -p ORACLE_DB_PASSWORD='${{ secrets.ORACLE_DB_PASSWORD }}'
+            -p ORACLE_DB_HOST='${{ secrets.ORACLE_DB_HOST }}'
+            -p ORACLE_DB_SERVICE='${{ secrets.ORACLE_DB_SERVICE }}'
             -p POSTGRES_DB_PASSWORD='${{ secrets.POSTGRES_DB_PASSWORD }}'
             -p FORESTCLIENTAPI_KEY='${{ secrets.FORESTCLIENTAPI_KEY }}'
             -p VITE_USER_POOLS_WEB_CLIENT_ID=${{ vars.VITE_USER_POOLS_WEB_CLIENT_ID }}

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
@@ -62,6 +62,8 @@ jobs:
             -p AWS_ACCESS_KEY_SECRET='${{ secrets.AWS_ACCESS_KEY_SECRET }}'
             -p ORACLE_DB_USER=${{ secrets.DB_USER }}
             -p ORACLE_DB_PASSWORD='${{ secrets.ORACLE_DB_PASSWORD }}'
+            -p ORACLE_DB_HOST='${{ secrets.ORACLE_DB_HOST }}'
+            -p ORACLE_DB_SERVICE='${{ secrets.ORACLE_DB_SERVICE }}'
             -p POSTGRES_DB_PASSWORD='${{ secrets.POSTGRES_DB_PASSWORD }}'
             -p FORESTCLIENTAPI_KEY='${{ secrets.FORESTCLIENTAPI_KEY }}'
             -p VITE_USER_POOLS_WEB_CLIENT_ID=${{ vars.VITE_USER_POOLS_WEB_CLIENT_ID }}

diff --git a/backend/openshift.deploy.yml b/backend/openshift.deploy.yml
@@ -130,7 +130,10 @@ objects:
               imagePullPolicy: Always
               env:
                 - name: ORACLEDB_HOST
-                  value: ${DATABASE_HOST}
+                  valueFrom:
+                    secretKeyRef:
+                      name: ${NAME}-${ZONE}-${COMPONENT}
+                      key: oracle-host
                 - name: ORACLEDB_SECRET
                   valueFrom:
                     secretKeyRef:
@@ -173,11 +176,17 @@ objects:
                 - name: RESULTS_ENV_OPENSEARCH
                   value: ${RESULTS_ENV_OPENSEARCH}
                 - name: DATABASE_HOST
-                  value: ${DATABASE_HOST}
+                  valueFrom:
+                    secretKeyRef:
+                      name: ${NAME}-${ZONE}-${COMPONENT}
+                      key: oracle-host
                 - name: DATABASE_PORT
                   value: ${DATABASE_PORT}
                 - name: SERVICE_NAME
-                  value: ${SERVICE_NAME}
+                  valueFrom:
+                    secretKeyRef:
+                      name: ${NAME}-${ZONE}-${COMPONENT}
+                      key: oracle-service
                 - name: AWS_COGNITO_ISSUER_URI
                   value: ${AWS_COGNITO_ISSUER_URI}
                 - name: DASHBOARD_JOB_IDIR_USERS

diff --git a/common/openshift.init.yml b/common/openshift.init.yml
@@ -25,6 +25,12 @@ parameters:
   - name: ORACLE_DB_PASSWORD
     description: Oracle database password for API
     required: true
+  - name: ORACLE_DB_HOST
+    description: Oracle database hostname
+    required: true
+  - name: ORACLE_DB_SERVICE
+    description: Oracle database service name
+    required: true
   - name: ORACLEDB_SECRET
     description: Oracle database keystore secret/password
     value: changeit
@@ -65,6 +71,8 @@ objects:
       oracle-user: ${ORACLE_DB_USER}
       oracle-password: ${ORACLE_DB_PASSWORD}
       oracle-secret: ${ORACLEDB_SECRET}
+      oracle-service: ${ORACLE_DB_SERVICE}
+      oracle-host: ${ORACLE_DB_HOST}
       forest-client-api-key: ${FORESTCLIENTAPI_KEY}
   - apiVersion: v1
     kind: Secret