navy 5.0.0 → 5.0.1-rc.1

package/README.md

@@ -51,11 +51,11 @@ You can customise the functionality of Navy by writing Javascript plugins which
 $ npm install -g navy
 ```
 
-- [Read more of the documentation on the website](https://momentumft.github.io/navy/)
-- [GitHub page](https://github.com/momentumft/navy)
+- [Read more of the documentation on the website](https://moneyhub.github.io/navy/)
+- [GitHub page](https://github.com/moneyhub/navy)
 
 ## License
 
 Licensed under the MIT License.
 
-[View the full license here](https://raw.githubusercontent.com/momentumft/navy/master/LICENSE).
+[View the full license here](https://raw.githubusercontent.com/moneyhub/navy/master/LICENSE).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "navy",
-  "version": "5.0.0",
+  "version": "5.0.1-rc.1",
   "description": "Quick and powerful development environments using Docker and Docker Compose",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -12,18 +12,18 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/momentumft/navy.git"
+    "url": "git+https://github.com/moneyhub/navy.git"
   },
   "keywords": [
     "docker",
     "environment"
   ],
-  "author": "Momentum Financial Technology Ltd",
+  "author": "Moneyhub Financial Technology Ltd",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/momentumft/navy/issues"
+    "url": "https://github.com/moneyhub/navy/issues"
   },
-  "homepage": "https://github.com/momentumft/navy#readme",
+  "homepage": "https://github.com/moneyhub/navy#readme",
   "dependencies": {
     "@babel/runtime": "^7",
     "bluebird": "^3.7.2",
@@ -38,13 +38,15 @@
     "js-yaml": "^3.14.1",
     "lodash": "^4.17.21",
     "mkdirp": "^0.5.5",
-    "node-forge": "^0.10.0",
+    "node-fetch": "^3.3.0",
+    "node-forge": "^1.3.0",
     "opn": "^5.5.0",
     "pad": "^3.2.0",
     "promise-retry": "^1.1.1",
+    "ramda": "^0.28.0",
     "resolve": "^1.20.0",
     "rimraf": "^2.7.1",
-    "simple-docker-registry-client": "^1.1.2",
-    "strip-ansi": "^3.0.1"
+    "strip-ansi": "^3.0.1",
+    "www-authenticate": "^0.6.3"
   }
 }

package/lib/cli/config/index.js

@@ -1,90 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.reconfigureIfNecessary = reconfigureIfNecessary;
-
-var _commander = _interopRequireDefault(require("commander"));
-
-var _config = require("../../config");
-
-var _errors = require("../../errors");
-
-var _reconfigure = require("../util/reconfigure");
-
-const NAME_MAP = {
-  'default-navy': 'defaultNavy',
-  'external-ip': 'externalIP',
-  'tlsCa-dir': 'tlsRootCaDir'
-};
-const configWhichNeedsReconfigure = ['externalIP'];
-
-async function reconfigureIfNecessary(configProp) {
-  if (configWhichNeedsReconfigure.indexOf(configProp) === -1) {
-    return;
-  }
-
-  await (0, _reconfigure.reconfigureAllNavies)();
-}
-
-_commander.default.command('set <key> <value>').description('Sets the given config key').action(async (key, value) => {
-  const configProp = NAME_MAP[key];
-
-  if (!configProp) {
-    throw new _errors.NavyError('Invalid config key: ' + key);
-  }
-
-  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);
-  }
-
-  const config = await (0, _config.getConfig)();
-  console.log(config[NAME_MAP[key]]);
-});
-
-_commander.default.command('rm <key>').description('Removes the current config value').action(async key => {
-  const configProp = NAME_MAP[key];
-
-  if (!configProp) {
-    throw new _errors.NavyError('Invalid config key: ' + key);
-  }
-
-  await (0, _config.setConfig)({ ...(await (0, _config.getConfig)()),
-    [configProp]: null
-  });
-  await reconfigureIfNecessary(configProp);
-});
-
-_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'));
-});
-
-_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', err => {
-  if (err instanceof _errors.NavyError) {
-    err.prettyPrint();
-  } else {
-    console.error(err.stack);
-  }
-});
-
-_commander.default.parse(process.argv);
-
-if (_commander.default.args.length === 0) {
-  _commander.default.help();
-}

package/lib/cli/config/wrapper.js

@@ -1,21 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-
-var _child_process = require("child_process");
-
-var _path = _interopRequireDefault(require("path"));
-
-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,85 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-
-var _path = _interopRequireDefault(require("path"));
-
-var _chalk = _interopRequireDefault(require("chalk"));
-
-var _invariant = _interopRequireDefault(require("invariant"));
-
-var _ = require("../");
-
-var _errors = require("../errors");
-
-var _dockerClient = _interopRequireDefault(require("../util/docker-client"));
-
-var _navyrc = _interopRequireDefault(require("../util/navyrc"));
-
-async function _default(service, opts) {
-  const navy = (0, _.getNavy)(opts.navy);
-  const cwd = process.cwd();
-  const navyRc = await (0, _navyrc.default)(cwd);
-
-  if (!navyRc || !navyRc.services) {
-    throw new _errors.NavyError(`No valid .navyrc file was found in "${cwd}"`);
-  }
-
-  if (!navyRc.develop) {
-    throw new _errors.NavyError('No develop mounts found in .navyrc');
-  }
-
-  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 (navyRc.services.indexOf(service) === -1) {
-    throw new _errors.NavyError(`Service "${service}" is not a valid development target`);
-  }
-
-  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
-        }
-      }
-    }
-  });
-  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;

package/lib/cli/doctor/clean-compose-files.js

@@ -1,33 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-
-var _bluebird = _interopRequireDefault(require("bluebird"));
-
-var _path = _interopRequireDefault(require("path"));
-
-var _ = require("../../");
-
-var _util = require("./util");
-
-var _state = require("../../navy/state");
-
-var _util2 = require("../../navy/util");
-
-async function _default() {
-  const rimraf = _bluebird.default.promisify(require('rimraf'));
-
-  (0, _util.start)('Cleaning temporary Docker Compose files');
-  const navyNames = await (0, _.getLaunchedNavyNames)();
-  await Promise.all(navyNames.map(async navyName => {
-    const navyPath = (0, _state.pathToNavy)((0, _util2.normaliseNavyName)(navyName));
-    await rimraf(_path.default.join(navyPath, 'docker-compose.tmp.yml'));
-  }));
-}
-
-module.exports = exports.default;

package/lib/cli/doctor/index.js

@@ -1,50 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-
-var _chalk = _interopRequireDefault(require("chalk"));
-
-var _cleanComposeFiles = _interopRequireDefault(require("./clean-compose-files"));
-
-var _invalidState = _interopRequireDefault(require("./invalid-state"));
-
-var _invalidComposeConfig = _interopRequireDefault(require("./invalid-compose-config"));
-
-async function run(fns) {
-  const errors = [];
-
-  for (const fn of fns) {
-    try {
-      await fn();
-    } catch (ex) {
-      errors.push(ex);
-    }
-  }
-
-  return errors;
-}
-
-async function _default() {
-  const errors = await run([_cleanComposeFiles.default, _invalidState.default, _invalidComposeConfig.default]);
-
-  if (errors.length > 0) {
-    console.log(_chalk.default.yellow('There were some issues'));
-    console.log();
-    errors.forEach(error => console.log(error.stack));
-    return;
-  }
-
-  console.log();
-  console.log(_chalk.default.green(' ✔ Finished tests'));
-  console.log();
-  console.log(' Please try running Navy again if it wasn\'t working before.');
-  console.log(' If you still have problems, please open an issue at https://github.com/momentumft/navy/issues/new');
-  console.log();
-}
-
-module.exports = exports.default;

package/lib/cli/doctor/invalid-compose-config.js

@@ -1,26 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-
-var _ = require("../../");
-
-var _util = require("./util");
-
-async function _default() {
-  (0, _util.start)('Checking for Navies with invalid/no compose config');
-  const navies = await (0, _.getLaunchedNavies)();
-  await Promise.all(navies.map(async navy => {
-    await (0, _util.catchInvariant)('NO_DOCKER_COMPOSE_FILE', async () => {
-      await (await navy.safeGetDriver()).getConfig();
-    }, async () => {
-      await (0, _util.fix)('Found Navy %s which has no docker compose config, removing', navy.name, async () => {
-        await navy.delete();
-      });
-    });
-  }));
-}
-
-module.exports = exports.default;

package/lib/cli/doctor/invalid-state.js

@@ -1,33 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-
-var _ = require("../../");
-
-var _util = require("./util");
-
-async function _default() {
-  (0, _util.start)('Checking for dangling Navies');
-  const navies = await (0, _.getLaunchedNavies)();
-  await Promise.all(navies.map(async navy => {
-    const configProvider = await navy.getConfigProvider();
-
-    if (!configProvider) {
-      await (0, _util.fix)('Found Navy without config provider %s, removing', navy.name, async () => {
-        await navy.delete();
-      });
-      return;
-    }
-
-    if (await configProvider.isDangling()) {
-      await (0, _util.fix)('Found dangling Navy %s (invalid config), removing', navy.name, async () => {
-        await navy.destroy();
-      });
-    }
-  }));
-}
-
-module.exports = exports.default;

package/lib/cli/doctor/util.js

@@ -1,41 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.start = exports.fix = exports.catchInvariant = void 0;
-
-var _util = _interopRequireDefault(require("util"));
-
-var _invariant = _interopRequireDefault(require("invariant"));
-
-var _chalk = _interopRequireDefault(require("chalk"));
-
-const fix = async (message, ...params) => {
-  (0, _invariant.default)(params.length > 0, "DOCTOR_FIX_NO_PARAMS: Expected params to be passed to doctor fix");
-  const fixCallback = params[params.length - 1];
-  console.log(_chalk.default.yellow('----->', _util.default.format(message, ...params.slice(0, -1))));
-  await fixCallback();
-};
-
-exports.fix = fix;
-
-const start = message => {
-  console.log(_chalk.default.dim('----->', message));
-};
-
-exports.start = start;
-
-const catchInvariant = async (code, fn, catchCallback) => {
-  try {
-    await fn();
-  } catch (ex) {
-    if (ex.name === 'Invariant Violation' && ex.message.indexOf(code) === 0) {
-      await catchCallback();
-    }
-  }
-};
-
-exports.catchInvariant = catchInvariant;

package/lib/cli/external-ip.js

@@ -1,18 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _config = require("../config");
-
-var _externalIp = require("../util/external-ip");
-
-var _default = async () => {
-  const config = await (0, _config.getConfig)();
-  console.log(await (0, _externalIp.getExternalIP)(config.externalIP));
-};
-
-exports.default = _default;
-module.exports = exports.default;

package/lib/cli/health.js

@@ -1,45 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-
-var _chalk = _interopRequireDefault(require("chalk"));
-
-var _ = require("../");
-
-var _table = _interopRequireDefault(require("../util/table"));
-
-function getStatus(service, state) {
-  const health = service.raw && service.raw.State.Health;
-
-  if (!health) {
-    return '-';
-  }
-
-  const statusString = health.Status === 'healthy' ? _chalk.default.green('✔ Healthy') : _chalk.default.red('• Unhealthy');
-  return statusString;
-}
-
-function getHistory(service, state) {
-  const health = service.raw && service.raw.State.Health;
-
-  if (!health) {
-    return '-';
-  }
-
-  const history = health.Log;
-  return history.map(record => record.ExitCode === 0 ? _chalk.default.green('█') : _chalk.default.red('x')).join(' ');
-}
-
-async function _default(opts) {
-  const navy = (0, _.getNavy)(opts.navy);
-  const ps = await navy.ps();
-  const state = await navy.getState();
-  console.log((0, _table.default)([['NAME', 'STATUS', 'HISTORY'], ...ps.map(service => [service.name, getStatus(service, state), getHistory(service, state)])]));
-}
-
-module.exports = exports.default;

package/lib/cli/https.js

@@ -1,92 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-
-var _chalk = _interopRequireDefault(require("chalk"));
-
-var _errors = require("../errors");
-
-var _navy = require("../navy");
-
-var _config = require("../config");
-
-var _httpProxy = require("../http-proxy");
-
-var _https = require("../util/https");
-
-var _fs = _interopRequireDefault(require("fs"));
-
-async function _default(services, opts) {
-  const tlsRootCaDir = (0, _config.getConfig)().tlsRootCaDir || _config.DEFAULT_TLS_ROOT_CA_DIR;
-
-  const configDir = (0, _config.getConfigDir)();
-
-  if (opts.disable) {
-    await (0, _https.removeCert)(opts);
-    await (0, _httpProxy.reconfigureHTTPProxy)({
-      restart: true
-    });
-    console.log();
-    console.log(_chalk.default.green(`✅ HTTPS for service ${opts.disable} is now disabled`));
-    console.log();
-    return;
-  }
-
-  if (!services || services.length === 0) {
-    if (!_fs.default.existsSync(`${configDir}/tls-certs`)) return;
-
-    const files = _fs.default.readdirSync(`${configDir}/tls-certs`);
-
-    const urls = files.filter(file => file.endsWith('.crt')).map(crt => {
-      return `https://${crt.replace('.crt', '')}`;
-    });
-
-    for (const url of urls) {
-      console.log(`${url}`);
-    }
-
-    return;
-  }
-
-  if (!_fs.default.existsSync(`${tlsRootCaDir}/ca.crt`) || !_fs.default.existsSync(`${tlsRootCaDir}/ca.key`)) {
-    await (0, _https.generateRootCa)();
-  }
-
-  const navy = await (0, _navy.getNavy)(opts.navy);
-  await navy.ensurePluginsLoaded();
-  const availableServices = await navy.getAvailableServiceNames();
-  const httpsReadyServices = [];
-
-  for (const service of services) {
-    if (!availableServices.includes(service)) {
-      console.log(`❌ ${service} not found, skipping`);
-      continue;
-    }
-
-    const serviceUrl = await navy.url(service);
-
-    try {
-      await (0, _https.createCert)({
-        serviceUrl
-      });
-      httpsReadyServices.push(service);
-    } catch (error) {
-      console.log(error);
-      throw new _errors.NavyError(`Could not generate TLS cert for ${service}`);
-    }
-  }
-
-  await (0, _httpProxy.reconfigureHTTPProxy)({
-    restart: true
-  });
-  console.log();
-  console.log(_chalk.default.green(`✅ Service(s) ${httpsReadyServices.join(', ')} now accessible via HTTPS🔒`));
-  console.log();
-}
-
-module.exports = exports.default;

package/lib/cli/import.js

@@ -1,38 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-
-var _path = _interopRequireDefault(require("path"));
-
-var _chalk = _interopRequireDefault(require("chalk"));
-
-var _fs = _interopRequireDefault(require("../util/fs"));
-
-var _ = require("../");
-
-var _configProvider = require("../config-provider");
-
-var _util = require("./util");
-
-async function _default(opts) {
-  const navy = (0, _.getNavy)(opts.navy);
-
-  const boatAsciiArt = _fs.default.readFileSync(_path.default.join(__dirname, '../../resources/sailing-boat.txt')).toString();
-
-  const initialiseOpts = await (0, _configProvider.getImportOptionsForCLI)(opts);
-  await (0, _util.importNavy)(navy, initialiseOpts);
-  console.log(` You can now use ${_chalk.default.bold('navy')} commands from any directory to control this Navy.`);
-  console.log();
-
-  if (process.stdout.isTTY) {
-    console.log(boatAsciiArt);
-    console.log();
-  }
-}
-
-module.exports = exports.default;

package/lib/cli/index.js

@@ -1,31 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-var _package = _interopRequireDefault(require("../../package.json"));
-
-var _program = _interopRequireDefault(require("./program"));
-
-var _errors = require("../errors");
-
-const debug = require('debug')('navy:cli');
-
-_program.default.version(_package.default.version);
-
-_program.default.command('help').alias('*').action(() => _program.default.help());
-
-try {
-  _program.default.parse(process.argv);
-} catch (ex) {
-  if (ex instanceof _errors.NavyError) {
-    ex.prettyPrint();
-  } else {
-    throw ex;
-  }
-}
-
-debug('Invoked CLI action');
-
-if (_program.default.args.length === 0) {
-  _program.default.help();
-}