navy 4.1.2-rc.2 → 5.0.0

package/lib/config-providers/npm/index.js

@@ -1,272 +1,101 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
-var _regenerator = require('babel-runtime/regenerator');
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var tryAndInstall = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(pkgName) {
-    return _regenerator2.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return mkdirp(nodeModulesPath);
-
-          case 2:
-            _context.prev = 2;
-
-            // $FlowIgnore some weird bug with execSync
-            (0, _child_process.execSync)('npm info ' + pkgName + ' name', { stdio: 'ignore' });
-            _context.next = 9;
-            break;
-
-          case 6:
-            _context.prev = 6;
-            _context.t0 = _context['catch'](2);
-            throw new Error('Package "' + pkgName + '" not found or unreachable');
-
-          case 9:
-
-            // $FlowIgnore some weird bug with execSync
-            (0, _child_process.execSync)('npm i ' + pkgName, { stdio: 'inherit', cwd: npmContext });
-
-          case 10:
-          case 'end':
-            return _context.stop();
-        }
-      }
-    }, _callee, this, [[2, 6]]);
-  }));
-
-  return function tryAndInstall(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
 exports.default = createNpmConfigProvider;
 
-var _path = require('path');
+var _path = _interopRequireDefault(require("path"));
 
-var _path2 = _interopRequireDefault(_path);
+var _child_process = require("child_process");
 
-var _child_process = require('child_process');
+var _invariant = _interopRequireDefault(require("invariant"));
 
-var _invariant = require('invariant');
+var _bluebird = _interopRequireDefault(require("bluebird"));
 
-var _invariant2 = _interopRequireDefault(_invariant);
+var _fs = _interopRequireDefault(require("../../util/fs"));
 
-var _bluebird = require('bluebird');
+var _state = require("../../navy/state");
 
-var _bluebird2 = _interopRequireDefault(_bluebird);
+var _util = require("./util");
 
-var _fs = require('../../util/fs');
+const mkdirp = _bluebird.default.promisify(require('mkdirp'));
 
-var _fs2 = _interopRequireDefault(_fs);
+const npmContext = _path.default.join((0, _state.pathToNavyRoot)(), 'npm');
 
-var _state = require('../../navy/state');
+const nodeModulesPath = _path.default.join(npmContext, 'node_modules');
 
-var _util = require('./util');
+async function tryAndInstall(pkgName) {
+  await mkdirp(nodeModulesPath);
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+  try {
+    // $FlowIgnore some weird bug with execSync
+    (0, _child_process.execSync)(`npm info ${pkgName} name`, {
+      stdio: 'ignore'
+    });
+  } catch (ex) {
+    throw new Error(`Package "${pkgName}" not found or unreachable`);
+  } // $FlowIgnore some weird bug with execSync
 
-var mkdirp = _bluebird2.default.promisify(require('mkdirp'));
 
-var npmContext = _path2.default.join((0, _state.pathToNavyRoot)(), 'npm');
-var nodeModulesPath = _path2.default.join(npmContext, 'node_modules');
+  (0, _child_process.execSync)(`npm i ${pkgName}`, {
+    stdio: 'inherit',
+    cwd: npmContext
+  });
+}
 
 function createNpmConfigProvider(navy) {
   return {
-    getNavyPath: function getNavyPath() {
-      var _this = this;
-
-      return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
-        var envState, navyPath;
-        return _regenerator2.default.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                _context2.next = 2;
-                return navy.getState();
-
-              case 2:
-                envState = _context2.sent;
-
-
-                (0, _invariant2.default)(!!envState, 'STATE_NONEXISTANT: State doesn\'t exist for navy %s', navy.name);
-                (0, _invariant2.default)(!!envState.npmPackage, 'NPM_PROVIDER_REQUIRES_PACKAGE: NPM config provider requires an NPM package for %s', navy.name);
-
-                _context2.next = 7;
-                return (0, _util.pathToModule)(nodeModulesPath, envState.npmPackage);
-
-              case 7:
-                navyPath = _context2.sent;
+    async getNavyPath() {
+      const envState = await navy.getState();
+      (0, _invariant.default)(!!envState, "STATE_NONEXISTANT: State doesn't exist for navy %s", navy.name);
+      (0, _invariant.default)(!!envState.npmPackage, "NPM_PROVIDER_REQUIRES_PACKAGE: NPM config provider requires an NPM package for %s", navy.name);
+      const navyPath = await (0, _util.pathToModule)(nodeModulesPath, envState.npmPackage);
 
+      _fs.default.accessSync(navyPath); // see if path exists
 
-                _fs2.default.accessSync(navyPath); // see if path exists
 
-                return _context2.abrupt('return', navyPath);
-
-              case 10:
-              case 'end':
-                return _context2.stop();
-            }
-          }
-        }, _callee2, _this);
-      }))();
+      return navyPath;
     },
-    getNavyFilePath: function getNavyFilePath() {
-      var _this2 = this;
-
-      return (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 = _path2.default;
-                _context3.next = 3;
-                return _this2.getNavyPath();
-
-              case 3:
-                _context3.t1 = _context3.sent;
-                return _context3.abrupt('return', _context3.t0.join.call(_context3.t0, _context3.t1, 'Navyfile.js'));
 
-              case 5:
-              case 'end':
-                return _context3.stop();
-            }
-          }
-        }, _callee3, _this2);
-      }))();
+    async getNavyFilePath() {
+      return _path.default.join(await this.getNavyPath(), 'Navyfile.js');
     },
-    refreshConfig: function refreshConfig() {
-      var _this3 = this;
-
-      return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
-        var envState;
-        return _regenerator2.default.wrap(function _callee4$(_context4) {
-          while (1) {
-            switch (_context4.prev = _context4.next) {
-              case 0:
-                _context4.next = 2;
-                return navy.getState();
-
-              case 2:
-                envState = _context4.sent;
-
 
-                (0, _invariant2.default)(!!envState, 'STATE_NONEXISTANT: State doesn\'t exist for navy %s', navy.name);
-                (0, _invariant2.default)(!!envState.npmPackage, 'NPM_PROVIDER_REQUIRES_PACKAGE: NPM config provider requires an NPM package for %s', navy.name);
-
-                _context4.next = 7;
-                return tryAndInstall(envState.npmPackage);
-
-              case 7:
-                return _context4.abrupt('return', true);
-
-              case 8:
-              case 'end':
-                return _context4.stop();
-            }
-          }
-        }, _callee4, _this3);
-      }))();
+    async refreshConfig() {
+      const envState = await navy.getState();
+      (0, _invariant.default)(!!envState, "STATE_NONEXISTANT: State doesn't exist for navy %s", navy.name);
+      (0, _invariant.default)(!!envState.npmPackage, "NPM_PROVIDER_REQUIRES_PACKAGE: NPM config provider requires an NPM package for %s", navy.name);
+      await tryAndInstall(envState.npmPackage);
+      return true;
     },
-    getLocationDisplayName: function getLocationDisplayName() {
-      var _this4 = this;
-
-      return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
-        var envState;
-        return _regenerator2.default.wrap(function _callee5$(_context5) {
-          while (1) {
-            switch (_context5.prev = _context5.next) {
-              case 0:
-                _context5.next = 2;
-                return navy.getState();
-
-              case 2:
-                envState = _context5.sent;
 
-
-                (0, _invariant2.default)(!!envState, 'STATE_NONEXISTANT: State doesn\'t exist for navy %s', navy.name);
-
-                return _context5.abrupt('return', envState.npmPackage);
-
-              case 5:
-              case 'end':
-                return _context5.stop();
-            }
-          }
-        }, _callee5, _this4);
-      }))();
+    async getLocationDisplayName() {
+      const envState = await navy.getState();
+      (0, _invariant.default)(!!envState, "STATE_NONEXISTANT: State doesn't exist for navy %s", navy.name);
+      return envState.npmPackage;
     },
-    isDangling: function isDangling() {
-      var _this5 = this;
-
-      return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
-        var envState;
-        return _regenerator2.default.wrap(function _callee6$(_context6) {
-          while (1) {
-            switch (_context6.prev = _context6.next) {
-              case 0:
-                _context6.next = 2;
-                return navy.getState();
-
-              case 2:
-                envState = _context6.sent;
-                return _context6.abrupt('return', !envState || !envState.npmPackage);
 
-              case 4:
-              case 'end':
-                return _context6.stop();
-            }
-          }
-        }, _callee6, _this5);
-      }))();
+    async isDangling() {
+      const envState = await navy.getState();
+      return !envState || !envState.npmPackage;
     }
+
   };
 }
 
 createNpmConfigProvider.importCliOptions = [['--npm-package [package]', 'set the NPM package to use for docker compose config']];
 
-createNpmConfigProvider.getImportOptionsForCLI = function () {
-  var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(opts) {
-    return _regenerator2.default.wrap(function _callee7$(_context7) {
-      while (1) {
-        switch (_context7.prev = _context7.next) {
-          case 0:
-            if (!opts.npmPackage) {
-              _context7.next = 4;
-              break;
-            }
-
-            _context7.next = 3;
-            return tryAndInstall(opts.npmPackage);
-
-          case 3:
-            return _context7.abrupt('return', {
-              configProvider: 'npm',
-              npmPackage: opts.npmPackage
-            });
+createNpmConfigProvider.getImportOptionsForCLI = async opts => {
+  if (opts.npmPackage) {
+    await tryAndInstall(opts.npmPackage);
+    return {
+      configProvider: 'npm',
+      npmPackage: opts.npmPackage
+    };
+  }
+};
 
-          case 4:
-          case 'end':
-            return _context7.stop();
-        }
-      }
-    }, _callee7, undefined);
-  }));
-
-  return function (_x2) {
-    return _ref2.apply(this, arguments);
-  };
-}();
 module.exports = exports.default;

package/lib/config-providers/npm/util.js

@@ -1,18 +1,15 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.pathToModule = pathToModule;
 
-var _path = require('path');
-
-var _path2 = _interopRequireDefault(_path);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _path = _interopRequireDefault(require("path"));
 
 function pathToModule(nodeModulesPath, pkgName) {
-  var pkgNameWithNoTags = pkgName.lastIndexOf('@') !== 0 && pkgName.lastIndexOf('@') !== -1 ? pkgName.substring(0, pkgName.lastIndexOf('@')) : pkgName;
-
-  return _path2.default.join(nodeModulesPath, pkgNameWithNoTags);
+  const pkgNameWithNoTags = pkgName.lastIndexOf('@') !== 0 && pkgName.lastIndexOf('@') !== -1 ? pkgName.substring(0, pkgName.lastIndexOf('@')) : pkgName;
+  return _path.default.join(nodeModulesPath, pkgNameWithNoTags);
 }

package/lib/config.js

@@ -1,93 +1,46 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setConfig = undefined;
-
-var _regenerator = require('babel-runtime/regenerator');
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _stringify = require('babel-runtime/core-js/json/stringify');
-
-var _stringify2 = _interopRequireDefault(_stringify);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var setConfig = exports.setConfig = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(config) {
-    return _regenerator2.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            if (config == null) config = DEFAULT_CONFIG;
-
-            _context.next = 3;
-            return mkdirp(_path2.default.dirname(getConfigPath()));
-
-          case 3:
-            _context.next = 5;
-            return _fs2.default.writeFileAsync(getConfigPath(), (0, _stringify2.default)(config, null, 2));
-
-          case 5:
-
-            // trash cached config
-            _config = null;
-
-          case 6:
-          case 'end':
-            return _context.stop();
-        }
-      }
-    }, _callee, this);
-  }));
-
-  return function setConfig(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-exports.getConfigPath = getConfigPath;
+exports.DEFAULT_TLS_ROOT_CA_DIR = void 0;
 exports.getConfig = getConfig;
+exports.getConfigDir = getConfigDir;
+exports.getConfigPath = getConfigPath;
+exports.setConfig = setConfig;
 
-var _path = require('path');
-
-var _path2 = _interopRequireDefault(_path);
-
-var _bluebird = require('bluebird');
-
-var _bluebird2 = _interopRequireDefault(_bluebird);
-
-var _invariant = require('invariant');
-
-var _invariant2 = _interopRequireDefault(_invariant);
+var _path = _interopRequireDefault(require("path"));
 
-var _fs = require('./util/fs');
+var _invariant = _interopRequireDefault(require("invariant"));
 
-var _fs2 = _interopRequireDefault(_fs);
+var _fs = _interopRequireWildcard(require("fs"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-var DEFAULT_ENVIRONMENT_NAME = 'dev';
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var DEFAULT_CONFIG = {
+// $FlowIgnore
+const DEFAULT_ENVIRONMENT_NAME = 'dev';
+const DEFAULT_TLS_ROOT_CA_DIR = `${getConfigDir()}/tls-root-ca`;
+exports.DEFAULT_TLS_ROOT_CA_DIR = DEFAULT_TLS_ROOT_CA_DIR;
+const DEFAULT_CONFIG = {
   defaultNavy: DEFAULT_ENVIRONMENT_NAME,
-  externalIP: null
+  externalIP: null,
+  tlsRootCaDir: DEFAULT_TLS_ROOT_CA_DIR
 };
+let _config = null;
 
-var mkdirp = _bluebird2.default.promisify(require('mkdirp'));
-
-var _config = null;
+function getConfigDir() {
+  const home = process.env.HOME;
+  (0, _invariant.default)(home, "NO_HOME_DIRECTORY: No home directory available");
+  return _path.default.join(home, '.navy');
+}
 
 function getConfigPath() {
-  var home = process.env.HOME;
-
-  (0, _invariant2.default)(home, 'NO_HOME_DIRECTORY: No home directory available');
-
-  return _path2.default.join(home, '.navy', 'config.json');
+  const configDir = getConfigDir();
+  return _path.default.join(configDir, 'config.json');
 }
 
 function getConfig() {
@@ -96,11 +49,21 @@ function getConfig() {
   }
 
   try {
-    var file = _fs2.default.readFileSync(getConfigPath(), 'utf8');
-    _config = JSON.parse(file);
+    const file = _fs.default.readFileSync(getConfigPath(), 'utf8');
 
+    _config = JSON.parse(file);
     return _config;
   } catch (ex) {
     return DEFAULT_CONFIG;
   }
+}
+
+async function setConfig(config) {
+  if (config == null) config = DEFAULT_CONFIG;
+  await _fs.promises.mkdir(_path.default.dirname(getConfigPath()), {
+    recursive: true
+  });
+  await _fs.promises.writeFile(getConfigPath(), JSON.stringify(config, null, 2)); // trash cached config
+
+  _config = null;
 }

package/lib/driver-logging.js

@@ -1,35 +1,31 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.startDriverLogging = startDriverLogging;
-exports.stopDriverLogging = stopDriverLogging;
 exports.isDriverLogging = isDriverLogging;
 exports.log = log;
+exports.startDriverLogging = startDriverLogging;
+exports.stopDriverLogging = stopDriverLogging;
 
-var _cliSpinners = require('cli-spinners');
-
-var _chalk = require('chalk');
-
-var _chalk2 = _interopRequireDefault(_chalk);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _cliSpinners = require("cli-spinners");
 
-var _isDriverLogging = false;
-var _spinnerInterval = null;
-var _spinnerIndex = 0;
-var _message = null;
+var _chalk = _interopRequireDefault(require("chalk"));
 
-function _redraw() {
-  var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+let _isDriverLogging = false;
+let _spinnerInterval = null;
+let _spinnerIndex = 0;
+let _message = null;
 
-  var symbol = _chalk2.default.cyan(_cliSpinners.dots.frames[_spinnerIndex]);
+function _redraw(opts = {}) {
+  let symbol = _chalk.default.cyan(_cliSpinners.dots.frames[_spinnerIndex]);
 
   if (opts.success === true) {
-    symbol = _chalk2.default.green('✔');
+    symbol = _chalk.default.green('✔');
   } else if (opts.success === false) {
-    symbol = _chalk2.default.red('•');
+    symbol = _chalk.default.red('•');
   }
 
   if (!process.stdout.isTTY) {
@@ -40,11 +36,12 @@ function _redraw() {
       console.log();
       console.log(symbol, 'FAILURE');
     }
+
     return;
   }
 
   process.stdout.write('                                                                        \n');
-  process.stdout.write(' ' + symbol + ' ' + (opts.success === false ? _chalk2.default.red(_message, 'FAILED') : _message) + '\n');
+  process.stdout.write(` ${symbol} ${opts.success === false ? _chalk.default.red(_message, 'FAILED') : _message}\n`);
   process.stdout.cursorTo(0);
   process.stdout.moveCursor(0, -2);
 }
@@ -55,7 +52,7 @@ function startDriverLogging(message) {
 
   _redraw();
 
-  _spinnerInterval = setInterval(function () {
+  _spinnerInterval = setInterval(() => {
     _spinnerIndex++;
 
     if (_spinnerIndex >= _cliSpinners.dots.frames.length) {
@@ -66,15 +63,14 @@ function startDriverLogging(message) {
   }, _cliSpinners.dots.interval);
 }
 
-function stopDriverLogging() {
-  var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
+function stopDriverLogging(opts = {}) {
   if (!isDriverLogging()) return;
-
   _isDriverLogging = false;
   clearInterval(_spinnerInterval);
 
-  _redraw({ success: opts.success != null ? opts.success : true });
+  _redraw({
+    success: opts.success != null ? opts.success : true
+  });
 
   if (process.stdout.isTTY) console.log('\n\n');
 }
@@ -85,6 +81,5 @@ function isDriverLogging() {
 
 function log(message) {
   if (!isDriverLogging()) return;
-
-  process.stdout.write(_chalk2.default.dim(message));
+  process.stdout.write(_chalk.default.dim(message));
 }

package/lib/driver.js

@@ -1,20 +1,18 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.resolveDriverFromName = resolveDriverFromName;
 
-var _dockerCompose = require('./drivers/docker-compose');
-
-var _dockerCompose2 = _interopRequireDefault(_dockerCompose);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _dockerCompose = _interopRequireDefault(require("./drivers/docker-compose"));
 
 function resolveDriverFromName(driverName) {
   switch (driverName) {
     case 'docker-compose':
-      return _dockerCompose2.default;
+      return _dockerCompose.default;
   }
 
   return null;