navy 4.1.2-rc.2 → 5.0.0

package/lib/cli/config/index.js

@@ -1,265 +1,81 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.reconfigureIfNecessary = undefined;
-
-var _stringify = require('babel-runtime/core-js/json/stringify');
-
-var _stringify2 = _interopRequireDefault(_stringify);
-
-var _keys = require('babel-runtime/core-js/object/keys');
-
-var _keys2 = _interopRequireDefault(_keys);
-
-var _defineProperty2 = require('babel-runtime/helpers/defineProperty');
-
-var _defineProperty3 = _interopRequireDefault(_defineProperty2);
-
-var _extends4 = require('babel-runtime/helpers/extends');
-
-var _extends5 = _interopRequireDefault(_extends4);
-
-var _regenerator = require('babel-runtime/regenerator');
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
+exports.reconfigureIfNecessary = reconfigureIfNecessary;
 
-var reconfigureIfNecessary = exports.reconfigureIfNecessary = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(configProp) {
-    return _regenerator2.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            if (!(configWhichNeedsReconfigure.indexOf(configProp) === -1)) {
-              _context.next = 2;
-              break;
-            }
+var _commander = _interopRequireDefault(require("commander"));
 
-            return _context.abrupt('return');
+var _config = require("../../config");
 
-          case 2:
-            _context.next = 4;
-            return (0, _reconfigure.reconfigureAllNavies)();
+var _errors = require("../../errors");
 
-          case 4:
-          case 'end':
-            return _context.stop();
-        }
-      }
-    }, _callee, this);
-  }));
+var _reconfigure = require("../util/reconfigure");
 
-  return function reconfigureIfNecessary(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-var _commander = require('commander');
-
-var _commander2 = _interopRequireDefault(_commander);
-
-var _config = require('../../config');
-
-var _errors = require('../../errors');
-
-var _reconfigure = require('../util/reconfigure');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var NAME_MAP = {
+const NAME_MAP = {
   'default-navy': 'defaultNavy',
-  'external-ip': 'externalIP'
+  'external-ip': 'externalIP',
+  'tlsCa-dir': 'tlsRootCaDir'
 };
+const configWhichNeedsReconfigure = ['externalIP'];
 
-var configWhichNeedsReconfigure = ['externalIP'];
-
-_commander2.default.command('set <key> <value>').description('Sets the given config key').action(function () {
-  var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(key, value) {
-    var configProp;
-    return _regenerator2.default.wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            configProp = NAME_MAP[key];
-
-            if (configProp) {
-              _context2.next = 3;
-              break;
-            }
-
-            throw new _errors.NavyError('Invalid config key: ' + key);
-
-          case 3:
-            _context2.t0 = _config.setConfig;
-            _context2.t1 = _extends5.default;
-            _context2.t2 = {};
-            _context2.next = 8;
-            return (0, _config.getConfig)();
-
-          case 8:
-            _context2.t3 = _context2.sent;
-            _context2.t4 = (0, _defineProperty3.default)({}, configProp, value);
-            _context2.t5 = (0, _context2.t1)(_context2.t2, _context2.t3, _context2.t4);
-            _context2.next = 13;
-            return (0, _context2.t0)(_context2.t5);
-
-          case 13:
-            _context2.next = 15;
-            return reconfigureIfNecessary(configProp);
-
-          case 15:
-          case 'end':
-            return _context2.stop();
-        }
-      }
-    }, _callee2, undefined);
-  }));
-
-  return function (_x2, _x3) {
-    return _ref2.apply(this, arguments);
-  };
-}());
-
-_commander2.default.command('get <key>').description('Gets the given config by key').action(function () {
-  var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(key) {
-    var config;
-    return _regenerator2.default.wrap(function _callee3$(_context3) {
-      while (1) {
-        switch (_context3.prev = _context3.next) {
-          case 0:
-            if (NAME_MAP[key]) {
-              _context3.next = 2;
-              break;
-            }
-
-            throw new _errors.NavyError('Invalid config key: ' + key);
-
-          case 2:
-            _context3.next = 4;
-            return (0, _config.getConfig)();
-
-          case 4:
-            config = _context3.sent;
-
-
-            console.log(config[NAME_MAP[key]]);
-
-          case 6:
-          case 'end':
-            return _context3.stop();
-        }
-      }
-    }, _callee3, undefined);
-  }));
-
-  return function (_x4) {
-    return _ref3.apply(this, arguments);
-  };
-}());
-
-_commander2.default.command('rm <key>').description('Removes the current config value').action(function () {
-  var _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(key) {
-    var configProp;
-    return _regenerator2.default.wrap(function _callee4$(_context4) {
-      while (1) {
-        switch (_context4.prev = _context4.next) {
-          case 0:
-            configProp = NAME_MAP[key];
-
-            if (configProp) {
-              _context4.next = 3;
-              break;
-            }
-
-            throw new _errors.NavyError('Invalid config key: ' + key);
-
-          case 3:
-            _context4.t0 = _config.setConfig;
-            _context4.t1 = _extends5.default;
-            _context4.t2 = {};
-            _context4.next = 8;
-            return (0, _config.getConfig)();
-
-          case 8:
-            _context4.t3 = _context4.sent;
-            _context4.t4 = (0, _defineProperty3.default)({}, configProp, null);
-            _context4.t5 = (0, _context4.t1)(_context4.t2, _context4.t3, _context4.t4);
-            _context4.next = 13;
-            return (0, _context4.t0)(_context4.t5);
-
-          case 13:
-            _context4.next = 15;
-            return reconfigureIfNecessary(configProp);
+async function reconfigureIfNecessary(configProp) {
+  if (configWhichNeedsReconfigure.indexOf(configProp) === -1) {
+    return;
+  }
 
-          case 15:
-          case 'end':
-            return _context4.stop();
-        }
-      }
-    }, _callee4, undefined);
-  }));
+  await (0, _reconfigure.reconfigureAllNavies)();
+}
 
-  return function (_x5) {
-    return _ref4.apply(this, arguments);
-  };
-}());
+_commander.default.command('set <key> <value>').description('Sets the given config key').action(async (key, value) => {
+  const configProp = NAME_MAP[key];
 
-_commander2.default.command('ls').description('Lists all of the Navy config keys and values that have been set').action((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
-  var configKeys, config;
-  return _regenerator2.default.wrap(function _callee5$(_context5) {
-    while (1) {
-      switch (_context5.prev = _context5.next) {
-        case 0:
-          configKeys = (0, _keys2.default)(NAME_MAP);
-          _context5.next = 3;
-          return (0, _config.getConfig)();
+  if (!configProp) {
+    throw new _errors.NavyError('Invalid config key: ' + key);
+  }
 
-        case 3:
-          config = _context5.sent;
+  await (0, _config.setConfig)({ ...(await (0, _config.getConfig)()),
+    [configProp]: value
+  });
+  await reconfigureIfNecessary(configProp);
+});
 
+_commander.default.command('get <key>').description('Gets the given config by key').action(async key => {
+  if (!NAME_MAP[key]) {
+    throw new _errors.NavyError('Invalid config key: ' + key);
+  }
 
-          console.log(configKeys.map(function (key) {
-            return key + '=' + (config[NAME_MAP[key]] != null ? config[NAME_MAP[key]] : 'null');
-          }).join('\n'));
+  const config = await (0, _config.getConfig)();
+  console.log(config[NAME_MAP[key]]);
+});
 
-        case 5:
-        case 'end':
-          return _context5.stop();
-      }
-    }
-  }, _callee5, undefined);
-})));
+_commander.default.command('rm <key>').description('Removes the current config value').action(async key => {
+  const configProp = NAME_MAP[key];
 
-_commander2.default.command('json').description('Dumps out all Navy config as JSON').action((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
-  return _regenerator2.default.wrap(function _callee6$(_context6) {
-    while (1) {
-      switch (_context6.prev = _context6.next) {
-        case 0:
-          _context6.t0 = console;
-          _context6.t1 = _stringify2.default;
-          _context6.next = 4;
-          return (0, _config.getConfig)();
+  if (!configProp) {
+    throw new _errors.NavyError('Invalid config key: ' + key);
+  }
 
-        case 4:
-          _context6.t2 = _context6.sent;
-          _context6.t3 = (0, _context6.t1)(_context6.t2, null, 2);
+  await (0, _config.setConfig)({ ...(await (0, _config.getConfig)()),
+    [configProp]: null
+  });
+  await reconfigureIfNecessary(configProp);
+});
 
-          _context6.t0.log.call(_context6.t0, _context6.t3);
+_commander.default.command('ls').description('Lists all of the Navy config keys and values that have been set').action(async () => {
+  const configKeys = Object.keys(NAME_MAP);
+  const config = await (0, _config.getConfig)();
+  console.log(configKeys.map(key => `${key}=${config[NAME_MAP[key]] != null ? config[NAME_MAP[key]] : 'null'}`).join('\n'));
+});
 
-        case 7:
-        case 'end':
-          return _context6.stop();
-      }
-    }
-  }, _callee6, undefined);
-})));
+_commander.default.command('json').description('Dumps out all Navy config as JSON').action(async () => {
+  console.log(JSON.stringify(await (0, _config.getConfig)(), null, 2));
+});
 
-process.on('unhandledRejection', function (err) {
+process.on('unhandledRejection', err => {
   if (err instanceof _errors.NavyError) {
     err.prettyPrint();
   } else {
@@ -267,8 +83,8 @@ process.on('unhandledRejection', function (err) {
   }
 });
 
-_commander2.default.parse(process.argv);
+_commander.default.parse(process.argv);
 
-if (_commander2.default.args.length === 0) {
-  _commander2.default.help();
+if (_commander.default.args.length === 0) {
+  _commander.default.help();
 }

package/lib/cli/config/wrapper.js

@@ -1,45 +1,21 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = _default;
 
-var _regenerator = require('babel-runtime/regenerator');
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var _child_process = require('child_process');
-
-var _path = require('path');
-
-var _path2 = _interopRequireDefault(_path);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-exports.default = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(navy) {
-    return _regenerator2.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            // $FlowIgnore flow bug with execSync
-            (0, _child_process.execSync)(_path2.default.join(__dirname, '../../../bin/navy-config.js') + ' ' + process.argv.slice(3).join(' '), { stdio: 'inherit' });
+var _child_process = require("child_process");
 
-          case 1:
-          case 'end':
-            return _context.stop();
-        }
-      }
-    }, _callee, this);
-  }));
+var _path = _interopRequireDefault(require("path"));
 
-  return function (_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
+async function _default(navy) {
+  // $FlowIgnore flow bug with execSync
+  (0, _child_process.execSync)(_path.default.join(__dirname, '../../../bin/navy-config.js') + ' ' + process.argv.slice(3).join(' '), {
+    stdio: 'inherit'
+  });
+}
 
 module.exports = exports.default;

package/lib/cli/develop.js

@@ -1,189 +1,85 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = _default;
 
-var _regenerator = require('babel-runtime/regenerator');
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _defineProperty2 = require('babel-runtime/helpers/defineProperty');
-
-var _defineProperty3 = _interopRequireDefault(_defineProperty2);
-
-var _extends3 = require('babel-runtime/helpers/extends');
-
-var _extends4 = _interopRequireDefault(_extends3);
-
-var _keys = require('babel-runtime/core-js/object/keys');
-
-var _keys2 = _interopRequireDefault(_keys);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var _path = require('path');
-
-var _path2 = _interopRequireDefault(_path);
-
-var _chalk = require('chalk');
-
-var _chalk2 = _interopRequireDefault(_chalk);
-
-var _invariant = require('invariant');
-
-var _invariant2 = _interopRequireDefault(_invariant);
-
-var _ = require('../');
-
-var _errors = require('../errors');
-
-var _dockerClient = require('../util/docker-client');
-
-var _dockerClient2 = _interopRequireDefault(_dockerClient);
-
-var _navyrc = require('../util/navyrc');
-
-var _navyrc2 = _interopRequireDefault(_navyrc);
+var _path = _interopRequireDefault(require("path"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _chalk = _interopRequireDefault(require("chalk"));
 
-exports.default = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(service, opts) {
-    var navy, cwd, navyRc, mounts, state, container, containerId, containerObj;
-    return _regenerator2.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            navy = (0, _.getNavy)(opts.navy);
-            cwd = process.cwd();
-            _context.next = 4;
-            return (0, _navyrc2.default)(cwd);
+var _invariant = _interopRequireDefault(require("invariant"));
 
-          case 4:
-            navyRc = _context.sent;
+var _ = require("../");
 
-            if (!(!navyRc || !navyRc.services)) {
-              _context.next = 7;
-              break;
-            }
+var _errors = require("../errors");
 
-            throw new _errors.NavyError('No valid .navyrc file was found in "' + cwd + '"');
+var _dockerClient = _interopRequireDefault(require("../util/docker-client"));
 
-          case 7:
-            if (navyRc.develop) {
-              _context.next = 9;
-              break;
-            }
+var _navyrc = _interopRequireDefault(require("../util/navyrc"));
 
-            throw new _errors.NavyError('No develop mounts found in .navyrc');
+async function _default(service, opts) {
+  const navy = (0, _.getNavy)(opts.navy);
+  const cwd = process.cwd();
+  const navyRc = await (0, _navyrc.default)(cwd);
 
-          case 9:
-            if (!(navyRc.services.length > 1 && !service)) {
-              _context.next = 11;
-              break;
-            }
+  if (!navyRc || !navyRc.services) {
+    throw new _errors.NavyError(`No valid .navyrc file was found in "${cwd}"`);
+  }
 
-            throw new _errors.NavyError('Multiple service mappings are defined in .navyrc, you need to explicitly specify what service to develop');
+  if (!navyRc.develop) {
+    throw new _errors.NavyError('No develop mounts found in .navyrc');
+  }
 
-          case 11:
+  if (navyRc.services.length > 1 && !service) {
+    throw new _errors.NavyError('Multiple service mappings are defined in .navyrc, you need to explicitly specify what service to develop');
+  }
 
-            if (!service) service = navyRc.services[0];
+  if (!service) service = navyRc.services[0];
 
-            if (!(navyRc.services.indexOf(service) === -1)) {
-              _context.next = 14;
-              break;
-            }
+  if (navyRc.services.indexOf(service) === -1) {
+    throw new _errors.NavyError(`Service "${service}" is not a valid development target`);
+  }
 
-            throw new _errors.NavyError('Service "' + service + '" is not a valid development target');
-
-          case 14:
-            mounts = {};
-
-            (0, _keys2.default)(navyRc.develop.mounts).forEach(function (localPath) {
-              return mounts[_path2.default.resolve(localPath)] = navyRc.develop.mounts[localPath];
-            });
-
-            _context.next = 18;
-            return navy.getState();
-
-          case 18:
-            _context.t0 = _context.sent;
-
-            if (_context.t0) {
-              _context.next = 21;
-              break;
-            }
-
-            _context.t0 = {};
-
-          case 21:
-            state = _context.t0;
-            _context.next = 24;
-            return navy.saveState((0, _extends4.default)({}, state, {
-              services: (0, _extends4.default)({}, state.services, (0, _defineProperty3.default)({}, service, (0, _extends4.default)({}, (state.services || {})[service], {
-                _develop: {
-                  mounts: mounts,
-                  command: navyRc.develop.command
-                }
-              })))
-            }));
-
-          case 24:
-            _context.next = 26;
-            return navy.emitAsync('cli.develop.beforeLaunch');
-
-          case 26:
-            _context.next = 28;
-            return navy.kill([service]);
-
-          case 28:
-            _context.next = 30;
-            return navy.launch([service], { noDeps: true });
-
-          case 30:
-
-            console.log('\uD83D\uDEA7  ' + service + ' has now restarted in development \uD83D\uDEA7');
-            console.log(_chalk2.default.dim('-----------'));
-            console.log();
-
-            _context.next = 35;
-            return navy.ps();
-
-          case 35:
-            _context.t1 = function (_service) {
-              return _service.name === service;
-            };
-
-            container = _context.sent.filter(_context.t1)[0];
-
-
-            (0, _invariant2.default)(container, 'DEVELOP_NO_CONTAINER_ID: Could not determine container ID for log attachment');
-
-            containerId = container.id;
-            containerObj = _dockerClient2.default.getContainer(containerId);
-
-            containerObj.attach({ stream: true, stdout: true, stderr: true }).then(function (stream) {
-              return containerObj.modem.demuxStream(stream, process.stdout, process.stderr);
-            }).catch(function () {
-              console.log();
-              console.log(_chalk2.default.dim('-------> ' + service + ' exited'));
-              console.log();
-            });
-
-          case 41:
-          case 'end':
-            return _context.stop();
+  const mounts = {};
+  Object.keys(navyRc.develop.mounts).forEach(localPath => mounts[_path.default.resolve(localPath)] = navyRc.develop.mounts[localPath]);
+  const state = (await navy.getState()) || {};
+  await navy.saveState({ ...state,
+    services: { ...state.services,
+      [service]: { ...(state.services || {})[service],
+        _develop: {
+          mounts,
+          command: navyRc.develop.command
         }
       }
-    }, _callee, this);
-  }));
-
-  return function (_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-}();
+    }
+  });
+  await navy.emitAsync('cli.develop.beforeLaunch');
+  await navy.kill([service]);
+  await navy.launch([service], {
+    noDeps: true
+  });
+  console.log(`🚧  ${service} has now restarted in development 🚧`);
+  console.log(_chalk.default.dim('-----------'));
+  console.log();
+  const container = (await navy.ps()).filter(_service => _service.name === service)[0];
+  (0, _invariant.default)(container, "DEVELOP_NO_CONTAINER_ID: Could not determine container ID for log attachment");
+  const containerId = container.id;
+
+  const containerObj = _dockerClient.default.getContainer(containerId);
+
+  containerObj.attach({
+    stream: true,
+    stdout: true,
+    stderr: true
+  }).then(stream => containerObj.modem.demuxStream(stream, process.stdout, process.stderr)).catch(() => {
+    console.log();
+    console.log(_chalk.default.dim(`-------> ${service} exited`));
+    console.log();
+  });
+}
 
 module.exports = exports.default;