Tracking pull request to merge relase-2.15.0 to master (#2828)

* fix: resolve error saving on compliance report acceptance (#2832) --------- Co-authored-by: Hamed Valiollahi <[email protected]>
bcgov · Feb 20, 2024 · 620006b · 620006b
1 parent e8ee15f
commit 620006b
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 117 deletions.
diff --git a/.github/readme.md b/.github/readme.md
@@ -17,7 +17,6 @@
 * Create the new release branch from master
 * Update tfrs-release.yaml
   * name
-  * branches
   * PR_NUMBER
   * RELEASE_NAME
 * Update .pipeline/lib/config.js

diff --git a/.github/workflows/dev-release.yaml b/.github/workflows/dev-release.yaml
@@ -1,11 +1,11 @@
 ## For each release, the value of name, branches, RELEASE_NAME and PR_NUMBER need to be adjusted accordingly
 ## For each release, update lib/config.js: version and releaseBranch
 
-name: TFRS Dev release-2.14.0
+name: TFRS Dev release-2.15.0
 
 on:
   push:
-    branches: [ release-2.14.0 ]
+    branches: [ release-2.15.0 ]
     paths:
       - frontend/**
       - backend/**
@@ -15,8 +15,8 @@ on:
 env:
   ## The pull request number of the Tracking pull request to merge the release branch to main
   ## Also remember to update the version in .pipeline/lib/config.js
-  PR_NUMBER: 2737
-  RELEASE_NAME: release-2.14.0
+  PR_NUMBER: 2828
+  RELEASE_NAME: release-2.15.0
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

diff --git a/.github/workflows/pr-dev-deploy-template.yaml b/.github/workflows/pr-dev-deploy-template.yaml
@@ -61,131 +61,64 @@ jobs:
         run: |
           oc tag ${{ secrets.tools-namespace }}/tfrs-frontend:build${{ inputs.suffix }} ${{ secrets.namespace }}/tfrs-frontend:dev${{ inputs.suffix }}
           cd charts/tfrs-apps/charts/tfrs-frontend
-          helm status -n ${{ secrets.namespace }} tfrs-frontend-dev${{ inputs.suffix }}
-          if [ $? -eq 0 ]; then
-            echo "tfrs-frontend-dev${{ inputs.suffix }} release exists already"
-            helm upgrade \
-              --set frontendImageTagName=dev${{ inputs.suffix }} \
-              --set suffix=-dev${{ inputs.suffix }} \
-              --set namespace=${{ secrets.namespace }} \
-              --set envName=dev \
-              -n ${{ secrets.namespace }} -f ./values-dev-jan.yaml tfrs-frontend-dev${{ inputs.suffix }} .
-          else
-            echo "tfrs-frontend-dev${{ inputs.suffix }} release does not exist"
-            helm install \
-              --set frontendImageTagName=dev${{ inputs.suffix }} \
-              --set suffix=-dev${{ inputs.suffix }} \
-              --set namespace=${{ secrets.namespace }} \
-              --set envName=dev \
-              -n ${{ secrets.namespace }} -f ./values-dev-jan.yaml tfrs-frontend-dev${{ inputs.suffix }} .
-          fi
+          helm upgrade --install \
+            --set frontendImageTagName=dev${{ inputs.suffix }} \
+            --set suffix=-dev${{ inputs.suffix }} \
+            --set namespace=${{ secrets.namespace }} \
+            --set envName=dev \
+            -n ${{ secrets.namespace }} -f ./values-dev-jan.yaml tfrs-frontend-dev${{ inputs.suffix }} .
           
       - name: Deploy tfrs-backend
         shell: bash {0}
         run: |
           oc tag ${{ secrets.tools-namespace }}/tfrs-backend:build${{ inputs.suffix }} ${{ secrets.namespace }}/tfrs-backend:dev${{ inputs.suffix }}
           cd charts/tfrs-apps/charts/tfrs-backend
-          helm status -n ${{ secrets.namespace }} tfrs-backend-dev${{ inputs.suffix }}
-          if [ $? -eq 0 ]; then
-            echo "tfrs-backend-dev${{ inputs.suffix }} release exists already"
-            helm upgrade \
-              --set backendImageTagName=dev${{ inputs.suffix }} \
-              --set suffix=-dev${{ inputs.suffix }} \
-              --set namespace=${{ secrets.namespace }} \
-              --set envName=dev \
-              --set databaseServiceHostName=${{ inputs.database-service-host-name }} \
-              --set rabbitmqVHost=tfrs-dev${{ inputs.suffix }}-vhost \
-              -n ${{ secrets.namespace }} -f ./values-dev-jan.yaml tfrs-backend-dev${{ inputs.suffix }} .
-          else
-            echo "tfrs-backend-dev${{ inputs.suffix }} release does not exist"
-            helm install \
-              --set backendImageTagName=dev${{ inputs.suffix }} \
-              --set suffix=-dev${{ inputs.suffix }} \
-              --set namespace=${{ secrets.namespace }} \
-              --set envName=dev \
-              --set databaseServiceHostName=${{ inputs.database-service-host-name }} \
-              --set rabbitmqVHost=tfrs-dev${{ inputs.suffix }}-vhost \
-              -n ${{ secrets.namespace }} -f ./values-dev-jan.yaml tfrs-backend-dev${{ inputs.suffix }} .
-          fi
+          helm upgrade --install \
+            --set backendImageTagName=dev${{ inputs.suffix }} \
+            --set suffix=-dev${{ inputs.suffix }} \
+            --set namespace=${{ secrets.namespace }} \
+            --set envName=dev \
+            --set databaseServiceHostName=${{ inputs.database-service-host-name }} \
+            --set rabbitmqVHost=tfrs-dev${{ inputs.suffix }}-vhost \
+            -n ${{ secrets.namespace }} -f ./values-dev-jan.yaml tfrs-backend-dev${{ inputs.suffix }} .
           
       - name: Deploy tfrs-celery
         shell: bash {0}
         run: |
           oc tag ${{ secrets.tools-namespace }}/tfrs-celery:build${{ inputs.suffix }} ${{ secrets.namespace }}/tfrs-celery:dev${{ inputs.suffix }}
           cd charts/tfrs-apps/charts/tfrs-celery
-          helm status -n ${{ secrets.namespace }} tfrs-celery-dev${{ inputs.suffix }}
-          if [ $? -eq 0 ]; then
-            echo "tfrs-celery-dev${{ inputs.suffix }} release exists already"
-            helm upgrade \
-              --set celeryImageTagName=dev${{ inputs.suffix }} \
-              --set suffix=-dev${{ inputs.suffix }} \
-              --set namespace=${{ secrets.namespace }} \
-              --set envName=dev \
-              --set databaseServiceHostName=${{ inputs.database-service-host-name }} \
-              --set rabbitmqVHost=tfrs-dev${{ inputs.suffix }}-vhost \
-              -n ${{ secrets.namespace }} -f ./values-dev-jan.yaml tfrs-celery-dev${{ inputs.suffix }} .
-          else
-            echo "tfrs-celery-dev${{ inputs.suffix }} release does not exist"
-            helm install \
-              --set celeryImageTagName=dev${{ inputs.suffix }} \
-              --set suffix=-dev${{ inputs.suffix }} \
-              --set namespace=${{ secrets.namespace }} \
-              --set envName=dev \
-              --set databaseServiceHostName=${{ inputs.database-service-host-name }} \
-              --set rabbitmqVHost=tfrs-dev${{ inputs.suffix }}-vhost \
-              -n ${{ secrets.namespace }} -f ./values-dev-jan.yaml tfrs-celery-dev${{ inputs.suffix }} .
-          fi
+          helm upgrade --install \
+            --set celeryImageTagName=dev${{ inputs.suffix }} \
+            --set suffix=-dev${{ inputs.suffix }} \
+            --set namespace=${{ secrets.namespace }} \
+            --set envName=dev \
+            --set databaseServiceHostName=${{ inputs.database-service-host-name }} \
+            --set rabbitmqVHost=tfrs-dev${{ inputs.suffix }}-vhost \
+            -n ${{ secrets.namespace }} -f ./values-dev-jan.yaml tfrs-celery-dev${{ inputs.suffix }} .
 
       - name: Deploy tfrs-scan-handler
         shell: bash {0}
         run: |
           oc tag ${{ secrets.tools-namespace }}/tfrs-scan-handler:build${{ inputs.suffix }} ${{ secrets.namespace }}/tfrs-scan-handler:dev${{ inputs.suffix }}
           cd charts/tfrs-apps/charts/tfrs-scan-handler
-          helm status -n ${{ secrets.namespace }} tfrs-scan-handler-dev${{ inputs.suffix }}
-          if [ $? -eq 0 ]; then
-            echo "tfrs-scan-handler-dev${{ inputs.suffix }} release exists already"
-            helm upgrade \
-              --set scanHandlerImageTagName=dev${{ inputs.suffix }} \
-              --set suffix=-dev${{ inputs.suffix }} \
-              --set namespace=${{ secrets.namespace }} \
-              --set envName=dev \
-              --set databaseServiceHostName=${{ inputs.database-service-host-name }} \
-              --set rabbitmqVHost=tfrs-dev${{ inputs.suffix }}-vhost  \
-              -n ${{ secrets.namespace }} -f ./values-dev-jan.yaml tfrs-scan-handler-dev${{ inputs.suffix }} .
-          else
-            echo "tfrs-scan-handler-dev${{ inputs.suffix }} release does not exist"
-            helm install \
-              --set scanHandlerImageTagName=dev${{ inputs.suffix }} \
-              --set suffix=-dev${{ inputs.suffix }} \
-              --set namespace=${{ secrets.namespace }} \
-              --set envName=dev \
-              --set databaseServiceHostName=${{ inputs.database-service-host-name }} \
-              --set rabbitmqVHost=tfrs-dev${{ inputs.suffix }}-vhost \
-              -n ${{ secrets.namespace }} -f ./values-dev-jan.yaml tfrs-scan-handler-dev${{ inputs.suffix }} .
-          fi
+          helm upgrade --install \
+            --set scanHandlerImageTagName=dev${{ inputs.suffix }} \
+            --set suffix=-dev${{ inputs.suffix }} \
+            --set namespace=${{ secrets.namespace }} \
+            --set envName=dev \
+            --set databaseServiceHostName=${{ inputs.database-service-host-name }} \
+            --set rabbitmqVHost=tfrs-dev${{ inputs.suffix }}-vhost  \
+            -n ${{ secrets.namespace }} -f ./values-dev-jan.yaml tfrs-scan-handler-dev${{ inputs.suffix }} .
 
       - name: Deploy tfrs-scan-coordinator
         shell: bash {0}
         run: |
           oc tag ${{ secrets.tools-namespace }}/tfrs-scan-coordinator:build${{ inputs.suffix}} ${{ secrets.namespace }}/tfrs-scan-coordinator:dev${{ inputs.suffix}}
           cd charts/tfrs-apps/charts/tfrs-scan-coordinator
-          helm status -n ${{ secrets.namespace }} tfrs-scan-coordinator-dev${{ inputs.suffix }}
-          if [ $? -eq 0 ]; then
-            echo "tfrs-scan-coordinator-dev${{ inputs.suffix }} release exists already"
-            helm upgrade \
-              --set scanCoordinatorImageTagName=dev${{ inputs.suffix}} \
-              --set suffix=-dev${{ inputs.suffix }} \
-              --set namespace=${{ secrets.namespace }} \
-              --set envName=dev \
-              --set rabbitmqVHost=tfrs-dev${{ inputs.suffix }}-vhost \
-              -n ${{ secrets.namespace }} -f ./values-dev-jan.yaml tfrs-scan-coordinator-dev${{ inputs.suffix }} .
-          else
-            echo "tfrs-scan-coordinator${{ inputs.suffix }} release does not exist"
-            helm install \
-              --set scanCoordinatorImageTagName=dev${{ inputs.suffix}} \
-              --set suffix=-dev${{ inputs.suffix }} \
-              --set namespace=${{ secrets.namespace }} \
-              --set envName=dev \
-              --set rabbitmqVHost=tfrs-dev${{ inputs.suffix }}-vhost \
-              -n ${{ secrets.namespace }} -f ./values-dev-jan.yaml tfrs-scan-coordinator-dev${{ inputs.suffix }} .
-          fi                  
+          helm upgrade --install \
+            --set scanCoordinatorImageTagName=dev${{ inputs.suffix}} \
+            --set suffix=-dev${{ inputs.suffix }} \
+            --set namespace=${{ secrets.namespace }} \
+            --set envName=dev \
+            --set rabbitmqVHost=tfrs-dev${{ inputs.suffix }}-vhost \
+            -n ${{ secrets.namespace }} -f ./values-dev-jan.yaml tfrs-scan-coordinator-dev${{ inputs.suffix }} .
diff --git a/.github/workflows/tfrs-release.yaml b/.github/workflows/tfrs-release.yaml
@@ -1,7 +1,7 @@
 ## For each release, the value of name, branches, RELEASE_NAME and PR_NUMBER need to be adjusted accordingly
 ## For each release, update lib/config.js: version and releaseBranch
 
-name: TFRS release-2.14.0
+name: TFRS release-2.15.0
 
 on:
   workflow_dispatch:
@@ -10,8 +10,8 @@ on:
 env:
   ## The pull request number of the Tracking pull request to merge the release branch to main
   ## Also remember to update the version in .pipeline/lib/config.js
-  PR_NUMBER: 2737
-  RELEASE_NAME: release-2.14.0
+  PR_NUMBER: 2828
+  RELEASE_NAME: release-2.15.0
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

diff --git a/.pipeline/lib/config.js b/.pipeline/lib/config.js
@@ -1,7 +1,7 @@
 'use strict';
 const options= require('@bcgov/pipeline-cli').Util.parseArguments()
 const changeId = options.pr //aka pull-request
-const version = '2.14.0'
+const version = '2.15.0'
 const name = 'tfrs'
 const ocpName = 'apps.silver.devops'
 
@@ -13,7 +13,7 @@ options.git.repository='tfrs'
 const phases = {
   build: {  namespace:'0ab226-tools'    , name: `${name}`, phase: 'build'  , changeId:changeId, suffix: `-build-${changeId}`  , 
             instance: `${name}-build-${changeId}`  , version:`${version}-${changeId}`, tag:`build-${version}-${changeId}`,
-            releaseBranch: 'release-2.14.0'
+            releaseBranch: 'release-2.15.0'
           },
   dev: {namespace:'0ab226-dev'    , name: `${name}`, phase: 'dev'  , changeId:changeId, suffix: `-dev`  , 
         instance: `${name}-dev`  , version:`${version}`, tag:`dev-${version}`, dbServiceName: 'tfrs-spilo',

diff --git a/backend/api/services/ComplianceReportService.py b/backend/api/services/ComplianceReportService.py
@@ -308,7 +308,7 @@ def create_director_transactions(compliance_report, creating_user):
             # Code 26C is used to identify credits that must be refunded to the supplier.
             # This occurs when our debit position decreases and we have already spent credits. 
             # In such cases, any excess credits must be returned to the supplier.
-            if is_supplemental and Decimal(lines['26C']) > 0:
+            if is_supplemental and Decimal(lines.get('26C', 0)) > 0:
                 print("*** DIRECTOR 26C Increase to Credits ***")
                 required_credit_transaction = Decimal(lines['26C'])
 

diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tfrs",
-  "version": "2.14.0",
+  "version": "2.15.0",
   "dependencies": {
     "@babel/eslint-parser": "^7.19.1",
     "@babel/plugin-proposal-object-rest-spread": "^7.20.7",

diff --git a/openshift-v4/templates/maintenance-page/Dockerfile b/openshift-v4/templates/maintenance-page/Dockerfile
@@ -2,4 +2,10 @@ FROM artifacts.developer.gov.bc.ca/docker-remote/httpd:2.4.46
 COPY ./httpd.conf /usr/local/apache2/conf/httpd.conf
 COPY ./public-html/ /usr/local/apache2/htdocs/
 RUN chgrp -R root /usr/local/apache2/logs \
-    && chmod -R g+w /usr/local/apache2/logs
+    && chmod -R g+w /usr/local/apache2/logs
+RUN apt-get update && apt-get install -y curl
+RUN which curl
+RUN curl --insecure --silent -L -o /tmp/oc.tar https://downloads-openshift-console.apps.silver.devops.gov.bc.ca/arm64/linux/oc.tar
+WORKDIR /tmp
+RUN tar xvf oc.tar && \
+    cp oc /bin