@automattic/vip 2.20.0 → 2.22.0

package/CHANGELOG.md

@@ -1,30 +1,59 @@
 ## Changelog
 
-### 2.20.0 (23 Sep 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 
+## 2.22.0 (2 Nov 2022)
+
+#1165  Add caching type policy for `WPSite` data                                                           
+#1164  Fix regExp to categorize multisite tables during SQL Imports                                        
+#1163  Pull correct environment's details from API when displaying Multisite SQL Import preflight details  
+#1159  chore(deps): Bump debug from 4.3.3 to 4.3.4                                                         
+#1162  chore(deps): Bump update-notifier from 4.1.3 to 5.1.0                                               
+#1160  chore(deps): Bump json2csv from 5.0.6 to 5.0.7                                                      
+#1158  chore(deps): Bump args from 5.0.1 to 5.0.3                                                          
+#1157  chore(deps): Bump semver from 7.3.5 to 7.3.8                                                        
+#1155  chore(deps): Bump uuid from 8.3.2 to 9.0.0                                                          
+#1154  chore(deps): Update Babel-related packages                                                          
+#1153  chore(deps): Fix security vulnerabilities in dependencies                                           
+#1152  ci: Update workflows                                                                                
+#1151  refactor(dev-env): Modify `verifyDNSResolution()` to use Promises API                               
+
+### 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 
+- #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
@@ -27,7 +27,7 @@ services:
     ssl: true
     sslExpose: false
     services:
-      image: ghcr.io/automattic/vip-container-images/nginx:1.21.6
+      image: ghcr.io/automattic/vip-container-images/nginx:1.23.2
       command: nginx -g "daemon off;"
       volumes:
         - ./nginx/extra.conf:/etc/nginx/conf.extra/extra.conf
@@ -92,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'
@@ -104,6 +104,7 @@ services:
         ELASTICSEARCH_NODE_NAME: 'lando'
         ELASTICSEARCH_PORT_NUMBER: 9200
         discovery.type: 'single-node'
+        xpack.security.enabled: 'false'
       ports:
         - ":9200"
       volumes:
@@ -133,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
@@ -150,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

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,

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

@@ -279,6 +279,7 @@ const displayPlaybook = ({
   fileName,
   domain,
   formattedEnvironment,
+  unformattedEnvironment,
   isMultiSite,
   app
 }) => {
@@ -299,11 +300,12 @@ const displayPlaybook = ({
   let siteArray = [];
 
   if (isMultiSite) {
-    var _app$environments$, _app$environments$$wp;
+    var _app$environments, _selectedEnvironmentO;
 
     // eslint-disable-next-line no-multi-spaces
     console.log(`  multisite: ${isMultiSite.toString()}`);
-    siteArray = app === null || app === void 0 ? void 0 : (_app$environments$ = app.environments[0]) === null || _app$environments$ === void 0 ? void 0 : (_app$environments$$wp = _app$environments$.wpSites) === null || _app$environments$$wp === void 0 ? void 0 : _app$environments$$wp.nodes;
+    const selectedEnvironmentObj = app === null || app === void 0 ? void 0 : (_app$environments = app.environments) === null || _app$environments === void 0 ? void 0 : _app$environments.find(env => unformattedEnvironment === env.type);
+    siteArray = selectedEnvironmentObj === null || selectedEnvironmentObj === void 0 ? void 0 : (_selectedEnvironmentO = selectedEnvironmentObj.wpSites) === null || _selectedEnvironmentO === void 0 ? void 0 : _selectedEnvironmentO.nodes;
   }
 
   if (!tableNames.length) {
@@ -330,9 +332,9 @@ const displayPlaybook = ({
         let siteRegex;
 
         if (wpSite.id === 1) {
-          siteRegex = /wp_[a-z]+/i;
+          siteRegex = /^wp_[a-z]+/i;
         } else {
-          siteRegex = new RegExp(`wp_${wpSite.id}_[a-z]+`, 'i');
+          siteRegex = new RegExp(`^wp_${wpSite.id}_[a-z]+`, 'i');
         }
 
         const tableNamesInGroup = tableNames.filter(name => siteRegex.test(name));
@@ -362,9 +364,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;
 
@@ -419,6 +419,7 @@ const displayPlaybook = ({
     fileName,
     domain,
     formattedEnvironment,
+    unformattedEnvironment: opts.env.type,
     isMultiSite,
     app
   }); // PROMPT TO PROCEED WITH THE IMPORT

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

@@ -108,6 +108,15 @@ async function API({
   });
   return new _core.ApolloClient({
     link: _core2.ApolloLink.from([withToken, errorLink, authLink, httpLink]),
-    cache: new _core.InMemoryCache()
+    cache: new _core.InMemoryCache({
+      typePolicies: {
+        WPSite: {
+          // By default the cache key is assumed to be `id` which is not globally unique.
+          // So we are using `id` + `homeUrl` to prevent clashing keys.
+          // Change this to `blogId` + `homeUrl` when we switch to using wpSitesSDS
+          keyFields: ['id', 'homeUrl']
+        }
+      }
+    })
   });
 }

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'
 };

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

@@ -35,6 +35,8 @@ var _path = _interopRequireDefault(require("path"));
 
 var _os = _interopRequireDefault(require("os"));
 
+var _dns = _interopRequireDefault(require("dns"));
+
 var _progress = require("../cli/progress");
 
 var _tracker = require("../tracker");
@@ -62,7 +64,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * Internal dependencies
  */
 const debug = (0, _debug.default)('@automattic/vip:bin:dev-environment');
-const DEFAULT_SLUG = 'vip-local';
+const DEFAULT_SLUG = 'vip-local'; // Forward declaratrion to avoid no-use-before-define
 
 async function handleCLIException(exception, trackKey, trackBaseInfo = {}) {
   const errorPrefix = _chalk.default.red('Error:');
@@ -103,28 +105,23 @@ async function handleCLIException(exception, trackKey, trackBaseInfo = {}) {
   }
 }
 
-const verifyDNSResolution = slug => {
-  const dns = require('dns');
-
+const verifyDNSResolution = async slug => {
   const expectedIP = '127.0.0.1';
   const testDomain = `${slug}.vipdev.lndo.site`;
   const advice = `Please add following line to hosts file on your system:\n${expectedIP} ${testDomain}`;
   debug(`Verifying DNS resolution for ${testDomain}`);
-  return new Promise((resolve, reject) => {
-    dns.lookup(testDomain, (error, address) => {
-      debug(`Got DNS response ${address}`);
-
-      if (error) {
-        reject(new _userError.default(`DNS resolution for ${testDomain} failed. ${advice}`));
-      }
+  let address;
 
-      if (address !== expectedIP) {
-        reject(new _userError.default(`DNS resolution for ${testDomain} returned unexpected IP ${address}. Expected value is ${expectedIP}. ${advice}`));
-      }
+  try {
+    address = await _dns.default.promises.lookup(testDomain, 4);
+    debug(`Got DNS response ${address.address}`);
+  } catch (error) {
+    throw new _userError.default(`DNS resolution for ${testDomain} failed. ${advice}`);
+  }
 
-      resolve();
-    });
-  });
+  if (address.address !== expectedIP) {
+    throw new _userError.default(`DNS resolution for ${testDomain} returned unexpected IP ${address.address}. Expected value is ${expectedIP}. ${advice}`);
+  }
 };
 
 const VALIDATION_STEPS = [{
@@ -243,15 +240,15 @@ 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
+ * @param {boolean} suppressPrompts - supress prompts and use default values where needed
  * @returns {any} instance data
  */
 
 
-async function promptForArguments(preselectedOptions, defaultOptions, supressPrompts = false) {
+async function promptForArguments(preselectedOptions, defaultOptions, suppressPrompts = false) {
   debug('Provided preselected', preselectedOptions, 'and default', defaultOptions);
 
-  if (supressPrompts) {
+  if (suppressPrompts) {
     preselectedOptions = { ...defaultOptions,
       ...preselectedOptions
     };
@@ -270,13 +267,13 @@ async function promptForArguments(preselectedOptions, defaultOptions, supressPro
   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 || '',
     wordpress: {
-      mode: 'image'
+      mode: 'image',
+      tag: ''
     },
     muPlugins: {
       mode: 'image'
@@ -323,12 +320,12 @@ async function promptForArguments(preselectedOptions, defaultOptions, supressPro
   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;
@@ -501,7 +498,7 @@ const componentDisplayNames = {
 const componentDemoyNames = {
   muPlugins: 'vip-go-mu-plugins',
   appCode: 'vip-go-skeleton'
-};
+}; // eslint-disable-next-line no-redeclare
 
 async function promptForComponent(component, allowLocal, defaultObject) {
   debug(`Prompting for ${component} with default:`, defaultObject);
@@ -559,11 +556,12 @@ 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 {
-      mode: modeResult,
+      mode: 'image',
       tag: option
     };
   } // image
@@ -587,11 +585,7 @@ function processBooleanOption(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('xdebug_config', 'Extra configuration to pass to xdebug via XDEBUG_CONFIG environment variable').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
@@ -599,10 +593,28 @@ function addDevEnvConfigurationOptions(command) {
 
 
 async function getTagChoices() {
-  const versions = await (0, _devEnvironmentCore.getVersionList)();
+  let versions = await (0, _devEnvironmentCore.getVersionList)();
 
   if (versions.length < 1) {
-    return ['5.9', '5.8', '5.7', '5.6', '5.5'];
+    versions = [{
+      ref: '5.9.5',
+      tag: '5.9',
+      cacheable: true,
+      locked: true,
+      prerelease: false
+    }, {
+      ref: '5.8.6',
+      tag: '5.8',
+      cacheable: true,
+      locked: true,
+      prerelease: false
+    }, {
+      ref: '5.7.8',
+      tag: '5.7',
+      cacheable: true,
+      locked: true,
+      prerelease: false
+    }];
   }
 
   return versions.map(version => {

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

@@ -164,13 +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;
 }
 
@@ -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
 
 
@@ -316,20 +320,13 @@ async function prepareLandoEnv(instanceData, instancePath) {
 
   const instanceDataTargetPath = _path.default.join(instancePath, instanceDataFileName);
 
-  _fs.default.mkdirSync(instancePath, {
+  await _fs.default.promises.mkdir(instancePath, {
     recursive: true
   });
-
-  _fs.default.mkdirSync(nginxFolderPath, {
+  await _fs.default.promises.mkdir(nginxFolderPath, {
     recursive: true
   });
-
-  _fs.default.writeFileSync(landoFileTargetPath, landoFile);
-
-  _fs.default.writeFileSync(nginxFileTargetPath, nginxFile);
-
-  _fs.default.writeFileSync(instanceDataTargetPath, instanceDataFile);
-
+  await Promise.all([_fs.default.promises.writeFile(landoFileTargetPath, landoFile), _fs.default.promises.writeFile(nginxFileTargetPath, nginxFile), _fs.default.promises.writeFile(instanceDataTargetPath, instanceDataFile)]);
   debug(`Lando file created in ${landoFileTargetPath}`);
   debug(`Nginx file created in ${nginxFileTargetPath}`);
   debug(`Instance data file created in ${instanceDataTargetPath}`);
@@ -584,7 +581,7 @@ async function updateWordPressImage(slug) {
   } else {
     console.log('Environment WordPress version is: ' + _chalk.default.yellow(`${match.tag} (${match.ref})`));
 
-    if (envData.wordpress.doNotUpgrade || false) {
+    if (envData.wordpress.doNotUpgrade) {
       return false;
     }
   } // Prompt the user to select a new WordPress Version
@@ -600,18 +597,13 @@ async function updateWordPressImage(slug) {
   if (confirm.upgrade === 'yes') {
     console.log('Upgrading from: ' + _chalk.default.yellow(currentWordPressTag) + ' to:'); // Select a new image
 
-    const choice = await (0, _devEnvironmentCli.promptForComponent)('wordpress');
+    const choice = await (0, _devEnvironmentCli.promptForComponent)('wordpress', false, null);
     const version = versions.find(({
       tag
     }) => tag.trim() === choice.tag.trim()); // Write new data and stage for rebuild
 
     envData.wordpress.tag = version.tag;
-    envData.wordpress.ref = version.ref; // Ensure xdebugConfig is not undefined (needed by .lando.yml template)
-
-    if (!envData.xdebugConfig) {
-      envData.xdebugConfig = '';
-    }
-
+    envData.wordpress.ref = version.ref;
     await updateEnvironment(envData);
     return true;
   }
@@ -664,17 +656,10 @@ async function getVersionList() {
 
   try {
     // If the cache doesn't exist, create it
-    if (!_fs.default.existsSync(cacheFile)) {
+    // If the cache is expired, refresh it
+    if (!_fs.default.existsSync(cacheFile) || isVersionListExpired(cacheFile, _devEnvironment.DEV_ENVIRONMENT_WORDPRESS_VERSION_TTL)) {
       res = await fetchVersionList();
-
-      _fs.default.writeFileSync(cacheFile, res);
-    } // If the cache is expired, refresh it
-
-
-    if (isVersionListExpired(cacheFile, _devEnvironment.DEV_ENVIRONMENT_WORDPRESS_VERSION_TTL)) {
-      res = await fetchVersionList();
-
-      _fs.default.writeFileSync(cacheFile, res);
+      await _fs.default.promises.writeFile(cacheFile, res);
     }
   } catch (err) {
     // Soft error handling here, since it's still possible to use a previously cached file.
@@ -684,7 +669,8 @@ async function getVersionList() {
 
 
   try {
-    return JSON.parse(_fs.default.readFileSync(cacheFile));
+    const data = await _fs.default.promises.readFile(cacheFile, 'utf8');
+    return JSON.parse(data);
   } catch (err) {
     debug(err);
     return [];