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

drop configJson

Browse Source 
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)
This commit is contained in:
Girish Ramakrishnan
2016-04-03 22:29:16 -07:00
parent aaeb355183
commit 16a65fb185
5 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/storage/caas.js
View File

@@ -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 */
};