diff --git a/src/dns/cloudflare.js b/src/dns/cloudflare.js index 9a77c395c..66e4836ff 100644 --- a/src/dns/cloudflare.js +++ b/src/dns/cloudflare.js @@ -19,7 +19,6 @@ const assert = require('assert'), ipaddr = require('ipaddr.js'), safe = require('safetydance'), superagent = require('superagent'), - util = require('util'), waitForDns = require('./waitfordns.js'), _ = require('underscore'); @@ -38,20 +37,20 @@ function injectPrivateFields(newConfig, currentConfig) { function translateRequestError(result) { assert.strictEqual(typeof result, 'object'); - if (result.statusCode === 404) return new BoxError(BoxError.NOT_FOUND, util.format('%s %j', result.statusCode, 'API does not exist')); + if (result.statusCode === 404) return new BoxError(BoxError.NOT_FOUND, `[${result.statusCode}] ${JSON.stringify(result.body)}`); if (result.statusCode === 422) return new BoxError(BoxError.BAD_FIELD, result.body.message); if (result.statusCode === 400 || result.statusCode === 401 || result.statusCode === 403) { let message = 'Unknown error'; if (typeof result.body.error === 'string') { - message = `message: ${result.body.error} statusCode: ${result.statusCode}`; + message = `[${result.statusCode}] ${result.body.error}`; } else if (Array.isArray(result.body.errors) && result.body.errors.length > 0) { const error = result.body.errors[0]; - message = `message: ${error.message} statusCode: ${result.statusCode} code:${error.code}`; + message = `[${result.statusCode}] ${error.message} code:${error.code}`; } return new BoxError(BoxError.ACCESS_DENIED, message); } - return new BoxError(BoxError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body)); + return new BoxError(BoxError.EXTERNAL_ERROR, `${result.statusCode} ${JSON.stringify(result.body)}`); } function createRequest(method, url, domainConfig) { diff --git a/src/dns/desec.js b/src/dns/desec.js index 81d86f868..c62b34c63 100644 --- a/src/dns/desec.js +++ b/src/dns/desec.js @@ -19,13 +19,12 @@ const assert = require('assert'), safe = require('safetydance'), timers = require('timers/promises'), superagent = require('superagent'), - util = require('util'), waitForDns = require('./waitfordns.js'); const DESEC_ENDPOINT = 'https://desec.io/api/v1'; function formatError(response) { - return util.format('deSEC DNS error [%s] %j', response.statusCode, response.body); + return `deSEC DNS error [${response.statusCode}] ${JSON.stringify(response.body)}`; } function removePrivateFields(domainObject) { diff --git a/src/dns/gandi.js b/src/dns/gandi.js index 2a4b06c37..d5feb9672 100644 --- a/src/dns/gandi.js +++ b/src/dns/gandi.js @@ -18,13 +18,12 @@ const assert = require('assert'), dns = require('../dns.js'), safe = require('safetydance'), superagent = require('superagent'), - util = require('util'), waitForDns = require('./waitfordns.js'); const GANDI_API = 'https://dns.api.gandi.net/api/v5'; function formatError(response) { - return util.format(`Gandi DNS error [${response.statusCode}] ${response.body.message}`); + return `Gandi DNS error [${response.statusCode}] ${response.body.message}`; } function removePrivateFields(domainObject) { diff --git a/src/dns/godaddy.js b/src/dns/godaddy.js index a69ea9d79..226c7446b 100644 --- a/src/dns/godaddy.js +++ b/src/dns/godaddy.js @@ -18,14 +18,13 @@ const assert = require('assert'), dns = require('../dns.js'), safe = require('safetydance'), superagent = require('superagent'), - util = require('util'), waitForDns = require('./waitfordns.js'); // const GODADDY_API_OTE = 'https://api.ote-godaddy.com/v1/domains'; const GODADDY_API = 'https://api.godaddy.com/v1/domains'; function formatError(response) { - return util.format(`GoDaddy DNS error [${response.statusCode}] ${response.body.message}`); + return `GoDaddy DNS error [${response.statusCode}] ${response.body.message}`; } function removePrivateFields(domainObject) { diff --git a/src/dns/linode.js b/src/dns/linode.js index 08c38c9ed..259da7685 100644 --- a/src/dns/linode.js +++ b/src/dns/linode.js @@ -18,13 +18,12 @@ const assert = require('assert'), dns = require('../dns.js'), safe = require('safetydance'), superagent = require('superagent'), - util = require('util'), waitForDns = require('./waitfordns.js'); const LINODE_ENDPOINT = 'https://api.linode.com/v4'; function formatError(response) { - return util.format('Linode DNS error [%s] %j', response.statusCode, response.body); + return `Linode DNS error [${response.statusCode}] ${JSON.stringify(response.body)}`; } function removePrivateFields(domainObject) { @@ -126,7 +125,8 @@ async function upsert(domainObject, location, type, values) { debug('upsert: %s for zone %s of type %s with values %j', name, zoneName, type, values); const { zoneId, records } = await getZoneRecords(domainConfig, zoneName, name, type); - let i = 0, recordIds = []; // used to track available records to update instead of create + let i = 0; // used to track available records to update instead of create + const recordIds = []; for (const value of values) { const data = { diff --git a/src/dns/netcup.js b/src/dns/netcup.js index b8376dd8d..bc04af7bc 100644 --- a/src/dns/netcup.js +++ b/src/dns/netcup.js @@ -18,14 +18,13 @@ const assert = require('assert'), dns = require('../dns.js'), safe = require('safetydance'), superagent = require('superagent'), - util = require('util'), waitForDns = require('./waitfordns.js'); const API_ENDPOINT = 'https://ccp.netcup.net/run/webservice/servers/endpoint.php?JSON'; function formatError(response) { - if (response.body) return util.format('Netcup DNS error [%s] %s', response.body.statuscode, response.body.longmessage); - else return util.format('Netcup DNS error [%s] %s', response.statusCode, response.text); + if (response.body) return `Netcup DNS error [${response.body.statuscode}] ${response.body.longmessage}`; + else return `Netcup DNS error [${response.statusCode}] ${response.text}`; } function removePrivateFields(domainObject) { diff --git a/src/dns/vultr.js b/src/dns/vultr.js index f2409f616..ddab97f80 100644 --- a/src/dns/vultr.js +++ b/src/dns/vultr.js @@ -18,13 +18,12 @@ const assert = require('assert'), dns = require('../dns.js'), safe = require('safetydance'), superagent = require('superagent'), - util = require('util'), waitForDns = require('./waitfordns.js'); const VULTR_ENDPOINT = 'https://api.vultr.com/v2'; function formatError(response) { - return util.format('Vultr DNS error [%s] %j', response.statusCode, response.body); + return `Vultr DNS error [${response.statusCode}] ${JSON.stringify(response.body)}`; } function removePrivateFields(domainObject) {