drop configJson

The initial idea was to store exactly where the backups are stored.
But this only causes problems for migrations where the bucket might
change and clones where the prefix (box.id) changes.

Thus, it's best to leave the url creation to the caas side. (That
has to be done in another change)

src/backupdb.js

@@ -6,7 +6,7 @@ var assert = require('assert'),
     safe = require('safetydance'),
     util = require('util');
 
-var BACKUPS_FIELDS = [ 'filename', 'creationTime', 'version', 'type', 'dependsOn', 'state', 'configJson' ];
+var BACKUPS_FIELDS = [ 'filename', 'creationTime', 'version', 'type', 'dependsOn', 'state', ];
 
 exports = module.exports = {
     add: add,
@@ -27,8 +27,6 @@ function postProcess(result) {
     assert.strictEqual(typeof result, 'object');
 
     result.dependsOn = result.dependsOn ? result.dependsOn.split(',') : [ ];
-    result.config = safe.JSON.parse(result.configJson);
-    delete result.configJson;
 }
 
 function getPaged(page, perPage, callback) {
@@ -83,13 +81,12 @@ function add(backup, callback) {
     assert.strictEqual(typeof backup.version, 'string');
     assert(backup.type === exports.BACKUP_TYPE_APP || backup.type === exports.BACKUP_TYPE_BOX);
     assert(util.isArray(backup.dependsOn));
-    assert(backup.config && typeof backup.config === 'object');
     assert.strictEqual(typeof callback, 'function');
 
     var creationTime = backup.creationTime || new Date(); // allow tests to set the time
 
-    database.query('INSERT INTO backups (filename, version, type, creationTime, state, dependsOn, configJson) VALUES (?, ?, ?, ?, ?, ?, ?)',
-        [ backup.filename, backup.version, backup.type, creationTime, exports.BACKUP_STATE_NORMAL, backup.dependsOn.join(','), JSON.stringify(backup.config) ],
+    database.query('INSERT INTO backups (filename, version, type, creationTime, state, dependsOn) VALUES (?, ?, ?, ?, ?, ?)',
+        [ backup.filename, backup.version, backup.type, creationTime, exports.BACKUP_STATE_NORMAL, backup.dependsOn.join(',') ],
         function (error) {
         if (error && error.code === 'ER_DUP_ENTRY') return callback(new DatabaseError(DatabaseError.ALREADY_EXISTS));
         if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));

src/backups.js

@@ -20,8 +20,7 @@ var assert = require('assert'),
     debug = require('debug')('box:backups'),
     s3 = require('./storage/s3.js'),
     settings = require('./settings.js'),
-    util = require('util'),
-    _ = require('underscore');
+    util = require('util');
 
 function BackupsError(reason, errorOrMessage) {
     assert.strictEqual(typeof reason, 'string');
@@ -67,11 +66,6 @@ function getPaged(page, perPage, callback) {
     });
 }
 
-// this should probably be provider specific
-function cleanBackupConfig(backupConfig) {
-    return _.pick(backupConfig, 'provider', 'key', 'bucket', 'prefix', 'region');
-}
-
 function getByAppIdPaged(page, perPage, appId, callback) {
     assert(typeof page === 'number' && page > 0);
     assert(typeof perPage === 'number' && perPage > 0);
@@ -109,7 +103,7 @@ function getBackupUrl(appBackupIds, callback) {
             debug('getBackupUrl: id:%s url:%s sessionToken:%s backupKey:%s', obj.id, obj.url, obj.sessionToken, obj.backupKey);
 
             backupdb.add({ filename: filename, creationTime: now, version: config.version(), type: backupdb.BACKUP_TYPE_BOX,
-                           dependsOn: appBackupIds, config: cleanBackupConfig(backupConfig) }, function (error) {
+                           dependsOn: appBackupIds }, function (error) {
                 if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
 
                 callback(null, obj);
@@ -146,7 +140,7 @@ function getAppBackupUrl(app, callback) {
                 debug('getAppBackupUrl: %j', obj);
 
                 backupdb.add({ filename: dataFilename, creationTime: now, version: app.manifest.version, type: backupdb.BACKUP_TYPE_APP,
-                               dependsOn: [ ], config: cleanBackupConfig(backupConfig) }, function (error) {
+                               dependsOn: [ ] }, function (error) {
                     if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
 
                     callback(null, obj);
@@ -161,27 +155,22 @@ function getRestoreUrl(backupId, callback) {
     assert.strictEqual(typeof backupId, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    settings.getBackupConfig(function (error, apiConfig) {
+    settings.getBackupConfig(function (error, backupConfig) {
         if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
 
-        backupdb.get(backupId, function (error, result) {
-            if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
+        api(backupConfig.provider).getSignedDownloadUrl(backupConfig, backupId, function (error, result) {
+            if (error) return callback(error);
 
-            var backupConfig = result.config;
-            api(backupConfig.provider).getSignedDownloadUrl(apiConfig, backupConfig, backupId, function (error, result) {
-                if (error) return callback(error);
+            var obj = {
+                id: backupId,
+                url: result.url,
+                sessionToken: result.sessionToken,
+                backupKey: backupConfig.key
+            };
 
-                var obj = {
-                    id: backupId,
-                    url: result.url,
-                    sessionToken: result.sessionToken,
-                    backupKey: backupConfig.key
-                };
+            debug('getRestoreUrl: id:%s url:%s sessionToken:%s backupKey:%s', obj.id, obj.url, obj.sessionToken, obj.backupKey);
 
-                debug('getRestoreUrl: id:%s url:%s sessionToken:%s backupKey:%s', obj.id, obj.url, obj.sessionToken, obj.backupKey);
-
-                callback(null, obj);
-            });
+            callback(null, obj);
         });
     });
 }

src/storage/caas.js

@@ -79,23 +79,22 @@ function getSignedUploadUrl(apiConfig, filename, callback) {
     });
 }
 
-function getSignedDownloadUrl(apiConfig, info, filename, callback) {
+function getSignedDownloadUrl(apiConfig, filename, callback) {
     assert.strictEqual(typeof apiConfig, 'object');
-    assert.strictEqual(typeof info, 'object');
     assert.strictEqual(typeof filename, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    if (!info.bucket || !info.prefix || !info.region) return new Error('Invalid configuration'); // prevent error in s3
+    if (!apiConfig.bucket || !apiConfig.prefix) return new Error('Invalid configuration'); // prevent error in s3
 
     getBackupCredentials(apiConfig, function (error, credentials) {
         if (error) return callback(error);
 
-        credentials.region = info.region; // use same region as where we uploaded
+        credentials.region = apiConfig.region; // use same region as where we uploaded
         var s3 = new AWS.S3(credentials);
 
         var params = {
-            Bucket: info.bucket,
-            Key: info.prefix + '/' + filename,
+            Bucket: apiConfig.bucket,
+            Key: apiConfig.prefix + '/' + filename,
             Expires: 60 * 30 /* 30 minutes */
         };