chore: parallelize SAR

Author: rubenfonseca

.github/workflows/reusable_deploy_v2_sar.yml

@@ -34,6 +34,9 @@ jobs:
   deploy-sar-app:
     runs-on: ubuntu-latest
     environment: ${{ inputs.environment }}
+    strategy:
+      matrix:
+        architecture: ["x86_64", "arm64"]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -63,46 +66,39 @@ jobs:
       - name: Unzip artefact
         run: |
           unzip cdk.out.zip
-      - name: Set test SAR name
+      - name: Set SAR name
         run: |
           NAME=${{ env.SAR_NAME }}
           if [[ "${{ inputs.stage }}" == "BETA" ]]; then
             NAME="test-$NAME"
           fi
           echo SAR_NAME="${NAME}" >> "$GITHUB_ENV"
-      - name: Deploy x86_64 SAR
+      - name: Adds arm64 suffix to SAR name
+        if: ${{ matrix.architecture == 'arm64' }}
+        run: echo SAR_NAME="${SAR_NAME}-arm64" >> "$GITHUB_ENV"
+      - name: Deploy SAR
         run: |
-          asset=$(jq -jc '.Resources[] | select(.Properties.CompatibleArchitectures == ["x86_64"]) | .Metadata."aws:asset:path"' cdk.out/LayerV2Stack.template.json)
+          asset=$(jq -jc '.Resources[] | select(.Properties.CompatibleArchitectures == ["${{ matrix.architecture }}"]) | .Metadata."aws:asset:path"' cdk.out/LayerV2Stack.template.json)
           sed -e "s|<VERSION>|${{ inputs.package-version }}|g" -e "s/<SAR_APP_NAME>/${{ env.SAR_NAME }}/g" -e "s|<LAYER_CONTENT_PATH>|./cdk.out/$asset|g" layer/sar/template.txt > template.yml
           cp README.md LICENSE "./cdk.out/$asset/"
           sam package --template-file template.yml --output-template-file packaged.yml --s3-bucket ${{ secrets.AWS_SAR_S3_BUCKET }}
           sam publish --template packaged.yml --region "$AWS_REGION"
-      - name: Publish x86_64 SAR
+      - name: Publish SAR
         if: ${{ inputs.stage == 'PROD' }}
         run: |
           # wait until sar registers the app, otherwise it fails to make it public
           sleep 15
-          echo "Make x86_64 SAR app public"
+          echo "Make SAR app public"
           aws serverlessrepo put-application-policy --application-id arn:aws:serverlessrepo:${{ env.AWS_REGION }}:${{ steps.aws-credentials-sar-role.outputs.aws-account-id }}:applications/${{ env.SAR_NAME }} --statements Principals='*',Actions=Deploy
-      - name: Deploy arm64 SAR
-        run: |
-          asset=$(jq -jc '.Resources[] | select(.Properties.CompatibleArchitectures == ["arm64"]) | .Metadata."aws:asset:path"' cdk.out/LayerV2Stack.template.json)
-          sed -e "s|<VERSION>|${{ inputs.package-version }}|g" -e "s/<SAR_APP_NAME>/${{ env.SAR_NAME }}-arm64/g" -e "s|<LAYER_CONTENT_PATH>|./cdk.out/$asset|g" layer/sar/template.txt > template.yml
-          cp README.md LICENSE "./cdk.out/$asset/"
-          sam package --template-file template.yml --output-template-file packaged.yml --s3-bucket ${{ secrets.AWS_SAR_S3_BUCKET }}
-          sam publish --template packaged.yml --region "$AWS_REGION"
-      - name: Publish arm64 SAR
-        if: ${{ inputs.stage == 'PROD' }}
-        run: |
-          # wait until sar registers the app, otherwise it fails to make it public
-          sleep 15
-          echo "Make arm64 SAR app public"
-          aws serverlessrepo put-application-policy --application-id arn:aws:serverlessrepo:${{ env.AWS_REGION }}:${{ steps.aws-credentials-sar-role.outputs.aws-account-id }}:applications/${{ env.SAR_NAME }}-arm64 --statements Principals='*',Actions=Deploy
       - name: Deploy BETA canary
         if: ${{ inputs.stage == 'BETA' }}
         run: |
           STACK_NAME=serverlessrepo-v2-powertools-layer-test-stack
 
+          if [[ "${{ matrix.architecture }}" == "arm64" ]]; then
+            STACK_NAME="${STACK_NAME}-arm64"
+          fi
+
           echo "Check if stack does not exist"
           stack_exists=$(aws cloudformation list-stacks --query "StackSummaries[?(StackName == '$STACK_NAME' && StackStatus == 'CREATE_COMPLETE')].{StackId:StackId, StackName:StackName, CreationTime:CreationTime, StackStatus:StackStatus}" --output text)
           echo "$stack_exists"
@@ -128,19 +124,11 @@ jobs:
             exit 1
           fi
           echo "Deployment successful"
-      - name: Cleanup BETA x86_64 SAR
+      - name: Cleanup BETA SAR
         if: ${{ inputs.stage == 'BETA' }}
         run: |
           app_id=$(aws serverlessrepo list-applications --output text --query "Applications[?ApplicationId=='arn:aws:serverlessrepo:${{ env.AWS_REGION }}:${{ steps.aws-credentials-sar-role.outputs.aws-account-id }}:applications/${{ env.SAR_NAME }}'].ApplicationId")
           if [ -z "${app_id}" ]; then
             echo "Could not find the SAR that we just deployed."
           fi
           aws serverlessrepo delete-application --application-id "$app_id"
-      - name: Cleanup BETA arm64 SAR
-        if: ${{ inputs.stage == 'BETA' }}
-        run: |
-          app_id=$(aws serverlessrepo list-applications --output text --query "Applications[?ApplicationId=='arn:aws:serverlessrepo:${{ env.AWS_REGION }}:${{ steps.aws-credentials-sar-role.outputs.aws-account-id }}:applications/${{ env.SAR_NAME }}-arm64'].ApplicationId")
-          if [ -z "${app_id}" ]; then
-            echo "Could not find the SAR that we just deployed."
-          fi
-          aws serverlessrepo delete-application --application-id "$app_id"