feat: oracle legacy database

.github/workflows/merge.yml

@@ -156,6 +156,7 @@ jobs:
           parameters:
             -p ZONE=${{ env.ZONE }} -p NAME=${{ github.event.repository.name }}
             -p PROMOTE=${{ github.repository }}/legacy:${{ env.ZONE }}
+            -p ENVIRONMENT=${{ secrets.OC_NAMESPACE }}
 
       - name: Deploy Processor
         uses: bcgov-nr/action-deployer-openshift@v3.0.0
@@ -356,7 +357,8 @@ jobs:
           verification_path: health
           parameters:
             -p ZONE=${{ env.ZONE }} -p NAME=${{ github.event.repository.name }}
-            -p PROMOTE=${{ github.repository }}/legacy:${{ env.PREV }}    
+            -p PROMOTE=${{ github.repository }}/legacy:${{ env.PREV }}
+            -p ENVIRONMENT=${{ secrets.OC_NAMESPACE }}
 
       - name: Deploy Processor
         uses: bcgov-nr/action-deployer-openshift@v3.0.0

.github/workflows/pr-close.yml

@@ -19,3 +19,31 @@ jobs:
     with:
       cleanup: label
       packages: backend common database frontend legacy processor
+
+  tools-cleanup:
+    name: Cleanup tools environment
+    needs: [cleanup]
+    environment: tools
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Remove the PR database
+        continue-on-error: true
+        run: |
+          oc login --token=${{ secrets.OC_TOKEN }} --server=${{ secrets.OC_SERVER }}
+          oc project ${{ secrets.OC_NAMESPACE }} # Safeguard!
+          # This removes a new pluggable database, user and service for the PR
+          for i in {1..5}; do
+            POD_NAME=$(oc get pods -l app=nr-forest-client-tools -l deployment=nr-forest-client-tools-legacydb -o jsonpath='{.items[0].metadata.name}' 2>/dev/null)
+            if [ -n "$POD_NAME" ]; then
+              echo "Pod found: $POD_NAME"
+              oc exec $POD_NAME -- /opt/oracle/removeDatabase "THE" "PR_${{ github.event.number }}"
+              break
+            else
+              echo "Pod not found, retrying in 10 seconds... ($i/5)"
+              sleep 10
+            fi
+          done
+
+          if [ -z "$POD_NAME" ]; then
+            echo "Failed to find the pod after 5 attempts."
+          fi

.github/workflows/pr-open.yml

@@ -49,7 +49,7 @@ jobs:
       packages: write
     strategy:
       matrix:
-        package: [backend, common, database, frontend, legacy, processor]
+        package: [backend, database, frontend, legacy, processor]
     steps:
       - uses: actions/checkout@v4
 
@@ -63,9 +63,107 @@ jobs:
           build_args: |
             APP_VERSION=${{ needs.vars.outputs.semver }}-${{ github.event.number }}
 
+  build-legacydb:
+    name: Builds (legacydb)
+    runs-on: ubuntu-22.04
+    needs: [vars]
+    permissions:
+      packages: write    
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: bcgov-nr/action-builder-ghcr@v2.1.0
+        name: Build (Legacy db)
+        with:
+          package: legacydb
+          tag: latest
+          tag_fallback: test
+          triggers: ('legacydb/')
+          build_args: |
+            APP_VERSION=${{ needs.vars.outputs.semver }}-${{ github.event.number }}
+
+  deploy-tools:
+    name: Deploy Tools
+    needs: [build-legacydb, vars]
+    environment: tools
+    env:
+      DOMAIN: apps.silver.devops.gov.bc.ca
+      PREFIX: ${{ needs.vars.outputs.url }}
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Initializing Deployment
+        uses: bcgov-nr/action-deployer-openshift@v3.0.0
+        with:
+          file: legacydb/openshift.deploy.yml
+          oc_namespace: ${{ secrets.OC_NAMESPACE }}
+          oc_server: ${{ secrets.OC_SERVER }}
+          oc_token: ${{ secrets.OC_TOKEN }}
+          overwrite: false
+          parameters:
+            -p ZONE=tools            
+            -p ORACLEDB_USER_W=THE
+            -p ORACLEDB_PASSWORD_W=${{ secrets.ORACLEDB_PASSWORD_W }}
+            -p TAG=latest
+
+      - name: Create the PR database
+        continue-on-error: true
+        run: |
+          oc login --token=${{ secrets.OC_TOKEN }} --server=${{ secrets.OC_SERVER }}
+          oc project ${{ secrets.OC_NAMESPACE }} # Safeguard!
+          # This creates a new pluggable database for the PR
+          for i in {1..5}; do
+            POD_NAME=$(oc get pods -l app=nr-forest-client-tools  -l deployment=nr-forest-client-tools-legacydb -o jsonpath='{.items[0].metadata.name}' 2>/dev/null)
+            if [ -n "$POD_NAME" ]; then
+              echo "Pod found: $POD_NAME"
+              oc exec $POD_NAME -- /opt/oracle/createDatabase PR_${{ github.event.number }}
+              break
+            else
+              echo "Pod not found, retrying in 10 seconds... ($i/5)"
+              sleep 10
+            fi
+          done
+
+          if [ -z "$POD_NAME" ]; then
+            echo "Failed to find the pod after 5 attempts."
+          fi
+
+      - name: Create the PR user
+        continue-on-error: true
+        run: |
+          oc login --token=${{ secrets.OC_TOKEN }} --server=${{ secrets.OC_SERVER }}
+          oc project ${{ secrets.OC_NAMESPACE }} # Safeguard!
+          # This creates a new pluggable database for the PR
+          for i in {1..5}; do
+            POD_NAME=$(oc get pods -l app=nr-forest-client-tools -l deployment=nr-forest-client-tools-legacydb -o jsonpath='{.items[0].metadata.name}' 2>/dev/null)
+            if [ -n "$POD_NAME" ]; then
+              echo "Pod found: $POD_NAME"
+              oc exec $POD_NAME -- /opt/oracle/createAppUser "THE" "${{ secrets.ORACLEDB_PASSWORD_W }}_${{ github.event.number }}" "PR_${{ github.event.number }}"
+              break
+            else
+              echo "Pod not found, retrying in 10 seconds... ($i/5)"
+              sleep 10
+            fi
+          done
+
+          if [ -z "$POD_NAME" ]; then
+            echo "Failed to find the pod after 5 attempts."
+          fi
+
+      - name: Migrate the PR database
+        continue-on-error: true
+        run: |
+          BRANCH_NAME="${{ github.head_ref }}"
+          # Escape slashes and other special characters
+          ESCAPED_BRANCH_NAME=$(echo "$BRANCH_NAME" | sed 's/[\/&]/\\&/g')
+          oc login --token=${{ secrets.OC_TOKEN }} --server=${{ secrets.OC_SERVER }}
+          oc project ${{ secrets.OC_NAMESPACE }} # Safeguard!
+          oc create job --from=cronjob/nr-forest-client-tools-migratedb migrate-$(date +%s) --dry-run=client -o yaml | sed "s/value: main/value: ${ESCAPED_BRANCH_NAME}/" | sed "s/value: \"0\"/value: \"${{ github.event.number }}\"/" | oc apply -f -
+
   deploy:
     name: Deploy Application
-    needs: [builds, vars]
+    needs: [deploy-tools, builds, vars]
     environment: dev
     env:
       DOMAIN: apps.silver.devops.gov.bc.ca
@@ -86,11 +184,11 @@ jobs:
             -p ZONE=${{ github.event.number }}
             -p ORACLEDB_USER=${{ secrets.ORACLEDB_USERNAME }}
             -p ORACLEDB_PASSWORD=${{ secrets.ORACLEDB_PASSWORD }}
-            -p ORACLEDB_USER_W=${{ secrets.ORACLEDB_USERNAME_W }}
-            -p ORACLEDB_PASSWORD_W=${{ secrets.ORACLEDB_PASSWORD_W }}
+            -p ORACLEDB_USER_W=THE
+            -p ORACLEDB_PASSWORD_W=${{ secrets.ORACLEDB_PASSWORD_W }}_${{ github.event.number }}
             -p ORACLEDB_DATABASE=${{ secrets.ORACLEDB_DATABASE }}
-            -p ORACLEDB_HOST=${{ secrets.ORACLEDB_HOST }}
-            -p ORACLEDB_SERVICENAME=${{ secrets.ORACLEDB_SERVICENAME }}
+            -p ORACLEDB_HOST="nr-forest-client-tools-legacydb.d2723f-tools.svc.cluster.local"
+            -p ORACLEDB_SERVICENAME=PR_${{ github.event.number }}
             -p ORACLEDB_SECRET=${{ secrets.ORACLEDB_SECRET }}
             -p BCREGISTRY_KEY=${{ secrets.BCREGISTRY_KEY }}
             -p BCREGISTRY_ACCOUNT=${{ secrets.BCREGISTRY_ACCOUNT }}
@@ -148,6 +246,8 @@ jobs:
           parameters:
             -p ZONE=${{ github.event.number }}
             -p PROMOTE=${{ github.repository }}/legacy:${{ github.event.number }}
+            -p ENVIRONMENT=${{ secrets.OC_NAMESPACE }}
+            -p ORACLEDB_PORT=1521
 
       - name: Deploy Processor
         uses: bcgov-nr/action-deployer-openshift@v3.0.0
@@ -235,8 +335,6 @@ jobs:
             -p LANDING_URL=${{ needs.vars.outputs.url }}
             -p FRONTEND_URL=${{ needs.vars.outputs.url }}
 
-
-
   cypress-run:
     name: "User flow test"
     runs-on: ubuntu-22.04

common/openshift.init.yml

@@ -132,29 +132,3 @@ objects:
             - podSelector: {}
       policyTypes:
         - Ingress
-  - kind: PersistentVolumeClaim
-    apiVersion: v1
-    metadata:
-      name: ${NAME}-${ZONE}-index
-      labels:
-        app: ${NAME}-${ZONE}
-    spec:
-      accessModes:
-        - ReadWriteOnce
-      resources:
-        requests:
-          storage: ${IDX_PVC_SIZE}
-      storageClassName: netapp-file-standard
-  - kind: PersistentVolumeClaim
-    apiVersion: v1
-    metadata:
-      name: ${NAME}-${ZONE}-index-backup
-      labels:
-        app: ${NAME}-${ZONE}
-    spec:
-      accessModes:
-        - ReadWriteOnce
-      resources:
-        requests:
-          storage: ${IDX_BKP_PVC_SIZE}
-      storageClassName: netapp-file-standard

docker-compose.yml

@@ -22,7 +22,9 @@ services:
       POSTGRES_USER: *POSTGRES_USER
       POSTGRES_PASSWORD: *POSTGRES_PASSWORD
       POSTGRES_DB: *POSTGRES_DATABASE
-    image: postgres:15
+    build:
+      context: database
+      dockerfile: Dockerfile
     ports: [5432:5432]
     volumes: ["/pgdata"]
     healthcheck:
@@ -34,17 +36,28 @@ services:
 
   legacydb:
     container_name: oracle
+    #build:
+    #  context: legacydb
+    #  dockerfile: Dockerfile
     environment:
       APP_USER_PASSWORD: default
       APP_USER: THE
       ORACLE_RANDOM_PASSWORD: yes
     platform: "linux/amd64"
-    image: gvenzl/oracle-xe:21.3.0-slim-faststart
+    image: gvenzl/oracle-free:23.3-slim-faststart
     ports: [1521:1521]
-    volumes: [/opt/oracle/oradata gvenzl/oracle-xe]
+    volumes: [/opt/oracle/oradata]
     healthcheck:
       test: [ "CMD-SHELL", "healthcheck.sh" ]
       interval: 5s
       timeout: 10s
       retries: 10
     <<: *defaults
+
+  legacyflyway:
+    container_name: flyway
+    image: flyway/flyway
+    command: -url=jdbc:oracle:thin:@legacydb:1521/FREEPDB1 -user=THE -password=default -connectRetries=60 migrate    
+    volumes: [./legacy/src/test/resources/db/migration:/flyway/sql]
+    depends_on: [legacydb]
+    <<: *defaults

legacy/Dockerfile

@@ -44,5 +44,7 @@ USER 1001
 EXPOSE ${PORT}
 HEALTHCHECK CMD curl -f http://localhost:${PORT}/actuator/health | grep '"status":"UP"'
 
+ENV SPRING_PROFILES_ACTIVE=container
+
 # Startup
-ENTRYPOINT ["/app/nr-forest-client-legacy", "--spring.profiles.active=container"]
+ENTRYPOINT ["/app/nr-forest-client-legacy"]

legacy/openshift.deploy.yml

@@ -13,6 +13,9 @@ parameters:
   - name: ZONE
     description: Deployment zone, e.g. pr-### or prod
     required: true
+  - name: ENVIRONMENT
+    description: Environment name used by the application
+    value: prod
   - name: IMAGE_TAG
     description: Image tag to use
     value: latest
@@ -25,7 +28,10 @@ parameters:
     description: Image (namespace/name:tag) to promote/import
     value: bcgov/nr-forest-client-legacy:prod
   - name: ORACLEDB_KEYSTORE
-    description: Oracle database keystore file  
+    description: Oracle database keystore file
+  - name: ORACLEDB_PORT
+    description: Oracle database port
+    value: "1543"
   - name: CPU_REQUEST
     value: 75m
   - name: CPU_LIMIT
@@ -38,8 +44,8 @@ parameters:
     description: The amount of storage the cert PVC should have
     value: 25Mi
 objects:  
-  - apiVersion: v1
-    kind: ImageStream
+  - kind: ImageStream
+    apiVersion: v1
     metadata:
       labels:
         app: ${NAME}-${ZONE}
@@ -54,8 +60,8 @@ objects:
             name: ${REGISTRY}/${PROMOTE}
           referencePolicy:
             type: Local
-  - apiVersion: v1
-    kind: PersistentVolumeClaim
+  - kind: PersistentVolumeClaim
+    apiVersion: v1
     metadata:
       labels:
         app: ${NAME}-${ZONE}
@@ -67,11 +73,12 @@ objects:
         requests:
           storage: ${CERT_PVC_SIZE}
       storageClassName: netapp-file-standard
-  - apiVersion: v1
-    kind: DeploymentConfig
+  - kind: DeploymentConfig
+    apiVersion: v1
     metadata:
       labels:
         app: ${NAME}-${ZONE}
+        appkind: ${COMPONENT}
       name: ${NAME}-${ZONE}-${COMPONENT}
     spec:
       replicas: 1
@@ -105,7 +112,7 @@ objects:
                 claimName: ${NAME}-${ZONE}-${COMPONENT}
           initContainers:
             - name: ${NAME}-init
-              image: ${REGISTRY}/bcgov/${NAME}/common:${ZONE}
+              image: ${REGISTRY}/bcgov/nr-forest-client-commons/certextractor:0.2.0
               imagePullPolicy: Always
               env:
                 - name: ORACLEDB_HOST
@@ -119,7 +126,7 @@ objects:
                       name: ${NAME}-${ZONE}
                       key: oracle-secret
                 - name: ORACLEDB_PORT
-                  value: "1543"
+                  value: ${ORACLEDB_PORT}
               volumeMounts:
                 - name: ${NAME}-${ZONE}-certs
                   mountPath: /cert
@@ -161,7 +168,9 @@ objects:
                       name: ${NAME}-${ZONE}
                       key: oracle-service
                 - name: ORACLEDB_PORT
-                  value: "1543"
+                  value: ${ORACLEDB_PORT}
+                - name: SPRING_PROFILES_ACTIVE
+                  value: "container,${ENVIRONMENT}"
                 - name: ORACLEDB_SECRET
                   valueFrom:
                     secretKeyRef:
@@ -204,8 +213,8 @@ objects:
               volumeMounts:
                 - mountPath: /cert
                   name: ${NAME}-${ZONE}-certs
-  - apiVersion: v1
-    kind: Service
+  - kind: Service
+    apiVersion: v1
     metadata:
       labels:
         app: ${NAME}-${ZONE}