@automattic/vip 2.24.1 → 2.25.0

package/dist/lib/dev-environment/dev-environment-lando.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.bootstrapLando = bootstrapLando;
+exports.isEnvUp = isEnvUp;
 exports.landoDestroy = landoDestroy;
 exports.landoExec = landoExec;
 exports.landoInfo = landoInfo;
@@ -20,9 +21,10 @@ var _utils = _interopRequireDefault(require("lando/plugins/lando-core/lib/utils"
 var _build = _interopRequireDefault(require("lando/plugins/lando-tooling/lib/build"));
 var _chalk = _interopRequireDefault(require("chalk"));
 var _app = _interopRequireDefault(require("lando/lib/app"));
-var _userError = _interopRequireDefault(require("../user-error"));
 var _dns = _interopRequireDefault(require("dns"));
 var _devEnvironmentCore = require("./dev-environment-core");
+var _devEnvironment = require("../constants/dev-environment");
+var _userError = _interopRequireDefault(require("../user-error"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * 
@@ -58,8 +60,10 @@ function getLandoUserConfigurationRoot() {
  * @returns {object} Lando configuration
  */
 function getLandoConfig() {
-  const landoPath = _path.default.join(__dirname, '..', '..', '..', 'node_modules', 'lando');
-  debug(`Getting lando config, using path '${landoPath}' for plugins`);
+  const nodeModulesPath = _path.default.join(__dirname, '..', '..', '..', 'node_modules');
+  const landoPath = _path.default.join(nodeModulesPath, 'lando');
+  const atLandoPath = _path.default.join(nodeModulesPath, '@lando');
+  debug(`Getting lando config, using paths '${landoPath}' and '${atLandoPath}' for plugins`);
   const isLandoDebugSelected = (process.env.DEBUG || '').includes(DEBUG_KEY);
   const isAllDebugSelected = process.env.DEBUG === '*';
   const logLevelConsole = isAllDebugSelected || isLandoDebugSelected ? 'debug' : 'warn';
@@ -69,14 +73,39 @@ function getLandoConfig() {
     preLandoFiles: ['.lando.base.yml', '.lando.dist.yml', '.lando.upstream.yml'],
     postLandoFiles: ['.lando.local.yml'],
     pluginDirs: [landoPath, {
-      path: _path.default.join(landoPath, 'integrations'),
-      subdir: '.'
+      path: atLandoPath,
+      subdir: '.',
+      namespace: '@lando'
     }],
+    disablePlugins: [
+    // Plugins we need:
+    // '@lando/compose',
+    // '@lando/mailhog',
+    // '@lando/memcached',
+    // '@lando/phpmyadmin',
+    // The rest we don't need
+    '@lando/acquia', '@lando/apache', '@lando/argv', '@lando/backdrop', '@lando/dotnet', '@lando/drupal', '@lando/elasticsearch', '@lando/go', '@lando/joomla', '@lando/lagoon', '@lando/lamp', '@lando/laravel', '@lando/lemp', '@lando/mariadb', '@lando/mean', '@lando/mongo', '@lando/mssql', '@lando/mysql', '@lando/nginx', '@lando/node', '@lando/pantheon', '@lando/php', '@lando/platformsh', '@lando/postgres', '@lando/python', '@lando/redis', '@lando/ruby', '@lando/solr', '@lando/symfony', '@lando/tomcat', '@lando/varnish', '@lando/wordpress'],
     proxyName: 'vip-dev-env-proxy',
     userConfRoot: getLandoUserConfigurationRoot(),
     home: ''
   };
 }
+const appMap = new Map();
+async function getLandoApplication(lando, instancePath) {
+  if (appMap.has(instancePath)) {
+    return Promise.resolve(appMap.get(instancePath));
+  }
+  if (!(await (0, _devEnvironmentCore.doesEnvironmentExist)(instancePath))) {
+    throw new Error(_devEnvironment.DEV_ENVIRONMENT_NOT_FOUND);
+  }
+  const app = lando.getApp(instancePath);
+  addHooks(app, lando);
+  appMap.set(instancePath, app);
+  if (!app.initialized) {
+    await app.init();
+  }
+  return app;
+}
 async function bootstrapLando() {
   const lando = new _lando.default(getLandoConfig());
   await lando.bootstrap();
@@ -84,22 +113,18 @@ async function bootstrapLando() {
 }
 async function landoStart(lando, instancePath) {
   debug('Will start lando app on path:', instancePath);
-  const app = lando.getApp(instancePath);
-  await app.init();
-  addHooks(app, lando);
+  const app = await getLandoApplication(lando, instancePath);
   await app.start();
 }
 async function landoRebuild(lando, instancePath) {
   debug('Will rebuild lando app on path:', instancePath);
-  const app = lando.getApp(instancePath);
-  await app.init();
+  const app = await getLandoApplication(lando, instancePath);
   await ensureNoOrphantProxyContainer(lando);
-  addHooks(app, lando);
   await app.rebuild();
 }
 function addHooks(app, lando) {
   app.events.on('post-start', 1, () => healthcheckHook(app, lando));
-  lando.events.on('pre-engine-build', 5, async data => {
+  lando.events.once('pre-engine-build', async data => {
     const instanceData = (0, _devEnvironmentCore.readEnvironmentData)(app._name);
     let registryResolvable = false;
     try {
@@ -122,42 +147,46 @@ function addHooks(app, lando) {
 }
 const healthChecks = {
   database: 'mysql -uroot --silent --execute "SHOW DATABASES;"',
-  'vip-search': "curl -s --noproxy '*' -XGET localhost:9200",
+  elasticsearch: "curl -s --noproxy '*' -XGET localhost:9200",
   php: '[[ -f /wp/wp-includes/pomo/mo.php ]]'
 };
 async function healthcheckHook(app, lando) {
+  const now = new Date();
   try {
     await lando.Promise.retry(async () => {
       const list = await lando.engine.list({
         project: app.project
       });
       const notHealthyContainers = [];
+      const checkPromises = [];
+      const containerOrder = [];
       for (const container of list) {
         if (healthChecks[container.service]) {
-          try {
-            debug(`Testing ${container.service}: ${healthChecks[container.service]}`);
-            await app.engine.run({
-              id: container.id,
-              cmd: healthChecks[container.service],
-              compose: app.compose,
-              project: app.project,
-              opts: {
-                silent: true,
-                noTTY: true,
-                cstdio: 'pipe',
-                services: [container.service]
-              }
-            });
-          } catch (exception) {
-            debug(`${container.service} Health check failed`);
-            notHealthyContainers.push(container);
-          }
+          debug(`Testing ${container.service}: ${healthChecks[container.service]}`);
+          containerOrder.push(container);
+          checkPromises.push(app.engine.run({
+            id: container.id,
+            cmd: healthChecks[container.service],
+            compose: app.compose,
+            project: app.project,
+            opts: {
+              silent: true,
+              noTTY: true,
+              cstdio: 'pipe',
+              services: [container.service]
+            }
+          }));
         }
       }
-      if (notHealthyContainers.length) {
-        for (const container of notHealthyContainers) {
-          console.log(`Waiting for service ${container.service} ...`);
+      const results = await Promise.allSettled(checkPromises);
+      results.forEach((result, index) => {
+        if (result.status === 'rejected') {
+          debug(`${containerOrder[index].service} Health check failed`);
+          notHealthyContainers.push(containerOrder[index]);
         }
+      });
+      if (notHealthyContainers.length) {
+        notHealthyContainers.forEach(container => console.log(`Waiting for service ${container.service} ...`));
         return Promise.reject(notHealthyContainers);
       }
     }, {
@@ -165,31 +194,28 @@ async function healthcheckHook(app, lando) {
       backoff: 1000
     });
   } catch (containersWithFailingHealthCheck) {
-    for (const container of containersWithFailingHealthCheck) {
-      console.log(_chalk.default.yellow('WARNING:') + ` Service ${container.service} failed healthcheck`);
-    }
+    containersWithFailingHealthCheck.forEach(container => console.log(_chalk.default.yellow('WARNING:') + ` Service ${container.service} failed healthcheck`));
   }
+  const duration = new Date().getTime() - now.getTime();
+  debug(`Healthcheck completed in ${duration}ms`);
 }
 async function landoStop(lando, instancePath) {
   debug('Will stop lando app on path:', instancePath);
-  const app = lando.getApp(instancePath);
-  await app.init();
+  const app = await getLandoApplication(lando, instancePath);
   await app.stop();
 }
 async function landoDestroy(lando, instancePath) {
   debug('Will destroy lando app on path:', instancePath);
-  const app = lando.getApp(instancePath);
-  await app.init();
+  const app = await getLandoApplication(lando, instancePath);
   await app.destroy();
 }
 async function landoInfo(lando, instancePath) {
   var _app$info$find;
-  const app = lando.getApp(instancePath);
-  await app.init();
+  const app = await getLandoApplication(lando, instancePath);
   let appInfo = _utils.default.startTable(app);
   const reachableServices = app.info.filter(service => service.urls.length);
   reachableServices.forEach(service => appInfo[`${service.service} urls`] = service.urls);
-  const isUp = await isEnvUp(app);
+  const isUp = await isEnvUp(lando, instancePath);
   const frontEndUrl = (_app$info$find = app.info.find(service => 'nginx' === service.service)) === null || _app$info$find === void 0 ? void 0 : _app$info$find.urls[0];
   const extraService = await getExtraServicesConnections(lando, app);
   appInfo = {
@@ -213,7 +239,7 @@ async function landoInfo(lando, instancePath) {
   return appInfo;
 }
 const extraServiceDisplayConfiguration = [{
-  name: 'vip-search',
+  name: 'elasticsearch',
   label: 'enterprise search',
   protocol: 'http'
 }, {
@@ -248,43 +274,48 @@ async function getExtraServicesConnections(lando, app) {
   }
   return extraServices;
 }
-async function isEnvUp(app) {
+async function isEnvUp(lando, instancePath) {
+  const now = new Date();
+  const app = await getLandoApplication(lando, instancePath);
   const reachableServices = app.info.filter(service => service.urls.length);
   const urls = reachableServices.map(service => service.urls).flat();
   const scanResult = await app.scanUrls(urls, {
     max: 1
   });
+  const duration = new Date().getTime() - now.getTime();
+  debug('isEnvUp took %d ms', duration);
+
   // If all the URLs are reachable then the app is considered 'up'
   return (scanResult === null || scanResult === void 0 ? void 0 : scanResult.length) && scanResult.filter(result => result.status).length === scanResult.length;
 }
 async function landoExec(lando, instancePath, toolName, args, options) {
-  const app = lando.getApp(instancePath);
-  await app.init();
-  if (!options.force) {
-    const isUp = await isEnvUp(app);
-    if (!isUp) {
-      throw new _userError.default('Environment needs to be started before running wp command');
-    }
-  }
+  const app = await getLandoApplication(lando, instancePath);
   const tool = app.config.tooling[toolName];
   if (!tool) {
-    throw new Error(`${toolName} is not a known lando task`);
+    throw new _userError.default(`${toolName} is not a known lando task`);
+  }
+  const savedArgv = process.argv;
+  try {
+    /*
+    	lando is looking in both passed args and process.argv so we need to do a bit of hack to fake process.argv
+    	so that lando doesn't try to interpret args not meant for wp.
+    		Lando drops first 3 args (<node> <lando> <command>) from process.argv and process rest, so we will fake 3 args + the real args
+    */
+    process.argv = ['0', '1', '3'].concat(args);
+    tool.app = app;
+    tool.name = toolName;
+    if (options.stdio) {
+      tool.stdio = options.stdio;
+    }
+    const task = (0, _build.default)(tool, lando);
+    const argv = {
+      // eslint-disable-next-line id-length
+      _: args
+    };
+    await task.run(argv);
+  } finally {
+    process.argv = savedArgv;
   }
-
-  /*
-   lando is looking in both passed args and process.argv so we need to do a bit of hack to fake process.argv
-   so that lando doesn't try to interpret args not meant for wp.
-  	 Lando drops first 3 args (<node> <lando> <command>) from process.argv and process rest, so we will fake 3 args + the real args
-  */
-  process.argv = ['0', '1', '3'].concat(args);
-  tool.app = app;
-  tool.name = toolName;
-  const task = (0, _build.default)(tool, lando);
-  const argv = {
-    _: args // eslint-disable-line
-  };
-
-  await task.run(argv);
 }
 
 /**

package/dist/lib/envvar/api-delete.js

@@ -7,15 +7,12 @@ exports.default = deleteEnvVar;
 var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 var _api = _interopRequireDefault(require("../api"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /**
  * External dependencies
  */
-
 /**
  * Internal dependencies
  */
-
 const mutation = (0, _graphqlTag.default)`
 	mutation DeleteEnvironmentVariable(
 		$appId: Int!

package/dist/lib/envvar/api-get-all.js

@@ -7,15 +7,12 @@ exports.default = getEnvVars;
 var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 var _api = _interopRequireDefault(require("../api"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /**
  * External dependencies
  */
-
 /**
  * Internal dependencies
  */
-
 const query = (0, _graphqlTag.default)`
 	query GetEnvironmentVariablesWithValues(
 		$appId: Int!

package/dist/lib/envvar/api-get.js

@@ -6,15 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = getEnvVar;
 var _apiGetAll = _interopRequireDefault(require("./api-get-all"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /**
  * External dependencies
  */
-
 /**
  * Internal dependencies
  */
-
 async function getEnvVar(appId, envId, name) {
   const envvars = await (0, _apiGetAll.default)(appId, envId);
   return envvars.find(({

package/dist/lib/envvar/api-list.js

@@ -7,15 +7,12 @@ exports.default = listEnvVars;
 var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 var _api = _interopRequireDefault(require("../api"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /**
  * External dependencies
  */
-
 /**
  * Internal dependencies
  */
-
 const query = (0, _graphqlTag.default)`
 	query GetEnvironmentVariables(
 		$appId: Int!

package/dist/lib/envvar/api-set.js

@@ -7,15 +7,12 @@ exports.default = setEnvVar;
 var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 var _api = _interopRequireDefault(require("../api"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /**
  * External dependencies
  */
-
 /**
  * Internal dependencies
  */
-
 const mutation = (0, _graphqlTag.default)`
 	mutation AddEnvironmentVariable(
 		$appId: Int!

package/dist/lib/keychain/browser.js

@@ -4,11 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 /**
  * Internal dependencies
  */
-
 class Secure {
   getPassword(service) {
     return new Promise(resolve => {

package/dist/lib/keychain/insecure.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 /**
  * External dependencies
  */

package/dist/lib/media-import/progress.js

@@ -8,15 +8,12 @@ var _singleLineLog = require("single-line-log");
 var _status = require("./status");
 var _format = require("../cli/format");
 /** @format */
-
 /**
  * External dependencies
  */
-
 /**
  * Internal dependencies
  */
-
 const PRINT_INTERVAL = process.env.DEBUG ? 5000 : 200; // How often the report is printed. Mainly affects the "spinner" animation.
 
 class MediaImportProgressTracker {

package/dist/lib/token.js

@@ -9,15 +9,12 @@ var _uuid2 = require("uuid");
 var _keychain = _interopRequireDefault(require("./keychain"));
 var _api = require("./api");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /**
  * External dependencies
  */
-
 /**
  * Internal dependencies
  */
-
 // Config
 const SERVICE = 'vip-go-cli';
 exports.SERVICE = SERVICE;

package/dist/lib/vip-import-validate-files.js

@@ -8,11 +8,9 @@ var _chalk = _interopRequireDefault(require("chalk"));
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /**
  * External dependencies
  */
-
 // Accepted media file extensions
 const acceptedExtensions = ['jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'svg', 'tiff', 'tif', 'ico', 'asf', 'asx', 'wmv', 'wmx', 'wm', 'avi', 'divx', 'mov', 'qt', 'mpeg', 'mpg', 'mpe', 'mp4', 'm4v', 'ogv', 'webm', 'mkv', '3gp', '3gpp', '3g2', '3gp2', 'txt', 'asc', 'c', 'cc', 'h', 'srt', 'csv', 'tsv', 'ics', 'rtx', 'css', 'vtt', 'dfxp', 'mp3', 'm4a', 'm4b', 'ra', 'ram', 'wav', 'ogg', 'oga', 'mid', 'midi', 'wma', 'wax', 'mka', 'rtf', 'js', 'pdf', 'class', 'psd', 'xcf', 'doc', 'pot', 'pps', 'ppt', 'wri', 'xla', 'xls', 'xlt', 'xlw', 'mdb', 'mpp', 'docx', 'docm', 'dotx', 'dotm', 'xlsx', 'xlsm', 'xlsb', 'xltx', 'xltm', 'xlam', 'pptx', 'pptm', 'ppsx', 'ppsm', 'potx', 'potm', 'ppam', 'sldx', 'sldm', 'onetoc', ' onetoc2', 'onetmp', 'onepkg', 'oxps', 'xps', 'odt', 'odp', 'ods', 'odg', 'odc', 'odb', 'odf', 'webp', 'wp', 'wpd', 'key', 'numbers', 'pages'];