Merge pull request #28 from sdesalas/master

Fixes for restore `--overwrite` flag

Author: dylanlingelbach

lib/dynamo-restore.js

@@ -32,6 +32,7 @@ function DynamoRestore(options) {
     });
 
     this.options = options;
+    this.dynamodb = new AWS.DynamoDB();
 }
 
 // Stick to prototypal inheritance. While this can be done differently 
@@ -53,7 +54,7 @@ DynamoRestore.prototype.run = function(finishCallback) {
     }).bind(this));
     // Finish off by updating write capacity to end-state (if needed)
     this.on('finish', (function() {
-        var dynamodb = new AWS.DynamoDB(),
+        var dynamodb = this.dynamodb,
             options = this.options;
         // Do we need to update write capacity?
         if (options.writecapacity) {
@@ -89,22 +90,23 @@ DynamoRestore.prototype._validateS3Backup = function(options) {
 };
 
 DynamoRestore.prototype._validateTable = function(options) {
-    var dynamodb = new AWS.DynamoDB();
+    var dynamodb = this.dynamodb;
     if (!options.table) {
         return this.emit('error', 'Please provide a Dynamo DB table name to restore to.');
     }
     dynamodb.listTables({}, this._checkTableExists.bind(this));
 };
 
 DynamoRestore.prototype._checkTableExists = function(error, data) {
+    var dynamodb = this.dynamodb;
     if (error || !data || !data.TableNames) {
         return this.emit('error', 'Fatal Error. Could not connect to AWS DynamoDB engine. Please check your credentials.');
     }
     if (data.TableNames.indexOf(this.options.table) > -1) {
         // Table exists, should we overwrite it??
         if (this.options.overwrite) {
-            this.emit('warning', util.format('WARN: table [%s] will be overwritten.', options.table));
-            dynamodb.describeTable({ TableName: this.options.table }, this._checkTableReady.bind(this));
+            this.emit('warning', util.format('WARN: table [%s] will be overwritten.', this.options.table));
+            setTimeout(dynamodb.describeTable.bind(dynamodb, { TableName: this.options.table }, this._checkTableReady.bind(this)), 1000);
         } else {
             this.emit('error', 'Fatal Error. The destination table already exists! Exiting process..');
         }
@@ -228,7 +230,7 @@ DynamoRestore.prototype._extractSchema = function(template) {
 };
 
 DynamoRestore.prototype._createTable = function(callback) {
-    var dynamodb = new AWS.DynamoDB(),
+    var dynamodb = this.dynamodb,
         options = this.options;
     if (!options.table || !options.partitionkey) {
         return this.emit('error', 'Fatal Error. Could not create dynamo table. Not enough information provided.');
@@ -269,7 +271,7 @@ DynamoRestore.prototype._createTable = function(callback) {
 };
 
 DynamoRestore.prototype._checkTableReady = function(error, data) {
-    var dynamodb = new AWS.DynamoDB();
+    var dynamodb = this.dynamodb;
     if (error || !data || !data.Table) {
         return this.emit('error', 'Error creating table ' + this.options.table);
     }
@@ -288,7 +290,7 @@ DynamoRestore.prototype._checkTableReady = function(error, data) {
 DynamoRestore.prototype._sendBatch = function() {
     // Prepare
     var params = { RequestItems: {} },
-        dynamo = new AWS.DynamoDB(),
+        dynamo = this.dynamodb,
         options = this.options;
     batch = this.batches.shift();
     params.RequestItems[options.table] = batch.items;
@@ -313,7 +315,7 @@ DynamoRestore.prototype._sendBatch = function() {
         var unprocessedItems = data && data.UnprocessedItems && data.UnprocessedItems[options.table] || [];
         if (unprocessedItems.length) {
             // Retry unprocessed items
-            this.emit('warning', 'Retrying ' + unprocessedItems.length + ' unprocessed items');
+            this.emit('warning', unprocessedItems.length + ' unprocessed items. Add to queue and back off a bit.');
             this.batches.push({
                 items: unprocessedItems,
                 attempts: batch.attempts + 1