Use the per-repo IAM role names for push to ECR.

#1350
alphagov · Jun 21, 2024 · 6853c39 · 6853c39
1 parent 757bbb7
commit 6853c39
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/build-and-push-image.yml b/.github/workflows/build-and-push-image.yml
@@ -39,11 +39,11 @@ jobs:
           show-progress: false
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v4.0.1
+        uses: aws-actions/configure-aws-credentials@v4
         with:
-          role-to-assume: "arn:aws:iam::172025368201:role/github_action_ecr_push"
+          role-to-assume: arn:aws:iam::172025368201:role/github_action_ecr_push_${{ github.event.repository.name }}
           aws-region: eu-west-1
-          role-session-name: ecr-push
+          role-session-name: ecr-push-${{ github.event.repository.name }}
 
       - name: Login to Amazon ECR
         id: login-ecr

diff --git a/.github/workflows/build-and-push-multiarch-image.yml b/.github/workflows/build-and-push-multiarch-image.yml
@@ -72,9 +72,9 @@ jobs:
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v4
         with:
-          role-to-assume: "arn:aws:iam::172025368201:role/github_action_ecr_push"
+          role-to-assume: arn:aws:iam::172025368201:role/github_action_ecr_push_${{ github.event.repository.name }}
           aws-region: eu-west-1
-          role-session-name: ecr-push
+          role-session-name: ecr-push-${{ github.event.repository.name }}
 
       - name: Login to Amazon ECR
         id: login-ecr