Allow AWS SDK to specify AWS credentials

Author: dylanlingelbach

lib/dynamo-backup.js

@@ -12,6 +12,7 @@ var Uploader = require('s3-streaming-upload').Uploader;
 var ReadableStream = require('./readable-stream');
 
 function DynamoBackup(options) {
+    var params = {};
     options = options || {};
     this.excludedTables = options.excludedTables || [];
     this.includedTables = options.includedTables;
@@ -21,21 +22,20 @@ function DynamoBackup(options) {
     this.stopOnFailure = options.stopOnFailure || false;
     this.base64Binary = options.base64Binary || false;
     this.saveDataPipelineFormat = options.saveDataPipelineFormat || false;
-    this.awsAccessKey = options.awsAccessKey || process.env.AWS_ACCESS_KEY_ID;
-    this.awsSecretKey = options.awsSecretKey || process.env.AWS_SECRET_ACCESS_KEY;
-    this.awsRegion = options.awsRegion || process.env.AWS_DEFAULT_REGION || 'us-east-1';
+    this.awsAccessKey = options.awsAccessKey;
+    this.awsSecretKey = options.awsSecretKey;
+    this.awsRegion = options.awsRegion;
     this.debug = Boolean(options.debug);
 
-    // ensure that temporary credentials from IAM role don't get
-    // passed in as user access key without session token
-    if (this.awsAccessKey !== undefined &&
-        this.awsAccessKey.lastIndexOf('AKIA', 0) === 0) {
-        AWS.config.update({
-            accessKeyId: this.awsAccessKey,
-            secretAccessKey: this.secretAccessKey,
-            region: this.awsRegion
-        });
+    if (this.awsRegion) {
+        params.region = this.awsRegion;
+    }
+    if (this.awsAccessKey && this.awsSecretKey) {
+        params.accessKeyId = this.awsAccessKey;
+        params.secretAccessKey = this.awsSecretKey;
     }
+
+    AWS.config.update(params);
 }
 
 util.inherits(DynamoBackup, events.EventEmitter);
@@ -54,21 +54,21 @@ DynamoBackup.prototype.backupTable = function (tableName, backupPath, callback)
         backupPath = self._getBackupPath();
     }
 
-    var uploaderParams = {
-        bucket: self.bucket,
-        objectName: path.join(backupPath, tableName + '.json'),
-        stream: stream,
-        debug: self.debug
+   var params = {};
+   if (self.awsRegion) {
+       params.region = self.awsRegion;
+   }
+   if (self.awsAccessKey && self.awsSecretKey) {
+        params.accessKey = self.awsAccessKey;
+        params.secretKey = self.awsSecretKey;
     }
 
-    if (self.awsAccessKey !== undefined &&
-        self.awsAccessKey.lastIndexOf('AKIA', 0) === 0) {
-        uploaderParams.accessKey = self.awsAccessKey;
-        uploaderParams.secretKey = self.awsSecretKey;
-        uploaderParams.region = self.awsRegion;
-    }
+   params.bucket = self.bucket;
+   params.objectName = path.join(backupPath, tableName + '.json');
+   params.stream = stream;
+   params.debug = self.debug;
 
-    var upload = new Uploader(uploaderParams);
+   var upload = new Uploader(params);
 
     var startTime = moment.utc();
     self.emit('start-backup', tableName, startTime);