Merge pull request #209 from bcgov/vue-three

Vue 3 Upgrade Patches
bcgov · Apr 24, 2024 · efb8a2e · efb8a2e
2 parents 5c3690c + d40224b
commit efb8a2e
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 32 deletions.
diff --git a/.github/workflows/deploy-to.openshift-dev.yml b/.github/workflows/deploy-to.openshift-dev.yml
@@ -188,39 +188,68 @@ jobs:
           oc project ${{ env.OPENSHIFT_NAMESPACE_DEV }}
           # Cancel any rollouts in progress
           oc rollout cancel dc/${{ env.APP_NAME_BACKEND }} 2> /dev/null \
-          || true && echo "No backend rollout in progress"
+            || true && echo "No backend rollout in progress"
           oc rollout cancel dc/${{ env.APP_NAME_FRONTEND }} 2> /dev/null \
-          || true && echo "No frontend rollout in progress"
-          
+            || true && echo "No frontend rollout in progress"
+
           # Create the image stream if it doesn't exist
           oc create imagestream ${{ env.REPO_NAME }}-backend 2> /dev/null || true && echo "Backend image stream in place"
           oc create imagestream ${{ env.REPO_NAME }}-frontend-static 2> /dev/null || true && echo "Frontend image stream in place"
-          
+
           oc tag ${{ steps.push-image-backend.outputs.registry-path }} ${{ env.REPO_NAME }}-backend:${{ env.TAG }}
           oc tag ${{ steps.push-image-frontend.outputs.registry-path }} ${{ env.REPO_NAME }}-frontend-static:${{ env.TAG }}
 
           # Process and apply backend deployment template
-          oc process -f tools/openshift/backend.dc.yaml -p APP_NAME=${{ env.APP_NAME }} -p REPO_NAME=${{ env.REPO_NAME }} -p BRANCH=${{ env.BRANCH }} -p NAMESPACE=${{ env.OPENSHIFT_NAMESPACE_DEV }} -p TAG=${{ env.TAG }} -p MIN_REPLICAS=${{ env.MIN_REPLICAS_DEV }} -p MAX_REPLICAS=${{ env.MAX_REPLICAS_DEV }} -p MIN_CPU=${{ env.MIN_CPU_BACKEND }} -p MAX_CPU=${{ env.MAX_CPU_BACKEND }} -p MIN_MEM=${{ env.MIN_MEM_BACKEND }} -p MAX_MEM=${{ env.MAX_MEM_BACKEND }} -p HOST_ROUTE=${{ env.HOST_ROUTE }}\
-          | oc apply -f -
-        
+          oc process \
+            -f tools/openshift/backend.dc.yaml \
+            -p APP_NAME=${{ env.APP_NAME }} \
+            -p REPO_NAME=${{ env.REPO_NAME }} \
+            -p BRANCH=${{ env.BRANCH }} \
+            -p NAMESPACE=${{ env.OPENSHIFT_NAMESPACE_DEV }} \
+            -p TAG=${{ env.TAG }} \
+            -p MIN_REPLICAS=${{ env.MIN_REPLICAS_DEV }} \
+            -p MAX_REPLICAS=${{ env.MAX_REPLICAS_DEV }} \
+            -p MIN_CPU=${{ env.MIN_CPU_BACKEND }} \
+            -p MAX_CPU=${{ env.MAX_CPU_BACKEND }} \
+            -p MIN_MEM=${{ env.MIN_MEM_BACKEND }} \
+            -p MAX_MEM=${{ env.MAX_MEM_BACKEND }} \
+            -p HOST_ROUTE=${{ env.HOST_ROUTE }}\
+            | oc apply -f -
+
           # Process and apply frontend deployment template
-          oc process -f tools/openshift/frontend-static.dc.yaml -p APP_NAME=${{ env.APP_NAME }} -p REPO_NAME=${{ env.REPO_NAME }} -p BRANCH=${{ env.BRANCH }} -p NAMESPACE=${{ env.OPENSHIFT_NAMESPACE_DEV }} -p TAG=${{ env.TAG }} -p MIN_REPLICAS=${{ env.MIN_REPLICAS_DEV }} -p MAX_REPLICAS=${{ env.MAX_REPLICAS_DEV }} -p MIN_CPU=${{ env.MIN_CPU_FRONTEND }} -p MAX_CPU=${{ env.MAX_CPU_FRONTEND }} -p MIN_MEM=${{ env.MIN_MEM_FRONTEND }} -p MAX_MEM=${{ env.MAX_MEM_FRONTEND }} -p HOST_ROUTE=${{ env.HOST_ROUTE }} -p CA_CERT="${{ env.CA_CERT }}" -p CERTIFICATE="${{ env.CERTIFICATE }}" -p PRIVATE_KEY="${{ env.PRIVATE_KEY }}"\
-          | oc apply -f -
-          
+          oc process \
+            -f tools/openshift/frontend-static.dc.yaml \
+            -p APP_NAME=${{ env.APP_NAME }} \
+            -p REPO_NAME=${{ env.REPO_NAME }} \
+            -p BRANCH=${{ env.BRANCH }} \
+            -p NAMESPACE=${{ env.OPENSHIFT_NAMESPACE_DEV }} \
+            -p TAG=${{ env.TAG }} \
+            -p MIN_REPLICAS=${{ env.MIN_REPLICAS_DEV }} \
+            -p MAX_REPLICAS=${{ env.MAX_REPLICAS_DEV }} \
+            -p MIN_CPU=${{ env.MIN_CPU_FRONTEND }} \
+            -p MAX_CPU=${{ env.MAX_CPU_FRONTEND }} \
+            -p MIN_MEM=${{ env.MIN_MEM_FRONTEND }} \
+            -p MAX_MEM=${{ env.MAX_MEM_FRONTEND }} \
+            -p HOST_ROUTE=${{ env.HOST_ROUTE }} \
+            -p CA_CERT="${{ env.CA_CERT }}" \
+            -p CERTIFICATE="${{ env.CERTIFICATE }}" \
+            -p PRIVATE_KEY="${{ env.PRIVATE_KEY }}" \
+            | oc apply -f -
+
           curl -s https://raw.githubusercontent.com/bcgov/${{ env.REPO_NAME }}/master/tools/config/update-configmap.sh | bash /dev/stdin dev ${{ env.APP_NAME }} ${{ env.NAMESPACE }} ${{ env.COMMON_NAMESPACE }} ${{ env.SPLUNK_TOKEN }}
-          
+
           # Start rollout (if necessary) and follow it
           oc rollout latest dc/${{ env.APP_NAME_BACKEND }} 2> /dev/null \
-          || true && echo "Rollout in progress"
+            || true && echo "Rollout in progress"
           oc logs -f dc/${{ env.APP_NAME_BACKEND }}
-               
+
           oc rollout latest dc/${{ env.APP_NAME_FRONTEND }} 2> /dev/null \
-          || true && echo "Rollout in progress"
-          
+            || true && echo "Rollout in progress"
+
           # Get status, returns 0 if rollout is successful
           oc rollout status dc/${{ env.APP_NAME_BACKEND }}
           oc rollout status dc/${{ env.APP_NAME_FRONTEND }}
       - name: ZAP Scan
-        uses: zaproxy/action-api-scan@v0.3.0
+        uses: zaproxy/action-full-scan@v0.7.0
         with:
-          target: 'https://${{ env.HOST_ROUTE }}'
+          target: 'https://${{ env.HOST_ROUTE }}'
diff --git a/.github/workflows/deploy-to.openshift-test.yml b/.github/workflows/deploy-to.openshift-test.yml
@@ -116,39 +116,39 @@ jobs:
           oc project ${{ env.OPENSHIFT_NAMESPACE_TEST }}
           # Cancel any rollouts in progress
           oc rollout cancel dc/${{ env.APP_NAME_BACKEND }} 2> /dev/null \
-          || true && echo "No backend rollout in progress"
+            || true && echo "No backend rollout in progress"
           oc rollout cancel dc/${{ env.APP_NAME_FRONTEND }} 2> /dev/null \
-          || true && echo "No frontend rollout in progress"
-          
+            || true && echo "No frontend rollout in progress"
+
           # Create the image stream if it doesn't exist
           oc create imagestream ${{ env.REPO_NAME }}-backend 2> /dev/null || true && echo "Backend image stream in place"
           oc create imagestream ${{ env.REPO_NAME }}-frontend-static 2> /dev/null || true && echo "Frontend image stream in place"
-          
+
           oc tag ${{ env.NAMESPACE }}-dev/${{ env.REPO_NAME }}-backend:${{ env.TAG }} ${{ env.NAMESPACE }}-test/${{ env.REPO_NAME }}-backend:${{ env.TAG }}
           oc tag ${{ env.NAMESPACE }}-dev/${{ env.REPO_NAME }}-frontend-static:${{ env.TAG }} ${{ env.NAMESPACE }}-test/${{ env.REPO_NAME }}-frontend-static:${{ env.TAG }}
 
           # Process and apply backend deployment template
           oc process -f tools/openshift/backend.dc.yaml -p APP_NAME=${{ env.APP_NAME }} -p REPO_NAME=${{ env.REPO_NAME }} -p BRANCH=${{ env.BRANCH }} -p NAMESPACE=${{ env.OPENSHIFT_NAMESPACE_TEST }} -p TAG=${{ env.TAG }} -p MIN_REPLICAS=${{ env.MIN_REPLICAS_TEST }} -p MAX_REPLICAS=${{ env.MAX_REPLICAS_TEST }} -p MIN_CPU=${{ env.MIN_CPU_BACKEND }} -p MAX_CPU=${{ env.MAX_CPU_BACKEND }} -p MIN_MEM=${{ env.MIN_MEM_BACKEND }} -p MAX_MEM=${{ env.MAX_MEM_BACKEND }} -p HOST_ROUTE=${{ env.HOST_ROUTE }}\
           | oc apply -f -
-          
+
           # Process and apply frontend deployment template
           oc process -f tools/openshift/frontend-static.dc.yaml -p APP_NAME=${{ env.APP_NAME }} -p REPO_NAME=${{ env.REPO_NAME }} -p BRANCH=${{ env.BRANCH }} -p NAMESPACE=${{ env.OPENSHIFT_NAMESPACE_TEST }} -p TAG=${{ env.TAG }} -p MIN_REPLICAS=${{ env.MIN_REPLICAS_TEST }} -p MAX_REPLICAS=${{ env.MAX_REPLICAS_TEST }} -p MIN_CPU=${{ env.MIN_CPU_FRONTEND }} -p MAX_CPU=${{ env.MAX_CPU_FRONTEND }} -p MIN_MEM=${{ env.MIN_MEM_FRONTEND }} -p MAX_MEM=${{ env.MAX_MEM_FRONTEND }} -p HOST_ROUTE=${{ env.HOST_ROUTE }} -p CA_CERT="${{ env.CA_CERT }}" -p CERTIFICATE="${{ env.CERTIFICATE }}" -p PRIVATE_KEY="${{ env.PRIVATE_KEY }}"\
-          | oc apply -f -
-          
+            | oc apply -f -
+
           curl -s https://raw.githubusercontent.com/bcgov/${{ env.REPO_NAME }}/master/tools/config/update-configmap.sh | bash /dev/stdin test ${{ env.APP_NAME }} ${{ env.NAMESPACE }} ${{ env.COMMON_NAMESPACE }} ${{ env.SPLUNK_TOKEN }}
-          
+
           # Start rollout (if necessary) and follow it
           oc rollout latest dc/${{ env.APP_NAME_BACKEND }} 2> /dev/null \
-          || true && echo "Rollout in progress"
+            || true && echo "Rollout in progress"
           oc logs -f dc/${{ env.APP_NAME_BACKEND }}
-          
+
           oc rollout latest dc/${{ env.APP_NAME_FRONTEND }} 2> /dev/null \
           || true && echo "Rollout in progress"
-          
+
           # Get status, returns 0 if rollout is successful
           oc rollout status dc/${{ env.APP_NAME_BACKEND }}
           oc rollout status dc/${{ env.APP_NAME_FRONTEND }}
       - name: ZAP Scan
-        uses: zaproxy/action-api-scan@v0.3.0
+        uses: zaproxy/action-full-scan@v0.7.0
         with:
-          target: 'https://${{ env.HOST_ROUTE }}'
+          target: 'https://${{ env.HOST_ROUTE }}'
diff --git a/tools/config/update-configmap.sh b/tools/config/update-configmap.sh
@@ -111,11 +111,11 @@ fi
 if [ "$envValue" = "dev" ]
 then
   bannerEnvironment="DEV"
-  bannerColor="#dba424"
+  bannerColor="#8d28d7"
 elif [ "$envValue" = "test" ]
 then
   bannerEnvironment="TEST"
-  bannerColor="#8d28d7"
+  bannerColor="#dba424"
 fi
 
 echo Generating private and public keys