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

Revert "getRestoreUrl now uses caas restore api"

Browse Source 
This reverts commit f9fc9325a8995dc0a9cb1dfcf22fb27eca697a89.

For now, we can simply assume that caas is s3 based.
This commit is contained in:
Girish Ramakrishnan
2016-04-04 15:54:16 -07:00
parent ec160fe45f
commit 8aacc503a6
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/storage/caas.js
View File

@@ -79,19 +79,28 @@ function getBackupUrl(apiConfig, filename, callback) {
});
}
function getRestoreUrl(apiConfig, backupId, callback) {
function getRestoreUrl(apiConfig, filename, callback) {
assert.strictEqual(typeof apiConfig, 'object');
assert.strictEqual(typeof backupId, 'string');
assert.strictEqual(typeof filename, 'string');
assert.strictEqual(typeof callback, 'function');
var url = config.apiServerOrigin() + '/api/v1/boxes/' + config.fqdn() + '/restoreurl';
if (!apiConfig.bucket || !apiConfig.prefix) return new Error('Invalid configuration'); // prevent error in s3
superagent.put(url).query({ token: config.token(), backupId: backupId }).end(function (error, result) {
if (error && !error.response) return callback(error);
if (result.statusCode !== 201) return callback(new Error(result.text));
if (!result.body || !result.body.url) return callback(new Error('Unexpected response'));
getBackupCredentials(apiConfig, function (error, credentials) {
if (error) return callback(error);
return callback(null, { url: result.body.url });
credentials.region = apiConfig.region; // use same region as where we uploaded
var s3 = new AWS.S3(credentials);
var params = {
Bucket: apiConfig.bucket,
Key: apiConfig.prefix + '/' + filename,
Expires: 60 * 30 /* 30 minutes */
};
var url = s3.getSignedUrl('getObject', params);
callback(null, { url: url });
});
}

2
src/storage/s3.js
View File

@@ -90,8 +90,6 @@ function getRestoreUrl(apiConfig, filename, callback) {
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);