TID-4 Moved to single GHA workflow

.github/workflows/push.yml

@@ -0,0 +1,62 @@
+name: Validate and Test
+
+on:
+  push:
+    branches:
+      - '*'
+
+jobs:
+  test:
+    name: Validate and test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Test
+        run: scripts/run-tests-in-container.sh
+  deploy_diff:
+    needs: ["test"]
+    name: Diff IaC changes
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write
+      contents: read
+      id-token: write
+    steps:
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          role-to-assume: ${{vars.GHA_AWS_DEPLOY_ROLE}}
+          aws-region: us-west-2
+      - name: Checkout repo
+        uses: actions/checkout@v2
+      - name: Install dependencies
+        run: cd iac/ && npm install
+      - name: CDK Diff
+        env:
+          AWS_ACCOUNT: ${{ secrets.CDK_DEPLOY_ACCOUNT }}
+          AWS_REGION: ${{ env.AWS_REGION }}
+        run: export PATH=node_modules/aws-cdk/bin:$PATH && bash ./scripts/deploy.sh DIFF
+  deploy:
+    if: github.ref == 'refs/heads/main'
+    needs: ["deploy_diff"]
+    name: Deploy IaC
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write
+      contents: read
+      id-token: write
+    steps:
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          role-to-assume: ${{vars.GHA_AWS_DEPLOY_ROLE}}
+          aws-region: us-west-2
+      - name: Checkout repo
+        uses: actions/checkout@v2
+      - name: Install dependencies
+        run: cd iac/ && npm install
+      - name: CDK Deploy
+        env:
+          AWS_ACCOUNT: ${{ secrets.CDK_DEPLOY_ACCOUNT }}
+          AWS_REGION: ${{ env.AWS_REGION }}
+        run: export PATH=node_modules/aws-cdk/bin:$PATH && bash ./scripts/deploy.sh

scripts/deploy.sh

@@ -26,10 +26,9 @@ if [ $1 = "DIFF" ]
 then 
     CMD="diff"
 else
-    CMD="deploy"
+    CMD="deploy --require-approval never"
 fi
 
 cdk $CMD \
     -c aws_region=$AWS_REGION \
-    -c aws_account=$AWS_ACCOUNT \
-    --require-approval never
+    -c aws_account=$AWS_ACCOUNT