diff --git a/src/apptask.js b/src/apptask.js index da445a240..7eb5c1762 100644 --- a/src/apptask.js +++ b/src/apptask.js @@ -267,13 +267,13 @@ function registerSubdomain(app, overwrite, callback) { debugApp(app, 'Registering subdomain location [%s] overwrite: %s', app.fqdn, overwrite); // get the current record before updating it - domains.getDNSRecords(app.location, app.domain, 'A', function (error, values) { + domains.getDnsRecords(app.location, app.domain, 'A', function (error, values) { if (error) return retryCallback(error); // refuse to update any existing DNS record for custom domains that we did not create if (values.length !== 0 && !overwrite) return retryCallback(null, new Error('DNS Record already exists')); - domains.upsertDNSRecords(app.location, app.domain, 'A', [ ip ], function (error, changeId) { + domains.upsertDnsRecords(app.location, app.domain, 'A', [ ip ], function (error, changeId) { if (error && (error.reason === DomainError.STILL_BUSY || error.reason === DomainError.EXTERNAL_ERROR)) return retryCallback(error); // try again retryCallback(null, error || changeId); @@ -305,7 +305,7 @@ function unregisterSubdomain(app, location, domain, callback) { async.retry({ times: 30, interval: 5000 }, function (retryCallback) { debugApp(app, 'Unregistering subdomain: %s', app.fqdn); - domains.removeDNSRecords(location, domain, 'A', [ ip ], function (error) { + domains.removeDnsRecords(location, domain, 'A', [ ip ], function (error) { if (error && error.reason === DomainError.NOT_FOUND) return retryCallback(null, null); // domain can be not found if oldConfig.domain or restoreConfig.domain was removed if (error && (error.reason === DomainError.STILL_BUSY || error.reason === DomainError.EXTERNAL_ERROR)) return retryCallback(error); // try again @@ -341,7 +341,7 @@ function waitForDnsPropagation(app, callback) { sysinfo.getPublicIp(function (error, ip) { if (error) return callback(error); - domains.waitForDNSRecord(app.fqdn, app.domain, ip, 'A', { interval: 5000, times: 120 }, callback); + domains.waitForDnsRecord(app.fqdn, app.domain, ip, 'A', { interval: 5000, times: 120 }, callback); }); } diff --git a/src/dns/cloudflare.js b/src/dns/cloudflare.js index b57d17b51..877f8ed83 100644 --- a/src/dns/cloudflare.js +++ b/src/dns/cloudflare.js @@ -58,7 +58,7 @@ function getZoneByName(dnsConfig, zoneName, callback) { }); } -function getDNSRecordsByZoneId(dnsConfig, zoneId, zoneName, subdomain, type, callback) { +function getDnsRecordsByZoneId(dnsConfig, zoneId, zoneName, subdomain, type, callback) { assert.strictEqual(typeof dnsConfig, 'object'); assert.strictEqual(typeof zoneId, 'string'); assert.strictEqual(typeof zoneName, 'string'); @@ -100,7 +100,7 @@ function upsert(dnsConfig, zoneName, subdomain, type, values, callback) { var zoneId = result.id; - getDNSRecordsByZoneId(dnsConfig, zoneId, zoneName, subdomain, type, function (error, result) { + getDnsRecordsByZoneId(dnsConfig, zoneId, zoneName, subdomain, type, function (error, result) { if (error) return callback(error); var dnsRecords = result; @@ -171,7 +171,7 @@ function get(dnsConfig, zoneName, subdomain, type, callback) { getZoneByName(dnsConfig, zoneName, function(error, result){ if (error) return callback(error); - getDNSRecordsByZoneId(dnsConfig, result.id, zoneName, subdomain, type, function(error, result) { + getDnsRecordsByZoneId(dnsConfig, result.id, zoneName, subdomain, type, function(error, result) { if (error) return callback(error); var tmp = result.map(function (record) { return record.content; }); @@ -193,7 +193,7 @@ function del(dnsConfig, zoneName, subdomain, type, values, callback) { getZoneByName(dnsConfig, zoneName, function(error, result){ if (error) return callback(error); - getDNSRecordsByZoneId(dnsConfig, result.id, zoneName, subdomain, type, function(error, result) { + getDnsRecordsByZoneId(dnsConfig, result.id, zoneName, subdomain, type, function(error, result) { if (error) return callback(error); if (result.length === 0) return callback(null); diff --git a/src/domains.js b/src/domains.js index 755909ffe..2facf5b3b 100644 --- a/src/domains.js +++ b/src/domains.js @@ -10,11 +10,11 @@ module.exports = exports = { fqdn: fqdn, setAdmin: setAdmin, - getDNSRecords: getDNSRecords, - upsertDNSRecords: upsertDNSRecords, - removeDNSRecords: removeDNSRecords, + getDnsRecords: getDnsRecords, + upsertDnsRecords: upsertDnsRecords, + removeDnsRecords: removeDnsRecords, - waitForDNSRecord: waitForDNSRecord, + waitForDnsRecord: waitForDnsRecord, DomainError: DomainError }; @@ -256,7 +256,7 @@ function getName(domain, subdomain) { return subdomain === '' ? part : subdomain + '.' + part; } -function getDNSRecords(subdomain, domain, type, callback) { +function getDnsRecords(subdomain, domain, type, callback) { assert.strictEqual(typeof subdomain, 'string'); assert.strictEqual(typeof domain, 'string'); assert.strictEqual(typeof type, 'string'); @@ -273,7 +273,7 @@ function getDNSRecords(subdomain, domain, type, callback) { }); } -function upsertDNSRecords(subdomain, domain, type, values, callback) { +function upsertDnsRecords(subdomain, domain, type, values, callback) { assert.strictEqual(typeof subdomain, 'string'); assert.strictEqual(typeof domain, 'string'); assert.strictEqual(typeof type, 'string'); @@ -293,7 +293,7 @@ function upsertDNSRecords(subdomain, domain, type, values, callback) { }); } -function removeDNSRecords(subdomain, domain, type, values, callback) { +function removeDnsRecords(subdomain, domain, type, values, callback) { assert.strictEqual(typeof subdomain, 'string'); assert.strictEqual(typeof domain, 'string'); assert.strictEqual(typeof type, 'string'); @@ -313,7 +313,7 @@ function removeDNSRecords(subdomain, domain, type, values, callback) { }); } -function waitForDNSRecord(fqdn, domain, value, type, options, callback) { +function waitForDnsRecord(fqdn, domain, value, type, options, callback) { assert.strictEqual(typeof fqdn, 'string'); assert.strictEqual(typeof domain, 'string'); assert(typeof value === 'string' || util.isRegExp(value)); diff --git a/src/dyndns.js b/src/dyndns.js index 45b9b4bdb..33bc68062 100644 --- a/src/dyndns.js +++ b/src/dyndns.js @@ -23,7 +23,7 @@ function sync(callback) { debug('refreshDNS: current ip %s', ip); - domains.upsertDNSRecords(config.adminLocation(), config.adminDomain(), 'A', [ ip ], function (error) { + domains.upsertDnsRecords(config.adminLocation(), config.adminDomain(), 'A', [ ip ], function (error) { if (error) return callback(error); debug('refreshDNS: done for admin location'); @@ -35,7 +35,7 @@ function sync(callback) { // do not change state of installing apps since apptask will error if dns record already exists if (app.installationState !== appdb.ISTATE_INSTALLED) return callback(); - domains.upsertDNSRecords(app.location, app.domain, 'A', [ ip ], callback); + domains.upsertDnsRecords(app.location, app.domain, 'A', [ ip ], callback); }, function (error) { if (error) return callback(error); diff --git a/src/mail.js b/src/mail.js index 38674d01d..938f71c48 100644 --- a/src/mail.js +++ b/src/mail.js @@ -618,7 +618,7 @@ function txtRecordsWithSpf(domain, callback) { assert.strictEqual(typeof domain, 'string'); assert.strictEqual(typeof callback, 'function'); - domains.getDNSRecords('', domain, 'TXT', function (error, txtRecords) { + domains.getDnsRecords('', domain, 'TXT', function (error, txtRecords) { if (error) return callback(error); debug('txtRecordsWithSpf: current txt records - %j', txtRecords); @@ -693,7 +693,7 @@ function addDnsRecords(domain, callback) { debug('addDnsRecords: will update %j', records); async.mapSeries(records, function (record, iteratorCallback) { - domains.upsertDNSRecords(record.subdomain, record.domain, record.type, record.values, iteratorCallback); + domains.upsertDnsRecords(record.subdomain, record.domain, record.type, record.values, iteratorCallback); }, function (error, changeIds) { if (error) debug('addDnsRecords: failed to update : %s. will retry', error); else debug('addDnsRecords: records %j added with changeIds %j', records, changeIds); @@ -808,7 +808,7 @@ function setMailEnabled(domain, enabled, callback) { ]; async.mapSeries(records, function (record, iteratorCallback) { - domains.upsertDNSRecords(record.subdomain, domain, record.type, record.values, iteratorCallback); + domains.upsertDnsRecords(record.subdomain, domain, record.type, record.values, iteratorCallback); }, NOOP_CALLBACK); callback(null); diff --git a/src/setup.js b/src/setup.js index fd3995fce..2f23345bf 100644 --- a/src/setup.js +++ b/src/setup.js @@ -145,7 +145,7 @@ function configureWebadmin(callback) { if (process.env.BOX_ENV === 'test') return callback(); async.retry({ times: 10, interval: 20000 }, function (retryCallback) { - domains.upsertDNSRecords(config.adminLocation(), domain, 'A', [ ip ], retryCallback); + domains.upsertDnsRecords(config.adminLocation(), domain, 'A', [ ip ], retryCallback); }, function (error) { if (error) debug('addWebadminDnsRecord: done updating records with error:', error); else debug('addWebadminDnsRecord: done'); @@ -162,7 +162,7 @@ function configureWebadmin(callback) { addWebadminDnsRecord(ip, config.adminDomain(), function (error) { if (error) return configureReverseProxy(error); - domains.waitForDNSRecord(config.adminFqdn(), config.adminDomain(), ip, 'A', { interval: 30000, times: 50000 }, function (error) { + domains.waitForDnsRecord(config.adminFqdn(), config.adminDomain(), ip, 'A', { interval: 30000, times: 50000 }, function (error) { if (error) return configureReverseProxy(error); gWebadminStatus.dns = true; diff --git a/src/test/dns-test.js b/src/test/dns-test.js index 6fd8b845a..65c1fa20e 100644 --- a/src/test/dns-test.js +++ b/src/test/dns-test.js @@ -55,7 +55,7 @@ describe('dns provider', function () { }); it('upsert succeeds', function (done) { - domains.upsertDNSRecords('test', DOMAIN_0.domain, 'A', [ '1.2.3.4' ], function (error, result) { + domains.upsertDnsRecords('test', DOMAIN_0.domain, 'A', [ '1.2.3.4' ], function (error, result) { expect(error).to.eql(null); expect(result).to.eql('noop-record-id'); @@ -64,7 +64,7 @@ describe('dns provider', function () { }); it('get succeeds', function (done) { - domains.getDNSRecords('test', DOMAIN_0.domain, 'A', function (error, result) { + domains.getDnsRecords('test', DOMAIN_0.domain, 'A', function (error, result) { expect(error).to.eql(null); expect(result).to.be.an(Array); expect(result.length).to.eql(0); @@ -74,7 +74,7 @@ describe('dns provider', function () { }); it('del succeeds', function (done) { - domains.removeDNSRecords('test', DOMAIN_0.domain, 'A', [ '1.2.3.4' ], function (error) { + domains.removeDnsRecords('test', DOMAIN_0.domain, 'A', [ '1.2.3.4' ], function (error) { expect(error).to.eql(null); done(); @@ -115,7 +115,7 @@ describe('dns provider', function () { .post('/v2/domains/' + DOMAIN_0.zoneName + '/records') .reply(201, { domain_record: DOMAIN_RECORD_0 }); - domains.upsertDNSRecords('test', DOMAIN_0.domain, 'A', [ '1.2.3.4' ], function (error, result) { + domains.upsertDnsRecords('test', DOMAIN_0.domain, 'A', [ '1.2.3.4' ], function (error, result) { expect(error).to.eql(null); expect(result).to.eql('3352892'); expect(req1.isDone()).to.be.ok(); @@ -165,7 +165,7 @@ describe('dns provider', function () { .put('/v2/domains/' + DOMAIN_0.zoneName + '/records/' + DOMAIN_RECORD_1.id) .reply(200, { domain_record: DOMAIN_RECORD_1_NEW }); - domains.upsertDNSRecords('test', DOMAIN_0.domain, 'A', [ DOMAIN_RECORD_1_NEW.data ], function (error, result) { + domains.upsertDnsRecords('test', DOMAIN_0.domain, 'A', [ DOMAIN_RECORD_1_NEW.data ], function (error, result) { expect(error).to.eql(null); expect(result).to.eql('3352893'); expect(req1.isDone()).to.be.ok(); @@ -251,7 +251,7 @@ describe('dns provider', function () { .post('/v2/domains/' + DOMAIN_0.zoneName + '/records') .reply(201, { domain_record: DOMAIN_RECORD_2_NEW }); - domains.upsertDNSRecords('', DOMAIN_0.domain, 'TXT', [ DOMAIN_RECORD_2_NEW.data, DOMAIN_RECORD_1_NEW.data, DOMAIN_RECORD_3_NEW.data ], function (error, result) { + domains.upsertDnsRecords('', DOMAIN_0.domain, 'TXT', [ DOMAIN_RECORD_2_NEW.data, DOMAIN_RECORD_1_NEW.data, DOMAIN_RECORD_3_NEW.data ], function (error, result) { expect(error).to.eql(null); expect(result).to.eql('3352893'); expect(req1.isDone()).to.be.ok(); @@ -290,7 +290,7 @@ describe('dns provider', function () { .get('/v2/domains/' + DOMAIN_0.zoneName + '/records') .reply(200, { domain_records: [ DOMAIN_RECORD_0, DOMAIN_RECORD_1 ] }); - domains.getDNSRecords('test', DOMAIN_0.domain, 'A', function (error, result) { + domains.getDnsRecords('test', DOMAIN_0.domain, 'A', function (error, result) { expect(error).to.eql(null); expect(result).to.be.an(Array); expect(result.length).to.eql(1); @@ -331,7 +331,7 @@ describe('dns provider', function () { .delete('/v2/domains/' + DOMAIN_0.zoneName + '/records/' + DOMAIN_RECORD_1.id) .reply(204, {}); - domains.removeDNSRecords('test', DOMAIN_0.domain, 'A', ['1.2.3.4'], function (error) { + domains.removeDnsRecords('test', DOMAIN_0.domain, 'A', ['1.2.3.4'], function (error) { expect(error).to.eql(null); expect(req1.isDone()).to.be.ok(); expect(req2.isDone()).to.be.ok(); @@ -437,7 +437,7 @@ describe('dns provider', function () { } }]); - domains.upsertDNSRecords('test', DOMAIN_0.domain, 'A', [ '1.2.3.4' ], function (error, result) { + domains.upsertDnsRecords('test', DOMAIN_0.domain, 'A', [ '1.2.3.4' ], function (error, result) { expect(error).to.eql(null); expect(result).to.eql('/change/C2QLKQIWEI0BZF'); expect(awsAnswerQueue.length).to.eql(0); @@ -456,7 +456,7 @@ describe('dns provider', function () { } }]); - domains.upsertDNSRecords('test', DOMAIN_0.domain, 'A', [ '1.2.3.4' ], function (error, result) { + domains.upsertDnsRecords('test', DOMAIN_0.domain, 'A', [ '1.2.3.4' ], function (error, result) { expect(error).to.eql(null); expect(result).to.eql('/change/C2QLKQIWEI0BZF'); expect(awsAnswerQueue.length).to.eql(0); @@ -475,7 +475,7 @@ describe('dns provider', function () { } }]); - domains.upsertDNSRecords('', DOMAIN_0.domain, 'TXT', [ 'first', 'second', 'third' ], function (error, result) { + domains.upsertDnsRecords('', DOMAIN_0.domain, 'TXT', [ 'first', 'second', 'third' ], function (error, result) { expect(error).to.eql(null); expect(result).to.eql('/change/C2QLKQIWEI0BZF'); expect(awsAnswerQueue.length).to.eql(0); @@ -496,7 +496,7 @@ describe('dns provider', function () { }] }]); - domains.getDNSRecords('test', DOMAIN_0.domain, 'A', function (error, result) { + domains.getDnsRecords('test', DOMAIN_0.domain, 'A', function (error, result) { expect(error).to.eql(null); expect(result).to.be.an(Array); expect(result.length).to.eql(1); @@ -517,7 +517,7 @@ describe('dns provider', function () { } }]); - domains.removeDNSRecords('test', DOMAIN_0.domain, 'A', ['1.2.3.4'], function (error) { + domains.removeDnsRecords('test', DOMAIN_0.domain, 'A', ['1.2.3.4'], function (error) { expect(error).to.eql(null); expect(awsAnswerQueue.length).to.eql(0); @@ -588,7 +588,7 @@ describe('dns provider', function () { zoneQueue.push([null, [ ]]); // getRecords zoneQueue.push([null, {id: '1'}]); - domains.upsertDNSRecords('test', DOMAIN_0.domain, 'A', [ '1.2.3.4' ], function (error, result) { + domains.upsertDnsRecords('test', DOMAIN_0.domain, 'A', [ '1.2.3.4' ], function (error, result) { expect(error).to.eql(null); expect(result).to.eql('1'); expect(zoneQueue.length).to.eql(0); @@ -602,7 +602,7 @@ describe('dns provider', function () { zoneQueue.push([null, [GCDNS().zone('test').record('A', {'name': 'test', data:['5.6.7.8'], ttl: 1})]]); zoneQueue.push([null, {id: '2'}]); - domains.upsertDNSRecords('test', DOMAIN_0.domain, 'A', [ '1.2.3.4' ], function (error, result) { + domains.upsertDnsRecords('test', DOMAIN_0.domain, 'A', [ '1.2.3.4' ], function (error, result) { expect(error).to.eql(null); expect(result).to.eql('2'); expect(zoneQueue.length).to.eql(0); @@ -616,7 +616,7 @@ describe('dns provider', function () { zoneQueue.push([null, [ ]]); // getRecords zoneQueue.push([null, {id: '3'}]); - domains.upsertDNSRecords('', DOMAIN_0.domain, 'TXT', [ 'first', 'second', 'third' ], function (error, result) { + domains.upsertDnsRecords('', DOMAIN_0.domain, 'TXT', [ 'first', 'second', 'third' ], function (error, result) { expect(error).to.eql(null); expect(result).to.eql('3'); expect(zoneQueue.length).to.eql(0); @@ -629,7 +629,7 @@ describe('dns provider', function () { zoneQueue.push([null, HOSTED_ZONES]); zoneQueue.push([null, [GCDNS().zone('test').record('A', {'name': 'test', data:['1.2.3.4', '5.6.7.8'], ttl: 1})]]); - domains.getDNSRecords('test', DOMAIN_0.domain, 'A', function (error, result) { + domains.getDnsRecords('test', DOMAIN_0.domain, 'A', function (error, result) { expect(error).to.eql(null); expect(result).to.be.an(Array); expect(result.length).to.eql(2); @@ -645,7 +645,7 @@ describe('dns provider', function () { zoneQueue.push([null, [GCDNS().zone('test').record('A', {'name': 'test', data:['5.6.7.8'], ttl: 1})]]); zoneQueue.push([null, {id: '5'}]); - domains.removeDNSRecords('test', DOMAIN_0.domain, 'A', ['1.2.3.4'], function (error) { + domains.removeDnsRecords('test', DOMAIN_0.domain, 'A', ['1.2.3.4'], function (error) { expect(error).to.eql(null); expect(zoneQueue.length).to.eql(0);