From dc14d888b1fd661eea9d804dbc6ee36b4c2359a5 Mon Sep 17 00:00:00 2001
From: Roger Zhang <ruojiazh@amazon.com>
Date: Tue, 4 Nov 2025 13:43:53 -0800
Subject: [PATCH 1/4] nits

---
 .github/workflows/integration-tests.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 4b6cc4c4bc7..308ca596b40 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -52,7 +52,7 @@ jobs:
           - package-delete-deploy
           - sync
           - local-invoke
-          - local-start
+          - local-start1
           - local-start2
           - other-and-e2e
         exclude:
@@ -66,7 +66,7 @@ jobs:
           - container_runtime: no-container
             test_suite: local-invoke
           - container_runtime: no-container
-            test_suite: local-start
+            test_suite: local-start1
           - container_runtime: no-container
             test_suite: local-start2
           - container_runtime: no-container
@@ -347,7 +347,7 @@ jobs:
         run: |
           # Set USING_FINCH_RUNTIME environment variable for finch tests
           if [ "${{ matrix.container_runtime }}" = "finch" ]; then
-            export container_runtime="finch"
+            export CONTAINER_RUNTIME="finch"
           fi
           
           # Determine container keyword filter based on container_runtime
@@ -385,8 +385,8 @@ jobs:
             "local-invoke")
               pytest -vv --reruns 3 tests/integration/local/invoke tests/integration/local/generate_event --json-report --json-report-file=TEST_REPORT-integration-local-invoke-${{ matrix.container_runtime }}.json
               ;;
-            "local-start")
-              pytest -vv --reruns 3 tests/integration/local/start_api --ignore tests/integration/local/start_api/test_start_api_with_terraform_application.py --json-report --json-report-file=TEST_REPORT-integration-local-start-${{ matrix.container_runtime }}.json
+            "local-start1")
+              pytest -vv --reruns 3 tests/integration/local/start_api --ignore tests/integration/local/start_api/test_start_api_with_terraform_application.py --json-report --json-report-file=TEST_REPORT-integration-local-start1-${{ matrix.container_runtime }}.json
               ;;
             "local-start2")
               pytest -vv --reruns 3 tests/integration/local/start_lambda tests/integration/local/start_api/test_start_api_with_terraform_application.py --json-report --json-report-file=TEST_REPORT-integration-local-start2-${{ matrix.container_runtime }}.json

From ed45f7bc437460d3d256b48c2189fd6d972ef884 Mon Sep 17 00:00:00 2001
From: Roger Zhang <ruojiazh@amazon.com>
Date: Tue, 4 Nov 2025 14:42:42 -0800
Subject: [PATCH 2/4] debug

---
 .github/workflows/integration-tests.yml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 308ca596b40..891654ab82d 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -313,8 +313,18 @@ jobs:
           echo "CI_ACCESS_ROLE_AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY" >> $GITHUB_ENV
           echo "CI_ACCESS_ROLE_AWS_SESSION_TOKEN=$AWS_SESSION_TOKEN" >> $GITHUB_ENV
           
-          # Set test credentials
-          echo "AWS_ACCESS_KEY_ID=$(echo "$test_env_var" | jq -j ".accessKeyID")" >> $GITHUB_ENV
+          # Set test credentials with error handling for AWS_ACCESS_KEY_ID
+          AWS_ACCESS_KEY_ID=$(echo "$test_env_var" | jq -j ".accessKeyID" 2>/dev/null) || {
+            echo "ERROR: Failed to parse accessKeyID from JSON"
+            echo "Actual payload received:"
+            echo "==================== START PAYLOAD ===================="
+            echo "$test_env_var"
+            echo "==================== END PAYLOAD ===================="
+            exit 1
+          }
+          echo "AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID" >> $GITHUB_ENV
+          
+          # Set remaining credentials
           echo "AWS_SECRET_ACCESS_KEY=$(echo "$test_env_var" | jq -j ".secretAccessKey")" >> $GITHUB_ENV
           echo "AWS_SESSION_TOKEN=$(echo "$test_env_var" | jq -j ".sessionToken")" >> $GITHUB_ENV
           echo "TASK_TOKEN=$(echo "$test_env_var" | jq -j ".taskToken")" >> $GITHUB_ENV

From b4d22b4e09640deac0ba0f1c9e36226e91a51946 Mon Sep 17 00:00:00 2001
From: Roger Zhang <ruojiazh@amazon.com>
Date: Tue, 4 Nov 2025 16:01:13 -0800
Subject: [PATCH 3/4] ignore deprecation

---
 .github/workflows/integration-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 891654ab82d..b17b5e5aae8 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -296,7 +296,7 @@ jobs:
       - name: Get testing resources and credentials
         run: |
           # Try with skip_role_deletion parameter first
-          test_env_var=$(python3.9 tests/get_testing_resources.py skip_role_deletion 2>&1)
+          test_env_var=$(python3.9 tests/get_testing_resources.py skip_role_deletion)
           
           if [ $? -ne 0 ]; then
             echo "First attempt with skip_role_deletion failed, trying without parameter..."
@@ -318,7 +318,7 @@ jobs:
             echo "ERROR: Failed to parse accessKeyID from JSON"
             echo "Actual payload received:"
             echo "==================== START PAYLOAD ===================="
-            echo "$test_env_var"
+            echo "${test_env_var:0:30}"
             echo "==================== END PAYLOAD ===================="
             exit 1
           }

From 693d0c2d655192c3ca4db51501a209ea222c233e Mon Sep 17 00:00:00 2001
From: Roger Zhang <roger.zhang.cs@gmail.com>
Date: Tue, 4 Nov 2025 16:16:59 -0800
Subject: [PATCH 4/4] Update integration-tests.yml

---
 .github/workflows/integration-tests.yml | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index b17b5e5aae8..fe5d0bee4ba 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -8,9 +8,6 @@ on:
   workflow_dispatch:  # Allow manual triggering
     # NOTE: This workflow can only be manually triggered from develop or main branches
     # The other branch will not pass the OIDC permission check
-    branches:
-      - develop  # Allow manual trigger on develop branch
-      - main     # Allow manual trigger on main branch
 
 permissions:
   id-token: write   # Required for OIDC
@@ -313,18 +310,8 @@ jobs:
           echo "CI_ACCESS_ROLE_AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY" >> $GITHUB_ENV
           echo "CI_ACCESS_ROLE_AWS_SESSION_TOKEN=$AWS_SESSION_TOKEN" >> $GITHUB_ENV
           
-          # Set test credentials with error handling for AWS_ACCESS_KEY_ID
-          AWS_ACCESS_KEY_ID=$(echo "$test_env_var" | jq -j ".accessKeyID" 2>/dev/null) || {
-            echo "ERROR: Failed to parse accessKeyID from JSON"
-            echo "Actual payload received:"
-            echo "==================== START PAYLOAD ===================="
-            echo "${test_env_var:0:30}"
-            echo "==================== END PAYLOAD ===================="
-            exit 1
-          }
-          echo "AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID" >> $GITHUB_ENV
-          
-          # Set remaining credentials
+          # Set test credentials
+          echo "AWS_ACCESS_KEY_ID=$(echo "$test_env_var" | jq -j ".accessKeyID")" >> $GITHUB_ENV
           echo "AWS_SECRET_ACCESS_KEY=$(echo "$test_env_var" | jq -j ".secretAccessKey")" >> $GITHUB_ENV
           echo "AWS_SESSION_TOKEN=$(echo "$test_env_var" | jq -j ".sessionToken")" >> $GITHUB_ENV
           echo "TASK_TOKEN=$(echo "$test_env_var" | jq -j ".taskToken")" >> $GITHUB_ENV
@@ -333,13 +320,6 @@ jobs:
           echo "AWS_KMS_KEY=$(echo "$test_env_var" | jq -j ".TestKMSKeyArn")" >> $GITHUB_ENV
           echo "AWS_SIGNING_PROFILE_NAME=$(echo "$test_env_var" | jq -j ".TestSigningProfileName")" >> $GITHUB_ENV
           echo "AWS_SIGNING_PROFILE_VERSION_ARN=$(echo "$test_env_var" | jq -j ".TestSigningProfileARN")" >> $GITHUB_ENV
-          
-          # Display first 6 characters of credentials for verification
-          ACCESS_KEY=$(echo "$test_env_var" | jq -j ".accessKeyID")
-          SECRET_KEY=$(echo "$test_env_var" | jq -j ".secretAccessKey")
-          echo "AWS_ACCESS_KEY_ID (first 6 chars): ${ACCESS_KEY:0:6}..."
-          echo "AWS_SECRET_ACCESS_KEY (first 6 chars): ${SECRET_KEY:0:6}..."
-
 
       - name: Login to Public ECR
         if: matrix.container_runtime != 'no-container' && env.BY_CANARY == 'true'