awslabs · hakenmt · Feb 25, 2025 · Feb 25, 2025 · Feb 25, 2025
diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml
@@ -18,60 +18,75 @@ jobs:
       actions: read
       checks: read
     if: contains(github.event.pull_request.labels.*.name, 'auto-approve') && contains('hakenmt,github-bot', github.event.pull_request.user.login)
+
+    env:
+      SHA: ${{ github.event.pull_request.head.sha }}
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      TIMEOUT: 600
+      INTERVAL: 10
+      WORKFLOW_NAME: build
+      TERMINATING_STATUS: "completed,action_required,cancelled,failure,neutral,skipped,stale,success,timed_out"
+
+    outputs:
+      RUN_ID: ${{ steps.wait-for-build.outputs.run_id }}
+      RUN_NUMBER: ${{ steps.wait-for-build.outputs.run_number }}
+      WORKFLOW_ID: ${{ steps.wait-for-build.outputs.workflow_id }}
+      CONCLUSION: ${{ steps.wait-for-build.outputs.conclusion }}
+
     steps:
-      - name: wait-for-build
+      - name: Wait for Build to Complete
         id: wait-for-build
-        env:
-          SHA: ${{ github.event.pull_request.head.sha }}
-          GH_TOKEN: ${{ github.token }}
-          TIMEOUT: 600
-          INTERVAL: 10
         run: | 
           START_TIME=$(date +%s)
-          TERMINATING_STATUS=("completed" "action_required" "cancelled" "failure" "neutral" "skipped" "stale" "success" "timed_out" )
 
           while true; do
-            # Get the latest build workflow run for this PR
-            WORKFLOW_RUN=$(gh api /repos/${{ github.repository }}/actions/runs?head_sha=$SHA \
-              --jq '.workflow_runs | map(select(.head_sha == "${{ github.event.pull_request.head.sha }}" and .name == "build"))[0]')
+            # Fetch latest workflow run matching SHA and workflow name
+            WORKFLOW_RUN=$(gh api /repos/${{ github.repository }}/actions/runs \
+            --jq ".workflow_runs | map(select(.head_sha == \"$SHA\" and .name == \"$WORKFLOW_NAME\")) | first")
 
             if [ -z "$WORKFLOW_RUN" ]; then
-              echo "No build workflow run found for the latest commit."
+              echo "No build workflow run found for commit $SHA."
             else
               STATUS=$(echo "$WORKFLOW_RUN" | jq -r '.conclusion')
+              RUN_NUMBER=$(echo "$WORKFLOW_RUN" | jq -r '.run_number')
+              RUN_ID=$(echo "$WORKFLOW_RUN" | jq -r '.id')
+              WORKFLOW_ID=$(echo "$WORKFLOW_RUN" | jq -r '.workflow_id')
+
+              echo "Build workflow status: $STATUS"
 
-              if [[ ${TERMINATING_STATUS[@]} =~ "$STATUS" ]]; then
-                echo "Build workflow finished."
-                echo "conclusion=$STATUS" >> $GITHUB_OUTPUT
+              if [[ ",$TERMINATING_STATUS," == *",$STATUS,"* ]]; then
+                echo "Build workflow finished with conclusion: $STATUS"
+                {
+                  echo "conclusion=$STATUS"
+                  echo "run_id=$RUN_ID"
+                  echo "run_number=$RUN_NUMBER"
+                  echo "workflow_id=$WORKFLOW_ID"
+                } >> "$GITHUB_OUTPUT"
                 break
-              else
-                echo "Build workflow status: $STATUS. Waiting for success..."
               fi
             fi
 
             # Check if timeout has been reached
-            CURRENT_TIME=$(date +%s)
-            ELAPSED_TIME=$((CURRENT_TIME - START_TIME))
-            if [ $ELAPSED_TIME -ge $TIMEOUT ]; then
+            ELAPSED=$(( $(date +%s) - START_TIME ))
+            if [ $ELAPSED -ge $TIMEOUT ]; then
               echo "Timeout reached. Build workflow did not succeed within $TIMEOUT seconds."
-              echo "conclusion=timed_out" >> $GITHUB_OUTPUT
+              echo "conclusion=timed_out" >> "$GITHUB_OUTPUT"
               break
             fi
 
-            # Wait for the specified interval before checking again
             sleep $INTERVAL
           done
 
-      - name: fail
+      - name: Fail If Build Did Not Succeed
         id: fail
         if: ${{ !contains('success,neutral,skipped', steps.wait-for-build.outputs.conclusion) }}
         run: |
-          echo "Did not reach successful build workflow state. Conclusion: ${{ steps.wait-for-build.outputs.conclusion }}"
+          echo "❌ Build workflow failed. Conclusion: ${{ steps.wait-for-build.outputs.conclusion }}"
           exit 1
 
-      - name: auto-approve
+      - name: Auto-Approve PR
         id: auto-approve
         uses: hmarr/[email protected]
         if: contains('success,neutral,skipped', steps.wait-for-build.outputs.conclusion)
         with:
-          github-token: ${{ github.token }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,12 +18,14 @@ jobs:
       contents: read
     #runs-on: codebuild-AwsLabsMultiAZWorkshopArm64GithubRunner-${{ github.run_id }}-${{ github.run_attempt }}
     runs-on: ubuntu-24.04-arm
+
     env:
       CDK_LOCATION: "cdk"
       PROJECT_NAME: ${{ github.event.repository.name }}
       DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: 0
       BUILD_APP: false
       USE_CODEBUILD: false
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml
@@ -8,8 +8,63 @@ permissions: {}
 
 jobs:
   review:
+
+    env:
+      SHA: ${{ github.event.pull_request.head.sha }}
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    outputs:
+      RUN_ID: ${{ steps.wait-for-build.outputs.run_id }}
+      RUN_NUMBER: ${{ steps.wait-for-build.outputs.run_number }}
+      WORKFLOW_ID: ${{ steps.wait-for-build.outputs.workflow_id }}
+      CONCLUSION: ${{ steps.wait-for-build.outputs.conclusion }}
+
     runs-on: ubuntu-latest
     steps:
+      - name: Wait for Build to Complete
+        id: wait-for-build
+        run: | 
+          START_TIME=$(date +%s)
+
+          while true; do
+            # Fetch latest workflow run matching SHA and workflow name
+            WORKFLOW_RUN=$(gh api /repos/${{ github.repository }}/actions/runs \
+              --jq --arg sha "$SHA" --arg workflow_name "$WORKFLOW_NAME" \
+              '.workflow_runs | map(select(.head_sha == $sha and .name == $workflow_name)) | first')
+
+            if [ -z "$WORKFLOW_RUN" ]; then
+              echo "No build workflow run found for commit $SHA."
+            else
+              STATUS=$(echo "$WORKFLOW_RUN" | jq -r '.conclusion')
+              RUN_NUMBER=$(echo "$WORKFLOW_RUN" | jq -r '.run_number')
+              RUN_ID=$(echo "$WORKFLOW_RUN" | jq -r '.id')
+              WORKFLOW_ID=$(echo "$WORKFLOW_RUN" | jq -r '.workflow_id')
+
+              echo "Build workflow status: $STATUS"
+
+              if [[ ",$TERMINATING_STATUS," == *",$STATUS,"* ]]; then
+                echo "Build workflow finished with conclusion: $STATUS"
+                {
+                  echo "conclusion=$STATUS"
+                  echo "run_id=$RUN_ID"
+                  echo "run_number=$RUN_NUMBER"
+                  echo "workflow_id=$WORKFLOW_ID"
+                } >> "$GITHUB_OUTPUT"
+                break
+              fi
+            fi
+
+            # Check if timeout has been reached
+            ELAPSED=$(( $(date +%s) - START_TIME ))
+            if [ $ELAPSED -ge $TIMEOUT ]; then
+              echo "Timeout reached. Build workflow did not succeed within $TIMEOUT seconds."
+              echo "conclusion=timed_out" >> "$GITHUB_OUTPUT"
+              break
+            fi
+
+            sleep $INTERVAL
+          done
+
       - name: Set approval status
         id: check_approval
         run: |

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,11 +15,22 @@ jobs:
     env:
       BUCKET: ${{ secrets.BUCKET }}
       PROJECT_NAME: ${{ github.event.repository.name }}
+      RUN_ID: ${{ github.event.workflow_run.id }}
+      RUN_NUMBER: ${{ github.event.workflow_run.run_number }}
+
     steps:
+      - name: Get run data
+        run: |
+          BUILD_RUN_ID=$(gh run view $RUN_ID --json jobs --jq '.jobs[].outputs.RUN_ID')
+          echo $BUILD_RUN_ID
+          echo "BUILD_RUN_ID=$BUILD_RUN_ID" >> $GITHUB_ENV
+
       - name: Get workshop content
         uses: actions/download-artifact@v4
         with:
           name: ContentArtifact
+          github-token: ${{ github.token }}
+          run-id: ${{ github.env.BUILD_RUN_ID }}
 
       - name: Upload to S3
         id: s3

diff --git a/cdk/Configs/cw-agent-config.json b/cdk/Configs/cw-agent-config.json
@@ -1,6 +1,6 @@
 {
     "metrics": {
-        "namespace": "multi-az/frontend",
+        "namespace": "multi-az-workshop/frontend",
         "append_dimensions": {
             "AutoScalingGroupName": "${aws:AutoScalingGroupName}",
             "InstanceId": "${aws:InstanceId}"

diff --git a/cdk/Configs/cw-agent-onebox-config.json b/cdk/Configs/cw-agent-onebox-config.json
@@ -1,6 +1,6 @@
 {
     "metrics": {
-        "namespace": "multi-az/frontend/onebox",
+        "namespace": "multi-az-workshop/frontend/onebox",
         "append_dimensions": {
             "AutoScalingGroupName": "${aws:AutoScalingGroupName}",
             "InstanceId": "${aws:InstanceId}"