Merge pull request #967 from techmatters/SJH_optimise_ecs_deploy

Split docker deploys into separate jobs. Remove redundant compatibili…

Author: stephenhand

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

@@ -50,7 +50,7 @@ env:
   PRIMARY_AWS_REGION: us-east-1
 
 jobs:
-  deploy_docker:
+  build_docker:
     name: Build Docker Image and Set regions
     runs-on: ubuntu-latest
 
@@ -96,18 +96,18 @@ jobs:
           name: workflow-scripts-artifacts
           path: .github/workflows/scripts
 
-  deploy_ecs:
-    needs: deploy_docker
-    name: Deploy to Amazon ECS
+  deploy_job_processor:
+    needs: build_docker
+    name: Deploy Job Processing service to Amazon ECS
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
       matrix:
-        region: ${{ fromJson(needs.deploy_docker.outputs.regions) }}
+        region: ${{ fromJson(needs.build_docker.outputs.regions) }}
 
     env:
-      DOCKER_IMAGE: ${{ needs.deploy_docker.outputs.docker_image }}
+      DOCKER_IMAGE: ${{ needs.build_docker.outputs.docker_image }}
 
     steps:
       - name: Download artifacts
@@ -144,7 +144,37 @@ jobs:
           service: ${{ inputs.environment }}-job-processor
           cluster: ${{ inputs.environment }}-ecs-cluster
           wait-for-service-stability: true
+  deploy_api_service:
+    needs:
+      - build_docker
+      - deploy_job_processor
+    name: Deploy HTTP service to Amazon ECS
+    runs-on: ubuntu-latest
 
+    strategy:
+      fail-fast: false
+      matrix:
+        region: ${{ fromJson(needs.build_docker.outputs.regions) }}
+
+    env:
+      DOCKER_IMAGE: ${{ needs.build_docker.outputs.docker_image }}
+
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v5
+        with:
+          name: workflow-scripts-artifacts
+          path: .github/workflows/scripts
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v5
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ matrix.region }}
+          # this plugin sets the AWS account ID to a secret which is not allowed in outputs
+          # we have to disable that so env.DOCKER_IMAGE will work
+          mask-aws-account-id: 'false'
       - name: Download current ECS task definition for the api service
         run: aws ecs describe-task-definition --task-definition ${{ inputs.environment }}-hrm-task --query taskDefinition > task-definition.json
 
@@ -163,7 +193,37 @@ jobs:
           service: ${{ inputs.environment }}-ecs-service
           cluster: ${{ inputs.environment }}-ecs-cluster
           wait-for-service-stability: true
+  deploy_scheduled_tasks:
+    needs:
+      - build_docker
+      - deploy_job_processor
+    name: Deploy to Amazon ECS
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        region: ${{ fromJson(needs.build_docker.outputs.regions) }}
+
+    env:
+      DOCKER_IMAGE: ${{ needs.build_docker.outputs.docker_image }}
+
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v5
+        with:
+          name: workflow-scripts-artifacts
+          path: .github/workflows/scripts
 
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v5
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ matrix.region }}
+          # this plugin sets the AWS account ID to a secret which is not allowed in outputs
+          # we have to disable that so env.DOCKER_IMAGE will work
+          mask-aws-account-id: 'false'
       - name: Download current ECS task definition for scheduled tasks
         run: aws ecs describe-task-definition --task-definition ${{ inputs.environment }}-hrm-scheduled-task --query taskDefinition > task-definition-hrm-scheduled-task.json
 
@@ -186,7 +246,39 @@ jobs:
         run: |
           chmod +x ./.github/workflows/scripts/update-event-bridge-target.sh
           ./.github/workflows/scripts/update-event-bridge-target.sh "${{ inputs.environment }}-hrm-scheduled-task" "${{ steps.scheduled-task-definition.outputs.task-definition-arn }}"
+  notify:
+    needs:
+      - build_docker
+      - deploy_api_service
+      - deploy_job_processor
+      - deploy_scheduled_tasks
+    name: Notify Slack and update matrix
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        region: ${{ fromJson(needs.build_docker.outputs.regions) }}
 
+    env:
+      DOCKER_IMAGE: ${{ needs.build_docker.outputs.docker_image }}
+
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v5
+        with:
+          name: workflow-scripts-artifacts
+          path: .github/workflows/scripts
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v5
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ matrix.region }}
+          # this plugin sets the AWS account ID to a secret which is not allowed in outputs
+          # we have to disable that so env.DOCKER_IMAGE will work
+          mask-aws-account-id: 'false'
       # reconfigure AWS credentials to use the default region for SSM Parameter Store.
       # aws-actions/configure-aws-credentials@v5 overrides env.AWS_DEFAULT_REGION, so
       # we name our env var PRIMARY_AWS_REGION to avoid that.

hrm-domain/hrm-core/contact/contactService.ts

@@ -340,12 +340,7 @@ export const patchContact = async (
   updatedBy: TwilioUserIdentifier,
   finalize: boolean,
   contactId: string,
-  {
-    referrals,
-    rawJson,
-    definitionVersion: definitionVersionFromPatch,
-    ...restOfPatch
-  }: PatchPayload,
+  { referrals, rawJson, definitionVersion, ...restOfPatch }: PatchPayload,
   { can, user }: { can: InitializedCan; user: TwilioUser },
   skipSearchIndex = false,
 ): Promise<Contact> => {
@@ -365,7 +360,6 @@ export const patchContact = async (
       }
     }
 
-    let definitionVersion = definitionVersionFromPatch || rawJson?.definitionVersion;
     if (!definitionVersion) {
       const contactRecord = await getById(accountSid, parseInt(contactId));
       definitionVersion = contactRecord.definitionVersion;