From ee5bd456e0c0ff8297ac504e24628ee52d714cdb Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Mon, 9 Nov 2015 22:45:07 -0800 Subject: [PATCH] set bucket and prefix to make migrate test pass --- src/routes/test/backups-test.js | 3 +-- src/storage/caas.js | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/routes/test/backups-test.js b/src/routes/test/backups-test.js index af441e067..08981ed49 100644 --- a/src/routes/test/backups-test.js +++ b/src/routes/test/backups-test.js @@ -56,7 +56,7 @@ function setup(done) { }, function createSettings(callback) { - settings.setBackupConfig({ provider: 'caas', token: 'BACKUP_TOKEN' }, callback); + settings.setBackupConfig({ provider: 'caas', token: 'BACKUP_TOKEN', bucket: 'Bucket', prefix: 'Prefix' }, callback); } ], done); } @@ -146,4 +146,3 @@ describe('Backups API', function () { }); }); }); - diff --git a/src/storage/caas.js b/src/storage/caas.js index d26745338..647249dfc 100644 --- a/src/storage/caas.js +++ b/src/storage/caas.js @@ -63,6 +63,8 @@ function getSignedUploadUrl(backupConfig, filename, callback) { assert.strictEqual(typeof filename, 'string'); assert.strictEqual(typeof callback, 'function'); + if (!backupConfig.bucket || !backupConfig.prefix) return new Error('Invalid configuration'); // prevent error in s3 + getBackupCredentials(backupConfig, function (error, credentials) { if (error) return callback(error); @@ -85,6 +87,8 @@ function getSignedDownloadUrl(backupConfig, filename, callback) { assert.strictEqual(typeof filename, 'string'); assert.strictEqual(typeof callback, 'function'); + if (!backupConfig.bucket || !backupConfig.prefix) return new Error('Invalid configuration'); // prevent error in s3 + getBackupCredentials(backupConfig, function (error, credentials) { if (error) return callback(error); @@ -108,6 +112,8 @@ function copyObject(backupConfig, from, to, callback) { assert.strictEqual(typeof to, 'string'); assert.strictEqual(typeof callback, 'function'); + if (!backupConfig.bucket || !backupConfig.prefix) return new Error('Invalid configuration'); // prevent error in s3 + getBackupCredentials(backupConfig, function (error, credentials) { if (error) return callback(error);