@automattic/vip 2.9.4 → 2.9.5

package/README.md

@@ -1,4 +1,3 @@
-
 VIP-CLI is your tool for interacting with and managing your VIP applications.
 
 ## Getting started
@@ -27,12 +26,23 @@ By default, we record information about the usage of this tool using an in-house
 
 ## Changelog
 
+### 2.9.5 (26 April 2022)
+
+- #1005 [dev-env] updateWordPress image improvements
+- #1006 Remove renovate.json
+- #1007 Set up CodeQL Scanning
+- #1008 WP-CLI: Reattach Reconnect-Related Events After a Successful Reconnection
+- #1009 Add ability to choose a PHP image to use
+- #1010 [dev-env] Add Enterprise Search, XDebug, phpMyAdmin options to the config wizard.
+
 ### 2.9.4 (07 April 2022)
+
 - #996 Clean up lint warnings
 - #1001 Fix reconnect event listeners
 - #1000 Bump socket.io-client from 4.0.1 to 4.4.1
 
 ### 2.9.3 (29 March 2022)
+
 - #995 Add debug call to dev-envs handleCLIException
 - #992 Add --debug flag to all commands
 - #993 [dev-env] Fix in caching version list.
@@ -43,96 +53,109 @@ By default, we record information about the usage of this tool using an in-house
 - #987 Add support for M1 Macs in the search-replace tests
 
 ### 2.9.2 (9 March 2022)
-- #980  [dev-env] Fix/tag formatting on stapled images
-- #986  Clean the build folder prior to rebuilding it
-- #985  Adding webP to the list of accepted extensions for files
-- #972  Run tests in Windows Env
+
+- #980 [dev-env] Fix/tag formatting on stapled images
+- #986 Clean the build folder prior to rebuilding it
+- #985 Adding webP to the list of accepted extensions for files
+- #972 Run tests in Windows Env
 
 https://github.com/Automattic/vip/releases/tag/v2.9.2
 
 ### 2.9.1 (2 March 2022)
-- #982  Remove unused dependencies - Fixes Error: Cannot find module 'core-js'
-- #978  [dev-env] Added phpmyadmin proxy value
+
+- #982 Remove unused dependencies - Fixes Error: Cannot find module 'core-js'
+- #978 [dev-env] Added phpmyadmin proxy value
 
 https://github.com/Automattic/vip/releases/tag/v2.9.1
 
 ### 2.9.0 (1 March 2022)
-- #966  [dev-env] Dynamic WordPress Image List
-- #975  [dev-env] prompt On Unselected Env
-- #974  [dev-env] Corrections of text for -h menu in dev-env create
-- #973  [dev-env] update Nginx image
-- #971  [dev-env] Use custom add user command
-- #964  [dev-env] Validate sql on import
-- #970  [dev-env] Do not use /tmp as a userConfRoot
-- #977  Fix flow errors
-- #976  Fix/duplicate shortcut parameter
-- #968  Update minimum Node version
+
+- #966 [dev-env] Dynamic WordPress Image List
+- #975 [dev-env] prompt On Unselected Env
+- #974 [dev-env] Corrections of text for -h menu in dev-env create
+- #973 [dev-env] update Nginx image
+- #971 [dev-env] Use custom add user command
+- #964 [dev-env] Validate sql on import
+- #970 [dev-env] Do not use /tmp as a userConfRoot
+- #977 Fix flow errors
+- #976 Fix/duplicate shortcut parameter
+- #968 Update minimum Node version
 
 https://github.com/Automattic/vip/releases/tag/v2.9.0
 
 ### 2.8.2 (27 January 2021)
-- #961  Fixes md5 calculation failing when search-replace is used
-- #959  Fixes md5 calculation for SQL Imports on VIPd
+
+- #961 Fixes md5 calculation failing when search-replace is used
+- #959 Fixes md5 calculation for SQL Imports on VIPd
 
 https://github.com/Automattic/vip/releases/tag/v2.8.2
 
 ### 2.8.0 (25 January 2021)
-- #952  FORNO-1047: Fix SQL Import for compressed files
-- #955  Add Error prefix for "Failed to fetch logs" msg
-- #946  Add support for the site logs tailing feature
-- #953  [dev-env] Updated list of available wordpress images for dev-env
-- #933  Update dependency debug to v4.3.3
+
+- #952 FORNO-1047: Fix SQL Import for compressed files
+- #955 Add Error prefix for "Failed to fetch logs" msg
+- #946 Add support for the site logs tailing feature
+- #953 [dev-env] Updated list of available wordpress images for dev-env
+- #933 Update dependency debug to v4.3.3
 
 https://github.com/Automattic/vip/releases/tag/v2.8.0
 
 ### 2.7.1 (10 January 2021)
+
 - #950 Switch to npm-shrinkwrap
-- #947  [dev-env] List all dev env alias
-- #944  Add `vip whoami` command
-- #942  Envvar: Show message when there is an attempt to change the New Relic key.
+- #947 [dev-env] List all dev env alias
+- #944 Add `vip whoami` command
+- #942 Envvar: Show message when there is an attempt to change the New Relic key.
 
 https://github.com/Automattic/vip/releases/tag/v2.7.1
 
 ### 2.7.0 (07 December 2021)
-- #941  [dev-env] Bump lando CLI dependency
-- #938  Hide roll back message after SQL Import failure for launched sites
-- #936  Sets jest maxWorkers to 4
+
+- #941 [dev-env] Bump lando CLI dependency
+- #938 Hide roll back message after SQL Import failure for launched sites
+- #936 Sets jest maxWorkers to 4
 
 https://github.com/Automattic/vip/releases/tag/v2.7.0
 
 ### 2.6.0 (23 November 2021)
-- #921  [dev-env] Introuces update to change existing environment
-- #928  [dev-env] Switch lando to use our fork
-- #927  [dev-env] Handles user already exists during sql import
-- #925  [dev-env] Fix the issue with dev-env update
-- #924  FORNO-985 Increase SQL Import limit for unlaunched sites to 100GB
-- #923  FORNO-943 Fixes a bug which prevents displaying SQL Import error messages
-- #922  Update eslint-config-wpvip commit hash to c6605d1
-- #873  Pin dependencies
+
+- #921 [dev-env] Introuces update to change existing environment
+- #928 [dev-env] Switch lando to use our fork
+- #927 [dev-env] Handles user already exists during sql import
+- #925 [dev-env] Fix the issue with dev-env update
+- #924 FORNO-985 Increase SQL Import limit for unlaunched sites to 100GB
+- #923 FORNO-943 Fixes a bug which prevents displaying SQL Import error messages
+- #922 Update eslint-config-wpvip commit hash to c6605d1
+- #873 Pin dependencies
 
 ### 2.5.0 (9 November 2021)
-- #919  [dev-env] Expose lando core logs
-- #916  [dev-env] Save instance data state
-- #914  [dev-env] update help wording for dev env
-- #915  Add warning message when an envvar is set/deleted
+
+- #919 [dev-env] Expose lando core logs
+- #916 [dev-env] Save instance data state
+- #914 [dev-env] update help wording for dev env
+- #915 Add warning message when an envvar is set/deleted
 
 ### 2.4.0 (5 November 2021)
-- #913  [dev-env] No login required for dev-env
-- #911  Adds more release instructions
+
+- #913 [dev-env] No login required for dev-env
+- #911 Adds more release instructions
 
 ### 2.3.1 (2 November 2021)
+
 - Fixes an issue with the 2.3.0 where the intended changes didn't get published correctly.
 
 ### 2.3.0 (2 November 2021)
-- #908  [dev-env] Custom user permissions setup
-- #897  [dev-env] Primary domain prompt for primary domain redirect
-- #902  [dev-env] Delete file permissions
-- #900  Clarify CONTRIBUTING guidelines
-- #905  Update contribution steps
+
+- #908 [dev-env] Custom user permissions setup
+- #897 [dev-env] Primary domain prompt for primary domain redirect
+- #902 [dev-env] Delete file permissions
+- #900 Clarify CONTRIBUTING guidelines
+- #905 Update contribution steps
 
 ### 2.2.0 (27 October 2021)
 
 New: Environment variables command
+
 - #896 Open config envvar command for all customers
 - #876 Update envvar list command to only show names
 - #879 Add config envvar get and get-all commands
@@ -140,6 +163,7 @@ New: Environment variables command
 - #858 Environment variable CLI commands (list, set, delete)
 
 Fixes:
+
 - #901 Don't mark import as failed until restore has completed
 - #899 Proxy fix + healthchecks
 - #894 support windows db import
@@ -154,6 +178,7 @@ Fixes:
 - #870 Add the VIP CLI release process and release schedule
 
 Dependencies updates:
+
 - #778 Update dependency ini to v2
 - #786 Update dependency keytar to v7
 - #884 Update dependency cli-columns to v4
@@ -166,28 +191,28 @@ https://github.com/Automattic/vip/releases/tag/v2.2.0
 
 ### 2.1.0 (16 September 2021)
 
-- #857  Remove select DB checks
-- #864  Adding WordPress versions to dev-env
-- #868  persist database data in between container restarts
-- #862  Fix lint warnings
-- #867  Update dependency lando to v3.3.2
-- #863  Add links to CONTRIBUTING and SECURITY
-- #855  Add some helpful hints for new command scaffolding
-- #856  Adding media import command on dev environment
-- #849  Adding SQL import to dev environment
-- #854  Updating command descriptions and arguments on dev-env
-- #850  Use official memcached image on dev-env
-- #853  Enable ssl forwarding on dev-env
-- #851  Conditionally disabling statsd on mu-plugins
-- #852  Fixing Prettier format annotation typo
-- #843  Removing custom wp-config-defaults
-- #848  Not using a prefix to all dev environments
-- #847  Update dependency lando to v3.3.0
-- #840  Use official Elasticsearch image on dev-env
-- #845  Fix MariaDB healthcheck
-- #846  dev-env: Update error message for directory prompt
-- #842  Removing PHP parameter from dev environment
-- #839  Use official MariaDB image and enable version selection on dev-env
+- #857 Remove select DB checks
+- #864 Adding WordPress versions to dev-env
+- #868 persist database data in between container restarts
+- #862 Fix lint warnings
+- #867 Update dependency lando to v3.3.2
+- #863 Add links to CONTRIBUTING and SECURITY
+- #855 Add some helpful hints for new command scaffolding
+- #856 Adding media import command on dev environment
+- #849 Adding SQL import to dev environment
+- #854 Updating command descriptions and arguments on dev-env
+- #850 Use official memcached image on dev-env
+- #853 Enable ssl forwarding on dev-env
+- #851 Conditionally disabling statsd on mu-plugins
+- #852 Fixing Prettier format annotation typo
+- #843 Removing custom wp-config-defaults
+- #848 Not using a prefix to all dev environments
+- #847 Update dependency lando to v3.3.0
+- #840 Use official Elasticsearch image on dev-env
+- #845 Fix MariaDB healthcheck
+- #846 dev-env: Update error message for directory prompt
+- #842 Removing PHP parameter from dev environment
+- #839 Use official MariaDB image and enable version selection on dev-env
 
 https://github.com/Automattic/vip/releases/tag/v2.1.0
 
@@ -229,6 +254,7 @@ https://github.com/Automattic/vip/releases/tag/v2.0.13
 https://github.com/Automattic/vip/releases/tag/v2.0.12
 
 ### 2.0.11 (5 August 2021)
+
 - Handle parameter validation in a consistent way #795
 - Fix error blocking data sync on CLI sites #810
 - Update DB Engine check to reduce false positives #811
@@ -244,6 +270,7 @@ https://github.com/Automattic/vip/releases/tag/v2.0.12
 https://github.com/Automattic/vip/releases/tag/2.0.11
 
 ### 2.0.10 (21 June 2021)
+
 - Adds Media Import Abort subcommand
 - Disables enterprise search by default
 - Handles numbered slugs correctly
@@ -255,6 +282,7 @@ https://github.com/Automattic/vip/releases/tag/2.0.11
 https://github.com/Automattic/vip/releases/tag/v2.0.10
 
 ### 2.0.9 (3 June 2021)
+
 - Enable SQL import for all site types
 - Bug fix for analytics errors causing some commands to fail
 - Add the full changelog to the readme
@@ -264,6 +292,7 @@ https://github.com/Automattic/vip/releases/tag/v2.0.10
 https://github.com/Automattic/vip/releases/tag/v2.0.9
 
 ### 2.0.8 (27 May 2021)
+
 - [Beta] Media Import: Enable media imports for production WordPress applications
 - SQL Import: Enable SQL Import for launched sites
 - SQL Import: Enable SQL Import for multisite networks
@@ -272,6 +301,7 @@ https://github.com/Automattic/vip/releases/tag/v2.0.9
 https://github.com/Automattic/vip/releases/tag/v2.0.8
 
 ### 2.0.7 (6 May 2021)
+
 - SQL Import: Add additional multisite validations
 - Update socket.io-client to 4.0.1
 - Misc. dependency updates
@@ -279,33 +309,39 @@ https://github.com/Automattic/vip/releases/tag/v2.0.8
 https://github.com/Automattic/vip/releases/tag/v2.0.7
 
 ### 2.0.6 (15 Apr 2021)
+
 - SQL Import: Add additional checks for site type
 
 https://github.com/Automattic/vip/releases/tag/v2.0.6
 
 ### 2.0.5 (8 Mar 2021)
+
 - Fix a bug when comparing env data to selected environment #697
 
 https://github.com/Automattic/vip/releases/tag/v2.0.5
 
 ### 2.0.4 (3 Mar 2021)
+
 - Bump socket.io-client from 2.3.0 to 2.4.0 (Fixes WP-CLI in node 15+) #679
 - Additional SQL import file static validations #669
 
 https://github.com/Automattic/vip/releases/tag/v2.0.4
 
 ### 2.0.3 (19 Feb 2021)
+
 - Improved SQL import validation around the use of TRIGGER
 
 https://github.com/Automattic/vip/releases/tag/v2.0.3
 
 ### 2.0.2 (15 Feb 2021)
+
 - Improved handling of debug output during search & replace
 - Updated the vip-search-replace package to ^1.0.13
 
 https://github.com/Automattic/vip/releases/tag/v2.0.2
 
 ### 2.0.1 (11 Feb 2021)
+
 - SQL Import: Improved reporting of server-side failures
 - SQL Import: Add ability to skip local validation
 - Updated the vip-search-replace package to v1.0.12
@@ -314,6 +350,7 @@ https://github.com/Automattic/vip/releases/tag/v2.0.2
 https://github.com/Automattic/vip/releases/tag/v2.0.1
 
 ### 2.0.0 (2 Feb 2021)
+
 - Drops support for Node 8
 - Added Security Policy
 - Added SQL file import feature for new sites
@@ -322,37 +359,44 @@ https://github.com/Automattic/vip/releases/tag/v2.0.1
 https://github.com/Automattic/vip/releases/tag/v2.0.0
 
 ### 1.12.1 (8 Sep 2020)
+
 - Updated list of accepted special characters for media files for imports
 
 https://github.com/Automattic/vip/releases/tag/v1.12.1
 
 ### 1.12.0 (21 Aug 2020)
+
 - Added multisite support for media files validation
 - Added Tracks for SQL and media file validation events
 
 https://github.com/Automattic/vip/releases/tag/v1.12.0
 
 ### 1.11.2 (17 Aug 2020)
+
 - Added support for multiple nested folders for the media file validation command
 
 https://github.com/Automattic/vip/releases/tag/v1.11.2
 
 ### 1.11.1 (17 Aug 2020)
+
 - Added fix to process the import validation subcommands
 
 https://github.com/Automattic/vip/releases/tag/v1.11.1
 
 ### 1.11.0 (17 Aug 2020)
+
 - Added `vip import validate sql` and `vip import validate files` commands to run static validation checks for SQL and media files for imports
 
 https://github.com/Automattic/vip/releases/tag/v1.11.0
 
 ### 1.10.0 (12 Jun 2020)
+
 - Added support for specifying a SOCKS proxy through the environment variable VIP_PROXY
 
 https://github.com/Automattic/vip/releases/tag/v1.10.0
 
 ### 1.9.0 (30 Mar 2020)
+
 - Added support for [opting out of usage tracking](https://github.com/Automattic/vip/tree/e54d9ee0ce2dd4725ca8718b3aba06db24306ad7#analytics) via `DO_NOT_TRACK` environment variable #547
 - Fix interactive commands not working correctly #478
 - Show usage information when an unsupported command is entered #527
@@ -361,6 +405,7 @@ https://github.com/Automattic/vip/releases/tag/v1.10.0
 https://github.com/Automattic/vip/releases/tag/v1.9.0
 
 ### 1.8.0 (25 Sep 2019)
+
 - Fixes around cancelling commands via Ctrl-C
 - Gracefully handle remote command cancellation
 - Enhance Rollbar logging for additional use cases
@@ -368,21 +413,25 @@ https://github.com/Automattic/vip/releases/tag/v1.9.0
 https://github.com/Automattic/vip/releases/tag/v1.8.0
 
 ### 1.7.0 (15 Aug 15 2019)
+
 - Resume long-running WP-CLI commands in case of network interruptions
 
 https://github.com/Automattic/vip/releases/tag/v1.7.0
 
 ### 1.6.2 (25 Jul 2019)
+
 - Corrected some install issues with the 1.6.0/1.6.1 releases.
 
 https://github.com/Automattic/vip/releases/tag/v1.6.2
 
 ### 1.6.1 (25 Jul 2019)
+
 - Intermittent release to test some issues with v1.6.0
 
 https://github.com/Automattic/vip/releases/tag/v1.6.1
 
 ### 1.6.0 (25 Jul 2019)
+
 - We added ability to cancel running commands.
 - We fixed an issue with trailing characters such as line breaks affecting use of command output by scripts.
 - Various dependancy updates.
@@ -390,6 +439,7 @@ https://github.com/Automattic/vip/releases/tag/v1.6.1
 https://github.com/Automattic/vip/releases/tag/v1.6.0
 
 ### 1.5.0 (15 Jul 2019)
+
 - Added `--yes` flag for WP-CLI commands to skip confirmation on production environments.
 - We fixed the character limit errors raised when running long WP-CLI commands.
 - We've added Rollbar to allow us to monitor and address errors
@@ -398,11 +448,13 @@ https://github.com/Automattic/vip/releases/tag/v1.6.0
 https://github.com/Automattic/vip/releases/tag/v1.5.0
 
 ### 1.4.1 (29 Apr 2019)
+
 - No functional changes, 1.4.0 was already taken on NPM :)
 
 https://github.com/Automattic/vip/releases/tag/1.4.1
 
 ### 1.4.0 (29 Apr 2019)
+
 - Added "environment alias" support (`vip @my-site.env sync`)
 - Added support for WP-CLI commands
 - Misc. dependency updates
@@ -410,6 +462,7 @@ https://github.com/Automattic/vip/releases/tag/1.4.1
 https://github.com/Automattic/vip/releases/tag/1.4.0
 
 ### 1.3.0 (1 Feb 2019)
+
 - We now display information header for every `vip app --app` execution [(#223)](https://github.com/Automattic/vip/pull/223).
 - We fixed the logout bug asking the user to login before being able to logout [(#222)](https://github.com/Automattic/vip/pull/222) and we also display a message when a user logout [(#221)](https://github.com/Automattic/vip/pull/221).
 - We replaced `inquirer` with `enquirer` [(#229)](https://github.com/Automattic/vip/pull/229).
@@ -420,11 +473,13 @@ https://github.com/Automattic/vip/releases/tag/1.4.0
 https://github.com/Automattic/vip/releases/tag/v1.3.0
 
 ### 1.2.1 (5 Dec 2018)
+
 - The `1.2.0` version was containing a bug and we published a patch to fix it. Please use this version instead.
 
 https://github.com/Automattic/vip/releases/tag/v1.2.1
 
 ### 1.2.0 (5 Dec 2018)
+
 - We now display a preview of the `sync` feature with the backup time and the search/replace taking place in your database.
 - We now display your mapped domain instead of the placeholder `go-vip.co` domain in `vip app` and `vip app list`.
 - We now display a better message when an app does not have any non-production environments.
@@ -434,11 +489,13 @@ https://github.com/Automattic/vip/releases/tag/v1.2.1
 https://github.com/Automattic/vip/releases/tag/v1.2.0
 
 ### 1.1.1 (1 Nov 2018)
+
 - Updates dependencies to fix a bug introduced by sub-dependencies.
 
 https://github.com/Automattic/vip/releases/tag/v1.1.1
 
 ### 1.1.0 (12 Jul 2018)
+
 - We now correctly report errors when `vip sync` fails. Previously, this would incorrectly report that a sync was run previously.
 - We fixed permissions issues for some users with `admin` access for repos. They were unable to properly view and access applications.
 - We now display more applications in `vip app list` (up to 100!) and have made it easier to browse through a large list thanks to (`$PAGER`|`less`) support. Previously you would only see the first 10 applications in your account.
@@ -448,6 +505,7 @@ https://github.com/Automattic/vip/releases/tag/v1.1.0
 ### 1.0.0 (2 Jul 2018)
 
 The first release!
+
 - `vip app list`: view a list of all your applications.
 - `vip app`: view details about one of your applications.
 - `vip sync`: trigger [a data sync](https://vip.wordpress.com/2018/03/28/data-sync-on-vip-go/) to synchronize data from your production environment to non-production environments.

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

@@ -22,7 +22,6 @@ services:
     volumes:
       devtools: {}
       scripts:
-
   nginx:
     type: compose
     ssl: true
@@ -37,11 +36,9 @@ services:
   php:
     type: compose
     services:
-      image: ghcr.io/automattic/vip-container-images/php-fpm:7.4
+      image: <%= php %>
       command: run.sh
       working_dir: /wp
-      healthcheck:
-        test: 'cat /wp/wp-includes/pomo/mo.php'
       environment:
         XDEBUG: <%= xdebug ? 'enable' : 'disable' %>
         STATSD: <%= statsd ? 'enable' : 'disable' %>
@@ -95,7 +92,7 @@ services:
       environment:
         UPLOAD_LIMIT: 4G
 <% } %>
-
+<% if ( enterpriseSearchEnabled ) { %>
   vip-search:
     type: compose
     services:
@@ -115,7 +112,7 @@ services:
         - search_data:/usr/share/elasticsearch/data
     volumes:
       search_data:
-
+<% } %>
 <% if ( statsd ) { %>
   statsd:
     type: compose

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

@@ -58,6 +58,7 @@ cmd.argv(process.argv, async (arg, opt) => {
       muPlugins: currentInstanceData.muPlugins.dir || currentInstanceData.muPlugins.tag || 'latest',
       wordpress: currentInstanceData.wordpress.tag,
       elasticsearch: currentInstanceData.elasticsearch,
+      php: currentInstanceData.php || _devEnvironment.DEV_ENVIRONMENT_PHP_VERSIONS.default,
       mariadb: currentInstanceData.mariadb,
       statsd: currentInstanceData.statsd,
       phpmyadmin: currentInstanceData.phpmyadmin,

package/dist/bin/vip-wp.js

@@ -17,6 +17,8 @@ var _readline = _interopRequireDefault(require("readline"));
 
 var _stream = require("stream");
 
+var _debug = _interopRequireDefault(require("debug"));
+
 var _api = _interopRequireWildcard(require("../lib/api"));
 
 var _command = _interopRequireWildcard(require("../lib/cli/command"));
@@ -44,6 +46,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * Internal dependencies
  */
+const debug = (0, _debug.default)('@automattic/vip:wp');
 const appQuery = `id, name,
 	organization {
 		id
@@ -163,22 +166,11 @@ const cancelCommand = async guid => {
 };
 
 const launchCommandAndGetStreams = async ({
+  socket,
   guid,
   inputToken,
   offset = 0
 }) => {
-  const token = await _token.default.get();
-  const socket = (0, _socket.default)(`${_api.API_HOST}/wp-cli`, {
-    transportOptions: {
-      polling: {
-        extraHeaders: {
-          Authorization: `Bearer ${token.raw}`
-        }
-      }
-    },
-    agent: (0, _socksProxyAgent.default)()
-  });
-
   const stdoutStream = _socket2.default.createStream();
 
   const stdinStream = _socket2.default.createStream();
@@ -227,6 +219,111 @@ const launchCommandAndGetStreams = async ({
   };
 };
 
+const bindReconnectEvents = ({
+  cliCommand,
+  inputToken,
+  subShellRl,
+  commonTrackingParams,
+  isSubShell
+}) => {
+  currentJob.socket.io.removeAllListeners('reconnect');
+  currentJob.socket.io.removeAllListeners('reconnect_attempt');
+  currentJob.socket.removeAllListeners('retry');
+  currentJob.socket.io.on('reconnect', async () => {
+    debug('socket.io: reconnect');
+
+    _rollbar.rollbar.info('WP-CLI socket.io.on( \'reconnect\' )', {
+      custom: {
+        code: 'wp-cli-on-reconnect',
+        commandGuid: cliCommand.guid
+      }
+    }); // Close old streams
+
+
+    unpipeStreamsFromProcess({
+      stdin: currentJob.stdinStream,
+      stdout: currentJob.stdoutStream
+    });
+    (0, _tracker.trackEvent)('wpcli_command_reconnect', commonTrackingParams);
+    currentJob = await launchCommandAndGetStreams({
+      socket: currentJob.socket,
+      guid: cliCommand.guid,
+      inputToken: inputToken,
+      offset: currentOffset
+    }); // Rebind new streams
+
+    pipeStreamsToProcess({
+      stdin: currentJob.stdinStream,
+      stdout: currentJob.stdoutStream
+    });
+    bindStreamEvents({
+      subShellRl,
+      isSubShell,
+      commonTrackingParams,
+      stdoutStream: currentJob.stdoutStream
+    });
+    bindReconnectEvents({
+      cliCommand,
+      inputToken,
+      subShellRl,
+      commonTrackingParams,
+      isSubShell
+    }); // Resume readline interface
+
+    subShellRl.resume();
+  });
+  currentJob.socket.on('retry', async () => {
+    debug('socket: retry');
+
+    _rollbar.rollbar.info('WP-CLI socket.io.on( \'retry\' )', {
+      custom: {
+        code: 'wp-cli-on-retry',
+        commandGuid: cliCommand.guid
+      }
+    });
+
+    setTimeout(() => {
+      currentJob.socket.io.engine.close();
+    }, 5000);
+  });
+  currentJob.socket.on('exit', async ({
+    exitCode,
+    message
+  }) => {
+    debug('socket: exit. Code: %d. Message: %s', exitCode, message);
+
+    if (message) {
+      console.log(message);
+    }
+
+    currentJob.stdinStream.destroy();
+    currentJob.stdoutStream.destroy();
+    currentJob.socket.close();
+    process.exit(exitCode);
+  });
+  currentJob.socket.io.on('reconnect_attempt', attempt => {
+    console.error('There was an error connecting to the server. Retrying...');
+
+    if (attempt > 1) {
+      return;
+    } // create a new input stream so that we can still catch things like SIGINT while reconnecting
+
+
+    if (currentJob.stdinStream) {
+      process.stdin.unpipe(currentJob.stdinStream);
+    }
+
+    process.stdin.pipe(_socket2.default.createStream());
+    currentJob.stdoutStream = _socket2.default.createStream();
+    bindStreamEvents({
+      subShellRl,
+      isSubShell,
+      commonTrackingParams,
+      stdoutStream: currentJob.stdoutStream
+    });
+  });
+};
+
 (0, _command.default)({
   wildcardCommand: true,
   appContext: true,
@@ -381,7 +478,19 @@ const launchCommandAndGetStreams = async ({
       });
     }
 
+    const token = await _token.default.get();
+    const socket = (0, _socket.default)(`${_api.API_HOST}/wp-cli`, {
+      transportOptions: {
+        polling: {
+          extraHeaders: {
+            Authorization: `Bearer ${token.raw}`
+          }
+        }
+      },
+      agent: (0, _socksProxyAgent.default)()
+    });
     currentJob = await launchCommandAndGetStreams({
+      socket,
       guid: cliCommand.guid,
       inputToken: inputToken
     });
@@ -396,47 +505,12 @@ const launchCommandAndGetStreams = async ({
       isSubShell,
       stdoutStream: currentJob.stdoutStream
     });
-    currentJob.socket.io.on('reconnect', async () => {
-      // Close old streams
-      unpipeStreamsFromProcess({
-        stdin: currentJob.stdinStream,
-        stdout: currentJob.stdoutStream
-      });
-      (0, _tracker.trackEvent)('wpcli_command_reconnect', commonTrackingParams);
-      currentJob = await launchCommandAndGetStreams({
-        guid: cliCommand.guid,
-        inputToken: inputToken,
-        offset: currentOffset
-      }); // Rebind new streams
-
-      pipeStreamsToProcess({
-        stdin: currentJob.stdinStream,
-        stdout: currentJob.stdoutStream
-      });
-      bindStreamEvents({
-        subShellRl,
-        isSubShell,
-        commonTrackingParams,
-        stdoutStream: currentJob.stdoutStream
-      }); // Resume readline interface
-
-      subShellRl.resume();
-    });
-    currentJob.socket.io.on('reconnect_attempt', () => {
-      // create a new input stream so that we can still catch things like SIGINT while reconnectin
-      if (currentJob.stdinStream) {
-        process.stdin.unpipe(currentJob.stdinStream);
-      }
-
-      process.stdin.pipe(_socket2.default.createStream());
-      currentJob.stdoutStream = _socket2.default.createStream();
-      bindStreamEvents({
-        subShellRl,
-        isSubShell,
-        commonTrackingParams,
-        stdoutStream: currentJob.stdoutStream
-      });
-      console.error('There was an error connecting to the server. Retrying...');
+    bindReconnectEvents({
+      cliCommand,
+      inputToken,
+      subShellRl,
+      commonTrackingParams,
+      isSubShell
     });
   }); // Fix to re-add the \n character that readline strips when terminal == true
 

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DEV_ENVIRONMENT_WORDPRESS_VERSION_TTL = exports.DEV_ENVIRONMENT_WORDPRESS_CACHE_KEY = exports.DEV_ENVIRONMENT_WORDPRESS_VERSIONS_URI = exports.DEV_ENVIRONMENT_RAW_GITHUB_HOST = exports.DEV_ENVIRONMENT_COMPONENTS = exports.DEV_ENVIRONMENT_NOT_FOUND = exports.DEV_ENVIRONMENT_PROMPT_INTRO = exports.DEV_ENVIRONMENT_DEFAULTS = exports.DEV_ENVIRONMENT_FULL_COMMAND = exports.DEV_ENVIRONMENT_SUBCOMMAND = void 0;
+exports.DEV_ENVIRONMENT_PHP_VERSIONS = exports.DEV_ENVIRONMENT_WORDPRESS_VERSION_TTL = exports.DEV_ENVIRONMENT_WORDPRESS_CACHE_KEY = exports.DEV_ENVIRONMENT_WORDPRESS_VERSIONS_URI = exports.DEV_ENVIRONMENT_RAW_GITHUB_HOST = exports.DEV_ENVIRONMENT_COMPONENTS = exports.DEV_ENVIRONMENT_NOT_FOUND = exports.DEV_ENVIRONMENT_PROMPT_INTRO = exports.DEV_ENVIRONMENT_DEFAULTS = exports.DEV_ENVIRONMENT_FULL_COMMAND = exports.DEV_ENVIRONMENT_SUBCOMMAND = void 0;
 const DEV_ENVIRONMENT_SUBCOMMAND = 'dev-env';
 exports.DEV_ENVIRONMENT_SUBCOMMAND = DEV_ENVIRONMENT_SUBCOMMAND;
 const DEV_ENVIRONMENT_FULL_COMMAND = `vip ${DEV_ENVIRONMENT_SUBCOMMAND}`;
@@ -12,7 +12,8 @@ const DEV_ENVIRONMENT_DEFAULTS = {
   title: 'VIP Dev',
   multisite: false,
   elasticsearchVersion: '7.10.1',
-  mariadbVersion: '10.3'
+  mariadbVersion: '10.3',
+  phpImage: 'default'
 };
 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';
@@ -29,4 +30,13 @@ const DEV_ENVIRONMENT_WORDPRESS_CACHE_KEY = 'wordpress-versions.json';
 exports.DEV_ENVIRONMENT_WORDPRESS_CACHE_KEY = DEV_ENVIRONMENT_WORDPRESS_CACHE_KEY;
 const DEV_ENVIRONMENT_WORDPRESS_VERSION_TTL = 86400; // once per day
 
-exports.DEV_ENVIRONMENT_WORDPRESS_VERSION_TTL = DEV_ENVIRONMENT_WORDPRESS_VERSION_TTL;
+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'
+};
+exports.DEV_ENVIRONMENT_PHP_VERSIONS = DEV_ENVIRONMENT_PHP_VERSIONS;

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

@@ -13,6 +13,7 @@ exports.promptForArguments = promptForArguments;
 exports.resolvePath = resolvePath;
 exports.promptForText = promptForText;
 exports.promptForBoolean = promptForBoolean;
+exports.promptForPhpVersion = promptForPhpVersion;
 exports.promptForComponent = promptForComponent;
 exports.addDevEnvConfigurationOptions = addDevEnvConfigurationOptions;
 exports.getTagChoices = getTagChoices;
@@ -67,9 +68,9 @@ function handleCLIException(exception) {
     console.log(errorPrefix, message);
 
     if (!process.env.DEBUG) {
-      console.log(`Please re-run the command with "${_chalk.default.bold('DEBUG=@automattic/vip:bin:dev-environment')}" prepended to it and provide the stack trace on the support ticket.`);
+      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(_chalk.default.bold('\nExample:\n'));
-      console.log('DEBUG=@automattic/vip:bin:dev-environment vip dev-env create\n');
+      console.log('vip dev-env create --debug @automattic/vip:bin:dev-environment \n');
     }
 
     debug(exception);
@@ -166,6 +167,7 @@ async function promptForArguments(preselectedOptions, defaultOptions) {
     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),
     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,
     mediaRedirectDomain: preselectedOptions.mediaRedirectDomain || '',
     wordpress: {
@@ -180,7 +182,12 @@ async function promptForArguments(preselectedOptions, defaultOptions) {
     statsd: false,
     phpmyadmin: false,
     xdebug: false,
-    siteSlug: ''
+    siteSlug: '',
+    enterpriseSearchEnabled: preselectedOptions.enterpriseSearchEnabled || defaultOptions.enterpriseSearchEnabled
+  };
+  const promptLabels = {
+    xdebug: 'XDebug',
+    phpmyadmin: 'phpMyAdmin'
   };
 
   if (!instanceData.mediaRedirectDomain && defaultOptions.mediaRedirectDomain) {
@@ -208,11 +215,17 @@ async function promptForArguments(preselectedOptions, defaultOptions) {
     instanceData[component] = result;
   }
 
-  for (const service of ['statsd', 'phpmyadmin', 'xdebug']) {
-    if (service in preselectedOptions) {
-      instanceData[service] = preselectedOptions[service];
-    } else if (service in defaultOptions) {
-      instanceData[service] = defaultOptions[service];
+  instanceData.enterpriseSearchEnabled = await promptForBoolean('Enable Enterprise Search?', defaultOptions.enterpriseSearchEnabled);
+
+  if (instanceData.enterpriseSearchEnabled) {
+    instanceData.statsd = preselectedOptions.statsd || defaultOptions.statsd || false;
+  } else {
+    instanceData.statsd = false;
+  }
+
+  for (const service of ['phpmyadmin', 'xdebug']) {
+    if (service in instanceData) {
+      instanceData[service] = await promptForBoolean(`Enable ${promptLabels[service] || service}`, instanceData[service]);
     }
   }
 
@@ -288,6 +301,35 @@ async function promptForBoolean(message, initial) {
   return confirm.run();
 }
 
+function resolvePhpVersion(version) {
+  debug(`Resolving PHP version '${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'
+
+  const index = versions.findIndex(value => value == version);
+
+  if (index === -1) {
+    const image = images.find(value => value === version);
+    return image !== null && image !== void 0 ? image : images[0];
+  }
+
+  return images[index];
+}
+
+async function promptForPhpVersion(initialValue) {
+  debug(`Prompting for PHP version, preselected option is ${initialValue}`);
+  const choices = Object.keys(_devEnvironment.DEV_ENVIRONMENT_PHP_VERSIONS);
+  const images = Object.values(_devEnvironment.DEV_ENVIRONMENT_PHP_VERSIONS);
+  const initial = images.findIndex(version => version === initialValue);
+  const select = new _enquirer.Select({
+    message: 'PHP version to use',
+    choices,
+    initial
+  });
+  const answer = await select.run();
+  return resolvePhpVersion(answer);
+}
+
 const componentDisplayNames = {
   wordpress: 'WordPress',
   muPlugins: 'vip-go-mu-plugins',
@@ -346,47 +388,15 @@ async function promptForComponent(component, allowLocal, defaultObject) {
 
   if (component === 'wordpress') {
     const message = `${messagePrefix}Which version would you like`;
-    const tagChoices = await getTagChoices(); // Tag strings come back from the api with excess whitespace
-    // This strips the whitespace for matching to the defaultObject.tag
-
-    const formatted = tagChoices.map(elm => {
-      return elm.trim();
-    }); // First tag not: "Pre-Release"
-
-    const firstNonPreRelease = formatted.find(img => {
-      return !img.match(/Pre\-Release/g);
-    }); // Set initialTagIndex as the first non Pre-Release
-
-    let initialTagIndex = formatted.indexOf(firstNonPreRelease);
-
-    if (defaultObject !== null && defaultObject !== void 0 && defaultObject.tag) {
-      const defaultTagIndex = formatted.indexOf(defaultObject.tag);
-
-      if (defaultTagIndex !== -1) {
-        initialTagIndex = defaultTagIndex;
-      }
-    }
-
+    const tagChoices = await getTagChoices();
     const selectTag = new _enquirer.Select({
       message,
-      choices: formatted,
-      initial: initialTagIndex
+      choices: tagChoices
     });
-    const option = await selectTag.run(); // Validate the input
-    // Some of the options are like: '5.7   →  5.7.5'
-    // Extract first occurrence of something that looks like a tag
-
-    const tagRgx = new RegExp(/(\d+\.\d+(?:\.\d+)?)/);
-    const match = tagRgx.exec(option);
-
-    if (!Array.isArray(match) || match.length < 2) {
-      throw new Error(`Invalid WordPress selection: ${option}`);
-    }
-
-    const tag = match[1];
+    const option = await selectTag.run();
     return {
       mode: modeResult,
-      tag
+      tag: option
     };
   } // image
 
@@ -409,7 +419,7 @@ function addDevEnvConfigurationOptions(command) {
     var _value$toLowerCase3;
 
     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('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');
 }
 /**
  * Provides the list of tag choices for selection
@@ -417,17 +427,16 @@ function addDevEnvConfigurationOptions(command) {
 
 
 async function getTagChoices() {
-  const tagChoices = [];
-  let tagFormatted, prerelease, mapping;
   const versions = await (0, _devEnvironmentCore.getVersionList)();
 
   if (versions.length < 1) {
     return ['5.9', '5.8', '5.7', '5.6', '5.5'];
   }
 
-  for (const version of versions) {
-    tagFormatted = version.tag.padEnd(8 - version.tag.length);
-    prerelease = version.prerelease ? '(Pre-Release)' : '';
+  return versions.map(version => {
+    let mapping;
+    const tagFormatted = version.tag.padEnd(8 - version.tag.length);
+    const prerelease = version.prerelease ? '(Pre-Release)' : '';
 
     if (version.tag !== version.ref) {
       mapping = `→ ${prerelease} ${version.ref}`;
@@ -435,8 +444,10 @@ async function getTagChoices() {
       mapping = '';
     }
 
-    tagChoices.push(`${tagFormatted} ${mapping}`);
-  }
-
-  return tagChoices.sort().reverse();
+    return {
+      name: version.tag,
+      message: `${tagFormatted} ${mapping}`,
+      value: version.tag
+    };
+  });
 }

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

@@ -154,6 +154,8 @@ function preProcessInstanceData(instanceData) {
     newInstanceData.mediaRedirectDomain = `https://${instanceData.mediaRedirectDomain}`;
   }
 
+  newInstanceData.enterpriseSearchEnabled = instanceData.enterpriseSearchEnabled || false;
+  newInstanceData.php = instanceData.php || _devEnvironment.DEV_ENVIRONMENT_PHP_VERSIONS.default;
   return newInstanceData;
 }
 
@@ -473,7 +475,6 @@ async function importMediaPath(slug, filePath) {
 
 async function updateWordPressImage(slug) {
   const versions = await getVersionList();
-  const refRgx = new RegExp(/\d+\.\d+(?:\.\d+)?/);
   let message, envData, currentWordPressTag; // Get the current environment configuration
 
   try {
@@ -489,55 +490,65 @@ async function updateWordPressImage(slug) {
     }
 
     (0, _devEnvironmentCli.handleCLIException)(new Error(message));
-  } // filter
-
+    return false;
+  } // sort
 
-  const filteredVersions = versions.filter(vsn => {
-    return refRgx.test(vsn.ref);
-  }); // sort
 
-  filteredVersions.sort((before, after) => before.tag < after.tag ? 1 : -1); // Newest WordPress Image
+  versions.sort((before, after) => before.tag < after.tag ? 1 : -1); // Newest WordPress Image
 
-  const newestWordPressImage = filteredVersions[0];
+  const newestWordPressImage = versions[0];
   console.log('The most recent WordPress version available is: ' + _chalk.default.green(newestWordPressImage.tag)); // If the currently used version is the most up to date: exit.
 
-  if (currentWordPressTag === newestWordPressImage.ref) {
+  if (currentWordPressTag === newestWordPressImage.tag) {
     console.log('Environment WordPress version is: ' + _chalk.default.green(currentWordPressTag) + '  ... 😎 nice! ');
     return false;
   } // Determine if there is an image available for the current WordPress version
 
 
-  const match = filteredVersions.find(({
-    ref
-  }) => ref === currentWordPressTag); // If there is no available image for the currently installed version, give user a path to change
+  const match = versions.find(({
+    tag
+  }) => tag === currentWordPressTag); // If there is no available image for the currently installed version, give user a path to change
 
   if (typeof match === 'undefined') {
     console.log(`Installed WordPress: ${currentWordPressTag} has no available container image in repository. `);
     console.log('You must select a new WordPress image to continue... ');
   } else {
-    console.log('Environment WordPress version is: ' + _chalk.default.yellow(match.ref));
+    console.log('Environment WordPress version is: ' + _chalk.default.yellow(`${match.tag} (${match.ref})`));
+
+    if (envData.wordpress.doNotUpgrade || false) {
+      return false;
+    }
   } // Prompt the user to select a new WordPress Version
 
 
   const confirm = await (0, _enquirer.prompt)({
-    type: 'confirm',
+    type: 'select',
     name: 'upgrade',
-    message: 'Would You like to change the WordPress version? '
+    message: 'Would You like to change the WordPress version? ',
+    choices: ['yes', 'no', "no (don't ask anymore)"]
   }); // If the user takes the new WP version path
 
-  if (confirm.upgrade) {
+  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 version = filteredVersions.find(({
+    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;
     await updateEnvironment(envData);
     return true;
   }
 
+  if (confirm.upgrade === "no (don't ask anymore)") {
+    envData.wordpress.doNotUpgrade = true;
+    console.log("We won't ask about upgrading this environment anymore.");
+    console.log('To manually upgrade please run:' + `${_chalk.default.yellow(`vip dev-env update --slug=${slug}`)}`);
+    await updateEnvironment(envData);
+  }
+
   return false;
 }
 /**

package/npm-shrinkwrap.json

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

package/package.json

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