@automattic/vip 2.9.4 → 2.11.0

package/CONTRIBUTING.md

@@ -44,21 +44,12 @@ Our release flow for VIP CLI follows this pattern:
 - Include a Changelog for all npm version releases, including any minor or major versions
 - 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
-- Please do not merge any changes into the `master` branch yet. All features/changes that are not ready to be public should stay in the `develop` branch to avoid conflicts when releasing urgent fixes.
-- Changes from the `develop` branch are merged to `master` and released on NPM following our release schedule
-- Any team member that is part of our NPM organization can release new minor or major versions, but please have a Customer Experience (Pâtisserie) team member look over the changes first.
+- 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.
 
 ### 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`.
 
-### Release Schedule
-
-The VIP Customer Experience squad conducts releases on Tuesdays from 4AM to 5PM Pacific Time (US). Releases are regular but do not happen every Tuesday. Please coordinate with the VIP Customer Experience squad if you'd like to lead your own release.
-
-As part of the release process, our squad merges changes from the `develop` branch to the `master` branch. Therefore, do not merge changes into `develop` unless it is ready for release (or use a feature flag to disable it).
-
-Fixes for urgent or breaking bugs may be merged straight to the `master` branch and released publicly via `npm` at any time outside of our release window. All other changes should participate in our release window.
-
 ## Releasing / Publishing
 
 ### Pre-publish Checks

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,41 @@ By default, we record information about the usage of this tool using an in-house
 
 ## Changelog
 
+### 2.11.0 (11 May 2022)
+
+- #1022 [dev-env] Validate docker installed
+- #1026 [dev-env] adds tracking to stop subcommand
+- #1028 Re-calculate the fileMeta if file gets changed by the searchAndReplace
+- #1029 Adds Pendo analytics client
+- #1030 [dev-env] Fix failure tracking
+
+### 2.10.0 (4 May 2022)
+
+- #1021 [dev-env] Add login info and documentation link to `dev-env info`
+- #1023 [dev-env] Skip the trunk from the prompt about the latest available WordPress versions
+- #1019 [dev-env] Unifies lando and other dev-env debug logs
+- #1018 [dev-env] enable lando debug on `--debug`
+- #1017 [dev-env] Adding tracking for create and destroy sub commands
+- #1016 [dev-env] Adding tracking for start sub command
+- #1020 [dev-env] More tracking
+
+### 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 +71,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 +181,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 +196,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 +209,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 +272,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 +288,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 +300,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 +310,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 +319,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 +327,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 +368,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 +377,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 +423,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 +431,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 +457,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 +466,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 +480,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 +491,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 +507,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 +523,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/config/config.json

@@ -1,6 +1,6 @@
 {
   "tracksUserType": "vip:user_id",
   "tracksAnonUserType": "anon",
-  "tracksEventPrefix": "vip_cli_",
-  "environment": "production"
+  "tracksEventPrefix": "vip_cli_dev_",
+  "environment": "development"
 }

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

@@ -14,6 +14,8 @@ var _debug = _interopRequireDefault(require("debug"));
 
 var _chalk = _interopRequireDefault(require("chalk"));
 
+var _tracker = require("../lib/tracker");
+
 var _command = _interopRequireDefault(require("../lib/cli/command"));
 
 var exit = _interopRequireWildcard(require("../lib/cli/exit"));
@@ -58,8 +60,13 @@ const cmd = (0, _command.default)().option('slug', 'Custom name of the dev envir
 (0, _devEnvironmentCli.addDevEnvConfigurationOptions)(cmd);
 cmd.examples(examples);
 cmd.argv(process.argv, async (arg, opt) => {
+  await (0, _devEnvironmentCli.validateDependencies)();
   const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
   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));
 
@@ -91,7 +98,8 @@ cmd.argv(process.argv, async (arg, opt) => {
     await (0, _devEnvironmentCore.printEnvironmentInfo)(slug);
     const message = '\n' + _chalk.default.green('✓') + ` environment created.\n\nTo start it please run:\n\n${startCommand}\n`;
     console.log(message);
+    await (0, _tracker.trackEvent)('dev_env_create_command_success', trackingInfo);
   } catch (error) {
-    exit.withError(error.message);
+    await (0, _devEnvironmentCli.handleCLIException)(error, 'dev_env_create_command_error', trackingInfo);
   }
 });

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

@@ -14,9 +14,9 @@ var _debug = _interopRequireDefault(require("debug"));
 
 var _chalk = _interopRequireDefault(require("chalk"));
 
-var _command = _interopRequireDefault(require("../lib/cli/command"));
+var _tracker = require("../lib/tracker");
 
-var exit = _interopRequireWildcard(require("../lib/cli/exit"));
+var _command = _interopRequireDefault(require("../lib/cli/command"));
 
 var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
 
@@ -24,10 +24,6 @@ var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
 
 var _devEnvironment = require("../lib/constants/dev-environment");
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /**
@@ -42,7 +38,10 @@ const examples = [{
   description: 'Destroys a local dev environment named foo'
 }];
 (0, _command.default)().option('slug', 'Custom name of the dev environment').option('soft', 'Keep config files needed to start an environment intact').examples(examples).argv(process.argv, async (arg, opt) => {
+  await (0, _devEnvironmentCli.validateDependencies)();
   const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
+  const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
+  await (0, _tracker.trackEvent)('dev_env_destroy_command_execute', trackingInfo);
   debug('Args: ', arg, 'Options: ', opt);
 
   try {
@@ -50,7 +49,8 @@ const examples = [{
     await (0, _devEnvironmentCore.destroyEnvironment)(slug, removeFiles);
     const message = _chalk.default.green('✓') + ' Environment destroyed.\n';
     console.log(message);
+    await (0, _tracker.trackEvent)('dev_env_destroy_command_success', trackingInfo);
   } catch (error) {
-    exit.withError(error.message);
+    await (0, _devEnvironmentCli.handleCLIException)(error, 'dev_env_destroy_command_error', trackingInfo);
   }
 });