@automattic/vip 2.27.0 → 2.28.0-dev

package/dist/bin/vip-cache.js

@@ -17,5 +17,5 @@
 var _command = _interopRequireDefault(require("../lib/cli/command"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 (0, _command.default)({
-  requiredArgs: 2
+  requiredArgs: 1
 }).command('purge-url', 'Purge page cache').argv(process.argv);

package/dist/bin/vip-config-envvar.js

@@ -17,5 +17,5 @@
 var _command = _interopRequireDefault(require("../lib/cli/command"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 (0, _command.default)({
-  requiredArgs: 1
+  requiredArgs: 0
 }).command('delete', 'Permanently delete an environment variable').command('get', 'Get the value of an environment variable').command('get-all', 'Get the values of all environment variable').command('list', 'List the names of all environment variables').command('set', 'Add or update an environment variable').argv(process.argv);

package/dist/bin/vip-dev-env.js

@@ -17,5 +17,5 @@
 var _command = _interopRequireDefault(require("../lib/cli/command"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 (0, _command.default)({
-  requiredArgs: 1
+  requiredArgs: 0
 }).command('create', 'Create a new local dev environment').command('update', 'Update an already created local dev environment').command('start', 'Start a local dev environment').command('stop', 'Stop a local dev environment').command('destroy', 'Remove containers, networks, volumes and configuration files of a local dev environment').command('info', 'Provides basic info about one or multiple local dev environments').command('list', 'Provides basic info about all local dev environments').command('exec', 'Execute a WP-CLI command in local dev environment').command('import', 'Import data into a local WordPress environment').command('shell', 'Spawns a shell in a dev environment').command('logs', 'View logs from a local WordPress environment').argv(process.argv);

package/dist/bin/vip-validate.js

@@ -13,7 +13,7 @@ var _command = _interopRequireDefault(require("../lib/cli/command"));
 var _tracker = require("../lib/tracker");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 (0, _command.default)({
-  requiredArgs: 1
+  requiredArgs: 0
 }).command('preflight', 'Runs preflight tests to validate if your application is ready to be deployed').argv(process.argv, async () => {
   await (0, _tracker.trackEvent)('vip_validate_command_execute');
 });

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

@@ -83,13 +83,7 @@ async function getLandoConfig() {
       subdir: '.',
       namespace: '@lando'
     }],
-    disablePlugins: [
-    // Plugins we need:
-    // '@lando/compose',
-    // '@lando/mailhog',
-    // '@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/memcached', '@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'],
+    disablePlugins: ['@lando/argv'],
     proxyName: 'vip-dev-env-proxy',
     userConfRoot: landoDir,
     home: fakeHomeDir,
@@ -125,7 +119,6 @@ async function landoRecovery(lando, instancePath, error) {
   console.error(_chalk.default.green('Recovery successful, trying to initialize again...'));
   try {
     const app = lando.getApp(instancePath);
-    addHooks(app, lando);
     await app.init();
     return app;
   } catch (initError) {
@@ -143,7 +136,6 @@ async function getLandoApplication(lando, instancePath) {
   let app;
   try {
     app = lando.getApp(instancePath);
-    await addHooks(app, lando);
     await app.init();
   } catch (error) {
     app = await landoRecovery(lando, instancePath, error);
@@ -153,6 +145,28 @@ async function getLandoApplication(lando, instancePath) {
 }
 async function bootstrapLando() {
   const lando = new _lando.default(await getLandoConfig());
+  lando.events.once('pre-engine-build', async data => {
+    const instanceData = (0, _devEnvironmentCore.readEnvironmentData)(data.name);
+    let registryResolvable = false;
+    try {
+      registryResolvable = (await _dns.default.promises.lookup('ghcr.io')).address || false;
+      debug('Registry ghcr.io is resolvable');
+    } catch (err) {
+      debug('Registry ghcr.io is not resolvable, image pull might be broken.');
+      registryResolvable = false;
+    }
+    const pull = registryResolvable && (instanceData.pullAfter || 0) < Date.now();
+    if (Array.isArray(data.opts.pullable) && Array.isArray(data.opts.local) && data.opts.local.length === 0 && !pull) {
+      // Setting `data.opts.pullable` to an empty array prevents Lando from pulling images with `docker pull`.
+      // Note that if some of the images are not available, they will still be pulled by `docker-compose`.
+      data.opts.local = data.opts.pullable;
+      data.opts.pullable = [];
+    }
+    if (pull || !instanceData.pullAfter) {
+      instanceData.pullAfter = Date.now() + 7 * 24 * 60 * 60 * 1000;
+      (0, _devEnvironmentCore.writeEnvironmentData)(data.name, instanceData);
+    }
+  });
   await lando.bootstrap();
   return lando;
 }
@@ -178,85 +192,6 @@ async function landoRebuild(lando, instancePath) {
   await ensureNoOrphantProxyContainer(lando);
   await app.rebuild();
 }
-async function addHooks(app, lando) {
-  app.events.on('post-start', 1, () => healthcheckHook(app, lando));
-  lando.events.once('pre-engine-build', async data => {
-    const instanceData = (0, _devEnvironmentCore.readEnvironmentData)(app._name);
-    let registryResolvable = false;
-    try {
-      registryResolvable = (await _dns.default.promises.lookup('ghcr.io')).address || false;
-      debug('Registry ghcr.io is resolvable');
-    } catch (err) {
-      debug('Registry ghcr.io is not resolvable, image pull might be broken.');
-      registryResolvable = false;
-    }
-    const pull = registryResolvable && (instanceData.pullAfter || 0) < Date.now();
-    if (Array.isArray(data.opts.pullable) && Array.isArray(data.opts.local) && data.opts.local.length === 0 && !pull) {
-      // Settigs `data.opts.pullable` to an empty array prevents Lando from pulling images with `docker pull`.
-      // Note that if some of the images are not available, they will still be pulled by `docker-compose`.
-      data.opts.local = data.opts.pullable;
-      data.opts.pullable = [];
-    }
-    if (pull || !instanceData.pullAfter) {
-      instanceData.pullAfter = Date.now() + 7 * 24 * 60 * 60 * 1000;
-      (0, _devEnvironmentCore.writeEnvironmentData)(app._name, instanceData);
-    }
-  });
-}
-const healthChecks = {
-  database: 'mysql -uroot --silent --execute "SHOW DATABASES;"',
-  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]) {
-          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]
-            }
-          }));
-        }
-      }
-      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);
-      }
-    }, {
-      max: 20,
-      backoff: 1000
-    });
-  } catch (containersWithFailingHealthCheck) {
-    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 = await getLandoApplication(lando, instancePath);