chore(main): release 5.0.0 (#1451 )

chore: Fix markdown link formatting in README.md (#1466 )
chore: update README with versioning (#1465 )
2026-08-24 04:25:05 +09:00 · 2025-09-03 12:07:05 -07:00 · 2025-09-03 18:41:20 +00:00 · 2025-09-03 11:35:44 -07:00 · 2025-09-03 18:25:19 +00:00 · 2025-09-03 18:24:41 +00:00
31 changed files with 12900 additions and 8349 deletions
@@ -0,0 +1,6 @@
+Port 9999
+Listen 127.0.0.1
+Timeout 600
+Allow 127.0.0.1
+LogFile "/home/runner/work/configure-aws-credentials/configure-aws-credentials/integ_proxy_log.txt"
+LogLevel Connect
@@ -24,7 +24,7 @@ jobs:
        with:
          parse-json-secrets: true
          secret-ids: |
-            OSDS,arn:aws:secretsmanager:us-west-2:206735643321:secret:github-aws-sdk-osds-automation-gebs9n
+            ${{ secrets.OSDS_PACKAGING_ROLE }}
      - name: Enable PR automerge
        run: gh pr merge --auto --squash "$PR_URL"
        env:
@@ -1,6 +1,6 @@
 name: Dependabot auto-approve
-on: 
-  pull_request:
+on:
+  pull_request_target:
  workflow_dispatch:

 permissions:
@@ -21,14 +21,14 @@ jobs:
        uses: aws-actions/configure-aws-credentials@v4
        with:
          aws-region: us-west-2
-          role-to-assume: arn:aws:iam::206735643321:role/ConfigureAwsCredentialsPackageRole
+          role-to-assume: ${{ secrets.CONFIGUREAWSCREDENTIALSPACKAGEROLEARN }}
          role-duration-seconds: 900
      - name: Get bot user token
        uses: aws-actions/aws-secretsmanager-get-secrets@v2
        with:
          parse-json-secrets: true
          secret-ids: |
-            OSDS,arn:aws:secretsmanager:us-west-2:206735643321:secret:github-aws-sdk-osds-automation-gebs9n
+            ${{ secrets.OSDS_PACKAGING_ROLE }}
      - name: Approve PR if not already approved
        run: |
          gh pr checkout "$PR_URL"
@@ -39,7 +39,7 @@ jobs:
        with:
          parse-json-secrets: true
          secret-ids: |
-            OSDS,arn:aws:secretsmanager:us-west-2:206735643321:secret:github-aws-sdk-osds-automation-gebs9n
+            ${{ secrets.OSDS_PACKAGING_ROLE }}
      - name: Commit
        run: |
          echo "::add-mask::${{ env.OSDS_ACCESS_TOKEN }}"
@@ -32,7 +32,7 @@
          with:
            parse-json-secrets: true
            secret-ids: |
-              OSDS,arn:aws:secretsmanager:us-west-2:206735643321:secret:github-aws-sdk-osds-automation-gebs9n
+              ${{ secrets.OSDS_PACKAGING_ROLE }}

        - name: Run release-please
          uses: googleapis/release-please-action@v4
@@ -0,0 +1,32 @@
+name: Run post-release integration test
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'dist/**'  
+  workflow_dispatch:
+
+jobs:
+  package_and_test:
+    name: Package dist files
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+          persist-credentials: false
+      - name: Integation tests
+        uses: ./
+        with:
+          aws-region: us-west-2
+          role-to-assume: ${{ secrets.CAWSC_integ_role }}
+          role-session-name: IntegTestCAWSC
+      - name: Get caller identity
+        run: |
+          aws sts get-caller-identity
@@ -0,0 +1,202 @@
+name: Run pre-release integ tests
+on: 
+    pull_request_target:
+permissions:
+    contents: read
+
+jobs:
+  oidc:
+    if: ${{ github.event.pull_request.user.login == 'aws-sdk-osds' && github.repository == 'aws-actions/configure-aws-credentials' }}
+    permissions: 
+        id-token: write
+    strategy: 
+        fail-fast: false
+        matrix:
+            os: [windows-latest, ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
+    name: OIDC login test
+    steps:
+      - name: checkout
+        uses: actions/checkout@v5
+        with:
+            fetch-depth: 0
+            persist-credentials: false
+      - name: Configure AWS credentials
+        uses: ./
+        with:
+            aws-region: us-west-2
+            role-to-assume: ${{ secrets.OIDC_integ_role }}
+      - name: Get Caller Identity
+        run: |
+            aws sts get-caller-identity
+
+  #can cut this test out if it's not necessary
+  static_assumeRole:
+    if: ${{ github.event.pull_request.user.login == 'aws-sdk-osds' && github.repository == 'aws-actions/configure-aws-credentials' }}
+    strategy: 
+        fail-fast: false
+        matrix:
+            os: [windows-latest, ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
+    name: Static IAM creds test
+    steps:
+      - name: checkout
+        uses: actions/checkout@v5
+        with:
+            fetch-depth: 0
+            persist-credentials: false
+      - name: Configure AWS credentials
+        uses: ./
+        with:
+            aws-region: us-west-2
+            aws-access-key-id: ${{ secrets.STATIC_ak_id }}
+            aws-secret-access-key: ${{ secrets.STATIC_secret_ak }}
+            role-to-assume: ${{ secrets.STATIC_role }}
+      - name: Get Caller Identity
+        run: |
+          aws sts get-caller-identity
+
+  role_chaining:
+    if: ${{ github.event.pull_request.user.login == 'aws-sdk-osds' && github.repository == 'aws-actions/configure-aws-credentials' }}
+    permissions: 
+        id-token: write
+    strategy: 
+        fail-fast: false
+        matrix:
+            os: [windows-latest, ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
+    name: Existing Creds + Role Chaining test
+    steps:
+      - name: checkout
+        uses: actions/checkout@v5
+        with:
+            fetch-depth: 0
+            persist-credentials: false    
+      - name: Configure AWS credentials
+        uses: ./
+        with:
+            aws-region: us-west-2
+            role-to-assume: ${{ secrets.ROLE_chaining_1 }}
+      - name: Get Caller Identity
+        run: |
+          aws sts get-caller-identity
+      - name: assume second role
+        uses: ./
+        with:
+            aws-region: us-west-2
+            role-to-assume: ${{ secrets.ROLE_chaining_2 }}
+            role-chaining: true
+      - name: get caller identity
+        run: |
+          aws sts get-caller-identity
+
+  inline_policy:
+    if: ${{ github.event.pull_request.user.login == 'aws-sdk-osds' && github.repository == 'aws-actions/configure-aws-credentials' }}
+    permissions: 
+        id-token: write
+    strategy: 
+        fail-fast: false
+        matrix:
+            os: [ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
+    name: Inline Policy Test
+    steps:
+      - name: checkout
+        uses: actions/checkout@v5
+        with:
+            fetch-depth: 0
+            persist-credentials: false  
+      - name: get creds w scoped down policy
+        uses: ./
+        with: 
+            aws-region: us-west-2
+            role-to-assume: ${{ secrets.INLINE_policy_role }}
+            inline-session-policy: '{"Version":"2012-10-17","Statement":[{"Sid":"Stmt1","Effect":"Allow","Action":"s3:ListAllMyBuckets","Resource":"*"}]}'
+    
+      #NOTE: This step should succeed. The role should have permission only to list all buckets.
+      - name: list buckets
+        run: aws s3 ls > /dev/null
+
+      #NOTE: This step should fail. we don't want the role to have permission to see the bucket contents.    
+      - name: try to list bucket contents
+        id: bucketContentsStep
+        continue-on-error: true
+        run: aws s3 ls s3://cawsc-integ-tests-bucket > /dev/null
+
+      #But the test fails if we could list the bucket contents.
+      - name: fail if we can list bucket contents
+        if: steps.bucketContentsStep.outcome == 'success'
+        run: exit 1
+
+  http-proxy:
+    if: ${{ github.event.pull_request.user.login == 'aws-sdk-osds' && github.repository == 'aws-actions/configure-aws-credentials' }}
+    permissions:
+        id-token: write
+    runs-on: ubuntu-latest
+    name: HTTP Proxy Test
+    steps:
+      - name: checkout
+        uses: actions/checkout@v5
+        with:
+            fetch-depth: 0
+            persist-credentials: false  
+      - name: install tinyproxy
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install tinyproxy
+      - name: start tinyproxy
+        run: tinyproxy -c .github/integ_tests/tinyproxy.conf
+      - name: Configure AWS credentials
+        continue-on-error: true
+        uses: ./
+        with:
+            aws-region: us-west-2
+            role-to-assume: ${{ secrets.OIDC_integ_role }}
+            http-proxy: http://127.0.0.1:9999
+            retry-max-attempts: 4
+      - name: checkout logs 
+        run: cat integ_proxy_log.txt
+      - name: check logs to see if successful call
+        run: grep -q "Request" integ_proxy_log.txt && echo "PROXY_CALL_LOGGED=1" >> $GITHUB_ENV || echo "PROXY_CALL_LOGGED=0" >> $GITHUB_ENV
+      - name: fail job if bad call 
+        if: ${{ env.PROXY_CALL_LOGGED != 1 }}
+        run: exit 1
+
+  token-file:
+    if: ${{ github.event.pull_request.user.login == 'aws-sdk-osds' && github.repository == 'aws-actions/configure-aws-credentials' }}
+    permissions:
+        id-token: write
+    strategy: 
+      fail-fast: false
+      matrix:
+        os: [windows-latest, ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
+    name: Token File Test
+    steps:
+      - name: checkout
+        uses: actions/checkout@v5
+        with:
+            fetch-depth: 0
+            persist-credentials: false
+      - name: fetch token and write to file
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const fs = require('fs');
+            async function getIDTokenAction() {
+              const id_token = await core.getIDToken("sts.amazonaws.com");
+              return id_token;
+            }
+            const idToken = await getIDTokenAction();
+            fs.writeFileSync(".github/integ_tests/integ_token.txt", idToken, (err) => {
+              if (err) throw err;
+            });
+      - name: get creds with that file
+        uses: ./
+        with:
+            aws-region: us-west-2
+            role-to-assume: ${{ secrets.OIDC_integ_role }}
+            web-identity-token-file: .github/integ_tests/integ_token.txt
+            retry-max-attempts: 4
+      - name: check creds
+        run: aws sts get-caller-identity
@@ -1,112 +0,0 @@
-name: Run Integ tests
-
-on:
-  workflow_dispatch:
-
-jobs:
-  integ-oidc:
-    permissions:
-      contents: read
-      id-token: write
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [[self-hosted, linux-fargate], windows-latest, ubuntu-latest, macos-latest]
-    name: Run OIDC integ tests
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    steps:
-      - name: "Checkout repository"
-        uses: actions/checkout@v4
-      - name: Integ test for OIDC
-        uses: ./
-        with:
-          aws-region: us-west-2
-          role-to-assume: ${{ secrets.SECRETS_OIDC_AWS_ROLE_TO_ASSUME }}
-          role-duration-seconds: 900
-          role-session-name: IntegOidcAssumeRole
-          role-external-id: ${{ secrets.SECRETS_OIDC_AWS_ROLE_EXTERNAL_ID }}
-  integ-oidc-env:
-    permissions:
-      contents: read
-      id-token: write
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [[self-hosted, linux-fargate], windows-latest, ubuntu-latest, macos-latest]
-    name: Run OIDC integ tests with existing invalid env vars
-    runs-on: ${{ matrix.os }}
-    env:
-      AWS_ACCESS_KEY_ID: dummyaccesskeyid
-      AWS_SECRET_ACCESS_KEY: dummysecretkey
-      AWS_SESSION_TOKEN: dummytoken
-    timeout-minutes: 30
-    steps:
-      - name: "Checkout repository"
-        uses: actions/checkout@v4
-      - name: Integ test for OIDC
-        uses: ./
-        with:
-          aws-region: us-west-2
-          role-to-assume: ${{ secrets.SECRETS_OIDC_AWS_ROLE_TO_ASSUME }}
-          role-duration-seconds: 900
-          role-session-name: IntegOidcAssumeRole
-          role-external-id: ${{ secrets.SECRETS_OIDC_AWS_ROLE_EXTERNAL_ID }}
-  integ-access-keys:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [[self-hosted, linux-fargate], windows-latest, ubuntu-latest, macos-latest]
-    name: Run access key integ tests
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    steps:
-      - name: "Checkout repository"
-        uses: actions/checkout@v4
-      - name: Integ test for access keys
-        uses: ./
-        with:
-          aws-region: us-west-2
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          role-to-assume: ${{ secrets.SECRETS_AWS_ROLE_TO_ASSUME }}
-          role-session-name: IntegAccessKeysAssumeRole
-          role-external-id: ${{ secrets.SECRETS_AWS_ROLE_EXTERNAL_ID }}
-  integ-access-keys-env:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [[self-hosted, linux-fargate], windows-latest, ubuntu-latest, macos-latest]
-    name: Run access key from env integ tests
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    steps:
-      - name: "Checkout repository"
-        uses: actions/checkout@v4
-      - name: Integ test for access keys
-        uses: ./
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        with:
-          aws-region: us-west-2
-          role-to-assume: ${{ secrets.SECRETS_AWS_ROLE_TO_ASSUME }}
-          role-session-name: IntegAccessKeysAssumeRole
-          role-external-id: ${{ secrets.SECRETS_AWS_ROLE_EXTERNAL_ID }}
-  integ-iam-user:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [[self-hosted, linux-fargate], windows-latest, ubuntu-latest, macos-latest]
-    name: Run IAM User integ tests
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    steps:
-      - name: "Checkout repository"
-        uses: actions/checkout@v4
-      - name: Integ test for IAM user
-        uses: ./
-        with:
-          aws-region: us-west-2
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -2,6 +2,8 @@ on:
  [pull_request]

 name: Run unit tests
+permissions:
+  contents: read

 jobs:
  unit-test:
@@ -14,13 +16,13 @@ jobs:
    timeout-minutes: 5
    steps:
      - name: "Checkout repository"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
      - name: "Setup node"
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v4.4.0
        with:
          node-version: 20
      - name: "Install dependencies"
-        uses: bahmutov/npm-install@v1
+        run: npm ci
      - name: "Run tests"
        run: npm run test --if-present
  lint:
@@ -1,5 +1,5 @@
 {
  ".release-please-manifest.json": "4.0.2",
  "package.json": "4.0.2",
-  ".": "4.2.0"
+  ".": "5.0.0"
 }
@@ -2,6 +2,54 @@

 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

+## [5.0.0](https://github.com/aws-actions/configure-aws-credentials/compare/v4.3.1...v5.0.0) (2025-09-03)
+
+
+### ⚠ BREAKING CHANGES
+
+* Cleanup input handling. Changes invalid boolean input behavior (see #1445)
+
+### Features
+
+* add skip OIDC option ([#1458](https://github.com/aws-actions/configure-aws-credentials/issues/1458)) ([8c45f6b](https://github.com/aws-actions/configure-aws-credentials/commit/8c45f6b08196feb86cfdbe431541d5571d9ab2c2))
+* Cleanup input handling. Changes invalid boolean input behavior (see [#1445](https://github.com/aws-actions/configure-aws-credentials/issues/1445)) ([74b3e27](https://github.com/aws-actions/configure-aws-credentials/commit/74b3e27aa80db064b5bb8c04b22fc607e817acf7))
+* support account id allowlist ([#1456](https://github.com/aws-actions/configure-aws-credentials/issues/1456)) ([c4be498](https://github.com/aws-actions/configure-aws-credentials/commit/c4be498953fc1da2707a50ce4b761a53af3d02af))
+
+## [4.3.1](https://github.com/aws-actions/configure-aws-credentials/compare/v4.3.0...v4.3.1) (2025-08-04)
+
+
+### Bug Fixes
+
+* update readme to 4.3.1 ([#1424](https://github.com/aws-actions/configure-aws-credentials/issues/1424)) ([be2e7ad](https://github.com/aws-actions/configure-aws-credentials/commit/be2e7ad815e27b890489a89ce2717b0f9e26b56e))
+
+## [4.3.0](https://github.com/aws-actions/configure-aws-credentials/compare/v4.2.1...v4.3.0) (2025-08-04)
+
+
+### Features
+
+* depenency update and feature cleanup ([#1414](https://github.com/aws-actions/configure-aws-credentials/issues/1414)) ([59489ba](https://github.com/aws-actions/configure-aws-credentials/commit/59489ba544930000b7b67412c167f5fe816568cf)), closes [#1062](https://github.com/aws-actions/configure-aws-credentials/issues/1062) [#1191](https://github.com/aws-actions/configure-aws-credentials/issues/1191)
+* Optional environment variable output ([c3b3ce6](https://github.com/aws-actions/configure-aws-credentials/commit/c3b3ce61b02510937ff02916a4eb153874bc5085))
+
+
+### Bug Fixes
+
+* **docs:** readme samples versioning ([5b3c895](https://github.com/aws-actions/configure-aws-credentials/commit/5b3c89504689ea1ea2b6000b23a6a2aac463662a))
+* the wrong example region for China partition in README ([37fe9a7](https://github.com/aws-actions/configure-aws-credentials/commit/37fe9a740bcb30ee8cccd96feb90666c937311f2))
+* properly set proxy environment variable ([cbea708](https://github.com/aws-actions/configure-aws-credentials/commit/cbea70821e4ab985ad3be0e5a93390523e257cde))
+
+
+### Miscellaneous Chores
+
+* release 4.3.0 ([3f7c218](https://github.com/aws-actions/configure-aws-credentials/commit/3f7c2187213bafaa1ea60a850b27082cbf55dda0))
+
+## [4.2.1](https://github.com/aws-actions/configure-aws-credentials/compare/v4.2.0...v4.2.1) (2025-05-14)
+
+
+### Bug Fixes
+
+* ensure explicit inputs take precedence over environment variables ([e56e6c4](https://github.com/aws-actions/configure-aws-credentials/commit/e56e6c4038915cd5a7238a671fe97f44c98a40b0))
+* prioritize explicit inputs over environment variables ([df9c8fe](https://github.com/aws-actions/configure-aws-credentials/commit/df9c8fed6b364f0d1fb0e6e03a0ec26f1ea4e3fc))
+
 ## [4.2.0](https://github.com/aws-actions/configure-aws-credentials/compare/v4.1.0...v4.2.0) (2025-05-06)


@@ -1,98 +1,130 @@
-## Configure AWS Credentials for GitHub Actions
-Configure your AWS credentials and region environment variables for use in other
-GitHub Actions.
+Configure AWS Credentials
+=========================
+Authenticate to AWS in GitHub Actions! Works especially well with [AWS Secrets
+Manager](https://github.com/aws-actions/aws-secretsmanager-get-secrets).

-This action implements the AWS JavaScript SDK credential resolution chain
-and exports session environment variables for your other Actions to use.
-Environment variable exports are detected by both the AWS SDKs and the AWS CLI
-for AWS API calls.
+Quick Start (OIDC, recommended)
+-------------------------------
+1. Create an IAM Identity Provider in your AWS account for GitHub OIDC. (See 
+[OIDC configuration](#oidc-configuration) below for details.)
+2. Create an IAM Role in your AWS account with a trust policy that allows GitHub
+Actions to assume it:
+    <details>
+    <summary>GitHub OIDC Trust Policy</summary>

-## Overview
-API calls to AWS need to be signed with credential information, so when you use
-one of the AWS SDKs or an AWS tool, you must provide it with AWS credentials and
-and AWS region. One way to do that in GitHub Actions is to use a repository
-secret with IAM credentials, but this doesn't follow [AWS security
-guidelines](https://docs.aws.amazon.com/IAM/latest/UserGuide/security-creds.html)
-on using long term credentials. Instead, we recommend that you use a long term
-credential or JWT to fetch a temporary credential, and use that with your tools
-instead. This GitHub Action facilitates just that.
+    ```json
+    {
+      "Version": "2012-10-17",
+      "Statement": [
+        {
+          "Effect": "Allow",
+          "Principal": {
+            "Federated": "arn:aws:iam::<AWS_ACCOUNT_ID>:oidc-provider/token.actions.githubusercontent.com"
+          },
+          "Action": "sts:AssumeRoleWithWebIdentity",
+          "Condition": {
+            "StringEquals": {
+              "token.actions.githubusercontent.com:aud": "sts.amazonaws.com",
+              "token.actions.githubusercontent.com:sub": "repo:<GITHUB_ORG>/<GITHUB_REPOSITORY>:ref:refs/heads/<GITHUB_BRANCH>"
+            }
+          }
+        }
+      ]
+    }
+    ```
+    </details>
+3. Attach permissions to the IAM Role that allow it to access the AWS resources 
+you need.
+4. Add the following to your GitHub Actions workflow:
+    <details>
+    <summary>Example Workflow</summary>

-AWS SDKs and Tools look for your credentials in standardized environment
-variables. In essence, this Action runs through the standard [credential
-resolution flow](https://docs.aws.amazon.com/sdkref/latest/guide/standardized-credentials.html),
-and at the end, exports environment variables for you to use later.
+    ```yaml
+    # Need ID token write permission to use OIDC
+    permissions:
+      id-token: write
+    jobs:
+      run_job_with_aws:
+        runs-on: ubuntu-latest
+        steps:
+          - name: Configure AWS Credentials
+            uses: aws-actions/configure-aws-credentials@main # Or a specific version
+            with:
+              role-to-assume: <Role ARN you created in step 2>
+              aws-region: <AWS Region you want to use>
+          - name: Additional steps
+            run: |
+              # Your commands that require AWS credentials
+              aws sts get-caller-identity 
+    ```
+    </details>
+That's it! Your GitHub Actions workflow can now access AWS resources using the
+IAM Role you created. Other authentication scenarios are also supported (see
+below).

-We support five methods for fetching credentials from AWS, but we recommend that
-you use GitHub's OIDC provider in conjunction with a configured AWS IAM
-Identity Provider endpoint.
+Security Recommendations
+------------------------
+* Use temporary credentials when possible. OIDC is recommended because it
+  provides temporary credentials and it's easy to set up.
+* Do not store credentials in your repository's code. Consider using
+  [git-secrets](https://github.com/awslabs/git-secrets) to prevent committing
+  secrets to your repository.
+* [Grant least privilege](https://docs.aws.amazon.com/IAM/latest/UserGuide/best-practices.html#grant-least-privilege)
+  to your workflows. Grant only those permissions that are necessary for the
+  workflow to run.
+* [Monitor the activity](https://docs.aws.amazon.com/IAM/latest/UserGuide/best-practices.html#keep-a-log)
+  of the credentials used in workflows.
+* Periodically rotate any long-lived credentials that you use.
+* Store sensitive information in a secure way, such as using
+  [AWS Secrets Manager](https://aws.amazon.com/secrets-manager/) or
+  [GitHub Secrets](https://docs.github.com/en/actions/security-guides/encrypted-secrets).

-For more information on how to do that, read on.
+Other Authentication Scenarios
+------------------------------
+This action supports five different authentication methods that are configured
+by specifying different inputs.

-### Note about GHES
-
-Some of this documentation may be inaccurate if you are using GHES (GitHub
-Enterprise Server), please take note to review the GitHub documentation when
-relevant.
-
-For example, the URL that the OIDC JWT is issued from is different than the
-usual `token.actions.githubusercontent.com`, and will be unique to your
-enterprise server. As a result, you will need to configure this differently when
-you create the Identity Provider.
-
-We do not presently have a GHES testing environment to validate this action. If
-you are running in GHES and encounter problems, please
-[let us know](https://github.com/aws-actions/configure-aws-credentials/issues/new/choose).
-
-## Security recommendations
-
-We recommend following
-[Amazon IAM best practices](https://docs.aws.amazon.com/IAM/latest/UserGuide/best-practices.html)
-for the AWS credentials used in GitHub Actions workflows, including:
-  * Do not store credentials in your repository's code.
-  * [Grant least privilege](https://docs.aws.amazon.com/IAM/latest/UserGuide/best-practices.html#grant-least-privilege)
-  to the credentials used in GitHub Actions workflows. Grant only the
-  permissions required to perform the actions in your GitHub Actions workflows.
-  Do not assume overly permissive roles, even for testing.
-  * [Monitor the activity](https://docs.aws.amazon.com/IAM/latest/UserGuide/best-practices.html#keep-a-log)
-  of the credentials used in GitHub Actions workflows.
-  * Use temporary credentials when possible.
-  * Periodically rotate any long-term credentials you use.
-
-## Using this action
-There are five different supported ways to retrieve credentials:
-
- Using GitHub's OIDC provider (`AssumeRoleWithWebIdentity`)
- Proceeding as an IAM user (No STS call is made)
- Using access keys as action input (`AssumeRole`)
- Using a WebIdentity Token File (`AssumeRoleWithWebIdentity`)
- Using existing credentials in your runner (`AssumeRole`)
+1. Use a `core.getIDToken()` call to authenticate via OIDC.
+2. Re-export existing long-lived IAM credentials (access key ID and secret
+   access key) as environment variables.
+3. Use static credentials stored in GitHub Secrets to fetch temporary
+   credentials via STS AssumeRole.
+4. Use a Web Identity Token to fetch temporary credentials via STS
+   AssumeRoleWithWebIdentity.
+5. Use credentials stored in the Action environment to fetch temporary
+   credentials via STS AssumeRole.

 Because we use the AWS JavaScript SDK, we always will use the [credential
 resolution flow for Node.js](https://docs.aws.amazon.com/sdk-for-javascript/v3/developer-guide/setting-credentials-node.html).
 Depending on your inputs, the action might override parts of this flow.

-We recommend using the first option above: [GitHub's OIDC provider](https://docs.github.com/en/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-amazon-web-services).
-This method uses OIDC to get short-lived credentials needed for your actions.
-See [OIDC](#OIDC) for more information on how to setup your AWS account to
-assume a role with OIDC. 
+<details>
+<summary>Inputs and their effects on the credential resolution flow</summary>

-The following table describes which method we'll use to get your credentials
-based on which values are supplied to the Action:
-
-| **Identity Used**                                               | `aws-access-key-id` | `role-to-assume` | `web-identity-token-file` | `role-chaining` | `id-token` permission
-| --------------------------------------------------------------- | ------------------- | ---------------- | ------------------------- | - | - |
-| [✅ Recommended] Assume Role directly using GitHub OIDC provider |                     | ✔                |                           | | ✔ |
-| IAM User                                                        | ✔                   |                  |                           | | |
-| Assume Role using IAM User credentials                          | ✔                   | ✔                |                           | | |
-| Assume Role using WebIdentity Token File credentials            |                     | ✔                | ✔                         | | |
-| Assume Role using existing credentials | | ✔ | | ✔ | |
+| **Identity Used**                        | `aws-access-key-id` | `role-to-assume` | `web-identity-token-file` | `role-chaining` |
+| ---------------------------------------- | ------------------- | ---------------- | ------------------------- | --------------- |
+| [✅ Recommended] GitHub OIDC             |                     | ✔                |                           |                 |
+| IAM User (no AssumeRole)                 | ✔                   |                  |                           |                 |
+| AssumeRole using static IAM credentials  | ✔                   | ✔                |                           |                 |
+| AssumeWithWebIdentity use a token file   |                     | ✔                | ✔                         |                 |
+| AssumeRole using existing credentials    |                     | ✔                |                           | ✔               |

 *Note: `role-chaining` is not always necessary to use existing credentials.
 If you're getting a "Credentials loaded by the SDK do not match" error,
 try enabling this option.*
+</details>

+Additionally, **`aws-region`** is always required.
+
+*Note: If you use GitHub Enterprise Server, you must use the you may need to
+adjust examples here to match your environment.*
+
+Additional Options
+------------------
 ### Options
 See [action.yml](./action.yml) for more detail.
+<details>
+<summary>Options list and descriptions</summary>

 |          Option           |                                            Description                                            | Required |
 |---------------------------|---------------------------------------------------------------------------------------------------|----------|
@@ -111,31 +143,76 @@ See [action.yml](./action.yml) for more detail.
 | role-skip-session-tagging | Skips session tagging if set.                                                                     |    No    |
 | inline-session-policy     | You may further restrict the assumed role policy by defining an inline policy here.               |    No    |
 | managed-session-policies  | You may further restrict the assumed role policy by specifying a managed policy here.             |    No    |
-| output-credentials        | When set, outputs fetched credentials as action step output. (Outputs access-key-id, secret-access-key, session-token, and expiration). Defaults to false.                   |    No    |
+| output-credentials        | When set, outputs fetched credentials as action step output. (Outputs aws-access-key-id, aws-secret-access-key, aws-session-token, aws-account-id, authenticated-arn, and aws-expiration). Defaults to false.                   |    No    |
+| output-env-credentials       | When set, outputs fetched credentials as environment variables (AWS_REGION, AWS_DEFAULT_REGION, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_SESSION_TOKEN). Defaults to true. Set to false if you need to avoid setting/changing env variables. You'd probably want to use output-credentials if you disable this. (NOTE: Setting to false will prevent the aws-account-id from being exported as a step output). |    No    |
 | unset-current-credentials | When set, attempts to unset any existing credentials in your action runner.                       |    No    |
 | disable-retry             | Disabled retry/backoff logic for assume role calls. By default, retries are enabled.              |    No    |
 | retry-max-attempts        | Limits the number of retry attempts before giving up. Defaults to 12.                             |    No    |
 | special-characters-workaround | Uncommonly, some environments cannot tolerate special characters in a secret key. This option will retry fetching credentials until the secret access key does not contain special characters. This option overrides disable-retry and retry-max-attempts. | No |
 | use-existing-credentials  | When set, the action will check if existing credentials are valid and exit if they are. Defaults to false. |    No    |
+| allowed-account-ids       | A comma-delimited list of expected AWS account IDs. The action will fail if we receive credentials for the wrong account. |    No    |
+| force-skip-oidc           | When set, the action will skip using GitHub OIDC provider even if the id-token permission is set. |    No    |
+</details>

-#### Credential Lifetime
-The default session duration is **1 hour**.
+#### Adjust the retry mechanism
+You can configure retry settings for if the STS call fails. By default, we
+retry with exponential backoff `12` times. You can disable this behavior
+altogether by setting the `disable-retry` input to `true`, or you can configure
+the number of times it retries with the `retry-max-attempts` input.

-If you would like to adjust this you can pass a duration to
-`role-duration-seconds`, but the duration cannot exceed the maximum that was
-defined when the IAM Role was created.
+#### Mask account ID
+Your account ID is not masked by default in workflow logs. You can set the
+`mask-aws-account-id` input to `true` to mask your account ID in workflow logs
+if desired.

-#### External ID
-If your role requires an external ID to assume, you can provide the external ID
-with the `role-external-id` input
+#### Unset current credentials
+Sometimes, existing credentials in your runner can get in the way of the
+intended outcome. You can set the `unset-current-credentials` input to `true` to
+work around this issue.

-#### Session tagging and name
+#### Use an HTTP proxy
+
+If need use an HTTP proxy you can set it in the action manually. Additionally
+this action will always consider the `HTTP_PROXY` environment variable.
+
+<details>
+<summary>Proxy configuration</summary>
+
+Manually configured proxy:
+```yaml
+uses: aws-actions/configure-aws-credentials@v4.3.1
+with:
+  aws-region: us-east-2
+  role-to-assume: my-github-actions-role
+  http-proxy: "http://companydomain.com:3128"
+```
+
+Proxy configured in the environment variable:
+```bash
+# Your environment configuration
+HTTP_PROXY="http://companydomain.com:3128"
+```
+</details>
+
+#### Special characters in AWS_SECRET_ACCESS_KEY
+Some edge cases are unable to properly parse an `AWS_SECRET_ACCESS_KEY` if it
+contains special characters. For more information, please see the
+[AWS CLI documentation](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-troubleshooting.html#tshoot-signature-does-not-match).
+If you set the `special-characters-workaround` option, this action will
+continually retry fetching credentials until we get one that does not have
+special characters. This option overrides the `disable-retry` and
+`retry-max-attempts` options. We recommend that you do not enable this option
+unless required, because retrying APIs infinitely until they succeed is not best
+practice.
+
+Session Naming and Policies
+---------------------------
 The default session name is "GitHubActions", and you can modify it by specifying
 the desired name in `role-session-name`.

-_Note: you might find it helpful to set the `role-session-name` to `${{ github.run_id }}` 
+*Note: you might find it helpful to set the `role-session-name` to `${{ github.run_id }}` 
 so as to clarify in audit logs which AWS actions were performed by which workflow 
-run._
+run.*

 The session will be tagged with the
 following tags: (Refer to [GitHub's documentation for `GITHUB_` environment
@@ -157,21 +234,7 @@ Particularly, `GITHUB_WORKFLOW` will be truncated if it's too long. If
 `GITHUB_ACTOR` or `GITHUB_WORKFLOW` contain invalid characters, the characters
 will be replaced with an '*'._

-The action will use session tagging by default during role assumption, unless
-you follow our recommendation and are assuming a role with a WebIdentity. For
-WebIdentity role assumption, the session tags have to be included in the encoded
-WebIdentity token. This means that tags can only be supplied by the OIDC
-provider, and they cannot set during the AssumeRoleWithWebIdentity API call
-within the Action. See [#419](https://github.com/aws-actions/configure-aws-credentials/issues/419)
-for more information.
-
-You can skip this session tagging by providing
-`role-skip-session-tagging` as true in the action's inputs:
-```yaml
-      uses: aws-actions/configure-aws-credentials@v4
-      with:
-        role-skip-session-tagging: true
-```
+The action will use session tagging by default unless you are using OIDC.

 ### Session policies
 Session policies are not required, but they allow you to limit the scope of the
@@ -182,15 +245,19 @@ session policy by its ARN.
 #### Inline session policies
 An IAM policy in stringified JSON format that you want to use as an inline
 session policy. Depending on preferences, the JSON could be written on a single
-line like this:
+line.
+
+<details>
+<summary>Inline session policy examples</summary>
+
 ```yaml
-      uses: aws-actions/configure-aws-credentials@v4
+      uses: aws-actions/configure-aws-credentials@v4.3.1
      with:
         inline-session-policy: '{"Version":"2012-10-17","Statement":[{"Sid":"Stmt1","Effect":"Allow","Action":"s3:List*","Resource":"*"}]}'
 ```
 Or we can have a nicely formatted JSON as well:
 ```yaml
-      uses: aws-actions/configure-aws-credentials@v4.1.0
+      uses: aws-actions/configure-aws-credentials@v4.3.1
      with:
         inline-session-policy: >-
          {
@@ -205,56 +272,33 @@ Or we can have a nicely formatted JSON as well:
           ]
          }
 ```
+</details>

 #### Managed session policies
 The Amazon Resource Names (ARNs) of the IAM managed policies that you want to
 use as managed session policies. The policies must exist in the same account as
-the role. You can pass a single managed policy like this:
+the role.
+
+<details>
+<summary>Managed session policy examples</summary>
+
 ```yaml
-      uses: aws-actions/configure-aws-credentials@v4.1.0
+      uses: aws-actions/configure-aws-credentials@v4.3.1
      with:
         managed-session-policies: arn:aws:iam::aws:policy/AmazonS3ReadOnlyAccess
 ```
 And we can pass multiple managed policies likes this:
 ```yaml
-      uses: aws-actions/configure-aws-credentials@v4.1.0
+      uses: aws-actions/configure-aws-credentials@v4.3.1
      with:
         managed-session-policies: |
          arn:aws:iam::aws:policy/AmazonS3ReadOnlyAccess
          arn:aws:iam::aws:policy/AmazonS3OutpostsReadOnlyAccess
 ```
+</details>

-### Misc
-
-#### Adjust the retry mechanism
-You can now configure retry settings for when the STS call fails. By default, we
-retry with exponential backoff `12` times. You can disable this behavior
-altogether by setting the `disable-retry` input to `true`, or you can configure
-the number of times it retries with the `retry-max-attempts` input.
-
-#### Mask account ID
-Your account ID is not masked by default in workflow logs since it's not
-considered sensitive information. However, you can set the `mask-aws-account-id`
-input to `true` to mask your account ID in workflow logs if desired.
-
-#### Unset current credentials
-Sometimes, existing credentials in your runner can get in the way of the
-intended outcome. You can set the `unset-current-credentials` input to `true` to
-work around this issue.
-
-#### Special characters in AWS_SECRET_ACCESS_KEY
-Some edge cases are unable to properly parse an `AWS_SECRET_ACCESS_KEY` if it
-contains special characters. For more information, please see the
-[AWS CLI documentation](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-troubleshooting.html#tshoot-signature-does-not-match).
-If you set the `special-characters-workaround` option, this action will
-continually retry fetching credentials until we get one that does not have
-special characters. This option overrides the `disable-retry` and
-`retry-max-attempts` options. We recommend that you do not enable this option
-unless required, because retrying APIs infinitely until they succeed is not best
-practice.
-
-## OIDC
-
+OIDC Configuration
+-------------------
 We recommend using [GitHub's OIDC
 provider](https://docs.github.com/en/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-amazon-web-services)
 to get short-lived AWS credentials needed for your actions. When using OIDC, you
@@ -273,15 +317,6 @@ To get this to work

 5. Specify that role's ARN when setting up this action.

-First, in order for this action to create the JWT, your workflow file must have
-the `id-token: write` permission:
-
-```yaml
-    permissions:
-      id-token: write
-      contents: read
-```
-
 ### OIDC Audience

 When the JWT is created, an audience needs to be specified. Normally, you would
@@ -292,83 +327,33 @@ You can specify the audience through the `audience` input:

 ```yaml
    - name: Configure AWS Credentials for China region audience
-      uses: aws-actions/configure-aws-credentials@v4.1.0
+      uses: aws-actions/configure-aws-credentials@v4.3.1
      with:
        audience: sts.amazonaws.com.cn
-        aws-region: us-east-3
+        aws-region: cn-northwest-1
        role-to-assume: arn:aws-cn:iam::123456789100:role/my-github-actions-role
 ```

 ### Configuring IAM to trust GitHub
-To use GitHub's OIDC provider, you must first set up federation
-with the provider as an IAM IdP. The GitHub OIDC provider only needs to be
-created once per account (i.e. multiple IAM Roles that can be assumed by the
-GitHub's OIDC can share a single OIDC Provider). Here is a sample CloudFormation
-template that will configure this trust for you.
+To use GitHub's OIDC provider, you must first set up federation in your AWS
+account. This involves creating an IAM Identity Provider that trusts GitHub's
+OIDC endpoint. You can create an IAM Identity Provider in the AWS Management 
+Console by specifying the following details:
+- **Provider Type**: OIDC
+- **Provider URL**: `https://token.actions.githubusercontent.com`
+- **Audience**: `sts.amazonaws.com` (or your custom audience if you specified
+  one in the `audience` input)

-Note that the thumbprint below has been set to all F's because the thumbprint is
-not used when authenticating `token.actions.githubusercontent.com`. This is a
-special case used *only when GitHub's OIDC is authenticating to IAM*. IAM uses
-its library of trusted CAs to authenticate. The value is still the API, so it
-must be specified.
+Prior versions of this documentation gave instructions for specifying the
+certificate fingerprint, but this is no longer necessary. The thumbprint, if 
+specified, will be ignored.

-You can copy the template below, or load it from here: 
-https://d38mtn6aq9zhn6.cloudfront.net/configure-aws-credentials-latest.yml
+You can also create the IAM Identity Provider using the AWS CLI:

-```yaml
-Parameters:
-  GitHubOrg:
-    Description: Name of GitHub organization/user (case sensitive)
-    Type: String
-  RepositoryName:
-    Description: Name of GitHub repository (case sensitive)
-    Type: String
-  OIDCProviderArn:
-    Description: Arn for the GitHub OIDC Provider.
-    Default: ""
-    Type: String
-  OIDCAudience:
-    Description: Audience supplied to configure-aws-credentials.
-    Default: "sts.amazonaws.com"
-    Type: String
-
-Conditions:
-  CreateOIDCProvider: !Equals 
-    - !Ref OIDCProviderArn
-    - ""
-
-Resources:
-  Role:
-    Type: AWS::IAM::Role
-    Properties:
-      AssumeRolePolicyDocument:
-        Statement:
-          - Effect: Allow
-            Action: sts:AssumeRoleWithWebIdentity
-            Principal:
-              Federated: !If 
-                - CreateOIDCProvider
-                - !Ref GithubOidc
-                - !Ref OIDCProviderArn
-            Condition:
-              StringEquals:
-                token.actions.githubusercontent.com:aud: !Ref OIDCAudience
-              StringLike:
-                token.actions.githubusercontent.com:sub: !Sub repo:${GitHubOrg}/${RepositoryName}:*
-
-  GithubOidc:
-    Type: AWS::IAM::OIDCProvider
-    Condition: CreateOIDCProvider
-    Properties:
-      Url: https://token.actions.githubusercontent.com
-      ClientIdList: 
-        - sts.amazonaws.com
-      ThumbprintList:
-        - ffffffffffffffffffffffffffffffffffffffff
-
-Outputs:
-  Role:
-    Value: !GetAtt Role.Arn 
+```bash
+aws iam create-open-id-connect-provider \
+    --url https://token.actions.githubusercontent.com \
+    --client-id-list sts.amazonaws.com 
 ```

 ### Claims and scoping permissions
@@ -410,83 +395,13 @@ For further information on OIDC and GitHub Actions, please see:
 * [GitHub docs: Configuring OpenID Connect in Amazon Web Services](https://docs.github.com/en/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-amazon-web-services)
 * [GitHub changelog: GitHub Actions: Secure cloud deployments with OpenID Connect](https://github.blog/changelog/2021-10-27-github-actions-secure-cloud-deployments-with-openid-connect/)

-## Self-Hosted Runners
+Examples
+--------

-If you run your GitHub Actions in a
-[self-hosted runner](https://help.github.com/en/actions/hosting-your-own-runners/about-self-hosted-runners) that already has access to AWS credentials, such as
-an EC2 instance, then you do not need to provide IAM user access key credentials
-to this action. We will use the standard AWS JavaScript SDK credential
-resolution methods to find your credentials, so if the AWS JS SDK can
-authenticate on your runner, this Action will as well.
-
-If no access key credentials are given in the action inputs, this action will
-use credentials from the runner environment using the
-[default methods for the AWS SDK for Javascript](https://docs.aws.amazon.com/sdk-for-javascript/v3/developer-guide/setting-credentials-node.html).
-
-You can use this action to simply configure the region and account ID in the
-environment, and then use the runner's credentials for all AWS API calls made by
-your Actions workflow:
-```yaml
-uses: aws-actions/configure-aws-credentials@v4.1.0
-with:
-  aws-region: us-east-2
-```
-In this case, your runner's credentials must have permissions to call any AWS
-APIs called by your Actions workflow.
-
-Or, you can use this action to assume a role, and then use the role credentials
-for all AWS API calls made by your Actions workflow:
-```yaml
-uses: aws-actions/configure-aws-credentials@v4.1.0
-with:
-  aws-region: us-east-2
-  role-to-assume: my-github-actions-role
-```
-In this case, your runner's credentials must have permissions to assume the
-role.
-
-You can also assume a role using a web identity token file, such as if using
-[Amazon EKS IRSA](https://docs.aws.amazon.com/eks/latest/userguide/iam-roles-for-service-accounts-technical-overview.html). Pods running in EKS
-worker nodes that do not run as root can use this file to assume a role with a
-web identity.
-
-### Proxy Configuration
-
-If need use a HTTP proxy you can set it in the action manually.
-
-Additionally this action will always consider the `HTTP_PROXY` environment
-variable.
-
-Manually configured proxy:
-```yaml
-uses: aws-actions/configure-aws-credentials@v4.1.0
-with:
-  aws-region: us-east-2
-  role-to-assume: my-github-actions-role
-  http-proxy: "http://companydomain.com:3128"
-```
-
-Proxy configured in the environment variable:
-```bash
-# Your environment configuration
-HTTP_PROXY="http://companydomain.com:3128"
-```
-
-### Use with the AWS CLI
-This workflow does _not_ install the [AWS CLI](https://aws.amazon.com/cli/)
-into your environment. Self-hosted runners that intend to run this action prior
-to executing `aws` commands need to have the AWS CLI
-[installed](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-install.html)
-if it's not already present. 
-Most [GitHub hosted runner environments](https://github.com/actions/virtual-environments)
-should include the AWS CLI by default.
-
-## Examples
-
-### AssumeRoleWithWebIdentity (recommended)
+### AssumeRoleWithWebIdentity
 ```yaml
    - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v4.1.0
+      uses: aws-actions/configure-aws-credentials@v4.3.1
      with:
        aws-region: us-east-2
        role-to-assume: arn:aws:iam::123456789100:role/my-github-actions-role
@@ -500,13 +415,13 @@ environment variable and use it to assume the role
 ### AssumeRole with role previously assumed by action in same workflow
 ```yaml
    - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v4.1.0
+      uses: aws-actions/configure-aws-credentials@v4.3.1
      with:
        aws-region: us-east-2
        role-to-assume: arn:aws:iam::123456789100:role/my-github-actions-role
        role-session-name: MySessionName
    - name: Configure other AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v4.1.0
+      uses: aws-actions/configure-aws-credentials@v4.3.1
      with:
        aws-region: us-east-2
        role-to-assume: arn:aws:iam::987654321000:role/my-second-role
@@ -521,7 +436,7 @@ role, `arn:aws:iam::987654321000:role/my-second-role`.
 ### AssumeRole with static IAM credentials in repository secrets
 ```yaml
    - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v4.1.0
+      uses: aws-actions/configure-aws-credentials@v4.3.1
      with:
        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -540,7 +455,7 @@ name, like `role-to-assume: my-github-actions-role`.
 ```yaml
    - name: Configure AWS Credentials 1
      id: creds
-      uses: aws-actions/configure-aws-credentials@v4.1.0
+      uses: aws-actions/configure-aws-credentials@v4.3.1
      with:
        aws-region: us-east-2
        role-to-assume: arn:aws:iam::123456789100:role/my-github-actions-role
@@ -549,7 +464,7 @@ name, like `role-to-assume: my-github-actions-role`.
      run: |
        aws sts get-caller-identity
    - name: Configure AWS Credentials 2
-      uses: aws-actions/configure-aws-credentials@v4.1.0
+      uses: aws-actions/configure-aws-credentials@v4.3.1
      with:
        aws-region: us-east-2
        aws-access-key-id: ${{ steps.creds.outputs.aws-access-key-id }}
@@ -564,12 +479,21 @@ This example shows that you can reference the fetched credentials as outputs if
 `output-credentials` is set to true. This example also shows that you can use
 the `aws-session-token` input in a situation where session tokens are fetched
 and passed to this action.
- 
-## License Summary
+
+Versioning
+----------
+Starting with version 5.0.0, this action uses semantic-style release tags and
+[immutable releases](https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/immutable-releases).
+A floating version tag (vN) is also provided for convenience: this tag will
+move to the latest major version (vN -> vN.2.1, vM -> vM.0.0, etc.).
+
+License
+-------
 This code is made available under the MIT license.

-## Security Disclosures
+Security Disclosures
+--------------------
 If you would like to report a potential security issue in this project, please
-do not create a GitHub issue.  Instead, please follow the instructions
-[here](https://aws.amazon.com/security/vulnerability-reporting/) or [email AWS
-security directly](mailto:aws-security@amazon.com).
+do not create a GitHub issue. Instead, please follow the instructions
+[here](https://aws.amazon.com/security/vulnerability-reporting/) or
+[email AWS security](mailto:aws-security@amazon.com) directly.
@@ -1,2 +1,2 @@
-const { fs } = require('memfs')
-module.exports = fs
+const { fs } = require('memfs');
+module.exports = fs;
@@ -61,6 +61,10 @@ inputs:
  output-credentials:
    description: Whether to set credentials as step output
    required: false
+  output-env-credentials:
+    description: Whether to export credentials as environment variables. If you set this to false, you probably want to use output-credentials.
+    required: false
+    default: true
  unset-current-credentials:
    description: Whether to unset the existing credentials in your runner. May be useful if you run this action multiple times in the same job
    required: false
@@ -74,7 +78,15 @@ inputs:
    description: Some environments do not support special characters in AWS_SECRET_ACCESS_KEY. This option will retry fetching credentials until the secret access key does not contain special characters. This option overrides disable-retry and retry-max-attempts. This option is disabled by default
    required: false
  use-existing-credentials:
+    required: false
    description: When enabled, this option will check if there are already valid credentials in the environment. If there are, new credentials will not be fetched. If there are not, the action will run as normal.
+  allowed-account-ids:
+    required: false
+    description: An option comma-delimited list of expected AWS account IDs. The action will fail if we receive credentials for the wrong account.
+  force-skip-oidc:
+    required: false
+    description: When enabled, this option will skip using GitHub OIDC provider even if the id-token permission is set. This is sometimes useful when using IAM instance credentials.
+
 outputs:
  aws-account-id:
    description: The AWS account ID for the provided credentials
@@ -84,3 +96,5 @@ outputs:
    description: The AWS secret access key for the provided credentials
  aws-session-token:
    description: The AWS session token for the provided credentials
+  aws-expiration:
+    description: The expiration time for the provided credentials
@@ -4,18 +4,22 @@
    "lineWidth": 120,
    "indentWidth": 2,
    "lineEnding": "lf",
-    "enabled": true,
+    "enabled": true
  },
  "linter": {
    "enabled": true,
    "rules": {
      "performance": {
-        "noDelete": "off",
+        "noDelete": "off"
+      },
+      "correctness": {
+        // Specifying a radix disables interpretation of 0x as a number (needed for backwards compat)
+        "useParseIntRadix": "off"
      },
      "complexity": {
-        "noExtraBooleanCast": "off",
+        "noExtraBooleanCast": "off"
      }
-    },
+    }
  },
  "javascript": {
    "formatter": {
@@ -23,12 +27,12 @@
      "jsxQuoteStyle": "double",
      "quoteStyle": "single",
      "bracketSpacing": true,
-      "arrowParentheses": "always",
-    },
+      "arrowParentheses": "always"
+    }
  },
  "json": {
    "formatter": {
-      "trailingCommas": "all",
-    },
-  },
+      "trailingCommas": "none"
+    }
+  }
 }
@@ -1,12 +1,14 @@
 {
  "name": "configure-aws-credentials",
  "description": "A GitHub Action to configure AWS credentials",
-  "version": "4.2.0",
+  "version": "5.0.0",
  "scripts": {
    "build": "tsc",
    "lint": "biome check --error-on-warnings ./src",
+    "lint:fix": "biome check --write ./src",
    "package": "npm run build && ncc build --license THIRD-PARTY -o dist && ncc build src/cleanup/index.ts -o dist/cleanup && cpy dist/THIRD-PARTY . && del-cli dist/THIRD-PARTY",
-    "test": "npm run lint && vitest run && npm run build"
+    "test": "npm run lint && vitest run && npm run build",
+    "clean": "del-cli coverage test-reports node_modules"
  },
  "author": {
    "name": "Amazon.com, Inc. or its affiliates",
@@ -14,26 +16,26 @@
    "organization": true
  },
  "devDependencies": {
-    "@aws-sdk/credential-provider-env": "^3.515.0",
-    "@biomejs/biome": "1.9.4",
-    "@smithy/property-provider": "^4.0.1",
-    "@types/node": "^22.15.11",
+    "@aws-sdk/credential-provider-env": "^3.879.0",
+    "@biomejs/biome": "2.2.2",
+    "@smithy/property-provider": "^4.0.3",
+    "@types/node": "^24.3.0",
    "@vercel/ncc": "^0.38.3",
-    "@vitest/coverage-v8": "^3.1.2",
+    "@vitest/coverage-v8": "^3.2.4",
    "aws-sdk-client-mock": "^4.1.0",
-    "cpy-cli": "^5.0.0",
+    "cpy-cli": "^6.0.0",
    "del-cli": "^6.0.0",
    "json-schema": "^0.4.0",
-    "memfs": "^4.17.1",
+    "memfs": "^4.38.2",
    "standard-version": "^9.5.0",
    "typescript": "^5.8.3",
-    "vitest": "^3.1.2"
+    "vitest": "^3.2.4"
  },
  "dependencies": {
    "@actions/core": "^1.11.1",
-    "@aws-sdk/client-sts": "^3.803.0",
-    "@smithy/node-http-handler": "^4.0.1",
-    "https-proxy-agent": "^5.0.1"
+    "@aws-sdk/client-sts": "^3.873.0",
+    "@smithy/node-http-handler": "^4.1.1",
+    "https-proxy-agent": "^7.0.6"
  },
  "keywords": [
    "aws",
@@ -6,8 +6,10 @@
      "bump-minor-pre-major": false,
      "bump-patch-for-minor-pre-major": false,
      "draft": false,
-      "prerelease": false
+      "prerelease": false,
+      "exclude-paths": [".github", "dist"]
    }
  },
+  "last-release-sha": "7474bc4690e29a8392af63c5b98e7449536d5c3a",
  "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"
 }
@@ -3,7 +3,7 @@ import { STSClient } from '@aws-sdk/client-sts';
 import type { AwsCredentialIdentity } from '@aws-sdk/types';
 import { NodeHttpHandler } from '@smithy/node-http-handler';
 import { HttpsProxyAgent } from 'https-proxy-agent';
-import { errorMessage } from './helpers';
+import { errorMessage, getCallerIdentity } from './helpers';

 const USER_AGENT = 'configure-aws-credentials-for-github-actions';

@@ -40,7 +40,11 @@ export class CredentialsClient {
    return this._stsClient;
  }

-  public async validateCredentials(expectedAccessKeyId?: string, roleChaining?: boolean) {
+  public async validateCredentials(
+    expectedAccessKeyId?: string,
+    roleChaining?: boolean,
+    expectedAccountIds?: string[],
+  ) {
    let credentials: AwsCredentialIdentity;
    try {
      credentials = await this.loadCredentials();
@@ -50,13 +54,27 @@ export class CredentialsClient {
    } catch (error) {
      throw new Error(`Credentials could not be loaded, please check your action inputs: ${errorMessage(error)}`);
    }
+    if (expectedAccountIds && expectedAccountIds.length > 0 && expectedAccountIds[0] !== '') {
+      let callerIdentity: Awaited<ReturnType<typeof getCallerIdentity>>;
+      try {
+        callerIdentity = await getCallerIdentity(this.stsClient);
+      } catch (error) {
+        throw new Error(`Could not validate account ID of credentials: ${errorMessage(error)}`);
+      }
+      if (!callerIdentity.Account || !expectedAccountIds.includes(callerIdentity.Account)) {
+        throw new Error(
+          `The account ID of the provided credentials (${
+            callerIdentity.Account ?? 'unknown'
+          }) does not match any of the expected account IDs: ${expectedAccountIds.join(', ')}`,
+        );
+      }
+    }

    if (!roleChaining) {
      const actualAccessKeyId = credentials.accessKeyId;
-
      if (expectedAccessKeyId && expectedAccessKeyId !== actualAccessKeyId) {
        throw new Error(
-          'Unexpected failure: Credentials loaded by the SDK do not match the access key ID configured by the action',
+          'Credentials loaded by the SDK do not match the expected access key ID configured by the action',
        );
      }
    }
@@ -142,8 +142,11 @@ export async function assumeRole(params: assumeRoleParams) {
    PolicyArns: managedSessionPolicies?.length ? managedSessionPolicies : undefined,
  };
  const keys = Object.keys(commonAssumeRoleParams) as Array<keyof typeof commonAssumeRoleParams>;
-  // biome-ignore lint/complexity/noForEach: Legacy code
-  keys.forEach((k) => commonAssumeRoleParams[k] === undefined && delete commonAssumeRoleParams[k]);
+  keys.forEach((k) => {
+    if (commonAssumeRoleParams[k] === undefined) {
+      delete commonAssumeRoleParams[k];
+    }
+  });

  // Instantiate STS client
  const stsClient = credentialsClient.stsClient;
@@ -1,5 +1,5 @@
 import * as core from '@actions/core';
-import { errorMessage } from '../helpers';
+import { errorMessage, getBooleanInput } from '../helpers';

 /**
 * When the GitHub Actions job is done, clean up any environment variables that
@@ -13,20 +13,24 @@ import { errorMessage } from '../helpers';
 */

 export function cleanup() {
-  try {
-    // The GitHub Actions toolkit does not have an option to completely unset
-    // environment variables, so we overwrite the current value with an empty
-    // string. The AWS CLI and AWS SDKs will behave correctly: they treat an
-    // empty string value as if the environment variable does not exist.
-    core.exportVariable('AWS_ACCESS_KEY_ID', '');
-    core.exportVariable('AWS_SECRET_ACCESS_KEY', '');
-    core.exportVariable('AWS_SESSION_TOKEN', '');
-    core.exportVariable('AWS_DEFAULT_REGION', '');
-    core.exportVariable('AWS_REGION', '');
-  } catch (error) {
-    core.setFailed(errorMessage(error));
+  // Only attempt to change environment variables if we changed them in the first place
+  if (getBooleanInput('output-env-credentials', { required: false, default: true })) {
+    try {
+      // The GitHub Actions toolkit does not have an option to completely unset
+      // environment variables, so we overwrite the current value with an empty
+      // string. The AWS CLI and AWS SDKs will behave correctly: they treat an
+      // empty string value as if the environment variable does not exist.
+      core.exportVariable('AWS_ACCESS_KEY_ID', '');
+      core.exportVariable('AWS_SECRET_ACCESS_KEY', '');
+      core.exportVariable('AWS_SESSION_TOKEN', '');
+      core.exportVariable('AWS_DEFAULT_REGION', '');
+      core.exportVariable('AWS_REGION', '');
+    } catch (error) {
+      core.setFailed(errorMessage(error));
+    }
  }
 }
+
 /* c8 ignore start */
 if (require.main === module) {
  try {
@@ -1,5 +1,5 @@
 import * as core from '@actions/core';
-import type { Credentials } from '@aws-sdk/client-sts';
+import type { Credentials, STSClient } from '@aws-sdk/client-sts';
 import { GetCallerIdentityCommand } from '@aws-sdk/client-sts';
 import type { CredentialsClient } from './CredentialsClient';

@@ -29,32 +29,51 @@ export function translateEnvVariables() {
    'SPECIAL_CHARACTERS_WORKAROUND',
    'USE_EXISTING_CREDENTIALS',
  ];
+  // Treat HTTPS_PROXY as HTTP_PROXY. Precedence is HTTPS_PROXY > HTTP_PROXY
+  if (process.env.HTTPS_PROXY) process.env.HTTP_PROXY = process.env.HTTPS_PROXY;
+
  for (const envVar of envVars) {
    if (process.env[envVar]) {
-      process.env[`INPUT_${envVar.replace(/_/g, '-')}`] = process.env[envVar];
+      const inputKey = `INPUT_${envVar.replace(/_/g, '-')}`;
+      process.env[inputKey] = process.env[inputKey] || process.env[envVar];
    }
  }
 }

 // Configure the AWS CLI and AWS SDKs using environment variables and set them as secrets.
 // Setting the credentials as secrets masks them in Github Actions logs
-export function exportCredentials(creds?: Partial<Credentials>, outputCredentials?: boolean) {
+export function exportCredentials(
+  creds?: Partial<Credentials>,
+  outputCredentials?: boolean,
+  outputEnvCredentials?: boolean,
+) {
  if (creds?.AccessKeyId) {
    core.setSecret(creds.AccessKeyId);
-    core.exportVariable('AWS_ACCESS_KEY_ID', creds.AccessKeyId);
  }

  if (creds?.SecretAccessKey) {
    core.setSecret(creds.SecretAccessKey);
-    core.exportVariable('AWS_SECRET_ACCESS_KEY', creds.SecretAccessKey);
  }

  if (creds?.SessionToken) {
    core.setSecret(creds.SessionToken);
-    core.exportVariable('AWS_SESSION_TOKEN', creds.SessionToken);
-  } else if (process.env.AWS_SESSION_TOKEN) {
-    // clear session token from previous credentials action
-    core.exportVariable('AWS_SESSION_TOKEN', '');
+  }
+
+  if (outputEnvCredentials) {
+    if (creds?.AccessKeyId) {
+      core.exportVariable('AWS_ACCESS_KEY_ID', creds.AccessKeyId);
+    }
+
+    if (creds?.SecretAccessKey) {
+      core.exportVariable('AWS_SECRET_ACCESS_KEY', creds.SecretAccessKey);
+    }
+
+    if (creds?.SessionToken) {
+      core.exportVariable('AWS_SESSION_TOKEN', creds.SessionToken);
+    } else if (process.env.AWS_SESSION_TOKEN) {
+      // clear session token from previous credentials action
+      core.exportVariable('AWS_SESSION_TOKEN', '');
+    }
  }

  if (outputCredentials) {
@@ -73,31 +92,42 @@ export function exportCredentials(creds?: Partial<Credentials>, outputCredential
  }
 }

-export function unsetCredentials() {
-  core.exportVariable('AWS_ACCESS_KEY_ID', '');
-  core.exportVariable('AWS_SECRET_ACCESS_KEY', '');
-  core.exportVariable('AWS_SESSION_TOKEN', '');
-  core.exportVariable('AWS_REGION', '');
-  core.exportVariable('AWS_DEFAULT_REGION', '');
+export function unsetCredentials(outputEnvCredentials?: boolean) {
+  if (outputEnvCredentials) {
+    core.exportVariable('AWS_ACCESS_KEY_ID', '');
+    core.exportVariable('AWS_SECRET_ACCESS_KEY', '');
+    core.exportVariable('AWS_SESSION_TOKEN', '');
+    core.exportVariable('AWS_REGION', '');
+    core.exportVariable('AWS_DEFAULT_REGION', '');
+  }
 }

-export function exportRegion(region: string) {
-  core.exportVariable('AWS_DEFAULT_REGION', region);
-  core.exportVariable('AWS_REGION', region);
+export function exportRegion(region: string, outputEnvCredentials?: boolean) {
+  if (outputEnvCredentials) {
+    core.exportVariable('AWS_DEFAULT_REGION', region);
+    core.exportVariable('AWS_REGION', region);
+  }
+}
+
+export async function getCallerIdentity(client: STSClient): Promise<{ Account: string; Arn: string; UserId?: string }> {
+  const identity = await client.send(new GetCallerIdentityCommand({}));
+  if (!identity.Account || !identity.Arn) {
+    throw new Error('Could not get Account ID or ARN from STS. Did you set credentials?');
+  }
+  return { Account: identity.Account, Arn: identity.Arn, UserId: identity.UserId };
 }

 // Obtains account ID from STS Client and sets it as output
 export async function exportAccountId(credentialsClient: CredentialsClient, maskAccountId?: boolean) {
-  const client = credentialsClient.stsClient;
-  const identity = await client.send(new GetCallerIdentityCommand({}));
+  const identity = await getCallerIdentity(credentialsClient.stsClient);
  const accountId = identity.Account;
-  if (!accountId) {
-    throw new Error('Could not get Account ID from STS. Did you set credentials?');
-  }
+  const arn = identity.Arn;
  if (maskAccountId) {
    core.setSecret(accountId);
+    core.setSecret(arn);
  }
  core.setOutput('aws-account-id', accountId);
+  core.setOutput('authenticated-arn', arn);
  return accountId;
 }

@@ -158,7 +188,6 @@ export async function retryAndBackoff<T>(
    }
    // It's retryable, so sleep and retry.
    await sleep(Math.random() * (2 ** retries * base));
-    // biome-ignore lint/style/noParameterAssign: This is a loop variable
    retries += 1;
    if (retries >= maxRetries) {
      throw err;
@@ -189,3 +218,32 @@ export async function areCredentialsValid(credentialsClient: CredentialsClient)
    return false;
  }
 }
+
+/**
+ * Like core.getBooleanInput, but respects the required option.
+ *
+ * From https://github.com/actions/toolkit/blob/6876e2a664ec02908178087905b9155e9892a437/packages/core/src/core.ts
+ *
+ * Gets the input value of the boolean type in the YAML 1.2 "core schema" specification.
+ * Support boolean input list: `true | True | TRUE | false | False | FALSE` .
+ * The return value is also in boolean type.
+ * ref: https://yaml.org/spec/1.2/spec.html#id2804923
+ *
+ * @param     name     name of the input to get
+ * @param     options  optional. See core.InputOptions. Also supports optional 'default' if the input is not set
+ * @returns   boolean
+ */
+export function getBooleanInput(name: string, options?: core.InputOptions & { default?: boolean }): boolean {
+  const trueValue = ['true', 'True', 'TRUE'];
+  const falseValue = ['false', 'False', 'FALSE'];
+  const optionsWithoutDefault = { ...options };
+  delete optionsWithoutDefault.default;
+  const val = core.getInput(name, optionsWithoutDefault);
+  if (trueValue.includes(val)) return true;
+  if (falseValue.includes(val)) return false;
+  if (val === '') return options?.default ?? false;
+  throw new TypeError(
+    `Input does not meet YAML 1.2 "Core Schema" specification: ${name}\n` +
+      `Support boolean input list: \`true | True | TRUE | false | False | FALSE\``,
+  );
+}
@@ -1,13 +1,14 @@
 import * as core from '@actions/core';
 import type { AssumeRoleCommandOutput } from '@aws-sdk/client-sts';
-import { CredentialsClient } from './CredentialsClient';
 import { assumeRole } from './assumeRole';
+import { CredentialsClient } from './CredentialsClient';
 import {
  areCredentialsValid,
  errorMessage,
  exportAccountId,
  exportCredentials,
  exportRegion,
+  getBooleanInput,
  retryAndBackoff,
  translateEnvVariables,
  unsetCredentials,
@@ -22,66 +23,57 @@ export async function run() {
  try {
    translateEnvVariables();
    // Get inputs
+    // Undefined inputs are empty strings ( or empty arrays)
    const AccessKeyId = core.getInput('aws-access-key-id', { required: false });
-    const SecretAccessKey = core.getInput('aws-secret-access-key', {
-      required: false,
-    });
-    const sessionTokenInput = core.getInput('aws-session-token', {
-      required: false,
-    });
+    const SecretAccessKey = core.getInput('aws-secret-access-key', { required: false });
+    const sessionTokenInput = core.getInput('aws-session-token', { required: false });
    const SessionToken = sessionTokenInput === '' ? undefined : sessionTokenInput;
    const region = core.getInput('aws-region', { required: true });
    const roleToAssume = core.getInput('role-to-assume', { required: false });
    const audience = core.getInput('audience', { required: false });
-    const maskAccountIdInput = core.getInput('mask-aws-account-id', { required: false }) || 'false';
-    const maskAccountId = maskAccountIdInput.toLowerCase() === 'true';
-    const roleExternalId = core.getInput('role-external-id', {
-      required: false,
-    });
-    const webIdentityTokenFile = core.getInput('web-identity-token-file', {
-      required: false,
-    });
+    const maskAccountId = getBooleanInput('mask-aws-account-id', { required: false });
+    const roleExternalId = core.getInput('role-external-id', { required: false });
+    const webIdentityTokenFile = core.getInput('web-identity-token-file', { required: false });
    const roleDuration =
      Number.parseInt(core.getInput('role-duration-seconds', { required: false })) || DEFAULT_ROLE_DURATION;
    const roleSessionName = core.getInput('role-session-name', { required: false }) || ROLE_SESSION_NAME;
-    const roleSkipSessionTaggingInput = core.getInput('role-skip-session-tagging', { required: false }) || 'false';
-    const roleSkipSessionTagging = roleSkipSessionTaggingInput.toLowerCase() === 'true';
-    const proxyServer = core.getInput('http-proxy', { required: false });
-    const inlineSessionPolicy = core.getInput('inline-session-policy', {
-      required: false,
+    const roleSkipSessionTagging = getBooleanInput('role-skip-session-tagging', { required: false });
+    const proxyServer = core.getInput('http-proxy', { required: false }) || process.env.HTTP_PROXY;
+    const inlineSessionPolicy = core.getInput('inline-session-policy', { required: false });
+    const managedSessionPolicies = core.getMultilineInput('managed-session-policies', { required: false }).map((p) => {
+      return { arn: p };
    });
-    const managedSessionPoliciesInput = core.getMultilineInput('managed-session-policies', { required: false });
-    const managedSessionPolicies: { arn: string }[] = [];
-    const roleChainingInput = core.getInput('role-chaining', { required: false }) || 'false';
-    const roleChaining = roleChainingInput.toLowerCase() === 'true';
-    const outputCredentialsInput = core.getInput('output-credentials', { required: false }) || 'false';
-    const outputCredentials = outputCredentialsInput.toLowerCase() === 'true';
-    const unsetCurrentCredentialsInput = core.getInput('unset-current-credentials', { required: false }) || 'false';
-    const unsetCurrentCredentials = unsetCurrentCredentialsInput.toLowerCase() === 'true';
-    const disableRetryInput = core.getInput('disable-retry', { required: false }) || 'false';
-    let disableRetry = disableRetryInput.toLowerCase() === 'true';
-    const specialCharacterWorkaroundInput =
-      core.getInput('special-characters-workaround', { required: false }) || 'false';
-    const specialCharacterWorkaround = specialCharacterWorkaroundInput.toLowerCase() === 'true';
-    const useExistingCredentialsInput = core.getInput('use-existing-credentials', { required: false }) || 'false';
-    const useExistingCredentials = useExistingCredentialsInput.toLowerCase() === 'true';
+    const roleChaining = getBooleanInput('role-chaining', { required: false });
+    const outputCredentials = getBooleanInput('output-credentials', { required: false });
+    const outputEnvCredentials = getBooleanInput('output-env-credentials', { required: false, default: true });
+    const unsetCurrentCredentials = getBooleanInput('unset-current-credentials', { required: false });
+    let disableRetry = getBooleanInput('disable-retry', { required: false });
+    const specialCharacterWorkaround = getBooleanInput('special-characters-workaround', { required: false });
+    const useExistingCredentials = core.getInput('use-existing-credentials', { required: false });
    let maxRetries = Number.parseInt(core.getInput('retry-max-attempts', { required: false })) || 12;
-    switch (true) {
-      case specialCharacterWorkaround:
-        // 😳
-        disableRetry = false;
-        maxRetries = 12;
-        break;
-      case maxRetries < 1:
-        maxRetries = 1;
-        break;
+    const expectedAccountIds = core
+      .getInput('allowed-account-ids', { required: false })
+      .split(',')
+      .map((s) => s.trim());
+    const forceSkipOidc = getBooleanInput('force-skip-oidc', { required: false });
+
+    if (forceSkipOidc && roleToAssume && !AccessKeyId && !webIdentityTokenFile) {
+      throw new Error(
+        "If 'force-skip-oidc' is true and 'role-to-assume' is set, 'aws-access-key-id' or 'web-identity-token-file' must be set",
+      );
    }
-    for (const managedSessionPolicy of managedSessionPoliciesInput) {
-      managedSessionPolicies.push({ arn: managedSessionPolicy });
+
+    if (specialCharacterWorkaround) {
+      // 😳
+      disableRetry = false;
+      maxRetries = 12;
+    } else if (maxRetries < 1) {
+      maxRetries = 1;
    }

    // Logic to decide whether to attempt to use OIDC or not
    const useGitHubOIDCProvider = () => {
+      if (forceSkipOidc) return false;
      // The `ACTIONS_ID_TOKEN_REQUEST_TOKEN` environment variable is set when the `id-token` permission is granted.
      // This is necessary to authenticate with OIDC, but not strictly set just for OIDC. If it is not set and all other
      // checks pass, it is likely but not guaranteed that the user needs but lacks this permission in their workflow.
@@ -108,13 +100,13 @@ export async function run() {
    };

    if (unsetCurrentCredentials) {
-      unsetCredentials();
+      unsetCredentials(outputEnvCredentials);
    }

    if (!region.match(REGION_REGEX)) {
      throw new Error(`Region is not valid: ${region}`);
    }
-    exportRegion(region);
+    exportRegion(region, outputEnvCredentials);

    // Instantiate credentials client
    const credentialsClient = new CredentialsClient({ region, proxyServer });
@@ -153,10 +145,10 @@ export async function run() {
      // Plus, in the assume role case, if the AssumeRole call fails, we want
      // the source credentials to already be masked as secrets
      // in any error messages.
-      exportCredentials({ AccessKeyId, SecretAccessKey, SessionToken });
+      exportCredentials({ AccessKeyId, SecretAccessKey, SessionToken }, outputCredentials, outputEnvCredentials);
    } else if (!webIdentityTokenFile && !roleChaining) {
      // Proceed only if credentials can be picked up
-      await credentialsClient.validateCredentials();
+      await credentialsClient.validateCredentials(undefined, roleChaining, expectedAccountIds);
      sourceAccountId = await exportAccountId(credentialsClient, maskAccountId);
    }

@@ -164,7 +156,7 @@ export async function run() {
      // Validate that the SDK can actually pick up credentials.
      // This validates cases where this action is using existing environment credentials,
      // and cases where the user intended to provide input credentials but the secrets inputs resolved to empty strings.
-      await credentialsClient.validateCredentials(AccessKeyId, roleChaining);
+      await credentialsClient.validateCredentials(AccessKeyId, roleChaining, expectedAccountIds);
      sourceAccountId = await exportAccountId(credentialsClient, maskAccountId);
    }

@@ -193,15 +185,21 @@ export async function run() {
        );
      } while (specialCharacterWorkaround && !verifyKeys(roleCredentials.Credentials));
      core.info(`Authenticated as assumedRoleId ${roleCredentials.AssumedRoleUser?.AssumedRoleId}`);
-      exportCredentials(roleCredentials.Credentials, outputCredentials);
+      exportCredentials(roleCredentials.Credentials, outputCredentials, outputEnvCredentials);
      // We need to validate the credentials in 2 of our use-cases
      // First: self-hosted runners. If the GITHUB_ACTIONS environment variable
      //  is set to `true` then we are NOT in a self-hosted runner.
      // Second: Customer provided credentials manually (IAM User keys stored in GH Secrets)
      if (!process.env.GITHUB_ACTIONS || AccessKeyId) {
-        await credentialsClient.validateCredentials(roleCredentials.Credentials?.AccessKeyId);
+        await credentialsClient.validateCredentials(
+          roleCredentials.Credentials?.AccessKeyId,
+          roleChaining,
+          expectedAccountIds,
+        );
+      }
+      if (outputEnvCredentials) {
+        await exportAccountId(credentialsClient, maskAccountId);
      }
-      await exportAccountId(credentialsClient, maskAccountId);
    } else {
      core.info('Proceeding with IAM user credentials');
    }
@@ -1,8 +1,8 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import { cleanup } from '../src/cleanup';
 import * as core from '@actions/core';
-import { mockClient } from 'aws-sdk-client-mock';
 import { STSClient } from '@aws-sdk/client-sts';
+import { mockClient } from 'aws-sdk-client-mock';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { cleanup } from '../src/cleanup';
 import mocks from './mockinputs.test';

 const mockedSTSClient = mockClient(STSClient);
@@ -45,4 +45,9 @@ describe('Configure AWS Credentials cleanup', {}, () => {
    cleanup();
    expect(core.setFailed).toHaveBeenCalled();
  });
+  it(`doesn't export credentials as empty env variables if asked not to`, {}, () => {
+    vi.spyOn(core, 'getInput').mockImplementation(mocks.getInput(mocks.NO_ENV_CREDS_INPUTS));
+    cleanup();
+    expect(core.exportVariable).toHaveBeenCalledTimes(0);
+  });
 });
@@ -1,7 +1,7 @@
-import { describe, it, expect, vi } from 'vitest';
-import * as helpers from '../src/helpers';
+import { beforeEach } from 'node:test';
 import * as core from '@actions/core';
-import { before, beforeEach } from 'node:test';
+import { describe, expect, it, vi } from 'vitest';
+import * as helpers from '../src/helpers';

 describe('Configure AWS Credentials helpers', {}, () => {
  beforeEach(() => {
@@ -11,9 +11,9 @@ describe('Configure AWS Credentials helpers', {}, () => {
    const actor = 'actor[bot]';
    expect(helpers.sanitizeGitHubVariables(actor)).toBe('actor_bot_');
  });
-  it('can sleep', {}, () => {
+  it('can sleep', {}, async () => {
    const sleep = helpers.defaultSleep(10);
-    expect(Promise.race([sleep, new Promise((_, reject) => setTimeout(reject, 20))])).resolves.toBe(undefined);
+    await expect(Promise.race([sleep, new Promise((_, reject) => setTimeout(reject, 20))])).resolves.toBe(undefined);
  });
  it('removes special characters from workflow names', {}, () => {
    expect(helpers.sanitizeGitHubVariables('sdf234@#$%$^&*()_+{}|:"<>?')).toEqual('sdf234@__________+___:____');
@@ -27,7 +27,11 @@ describe('Configure AWS Credentials helpers', {}, () => {
    vi.spyOn(core, 'setOutput').mockImplementation(() => {});
    vi.spyOn(core, 'setSecret').mockImplementation(() => {});
    vi.spyOn(core, 'exportVariable').mockImplementation(() => {});
-    helpers.exportCredentials({ AccessKeyId: 'test', SecretAccessKey: 'test', SessionToken: 'test', Expiration: new Date(8640000000000000) }, true);
+    helpers.exportCredentials(
+      { AccessKeyId: 'test', SecretAccessKey: 'test', SessionToken: 'test', Expiration: new Date(8640000000000000) },
+      true,
+      true,
+    );
    expect(core.setOutput).toHaveBeenCalledTimes(4);
    expect(core.setSecret).toHaveBeenCalledTimes(3);
    expect(core.exportVariable).toHaveBeenCalledTimes(3);
@@ -42,4 +46,19 @@ describe('Configure AWS Credentials helpers', {}, () => {
    expect(process.env.AWS_DEFAULT_REGION).toBeUndefined;
    process.env = env;
  });
+  it(`won't output credentials to env if told not to`, {}, () => {
+    vi.spyOn(core, 'setOutput').mockImplementation(() => {});
+    vi.spyOn(core, 'setSecret').mockImplementation(() => {});
+    vi.spyOn(core, 'exportVariable').mockImplementation(() => {});
+    helpers.exportCredentials(
+      { AccessKeyId: 'test', SecretAccessKey: 'test', SessionToken: 'test', Expiration: new Date(8640000000000000) },
+      true,
+      false,
+    );
+    helpers.unsetCredentials(false);
+    helpers.exportRegion('fake-test-region', false);
+    expect(core.setOutput).toHaveBeenCalledTimes(4);
+    expect(core.setSecret).toHaveBeenCalledTimes(3);
+    expect(core.exportVariable).toHaveBeenCalledTimes(0);
+  });
 });
@@ -1,17 +1,16 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import * as core from '@actions/core';
 import {
  AssumeRoleCommand,
  AssumeRoleWithWebIdentityCommand,
  GetCallerIdentityCommand,
  STSClient,
 } from '@aws-sdk/client-sts';
-import { fs, vol } from 'memfs';
-import * as core from '@actions/core';
-import mocks from './mockinputs.test';
 import { mockClient } from 'aws-sdk-client-mock';
-import { run } from '../src/index';
+import { fs, vol } from 'memfs';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { CredentialsClient } from '../src/CredentialsClient';
-import { before } from 'node:test';
+import { run } from '../src/index';
+import mocks from './mockinputs.test';

 const mockedSTSClient = mockClient(STSClient);

@@ -48,7 +47,7 @@ describe('Configure AWS Credentials', {}, () => {
      expect(core.info).toHaveBeenCalledWith('Authenticated as assumedRoleId AROAFAKEASSUMEDROLEID');
      expect(core.info).toHaveBeenCalledTimes(2);
      expect(core.setOutput).toHaveBeenCalledWith('aws-account-id', '111111111111');
-      expect(core.setOutput).toHaveBeenCalledOnce();
+      expect(core.setOutput).toHaveBeenCalledTimes(2);
      expect(core.setSecret).toHaveBeenCalledWith('STSAWSACCESSKEYID');
      expect(core.setSecret).toHaveBeenCalledWith('STSAWSSECRETACCESSKEY');
      expect(core.setSecret).toHaveBeenCalledWith('STSAWSSESSIONTOKEN');
@@ -72,7 +71,7 @@ describe('Configure AWS Credentials', {}, () => {
      expect(core.info).toHaveBeenCalledWith('Authenticated as assumedRoleId AROAFAKEASSUMEDROLEID');
      expect(core.info).toHaveBeenCalledTimes(3);
      expect(core.setOutput).toHaveBeenCalledWith('aws-account-id', '111111111111');
-      expect(core.setOutput).toHaveBeenCalledOnce();
+      expect(core.setOutput).toHaveBeenCalledTimes(2);
      expect(core.setSecret).toHaveBeenCalledWith('STSAWSACCESSKEYID');
      expect(core.setSecret).toHaveBeenCalledWith('STSAWSSECRETACCESSKEY');
      expect(core.setSecret).toHaveBeenCalledWith('STSAWSSESSIONTOKEN');
@@ -107,7 +106,7 @@ describe('Configure AWS Credentials', {}, () => {
      expect(core.setSecret).toHaveBeenCalledWith('MYAWSSECRETACCESSKEY');
      expect(core.setSecret).toHaveBeenCalledTimes(2);
      expect(core.setOutput).toHaveBeenCalledWith('aws-account-id', '111111111111');
-      expect(core.setOutput).toHaveBeenCalledOnce();
+      expect(core.setOutput).toHaveBeenCalledTimes(2);
      expect(core.info).toHaveBeenCalledWith('Proceeding with IAM user credentials');
      expect(core.info).toHaveBeenCalledOnce();
      expect(core.setFailed).not.toHaveBeenCalled();
@@ -141,7 +140,7 @@ describe('Configure AWS Credentials', {}, () => {
      expect(core.setSecret).toHaveBeenCalledWith('MYAWSSECRETACCESSKEY');
      expect(core.setSecret).toHaveBeenCalledTimes(5);
      expect(core.setOutput).toHaveBeenCalledWith('aws-account-id', '111111111111');
-      expect(core.setOutput).toHaveBeenCalledTimes(2);
+      expect(core.setOutput).toHaveBeenCalledTimes(4);
      expect(core.info).toHaveBeenCalledWith('Assuming role with user credentials');
      expect(core.info).toHaveBeenCalledWith('Authenticated as assumedRoleId AROAFAKEASSUMEDROLEID');
      expect(core.info).toHaveBeenCalledTimes(2);
@@ -174,7 +173,7 @@ describe('Configure AWS Credentials', {}, () => {
      expect(core.setSecret).toHaveBeenCalledWith('STSAWSSESSIONTOKEN');
      expect(core.setSecret).toHaveBeenCalledTimes(3);
      expect(core.setOutput).toHaveBeenCalledWith('aws-account-id', '111111111111');
-      expect(core.setOutput).toHaveBeenCalledTimes(1);
+      expect(core.setOutput).toHaveBeenCalledTimes(2);
      expect(core.setFailed).not.toHaveBeenCalled();
    });
  });
@@ -205,7 +204,7 @@ describe('Configure AWS Credentials', {}, () => {
      expect(core.setSecret).toHaveBeenCalledWith('STSAWSSESSIONTOKEN');
      expect(core.setSecret).toHaveBeenCalledTimes(3);
      expect(core.setOutput).toHaveBeenCalledWith('aws-account-id', '111111111111');
-      expect(core.setOutput).toHaveBeenCalledTimes(2);
+      expect(core.setOutput).toHaveBeenCalledTimes(4);
      expect(core.setFailed).not.toHaveBeenCalled();
    });
    it('exports environment variables from inputs', {}, async () => {
@@ -238,7 +237,7 @@ describe('Configure AWS Credentials', {}, () => {
      expect(core.setSecret).toHaveBeenCalledWith('STSAWSSESSIONTOKEN');
      expect(core.setSecret).toHaveBeenCalledTimes(6);
      expect(core.setOutput).toHaveBeenCalledWith('aws-account-id', '111111111111');
-      expect(core.setOutput).toHaveBeenCalledTimes(2);
+      expect(core.setOutput).toHaveBeenCalledTimes(4);
      expect(core.setFailed).not.toHaveBeenCalled();
    });
  });
@@ -300,17 +299,397 @@ describe('Configure AWS Credentials', {}, () => {
      await run();
      expect(core.setFailed).toHaveBeenCalled();
    });
-    it('gets new creds if told to reuse existing but they\'re invalid', {}, async () => {
+    it("gets new creds if told to reuse existing but they're invalid", {}, async () => {
      vi.spyOn(core, 'getInput').mockImplementation(mocks.getInput(mocks.USE_EXISTING_CREDENTIALS_INPUTS));
      mockedSTSClient.on(GetCallerIdentityCommand).rejects();
      await run();
-      expect(core.notice).toHaveBeenCalledWith('No valid credentials exist. Running as normal.')
+      expect(core.notice).toHaveBeenCalledWith('No valid credentials exist. Running as normal.');
    });
-    it('doesn\'t get new creds if there are already valid ones and we said use them', {}, async () => {
+    it("doesn't get new creds if there are already valid ones and we said use them", {}, async () => {
      vi.spyOn(core, 'getInput').mockImplementation(mocks.getInput(mocks.USE_EXISTING_CREDENTIALS_INPUTS));
      mockedSTSClient.on(GetCallerIdentityCommand).resolves(mocks.outputs.GET_CALLER_IDENTITY);
      await run();
      expect(core.setFailed).not.toHaveBeenCalled();
-    })
+    });
+    it("doesn't export credentials as environment variables if told not to", {}, async () => {
+      mockedSTSClient.on(AssumeRoleWithWebIdentityCommand).resolvesOnce(mocks.outputs.STS_CREDENTIALS);
+      vi.spyOn(core, 'getInput').mockImplementation(mocks.getInput(mocks.NO_ENV_CREDS_INPUTS));
+      vi.spyOn(core, 'getIDToken').mockResolvedValue('testoidctoken');
+      process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN = 'fake-token';
+      await run();
+      expect(core.setSecret).toHaveBeenCalledTimes(3);
+      expect(core.exportVariable).toHaveBeenCalledTimes(0);
+      expect(core.setFailed).not.toHaveBeenCalled();
+    });
+    it('can export creds as step outputs without exporting as env variables', {}, async () => {
+      mockedSTSClient.on(AssumeRoleWithWebIdentityCommand).resolvesOnce(mocks.outputs.STS_CREDENTIALS);
+      vi.spyOn(core, 'getInput').mockImplementation(mocks.getInput(mocks.STEP_BUT_NO_ENV_INPUTS));
+      vi.spyOn(core, 'getIDToken').mockResolvedValue('testoidctoken');
+      process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN = 'fake-token';
+      await run();
+      expect(core.setSecret).toHaveBeenCalledTimes(3);
+      expect(core.exportVariable).toHaveBeenCalledTimes(0);
+      expect(core.setOutput).toHaveBeenCalledTimes(4);
+      expect(core.setFailed).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('Force Skip OIDC', {}, () => {
+    beforeEach(() => {
+      vi.clearAllMocks();
+      mockedSTSClient.reset();
+    });
+
+    it('skips OIDC when force-skip-oidc is true with IAM credentials', async () => {
+      vi.spyOn(core, 'getInput').mockImplementation(mocks.getInput({
+        ...mocks.IAM_ASSUMEROLE_INPUTS,
+        'force-skip-oidc': 'true'
+      }));
+      vi.spyOn(core, 'getIDToken').mockResolvedValue('testoidctoken');
+      mockedSTSClient.on(AssumeRoleCommand).resolves(mocks.outputs.STS_CREDENTIALS);
+      mockedSTSClient.on(GetCallerIdentityCommand).resolves({ ...mocks.outputs.GET_CALLER_IDENTITY });
+      // biome-ignore lint/suspicious/noExplicitAny: any required to mock private method
+      vi.spyOn(CredentialsClient.prototype as any, 'loadCredentials')
+        .mockResolvedValueOnce({ accessKeyId: 'MYAWSACCESSKEYID' })
+        .mockResolvedValueOnce({ accessKeyId: 'STSAWSACCESSKEYID' });
+      process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN = 'fake-token';
+      
+      await run();
+      expect(core.getIDToken).not.toHaveBeenCalled();
+      expect(core.setFailed).not.toHaveBeenCalled();
+    });
+
+    it('skips OIDC when force-skip-oidc is true with web identity token file', async () => {
+      vi.spyOn(core, 'getInput').mockImplementation(mocks.getInput({
+        ...mocks.WEBIDENTITY_TOKEN_FILE_INPUTS,
+        'force-skip-oidc': 'true'
+      }));
+      vi.spyOn(core, 'getIDToken').mockResolvedValue('testoidctoken');
+      mockedSTSClient.on(AssumeRoleWithWebIdentityCommand).resolves(mocks.outputs.STS_CREDENTIALS);
+      mockedSTSClient.on(GetCallerIdentityCommand).resolves({ ...mocks.outputs.GET_CALLER_IDENTITY });
+      process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN = 'fake-token';
+      vi.mock('node:fs');
+      vol.reset();
+      fs.mkdirSync('/home/github', { recursive: true });
+      fs.writeFileSync('/home/github/file.txt', 'test-token');
+      
+      await run();
+      expect(core.getIDToken).not.toHaveBeenCalled();
+      expect(core.info).toHaveBeenCalledWith('Assuming role with web identity token file');
+      expect(core.setFailed).not.toHaveBeenCalled();
+    });
+
+    it('fails when force-skip-oidc is true but no alternative credentials provided', async () => {
+      vi.spyOn(core, 'getInput').mockImplementation(mocks.getInput({
+        'role-to-assume': 'arn:aws:iam::111111111111:role/MY-ROLE',
+        'aws-region': 'fake-region-1',
+        'force-skip-oidc': 'true'
+      }));
+      process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN = 'fake-token';
+      
+      await run();
+      expect(core.setFailed).toHaveBeenCalledWith(
+        "If 'force-skip-oidc' is true and 'role-to-assume' is set, 'aws-access-key-id' or 'web-identity-token-file' must be set"
+      );
+    });
+
+    it('allows force-skip-oidc without role-to-assume', async () => {
+      vi.spyOn(core, 'getInput').mockImplementation(mocks.getInput({
+        ...mocks.IAM_USER_INPUTS,
+        'force-skip-oidc': 'true'
+      }));
+      vi.spyOn(core, 'getIDToken').mockResolvedValue('testoidctoken');
+      
+      mockedSTSClient.on(GetCallerIdentityCommand).resolves({ ...mocks.outputs.GET_CALLER_IDENTITY });
+      // biome-ignore lint/suspicious/noExplicitAny: any required to mock private method
+      vi.spyOn(CredentialsClient.prototype as any, 'loadCredentials').mockResolvedValue({
+        accessKeyId: 'MYAWSACCESSKEYID',
+      });
+      
+      process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN = 'fake-token';
+      
+      await run();
+      expect(core.getIDToken).not.toHaveBeenCalled();
+      expect(core.info).toHaveBeenCalledWith('Proceeding with IAM user credentials');
+      expect(core.setFailed).not.toHaveBeenCalled();
+    });
+
+    it('uses OIDC when force-skip-oidc is false (default behavior)', async () => {
+      vi.spyOn(core, 'getInput').mockImplementation(mocks.getInput({
+        ...mocks.GH_OIDC_INPUTS,
+        'force-skip-oidc': 'false'
+      }));
+      vi.spyOn(core, 'getIDToken').mockResolvedValue('testoidctoken');
+      mockedSTSClient.on(AssumeRoleWithWebIdentityCommand).resolves(mocks.outputs.STS_CREDENTIALS);
+      mockedSTSClient.on(GetCallerIdentityCommand).resolves({ ...mocks.outputs.GET_CALLER_IDENTITY });
+      process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN = 'fake-token';
+      
+      await run();
+      expect(core.getIDToken).toHaveBeenCalledWith('');
+      expect(core.info).toHaveBeenCalledWith('Assuming role with OIDC');
+      expect(core.setFailed).not.toHaveBeenCalled();
+    });
+
+    it('uses OIDC when force-skip-oidc is not set (default behavior)', async () => {
+      vi.spyOn(core, 'getInput').mockImplementation(mocks.getInput(mocks.GH_OIDC_INPUTS));
+      vi.spyOn(core, 'getIDToken').mockResolvedValue('testoidctoken');
+      mockedSTSClient.on(AssumeRoleWithWebIdentityCommand).resolves(mocks.outputs.STS_CREDENTIALS);
+      mockedSTSClient.on(GetCallerIdentityCommand).resolves({ ...mocks.outputs.GET_CALLER_IDENTITY });
+      process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN = 'fake-token';
+      
+      await run();
+      expect(core.getIDToken).toHaveBeenCalledWith('');
+      expect(core.info).toHaveBeenCalledWith('Assuming role with OIDC');
+      expect(core.setFailed).not.toHaveBeenCalled();
+    });
+
+    it('works with role chaining when force-skip-oidc is true', async () => {
+      vi.spyOn(core, 'getInput').mockImplementation(mocks.getInput({
+        ...mocks.EXISTING_ROLE_INPUTS,
+        'force-skip-oidc': 'true',
+        'aws-access-key-id': 'MYAWSACCESSKEYID',
+        'aws-secret-access-key': 'MYAWSSECRETACCESSKEY'
+      }));
+      vi.spyOn(core, 'getIDToken').mockResolvedValue('testoidctoken');
+      mockedSTSClient.on(AssumeRoleCommand).resolves(mocks.outputs.STS_CREDENTIALS);
+      mockedSTSClient.on(GetCallerIdentityCommand).resolves({ ...mocks.outputs.GET_CALLER_IDENTITY });
+      // biome-ignore lint/suspicious/noExplicitAny: any required to mock private method
+      vi.spyOn(CredentialsClient.prototype as any, 'loadCredentials')
+        .mockResolvedValueOnce({ accessKeyId: 'MYAWSACCESSKEYID' })
+        .mockResolvedValueOnce({ accessKeyId: 'STSAWSACCESSKEYID' });
+      process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN = 'fake-token';
+      
+      await run();
+      expect(core.getIDToken).not.toHaveBeenCalled();
+      expect(core.setFailed).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('Account ID Validation', {}, () => {  
+    beforeEach(() => {
+      vi.clearAllMocks();
+      mockedSTSClient.reset();
+    });
+    
+    it('succeeds when account ID matches allowed list', async () => {
+      vi.spyOn(core, 'getInput').mockImplementation(mocks.getInput({
+        ...mocks.IAM_USER_INPUTS,
+        'allowed-account-ids': '111111111111'
+      }));
+      mockedSTSClient.on(GetCallerIdentityCommand).resolves({ ...mocks.outputs.GET_CALLER_IDENTITY });
+      // biome-ignore lint/suspicious/noExplicitAny: any required to mock private method
+      vi.spyOn(CredentialsClient.prototype as any, 'loadCredentials').mockResolvedValue({
+        accessKeyId: 'MYAWSACCESSKEYID',
+      });
+      
+      await run();
+      expect(core.setFailed).not.toHaveBeenCalled();
+      expect(core.info).toHaveBeenCalledWith('Proceeding with IAM user credentials');
+    });
+
+    it('succeeds with multiple allowed account IDs when account matches', async () => {
+      vi.spyOn(core, 'getInput').mockImplementation(mocks.getInput({
+        ...mocks.IAM_USER_INPUTS,
+        'allowed-account-ids': '999999999999,111111111111,222222222222'
+      }));
+      mockedSTSClient.on(GetCallerIdentityCommand).resolves({ ...mocks.outputs.GET_CALLER_IDENTITY });
+      // biome-ignore lint/suspicious/noExplicitAny: any required to mock private method
+      vi.spyOn(CredentialsClient.prototype as any, 'loadCredentials').mockResolvedValue({
+        accessKeyId: 'MYAWSACCESSKEYID',
+      });
+      
+      await run();
+      expect(core.setFailed).not.toHaveBeenCalled();
+    });
+
+    it('fails when account ID does not match allowed list', async () => {
+      vi.spyOn(core, 'getInput').mockImplementation(mocks.getInput({
+        ...mocks.IAM_USER_INPUTS,
+        'allowed-account-ids': '999999999999'
+      }));
+      mockedSTSClient.on(GetCallerIdentityCommand).resolves({ ...mocks.outputs.GET_CALLER_IDENTITY });
+      // biome-ignore lint/suspicious/noExplicitAny: any required to mock private method
+      vi.spyOn(CredentialsClient.prototype as any, 'loadCredentials').mockResolvedValue({
+        accessKeyId: 'MYAWSACCESSKEYID',
+      });
+      
+      await run();
+      expect(core.setFailed).toHaveBeenCalledWith(
+        'The account ID of the provided credentials (111111111111) does not match any of the expected account IDs: 999999999999'
+      );
+    });
+
+    it('fails when account ID does not match any in multiple allowed accounts', async () => {
+      vi.spyOn(core, 'getInput').mockImplementation(mocks.getInput({
+        ...mocks.IAM_USER_INPUTS,
+        'allowed-account-ids': '999999999999,888888888888'
+      }));    
+    
+    mockedSTSClient.on(GetCallerIdentityCommand).resolves({ ...mocks.outputs.GET_CALLER_IDENTITY });
+      // biome-ignore lint/suspicious/noExplicitAny: any required to mock private method
+      vi.spyOn(CredentialsClient.prototype as any, 'loadCredentials').mockResolvedValue({
+        accessKeyId: 'MYAWSACCESSKEYID',
+      });    
+      
+      await run();
+      expect(core.setFailed).toHaveBeenCalledWith(
+        'The account ID of the provided credentials (111111111111) does not match any of the expected account IDs: 999999999999, 888888888888'
+      );
+    });
+
+    it('works with assume role when account ID matches', async () => {
+      vi.spyOn(core, 'getInput').mockImplementation(mocks.getInput({
+        ...mocks.IAM_ASSUMEROLE_INPUTS,
+        'allowed-account-ids': '111111111111'
+      }));
+      mockedSTSClient.on(AssumeRoleCommand).resolves(mocks.outputs.STS_CREDENTIALS);
+      mockedSTSClient.on(GetCallerIdentityCommand).resolves({ ...mocks.outputs.GET_CALLER_IDENTITY });
+      // biome-ignore lint/suspicious/noExplicitAny: any required to mock private method
+      vi.spyOn(CredentialsClient.prototype as any, 'loadCredentials')
+        .mockResolvedValueOnce({ accessKeyId: 'MYAWSACCESSKEYID' })
+        .mockResolvedValueOnce({ accessKeyId: 'STSAWSACCESSKEYID' });
+      
+      await run();
+      expect(core.setFailed).not.toHaveBeenCalled();
+      expect(core.info).toHaveBeenCalledWith('Authenticated as assumedRoleId AROAFAKEASSUMEDROLEID');
+    });
+
+    it('works with OIDC when account ID matches', async () => {
+      vi.spyOn(core, 'getInput').mockImplementation(mocks.getInput({
+        ...mocks.GH_OIDC_INPUTS,
+        'allowed-account-ids': '111111111111'
+      }));
+      vi.spyOn(core, 'getIDToken').mockResolvedValue('testoidctoken');
+      mockedSTSClient.on(AssumeRoleWithWebIdentityCommand).resolves(mocks.outputs.STS_CREDENTIALS);
+      mockedSTSClient.on(GetCallerIdentityCommand).resolves({ ...mocks.outputs.GET_CALLER_IDENTITY });
+      process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN = 'fake-token';
+      
+      await run();        
+            expect(core.setFailed).not.toHaveBeenCalled();
+      expect(core.info).toHaveBeenCalledWith('Authenticated as assumedRoleId AROAFAKEASSUMEDROLEID');
+    });
+
+    it('handles GetCallerIdentity API failure gracefully', async () => {
+      vi.spyOn(core, 'getInput').mockImplementation(mocks.getInput({
+        ...mocks.IAM_USER_INPUTS,
+        'allowed-account-ids': '111111111111'
+      }));
+      mockedSTSClient.on(GetCallerIdentityCommand).rejects(new Error('API Error'));
+      // biome-ignore lint/suspicious/noExplicitAny: any required to mock private method
+      vi.spyOn(CredentialsClient.prototype as any, 'loadCredentials').mockResolvedValue({
+        accessKeyId: 'MYAWSACCESSKEYID',
+      });
+      
+      await run();
+      expect(core.setFailed).toHaveBeenCalledWith('Could not validate account ID of credentials: API Error');
+    });
+
+    it('ignores validation when allowed-account-ids is empty', async () => {
+      vi.spyOn(core, 'getInput').mockImplementation(mocks.getInput({
+        ...mocks.IAM_USER_INPUTS,
+        'allowed-account-ids': ''
+      }));
+      mockedSTSClient.on(GetCallerIdentityCommand).resolves({ ...mocks.outputs.GET_CALLER_IDENTITY });
+      // biome-ignore lint/suspicious/noExplicitAny: any required to mock private method
+      vi.spyOn(CredentialsClient.prototype as any, 'loadCredentials').mockResolvedValue({
+        accessKeyId: 'MYAWSACCESSKEYID',
+      });
+      
+      await run();
+      expect(core.setFailed).not.toHaveBeenCalled();
+      expect(core.info).toHaveBeenCalledWith('Proceeding with IAM user credentials');
+    });
+
+    it('handles whitespace in allowed-account-ids input', async () => {
+      vi.spyOn(core, 'getInput').mockImplementation(mocks.getInput({
+        ...mocks.IAM_USER_INPUTS,
+        'allowed-account-ids': ' 111111111111 , 222222222222 '
+      }));
+      mockedSTSClient.on(GetCallerIdentityCommand).resolves({ ...mocks.outputs.GET_CALLER_IDENTITY });
+      // biome-ignore lint/suspicious/noExplicitAny: any required to mock private method
+      vi.spyOn(CredentialsClient.prototype as any, 'loadCredentials').mockResolvedValue({
+        accessKeyId: 'MYAWSACCESSKEYID',
+      });
+      
+      await run();
+      expect(core.setFailed).not.toHaveBeenCalled();
+    });
+  });    
+    
+  describe('HTTP Proxy Configuration', {}, () => {
+    beforeEach(() => {
+      vi.spyOn(core, 'getInput').mockImplementation(mocks.getInput(mocks.GH_OIDC_INPUTS));
+      vi.spyOn(core, 'getIDToken').mockResolvedValue('testoidctoken');
+      mockedSTSClient.on(GetCallerIdentityCommand).resolvesOnce({ ...mocks.outputs.GET_CALLER_IDENTITY });
+      mockedSTSClient.on(AssumeRoleWithWebIdentityCommand).resolvesOnce(mocks.outputs.STS_CREDENTIALS);
+      process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN = 'fake-token';
+    });
+
+    it('configures proxy from http-proxy input', async () => {
+      const infoSpy = vi.spyOn(core, 'info');
+      vi.spyOn(core, 'getInput').mockImplementation(
+        mocks.getInput({
+          ...mocks.GH_OIDC_INPUTS,
+          'http-proxy': 'http://proxy.example.com:8080'
+        })
+      );
+      
+      await run();
+      
+      expect(infoSpy).toHaveBeenCalledWith('Configuring proxy handler for STS client');
+      expect(core.setFailed).not.toHaveBeenCalled();
+    });
+
+    it('configures proxy from HTTP_PROXY environment variable', async () => {
+      const infoSpy = vi.spyOn(core, 'info');
+      process.env.HTTP_PROXY = 'http://proxy.example.com:8080';
+      
+      await run();
+      
+      expect(infoSpy).toHaveBeenCalledWith('Configuring proxy handler for STS client');
+      expect(core.setFailed).not.toHaveBeenCalled();
+    });
+
+    it('configures proxy from HTTPS_PROXY environment variable', async () => {
+      const infoSpy = vi.spyOn(core, 'info');
+      process.env.HTTPS_PROXY = 'https://proxy.example.com:8080';
+      
+      await run();
+      
+      expect(infoSpy).toHaveBeenCalledWith('Configuring proxy handler for STS client');
+      expect(core.setFailed).not.toHaveBeenCalled();
+    });
+
+    it('prioritizes http-proxy input over environment variables', async () => {
+      const infoSpy = vi.spyOn(core, 'info');
+      process.env.HTTP_PROXY = 'http://env-proxy.example.com:8080';
+      vi.spyOn(core, 'getInput').mockImplementation(
+        mocks.getInput({
+          ...mocks.GH_OIDC_INPUTS,
+          'http-proxy': 'http://input-proxy.example.com:8080'
+        })
+      );
+      
+      await run();
+      
+      expect(infoSpy).toHaveBeenCalledWith('Configuring proxy handler for STS client');
+      expect(core.setFailed).not.toHaveBeenCalled();
+    });
+
+    it('properly configures proxy agent in STS client', async () => {
+      const infoSpy = vi.spyOn(core, 'info');
+      
+      vi.spyOn(core, 'getInput').mockImplementation(
+        mocks.getInput({
+          ...mocks.GH_OIDC_INPUTS,
+          'http-proxy': 'http://proxy.example.com:8080'
+        })
+      );
+      
+      await run();
+      
+      expect(infoSpy).toHaveBeenCalledWith('Configuring proxy handler for STS client');
+      expect(core.setFailed).not.toHaveBeenCalled();
+    });
  });
 });
@@ -31,7 +31,18 @@ const inputs = {
    'aws-region': 'fake-region-1',
    'use-existing-credentials': 'true',
    'role-to-assume': 'arn:aws:iam::111111111111:role/MY-ROLE',
-  }
+  },
+  NO_ENV_CREDS_INPUTS: {
+    'role-to-assume': 'arn:aws:iam::111111111111:role/MY-ROLE',
+    'aws-region': 'fake-region-1',
+    'output-env-credentials': 'false',
+  },
+  STEP_BUT_NO_ENV_INPUTS: {
+    'role-to-assume': 'arn:aws:iam::111111111111:role/MY-ROLE',
+    'aws-region': 'fake-region-1',
+    'output-env-credentials': 'false',
+    'output-credentials': 'true',
+  },
 };

 const envs = {
@@ -19,17 +19,12 @@
    "sourceMap": true,
    "disableSizeLimit": true,
    "forceConsistentCasingInFileNames": true,
-    "lib": [ "ES2020" ],
+    "lib": ["ES2020"],
    "target": "ES2020",
    "noErrorTruncation": true,
    "esModuleInterop": true,
-    "rootDir": "src",
+    "rootDir": "src"
  },
-  "include": [
-    "src/**/*.ts"
-  ],
-  "exclude": [
-    "test/**/*.ts"
-  ],
+  "include": ["src/**/*.ts"],
+  "exclude": ["test/**/*.ts"]
 }
-
@@ -1,11 +1,8 @@
 {
  "extends": "./tsconfig.json",
-  "include": [
-    "test/**/*.ts",
-    "src/**/*.ts"
-  ],
+  "include": ["test/**/*.ts", "src/**/*.ts"],
  "exclude": [],
  "compilerOptions": {
    "rootDir": "./"
-  },
+  }
 }