From 5310c43e3a2b709ffeaae8034a27b86694aa7cf2 Mon Sep 17 00:00:00 2001
From: Leandro Damascena <lcdama@amazon.pt>
Date: Thu, 20 Mar 2025 11:26:51 +0000
Subject: [PATCH 1/2] Fix SAR pipeline

---
 .github/workflows/reusable_deploy_v3_sar.yml | 4 ++--
 .github/workflows/run-e2e-tests.yml          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/reusable_deploy_v3_sar.yml b/.github/workflows/reusable_deploy_v3_sar.yml
index 223a2135091..fa136646a4c 100644
--- a/.github/workflows/reusable_deploy_v3_sar.yml
+++ b/.github/workflows/reusable_deploy_v3_sar.yml
@@ -182,7 +182,7 @@ jobs:
           echo "Creating canary stack"
           echo "Stack name: $TEST_STACK_NAME"
           aws serverlessrepo create-cloud-formation-change-set \
-            --application-id arn:aws:serverlessrepo:${{ env.AWS_REGION }}:${{ steps.aws-credentials-sar-role.outputs.aws-account-id }}:applications/${{ env.SAR_NAME }} \
+            --application-id arn:aws:serverlessrepo:${{ env.AWS_REGION }}:${{ secrets.AWS_SAR_V3_ACCOUNTID }}:applications/${{ env.SAR_NAME }} \
             --stack-name "${TEST_STACK_NAME/serverlessrepo-/}" \
             --capabilities CAPABILITY_NAMED_IAM
 
@@ -207,5 +207,5 @@ jobs:
           sleep 15
           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 }} \
+            --application-id arn:aws:serverlessrepo:${{ env.AWS_REGION }}:${{ secrets.AWS_SAR_V3_ACCOUNTID }}:applications/${{ env.SAR_NAME }} \
             --statements Principals='*',Actions=Deploy
diff --git a/.github/workflows/run-e2e-tests.yml b/.github/workflows/run-e2e-tests.yml
index b9cbf34d119..56c6ed8c2c1 100644
--- a/.github/workflows/run-e2e-tests.yml
+++ b/.github/workflows/run-e2e-tests.yml
@@ -41,7 +41,7 @@ permissions:
 
 jobs:
   run:
-    runs-on: aws-powertools_ubuntu-latest_8-core
+    runs-on: ubuntu-latest
     permissions:
       id-token: write # needed to request JWT with GitHub's OIDC Token endpoint. docs: https://bit.ly/3MNgQO9
       contents: read  # checkout code

From 81f59461d1e9b6144b902fddcc32215c7ca4fc63 Mon Sep 17 00:00:00 2001
From: Leandro Damascena <lcdama@amazon.pt>
Date: Thu, 20 Mar 2025 11:47:59 +0000
Subject: [PATCH 2/2] Fix SAR pipeline

---
 .github/workflows/run-e2e-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/run-e2e-tests.yml b/.github/workflows/run-e2e-tests.yml
index 56c6ed8c2c1..b9cbf34d119 100644
--- a/.github/workflows/run-e2e-tests.yml
+++ b/.github/workflows/run-e2e-tests.yml
@@ -41,7 +41,7 @@ permissions:
 
 jobs:
   run:
-    runs-on: ubuntu-latest
+    runs-on: aws-powertools_ubuntu-latest_8-core
     permissions:
       id-token: write # needed to request JWT with GitHub's OIDC Token endpoint. docs: https://bit.ly/3MNgQO9
       contents: read  # checkout code