jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

remove getBackupUrl

Browse Source
This commit is contained in:
Girish Ramakrishnan
2016-04-10 22:12:06 -07:00
parent 5229222014
commit 4ed368cdd8
3 changed files with 2 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backups.js
+2 -2
View File
@@ -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;
src/storage/caas.js
-15
View File
@@ -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');
src/storage/s3.js
-23
View File
@@ -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');