diff --git a/src/backuptask.js b/src/backuptask.js index 3d99fd15c..762e87b4a 100755 --- a/src/backuptask.js +++ b/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); }); } diff --git a/src/storage/caas.js b/src/storage/caas.js index 838697dda..9bd1de4dc 100644 --- a/src/storage/caas.js +++ b/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); }); } diff --git a/src/storage/filesystem.js b/src/storage/filesystem.js index 3c50e5973..60f589052 100644 --- a/src/storage/filesystem.js +++ b/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); }); } diff --git a/src/storage/interface.js b/src/storage/interface.js index 868c46d03..32a23f1a0 100644 --- a/src/storage/interface.js +++ b/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 diff --git a/src/storage/noop.js b/src/storage/noop.js index 30bfa2de3..baf9683d1 100644 --- a/src/storage/noop.js +++ b/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); diff --git a/src/storage/s3.js b/src/storage/s3.js index 1bb79517b..a100278b5 100644 --- a/src/storage/s3.js +++ b/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); }); }