Merge pull request #90 from unboxed/fix-matrix

Re-enable matrix [testing GH Action]
unboxed · Aug 11, 2023 · d7a9caa · d7a9caa
2 parents df7fd81 + 44a8c6a
commit d7a9caa
Show file tree

Hide file tree

Showing 2 changed files with 106 additions and 55 deletions.
diff --git a/.github/workflows/deploy-environment.yml b/.github/workflows/deploy-environment.yml
@@ -7,24 +7,30 @@ on:
       environment-name:
         type: string
         required: true
+      db_subnets:
+        type: string
+        required: true
+      db_sg:
+        type: string
+        required: true
 
 concurrency:
   group: ${{ inputs.environment-name }}
 
 jobs:
-  deploy:
-    name: Deploy to ${{ inputs.environment-name }}
+  build-image:
+    name: Create and push docker image to ECR for ${{ inputs.environment-name }}
     runs-on: ubuntu-20.04
     environment: ${{ inputs.environment-name }}
 
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Create an image tag based on the commit sha
-        id: image_tag
+      - name: Get github commit sha
+        id: github
         run: |
-          echo "sha=$(echo ${GITHUB_SHA} | cut -c1-7)" >>$GITHUB_OUTPUT
+          echo "sha=$(echo ${GITHUB_SHA::7})" >>$GITHUB_OUTPUT
 
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v2
@@ -59,11 +65,41 @@ jobs:
             --load \
             -t paapi:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -f Dockerfile.production .
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
-          echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >>$GITHUB_OUTPUT
+
+  deploy-db-migrate-service:
+    name: Perform database migrations on ${{ inputs.environment-name }}
+    runs-on: ubuntu-20.04
+    needs: [build-image]
+
+    steps:
+      - name: Get github commit sha
+        id: github
+        run: |
+          echo "sha=$(echo ${GITHUB_SHA::7})" >>$GITHUB_OUTPUT
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: eu-west-2
+
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v1
+
+      - name: Get image URI
+        id: ecr-image
+        env:
+          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+          ECR_REPOSITORY: paapi/${{ inputs.environment-name }}
+          IMAGE_TAG: ${{ steps.github.outputs.sha }}
+        run: |
+          echo "uri=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >>$GITHUB_OUTPUT
 
       - name: Download task definition for db_migrate and strip unused properties
         env:
-          IMAGE_ARN: ${{ steps.build-image.outputs.image }}
+          IMAGE_ARN: ${{ steps.ecr-image.outputs.image }}
         run: |
           aws ecs describe-task-definition --task-definition paapi-db-migrate-${{ inputs.environment-name }} --query taskDefinition | \
           jq -r 'del(.compatibilities, .taskDefinitionArn, .requiresAttributes, .revision, .status, .registeredAt, .registeredBy)' | \
@@ -78,77 +114,88 @@ jobs:
         env:
           CLUSTER: paapi-${{ inputs.environment-name }}
           TASK_DEFINITION: paapi-db-migrate-${{ inputs.environment-name }}
-          PAAPI_SUBNETS: subnet-${{ secrets.PAAPI_SUBNETS }}
-          PAAPI_SG: sg-${{ secrets.PAAPI_SG }}
+          LOG_GROUP: paapi-db-migrate-${{ inputs.environment-name }}
+          PAAPI_SUBNETS: subnet-${{ secrets[format('{0}', inputs.db_subnets)] }}
+          PAAPI_SG: sg-${{ secrets[format('{0}', inputs.db_sg)] }}
         run: |
-          aws ecs run-task --cluster $CLUSTER \
+          start_time=$(date -Iseconds)
+          task_arn=$(aws ecs run-task --cluster $CLUSTER \
             --task-definition $TASK_DEFINITION --launch-type FARGATE \
-            --network-configuration '{"awsvpcConfiguration": {"subnets": ["'$PAAPI_SUBNETS'"],"securityGroups": ["'$PAAPI_SG'"],"assignPublicIp": "ENABLED"}}'
+            --network-configuration '{"awsvpcConfiguration": {"subnets": ["'$PAAPI_SUBNETS'"],"securityGroups": ["'$PAAPI_SG'"],"assignPublicIp": "ENABLED"}}' | \
+             jq -r '.tasks[].taskArn')
+          aws ecs wait tasks-stopped --cluster $CLUSTER --tasks "$task_arn"
+          aws logs tail $LOG_GROUP --format short --since $start_time
+          result_json=$(aws ecs describe-tasks --cluster $CLUSTER --task $task_arn)
+          exit_code=$(echo "$result_json" | jq -r '.tasks[].containers[0].exitCode // 1')
+          if [ $exit_code -gt 0 ]; then echo "$result_json" | jq -r; fi
+          exit $exit_code
+
+  deploy-services:
+    name: Deploy services to ${{ inputs.environment-name }}
+    runs-on: ubuntu-20.04
+    needs: [build-image, deploy-db-migrate-service]
+    strategy:
+      matrix:
+        service_type: ['worker-high-priority', 'worker-low-priority', 'web']
 
-      - name: Download task definition for worker high-priority and strip unused properties
-        env:
-          IMAGE_ARN: ${{ steps.build-image.outputs.image }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        if: matrix.service_type == 'web'
+
+      - name: Get github commit sha
+        id: github
         run: |
-          aws ecs describe-task-definition --task-definition paapi-worker-high-priority-${{ inputs.environment-name }} --query taskDefinition | \
-          jq -r 'del(.compatibilities, .taskDefinitionArn, .requiresAttributes, .revision, .status, .registeredAt, .registeredBy)' > worker-high-priority.json
+          echo "sha=$(echo ${GITHUB_SHA::7})" >>$GITHUB_OUTPUT
 
-      - name: Generate task definition for worker high-priority
-        id: task-def-worker-high-priority
-        uses: aws-actions/amazon-ecs-render-task-definition@v1
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v2
         with:
-          task-definition: worker-high-priority.json
-          container-name: paapi
-          image: ${{ steps.build-image.outputs.image }}
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: eu-west-2
 
-      - name: Deploy worker high-priority
-        uses: aws-actions/amazon-ecs-deploy-task-definition@v1
-        with:
-          task-definition: ${{ steps.task-def-worker-high-priority.outputs.task-definition }}
-          service: paapi-worker-high-priority-${{ inputs.environment-name }}
-          cluster: paapi-${{ inputs.environment-name }}
-          wait-for-service-stability: true
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v1
 
-      - name: Download task definition for worker low-priority and strip unused properties
+      - name: Get image URI
+        id: ecr-image
         env:
-          IMAGE_ARN: ${{ steps.build-image.outputs.image }}
+          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+          ECR_REPOSITORY: paapi/${{ inputs.environment-name }}
+          IMAGE_TAG: ${{ steps.github.outputs.sha }}
+        run: |
+          echo "uri=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >>$GITHUB_OUTPUT
+
+      - name: Download task definition for ${{ matrix.service_type }} and strip unused properties
         run: |
-          aws ecs describe-task-definition --task-definition paapi-worker-low-priority-${{ inputs.environment-name }} --query taskDefinition | \
-          jq -r 'del(.compatibilities, .taskDefinitionArn, .requiresAttributes, .revision, .status, .registeredAt, .registeredBy)' > worker-low-priority.json
+          aws ecs describe-task-definition --task-definition paapi-${{ matrix.service_type }}-${{ inputs.environment-name }} --query taskDefinition | \
+          jq -r 'del(.compatibilities, .taskDefinitionArn, .requiresAttributes, .revision, .status, .registeredAt, .registeredBy)' > ${{ matrix.service_type }}.json
 
-      - name: Generate task definition for worker low-priority
-        id: task-def-worker-low-priority
+      - name: Generate task definition for ${{ inputs.environment-name }}
+        id: task-def
         uses: aws-actions/amazon-ecs-render-task-definition@v1
         with:
-          task-definition: worker-low-priority.json
+          task-definition: ${{ matrix.service_type }}.json
           container-name: paapi
-          image: ${{ steps.build-image.outputs.image }}
+          image: ${{ steps.ecr-image.outputs.uri }}
 
-      - name: Deploy worker low-priority
+      - name: Deploy ${{ matrix.service_type }}
         uses: aws-actions/amazon-ecs-deploy-task-definition@v1
+        if: matrix.service_type != 'web'
         with:
-          task-definition: ${{ steps.task-def-worker-low-priority.outputs.task-definition }}
-          service: paapi-worker-low-priority-${{ inputs.environment-name }}
+          task-definition: ${{ steps.task-def.outputs.task-definition }}
+          service: paapi-${{ matrix.service_type }}-${{ inputs.environment-name }}
           cluster: paapi-${{ inputs.environment-name }}
           wait-for-service-stability: true
 
-      - name: Download task definition for web and strip unused properties
-        run: |
-          aws ecs describe-task-definition --task-definition paapi-web-${{ inputs.environment-name }} --query taskDefinition | \
-          jq -r 'del(.compatibilities, .taskDefinitionArn, .requiresAttributes, .revision, .status, .registeredAt, .registeredBy)' > web.json
-
-      - name: Generate task definition for web
-        id: task-def-web
-        uses: aws-actions/amazon-ecs-render-task-definition@v1
-        with:
-          task-definition: web.json
-          container-name: paapi
-          image: ${{ steps.build-image.outputs.image }}
-
       - name: Deploy web
         uses: aws-actions/amazon-ecs-deploy-task-definition@v1
+        if: matrix.service_type == 'web'
         with:
-          task-definition: ${{ steps.task-def-web.outputs.task-definition }}
-          service: paapi-web-${{ inputs.environment-name }}
+          task-definition: ${{ steps.task-def.outputs.task-definition }}
+          service: paapi-${{ matrix.service_type }}-${{ inputs.environment-name }}
           cluster: paapi-${{ inputs.environment-name }}
           wait-for-service-stability: true
           codedeploy-appspec: .aws/appspec.yml

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -11,10 +11,14 @@ jobs:
     uses: ./.github/workflows/deploy-environment.yml
     with:
       environment-name: "staging"
+      db_subnets: "STAGING_PAAPI_SUBNETS"
+      db_sg: "STAGING_PAAPI_SG"
     secrets: inherit
 
   deploy-prod:
     uses: ./.github/workflows/deploy-environment.yml
     with:
       environment-name: "production"
+      db_subnets: "PRODUCTION_PAAPI_SUBNETS"
+      db_sg: "PRODUCTION_PAAPI_SG"
     secrets: inherit