archive-gh-me/serverless
1
0
Fork 0
mirror of https://github.com/serverless/serverless.git synced 2026-01-25 15:07:39 +00:00
Code Issues Projects Releases Wiki Activity

ProvideAws: fix env loading

Browse Source
This commit is contained in:
Austen Collins 2016-02-13 15:16:43 -08:00
parent 7f1329306a
commit 24d577db32
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ServerlessProviderAws.js
View File

@ -119,7 +119,7 @@ class ServerlessProviderAws {
// Access Keys w/ Stage Suffix
credentials = {
accessKeyId: process.env[this._config.envPrefix + 'AWS_ACCESS_KEY_ID_' + stage],
secretAccessKey: process.env[this._config.envPrefix + 'SECRET_ACCESS_KEY_' + stage]
secretAccessKey: process.env[this._config.envPrefix + 'AWS_SECRET_ACCESS_KEY_' + stage]
};
} else if ((process.env[this._config.envPrefix + 'AWS_ACCESS_KEY_ID'] && process.env[this._config.envPrefix + 'AWS_SECRET_ACCESS_KEY'])
@ -128,7 +128,7 @@ class ServerlessProviderAws {
// Access Keys Plain
credentials = {
accessKeyId: process.env[this._config.envPrefix + 'AWS_ACCESS_KEY_ID'] || process.env[this._config.envPrefix + 'SERVERLESS_ADMIN_AWS_ACCESS_KEY_ID'],
secretAccessKey: process.env[this._config.envPrefix + 'SECRET_ACCESS_KEY'] || process.env[this._config.envPrefix + 'SERVERLESS_ADMIN_AWS_SECRET_ACCESS_KEY']
secretAccessKey: process.env[this._config.envPrefix + 'AWS_SECRET_ACCESS_KEY'] || process.env[this._config.envPrefix + 'SERVERLESS_ADMIN_AWS_SECRET_ACCESS_KEY']
};
} else if (process.env[this._config.envPrefix + 'AWS_SESSION_TOKEN_' + stage]) {
@ -138,7 +138,7 @@ class ServerlessProviderAws {
sessionToken: process.env[this._config.envPrefix + 'AWS_SESSION_TOKEN_' + stage]
};
} else if (process.env[this._config.envPrefix + 'AWS_SESSION_TOKEN_' + stage]) {
} else if (process.env[this._config.envPrefix + 'AWS_SESSION_TOKEN']) {
// Session Token Plain
credentials = {