navy 4.1.2-rc.2 → 5.0.0

package/lib/util/__tests__/registry-client.js

@@ -1,17 +1,16 @@
-'use strict';
+"use strict";
 
-var _chai = require('chai');
+var _chai = require("chai");
 
-var _registryClient = require('../registry-client');
+var _registryClient = require("../registry-client");
 
 /* eslint-env mocha */
+
 /* eslint-disable no-unused-expressions */
-/* eslint-enable chai-friendly/no-unused-expressions */
 
+/* eslint-enable chai-friendly/no-unused-expressions */
 describe('docker registry client', function () {
-
   describe('getAuthForRegistry', function () {
-
     beforeEach(function () {
       this.config = {
         auths: {
@@ -26,68 +25,56 @@ describe('docker registry client', function () {
         }
       };
     });
-
     it('should return the auth config for the given registry', function () {
       (0, _chai.expect)((0, _registryClient.getAuthForRegistry)('quay.io', this.config)).to.eql({
         auth: 'pretend-base64-of-username-and-password',
         email: 'test@navy.rocks'
       });
     });
-
     it('should return the auth config for Docker Hub if given', function () {
       (0, _chai.expect)((0, _registryClient.getAuthForRegistry)('registry-1.docker.io', this.config)).to.eql({
         auth: 'pretend-base64-of-username-and-password',
         email: 'test@navy.rocks'
       });
     });
-
     it('should return null if there is no authentication for the given registry', function () {
       (0, _chai.expect)((0, _registryClient.getAuthForRegistry)('foo.bar', this.config)).to.be.null;
     });
-
     it('should return null if there is no docker config', function () {
       (0, _chai.expect)((0, _registryClient.getAuthForRegistry)('foo.bar', null)).to.be.null;
     });
   });
-
   describe('credentialsFromAuth', function () {
-
     it('should return the username and password from base64 encoded auth', function () {
-      (0, _chai.expect)((0, _registryClient.credentialsFromAuth)({ auth: 'YmFyOnBhc3N3b3Jk' })).to.eql({
+      (0, _chai.expect)((0, _registryClient.credentialsFromAuth)({
+        auth: 'YmFyOnBhc3N3b3Jk'
+      })).to.eql({
         username: 'bar',
         password: 'password'
       });
     });
-
     it('should throw invariant violation when auth is invalid base64', function () {
-      (0, _chai.expect)(function () {
-        return (0, _registryClient.credentialsFromAuth)({ auth: 'zjasj' });
-      }).to.throw('Invalid base64 string in docker/config.json for registry authentication');
+      (0, _chai.expect)(() => (0, _registryClient.credentialsFromAuth)({
+        auth: 'zjasj'
+      })).to.throw('Invalid base64 string in docker/config.json for registry authentication');
     });
   });
-
   describe('registryFromImage', function () {
-
     it('should return the correct registry domain from the given image', function () {
       (0, _chai.expect)((0, _registryClient.registryFromImage)('quay.io/someorg/someimage')).to.equal('quay.io');
     });
-
     it('should return the correct registry domain from the given image with tag', function () {
       (0, _chai.expect)((0, _registryClient.registryFromImage)('quay.io/someorg/someimage:some-tag')).to.equal('quay.io');
     });
-
     it('should return the correct registry domain from the given image from docker hub', function () {
       (0, _chai.expect)((0, _registryClient.registryFromImage)('someuser/someimage')).to.equal('registry-1.docker.io');
     });
-
     it('should return the correct registry domain from the given image with tag from docker hub', function () {
       (0, _chai.expect)((0, _registryClient.registryFromImage)('someuser/someimage:some-tag')).to.equal('registry-1.docker.io');
     });
-
     it('should return the correct registry domain from the given library image from docker hub', function () {
       (0, _chai.expect)((0, _registryClient.registryFromImage)('someimage')).to.equal('registry-1.docker.io');
     });
-
     it('should return the correct registry domain from the given library image with tag from docker hub', function () {
       (0, _chai.expect)((0, _registryClient.registryFromImage)('someimage:some-tag')).to.equal('registry-1.docker.io');
     });

package/lib/util/__tests__/service-host.js

@@ -1,145 +1,48 @@
-'use strict';
+"use strict";
 
-var _regenerator = require('babel-runtime/regenerator');
+var _chai = require("chai");
 
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var _chai = require('chai');
-
-var _serviceHost = require('../service-host');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _serviceHost = require("../service-host");
 
 /* eslint-env mocha */
-
 describe('service-host', function () {
-
   describe('getNIPSubdomain', function () {
-
-    it('should return an nip.io domain with the correct IP address', (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee() {
-      return _regenerator2.default.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              _context.t0 = _chai.expect;
-              _context.next = 3;
-              return (0, _serviceHost.getNIPSubdomain)('192.168.1.10');
-
-            case 3:
-              _context.t1 = _context.sent;
-              (0, _context.t0)(_context.t1).to.equal('192.168.1.10.nip.io');
-
-            case 5:
-            case 'end':
-              return _context.stop();
-          }
-        }
-      }, _callee, this);
-    })));
-
-    it('should fallback to localhost when a hostname is passed instead of an IP address', (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
-      return _regenerator2.default.wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              process.env.NAVY_EXTERNAL_IP = 'somehostname';
-              _context2.t0 = _chai.expect;
-              _context2.next = 4;
-              return (0, _serviceHost.getNIPSubdomain)('somehostname');
-
-            case 4:
-              _context2.t1 = _context2.sent;
-              (0, _context2.t0)(_context2.t1).to.equal('127.0.0.1.nip.io');
-
-            case 6:
-            case 'end':
-              return _context2.stop();
-          }
-        }
-      }, _callee2, this);
-    })));
+    it('should return an nip.io domain with the correct IP address', async function () {
+      (0, _chai.expect)(await (0, _serviceHost.getNIPSubdomain)('192.168.1.10')).to.equal('192.168.1.10.nip.io');
+    });
+    it('should fallback to localhost when a hostname is passed instead of an IP address', async function () {
+      process.env.NAVY_EXTERNAL_IP = 'somehostname';
+      (0, _chai.expect)(await (0, _serviceHost.getNIPSubdomain)('somehostname')).to.equal('127.0.0.1.nip.io');
+    });
   });
-
   describe('createHostForService', function () {
-
-    it('should return the correct host for a service', (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
-      return _regenerator2.default.wrap(function _callee3$(_context3) {
-        while (1) {
-          switch (_context3.prev = _context3.next) {
-            case 0:
-              _context3.t0 = _chai.expect;
-              _context3.next = 3;
-              return (0, _serviceHost.createHostForService)('someservice', 'mynavy', '127.0.0.1');
-
-            case 3:
-              _context3.t1 = _context3.sent;
-              (0, _context3.t0)(_context3.t1).to.equal('someservice.mynavy.127.0.0.1.nip.io');
-              _context3.t2 = _chai.expect;
-              _context3.next = 8;
-              return (0, _serviceHost.createHostForService)('someservice', 'mynavy', '192.168.1.10');
-
-            case 8:
-              _context3.t3 = _context3.sent;
-              (0, _context3.t2)(_context3.t3).to.equal('someservice.mynavy.192.168.1.10.nip.io');
-
-            case 10:
-            case 'end':
-              return _context3.stop();
-          }
-        }
-      }, _callee3, this);
-    })));
+    it('should return the correct host for a service', async function () {
+      (0, _chai.expect)(await (0, _serviceHost.createHostForService)('someservice', 'mynavy', '127.0.0.1')).to.equal('someservice.mynavy.127.0.0.1.nip.io');
+      (0, _chai.expect)(await (0, _serviceHost.createHostForService)('someservice', 'mynavy', '192.168.1.10')).to.equal('someservice.mynavy.192.168.1.10.nip.io');
+    });
   });
-
   describe('createUrlForService', function () {
-
-    it('should return the correct url for a service', (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
-      return _regenerator2.default.wrap(function _callee4$(_context4) {
-        while (1) {
-          switch (_context4.prev = _context4.next) {
-            case 0:
-              _context4.t0 = _chai.expect;
-              _context4.next = 3;
-              return (0, _serviceHost.createUrlForService)('someservice', 'mynavy', '192.168.99.100');
-
-            case 3:
-              _context4.t1 = _context4.sent;
-              (0, _context4.t0)(_context4.t1).to.equal('http://someservice.mynavy.192.168.99.100.nip.io');
-
-            case 5:
-            case 'end':
-              return _context4.stop();
-          }
-        }
-      }, _callee4, this);
-    })));
+    it('should return the correct url for a service', async function () {
+      (0, _chai.expect)(await (0, _serviceHost.createUrlForService)('someservice', 'mynavy', '192.168.99.100')).to.equal('http://someservice.mynavy.192.168.99.100.nip.io');
+    });
   });
-
   describe('getUrlFromService', function () {
-
     it('should extract the host from service ENV config', function () {
-      var service = {
+      const service = {
         raw: {
           Config: {
             Env: ['VIRTUAL_HOST=myservice.coolnavy.127.0.0.1.nip.io']
           }
         }
       };
-
       (0, _chai.expect)((0, _serviceHost.getUrlFromService)(service)).to.equal('http://myservice.coolnavy.127.0.0.1.nip.io');
     });
-
     it('should return null when the service object is not valid', function () {
-      var service = {
+      const service = {
         raw: {
           Config: {}
         }
       };
-
       (0, _chai.expect)((0, _serviceHost.getUrlFromService)(service)).to.equal(null);
       (0, _chai.expect)((0, _serviceHost.getUrlFromService)(undefined)).to.equal(null);
     });

package/lib/util/docker-client.js

@@ -1,22 +1,19 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = void 0;
 
-var _dockerode = require('dockerode');
-
-var _dockerode2 = _interopRequireDefault(_dockerode);
-
-var _bluebird = require('bluebird');
+var _dockerode = _interopRequireDefault(require("dockerode"));
 
-var _bluebird2 = _interopRequireDefault(_bluebird);
+var _bluebird = _interopRequireDefault(require("bluebird"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var dockerClient = new _dockerode2.default({
-  Promise: _bluebird2.default
+const dockerClient = new _dockerode.default({
+  Promise: _bluebird.default
 });
-
-exports.default = dockerClient;
+var _default = dockerClient;
+exports.default = _default;
 module.exports = exports.default;

package/lib/util/exec-async.js

@@ -1,45 +1,27 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
-var _promise = require('babel-runtime/core-js/promise');
-
-var _promise2 = _interopRequireDefault(_promise);
-
 exports.execAsync = execAsync;
 
-var _child_process = require('child_process');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var debug = require('debug')('navy:exec');
+var _child_process = require("child_process");
 
-function execAsync(command) {
-  var args = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  var callback = arguments[2];
-  var opts = arguments[3];
-
-  return new _promise2.default(function (resolve, reject) {
-    var cmd = command + ' ' + args.join(' ');
+const debug = require('debug')('navy:exec');
 
+function execAsync(command, args = [], callback, opts) {
+  return new Promise((resolve, reject) => {
+    const cmd = command + ' ' + args.join(' ');
     debug('Executing ' + cmd);
-
-    var childProcess = (0, _child_process.exec)(cmd, opts, function (err, stdout, stderr) {
+    const childProcess = (0, _child_process.exec)(cmd, opts, (err, stdout, stderr) => {
       if (err) {
         reject(err);
       } else {
         resolve(stdout.toString());
       }
     });
-
-    childProcess.stdout.on('data', function (line) {
-      return debug('out: ' + line.toString());
-    });
-    childProcess.stderr.on('data', function (line) {
-      return debug('err: ' + line.toString());
-    });
+    childProcess.stdout.on('data', line => debug('out: ' + line.toString()));
+    childProcess.stderr.on('data', line => debug('err: ' + line.toString()));
 
     if (callback) {
       callback(childProcess);

package/lib/util/external-ip.js

@@ -1,134 +1,56 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getExternalIP = exports.dnsLookup = undefined;
-
-var _regenerator = require('babel-runtime/regenerator');
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _promise = require('babel-runtime/core-js/promise');
-
-var _promise2 = _interopRequireDefault(_promise);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var dnsLookup = exports.dnsLookup = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(hostname) {
-    return _regenerator2.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return new _promise2.default(function (resolve, reject) {
-              _dns2.default.lookup(hostname, null, function (err, ip, ipFamily) {
-                if (err || ipFamily !== IPV4_FAMILY) {
-                  reject(new Error('Failed to lookup hostname "' + hostname + '"'));
-                } else {
-                  resolve(ip);
-                }
-              });
-            });
-
-          case 2:
-            return _context.abrupt('return', _context.sent);
-
-          case 3:
-          case 'end':
-            return _context.stop();
-        }
-      }
-    }, _callee, this);
-  }));
-
-  return function dnsLookup(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-var getExternalIP = exports.getExternalIP = function () {
-  var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(ipInConfig) {
-    var dockerHost, ip;
-    return _regenerator2.default.wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            dockerHost = process.env.DOCKER_HOST;
-
-            // DEPRECATED use NAVY_EXTERNAL_IP instead
-
-            if (!process.env.NAVY_HOST) {
-              _context2.next = 3;
-              break;
-            }
+exports.dnsLookup = dnsLookup;
+exports.getExternalIP = getExternalIP;
 
-            return _context2.abrupt('return', process.env.NAVY_HOST);
+var _dns = _interopRequireDefault(require("dns"));
 
-          case 3:
-            if (!process.env.NAVY_EXTERNAL_IP) {
-              _context2.next = 5;
-              break;
-            }
+const IPV4_FAMILY = 4;
 
-            return _context2.abrupt('return', process.env.NAVY_EXTERNAL_IP);
-
-          case 5:
-            if (!ipInConfig) {
-              _context2.next = 9;
-              break;
-            }
-
-            _context2.next = 8;
-            return dnsLookup(ipInConfig);
-
-          case 8:
-            return _context2.abrupt('return', _context2.sent);
-
-          case 9:
-            if (!(dockerHost && dockerHost.indexOf('tcp://') !== -1)) {
-              _context2.next = 16;
-              break;
-            }
-
-            // OSX with docker-machine, or a remote docker
-            // dockerHost will be formatted like:
-            // tcp://_._._._:_
-            // We only care about the IP address
-
-            ip = dockerHost.substring('tcp://'.length);
-
-            ip = ip.substring(0, ip.lastIndexOf(':')).trim();
-            _context2.next = 14;
-            return dnsLookup(ip);
-
-          case 14:
-            ip = _context2.sent;
-            return _context2.abrupt('return', ip);
-
-          case 16:
-            return _context2.abrupt('return', '127.0.0.1');
-
-          case 17:
-          case 'end':
-            return _context2.stop();
-        }
+async function dnsLookup(hostname) {
+  return await new Promise((resolve, reject) => {
+    _dns.default.lookup(hostname, null, (err, ip, ipFamily) => {
+      if (err || ipFamily !== IPV4_FAMILY) {
+        reject(new Error('Failed to lookup hostname "' + hostname + '"'));
+      } else {
+        resolve(ip);
       }
-    }, _callee2, this);
-  }));
-
-  return function getExternalIP(_x2) {
-    return _ref2.apply(this, arguments);
-  };
-}();
-
-var _dns = require('dns');
-
-var _dns2 = _interopRequireDefault(_dns);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var IPV4_FAMILY = 4;
+    });
+  });
+}
+
+async function getExternalIP(ipInConfig) {
+  const dockerHost = process.env.DOCKER_HOST; // DEPRECATED use NAVY_EXTERNAL_IP instead
+
+  if (process.env.NAVY_HOST) {
+    return process.env.NAVY_HOST;
+  }
+
+  if (process.env.NAVY_EXTERNAL_IP) {
+    // Custom external IP
+    return process.env.NAVY_EXTERNAL_IP;
+  }
+
+  if (ipInConfig) {
+    return await dnsLookup(ipInConfig);
+  }
+
+  if (dockerHost && dockerHost.indexOf('tcp://') !== -1) {
+    // OSX with docker-machine, or a remote docker
+    // dockerHost will be formatted like:
+    // tcp://_._._._:_
+    // We only care about the IP address
+    let ip = dockerHost.substring('tcp://'.length);
+    ip = ip.substring(0, ip.lastIndexOf(':')).trim();
+    ip = await dnsLookup(ip);
+    return ip;
+  } // No custom docker host, assume localhost
+
+
+  return '127.0.0.1';
+}

package/lib/util/fs.js

@@ -1,14 +1,15 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = void 0;
 
-var _bluebird = require('bluebird');
-
-var _bluebird2 = _interopRequireDefault(_bluebird);
+var _bluebird = _interopRequireDefault(require("bluebird"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _default = _bluebird.default.promisifyAll(require('fs'));
 
-exports.default = _bluebird2.default.promisifyAll(require('fs'));
+exports.default = _default;
 module.exports = exports.default;

package/lib/util/get-lan-ip.js

@@ -1,61 +1,24 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getLANIP = undefined;
-
-var _regenerator = require('babel-runtime/regenerator');
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _promise = require('babel-runtime/core-js/promise');
-
-var _promise2 = _interopRequireDefault(_promise);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
+exports.getLANIP = getLANIP;
 
-var getLANIP = exports.getLANIP = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee() {
-    return _regenerator2.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return new _promise2.default(function (resolve, reject) {
-              _dns2.default.lookup(_os2.default.hostname(), null, function (err, addr) {
-                if (err) {
-                  return reject(err);
-                }
+var _dns = _interopRequireDefault(require("dns"));
 
-                return resolve(addr);
-              });
-            });
+var _os = _interopRequireDefault(require("os"));
 
-          case 2:
-            return _context.abrupt('return', _context.sent);
-
-          case 3:
-          case 'end':
-            return _context.stop();
-        }
+async function getLANIP() {
+  return await new Promise((resolve, reject) => {
+    _dns.default.lookup(_os.default.hostname(), null, (err, addr) => {
+      if (err) {
+        return reject(err);
       }
-    }, _callee, this);
-  }));
-
-  return function getLANIP() {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-var _dns = require('dns');
-
-var _dns2 = _interopRequireDefault(_dns);
-
-var _os = require('os');
-
-var _os2 = _interopRequireDefault(_os);
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+      return resolve(addr);
+    });
+  });
+}