chore(release): 1.3.5

Merge pull request #66 from aws-actions/dependabot/npm_and_yarn/zeit/ncc-0.22.3
chore: Update dist
2026-08-26 04:45:10 +09:00 · 2020-05-27 16:03:20 +00:00 · 2020-05-26 19:17:49 +00:00 · 2020-05-26 19:12:44 +00:00 · 2020-05-26 19:12:17 +00:00 · 2020-05-26 19:11:54 +00:00
7 changed files with 187 additions and 143 deletions
@@ -2,6 +2,13 @@

 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.

+### [1.3.5](https://github.com/aws-actions/configure-aws-credentials/compare/v1.3.4...v1.3.5) (2020-05-27)
+
+
+### Bug Fixes
+
+* clear session token env var if present for non-session credentials ([#65](https://github.com/aws-actions/configure-aws-credentials/issues/65)) ([0c2c1f7](https://github.com/aws-actions/configure-aws-credentials/commit/0c2c1f7c129971b6f433551b1f4ba4a6a9cc8b70))
+
 ### [1.3.4](https://github.com/aws-actions/configure-aws-credentials/compare/v1.3.3...v1.3.4) (2020-05-18)

 ### [1.3.3](https://github.com/aws-actions/configure-aws-credentials/compare/v1.3.2...v1.3.3) (2020-04-02)
@@ -31,6 +31,7 @@ Add the following step to your workflow:
 ```

 For example, you can use this action with the AWS CLI available in [GitHub's hosted virtual environments](https://help.github.com/en/actions/reference/software-installed-on-github-hosted-runners).
+You can also run this action multiple times to use different AWS accounts, regions, or IAM roles in the same GitHub Actions workflow job.

 ```yaml
 jobs:
@@ -42,16 +43,27 @@ jobs:
    - name: Checkout
      uses: actions/checkout@v2

-    - name: Configure AWS credentials
+    - name: Configure AWS credentials from Test account
      uses: aws-actions/configure-aws-credentials@v1
      with:
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        aws-region: us-east-2
+        aws-access-key-id: ${{ secrets.TEST_AWS_ACCESS_KEY_ID }}
+        aws-secret-access-key: ${{ secrets.TEST_AWS_SECRET_ACCESS_KEY }}
+        aws-region: us-east-1

-    - name: Copy files to S3 with the AWS CLI
+    - name: Copy files to the test website with the AWS CLI
      run: |
-        aws s3 sync . s3://my-s3-website-bucket
+        aws s3 sync . s3://my-s3-test-website-bucket
+
+    - name: Configure AWS credentials from Production account
+      uses: aws-actions/configure-aws-credentials@v1
+      with:
+        aws-access-key-id: ${{ secrets.PROD_AWS_ACCESS_KEY_ID }}
+        aws-secret-access-key: ${{ secrets.PROD_AWS_SECRET_ACCESS_KEY }}
+        aws-region: us-west-2
+
+    - name: Copy files to the production website with the AWS CLI
+      run: |
+        aws s3 sync . s3://my-s3-prod-website-bucket
 ```

 See [action.yml](action.yml) for the full documentation for this action's inputs and outputs.
@@ -107,6 +107,9 @@ function exportCredentials(params){
  if (sessionToken) {
    core.exportVariable('AWS_SESSION_TOKEN', sessionToken);
    core.setSecret(sessionToken);
+  } else if (process.env.AWS_SESSION_TOKEN) {
+    // clear session token from previous credentials action
+    core.exportVariable('AWS_SESSION_TOKEN', '');
  }
 }

@@ -154,6 +154,28 @@ describe('Configure AWS Credentials', () => {
        expect(core.setSecret).toHaveBeenCalledWith(FAKE_ACCOUNT_ID);
    });

+    test('session token is cleared if necessary', async () => {
+        const mockInputs = {...CREDS_INPUTS, 'aws-region': 'eu-west-1'};
+        core.getInput = jest
+            .fn()
+            .mockImplementation(mockGetInput(mockInputs));
+        process.env.AWS_SESSION_TOKEN = 'helloworld';
+
+        await run();
+        expect(mockStsAssumeRole).toHaveBeenCalledTimes(0);
+        expect(core.exportVariable).toHaveBeenCalledTimes(5);
+        expect(core.setSecret).toHaveBeenCalledTimes(3);
+        expect(core.exportVariable).toHaveBeenCalledWith('AWS_ACCESS_KEY_ID', FAKE_ACCESS_KEY_ID);
+        expect(core.setSecret).toHaveBeenCalledWith(FAKE_ACCESS_KEY_ID);
+        expect(core.exportVariable).toHaveBeenCalledWith('AWS_SECRET_ACCESS_KEY', FAKE_SECRET_ACCESS_KEY);
+        expect(core.setSecret).toHaveBeenCalledWith(FAKE_SECRET_ACCESS_KEY);
+        expect(core.exportVariable).toHaveBeenCalledWith('AWS_SESSION_TOKEN', '');
+        expect(core.exportVariable).toHaveBeenCalledWith('AWS_DEFAULT_REGION', 'eu-west-1');
+        expect(core.exportVariable).toHaveBeenCalledWith('AWS_REGION', 'eu-west-1');
+        expect(core.setOutput).toHaveBeenCalledWith('aws-account-id', FAKE_ACCOUNT_ID);
+        expect(core.setSecret).toHaveBeenCalledWith(FAKE_ACCOUNT_ID);
+    });
+
    test('validates region name', async () => {
        process.env.SHOW_STACK_TRACE = 'false';

@@ -1,6 +1,6 @@
 {
  "name": "aws-actions-configure-aws-credentials",
-  "version": "1.3.4",
+  "version": "1.3.5",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -1037,9 +1037,9 @@
      "dev": true
    },
    "@zeit/ncc": {
-      "version": "0.22.2",
-      "resolved": "https://registry.npmjs.org/@zeit/ncc/-/ncc-0.22.2.tgz",
-      "integrity": "sha512-LGW5RPIwulh+fyKiMTgbIEbdc/hdf/4+U5B1WbT/We0jweHoywDbk9hi+3hNjSzQNShGumP72zgc6PHEUG5syg==",
+      "version": "0.22.3",
+      "resolved": "https://registry.npmjs.org/@zeit/ncc/-/ncc-0.22.3.tgz",
+      "integrity": "sha512-jnCLpLXWuw/PAiJiVbLjA8WBC0IJQbFeUwF4I9M+23MvIxTxk5pD4Q8byQBSPmHQjz5aBoA7AKAElQxMpjrCLQ==",
      "dev": true
    },
    "abab": {
@@ -1106,9 +1106,9 @@
      }
    },
    "ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
      "dev": true
    },
    "ansi-styles": {
@@ -1203,9 +1203,9 @@
      "dev": true
    },
    "aws-sdk": {
-      "version": "2.679.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.679.0.tgz",
-      "integrity": "sha512-bsbu3Mbwqz2DHpVSSgaSoFYsNrW+54vXN74iG++cCE7AAg9vOgCKzGul8yhR4jxxlOmGlfP9kCNrkCpjQ/Uqkg==",
+      "version": "2.684.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.684.0.tgz",
+      "integrity": "sha512-OkSMKIbRTBd3YV5iAklJxZFyLg0jRO2XW6+WhMuDBHMEs8aRbZw4iAD85wFC8tG7X9o0kcjnWfZUDq7MK1dcDg==",
      "requires": {
        "buffer": "4.9.1",
        "events": "1.1.1",
@@ -1951,9 +1951,9 @@
      }
    },
    "eslint": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.0.0.tgz",
-      "integrity": "sha512-qY1cwdOxMONHJfGqw52UOpZDeqXy8xmD0u8CT6jIstil72jkhURC704W8CFyTPDPllz4z4lu0Ql1+07PG/XdIg==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.1.0.tgz",
+      "integrity": "sha512-DfS3b8iHMK5z/YLSme8K5cge168I8j8o1uiVmFCgnnjxZQbCGyraF8bMl7Ju4yfBmCuxD7shOF7eqGkcuIHfsA==",
      "dev": true,
      "requires": {
        "@babel/code-frame": "^7.0.0",
@@ -1994,12 +1994,6 @@
        "v8-compile-cache": "^2.0.3"
      },
      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
        "ansi-styles": {
          "version": "4.2.1",
          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -2036,9 +2030,9 @@
          "dev": true
        },
        "cross-spawn": {
-          "version": "7.0.2",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz",
-          "integrity": "sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw==",
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
          "dev": true,
          "requires": {
            "path-key": "^3.1.0",
@@ -2118,15 +2112,6 @@
          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
          "dev": true
        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        },
        "supports-color": {
          "version": "7.1.0",
          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
@@ -2144,15 +2129,6 @@
          "requires": {
            "prelude-ls": "^1.2.1"
          }
-        },
-        "which": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
        }
      }
    },
@@ -2892,12 +2868,6 @@
        "through": "^2.3.6"
      },
      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
        "ansi-styles": {
          "version": "4.2.1",
          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -2939,15 +2909,6 @@
          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
          "dev": true
        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        },
        "supports-color": {
          "version": "7.1.0",
          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
@@ -6040,12 +6001,12 @@
      }
    },
    "strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
      "dev": true,
      "requires": {
-        "ansi-regex": "^4.1.0"
+        "ansi-regex": "^5.0.0"
      }
    },
    "strip-bom": {
@@ -6126,6 +6087,12 @@
        "string-width": "^3.0.0"
      },
      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
        "emoji-regex": {
          "version": "7.0.3",
          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
@@ -6148,6 +6115,15 @@
            "is-fullwidth-code-point": "^2.0.0",
            "strip-ansi": "^5.1.0"
          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
        }
      }
    },
@@ -1,6 +1,6 @@
 {
  "name": "aws-actions-configure-aws-credentials",
-  "version": "1.3.4",
+  "version": "1.3.5",
  "description": "Configure AWS Credentials",
  "main": "index.js",
  "scripts": {
@@ -26,11 +26,11 @@
  "homepage": "https://github.com/aws-actions/configure-aws-credentials#readme",
  "dependencies": {
    "@actions/core": "^1.2.4",
-    "aws-sdk": "^2.679.0"
+    "aws-sdk": "^2.684.0"
  },
  "devDependencies": {
-    "@zeit/ncc": "^0.22.2",
-    "eslint": "^7.0.0",
+    "@zeit/ncc": "^0.22.3",
+    "eslint": "^7.1.0",
    "jest": "^26.0.1"
  }
 }
Author	SHA1	Message	Date
Release Automation	9f7f57b093	chore(release): 1.3.5	2020-05-27 16:03:20 +00:00
dependabot-preview[bot]	09758fb6fe	Merge pull request #66 from aws-actions/dependabot/npm_and_yarn/zeit/ncc-0.22.3	2020-05-26 19:17:49 +00:00
GitHub Actions	38878c03af	chore: Update dist	2020-05-26 19:12:44 +00:00
dependabot-preview[bot]	ab6dfc4459	chore: Bump @zeit/ncc from 0.22.2 to 0.22.3 Bumps [@zeit/ncc](https://github.com/zeit/ncc) from 0.22.2 to 0.22.3. - [Release notes](https://github.com/zeit/ncc/releases) - [Commits](https://github.com/zeit/ncc/compare/0.22.2...0.22.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-05-26 19:12:17 +00:00
dependabot-preview[bot]	9d7a893ad4	Merge pull request #68 from aws-actions/dependabot/npm_and_yarn/aws-sdk-2.684.0	2020-05-26 19:11:54 +00:00
dependabot-preview[bot]	48c7de6aec	Merge pull request #67 from aws-actions/dependabot/npm_and_yarn/eslint-7.1.0	2020-05-26 19:10:37 +00:00
dependabot-preview[bot]	2371778031	chore: Bump aws-sdk from 2.679.0 to 2.684.0 Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.679.0 to 2.684.0. - [Release notes](https://github.com/aws/aws-sdk-js/releases) - [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-js/compare/v2.679.0...v2.684.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-05-26 19:10:04 +00:00
dependabot-preview[bot]	aec054896e	chore: Bump eslint from 7.0.0 to 7.1.0 Bumps [eslint](https://github.com/eslint/eslint) from 7.0.0 to 7.1.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v7.0.0...v7.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-05-26 19:09:32 +00:00
GitHub Actions	9c93b3b896	chore: Update dist	2020-05-26 04:01:20 +00:00
Clare Liguori	0c2c1f7c12	fix: clear session token env var if present for non-session credentials (#65 )	2020-05-26 04:00:51 +00:00