fix: changes from hotfix/singpass-growthbook-feature-flag

Author: scottheng96

.github/workflows/aws-deploy-scanner-legacy.yml

@@ -179,7 +179,6 @@ jobs:
           path: '**/node_modules'
           key: ${{ runner.OS }}-node-modules-${{ hashFiles('**/package-lock.json') }}
           fail-on-cache-miss: true
-      - run: npm ci --prefix serverless/virus-scanner
       - run: npm ci --prefix serverless/virus-scanner-guardduty
       - run: npm ci --prefix serverless/pdf-gen-sparticuz
       - name: Configure Datadog Test Visibility

.github/workflows/ci.yml

@@ -25,7 +25,8 @@ jobs:
       aws-region: 'ap-southeast-1'
       ecr-repository: 'formsg'
       # ECS configuration
-      ecs-cpu: 2048
+      ecs-cpu: 1024
+      formsg-app-reserved-cpu: 896
       ecs-memory: 4096
       ecs-cluster-name: 'formsg-prod-ecs'
       ecs-service-name: 'formsg-prod-ecs-service'

.github/workflows/deploy-ecs-prod.yml

@@ -26,6 +26,7 @@ jobs:
       ecr-repository: 'formsg'
       # ECS configuration
       ecs-cpu: 1024
+      formsg-app-reserved-cpu: 896
       ecs-memory: 2048
       ecs-cluster-name: 'formsg-stg-alt-ecs'
       ecs-service-name: 'formsg-stg-alt-ecs-service'

.github/workflows/deploy-ecs-stg-alt.yml

@@ -26,6 +26,7 @@ jobs:
       ecr-repository: 'formsg'
       # ECS configuration
       ecs-cpu: 1024
+      formsg-app-reserved-cpu: 896
       ecs-memory: 2048
       ecs-cluster-name: 'formsg-stg-alt2-ecs'
       ecs-service-name: 'formsg-stg-alt2-ecs-service'

.github/workflows/deploy-ecs-stg-alt2.yml

@@ -26,6 +26,7 @@ jobs:
       ecr-repository: 'formsg'
       # ECS configuration
       ecs-cpu: 1024
+      formsg-app-reserved-cpu: 896
       ecs-memory: 2048
       ecs-cluster-name: 'formsg-stg-alt3-ecs'
       ecs-service-name: 'formsg-stg-alt3-ecs-service'

.github/workflows/deploy-ecs-stg-alt3.yml

@@ -26,6 +26,7 @@ jobs:
       ecr-repository: 'formsg'
       # ECS configuration
       ecs-cpu: 1024
+      formsg-app-reserved-cpu: 896
       ecs-memory: 2048
       ecs-cluster-name: 'formsg-stg-ecs'
       ecs-service-name: 'formsg-stg-ecs-service'

.github/workflows/deploy-ecs-stg.yml

@@ -26,6 +26,7 @@ jobs:
       ecr-repository: 'formsg'
       # ECS configuration
       ecs-cpu: 1024
+      formsg-app-reserved-cpu: 896
       ecs-memory: 2048
       ecs-cluster-name: 'formsg-uat-ecs'
       ecs-service-name: 'formsg-uat-ecs-service'

.github/workflows/deploy-ecs-uat.yml

@@ -71,6 +71,10 @@ on:
         description: 'FormSG SDK mode'
         required: true
         type: string
+      formsg-app-reserved-cpu:
+        description: 'FormSG app reserved CPU units'
+        required: true
+        type: number
       dd-env:
         description: 'Datadog environment'
         required: true
@@ -184,6 +188,7 @@ jobs:
         run: |
           sed -i "s/<AWS_ACCOUNT_ID>/${{ secrets.aws-account-id }}/g" ${{ inputs.ecs-task-definition-path }}
           sed -i 's/<DD_ENV>/${{ inputs.dd-env }}/g' ${{ inputs.ecs-task-definition-path }}
+          sed -i 's/<FORMSG_APP_RESERVED_CPU>/${{ inputs.formsg-app-reserved-cpu }}/g' ${{ inputs.ecs-task-definition-path }}
           sed -i 's/<CPU>/${{ inputs.ecs-cpu }}/g' ${{ inputs.ecs-task-definition-path }}
           sed -i 's/<MEMORY>/${{ inputs.ecs-memory }}/g' ${{ inputs.ecs-task-definition-path }}
           sed -i 's/<ENVIRONMENT_SITE_NAME>/${{ inputs.environment-site-name }}/g' ${{ inputs.ecs-task-definition-path }}