From 6fa13f1bccae23adb126d7a344e3a5e3268b63bf Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Wed, 8 May 2019 15:28:22 -0700 Subject: [PATCH] caas: remove backupDone --- src/backups.js | 7 +------ src/caas.js | 30 ------------------------------ 2 files changed, 1 insertion(+), 36 deletions(-) diff --git a/src/backups.js b/src/backups.js index 60302cb05..6766a6deb 100644 --- a/src/backups.js +++ b/src/backups.js @@ -46,7 +46,6 @@ var addons = require('./addons.js'), async = require('async'), assert = require('assert'), backupdb = require('./backupdb.js'), - caas = require('./caas.js'), config = require('./config.js'), crypto = require('crypto'), database = require('./database.js'), @@ -785,11 +784,7 @@ function rotateBoxBackup(backupConfig, tag, appBackupIds, progressCallback, call debug(`Rotated box backup successfully as id ${backupId}`); - caas.backupDone(backupConfig, backupId, appBackupIds, function (error) { - if (error) return callback(error); - - callback(null, backupId); - }); + callback(null, backupId); }); }); }); diff --git a/src/caas.js b/src/caas.js index 013823bc5..d065d17aa 100644 --- a/src/caas.js +++ b/src/caas.js @@ -3,14 +3,11 @@ exports = module.exports = { verifySetupToken: verifySetupToken, - backupDone: backupDone, - CaasError: CaasError }; var assert = require('assert'), config = require('./config.js'), - debug = require('debug')('box:caas'), settings = require('./settings.js'), superagent = require('superagent'), util = require('util'); @@ -59,30 +56,3 @@ function verifySetupToken(setupToken, callback) { }); }); } - -function backupDone(apiConfig, backupId, appBackupIds, callback) { - assert.strictEqual(typeof apiConfig, 'object'); - assert.strictEqual(typeof backupId, 'string'); - assert(Array.isArray(appBackupIds)); - assert.strictEqual(typeof callback, 'function'); - - if (apiConfig.provider !== 'caas') return callback(); - - debug('[%s] backupDone: %s apps %j', backupId, backupId, appBackupIds); - - var url = config.apiServerOrigin() + '/api/v1/caas/boxes/' + apiConfig.boxId + '/backupDone'; - var data = { - boxVersion: config.version(), - backupId: backupId, - appId: null, // now unused - appVersion: null, // now unused - appBackupIds: appBackupIds - }; - - superagent.post(url).send(data).query({ token: apiConfig.token }).timeout(30 * 1000).end(function (error, result) { - if (error && !error.response) return callback(new CaasError(CaasError.EXTERNAL_ERROR, error.message)); - if (result.statusCode !== 200) return callback(new CaasError(CaasError.EXTERNAL_ERROR, result.text)); - - return callback(null); - }); -}