diff --git a/src/backups.js b/src/backups.js index 7b48278a7..a9ef175e0 100644 --- a/src/backups.js +++ b/src/backups.js @@ -120,7 +120,7 @@ function getBackupUrl(appBackupIds, callback) { settings.getBackupConfig(function (error, backupConfig) { if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error)); - api(backupConfig.provider).getBackupUrl(backupConfig, filename, function (error, result) { + api(backupConfig.provider).getBackupCredentials(backupConfig, filename, function (error, result) { if (error) return callback(error); result.id = filename; @@ -145,7 +145,7 @@ function getAppBackupUrl(app, callback) { settings.getBackupConfig(function (error, backupConfig) { if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error)); - api(backupConfig.provider).getBackupUrl(backupConfig, configFilename, function (error, result) { + api(backupConfig.provider).getBackupCredentials(backupConfig, configFilename, function (error, result) { if (error) return callback(error); result.id = dataFilename; diff --git a/src/storage/caas.js b/src/storage/caas.js index d752cac91..9d7edff39 100644 --- a/src/storage/caas.js +++ b/src/storage/caas.js @@ -1,7 +1,6 @@ 'use strict'; exports = module.exports = { - getBackupUrl: getBackupUrl, getRestoreUrl: getRestoreUrl, copyObject: copyObject, @@ -57,20 +56,6 @@ function getAllPaged(apiConfig, page, perPage, callback) { }); } -function getBackupUrl(apiConfig, filename, callback) { - assert.strictEqual(typeof apiConfig, 'object'); - assert.strictEqual(typeof filename, 'string'); - assert.strictEqual(typeof callback, 'function'); - - if (!apiConfig.bucket || !apiConfig.prefix) return new Error('Invalid configuration'); // prevent error in s3 - - getBackupCredentials(apiConfig, function (error, credentials) { - if (error) return callback(error); - - callback(null, credentials); - }); -} - function getRestoreUrl(apiConfig, filename, callback) { assert.strictEqual(typeof apiConfig, 'object'); assert.strictEqual(typeof filename, 'string'); diff --git a/src/storage/s3.js b/src/storage/s3.js index 553229b99..ce1d3ed2c 100644 --- a/src/storage/s3.js +++ b/src/storage/s3.js @@ -1,7 +1,6 @@ 'use strict'; exports = module.exports = { - getBackupUrl: getBackupUrl, getRestoreUrl: getRestoreUrl, copyObject: copyObject, @@ -65,28 +64,6 @@ function getAllPaged(apiConfig, page, perPage, callback) { }); } -function getBackupUrl(apiConfig, filename, callback) { - assert.strictEqual(typeof apiConfig, 'object'); - assert.strictEqual(typeof filename, 'string'); - assert.strictEqual(typeof callback, 'function'); - - getBackupCredentials(apiConfig, function (error, credentials) { - if (error) return callback(error); - - var s3 = new AWS.S3(credentials); - - var params = { - Bucket: apiConfig.bucket, - Key: apiConfig.prefix + '/' + filename, - Expires: 60 * 30 /* 30 minutes */ - }; - - var url = s3.getSignedUrl('putObject', params); - - callback(null, { url : url, id: filename }); - }); -} - function getRestoreUrl(apiConfig, filename, callback) { assert.strictEqual(typeof apiConfig, 'object'); assert.strictEqual(typeof filename, 'string');