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

Merge pull request #5650 from exoego/fix-cf-region-syntax

Browse Source 
AWS: Fix ${cf.REGION} syntax causes deployment in wrong region
This commit is contained in:
Takahiro Horike 2019-01-07 10:49:05 +09:00 committed by GitHub
commit d4e36b71c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/plugins/aws/provider/awsProvider.js
View File

@ -226,7 +226,7 @@ class AwsProvider {
*/
request(service, method, params, options) {
const that = this;
const credentials = that.getCredentials();
const credentials = _.cloneDeep(that.getCredentials());
// Make sure options is an object (honors wrong calls of request)
const requestOptions = _.isObject(options) ? options : {};
const shouldCache = _.get(requestOptions, 'useCache', false);

3
lib/plugins/aws/provider/awsProvider.test.js
View File

@ -324,6 +324,7 @@ describe('AwsProvider', () => {
},
},
};
expect(awsProvider.getCredentials()).to.deep.eql({ region: options.region });
return awsProvider
.request('CloudFormation',
@ -332,6 +333,8 @@ describe('AwsProvider', () => {
{ region: 'ap-northeast-1' })
.then(data => {
expect(data).to.eql({ region: 'ap-northeast-1' });
// Requesting different region should not affect region in credentials
expect(awsProvider.getCredentials()).to.deep.eql({ region: options.region });
});
});