@automattic/vip 2.2.0 → 2.5.0

package/CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing
 
-Thanks for contributing to the VIP Javascript library. There are some guidelines to ensure we have consistency across the CLI and web interfaces.
+Thanks for contributing to the VIP-CLI. There are some guidelines to ensure we have consistency across the CLI and web interfaces.
 
 ## Coding Standards
 
@@ -49,14 +49,15 @@ Our release flow for VIP CLI follows this pattern:
 - 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.
 
 ### Changelogs
-Changelogs allow customers to keep up with all the changes happening across our VIP Platform. Changelogs for VIP CLI are posted to the V[VIP Cloud Changelog P2](https://wpvipchangelog.wordpress.com/), along with the repository’s `README.md`.
+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
-We deploy changes from our `develop` branch to the `master` branch on Tuesdays from 4AM to 5PM Pacific Time.
 
-Changes that are not ready to be publicly released should stay in the `develop` branch to avoid conflicts with any urgent fixes we may need to roll out. 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 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.
 
-All other changes should follow the schedule so that we can monitor the newly released changes.
+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
 
@@ -93,13 +94,15 @@ gh pr list --search "is:merged sort:updated-desc closed:>$LAST_RELEASE_DATE" | s
 
 Then, let's publish:
 
+1. Make sure master branch is up to date `git pull`
 1. Set the version (via `npm version minor` or `npm version major` or `npm version patch`)
 1. For most regular releases, this will be `npm version minor`.
 1. Push the tag to GitHub (`git push --tags`)
-1. Publish the release to npm (`npm run publish-please`)
+1. Push the master branch `git push`
+1. Make sure you're part of the Automattic organization in npm
+1. Publish the release to npm (`npm run publish-please --access public`)
 1. Edit [the release on GitHub](https://github.com/Automattic/vip/releases) to include a description of the changes and publish (this can just copy the details from the changelog).
-1. Bump the version to the next minor: `npm --no-git-tag-version version preminor`
-1. Commit and push (`git add -u` + `git commit` + `git push origin master`).
+1. Push `master` changes (mostly the version bump) to `develop` (`git checkout develop && git merge master` )
 
 Once released, it's worth running `npm i -g @automattic/vip` to install / upgrade the released version to make sure everything looks good.
 

package/README.md

@@ -27,6 +27,26 @@ By default, we record information about the usage of this tool using an in-house
 
 ## Changelog
 
+### 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
+
+### 2.4.0 (5 November 2021)
+- #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
+
 ### 2.2.0 (27 October 2021)
 
 New: Environment variables command

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

@@ -12,12 +12,14 @@ services:
   devtools:
     type: compose
     services:
-      image: ghcr.io/automattic/vip-container-images/dev-tools:0.7
+      image: ghcr.io/automattic/vip-container-images/dev-tools:0.8
       command: sleep infinity
       volumes:
         - devtools:/dev-tools
+        - scripts:/scripts
     volumes:
       devtools: {}
+      scripts:
 
   nginx:
     type: compose
@@ -40,18 +42,23 @@ services:
         XDEBUG: <%= xdebug ? 'enable' : 'disable' %>
         STATSD: <%= statsd ? 'enable' : 'disable' %>
 
+        LANDO_NO_USER_PERMS: 'enable'
+
+
       volumes:
         - type: volume
           source: devtools
           target: /dev-tools
           volume:
             nocopy: true
+        - type: volume
+          source: scripts
+          target: /scripts
+          volume:
+            nocopy: true
 <% wpVolumes() %>
     run:
       - sh /dev-tools/setup.sh database root "http://<%= siteSlug %>.vipdev.lndo.site/" "<%= wpTitle %>" <% if ( multisite ) { %> <%= siteSlug %>.vipdev.lndo.site <% } %>
-    run_as_root:
-      - echo "Copying dev-env-plugin.php to mu-plugins"
-      - cp /dev-tools/dev-env-plugin.php /wp/wp-content/mu-plugins/
 
   database:
     type: compose
@@ -116,19 +123,29 @@ services:
   wordpress:
     type: compose
     services:
-      image: <%= wordpress.image %>:<%= wordpress.tag %>
-      command: sh -c "rsync -a /wp/ /shared/; sleep infinity"
+      image: ghcr.io/automattic/vip-container-images/wordpress:<%= wordpress.tag %>
+      command: sh -c "rsync -a /wp/ /shared/; chown www-data -R /shared; sleep infinity"
       volumes:
         - ./wordpress:/shared
+        - type: volume
+          source: scripts
+          target: /scripts
+          volume:
+            nocopy: true
 
 <% if ( muPlugins.mode == 'image' ) { %>
   mu-plugins:
     type: compose
     services:
-      image: <%= muPlugins.image %>:<%= muPlugins.tag %>
-      command: sh -c 'rsync -a /mu-plugins/ /shared/; sh /autoupdate.sh /shared'
+      image: ghcr.io/automattic/vip-container-images/mu-plugins:0.1
+      command: sh /run.sh
       volumes:
         - mu-plugins:/shared
+        - type: volume
+          source: scripts
+          target: /scripts
+          volume:
+            nocopy: true
     volumes:
       mu-plugins: {}
 <% } %>
@@ -137,7 +154,7 @@ services:
   client-code:
     type: compose
     services:
-      image: <%= clientCode.image %>:<%= clientCode.tag %>
+      image: ghcr.io/automattic/vip-container-images/skeleton:latest
       command: sleep infinity
       volumes:
         - clientcode_clientmuPlugins:/clientcode/client-mu-plugins

package/dist/bin/vip-config-envvar-delete.js

@@ -82,6 +82,10 @@ async function deleteEnvVarCommand(arg, opt) {
   });
   await (0, _tracker.trackEvent)('envvar_delete_command_success', trackingParams);
   console.log(_chalk.default.green(`Successfully deleted environment variable ${JSON.stringify(name)}`));
+
+  if (!opt.skipConfirmation) {
+    console.log(_chalk.default.bgYellow(_chalk.default.bold('Important:')), 'Updates to environment variables will not be available until the application’s next deploy.');
+  }
 }
 
 (0, _command.default)({

package/dist/bin/vip-config-envvar-set.js

@@ -101,6 +101,10 @@ async function setEnvVarCommand(arg, opt) {
   });
   await (0, _tracker.trackEvent)('envvar_set_command_success', trackingParams);
   console.log(_chalk.default.green(`Successfully set environment variable ${JSON.stringify(name)}`));
+
+  if (!opt.skipConfirmation) {
+    console.log(_chalk.default.bgYellow(_chalk.default.bold('Important:')), 'Updates to environment variables will not be available until the application’s next deploy.');
+  }
 }
 
 (0, _command.default)({

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

@@ -50,11 +50,11 @@ const examples = [{
   usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} create --multisite --wordpress "5.8" --client-code "~/git/my_code"`,
   description: 'Creates a local multisite dev environment using WP 5.8 and client code is expected to be in "~/git/my_code"'
 }];
-(0, _command.default)().option('slug', 'Custom name of the dev environment').option('title', 'Title for the WordPress site (default: "VIP Dev")').option('multisite', 'Enable multisite install', undefined, value => {
+(0, _command.default)().option('slug', 'Custom name of the dev environment').option('title', 'Title for the WordPress site').option('multisite', 'Enable multisite install', undefined, value => {
   var _value$toLowerCase;
 
   return 'false' !== (value === null || value === void 0 ? void 0 : (_value$toLowerCase = value.toLowerCase) === null || _value$toLowerCase === void 0 ? void 0 : _value$toLowerCase.call(value));
-}).option('wordpress', 'Use a specific WordPress version or local directory (default: last stable)').option(['u', 'mu-plugins'], 'Use a specific mu-plugins changeset or local directory (default: "auto": last commit in master)').option('client-code', 'Use the client code from a local directory or VIP skeleton (default: use the VIP skeleton)').option('statsd', 'Enable statsd component. By default it is disabled', undefined, value => {
+}).option('wordpress', 'Use a specific WordPress version').option(['u', 'mu-plugins'], 'Use a specific mu-plugins changeset or local directory').option('client-code', 'Use the client code from a local directory or VIP skeleton').option('statsd', 'Enable statsd component. By default it is disabled', undefined, value => {
   var _value$toLowerCase2;
 
   return 'false' !== (value === null || value === void 0 ? void 0 : (_value$toLowerCase2 = value.toLowerCase) === null || _value$toLowerCase2 === void 0 ? void 0 : _value$toLowerCase2.call(value));
@@ -96,8 +96,7 @@ const examples = [{
     siteSlug: slug,
     statsd: opt.statsd || false,
     phpmyadmin: opt.phpmyadmin || false,
-    xdebug: opt.xdebug || false,
-    mediaRedirectDomain: opt.mediaRedirectDomain || ''
+    xdebug: opt.xdebug || false
   };
 
   try {

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

@@ -0,0 +1,72 @@
+#!/usr/bin/env node
+
+/**
+ * 
+ * @format
+ */
+
+/**
+ * External dependencies
+ */
+"use strict";
+
+var _debug = _interopRequireDefault(require("debug"));
+
+var _chalk = _interopRequireDefault(require("chalk"));
+
+var _command = _interopRequireDefault(require("../lib/cli/command"));
+
+var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
+
+var _devEnvironment = require("../lib/constants/dev-environment");
+
+var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * Internal dependencies
+ */
+const debug = (0, _debug.default)('@automattic/vip:bin:dev-environment');
+const examples = [{
+  usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} update`,
+  description: 'Retriggers setup wizard in order to change environment configuration'
+}];
+const cmd = (0, _command.default)().option('slug', 'Custom name of the dev environment');
+(0, _devEnvironmentCli.addDevEnvConfigurationOptions)(cmd);
+cmd.examples(examples);
+cmd.argv(process.argv, async (arg, opt) => {
+  const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
+
+  try {
+    const environmentAlreadyExists = (0, _devEnvironmentCore.doesEnvironmentExist)(slug);
+
+    if (!environmentAlreadyExists) {
+      throw new Error(_devEnvironment.DEV_ENVIRONMENT_NOT_FOUND);
+    }
+
+    const currentInstanceData = (0, _devEnvironmentCore.readEnvironmentData)(slug);
+    debug('Read instance data', currentInstanceData);
+    const preselectedOptions = {
+      // Title and multisite can't be changed during update
+      title: currentInstanceData.wpTitle,
+      multisite: currentInstanceData.multisite,
+      ...opt
+    };
+    debug('Combined preselected data are', preselectedOptions);
+    const instanceData = await (0, _devEnvironmentCli.promptForArguments)(preselectedOptions, {}); // const instanceDataWithSlug = {
+    // 	...currentInstanceData,
+    // 	siteSlug: slug,
+    // 	statsd: opt.statsd || false,
+    // 	phpmyadmin: opt.phpmyadmin || false,
+    // 	xdebug: opt.xdebug || false,
+    // };
+  } catch (error) {
+    if ('ENOENT' === error.code) {
+      const message = 'Environment was created before update was supported.\n\nTo update environment please destroy it and create a new one.';
+      (0, _devEnvironmentCli.handleCLIException)(new Error(message));
+    } else {
+      (0, _devEnvironmentCli.handleCLIException)(error);
+    }
+  }
+});

package/dist/bin/vip.js

@@ -15,7 +15,7 @@ var _debug = _interopRequireDefault(require("debug"));
 
 var _config = _interopRequireDefault(require("../../config/config.json"));
 
-var _command = _interopRequireDefault(require("../lib/cli/command"));
+var _command = _interopRequireWildcard(require("../lib/cli/command"));
 
 var _token = _interopRequireDefault(require("../lib/token"));
 
@@ -23,6 +23,10 @@ var _tracker = require("../lib/tracker");
 
 var _rollbar = require("../lib/rollbar");
 
+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 }; }
 
 /**
@@ -52,9 +56,10 @@ const rootCmd = async function () {
   let token = await _token.default.get();
   const isHelpCommand = process.argv.some(arg => arg === 'help' || arg === '-h' || arg === '--help');
   const isLogoutCommand = process.argv.some(arg => arg === 'logout');
+  const isDevEnvCommandWithoutEnv = process.argv.some(arg => arg === 'dev-env') && !(0, _command.containsAppEnvArgument)(process.argv);
   debug('Argv:', process.argv);
 
-  if (isLogoutCommand || isHelpCommand || token && token.valid()) {
+  if (isLogoutCommand || isHelpCommand || isDevEnvCommandWithoutEnv || token && token.valid()) {
     runCmd();
   } else {
     console.log();

package/dist/lib/cli/command.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = _default;
 exports.getEnvIdentifier = getEnvIdentifier;
+exports.containsAppEnvArgument = containsAppEnvArgument;
 
 var _args = _interopRequireDefault(require("args"));
 
@@ -587,4 +588,9 @@ function getEnvIdentifier(env) {
   }
 
   return identifier;
+}
+
+function containsAppEnvArgument(argv) {
+  const parsedAlias = (0, _envAlias.parseEnvAliasFromArgv)(argv);
+  return !!(parsedAlias.app || parsedAlias.env || argv.includes('--app') || argv.includes('--env'));
 }

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

@@ -3,42 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DEV_ENVIRONMENT_COMPONENTS = exports.DEV_ENVIRONMENT_PROMPT_INTRO = exports.DEV_ENVIRONMENT_DEFAULTS = exports.DEV_ENVIRONMENT_CONTAINER_IMAGES = exports.DEV_ENVIRONMENT_FULL_COMMAND = exports.DEV_ENVIRONMENT_SUBCOMMAND = void 0;
+exports.DEV_ENVIRONMENT_COMPONENTS = 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}`;
 exports.DEV_ENVIRONMENT_FULL_COMMAND = DEV_ENVIRONMENT_FULL_COMMAND;
-const DEV_ENVIRONMENT_CONTAINER_IMAGES = {
-  wordpress: {
-    image: 'ghcr.io/automattic/vip-container-images/wordpress'
-  },
-  muPlugins: {
-    image: 'ghcr.io/automattic/vip-container-images/mu-plugins',
-    tag: 'latest'
-  },
-  clientCode: {
-    image: 'ghcr.io/automattic/vip-container-images/skeleton',
-    tag: 'latest'
-  }
-};
-exports.DEV_ENVIRONMENT_CONTAINER_IMAGES = DEV_ENVIRONMENT_CONTAINER_IMAGES;
 const DEV_ENVIRONMENT_DEFAULTS = {
   title: 'VIP Dev',
   multisite: false,
   elasticsearchVersion: '7.10.1',
-  mariadbVersion: '10.3',
-  wordpress: {},
-  muPlugins: {},
-  clientCode: {}
+  mariadbVersion: '10.3'
 };
 exports.DEV_ENVIRONMENT_DEFAULTS = DEV_ENVIRONMENT_DEFAULTS;
-['muPlugins', 'clientCode'].forEach(type => {
-  DEV_ENVIRONMENT_DEFAULTS[type] = {
-    mode: 'image',
-    image: DEV_ENVIRONMENT_CONTAINER_IMAGES[type].image,
-    tag: DEV_ENVIRONMENT_CONTAINER_IMAGES[type].tag
-  };
-});
 const DEV_ENVIRONMENT_PROMPT_INTRO = 'This is a wizard to help you set up your local dev environment.\n\n' + 'Sensible default values were pre-selected for convenience. ' + 'You may also choose to create multiple environments with different settings using the --slug option.\n\n';
 exports.DEV_ENVIRONMENT_PROMPT_INTRO = DEV_ENVIRONMENT_PROMPT_INTRO;
 const DEV_ENVIRONMENT_COMPONENTS = ['wordpress', 'muPlugins', 'clientCode'];

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

@@ -104,7 +104,7 @@ function printTable(data) {
   console.log(formattedData);
 }
 
-function processComponentOptionInput(passedParam, type, allowLocal) {
+function processComponentOptionInput(passedParam, allowLocal) {
   // cast to string
   const param = passedParam + '';
 
@@ -117,13 +117,12 @@ function processComponentOptionInput(passedParam, type, allowLocal) {
 
   return {
     mode: 'image',
-    image: _devEnvironment.DEV_ENVIRONMENT_CONTAINER_IMAGES[type].image,
     tag: param
   };
 }
 
 async function promptForArguments(providedOptions, appInfo) {
-  var _appInfo$environment;
+  var _appInfo$environment, _appInfo$environment3;
 
   debug('Provided options', providedOptions);
   console.log(_devEnvironment.DEV_ENVIRONMENT_PROMPT_INTRO);
@@ -144,10 +143,21 @@ async function promptForArguments(providedOptions, appInfo) {
     multisite: 'multisite' in providedOptions ? providedOptions.multisite : await promptForBoolean(multisiteText, multisiteDefault),
     elasticsearch: providedOptions.elasticsearch || _devEnvironment.DEV_ENVIRONMENT_DEFAULTS.elasticsearchVersion,
     mariadb: providedOptions.mariadb || _devEnvironment.DEV_ENVIRONMENT_DEFAULTS.mariadbVersion,
+    mediaRedirectDomain: '',
     wordpress: {},
     muPlugins: {},
     clientCode: {}
   };
+  const primaryDomain = appInfo === null || appInfo === void 0 ? void 0 : (_appInfo$environment3 = appInfo.environment) === null || _appInfo$environment3 === void 0 ? void 0 : _appInfo$environment3.primaryDomain;
+
+  if (primaryDomain) {
+    const mediaRedirectPromptText = `Would you like to redirect to ${primaryDomain} for missing media files?`;
+    const setMediaRedirectDomain = await promptForBoolean(mediaRedirectPromptText, true);
+
+    if (setMediaRedirectDomain) {
+      instanceData.mediaRedirectDomain = primaryDomain;
+    }
+  }
 
   for (const component of _devEnvironment.DEV_ENVIRONMENT_COMPONENTS) {
     const option = providedOptions[component];
@@ -162,7 +172,7 @@ async function processComponent(component, option) {
   const allowLocal = component !== 'wordpress';
 
   if (option) {
-    result = processComponentOptionInput(option, component, allowLocal);
+    result = processComponentOptionInput(option, allowLocal);
   } else {
     result = await promptForComponent(component, allowLocal);
   }
@@ -182,7 +192,7 @@ async function processComponent(component, option) {
     } else {
       const message = `Provided path "${resolvedPath}" does not point to a valid or existing directory.`;
       console.log(_chalk.default.yellow('Warning:'), message);
-      result = await promptForComponent(component);
+      result = await promptForComponent(component, allowLocal);
     }
   }
 
@@ -230,6 +240,7 @@ const componentDisplayNames = {
 };
 
 async function promptForComponent(component, allowLocal) {
+  debug(`Prompting for ${component}`);
   const componentDisplayName = componentDisplayNames[component] || component;
   const choices = [];
 
@@ -280,29 +291,24 @@ async function promptForComponent(component, allowLocal) {
   } // image
 
 
-  let tag = _devEnvironment.DEV_ENVIRONMENT_CONTAINER_IMAGES[component].tag;
-  const componentsWithPredefinedImageTag = ['muPlugins', 'clientCode'];
-
-  if (!componentsWithPredefinedImageTag.includes(component)) {
+  if (component === 'wordpress') {
     const message = `${messagePrefix}Which version would you like`;
     const selectTag = new _enquirer.Select({
       message,
-      choices: getLatestImageTags(component)
+      choices: getWordpressImageTags()
     });
-    tag = await selectTag.run();
+    const tag = await selectTag.run();
+    return {
+      mode: modeResult,
+      tag
+    };
   }
 
   return {
-    mode: modeResult,
-    image: _devEnvironment.DEV_ENVIRONMENT_CONTAINER_IMAGES[component].image,
-    tag
+    mode: modeResult
   };
 }
 
-function getLatestImageTags(component) {
-  if (component === 'wordpress') {
-    return ['5.8.1', '5.8', '5.7.3', '5.7.2'];
-  }
-
-  return [];
+function getWordpressImageTags() {
+  return ['5.8.1', '5.8', '5.7.3', '5.7.2'];
 }

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

@@ -64,6 +64,7 @@ const nginxFileTemplatePath = _path.default.join(__dirname, '..', '..', '..', 'a
 
 const landoFileName = '.lando.yml';
 const nginxFileName = 'extra.conf';
+const instanceDataFileName = 'instance_data.json';
 const homeDirPathInsideContainers = '/user';
 const uploadPathString = 'uploads';
 const nginxPathString = 'nginx';
@@ -133,7 +134,14 @@ async function destroyEnvironment(slug, removeFiles) {
     throw new Error('Environment not found.');
   }
 
-  await (0, _devEnvironmentLando.landoDestroy)(instancePath);
+  const landoFilePath = _path.default.join(instancePath, landoFileName);
+
+  if (_fs.default.existsSync(landoFilePath)) {
+    debug('Lando file exists, will lando destroy.');
+    await (0, _devEnvironmentLando.landoDestroy)(instancePath);
+  } else {
+    debug("Lando file doesn't exist, skipping lando destroy.");
+  }
 
   if (removeFiles) {
     await _fs.default.promises.rm(instancePath, {
@@ -200,6 +208,7 @@ function doesEnvironmentExist(slug) {
 async function prepareLandoEnv(instanceData, instancePath) {
   const landoFile = await _ejs.default.renderFile(landoFileTemplatePath, instanceData);
   const nginxFile = await _ejs.default.renderFile(nginxFileTemplatePath, instanceData);
+  const instanceDataFile = JSON.stringify(instanceData);
 
   const landoFileTargetPath = _path.default.join(instancePath, landoFileName);
 
@@ -207,6 +216,8 @@ async function prepareLandoEnv(instanceData, instancePath) {
 
   const nginxFileTargetPath = _path.default.join(nginxFolderPath, nginxFileName);
 
+  const instanceDataTargetPath = _path.default.join(instancePath, instanceDataFileName);
+
   _fs.default.mkdirSync(instancePath, {
     recursive: true
   });
@@ -219,8 +230,11 @@ async function prepareLandoEnv(instanceData, instancePath) {
 
   _fs.default.writeFileSync(nginxFileTargetPath, nginxFile);
 
+  _fs.default.writeFileSync(instanceDataTargetPath, instanceDataFile);
+
   debug(`Lando file created in ${landoFileTargetPath}`);
   debug(`Nginx file created in ${nginxFileTargetPath}`);
+  debug(`Instance data file created in ${instanceDataTargetPath}`);
 }
 
 function getAllEnvironmentNames() {
@@ -269,7 +283,10 @@ async function getApplicationInformation(appId, envType) {
 			name,
 			type,
 			branch,
-			isMultisite
+			isMultisite,
+			primaryDomain {
+				name
+			}
 		}`;
   const queryResult = await (0, _app.default)(appId, fieldsQuery);
   const appData = {};
@@ -290,11 +307,14 @@ async function getApplicationInformation(appId, envType) {
     }
 
     if (envData) {
+      var _envData$primaryDomai;
+
       appData.environment = {
         name: envData.name,
         branch: envData.branch,
         type: envData.type,
-        isMultisite: envData.isMultisite
+        isMultisite: envData.isMultisite,
+        primaryDomain: ((_envData$primaryDomai = envData.primaryDomain) === null || _envData$primaryDomai === void 0 ? void 0 : _envData$primaryDomai.name) || ''
       };
     }
   }

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

@@ -42,14 +42,16 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * This file will hold all the interactions with lando library
  */
-const debug = (0, _debug.default)('@automattic/vip:bin:dev-environment-lando');
+const DEBUG_KEY = '@automattic/vip:bin:dev-environment-lando';
+const debug = (0, _debug.default)(DEBUG_KEY);
 
 function getLandoConfig() {
   const landoPath = _path.default.join(__dirname, '..', '..', '..', 'node_modules', 'lando');
 
   debug(`Getting lando config, using path '${landoPath}' for plugins`);
+  const logLevelConsole = (process.env.DEBUG || '').includes(DEBUG_KEY) ? 'debug' : 'warn';
   return {
-    logLevelConsole: 'warn',
+    logLevelConsole,
     landoFile: '.lando.yml',
     preLandoFiles: ['.lando.base.yml', '.lando.dist.yml', '.lando.upstream.yml'],
     postLandoFiles: ['.lando.local.yml'],

package/package.json

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