Skip to content

Commit 2bb70de

Browse files
committed
Added condition to verify alternate S3 application is not being used
1 parent 35ee442 commit 2bb70de

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ module.exports = {
1818
defaultConfig: {
1919
filePattern: '**/*.{js,css,png,gif,ico,jpg,map,xml,txt,svg,swf,eot,ttf,woff,woff2,otf}',
2020
prefix: '',
21+
profile: '',
2122
acl: 'public-read',
2223
cacheControl: 'max-age='+TWO_YEAR_CACHE_PERIOD_IN_SEC+', public',
2324
expires: EXPIRE_IN_2030,

lib/s3.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ module.exports = CoreObject.extend({
4040
s3Options.sessionToken = sessionToken;
4141
}
4242

43-
if (profile) {
43+
if (profile && !this._plugin.readConfig('s3Client')) {
4444
this._plugin.log('Using AWS profile from config', { verbose: true });
4545
AWS.config.credentials = new AWS.SharedIniFileCredentials({ profile: profile });
4646
}

0 commit comments

Comments
 (0)