From cc4984239a4445813d9c40b2dc695b91b39303b3 Mon Sep 17 00:00:00 2001 From: recursivefunk Date: Sat, 8 Mar 2025 10:53:55 -0500 Subject: [PATCH 1/3] feat: add aws session token to getAWS --- README.md | 2 ++ package.json | 2 +- src/index.js | 5 ++++- test/test.env | 1 + test/test.js | 2 ++ 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 208aa9c..0b7cb1a 100644 --- a/README.md +++ b/README.md @@ -148,6 +148,7 @@ Fetch AWS Credentials const { awsKeyId, awsSecretAccessKey, + awsSessionToken, awsRegion, } = env.getAWS(); @@ -155,6 +156,7 @@ const { const { awsKeyId, awsSecretAccessKey, + awsSessionToken, awsRegion, } = env.getAWS({ region: 'region' }); ``` diff --git a/package.json b/package.json index d4c4b20..3116ea0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "good-env", - "version": "7.2.0", + "version": "7.2.1", "description": "Better environment variable handling for Twelve-Factor node apps", "main": "src/index.js", "scripts": { diff --git a/src/index.js b/src/index.js index 111ab08..95619f8 100644 --- a/src/index.js +++ b/src/index.js @@ -51,16 +51,19 @@ module.exports = Object const { AWS_ACCESS_KEY_ID: awsKeyId, AWS_SECRET_ACCESS_KEY: awsSecretAccessKey, - AWS_REGION: awsRegion + AWS_SESSION_TOKEN: awsSessionToken, + AWS_REGION: awsRegion, } = this.getAll({ AWS_ACCESS_KEY_ID: null, AWS_SECRET_ACCESS_KEY: null, + AWS_SESSION_TOKEN: null, AWS_REGION: region }); return { awsKeyId, awsSecretAccessKey, + awsSessionToken, awsRegion }; }, diff --git a/test/test.env b/test/test.env index 13cce3c..bf38f33 100644 --- a/test/test.env +++ b/test/test.env @@ -16,5 +16,6 @@ UNSUPPORTED_URL=beep://baz.bop AWS_ACCESS_KEY_ID=exampleaccesskeyid AWS_SECRET_ACCESS_KEY=examplesecretaccesskey AWS_REGION=us-east-1 +AWS_SESSION_TOKEN=session VALID_IP=192.168.1.60 INVALID_IP=nope diff --git a/test/test.js b/test/test.js index a822de2..0dab16c 100644 --- a/test/test.js +++ b/test/test.js @@ -45,12 +45,14 @@ test('it gets AWS creds', (t) => { const { awsKeyId, awsSecretAccessKey, + awsSessionToken, awsRegion } = env.getAWS(); t.equals(awsKeyId, 'exampleaccesskeyid'); t.equals(awsSecretAccessKey, 'examplesecretaccesskey'); t.equals(awsRegion, 'us-east-1'); + t.equals(awsSessionToken, 'session'); t.end(); }); From 6f11cc87ccc47f60453e2597152084528aa57ce0 Mon Sep 17 00:00:00 2001 From: recursivefunk Date: Sat, 8 Mar 2025 11:03:03 -0500 Subject: [PATCH 2/3] chore: format --- src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index 95619f8..4900622 100644 --- a/src/index.js +++ b/src/index.js @@ -52,7 +52,7 @@ module.exports = Object AWS_ACCESS_KEY_ID: awsKeyId, AWS_SECRET_ACCESS_KEY: awsSecretAccessKey, AWS_SESSION_TOKEN: awsSessionToken, - AWS_REGION: awsRegion, + AWS_REGION: awsRegion } = this.getAll({ AWS_ACCESS_KEY_ID: null, AWS_SECRET_ACCESS_KEY: null, From 329b222ce266fe238db9be0711b675dceb9713a5 Mon Sep 17 00:00:00 2001 From: recursivefunk Date: Sat, 8 Mar 2025 11:07:56 -0500 Subject: [PATCH 3/3] chore: correct minor version bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3116ea0..7a394e0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "good-env", - "version": "7.2.1", + "version": "7.3.0", "description": "Better environment variable handling for Twelve-Factor node apps", "main": "src/index.js", "scripts": {