@automattic/vip 2.19.2 → 2.21.0

package/CHANGELOG.md

@@ -1,7 +1,43 @@
 ## Changelog
 
+### 2.21.0 (24 Oct 2022)
+
+- #1143 [dev-env] adds default for wordpress version prompt
+- #1146 fix(dev-env): Resolve the "xdebugConfig is not defined" issue
+- #1142 Update Slack channel on which to (optionally) ping before release
+- #1144 fix: Suppress ES security-related warnings
+- #1132 [PIE-3105] Update VIP-CLI command line output
+- #1118 Remove unused confirmation prompt during sql import
+- #1137 [dev-env] simplify and rename elasticsearch service config
+- #1138 [dev-env] Update/rename app code and mu-plugins
+
+### 2.20.0 (19 Oct 2022)
+
+- #1121  Add support for custom PHP images
+- #1136  SQL Import: Add validation for unique_checks being disabled
+- #1131  SQL Import - Add ALTER TABLE statement validation
+- #1134  [dev-env] add app and env to tracks when creating env
+- #1135  [dev-env] Make xdebug config not break during wp update
+- #1098  Include options into reading software config
+- #1114  [dev-env] Verify current user is a docker user
+- #1130  Update/exec help
+- #1125  add validation output
+- #1127  Run wp-cli as www-data
+- #1120  Update php-fpm image names
+- #1126  Update memcached to 1.6-alpine3.16
+- #1124  [dev-env] Supress Setup wizard during update
+- #1111  [dev-env] prompt for es index after db import
+- #1119  Use --yes instead of --force
+- #1115  [dev-env] reclasify most common error
+- #1122  [dev-env] support xdebug_config environment variable
+- #1129  Fix ESLint/Flow/SonarScan issues
+- #1133  Add PHP 8.2 image
+- #1141  SQL validation: Change formatting to make it more readable
+
+https://github.com/Automattic/vip-cli/releases/tag/v2.20.0
+
 ### 2.19.2 (23 Sep 2022)
-- #1116 Reverted #1049 changes 
+- #1116 Reverted #1049 changes
 
 ### 2.19.0 (23 Sep 2022)
 - #1108 [dev-env] Validate import file and add debug lines

package/CONTRIBUTING.md

@@ -50,7 +50,7 @@ Our release flow for VIP CLI follows this pattern:
 - This is a public repository. Please do not include any internal links in PRs, changelogs, testing instructions, etc.
 - Merge changes from your feature branch to the `develop` branch
 - If you are ready to release your changes publicly, merge your changes from the `develop` branch to the `master` branch. All changes that are not ready to be public should be feature flagged or stay in the `develop` branch to avoid conflicts when releasing urgent fixes (not recommended).
-- Finally, release your changes as a new minor or major NPM version. Ping in the #vip-platform-patisserie channel to notify folks of a new release, but please feel free to release your changes without any blockers from the team. Any team member that is part of the Automattic NPM organization can release a new version; if you aren't a member, generic credentials are available in the Secret Store.
+- Finally, release your changes as a new minor or major NPM version. Ping in the #vip-platform channel to notify folks of a new release, but please feel free to release your changes without any blockers from the team. Any team member that is part of the Automattic NPM organization can release a new version; if you aren't a member, generic credentials are available in the Secret Store.
 
 ### Changelogs
 Changelogs allow customers to keep up with all the changes happening across our VIP Platform. Changelogs for VIP CLI are posted to the [VIP Cloud Changelog P2](https://wpvipchangelog.wordpress.com/), along with the repository’s `README.md`.

package/assets/dev-env.lando.template.yml.ejs

@@ -14,7 +14,7 @@ services:
   devtools:
     type: compose
     services:
-      image: ghcr.io/automattic/vip-container-images/dev-tools:0.8
+      image: ghcr.io/automattic/vip-container-images/dev-tools:0.9
       command: sleep infinity
       volumes:
         - devtools:/dev-tools
@@ -40,9 +40,11 @@ services:
       command: run.sh
       working_dir: /wp
       environment:
-        XDEBUG: <%= xdebug ? 'enable' : 'disable' %>
         STATSD: <%= statsd ? 'enable' : 'disable' %>
-
+        XDEBUG: <%= xdebug ? 'enable' : 'disable' %>
+<% if ( xdebugConfig ) { %>
+        XDEBUG_CONFIG: "<%= xdebugConfig %>"
+<% } %>
         LANDO_NO_USER_PERMS: 'enable'
 
 
@@ -78,7 +80,7 @@ services:
   memcached:
     type: memcached:custom
     overrides:
-      image: memcached:1.6-alpine3.14
+      image: memcached:1.6-alpine3.16
       command: docker-entrypoint.sh memcached
 
 <% if ( phpmyadmin ) { %>
@@ -90,11 +92,11 @@ services:
       environment:
         UPLOAD_LIMIT: 4G
 <% } %>
-<% if ( elasticsearchEnabled ) { %>
-  vip-search:
+<% if ( elasticsearch ) { %>
+  elasticsearch:
     type: compose
     services:
-      image: elasticsearch:<%= elasticsearch %>
+      image: elasticsearch:7.17.2
       command: /usr/local/bin/docker-entrypoint.sh
       environment:
         ELASTICSEARCH_IS_DEDICATED_NODE: 'no'
@@ -102,6 +104,7 @@ services:
         ELASTICSEARCH_NODE_NAME: 'lando'
         ELASTICSEARCH_PORT_NUMBER: 9200
         discovery.type: 'single-node'
+        xpack.security.enabled: 'false'
       ports:
         - ":9200"
       volumes:
@@ -131,7 +134,7 @@ services:
             nocopy: true
 
 <% if ( muPlugins.mode == 'image' ) { %>
-  mu-plugins:
+  vip-mu-plugins:
     type: compose
     services:
       image: ghcr.io/automattic/vip-container-images/mu-plugins:0.1
@@ -148,7 +151,7 @@ services:
 <% } %>
 
 <% if ( appCode.mode == 'image' ) { %>
-  client-code:
+  demo-app-code:
     type: compose
     services:
       image: ghcr.io/automattic/vip-container-images/skeleton:latest
@@ -175,15 +178,9 @@ tooling:
   wp:
     service: php
     description: "Run WP-CLI command"
-    user: root
-    cmd:
-      - wp --allow-root
-
-  add-site:
-    service: php
-    description: "Add site to a multisite installation"
+    user: www-data
     cmd:
-      - bash /dev-tools/add-site.sh
+      - wp
 
   db:
     service: php

package/dist/bin/vip-config-software-get.js

@@ -28,12 +28,13 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 // Command examples
 const examples = [{
-  usage: 'vip @mysite.develop config software get wordpress --format json',
-  description: 'Read current software settings for WordPress in JSON format'
+  usage: 'vip @mysite.develop config software get wordpress --include available_versions --format json',
+  description: 'Read current software settings for WordPress in JSON format including available versions'
 }, {
   usage: 'vip @mysite.develop config software get',
   description: 'Read current software settings for all components'
 }];
+const VALID_INCLUDES = ['available_versions'];
 (0, _command.default)({
   appContext: true,
   appQuery: _software.appQuery,
@@ -42,7 +43,7 @@ const examples = [{
   wildcardCommand: true,
   format: true,
   usage: 'vip @mysite.develop config software get <wordpress|php|nodejs|muplugins>'
-}).examples(examples).argv(process.argv, async (arg, opt) => {
+}).option('include', `Extra information to be included. Valida values: ${VALID_INCLUDES.join(',')}`).examples(examples).argv(process.argv, async (arg, opt) => {
   var _opt$env;
 
   const trackingInfo = {
@@ -50,6 +51,22 @@ const examples = [{
     args: JSON.stringify(arg)
   };
   await (0, _tracker.trackEvent)('config_software_get_execute', trackingInfo);
+  let include = [];
+
+  if (opt.include) {
+    if (Array.isArray(opt.include)) {
+      include = opt.include;
+    } else {
+      include = [opt.include];
+    }
+
+    const invalidIncludes = include.filter(includeKey => !VALID_INCLUDES.includes(includeKey));
+
+    if (invalidIncludes.length > 0) {
+      throw new _userError.default(`Invalid include value(s): ${invalidIncludes.join(',')}`);
+    }
+  }
+
   const {
     softwareSettings
   } = opt.env;
@@ -72,19 +89,7 @@ const examples = [{
     chosenSettings = [softwareSettings.wordpress, softwareSettings.php, softwareSettings.muplugins, softwareSettings.nodejs];
   }
 
-  const preFormatted = chosenSettings.filter(softwareSetting => !!softwareSetting).map(softwareSetting => {
-    let version = softwareSetting.current.version;
-
-    if (softwareSetting.slug === 'wordpress' && !softwareSetting.pinned) {
-      version += ' (managed updates)';
-    }
-
-    return {
-      name: softwareSetting.name,
-      slug: softwareSetting.slug,
-      version
-    };
-  });
+  const preFormatted = chosenSettings.filter(softwareSetting => !!softwareSetting).map(softwareSetting => (0, _software.formatSoftwareSettings)(softwareSetting, include, opt.format));
   console.log((0, _format.formatData)(preFormatted, opt.format));
   await (0, _tracker.trackEvent)('config_software_get_success', trackingInfo);
 });

package/dist/bin/vip-config-software-update.js

@@ -51,7 +51,7 @@ const cmd = (0, _command.default)({
   usage: 'vip @mysite.develop config software update nodejs 16',
   description: 'Update Node.js to v16'
 }]);
-cmd.option('force', 'Auto-confirm update');
+cmd.option('yes', 'Auto-confirm update');
 cmd.argv(process.argv, async (arg, opt) => {
   const {
     app,
@@ -73,7 +73,7 @@ cmd.argv(process.argv, async (arg, opt) => {
     }
 
     const updateOptions = {
-      force: !!opt.force
+      force: !!opt.yes
     };
 
     if (arg.length > 0) {

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

@@ -66,7 +66,9 @@ cmd.argv(process.argv, async (arg, opt) => {
   await (0, _devEnvironmentCli.validateDependencies)(slug);
   debug('Args: ', arg, 'Options: ', opt);
   const trackingInfo = {
-    slug
+    slug,
+    app: opt.app,
+    env: opt.env
   };
   await (0, _tracker.trackEvent)('dev_env_create_command_execute', trackingInfo);
 

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

@@ -29,12 +29,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const examples = [{
   usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} exec -- wp post list`,
   description: 'Use dev-environment to run `wp post list`'
+}, {
+  usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} exec --slug my_site -- wp post list --posts_per_page=500`,
+  description: 'Use dev-environment "my-site" to run `wp post list --posts_per_page=500`'
 }, {
   usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} exec --slug my_site -- wp shell`,
   description: 'Use dev-environment "my_site" to run interactive wp shell'
-}, {
-  usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} exec -- add-site --new-site-slug subsite --new-site-title "New Subsite"`,
-  description: 'Execute script to add a subsite to multisite dev environment'
 }];
 (0, _command.default)({
   wildcardCommand: true

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

@@ -81,6 +81,17 @@ const examples = [{
 
     const cacheArg = ['wp', 'cache', 'flush'];
     await (0, _devEnvironmentCore.exec)(slug, cacheArg);
+
+    try {
+      await (0, _devEnvironmentCore.exec)(slug, ['wp', 'cli', 'has-command', 'vip-search']);
+      const doIndex = await (0, _devEnvironmentCli.promptForBoolean)('Do you want to index data in ElasticSearch (used by enterprise search)?', true);
+
+      if (doIndex) {
+        await (0, _devEnvironmentCore.exec)(slug, ['wp', 'vip-search', 'index', '--setup', '--network-wide', '--skip-confirm']);
+      }
+    } catch (err) {// Exception means they don't have vip-search enabled.
+    }
+
     const addUserArg = ['wp', 'dev-env-add-admin', '--username=vipgo', '--password=password'];
     await (0, _devEnvironmentCore.exec)(slug, addUserArg);
     await (0, _tracker.trackEvent)('dev_env_import_sql_command_success', trackingInfo);

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

@@ -62,7 +62,6 @@ cmd.argv(process.argv, async (arg, opt) => {
       appCode: currentInstanceData.appCode.dir || currentInstanceData.appCode.tag || 'latest',
       muPlugins: currentInstanceData.muPlugins.dir || currentInstanceData.muPlugins.tag || 'latest',
       wordpress: currentInstanceData.wordpress.tag,
-      elasticsearchEnabled: currentInstanceData.elasticsearchEnabled,
       elasticsearch: currentInstanceData.elasticsearch,
       php: currentInstanceData.php || _devEnvironment.DEV_ENVIRONMENT_PHP_VERSIONS.default,
       mariadb: currentInstanceData.mariadb,
@@ -73,7 +72,11 @@ cmd.argv(process.argv, async (arg, opt) => {
       multisite: false,
       title: ''
     };
-    const instanceData = await (0, _devEnvironmentCli.promptForArguments)(preselectedOptions, defaultOptions);
+    const providedOptions = Object.keys(opt).filter(option => option.length > 1) // Filter out single letter aliases
+    .filter(option => !['debug', 'help', 'slug'].includes(option)); // Filter out options that are not related to instance configuration
+
+    const supressPrompts = providedOptions.length > 0;
+    const instanceData = await (0, _devEnvironmentCli.promptForArguments)(preselectedOptions, defaultOptions, supressPrompts);
     instanceData.siteSlug = slug;
     await (0, _devEnvironmentCore.updateEnvironment)(instanceData);
     const message = '\n' + _chalk.default.green('✓') + ' environment updated. Restart environment for changes to take an affect.';

package/dist/bin/vip-import-sql.js

@@ -362,9 +362,7 @@ const displayPlaybook = ({
   appQuery,
   envContext: true,
   requiredArgs: 1,
-  module: 'import-sql',
-  requireConfirm: 'Are you sure you want to import the contents of the provided SQL file?',
-  skipConfirmPrompt: true
+  module: 'import-sql'
 }).command('status', 'Check the status of the current running import').option('skip-validate', 'Do not perform pre-upload file validation. If unsupported entries are present, the import is likely to fail').option('search-replace', 'Perform Search and Replace on the specified SQL file').option('in-place', 'Search and Replace explicitly on the given input file').option('output', 'Specify the replacement output file for Search and Replace', 'process.stdout').examples(examples).argv(process.argv, async (arg, opts) => {
   var _env$primaryDomain;
 

package/dist/bin/vip.js

@@ -65,22 +65,21 @@ const rootCmd = async function () {
     runCmd();
   } else {
     console.log();
-    console.log('  Welcome to');
     console.log('   _    __ ________         ________    ____');
-    console.log('  | |  / //  _/ __ \       / ____/ /   /  _/');
+    console.log('  | |  / //  _/ __        / ____/ /   /  _/');
     console.log('  | | / / / // /_/ /______/ /   / /    / /  ');
     console.log('  | |/ /_/ // ____//_____/ /___/ /____/ /   ');
-    console.log('  |___//___/_/           \____/_____/___/   ');
+    console.log('  |___//___/_/           ____/_____/___/   ');
     console.log();
-    console.log('  VIP CLI is your tool for interacting with and managing your VIP applications.');
+    console.log('  VIP-CLI is your tool for interacting with and managing your VIP applications.');
     console.log();
-    console.log(`  To get started, we need an access token for your VIP account. We'll open ${tokenURL} in your web browser; follow the instructions there to continue.`);
+    console.log('  Authenticate your installation of VIP-CLI with your Personal Access Token. This URL will be opened in your web browser automatically so that you can retrieve your token: ' + tokenURL);
     console.log();
     await (0, _tracker.trackEvent)('login_command_execute');
     const answer = await (0, _enquirer.prompt)({
       type: 'confirm',
       name: 'continue',
-      message: 'Ready?'
+      message: 'Ready to authenticate?'
     });
 
     if (!answer.continue) {

package/dist/lib/api.js

@@ -7,8 +7,6 @@ exports.disableGlobalGraphQLErrorHandling = disableGlobalGraphQLErrorHandling;
 exports.default = API;
 exports.API_URL = exports.API_HOST = exports.PRODUCTION_API_HOST = void 0;
 
-var _nodeFetch = _interopRequireDefault(require("node-fetch"));
-
 var _core = require("@apollo/client/core");
 
 var _core2 = require("@apollo/client/link/core");
@@ -108,9 +106,8 @@ async function API({
       agent: proxyAgent
     }
   });
-  const apiClient = new _core.ApolloClient({
+  return new _core.ApolloClient({
     link: _core2.ApolloLink.from([withToken, errorLink, authLink, httpLink]),
     cache: new _core.InMemoryCache()
   });
-  return apiClient;
 }

package/dist/lib/config/software.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getUpdateResult = exports.triggerUpdate = exports.promptForUpdate = exports.appQueryFragments = exports.appQuery = void 0;
+exports.formatSoftwareSettings = exports.getUpdateResult = exports.triggerUpdate = exports.promptForUpdate = exports.appQueryFragments = exports.appQuery = void 0;
 
 var _enquirer = require("enquirer");
 
@@ -231,7 +231,9 @@ const _processComponent = async (appTypeId, userProvidedComponent) => {
     message: 'Component to update',
     choices
   });
-  return await select.run();
+  return select.run().catch(() => {
+    throw new _userError.default('Command cancelled by user.');
+  });
 };
 
 const _processComponentVersion = async (softwareSettings, component, userProvidedVersion) => {
@@ -251,7 +253,9 @@ const _processComponentVersion = async (softwareSettings, component, userProvide
     message: `Version for ${COMPONENT_NAMES[component]} to upgrade to`,
     choices: versionChoices
   });
-  return await versionSelect.run();
+  return versionSelect.run().catch(() => {
+    throw new _userError.default('Command cancelled by user.');
+  });
 };
 
 const promptForUpdate = async (appTypeId, opts, softwareSettings) => {
@@ -259,7 +263,9 @@ const promptForUpdate = async (appTypeId, opts, softwareSettings) => {
   const version = await _processComponentVersion(softwareSettings, component, opts.version);
   const confirm = opts.force || (await new _enquirer.Confirm({
     message: `Are you sure you want to upgrade ${COMPONENT_NAMES[component]} to ${version}?`
-  }).run());
+  }).run().catch(() => {
+    throw new _userError.default('Command cancelled by user.');
+  }));
 
   if (confirm) {
     return {
@@ -276,7 +282,7 @@ exports.promptForUpdate = promptForUpdate;
 const triggerUpdate = async variables => {
   debug('Triggering update', variables);
   const api = await (0, _api.default)();
-  return await api.mutate({
+  return api.mutate({
     mutation: updateSoftwareMutation,
     variables
   });
@@ -342,4 +348,30 @@ const getUpdateResult = async (appId, envId) => {
   };
 };
 
-exports.getUpdateResult = getUpdateResult;
+exports.getUpdateResult = getUpdateResult;
+
+const formatSoftwareSettings = (softwareSetting, includes, format) => {
+  let version = softwareSetting.current.version;
+
+  if (softwareSetting.slug === 'wordpress' && !softwareSetting.pinned) {
+    version += ' (managed updates)';
+  }
+
+  const result = {
+    name: softwareSetting.name,
+    slug: softwareSetting.slug,
+    version
+  };
+
+  if (includes.includes('available_versions')) {
+    result.available_versions = _optionsForVersion(softwareSetting).map(option => option.value);
+
+    if (format !== 'json') {
+      result.available_versions = result.available_versions.join(',');
+    }
+  }
+
+  return result;
+};
+
+exports.formatSoftwareSettings = formatSoftwareSettings;

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

@@ -11,7 +11,6 @@ exports.DEV_ENVIRONMENT_FULL_COMMAND = DEV_ENVIRONMENT_FULL_COMMAND;
 const DEV_ENVIRONMENT_DEFAULTS = {
   title: 'VIP Dev',
   multisite: false,
-  elasticsearchVersion: '7.17.2',
   mariadbVersion: '10.3',
   phpVersion: '8.0'
 };
@@ -33,9 +32,11 @@ const DEV_ENVIRONMENT_WORDPRESS_VERSION_TTL = 86400; // once per day
 exports.DEV_ENVIRONMENT_WORDPRESS_VERSION_TTL = DEV_ENVIRONMENT_WORDPRESS_VERSION_TTL;
 const DEV_ENVIRONMENT_PHP_VERSIONS = {
   // eslint-disable-next-line quote-props
-  '8.1': 'ghcr.io/automattic/vip-container-images/php-fpm-alt:8.1',
-  '8.0': 'ghcr.io/automattic/vip-container-images/php-fpm-alt:8.0',
-  // eslint-disable-next-line quote-props -- flow does nit support non-string keys
-  '7.4': 'ghcr.io/automattic/vip-container-images/php-fpm-alt:7.4'
+  '8.2': 'ghcr.io/automattic/vip-container-images/php-fpm:8.2',
+  // eslint-disable-next-line quote-props
+  '8.1': 'ghcr.io/automattic/vip-container-images/php-fpm:8.1',
+  '8.0': 'ghcr.io/automattic/vip-container-images/php-fpm:8.0',
+  // eslint-disable-next-line quote-props -- flow does not support non-string keys
+  '7.4': 'ghcr.io/automattic/vip-container-images/php-fpm:7.4'
 };
 exports.DEV_ENVIRONMENT_PHP_VERSIONS = DEV_ENVIRONMENT_PHP_VERSIONS;

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

@@ -35,7 +35,7 @@ var _path = _interopRequireDefault(require("path"));
 
 var _os = _interopRequireDefault(require("os"));
 
-var exit = _interopRequireWildcard(require("../cli/exit"));
+var _progress = require("../cli/progress");
 
 var _tracker = require("../tracker");
 
@@ -47,10 +47,6 @@ var _devEnvironmentLando = require("./dev-environment-lando");
 
 var _userError = _interopRequireDefault(require("../user-error"));
 
-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); }
-
-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; }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /**
@@ -131,14 +127,48 @@ const verifyDNSResolution = slug => {
   });
 };
 
+const VALIDATION_STEPS = [{
+  id: 'docker',
+  name: 'Check for docker installation'
+}, {
+  id: 'compose',
+  name: 'Check for docker-compose installation'
+}, {
+  id: 'access',
+  name: 'Check access to docker for current user'
+}, {
+  id: 'dns',
+  name: 'Check DNS resolution'
+}];
+
 const validateDependencies = async slug => {
+  const progressTracker = new _progress.ProgressTracker(VALIDATION_STEPS);
+  console.log('Running validation steps...');
+  progressTracker.startPrinting();
+  progressTracker.stepRunning('docker');
+
   try {
     await (0, _devEnvironmentLando.validateDockerInstalled)();
   } catch (exception) {
     throw new _userError.default(exception.message);
   }
 
+  progressTracker.stepSuccess('docker');
+  progressTracker.stepSuccess('compose');
+  progressTracker.print();
+
+  try {
+    await (0, _devEnvironmentLando.validateDockerAccess)();
+  } catch (exception) {
+    throw new _userError.default(exception.message);
+  }
+
+  progressTracker.stepSuccess('access');
+  progressTracker.print();
   await verifyDNSResolution(slug);
+  progressTracker.stepSuccess('dns');
+  progressTracker.print();
+  progressTracker.stopPrinting();
 };
 
 exports.validateDependencies = validateDependencies;
@@ -213,13 +243,22 @@ function getOptionsFromAppInfo(appInfo) {
  * Prompt for arguments
  * @param {InstanceOptions} preselectedOptions - options to be used without prompt
  * @param {InstanceOptions} defaultOptions - options to be used as default values for prompt
+ * @param {boolean} supressPrompts - supress prompts and use default values where needed
  * @returns {any} instance data
  */
 
 
-async function promptForArguments(preselectedOptions, defaultOptions) {
+async function promptForArguments(preselectedOptions, defaultOptions, supressPrompts = false) {
   debug('Provided preselected', preselectedOptions, 'and default', defaultOptions);
-  console.log(_devEnvironment.DEV_ENVIRONMENT_PROMPT_INTRO);
+
+  if (supressPrompts) {
+    preselectedOptions = { ...defaultOptions,
+      ...preselectedOptions
+    };
+  } else {
+    console.log(_devEnvironment.DEV_ENVIRONMENT_PROMPT_INTRO);
+  }
+
   let multisiteText = 'Multisite';
   let multisiteDefault = _devEnvironment.DEV_ENVIRONMENT_DEFAULTS.multisite;
 
@@ -231,8 +270,7 @@ async function promptForArguments(preselectedOptions, defaultOptions) {
   const instanceData = {
     wpTitle: preselectedOptions.title || (await promptForText('WordPress site title', defaultOptions.title || _devEnvironment.DEV_ENVIRONMENT_DEFAULTS.title)),
     multisite: 'multisite' in preselectedOptions ? preselectedOptions.multisite : await promptForBoolean(multisiteText, !!multisiteDefault),
-    elasticsearchEnabled: false,
-    elasticsearch: preselectedOptions.elasticsearch || defaultOptions.elasticsearch || _devEnvironment.DEV_ENVIRONMENT_DEFAULTS.elasticsearchVersion,
+    elasticsearch: false,
     php: preselectedOptions.php ? resolvePhpVersion(preselectedOptions.php) : await promptForPhpVersion(resolvePhpVersion(defaultOptions.php || _devEnvironment.DEV_ENVIRONMENT_DEFAULTS.phpVersion)),
     mariadb: preselectedOptions.mariadb || defaultOptions.mariadb || _devEnvironment.DEV_ENVIRONMENT_DEFAULTS.mariadbVersion,
     mediaRedirectDomain: preselectedOptions.mediaRedirectDomain || '',
@@ -248,6 +286,7 @@ async function promptForArguments(preselectedOptions, defaultOptions) {
     statsd: false,
     phpmyadmin: false,
     xdebug: false,
+    xdebugConfig: preselectedOptions.xdebugConfig,
     siteSlug: ''
   };
   const promptLabels = {
@@ -283,12 +322,12 @@ async function promptForArguments(preselectedOptions, defaultOptions) {
   debug(`Processing elasticsearch with preselected "${preselectedOptions.elasticsearch}"`);
 
   if ('elasticsearch' in preselectedOptions) {
-    instanceData.elasticsearchEnabled = !!preselectedOptions.elasticsearch;
+    instanceData.elasticsearch = !!preselectedOptions.elasticsearch;
   } else {
-    instanceData.elasticsearchEnabled = await promptForBoolean('Enable Elasticsearch (needed by Enterprise Search)?', defaultOptions.elasticsearchEnabled);
+    instanceData.elasticsearch = await promptForBoolean('Enable Elasticsearch (needed by Enterprise Search)?', defaultOptions.elasticsearch);
   }
 
-  if (instanceData.elasticsearchEnabled) {
+  if (instanceData.elasticsearch) {
     instanceData.statsd = preselectedOptions.statsd || defaultOptions.statsd || false;
   } else {
     instanceData.statsd = false;
@@ -299,7 +338,7 @@ async function promptForArguments(preselectedOptions, defaultOptions) {
       if (service in preselectedOptions) {
         instanceData[service] = preselectedOptions[service];
       } else {
-        instanceData[service] = await promptForBoolean(`Enable ${promptLabels[service] || service}`, instanceData[service]);
+        instanceData[service] = await promptForBoolean(`Enable ${promptLabels[service] || service}`, defaultOptions[service]);
       }
     }
   }
@@ -363,6 +402,7 @@ function validateLocalPath(component, providedPath) {
     }
 
     if (missingFiles.length > 0) {
+      // eslint-disable-next-line max-len
       const message = `Provided path "${providedPath}" is missing following files/folders: ${missingFiles.join(', ')}. Learn more: https://docs.wpvip.com/technical-references/vip-codebase/#1-wordpress`;
       return {
         result: false,
@@ -420,6 +460,11 @@ async function promptForBoolean(message, initial) {
 
 function resolvePhpVersion(version) {
   debug(`Resolving PHP version '${version}'`);
+
+  if (typeof version === 'string' && version.startsWith('image:')) {
+    return version;
+  }
+
   const versions = Object.keys(_devEnvironment.DEV_ENVIRONMENT_PHP_VERSIONS);
   const images = Object.values(_devEnvironment.DEV_ENVIRONMENT_PHP_VERSIONS); // eslint-disable-next-line eqeqeq -- use loose comparison because commander resolves '8.0' to '8'
 
@@ -513,7 +558,8 @@ async function promptForComponent(component, allowLocal, defaultObject) {
     const tagChoices = await getTagChoices();
     const selectTag = new _enquirer.Select({
       message,
-      choices: tagChoices
+      choices: tagChoices,
+      initial: (defaultObject === null || defaultObject === void 0 ? void 0 : defaultObject.tag) || ''
     });
     const option = await selectTag.run();
     return {
@@ -537,19 +583,11 @@ function processBooleanOption(value) {
     return false;
   }
 
-  if (FALSE_OPTIONS.includes((_value$toLowerCase = value.toLowerCase) === null || _value$toLowerCase === void 0 ? void 0 : _value$toLowerCase.call(value))) {
-    return false;
-  }
-
-  return true;
+  return !FALSE_OPTIONS.includes((_value$toLowerCase = value.toLowerCase) === null || _value$toLowerCase === void 0 ? void 0 : _value$toLowerCase.call(value));
 }
 
 function addDevEnvConfigurationOptions(command) {
-  return command.option('wordpress', 'Use a specific WordPress version').option(['u', 'mu-plugins'], 'Use a specific mu-plugins changeset or local directory').option('app-code', 'Use the application code from a local directory or use "demo" for VIP skeleton code').option('statsd', 'Enable statsd component. By default it is disabled', undefined, processBooleanOption).option('phpmyadmin', 'Enable PHPMyAdmin component. By default it is disabled', undefined, processBooleanOption).option('xdebug', 'Enable XDebug. By default it is disabled', undefined, processBooleanOption).option('elasticsearch', 'Explicitly choose Elasticsearch version to use or false to disable it', undefined, value => {
-    var _value$toLowerCase2;
-
-    return FALSE_OPTIONS.includes(value === null || value === void 0 ? void 0 : (_value$toLowerCase2 = value.toLowerCase) === null || _value$toLowerCase2 === void 0 ? void 0 : _value$toLowerCase2.call(value)) ? false : value;
-  }).option('mariadb', 'Explicitly choose MariaDB version to use').option(['r', 'media-redirect-domain'], 'Domain to redirect for missing media files. This can be used to still have images without the need to import them locally.').option('php', 'Explicitly choose PHP version to use');
+  return command.option('wordpress', 'Use a specific WordPress version').option(['u', 'mu-plugins'], 'Use a specific mu-plugins changeset or local directory').option('app-code', 'Use the application code from a local directory or use "demo" for VIP skeleton code').option('statsd', 'Enable statsd component. By default it is disabled', undefined, processBooleanOption).option('phpmyadmin', 'Enable PHPMyAdmin component. By default it is disabled', undefined, processBooleanOption).option('xdebug', 'Enable XDebug. By default it is disabled', undefined, processBooleanOption).option('xdebug_config', 'Extra configuration to pass to xdebug via XDEBUG_CONFIG environment variable').option('elasticsearch', 'Enable Elasticsearch (needed by Enterprise Search)', undefined, processBooleanOption).option('mariadb', 'Explicitly choose MariaDB version to use').option(['r', 'media-redirect-domain'], 'Domain to redirect for missing media files. This can be used to still have images without the need to import them locally.').option('php', 'Explicitly choose PHP version to use');
 }
 /**
  * Provides the list of tag choices for selection

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

@@ -164,8 +164,17 @@ function preProcessInstanceData(instanceData) {
     newInstanceData.mediaRedirectDomain = `https://${instanceData.mediaRedirectDomain}`;
   }
 
-  newInstanceData.elasticsearchEnabled = instanceData.elasticsearchEnabled || false;
+  newInstanceData.elasticsearch = instanceData.elasticsearch || false;
   newInstanceData.php = instanceData.php || _devEnvironment.DEV_ENVIRONMENT_PHP_VERSIONS.default;
+
+  if (newInstanceData.php.startsWith('image:')) {
+    newInstanceData.php = newInstanceData.php.slice('image:'.length);
+  }
+
+  if (!newInstanceData.xdebugConfig) {
+    newInstanceData.xdebugConfig = '';
+  }
+
   return newInstanceData;
 }
 
@@ -258,12 +267,7 @@ async function exec(slug, args, options = {}) {
   }
 
   const command = args.shift();
-  let commandArgs = [...args];
-
-  if ('add-site' === command) {
-    commandArgs = [...args.map(argument => argument.replace('--new-site-', '--'))];
-  }
-
+  const commandArgs = [...args];
   await (0, _devEnvironmentLando.landoExec)(instancePath, command, commandArgs, options);
 }
 
@@ -289,9 +293,9 @@ function readEnvironmentData(slug) {
    ***********************************/
   // REMOVEME after the wheel of time spins around few times
 
-  if (instanceData.enterpriseSearchEnabled) {
-    // enterpriseSearchEnabled was renamed to elasticsearchEnabled
-    instanceData.elasticsearchEnabled = instanceData.enterpriseSearchEnabled;
+  if (instanceData.enterpriseSearchEnabled || instanceData.elasticsearchEnabled) {
+    // enterpriseSearchEnabled and elasticsearchEnabled was renamed to elasticsearch
+    instanceData.elasticsearch = instanceData.enterpriseSearchEnabled || instanceData.elasticsearchEnabled;
   } // REMOVEME after the wheel of time spins around few times
 
 

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

@@ -10,6 +10,7 @@ exports.landoDestroy = landoDestroy;
 exports.landoInfo = landoInfo;
 exports.landoExec = landoExec;
 exports.validateDockerInstalled = validateDockerInstalled;
+exports.validateDockerAccess = validateDockerAccess;
 
 var _debug = _interopRequireDefault(require("debug"));
 
@@ -27,6 +28,8 @@ var _chalk = _interopRequireDefault(require("chalk"));
 
 var _app = _interopRequireDefault(require("lando/lib/app"));
 
+var _userError = _interopRequireDefault(require("../user-error"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /**
@@ -283,7 +286,7 @@ async function landoExec(instancePath, toolName, args, options) {
     const isUp = await isEnvUp(app);
 
     if (!isUp) {
-      throw new Error('environment needs to be started before running wp command');
+      throw new _userError.default('Environment needs to be started before running wp command');
     }
   }
 
@@ -359,4 +362,17 @@ async function validateDockerInstalled() {
   if (lando.engine.composeInstalled === false) {
     throw Error('docker-compose could not be located! Please follow the following instructions to install it - https://docs.docker.com/compose/install/');
   }
+}
+
+async function validateDockerAccess() {
+  const lando = new _lando.default(getLandoConfig());
+  await lando.bootstrap();
+  const docker = lando.engine.docker;
+  lando.log.verbose('Fetching docker info to verify user is in docker group');
+
+  try {
+    await docker.info();
+  } catch (error) {
+    throw Error('Failed to connect to docker. Please verify that the current user is part of docker group and has access to docker commands.');
+  }
 }

package/dist/lib/validations/sql.js

@@ -254,6 +254,28 @@ const checks = {
     excerpt: "'CREATE TABLE' should be present (case-insensitive)",
     recommendation: 'Check import settings to include CREATE TABLE statements'
   },
+  alterTable: {
+    matcher: /^ALTER TABLE `?([a-z0-9_]*)/i,
+    matchHandler: lineNumber => ({
+      lineNumber
+    }),
+    outputFormatter: lineNumberCheckFormatter,
+    results: [],
+    message: 'ALTER TABLE statement',
+    excerpt: "'ALTER TABLE' should not be present (case-insensitive)",
+    recommendation: 'Remove these lines and define table structure in the CREATE TABLE statement instead'
+  },
+  uniqueChecks: {
+    matcher: /^SET UNIQUE_CHECKS\s*=\s*0/i,
+    matchHandler: lineNumber => ({
+      lineNumber
+    }),
+    outputFormatter: lineNumberCheckFormatter,
+    results: [],
+    message: 'SET UNIQUE_CHECKS = 0',
+    excerpt: "'SET UNIQUE_CHECKS = 0' should not be present",
+    recommendation: "Disabling 'UNIQUE_CHECKS' is not allowed. These lines should be removed"
+  },
   siteHomeUrl: {
     matcher: "'(siteurl|home)',\\s?'(.*?)'",
     matchHandler: (lineNumber, results) => ({
@@ -386,7 +408,7 @@ const postValidation = async options => {
       is_import: options.isImport,
       error: errorSummary
     });
-    const errorOutput = [`SQL validation failed due to ${_chalk.default.red(problemsFound)} error(s)`, ''];
+    const errorOutput = [];
     formattedErrors.forEach(error => {
       errorOutput.push(error.error);
 
@@ -396,6 +418,7 @@ const postValidation = async options => {
 
       errorOutput.push('');
     });
+    errorOutput.push(_chalk.default.bold.red(`SQL validation failed due to ${problemsFound} error(s)`));
 
     if (options.isImport) {
       throw new Error(errorOutput.join('\n'));

package/npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "2.19.2",
+  "version": "2.21.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "2.19.2",
+  "version": "2.21.0",
   "description": "The VIP Javascript library & CLI",
   "main": "index.js",
   "bin": {