Fix backup mapping (mail dir has moved)

src/backuptask.js

@@ -52,12 +52,7 @@ function backupApp(backupId, appId, callback) {
 
         var appDataDir = safe.fs.realpathSync(path.join(paths.APPS_DATA_DIR, appId));
 
-        var backupMapping = [{
-            source: appDataDir,
-            destination: '.'
-        }];
-
-        api(backupConfig.provider).backup(backupConfig, backupId, backupMapping, callback);
+        api(backupConfig.provider).backup(backupConfig, backupId, appDataDir, callback);
     });
 }
 
@@ -70,12 +65,7 @@ function backupBox(backupId, callback) {
     settings.getBackupConfig(function (error, backupConfig) {
         if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
 
-        var backupMapping = [{
-            source: paths.BOX_DATA_DIR,
-            destination: 'box'
-        }];
-
-        api(backupConfig.provider).backup(backupConfig, backupId, backupMapping, callback);
+        api(backupConfig.provider).backup(backupConfig, backupId, paths.BOX_DATA_DIR, callback);
     });
 }
 

src/storage/caas.js

@@ -61,17 +61,17 @@ function getBackupFilePath(apiConfig, backupId) {
 }
 
 // storage api
-function backup(apiConfig, backupId, sourceDirectories, callback) {
+function backup(apiConfig, backupId, sourceDir, callback) {
     assert.strictEqual(typeof apiConfig, 'object');
     assert.strictEqual(typeof backupId, 'string');
-    assert(Array.isArray(sourceDirectories));
+    assert.strictEqual(typeof sourceDir, 'string');
     assert.strictEqual(typeof callback, 'function');
 
     callback = once(callback);
 
     var backupFilePath = getBackupFilePath(apiConfig, backupId);
 
-    debug('[%s] backup: %j -> %s', backupId, sourceDirectories, backupFilePath);
+    debug('[%s] backup: %s -> %s', backupId, sourceDir, backupFilePath);
 
     getBackupCredentials(apiConfig, function (error, credentials) {
         if (error) return callback(error);
@@ -95,7 +95,7 @@ function backup(apiConfig, backupId, sourceDirectories, callback) {
             callback(null);
         });
 
-        targz.create(sourceDirectories, apiConfig.key || null, passThrough, callback);
+        targz.create([{ source: sourceDir, destination: '.' }], apiConfig.key || null, passThrough, callback);
     });
 }
 

src/storage/filesystem.js

@@ -37,17 +37,17 @@ function getBackupFilePath(apiConfig, backupId) {
 }
 
 // storage api
-function backup(apiConfig, backupId, sourceDirectories, callback) {
+function backup(apiConfig, backupId, sourceDir, callback) {
     assert.strictEqual(typeof apiConfig, 'object');
     assert.strictEqual(typeof backupId, 'string');
-    assert(Array.isArray(sourceDirectories));
+    assert.strictEqual(typeof sourceDir, 'string');
     assert.strictEqual(typeof callback, 'function');
 
     callback = once(callback);
 
     var backupFilePath = getBackupFilePath(apiConfig, backupId);
 
-    debug('[%s] backup: %j -> %s', backupId, sourceDirectories, backupFilePath);
+    debug('[%s] backup: %s -> %s', backupId, sourceDir, backupFilePath);
 
     mkdirp(path.dirname(backupFilePath), function (error) {
         if (error) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
@@ -69,7 +69,7 @@ function backup(apiConfig, backupId, sourceDirectories, callback) {
             callback(null);
         });
 
-        targz.create(sourceDirectories, apiConfig.key || null, fileStream, callback);
+        targz.create([{ source: sourceDir, destination: '.' }], apiConfig.key || null, fileStream, callback);
     });
 }
 

src/storage/interface.js

@@ -19,10 +19,10 @@ exports = module.exports = {
 
 var assert = require('assert');
 
-function backup(apiConfig, backupId, sourceDirectories, callback) {
+function backup(apiConfig, backupId, sourceDir, callback) {
     assert.strictEqual(typeof apiConfig, 'object');
     assert.strictEqual(typeof backupId, 'string');
-    assert(Array.isArray(sourceDirectories));
+    assert.strictEqual(typeof sourceDir, 'string');
     assert.strictEqual(typeof callback, 'function');
 
     // Result: none

src/storage/noop.js

@@ -14,10 +14,10 @@ exports = module.exports = {
 var assert = require('assert'),
     debug = require('debug')('box:storage/noop');
 
-function backup(apiConfig, backupId, sourceDirectories, callback) {
+function backup(apiConfig, backupId, sourceDir, callback) {
     assert.strictEqual(typeof apiConfig, 'object');
     assert.strictEqual(typeof backupId, 'string');
-    assert(Array.isArray(sourceDirectories));
+    assert.strictEqual(typeof sourceDir, 'string');
     assert.strictEqual(typeof callback, 'function');
 
     debug('backup: %s %j', backupId, sourceDirectories);

src/storage/s3.js

@@ -66,17 +66,17 @@ function getBackupFilePath(apiConfig, backupId) {
 }
 
 // storage api
-function backup(apiConfig, backupId, sourceDirectories, callback) {
+function backup(apiConfig, backupId, sourceDir, callback) {
     assert.strictEqual(typeof apiConfig, 'object');
     assert.strictEqual(typeof backupId, 'string');
-    assert(Array.isArray(sourceDirectories));
+    assert.strictEqual(typeof sourceDir, 'string');
     assert.strictEqual(typeof callback, 'function');
 
     callback = once(callback);
 
     var backupFilePath = getBackupFilePath(apiConfig, backupId);
 
-    debug('[%s] backup: %j -> %s', backupId, sourceDirectories, backupFilePath);
+    debug('[%s] backup: %s -> %s', backupId, sourceDir, backupFilePath);
 
     getBackupCredentials(apiConfig, function (error, credentials) {
         if (error) return callback(error);
@@ -100,7 +100,7 @@ function backup(apiConfig, backupId, sourceDirectories, callback) {
             callback(null);
         });
 
-        targz.create(sourceDirectories, apiConfig.key || null, passThrough, callback);
+        targz.create([{ source: sourceDir, destination: '.' }], apiConfig.key || null, passThrough, callback);
     });
 }