storage: checkPreconditions is now async

src/storage/filesystem.js

@@ -63,35 +63,32 @@ function getRootPath(apiConfig) {
 }
 
 // the du call in the function below requires root
-async function checkPreconditions(apiConfig, dataLayout, callback) {
+async function checkPreconditions(apiConfig, dataLayout) {
     assert.strictEqual(typeof apiConfig, 'object');
     assert(dataLayout instanceof DataLayout, 'dataLayout must be a DataLayout');
-    assert.strictEqual(typeof callback, 'function');
 
     let used = 0;
     for (let localPath of dataLayout.localPaths()) {
         debug(`checkPreconditions: getting disk usage of ${localPath}`);
         let result = safe.child_process.execSync(`du -Dsb ${localPath}`, { encoding: 'utf8' });
-        if (!result) return callback(new BoxError(BoxError.FS_ERROR, `du error: ${safe.error.message}`));
+        if (!result) throw new BoxError(BoxError.FS_ERROR, `du error: ${safe.error.message}`);
         used += parseInt(result, 10);
     }
 
     debug(`checkPreconditions: ${used} bytes`);
 
     const [error, result] = await safe(df.file(getRootPath(apiConfig)));
-    if (error) return callback(new BoxError(BoxError.FS_ERROR, `Error when checking for disk space: ${error.message}`));
+    if (error) throw new BoxError(BoxError.FS_ERROR, `Error when checking for disk space: ${error.message}`);
 
     // Check filesystem is mounted so we don't write into the actual folder on disk
     if (apiConfig.provider === PROVIDER_SSHFS || apiConfig.provider === PROVIDER_CIFS || apiConfig.provider === PROVIDER_NFS || apiConfig.provider === PROVIDER_EXT4) {
-        if (result.mountpoint !== paths.MANAGED_BACKUP_MOUNT_DIR) return callback(new BoxError(BoxError.FS_ERROR, 'Backup target is not mounted'));
+        if (result.mountpoint !== paths.MANAGED_BACKUP_MOUNT_DIR) throw new BoxError(BoxError.FS_ERROR, 'Backup target is not mounted');
     } else if (apiConfig.provider === PROVIDER_MOUNTPOINT) {
-        if (result.mountpoint === '/') return callback(new BoxError(BoxError.FS_ERROR, `${apiConfig.backupFolder} is not mounted`));
+        if (result.mountpoint === '/') throw new BoxError(BoxError.FS_ERROR, `${apiConfig.backupFolder} is not mounted`);
     }
 
     const needed = 0.6 * used + (1024 * 1024 * 1024); // check if there is atleast 1GB left afterwards. aim for 60% because rsync/tgz won't need full 100%
-    if (result.available <= needed) return callback(new BoxError(BoxError.FS_ERROR, `Not enough disk space for backup. Needed: ${prettyBytes(needed)} Available: ${prettyBytes(result.available)}`));
-
-    callback(null);
+    if (result.available <= needed) throw new BoxError(BoxError.FS_ERROR, `Not enough disk space for backup. Needed: ${prettyBytes(needed)} Available: ${prettyBytes(result.available)}`);
 }
 
 function hasChownSupportSync(apiConfig) {

src/storage/gcs.js

@@ -70,12 +70,9 @@ function getRootPath(apiConfig) {
     return apiConfig.prefix;
 }
 
-function checkPreconditions(apiConfig, dataLayout, callback) {
+async function checkPreconditions(apiConfig, dataLayout) {
     assert.strictEqual(typeof apiConfig, 'object');
     assert(dataLayout instanceof DataLayout, 'dataLayout must be a DataLayout');
-    assert.strictEqual(typeof callback, 'function');
-
-    callback(null);
 }
 
 function upload(apiConfig, backupFilePath, sourceStream, callback) {

src/storage/interface.js

@@ -34,7 +34,7 @@ exports = module.exports = {
     injectPrivateFields
 };
 
-var assert = require('assert'),
+const assert = require('assert'),
     BoxError = require('../boxerror.js'),
     DataLayout = require('../datalayout.js'),
     EventEmitter = require('events');
@@ -56,12 +56,9 @@ function getRootPath(apiConfig) {
     return '/';
 }
 
-function checkPreconditions(apiConfig, dataLayout, callback) {
+async function checkPreconditions(apiConfig, dataLayout) {
     assert.strictEqual(typeof apiConfig, 'object');
     assert(dataLayout instanceof DataLayout, 'dataLayout must be a DataLayout');
-    assert.strictEqual(typeof callback, 'function');
-
-    callback(null);
 }
 
 function upload(apiConfig, backupFilePath, sourceStream, callback) {

src/storage/noop.js

@@ -22,7 +22,7 @@ exports = module.exports = {
     injectPrivateFields
 };
 
-var assert = require('assert'),
+const assert = require('assert'),
     BoxError = require('../boxerror.js'),
     DataLayout = require('../datalayout.js'),
     debug = require('debug')('box:storage/noop'),
@@ -33,12 +33,9 @@ function getRootPath(apiConfig) {
     return '';
 }
 
-function checkPreconditions(apiConfig, dataLayout, callback) {
+async function checkPreconditions(apiConfig, dataLayout) {
     assert.strictEqual(typeof apiConfig, 'object');
     assert(dataLayout instanceof DataLayout, 'dataLayout must be a DataLayout');
-    assert.strictEqual(typeof callback, 'function');
-
-    callback(null);
 }
 
 function upload(apiConfig, backupFilePath, sourceStream, callback) {

src/storage/s3.js

@@ -98,12 +98,9 @@ function getRootPath(apiConfig) {
     return apiConfig.prefix;
 }
 
-function checkPreconditions(apiConfig, dataLayout, callback) {
+async function checkPreconditions(apiConfig, dataLayout) {
     assert.strictEqual(typeof apiConfig, 'object');
     assert(dataLayout instanceof DataLayout, 'dataLayout must be a DataLayout');
-    assert.strictEqual(typeof callback, 'function');
-
-    callback(null);
 }
 
 function upload(apiConfig, backupFilePath, sourceStream, callback) {