@automattic/vip 2.13.1 → 2.16.0

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

@@ -0,0 +1,23 @@
+#!/usr/bin/env node
+
+/**
+ * 
+ * @format
+ */
+
+/**
+ * External dependencies
+ */
+
+/**
+ * Internal dependencies
+ */
+"use strict";
+
+var _command = _interopRequireDefault(require("../lib/cli/command"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+(0, _command.default)({
+  requiredArgs: 1
+}).command('get', 'Read current software settings').argv(process.argv);

package/dist/bin/vip-config.js

@@ -15,6 +15,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 (0, _command.default)({
   requiredArgs: 2
-}).command('envvar', 'Manage environment variables for an application environment').argv(process.argv, async () => {
+}).command('envvar', 'Manage environment variables for an application environment').command('software', 'Software management').argv(process.argv, async () => {
   process.exit(0);
 });

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

@@ -49,26 +49,28 @@ const examples = [{
   usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} create --slug=test`,
   description: 'Assigning unique slugs to environments allows multiple environments to be created.'
 }, {
-  usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} create --multisite --wordpress="5.8" --client-code="~/git/my_code"`,
-  description: 'Creates a local multisite dev environment using WP 5.8 and client code is expected to be in "~/git/my_code"'
+  usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} create --multisite --wordpress="5.8" --app-code="~/git/my_code"`,
+  description: 'Creates a local multisite dev environment using WP 5.8 and application code is expected to be in "~/git/my_code"'
 }];
-const cmd = (0, _command.default)().option('slug', 'Custom name of the dev environment').option('title', 'Title for the WordPress site').option('multisite', 'Enable multisite install', undefined, value => {
-  var _value$toLowerCase;
-
-  return 'false' !== (value === null || value === void 0 ? void 0 : (_value$toLowerCase = value.toLowerCase) === null || _value$toLowerCase === void 0 ? void 0 : _value$toLowerCase.call(value));
-});
+const cmd = (0, _command.default)().option('slug', 'Custom name of the dev environment').option('title', 'Title for the WordPress site').option('multisite', 'Enable multisite install', undefined, _devEnvironmentCli.processBooleanOption);
 (0, _devEnvironmentCli.addDevEnvConfigurationOptions)(cmd);
 cmd.examples(examples);
 cmd.argv(process.argv, async (arg, opt) => {
   await (0, _devEnvironmentCli.validateDependencies)();
-  const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
+  const environmentNameOptions = {
+    slug: opt.slug,
+    app: opt.app,
+    env: opt.env,
+    allowAppEnv: true
+  };
+  const slug = (0, _devEnvironmentCli.getEnvironmentName)(environmentNameOptions);
   debug('Args: ', arg, 'Options: ', opt);
   const trackingInfo = {
     slug
   };
   await (0, _tracker.trackEvent)('dev_env_create_command_execute', trackingInfo);
 
-  const startCommand = _chalk.default.bold((0, _devEnvironmentCli.getEnvironmentStartCommand)(opt));
+  const startCommand = _chalk.default.bold((0, _devEnvironmentCli.getEnvironmentStartCommand)(slug));
 
   const environmentAlreadyExists = (0, _devEnvironmentCore.doesEnvironmentExist)(slug);
 

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

@@ -38,7 +38,11 @@ const examples = [{
 }];
 (0, _command.default)({
   wildcardCommand: true
-}).option('slug', 'Custom name of the dev environment').examples(examples).argv(process.argv, async (unmatchedArgs, opt) => {
+}).option('slug', 'Custom name of the dev environment').option('force', 'Disabling validations before task execution', undefined, value => {
+  var _value$toLowerCase;
+
+  return 'false' !== (value === null || value === void 0 ? void 0 : (_value$toLowerCase = value.toLowerCase) === null || _value$toLowerCase === void 0 ? void 0 : _value$toLowerCase.call(value));
+}).examples(examples).argv(process.argv, async (unmatchedArgs, opt) => {
   await (0, _devEnvironmentCli.validateDependencies)();
   const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
@@ -59,7 +63,10 @@ const examples = [{
       arg = process.argv.slice(argSplitterIx + 1);
     }
 
-    await (0, _devEnvironmentCore.exec)(slug, arg);
+    const options = {
+      force: opt.force
+    };
+    await (0, _devEnvironmentCore.exec)(slug, arg, options);
     await (0, _tracker.trackEvent)('dev_env_exec_command_success', trackingInfo);
   } catch (error) {
     (0, _devEnvironmentCli.handleCLIException)(error, 'dev_env_exec_command_error', trackingInfo);

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

@@ -44,7 +44,7 @@ const examples = [{
 }];
 (0, _command.default)({
   requiredArgs: 1
-}).option('slug', 'Custom name of the dev environment').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('skip-validate', 'Do not perform file validation.').examples(examples).argv(process.argv, async (unmatchedArgs, opt) => {
+}).option('slug', 'Custom name of the dev environment').option(['r', 'search-replace'], 'Perform Search and Replace on the specified SQL file').option('in-place', 'Search and Replace explicitly on the given input file').option('skip-validate', 'Do not perform file validation.').examples(examples).argv(process.argv, async (unmatchedArgs, opt) => {
   await (0, _devEnvironmentCli.validateDependencies)();
   const [fileName] = unmatchedArgs;
   const {

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

@@ -31,9 +31,6 @@ const debug = (0, _debug.default)('@automattic/vip:bin:dev-environment');
 const examples = [{
   usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} info --all`,
   description: 'Return information about all local dev environments'
-}, {
-  usage: `vip @123 ${_devEnvironment.DEV_ENVIRONMENT_SUBCOMMAND} info`,
-  description: 'Return information about dev environment for site 123'
 }, {
   usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} info --slug=my_site`,
   description: 'Return information about a local dev environment named "my_site"'

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

@@ -38,7 +38,7 @@ const examples = [{
   usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} start`,
   description: 'Starts a local dev environment'
 }];
-(0, _command.default)().option('slug', 'Custom name of the dev environment').option('skip-rebuild', 'Only start stopped services').examples(examples).argv(process.argv, async (arg, opt) => {
+(0, _command.default)().option('slug', 'Custom name of the dev environment').option('skip-rebuild', 'Only start stopped services').option(['w', 'skip-wp-versions-check'], 'Skip propting for wordpress update if non latest').examples(examples).argv(process.argv, async (arg, opt) => {
   await (0, _devEnvironmentCli.validateDependencies)();
   const startProcessing = new Date();
   const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
@@ -46,7 +46,8 @@ const examples = [{
   await (0, _tracker.trackEvent)('dev_env_start_command_execute', trackingInfo);
   debug('Args: ', arg, 'Options: ', opt);
   const options = {
-    skipRebuild: !!opt.skipRebuild
+    skipRebuild: !!opt.skipRebuild,
+    skipWpVersionsCheck: !!opt.skipWpVersionsCheck
   };
 
   try {

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

@@ -59,16 +59,16 @@ cmd.argv(process.argv, async (arg, opt) => {
       ...opt
     };
     const defaultOptions = {
-      clientCode: currentInstanceData.clientCode.dir || currentInstanceData.clientCode.tag || 'latest',
+      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,
       statsd: currentInstanceData.statsd,
       phpmyadmin: currentInstanceData.phpmyadmin,
       xdebug: currentInstanceData.xdebug,
-      enterpriseSearchEnabled: currentInstanceData.enterpriseSearchEnabled,
       mediaRedirectDomain: currentInstanceData.mediaRedirectDomain,
       multisite: false,
       title: ''

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

@@ -249,7 +249,8 @@ async function validateAndGetTableNames({
   skipValidate,
   appId,
   envId,
-  fileNameToUpload
+  fileNameToUpload,
+  searchReplace
 }) {
   const validations = [_sql.staticSqlValidations, _siteType.siteTypeValidations];
 
@@ -259,10 +260,10 @@ async function validateAndGetTableNames({
   }
 
   try {
-    await (0, _lineByLine.fileLineValidations)(appId, envId, fileNameToUpload, validations);
+    await (0, _lineByLine.fileLineValidations)(appId, envId, fileNameToUpload, validations, searchReplace);
   } catch (validateErr) {
     console.log('');
-    exit.withError(`${validateErr.message}
+    exit.withError(`${validateErr.message}\n
 If you are confident the file does not contain unsupported statements, you can retry the command with the ${_chalk.default.yellow('--skip-validate')} option.
 `);
   } // this can only be called after static validation of the SQL file
@@ -407,7 +408,8 @@ const displayPlaybook = ({
     skipValidate,
     appId,
     envId,
-    fileNameToUpload
+    fileNameToUpload,
+    searchReplace
   }); // display playbook of what will happen during execution
 
   displayPlaybook({

package/dist/lib/api/app.js

@@ -18,11 +18,15 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * Internal dependencies
  */
-async function _default(app, fields) {
+async function _default(app, fields, fragments) {
   if (!fields) {
     fields = 'id,name';
   }
 
+  if (!fragments) {
+    fragments = '';
+  }
+
   const api = await (0, _api.default)();
 
   if (isNaN(app)) {
@@ -36,7 +40,8 @@ async function _default(app, fields) {
 							${fields}
 						}
 					}
-				}`,
+				}
+				${fragments || ''}`,
       variables: {
         name: app
       }
@@ -56,7 +61,8 @@ async function _default(app, fields) {
 				app( id: $id ){
 					${fields}
 				}
-			}`,
+			}
+			${fragments || ''}`,
     variables: {
       id: app
     }

package/dist/lib/cli/command.js

@@ -39,6 +39,8 @@ var exit = _interopRequireWildcard(require("./exit"));
 
 var _debug = _interopRequireDefault(require("debug"));
 
+var _userError = _interopRequireDefault(require("./userError"));
+
 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; }
@@ -56,6 +58,10 @@ function uncaughtError(err) {
     return;
   }
 
+  if (err instanceof _userError.default) {
+    exit.withError(err.message);
+  }
+
   console.log(_chalk.default.red('✕'), 'Please contact VIP Support with the following information:');
   console.log(_chalk.default.dim(err.stack));
   exit.withError('Unexpected error');
@@ -189,7 +195,8 @@ _args.default.argv = async function (argv, cb) {
 									${_opts.appQuery}
 								}
 							}
-						}`,
+						}
+						${_opts.appQueryFragments || ''}`,
           variables: {
             first: 100,
             after: null // TODO make dynamic?
@@ -251,7 +258,7 @@ _args.default.argv = async function (argv, cb) {
       let appLookup;
 
       try {
-        appLookup = await (0, _app.default)(options.app, _opts.appQuery);
+        appLookup = await (0, _app.default)(options.app, _opts.appQuery, _opts.appQueryFragments);
       } catch (err) {
         await (0, _tracker.trackEvent)('command_appcontext_param_error', {
           error: 'App lookup failed'

package/dist/lib/cli/userError.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+function UserError(message) {
+  this.message = message;
+}
+
+UserError.prototype = new Error();
+var _default = UserError;
+exports.default = _default;

package/dist/lib/config/software.js

@@ -0,0 +1,57 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.appQueryFragments = exports.appQuery = void 0;
+const appQuery = `
+	id,
+	name,
+	type,
+	organization { id, name },
+	environments{
+		appId
+		id
+		name
+		type
+		softwareSettings {
+			php {
+			  ...Software
+			}
+			wordpress {
+			  ...Software
+			}
+			muplugins {
+			  ...Software
+			}
+			nodejs {
+			  ...Software
+			}
+		}
+	}`;
+exports.appQuery = appQuery;
+const appQueryFragments = `fragment Software on AppEnvironmentSoftwareSettingsSoftware {
+		name
+		slug
+		pinned
+		current {
+		  version
+		  default
+		  deprecated
+		  unstable
+		  compatible
+		  latestRelease
+		  private
+		}
+		options {
+		  version
+		  default
+		  deprecated
+		  unstable
+		  compatible
+		  latestRelease
+		  private
+		}
+	}
+`;
+exports.appQueryFragments = appQueryFragments;

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

@@ -11,16 +11,16 @@ exports.DEV_ENVIRONMENT_FULL_COMMAND = DEV_ENVIRONMENT_FULL_COMMAND;
 const DEV_ENVIRONMENT_DEFAULTS = {
   title: 'VIP Dev',
   multisite: false,
-  elasticsearchVersion: '7.10.1',
+  elasticsearchVersion: '7.17.2',
   mariadbVersion: '10.3',
-  phpImage: 'default'
+  phpVersion: '8.0'
 };
 exports.DEV_ENVIRONMENT_DEFAULTS = DEV_ENVIRONMENT_DEFAULTS;
 const DEV_ENVIRONMENT_PROMPT_INTRO = 'This is a wizard to help you set up your local dev environment.\n\n' + 'Sensible default values were pre-selected for convenience. ' + 'You may also choose to create multiple environments with different settings using the --slug option.\n\n';
 exports.DEV_ENVIRONMENT_PROMPT_INTRO = DEV_ENVIRONMENT_PROMPT_INTRO;
 const DEV_ENVIRONMENT_NOT_FOUND = 'Environment not found.';
 exports.DEV_ENVIRONMENT_NOT_FOUND = DEV_ENVIRONMENT_NOT_FOUND;
-const DEV_ENVIRONMENT_COMPONENTS = ['wordpress', 'muPlugins', 'clientCode'];
+const DEV_ENVIRONMENT_COMPONENTS = ['wordpress', 'muPlugins', 'appCode'];
 exports.DEV_ENVIRONMENT_COMPONENTS = DEV_ENVIRONMENT_COMPONENTS;
 const DEV_ENVIRONMENT_RAW_GITHUB_HOST = 'raw.githubusercontent.com';
 exports.DEV_ENVIRONMENT_RAW_GITHUB_HOST = DEV_ENVIRONMENT_RAW_GITHUB_HOST;
@@ -32,11 +32,10 @@ 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 = {
-  default: 'ghcr.io/automattic/vip-container-images/php-fpm:7.4',
-  // 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.0': 'ghcr.io/automattic/vip-container-images/php-fpm-alt:8.0',
   // eslint-disable-next-line quote-props
-  '8.1': 'ghcr.io/automattic/vip-container-images/php-fpm-alt:8.1'
+  '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'
 };
 exports.DEV_ENVIRONMENT_PHP_VERSIONS = DEV_ENVIRONMENT_PHP_VERSIONS;

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

@@ -15,6 +15,7 @@ exports.promptForText = promptForText;
 exports.promptForBoolean = promptForBoolean;
 exports.promptForPhpVersion = promptForPhpVersion;
 exports.promptForComponent = promptForComponent;
+exports.processBooleanOption = processBooleanOption;
 exports.addDevEnvConfigurationOptions = addDevEnvConfigurationOptions;
 exports.getTagChoices = getTagChoices;
 exports.getEnvTrackingInfo = getEnvTrackingInfo;
@@ -44,6 +45,8 @@ var _devEnvironmentCore = require("./dev-environment-core");
 
 var _devEnvironmentLando = require("./dev-environment-lando");
 
+var _userError = _interopRequireDefault(require("../cli/userError"));
+
 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; }
@@ -82,7 +85,8 @@ async function handleCLIException(exception, trackKey, trackBaseInfo = {}) {
     if (trackKey) {
       try {
         const errorTrackingInfo = { ...trackBaseInfo,
-          failure: message
+          failure: message,
+          stack: exception.stack
         };
         await (0, _tracker.trackEvent)(trackKey, errorTrackingInfo);
       } catch (trackException) {
@@ -91,9 +95,9 @@ async function handleCLIException(exception, trackKey, trackBaseInfo = {}) {
     }
 
     if (!process.env.DEBUG) {
-      console.log(`Please re-run the command with "--debug ${_chalk.default.bold('@automattic/vip:bin:dev-environment')}" appended to it and provide the stack trace on the support ticket.`);
+      console.log(`\nPlease re-run the command with "--debug ${_chalk.default.bold('@automattic/vip:bin:dev-environment')}" appended to it and provide the stack trace on the support ticket.`);
       console.log(_chalk.default.bold('\nExample:\n'));
-      console.log('vip dev-env create --debug @automattic/vip:bin:dev-environment \n');
+      console.log('vip dev-env <command> <arguments> --debug @automattic/vip:bin:dev-environment \n');
     }
 
     debug(exception);
@@ -117,28 +121,25 @@ function getEnvironmentName(options) {
 
   if (options.app) {
     const envSuffix = options.env ? `-${options.env}` : '';
-    return options.app + envSuffix;
-  }
+    const appName = options.app + envSuffix;
 
-  return DEFAULT_SLUG;
-}
+    if (options.allowAppEnv) {
+      return appName;
+    }
 
-function getEnvironmentStartCommand(options) {
-  if (options.slug) {
-    return `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} start --slug ${options.slug}`;
+    const message = `This command does not support @app.env notation. Use '--slug=${appName}' to target the local environment.`;
+    throw new _userError.default(message);
   }
 
-  if (options.app) {
-    let application = `@${options.app}`;
-
-    if (options.env) {
-      application += `.${options.env}`;
-    }
+  return DEFAULT_SLUG;
+}
 
-    return `vip ${application} ${_devEnvironment.DEV_ENVIRONMENT_SUBCOMMAND} start`;
+function getEnvironmentStartCommand(slug) {
+  if (!slug || slug === DEFAULT_SLUG) {
+    return `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} start`;
   }
 
-  return `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} start`;
+  return `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} start --slug ${slug}`;
 }
 
 function printTable(data) {
@@ -199,6 +200,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,
     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,
@@ -209,14 +211,13 @@ async function promptForArguments(preselectedOptions, defaultOptions) {
     muPlugins: {
       mode: 'image'
     },
-    clientCode: {
+    appCode: {
       mode: 'image'
     },
     statsd: false,
     phpmyadmin: false,
     xdebug: false,
-    siteSlug: '',
-    enterpriseSearchEnabled: preselectedOptions.enterpriseSearchEnabled || defaultOptions.enterpriseSearchEnabled
+    siteSlug: ''
   };
   const promptLabels = {
     xdebug: 'XDebug',
@@ -248,9 +249,15 @@ async function promptForArguments(preselectedOptions, defaultOptions) {
     instanceData[component] = result;
   }
 
-  instanceData.enterpriseSearchEnabled = await promptForBoolean('Enable Enterprise Search?', defaultOptions.enterpriseSearchEnabled);
+  debug(`Processing elasticsearch with preselected "${preselectedOptions.elasticsearch}"`);
 
-  if (instanceData.enterpriseSearchEnabled) {
+  if ('elasticsearch' in preselectedOptions) {
+    instanceData.elasticsearchEnabled = !!preselectedOptions.elasticsearch;
+  } else {
+    instanceData.elasticsearchEnabled = await promptForBoolean('Enable Elasticsearch (needed by Enterprise Search)?', defaultOptions.elasticsearchEnabled);
+  }
+
+  if (instanceData.elasticsearchEnabled) {
     instanceData.statsd = preselectedOptions.statsd || defaultOptions.statsd || false;
   } else {
     instanceData.statsd = false;
@@ -258,7 +265,11 @@ async function promptForArguments(preselectedOptions, defaultOptions) {
 
   for (const service of ['phpmyadmin', 'xdebug']) {
     if (service in instanceData) {
-      instanceData[service] = await promptForBoolean(`Enable ${promptLabels[service] || service}`, instanceData[service]);
+      if (service in preselectedOptions) {
+        instanceData[service] = preselectedOptions[service];
+      } else {
+        instanceData[service] = await promptForBoolean(`Enable ${promptLabels[service] || service}`, instanceData[service]);
+      }
     }
   }
 
@@ -283,15 +294,14 @@ async function processComponent(component, preselectedValue, defaultValue) {
 
     const resolvedPath = resolvePath(result.dir || '');
     result.dir = resolvedPath;
+    const {
+      result: isPathValid,
+      message
+    } = validateLocalPath(component, resolvedPath);
 
-    const isDirectory = resolvedPath && _fs.default.existsSync(resolvedPath) && _fs.default.lstatSync(resolvedPath).isDirectory();
-
-    const isEmpty = isDirectory ? _fs.default.readdirSync(resolvedPath).length === 0 : true;
-
-    if (isDirectory && !isEmpty) {
+    if (isPathValid) {
       break;
     } else {
-      const message = `Provided path "${resolvedPath}" does not point to a valid or existing directory.`;
       console.log(_chalk.default.yellow('Warning:'), message);
       result = await promptForComponent(component, allowLocal, defaultObject);
     }
@@ -300,6 +310,49 @@ async function processComponent(component, preselectedValue, defaultValue) {
   return result;
 }
 
+function validateLocalPath(component, providedPath) {
+  if (!isNonEmptyDirectory(providedPath)) {
+    const message = `Provided path "${providedPath}" does not point to a valid or existing directory.`;
+    return {
+      result: false,
+      message
+    };
+  }
+
+  if (component === 'appCode') {
+    const files = ['languages', 'plugins', 'themes', 'private', 'images', 'client-mu-plugins', 'vip-config'];
+    const missingFiles = [];
+
+    for (const file of files) {
+      const filePath = _path.default.resolve(providedPath, file);
+
+      if (!_fs.default.existsSync(filePath)) {
+        missingFiles.push(file);
+      }
+    }
+
+    if (missingFiles.length > 0) {
+      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,
+        message
+      };
+    }
+  }
+
+  return {
+    result: true,
+    message: ''
+  };
+}
+
+function isNonEmptyDirectory(directoryPath) {
+  const isDirectory = directoryPath && _fs.default.existsSync(directoryPath) && _fs.default.lstatSync(directoryPath).isDirectory();
+
+  const isEmpty = isDirectory ? _fs.default.readdirSync(directoryPath).length === 0 : true;
+  return !isEmpty && isDirectory;
+}
+
 function resolvePath(input) {
   // Resolve does not do ~ reliably
   const resolvedPath = input.replace(/^~/, _os.default.homedir()); // And resolve to handle relative paths
@@ -366,7 +419,7 @@ async function promptForPhpVersion(initialValue) {
 const componentDisplayNames = {
   wordpress: 'WordPress',
   muPlugins: 'vip-go-mu-plugins',
-  clientCode: 'site-code'
+  appCode: 'application code'
 };
 
 async function promptForComponent(component, allowLocal, defaultObject) {
@@ -382,12 +435,12 @@ async function promptForComponent(component, allowLocal, defaultObject) {
   }
 
   modChoices.push({
-    message: 'image - that gets automatically fetched',
+    message: 'demo image - that gets automatically fetched',
     value: 'image'
   });
   let initialMode = 'image';
 
-  if ('clientCode' === component) {
+  if ('appCode' === component) {
     initialMode = 'local';
   }
 
@@ -439,20 +492,28 @@ async function promptForComponent(component, allowLocal, defaultObject) {
   };
 }
 
-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('client-code', 'Use the client code from a local directory or VIP skeleton').option('statsd', 'Enable statsd component. By default it is disabled', undefined, value => {
-    var _value$toLowerCase;
+const FALSE_OPTIONS = ['false', 'no', 'n', '0'];
 
-    return 'false' !== (value === null || value === void 0 ? void 0 : (_value$toLowerCase = value.toLowerCase) === null || _value$toLowerCase === void 0 ? void 0 : _value$toLowerCase.call(value));
-  }).option('phpmyadmin', 'Enable PHPMyAdmin component. By default it is disabled', undefined, value => {
-    var _value$toLowerCase2;
+function processBooleanOption(value) {
+  var _value$toLowerCase;
 
-    return 'false' !== (value === null || value === void 0 ? void 0 : (_value$toLowerCase2 = value.toLowerCase) === null || _value$toLowerCase2 === void 0 ? void 0 : _value$toLowerCase2.call(value));
-  }).option('xdebug', 'Enable XDebug. By default it is disabled', undefined, value => {
-    var _value$toLowerCase3;
+  if (!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;
+}
+
+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' !== (value === null || value === void 0 ? void 0 : (_value$toLowerCase3 = value.toLowerCase) === null || _value$toLowerCase3 === void 0 ? void 0 : _value$toLowerCase3.call(value));
-  }).option('elasticsearch', 'Explicitly choose Elasticsearch version to use').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 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');
 }
 /**
  * Provides the list of tag choices for selection