Skip to content

Commit c087ec2

Browse files
committed
Handle rejection in aws credentials setup
1 parent 75081e5 commit c087ec2

3 files changed

Lines changed: 31 additions & 29 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "simplify-sdk",
3-
"version": "0.1.48",
3+
"version": "0.1.49",
44
"description": "Simplify Framework SDK library for NodeJS",
55
"main": "simplify.js",
66
"dependencies": {

provider.js

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,37 @@ process.env.AWS_SDK_LOAD_CONFIG = process.env.AWS_SDK_LOAD_CONFIG || true
1717
module.exports = {
1818
setConfig: function (config) {
1919
return new Promise(function (resolve, reject) {
20-
AWS.CredentialProviderChain.defaultProviders = [
21-
function () { return new AWS.SharedIniFileCredentials(config.Profile ? { profile: config.Profile } : {}); },
22-
function () { return new AWS.EnvironmentCredentials('AWS'); },
23-
function () { return new AWS.ECSCredentials(); },
24-
function () { return new AWS.ProcessCredentials(); },
25-
function () { return new AWS.EC2MetadataCredentials() },
26-
function () { return new AWS.EnvironmentCredentials('AMAZON'); },
27-
function () { return new AWS.TokenFileWebIdentityCredentials(); }
28-
]
29-
new AWS.CredentialProviderChain().resolve(function (err, credentials) {
30-
if (err) {
31-
reject(err)
32-
} else {
33-
AWS.config.update({ credentials: credentials });
34-
console.log(`${CBEGIN}Simplify${CRESET} | AWSProvider-Credentials: ${AWS.config.credentials.profile ? AWS.config.credentials.profile : 'default'}`)
35-
s3BucketParams.Bucket = (config.Bucket || {}).Name
36-
if (config.Region != 'us-east-1') {
37-
s3BucketParams.CreateBucketConfiguration = {
38-
LocationConstraint: config.Region
20+
try {
21+
AWS.CredentialProviderChain.defaultProviders = [
22+
function () { return new AWS.SharedIniFileCredentials(config.Profile ? { profile: config.Profile } : {}); },
23+
function () { return new AWS.EnvironmentCredentials('AWS'); },
24+
function () { return new AWS.ECSCredentials(); },
25+
function () { return new AWS.ProcessCredentials(); },
26+
function () { return new AWS.EC2MetadataCredentials() },
27+
function () { return new AWS.EnvironmentCredentials('AMAZON'); },
28+
function () { return new AWS.TokenFileWebIdentityCredentials(); }
29+
]
30+
new AWS.CredentialProviderChain().resolve(function (err, credentials) {
31+
if (err) {
32+
reject({ message: `Invalid AWS Credentials configuration ${config.Profile ? `profile ${config.Profile}`: 'settings'}` })
33+
} else {
34+
AWS.config.update({ credentials: credentials });
35+
console.log(`${CBEGIN}Simplify${CRESET} | AWSProvider-Credentials: ${AWS.config.credentials.profile ? AWS.config.credentials.profile : 'default'}`)
36+
s3BucketParams.Bucket = (config.Bucket || {}).Name
37+
if (config.Region != 'us-east-1') {
38+
s3BucketParams.CreateBucketConfiguration = {
39+
LocationConstraint: config.Region
40+
}
3941
}
42+
if (config.ServerSideEncryption && config.SSEKMSKeyId) {
43+
s3BucketParams.ServerSideEncryption = config.ServerSideEncryption
44+
s3BucketParams.SSEKMSKeyId = config.SSEKMSKeyId
45+
}
46+
awsconfig = config
47+
resolve(AWS.config.credentials)
4048
}
41-
if (config.ServerSideEncryption && config.SSEKMSKeyId) {
42-
s3BucketParams.ServerSideEncryption = config.ServerSideEncryption
43-
s3BucketParams.SSEKMSKeyId = config.SSEKMSKeyId
44-
}
45-
awsconfig = config
46-
resolve(AWS.config.credentials)
47-
}
48-
});
49+
})
50+
} catch(err) { reject({ message: 'Unhandled AWS Credentials exception' }) };
4951
})
5052
},
5153
getStorage: function () {

simplify.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1249,4 +1249,4 @@ module.exports = {
12491249
finishWithErrors
12501250
}
12511251

1252-
showBoxBanner()
1252+
process.env.DISABLE_BOX_BANNER || showBoxBanner()

0 commit comments

Comments
 (0)