From 244d55427684e4c340522024cb7a438757a5e817 Mon Sep 17 00:00:00 2001 From: Bart Louwers Date: Thu, 1 Aug 2024 01:35:17 +0200 Subject: [PATCH] Use GitHub's OIDC provider to authenticate with AWS (#2672) --- .github/actions/aws-device-farm-run/action.yml | 8 +++----- .github/workflows/android-device-test.yml | 2 +- .github/workflows/ios-device-test.yml | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/actions/aws-device-farm-run/action.yml b/.github/actions/aws-device-farm-run/action.yml index da140eff7..9480e1eef 100644 --- a/.github/actions/aws-device-farm-run/action.yml +++ b/.github/actions/aws-device-farm-run/action.yml @@ -51,14 +51,12 @@ runs: using: "composite" steps: - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v3 + uses: aws-actions/configure-aws-credentials@v4 with: - aws-access-key-id: ${{ inputs.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ inputs.AWS_SECRET_ACCESS_KEY }} aws-region: us-west-2 role-to-assume: ${{ inputs.AWS_ROLE_TO_ASSUME }} - role-duration-seconds: 3600 - role-session-name: MySessionName + role-session-name: ${{ github.run_id }} + role-duration-seconds: 14400 - name: Create upload app shell: bash diff --git a/.github/workflows/android-device-test.yml b/.github/workflows/android-device-test.yml index 46d432c20..14c036902 100644 --- a/.github/workflows/android-device-test.yml +++ b/.github/workflows/android-device-test.yml @@ -141,7 +141,7 @@ jobs: testFilter: ${{ matrix.test.testFilter }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - AWS_ROLE_TO_ASSUME: ${{ vars.AWS_ROLE_TO_ASSUME }} + AWS_ROLE_TO_ASSUME: ${{ vars.OIDC_AWS_ROLE_TO_ASSUME }} AWS_DEVICE_FARM_PROJECT_ARN: ${{ vars.AWS_DEVICE_FARM_PROJECT_ARN }} AWS_DEVICE_FARM_DEVICE_POOL_ARN: ${{ matrix.test.devicePool }} externalData: ${{ env.external_data_arn }} diff --git a/.github/workflows/ios-device-test.yml b/.github/workflows/ios-device-test.yml index ddb635823..5cd00ab61 100644 --- a/.github/workflows/ios-device-test.yml +++ b/.github/workflows/ios-device-test.yml @@ -57,7 +57,7 @@ jobs: testType: XCTEST AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - AWS_ROLE_TO_ASSUME: ${{ vars.AWS_ROLE_TO_ASSUME }} + AWS_ROLE_TO_ASSUME: ${{ vars.OIDC_AWS_ROLE_TO_ASSUME }} AWS_DEVICE_FARM_PROJECT_ARN: ${{ vars.AWS_DEVICE_FARM_PROJECT_ARN }} AWS_DEVICE_FARM_DEVICE_POOL_ARN: ${{ vars.AWS_DEVICE_FARM_IPHONE_DEVICE_POOL_ARN }}