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

rename backups to backuptargets

Browse Source
This commit is contained in:
Girish Ramakrishnan
2025-07-24 18:46:21 +02:00
parent 5e456f378b
commit 931311f11f
20 changed files with 104 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/backupcleaner-test.js
+3 -3
View File
@@ -9,7 +9,7 @@
const archives = require('../archives.js'),
backupCleaner = require('../backupcleaner.js'),
backupListing = require('../backuplisting.js'),
backups = require('../backups.js'),
backupTargets = require('../backuptargets.js'),
common = require('./common.js'),
expect = require('expect.js'),
moment = require('moment'),
@@ -232,11 +232,11 @@ describe('backup cleaner', function () {
backupFolder: '/tmp/someplace',
format: 'tgz'
}));
await backups.setPolicy({ retention: { keepWithinSecs: 1 }, schedule: '00 00 23 * * *' });
await backupTargets.setPolicy({ retention: { keepWithinSecs: 1 }, schedule: '00 00 23 * * *' });
});
async function cleanupBackups() {
const taskId = await backups.startCleanupTask({ username: 'test' });
const taskId = await backupTargets.startCleanupTask({ username: 'test' });
console.log('started task', taskId);
src/test/backups-test.js
+9 -9
View File
@@ -7,7 +7,7 @@
'use strict';
const backupListing = require('../backuplisting.js'),
backups = require('../backups.js'),
backupTargets = require('../backuptargets.js'),
BoxError = require('../boxerror.js'),
common = require('./common.js'),
expect = require('expect.js'),
@@ -123,37 +123,37 @@ describe('backups', function () {
describe('config and policy', function () {
it('can get backup config', async function () {
const backupConfig = await backups.getConfig();
const backupConfig = await backupTargets.getConfig();
expect(backupConfig.provider).to.be('filesystem');
expect(backupConfig.backupFolder).to.be('/var/backups');
});
it('can set backup config', async function () {
let backupConfig = await backups.getConfig();
let backupConfig = await backupTargets.getConfig();
backupConfig = Object.assign({}, backupConfig, { backupFolder: '/tmp/backups' });
await backups.setConfig(backupConfig);
await backupTargets.setConfig(backupConfig);
const newBackupConfig = await backups.getConfig();
const newBackupConfig = await backupTargets.getConfig();
expect(newBackupConfig.backupFolder).to.be('/tmp/backups');
});
it('cannot set backup policy with invalid schedule', async function () {
const [error] = await safe(backups.setPolicy({ schedule: '', retention: { keepWithinSecs: 1 }}));
const [error] = await safe(backupTargets.setPolicy({ schedule: '', retention: { keepWithinSecs: 1 }}));
expect(error.reason).to.be(BoxError.BAD_FIELD);
});
it('cannot set backup policy with missing retention', async function () {
const [error] = await safe(backups.setPolicy({ schedule: '00 * * * * *'}));
const [error] = await safe(backupTargets.setPolicy({ schedule: '00 * * * * *'}));
expect(error.reason).to.be(BoxError.BAD_FIELD);
});
it('cannot set backup policy with invalid retention', async function () {
const [error] = await safe(backups.setPolicy({ schedule: '00 * * * * *', retention: { keepWhenever: 4 }}));
const [error] = await safe(backupTargets.setPolicy({ schedule: '00 * * * * *', retention: { keepWhenever: 4 }}));
expect(error.reason).to.be(BoxError.BAD_FIELD);
});
it('can set valid backup policy', async function () {
await backups.setPolicy({ schedule: '00 00 2,23 * * 0,1,2', retention: { keepWithinSecs: 1 }});
await backupTargets.setPolicy({ schedule: '00 00 2,23 * * 0,1,2', retention: { keepWithinSecs: 1 }});
});
});
});
src/test/backuptask-test.js
+3 -3
View File
@@ -7,7 +7,7 @@
'use strict';
const backupListing = require('../backuplisting.js'),
backups = require('../backups.js'),
backupTargets = require('../backuptargets.js'),
common = require('./common.js'),
expect = require('expect.js'),
fs = require('fs'),
@@ -34,11 +34,11 @@ describe('backuptask', function () {
before(async function () {
fs.rmSync(backupConfig.backupFolder, { recursive: true, force: true });
await backups.setStorage(backupConfig);
await backupTargets.setStorage(backupConfig);
});
async function createBackup() {
const taskId = await backups.startBackupTask({ username: 'test' });
const taskId = await backupTargets.startBackupTask({ username: 'test' });
while (true) {
await timers.setTimeout(1000);
src/test/common.js
+2 -2
View File
@@ -2,7 +2,7 @@
const apps = require('../apps.js'),
appstore = require('../appstore.js'),
backups = require('../backups.js'),
backupTargets = require('../backuptargets.js'),
constants = require('../constants.js'),
cron = require('../cron.js'),
dashboard = require('../dashboard.js'),
@@ -220,7 +220,7 @@ async function databaseSetup() {
await database._clear();
await appstore._setApiServerOrigin(exports.mockApiServerOrigin);
await dashboard._setLocation(constants.DASHBOARD_SUBDOMAIN, exports.dashboardDomain);
exports.defaultBackupTarget.id = await backups._addDefaultTarget();
exports.defaultBackupTarget.id = await backupTargets._addDefaultTarget();
}
async function domainSetup() {
src/test/storage-test.js
+3 -3
View File
@@ -6,7 +6,7 @@
'use strict';
const backups = require('../backups.js'),
const backupTargets = require('../backuptargets.js'),
BoxError = require('../boxerror.js'),
common = require('./common.js'),
execSync = require('child_process').execSync,
@@ -54,12 +54,12 @@ describe('Storage', function () {
it('fails to set backup storage for bad folder', async function () {
const tmp = Object.assign({}, gBackupConfig, { backupFolder: '/root/oof' });
const [error] = await safe(backups.setStorage(tmp));
const [error] = await safe(backupTargets.setStorage(tmp));
expect(error.reason).to.equal(BoxError.BAD_FIELD);
});
it('succeeds to set backup storage', async function () {
await backups.setStorage(gBackupConfig);
await backupTargets.setStorage(gBackupConfig);
expect(fs.existsSync(path.join(gBackupConfig.backupFolder, 'snapshot'))).to.be(true); // auto-created
});