Merge branch 'master' into dwkerwin-iam-role-compatibility

Author: dylanlingelbach

README.md

@@ -47,15 +47,15 @@ var backup = new DynamoBackup({
 });
 
 backup.on('error', function(data) {
-    console.log('Error backing up ' + data.tableName);
-    console.log(data.error);
+    console.log('Error backing up ' + data.table);
+    console.log(data.err);
 });
 
-backup.on('start-backup', function(tableName) {
+backup.on('start-backup', function(tableName, startTime) {
     console.log('Starting to copy table ' + tableName);
 });
 
-backup.on('end-backup', function(tableName) {
+backup.on('end-backup', function(tableName, backupDuration) {
     console.log('Done copying table ' + tableName);
 });
 

lib/dynamo-backup.js

@@ -43,7 +43,7 @@ util.inherits(DynamoBackup, events.EventEmitter);
 DynamoBackup.prototype.listTables = function (callback) {
     var self = this;
     self._fetchTables(null, [], callback);
-}
+};
 
 DynamoBackup.prototype.backupTable = function (tableName, backupPath, callback) {
     var self = this;
@@ -115,7 +115,7 @@ DynamoBackup.prototype.backupTable = function (tableName, backupPath, callback)
             }
         }
         );
-}
+};
 
 DynamoBackup.prototype.backupAllTables = function (callback) {
     var self = this;
@@ -143,13 +143,13 @@ DynamoBackup.prototype.backupAllTables = function (callback) {
             callback
             );
     });
-}
+};
 
 DynamoBackup.prototype._getBackupPath = function () {
     var self = this;
     var now = moment.utc();
     return self.backupPath || ('DynamoDB-backup-' + now.format('YYYY-MM-DD-HH-mm-ss'));
-}
+};
 
 DynamoBackup.prototype._copyTable = function (tableName, itemsReceived, callback) {
     var self = this;
@@ -164,7 +164,7 @@ DynamoBackup.prototype._copyTable = function (tableName, itemsReceived, callback
 
         self._streamItems(tableName, null, limit, itemsReceived, callback);
     });
-}
+};
 
 DynamoBackup.prototype._streamItems = function fetchItems(tableName, startKey, limit, itemsReceived, callback) {
     var self = this;
@@ -191,7 +191,7 @@ DynamoBackup.prototype._streamItems = function fetchItems(tableName, startKey, l
         }
         self._streamItems(tableName, data.LastEvaluatedKey, limit, itemsReceived, callback);
     });
-}
+};
 
 DynamoBackup.prototype._fetchTables = function (lastTable, tables, callback) {
     var self = this;
@@ -228,6 +228,10 @@ DynamoBackup.prototype._formatForDataPipeline = function (item) {
             var dataPipelineValueKey = self._getDataPipelineAttributeValueKey(k);
             value[dataPipelineValueKey] = v;
             value[k] = undefined;
+            // for MAps and Lists, recurse until the elements are created with the correct case
+            if(k === 'M' || k === 'L') {
+              self._formatForDataPipeline(v);
+            }
         });
     });
     return JSON.stringify(item);
@@ -241,8 +245,9 @@ DynamoBackup.prototype._getDataPipelineAttributeValueKey = function (type) {
         case 'M':
         case 'L':
         case 'NULL':
-        case 'BOOL':
             return type.toLowerCase();
+        case 'BOOL':
+            return 'bOOL';
         case 'SS':
             return 'sS';
         case 'NS':
@@ -252,6 +257,6 @@ DynamoBackup.prototype._getDataPipelineAttributeValueKey = function (type) {
         default:
             throw new Error('Unknown AttributeValue key: ' + type);
     }
-}
+};
 
 module.exports = DynamoBackup;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dynamo-backup-to-s3",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "author": "Dylan Lingelbach (https://github.com/dylanlingelbach)",
   "license": "MIT",
   "repository": {