@automattic/vip 2.27.0-dev3 → 2.27.0-dev4

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## Changelog
 
+### 2.27.0
+
+- #1287 fix(dev-env): Pull fresh images for new environments
+- #1288 fix(flow): Fix Flow issues
+- #1286 fix(dev-env): Provide Flow typings for `landoLogs()`
+- #1285 refactor(dev-env): Refactor Lando template to avoid running unnecessary scripts
+- #1280 Dev-env: Add command to view logs `vip dev-env logs`
+- #1267 feat(dev-env): Add `vip dev-env shell` command
+- #1283 fix(dev-env): Add missing `await`
+- #1284 test: Do not mock `localStorage` if `global.localStorage` is defined
+- #1281 [dev-env] Update the wording for Docker connection check
+- #1173 Add dev-env configuration file
+- #1279 Add some clarification to test-release process
+
 ### 2.26.2
 
 - #1278	Prepare v2.26.2

package/CONTRIBUTING.md

@@ -146,6 +146,8 @@ In order to do that, please follow this:
 
 You can repeat this with every new version until you're happy with your version and ready to a public release. We currently don't support multiple branches for multiple versions. When it's the case, this process needs to be done for every version in every branch.
 
+_PS: The above steps will only change your local `trunk`. The remote `trunk` will remain unaffected, and you can reset your local trunk afterwards with `git reset --hard origin/trunk`._
+
 ### Patching Old Releases
 
 There may be times when we need to push out a critical fix to the most recent release (or several past releases) such as for patching security issues or major bugs. This can be complicated by the fact that we may have some larger changes already merged into the `trunk` branch.

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

@@ -9,8 +9,8 @@ proxy:
 <% } %>
   phpmyadmin:
     - <%= siteSlug %>-pma.vipdev.lndo.site
-services:
 
+services:
   devtools:
     type: compose
     services:
@@ -19,16 +19,24 @@ services:
       volumes:
         - devtools:/dev-tools
         - scripts:/scripts
+      environment:
+        LANDO_NO_USER_PERMS: 1
+        LANDO_NO_SCRIPTS: 1
+        LANDO_NEEDS_EXEC: 1
     volumes:
       devtools: {}
       scripts:
+
   nginx:
     type: compose
     ssl: true
     sslExpose: false
     services:
-      image: ghcr.io/automattic/vip-container-images/nginx:1.23.2
+      image: ghcr.io/automattic/vip-container-images/nginx:1.23.3
       command: nginx -g "daemon off;"
+      environment:
+        LANDO_NO_SCRIPTS: 1
+        LANDO_NEEDS_EXEC: 1
       volumes:
         - ./nginx/extra.conf:/etc/nginx/conf.extra/extra.conf
 <% wpVolumes() %>
@@ -45,8 +53,7 @@ services:
         XDEBUG_CONFIG: "<%= xdebugConfig %>"
 <% } %>
         LANDO_NO_USER_PERMS: 'enable'
-
-
+        LANDO_NEEDS_EXEC: 1
       volumes:
         - type: volume
           source: devtools
@@ -81,6 +88,9 @@ services:
         MYSQL_USER: wordpress
         MYSQL_PASSWORD: wordpress
         MYSQL_DATABASE: wordpress
+        LANDO_NO_USER_PERMS: 1
+        LANDO_NO_SCRIPTS: 1
+        LANDO_NEEDS_EXEC: 1
       volumes:
         - database_data:/var/lib/mysql
     volumes:
@@ -105,6 +115,7 @@ services:
       environment:
         UPLOAD_LIMIT: 4G
 <% } %>
+
 <% if ( elasticsearch ) { %>
   elasticsearch:
     type: compose
@@ -118,6 +129,9 @@ services:
         ELASTICSEARCH_PORT_NUMBER: 9200
         discovery.type: 'single-node'
         xpack.security.enabled: 'false'
+        LANDO_NO_USER_PERMS: 1
+        LANDO_NO_SCRIPTS: 1
+        LANDO_NEEDS_EXEC: 1
       ports:
         - ":9200"
       volumes:
@@ -130,7 +144,7 @@ services:
     type: compose
     services:
       image: ghcr.io/automattic/vip-container-images/wordpress:<%= wordpress.tag %>
-      command: sh -c "rsync -a /wp/ /shared/; chown www-data -R /shared; sleep infinity"
+      command: sh -c "rsync -a --chown=www-data:www-data /wp/ /shared/; sleep infinity"
       volumes:
         - ./wordpress:/shared
         - type: volume
@@ -152,6 +166,9 @@ services:
           target: /scripts
           volume:
             nocopy: true
+      environment:
+        LANDO_NO_SCRIPTS: 1
+        LANDO_NEEDS_EXEC: 1
     volumes:
       mu-plugins: {}
 <% } %>

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

@@ -18,6 +18,7 @@ var exit = _interopRequireWildcard(require("../lib/cli/exit"));
 var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
 var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
 var _devEnvironment = require("../lib/constants/dev-environment");
+var _devEnvironmentConfigurationFile = require("../lib/dev-environment/dev-environment-configuration-file");
 var _devEnvironmentLando = require("../lib/dev-environment/dev-environment-lando");
 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; }
@@ -46,6 +47,7 @@ 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) => {
+  const configurationFileOptions = await (0, _devEnvironmentConfigurationFile.getConfigurationFileOptions)();
   const environmentNameOptions = {
     slug: opt.slug,
     app: opt.app,
@@ -53,8 +55,9 @@ cmd.argv(process.argv, async (arg, opt) => {
     allowAppEnv: true
   };
   let slug = _devEnvironmentCli.DEFAULT_SLUG;
-  if (Object.keys(opt).length !== 0) {
-    slug = (0, _devEnvironmentCli.getEnvironmentName)(environmentNameOptions);
+  const hasConfiguration = Object.keys(opt).length !== 0 || Object.keys(configurationFileOptions).length > 0;
+  if (hasConfiguration) {
+    slug = await (0, _devEnvironmentCli.getEnvironmentName)(environmentNameOptions);
   }
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
   await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
@@ -65,7 +68,7 @@ cmd.argv(process.argv, async (arg, opt) => {
     env: opt.env
   };
   await (0, _tracker.trackEvent)('dev_env_create_command_execute', trackingInfo);
-  const startCommand = _chalk.default.bold((0, _devEnvironmentCli.getEnvironmentStartCommand)(slug));
+  const startCommand = _chalk.default.bold((0, _devEnvironmentCli.getEnvironmentStartCommand)(slug, configurationFileOptions));
   const environmentAlreadyExists = await (0, _devEnvironmentCore.doesEnvironmentExist)((0, _devEnvironmentCore.getEnvironmentPath)(slug));
   if (environmentAlreadyExists) {
     const messageToShow = `Environment already exists\n\n\nTo start the environment run:\n\n${startCommand}\n\n` + `To create another environment use ${_chalk.default.bold('--slug')} option with a unique name.\n`;
@@ -82,7 +85,15 @@ cmd.argv(process.argv, async (arg, opt) => {
     debug(`WARNING: ${message}`, error.message);
     console.log(_chalk.default.yellow('Warning:'), message);
   }
-  const instanceData = await (0, _devEnvironmentCli.promptForArguments)(opt, defaultOptions);
+  let preselectedOptions = opt;
+  let suppressPrompts = false;
+  if (Object.keys(configurationFileOptions).length > 0) {
+    console.log('\nUsing configuration from file.');
+    (0, _devEnvironmentConfigurationFile.printConfigurationFile)(configurationFileOptions);
+    preselectedOptions = (0, _devEnvironmentConfigurationFile.mergeConfigurationFileOptions)(opt, configurationFileOptions);
+    suppressPrompts = true;
+  }
+  const instanceData = await (0, _devEnvironmentCli.promptForArguments)(preselectedOptions, defaultOptions, suppressPrompts);
   instanceData.siteSlug = slug;
   try {
     await (0, _devEnvironmentCore.createEnvironment)(instanceData);

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

@@ -31,7 +31,7 @@ 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) => {
-  const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
+  const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
   await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);

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

@@ -37,7 +37,7 @@ const examples = [{
   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));
 }).examples(examples).argv(process.argv, async (unmatchedArgs, opt) => {
-  const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
+  const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
   await (0, _devEnvironmentCli.validateDependencies)(lando, slug, opt.quiet);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);

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

@@ -31,7 +31,7 @@ const examples = [{
   requiredArgs: 1
 }).examples(examples).option('slug', 'Custom name of the dev environment').argv(process.argv, async (unmatchedArgs, opt) => {
   const [filePath] = unmatchedArgs;
-  const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
+  const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_import_media_command_execute', trackingInfo);
   try {

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

@@ -37,7 +37,8 @@ const examples = [{
   requiredArgs: 1
 }).option('slug', 'Custom name of the dev environment').option(['r', 'search-replace'], 'Perform Search and Replace on the specified SQL file').option('in-place', 'Search and Replace explicitly on the given input file').option('skip-validate', 'Do not perform file validation.').examples(examples).argv(process.argv, async (unmatchedArgs, opt) => {
   const [fileName] = unmatchedArgs;
-  const cmd = new _devEnvImportSql.DevEnvImportSQLCommand(fileName, opt);
+  const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
+  const cmd = new _devEnvImportSql.DevEnvImportSQLCommand(fileName, opt, slug);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(cmd.slug);
   try {
     await cmd.run();

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

@@ -30,7 +30,7 @@ const examples = [{
   description: 'Return information about a local dev environment named "my_site"'
 }];
 (0, _command.default)().option('slug', 'Custom name of the dev environment').option('all', 'Show Info for all local dev environments').option('extended', 'Show extended information about the dev environment').examples(examples).argv(process.argv, async (arg, opt) => {
-  const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
+  const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
   await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
   const trackingInfo = opt.all ? {

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

@@ -0,0 +1,55 @@
+#!/usr/bin/env node
+// @format
+/**
+ * External dependencies
+ */
+"use strict";
+
+var _debug = _interopRequireDefault(require("debug"));
+var _tracker = require("../lib/tracker");
+var _command = _interopRequireDefault(require("../lib/cli/command"));
+var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
+var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
+var _devEnvironment = require("../lib/constants/dev-environment");
+var _devEnvironmentLando = require("../lib/dev-environment/dev-environment-lando");
+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} logs --slug=my_site`,
+  description: 'Return all logs from a local dev environment named "my_site"'
+}, {
+  usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} logs --slug=my_site --service=elasticsearch`,
+  description: 'Return logs from the "elasticsearch" service from a local dev environment named "my_site"'
+}, {
+  usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} logs --slug=my_site --service=elasticsearch -f`,
+  description: 'Follow logs from the "elasticsearch" service from a local dev environment named "my_site"'
+}];
+(0, _command.default)().option('slug', 'Custom name of the dev environment').option(['f', 'follow'], 'Follow logs for a specific service in local dev environment').option('service', 'Show logs for a specific service in local dev environment. Defaults to all if none passed in.').examples(examples).argv(process.argv, async (arg, opt) => {
+  const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
+  const lando = await (0, _devEnvironmentLando.bootstrapLando)();
+  await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
+  const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
+  await (0, _tracker.trackEvent)('dev_env_logs_command_execute', trackingInfo);
+  debug('Args: ', arg, 'Options: ', opt);
+  if (!opt.follow) {
+    opt.follow = false;
+  }
+  if (!opt.service) {
+    opt.service = false;
+  }
+  const options = {
+    follow: opt.follow,
+    service: opt.service,
+    timestamps: true
+  };
+  try {
+    await (0, _devEnvironmentCore.showLogs)(lando, slug, options);
+    await (0, _tracker.trackEvent)('dev_env_logs_command_success', trackingInfo);
+  } catch (error) {
+    await (0, _devEnvironmentCli.handleCLIException)(error, 'dev_env_logs_command_error', trackingInfo);
+    process.exitCode = 1;
+  }
+});

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

@@ -0,0 +1,83 @@
+#!/usr/bin/env node
+// @format
+/**
+ * External dependencies
+ */
+"use strict";
+
+var _debug = _interopRequireDefault(require("debug"));
+var _tracker = require("../lib/tracker");
+var _command = _interopRequireDefault(require("../lib/cli/command"));
+var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
+var _devEnvironment = require("../lib/constants/dev-environment");
+var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
+var _devEnvironmentLando = require("../lib/dev-environment/dev-environment-lando");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/**
+ * Internal dependencies
+ */
+const debug = (0, _debug.default)('@automattic/vip:bin:dev-environment');
+const userMap = {
+  devtools: 'www-data',
+  nginx: 'www-data',
+  php: 'www-data',
+  database: 'mysql',
+  memcached: 'memcache',
+  wordpress: 'www-data',
+  'vip-mu-plugins': 'www-data',
+  'demo-app-code': 'www-data',
+  elasticsearch: 'elasticsearch',
+  phpmyadmin: 'www-data',
+  mailhog: 'mailhog'
+};
+const examples = [{
+  usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} shell`,
+  description: 'Spawns a shell in the dev environment'
+}, {
+  usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} shell -r`,
+  description: 'Spawns a shell in the dev environment under root user'
+}, {
+  usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} shell -- ls -lha`,
+  description: 'Runs `ls -lha` command in the shell in the dev environment'
+}, {
+  usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} shell -S database -- ls -lha`,
+  description: 'Runs `ls -lha` command in the shell of the database service in the dev environment'
+}];
+function getCommand(args) {
+  const splitterIdx = process.argv.findIndex(argument => '--' === argument);
+  if (args.length > 0 && splitterIdx === -1) {
+    throw new Error('Please provide "--" argument to separate arguments for "vip" and command to be executed (see "--help" for examples)');
+  }
+  let cmd = [];
+  if (splitterIdx !== -1 && splitterIdx + 1 < process.argv.length) {
+    cmd = process.argv.slice(splitterIdx + 1);
+  }
+  return cmd;
+}
+(0, _command.default)({
+  wildcardCommand: true
+}).option('slug', 'Custom name of the dev environment').option('root', 'Spawn a root shell').option('service', 'Spawn a shell in a specific service (php if omitted)').examples(examples).argv(process.argv, async (args, opt) => {
+  const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
+  const lando = await (0, _devEnvironmentLando.bootstrapLando)();
+  await (0, _devEnvironmentCli.validateDependencies)(lando, '', true);
+  const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
+  await (0, _tracker.trackEvent)('dev_env_shell_command_execute', trackingInfo);
+  debug('Args: ', args, 'Options: ', opt);
+  const isRoot = !!opt.root;
+  const service = opt.service || 'php';
+  const user = isRoot ? 'root' : userMap[service] || 'www-data';
+  const cmd = getCommand(args);
+  try {
+    await (0, _devEnvironmentLando.landoShell)(lando, (0, _devEnvironmentCore.getEnvironmentPath)(slug), service, user, cmd);
+    await (0, _tracker.trackEvent)('dev_env_shell_command_success', trackingInfo);
+  } catch (error) {
+    // error.hide comes from Lando to  between normal errors and non-zero exit code from commands.
+    // We don't want to track the latter as errors.
+    if (!error.hide) {
+      await (0, _devEnvironmentCli.handleCLIException)(error, 'dev_env_shell_command_error', trackingInfo);
+      process.exitCode = 1;
+    } else {
+      await (0, _tracker.trackEvent)('dev_env_shell_command_success', trackingInfo);
+    }
+  }
+});

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

@@ -32,7 +32,7 @@ const examples = [{
   description: 'Starts a local dev environment'
 }];
 (0, _command.default)().option('slug', 'Custom name of the dev environment').option('skip-rebuild', 'Only start stopped services').option(['w', 'skip-wp-versions-check'], 'Skip prompting for wordpress update if non latest').examples(examples).argv(process.argv, async (arg, opt) => {
-  const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
+  const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
   await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
   const startProcessing = new Date();

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

@@ -28,7 +28,7 @@ const examples = [{
   description: 'Stops a local dev environment'
 }];
 (0, _command.default)().option('slug', 'Custom name of the dev environment').examples(examples).argv(process.argv, async (arg, opt) => {
-  const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
+  const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
   await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
   debug('Args: ', arg, 'Options: ', opt);

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

@@ -36,6 +36,7 @@ const appQuery = `
 		type
 		name
 		primaryDomain { name }
+		uniqueLabel
 	}
 `;
 (0, _command.default)({

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

@@ -18,6 +18,7 @@ var _devEnvironment = require("../lib/constants/dev-environment");
 var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
 var _devEnvironmentCore = require("../lib/dev-environment/dev-environment-core");
 var _devEnvironmentLando = require("../lib/dev-environment/dev-environment-lando");
+var _devEnvironmentConfigurationFile = require("../lib/dev-environment/dev-environment-configuration-file");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Internal dependencies
@@ -31,7 +32,7 @@ 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) => {
-  const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
+  const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
   await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
@@ -43,12 +44,22 @@ cmd.argv(process.argv, async (arg, opt) => {
     }
     const currentInstanceData = (0, _devEnvironmentCore.readEnvironmentData)(slug);
     debug('Read instance data', currentInstanceData);
-    const preselectedOptions = {
-      // Title and multisite can't be changed during update
+    const configurationFileOptions = await (0, _devEnvironmentConfigurationFile.getConfigurationFileOptions)();
+    let preselectedOptions = Object.assign({}, opt);
+    if (Object.keys(configurationFileOptions).length > 0) {
+      preselectedOptions = (0, _devEnvironmentConfigurationFile.mergeConfigurationFileOptions)(opt, configurationFileOptions);
+    }
+
+    // Title and multisite can't be changed during update
+    const selectedOptions = {
       title: currentInstanceData.wpTitle,
-      multisite: currentInstanceData.multisite,
-      ...opt
+      multisite: currentInstanceData.multisite
     };
+    Object.keys(preselectedOptions).forEach(key => {
+      if (!(key in selectedOptions)) {
+        selectedOptions[key] = preselectedOptions[key];
+      }
+    });
     const defaultOptions = {
       appCode: currentInstanceData.appCode.dir || currentInstanceData.appCode.tag || 'latest',
       muPlugins: currentInstanceData.muPlugins.dir || currentInstanceData.muPlugins.tag || 'latest',
@@ -66,7 +77,7 @@ cmd.argv(process.argv, async (arg, opt) => {
     const providedOptions = Object.keys(opt).filter(option => option.length > 1) // Filter out single letter aliases
     .filter(option => !['debug', 'help', 'slug'].includes(option)); // Filter out options that are not related to instance configuration
 
-    const suppressPrompts = providedOptions.length > 0;
+    const suppressPrompts = providedOptions.length > 0 || Object.keys(configurationFileOptions).length > 0;
     const instanceData = await (0, _devEnvironmentCli.promptForArguments)(preselectedOptions, defaultOptions, suppressPrompts);
     instanceData.siteSlug = slug;
     await (0, _devEnvironmentCore.updateEnvironment)(instanceData);

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

@@ -17,5 +17,5 @@
 var _command = _interopRequireDefault(require("../lib/cli/command"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 (0, _command.default)({
-  requiredArgs: 1
-}).command('create', 'Create a new local dev environment').command('update', 'Update an already created local dev environment').command('start', 'Start a local dev environment').command('stop', 'Stop a local dev environment').command('destroy', 'Remove containers, networks, volumes and configuration files of a local dev environment').command('info', 'Provides basic info about one or multiple local dev environments').command('list', 'Provides basic info about all local dev environments').command('exec', 'Execute an operation on a dev environment').command('import', 'Import data into a local WordPress environment').command('sync', 'Pull data from production to local development environment').argv(process.argv);
+  requiredArgs: 0
+}).command('create', 'Create a new local dev environment').command('update', 'Update an already created local dev environment').command('start', 'Start a local dev environment').command('stop', 'Stop a local dev environment').command('destroy', 'Remove containers, networks, volumes and configuration files of a local dev environment').command('info', 'Provides basic info about one or multiple local dev environments').command('list', 'Provides basic info about all local dev environments').command('exec', 'Execute a WP-CLI command in local dev environment').command('import', 'Import data into a local WordPress environment').command('shell', 'Spawns a shell in a dev environment').command('logs', 'View logs from a local WordPress environment').command('sync', 'Pull data from production to local development environment').argv(process.argv);

package/dist/commands/dev-env-import-sql.js

@@ -26,10 +26,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  */
 
 class DevEnvImportSQLCommand {
-  constructor(fileName, options) {
+  constructor(fileName, options, slug) {
     this.fileName = fileName;
     this.options = options;
-    this.slug = (0, _devEnvironmentCli.getEnvironmentName)(options);
+    this.slug = slug;
   }
   async run(silent = false) {
     const lando = await (0, _devEnvironmentLando.bootstrapLando)();

package/dist/commands/dev-env-sync-sql.js

@@ -16,6 +16,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.DevEnvSyncSQLCommand = void 0;
 var _fs = _interopRequireDefault(require("fs"));
 var _chalk = _interopRequireDefault(require("chalk"));
+var _url = _interopRequireDefault(require("url"));
 var _vipSearchReplace = require("@automattic/vip-search-replace");
 var _clientFileUploader = require("../lib/client-file-uploader");
 var _exportSql = require("./export-sql");
@@ -39,8 +40,8 @@ function findSiteHomeUrl(sql) {
   const regex = "'(siteurl|home)',\\s?'(.*?)'";
   const results = sql.match(regex);
   if (results) {
-    const domain = results[2].replace(/https?:\/\//, '');
-    return domain;
+    const url = results[2];
+    return _url.default.parse(url).hostname;
   }
   return null;
 }
@@ -55,15 +56,15 @@ function findSiteHomeUrl(sql) {
 async function extractSiteUrls(sqlFile) {
   const readInterface = await (0, _lineByLine.getReadInterface)(sqlFile);
   return new Promise((resolve, reject) => {
-    const domains = [];
+    const domains = new Set();
     readInterface.on('line', line => {
       const domain = findSiteHomeUrl(line);
       if (domain) {
-        domains.push(domain);
+        domains.add('//' + domain);
       }
     });
     readInterface.on('close', () => {
-      resolve(domains);
+      resolve(Array.from(domains));
     });
     readInterface.on('error', reject);
   });
@@ -83,7 +84,7 @@ class DevEnvSyncSQLCommand {
     this.tmpDir = (0, _utils.makeTempDir)();
   }
   get landoDomain() {
-    return `${this.slug}.vipdev.lndo.site`;
+    return `//${this.slug}.vipdev.lndo.site`;
   }
   get sqlFile() {
     return `${this.tmpDir}/sql-export.sql`;
@@ -133,11 +134,10 @@ class DevEnvSyncSQLCommand {
    */
   async runImport() {
     const importOptions = {
-      slug: this.slug,
       inPlace: true,
       skipValidate: true
     };
-    const importCommand = new _devEnvImportSql.DevEnvImportSQLCommand(this.sqlFile, importOptions);
+    const importCommand = new _devEnvImportSql.DevEnvImportSQLCommand(this.sqlFile, importOptions, this.slug);
     await importCommand.run(true);
   }
 

package/dist/commands/export-sql.js

@@ -195,7 +195,6 @@ class ExportSQLCommand {
     DOWNLOAD_LINK: 'downloadLink',
     DOWNLOAD: 'download'
   };
-
   /**
    * Creates an instance of SQLExportCommand
    *
@@ -232,6 +231,7 @@ class ExportSQLCommand {
       latestBackup,
       jobs
     } = await fetchLatestBackupAndJobStatus(this.app.id, this.env.id);
+    this.runningJobs = jobs;
 
     // Find the job that generates the export for the latest backup
     return jobs.find(job => {
@@ -316,24 +316,26 @@ class ExportSQLCommand {
   async run() {
     console.log(`Fetching the latest backup for ${this.app.name}`);
     const {
-      latestBackup
+      latestBackup,
+      jobs
     } = await fetchLatestBackupAndJobStatus(this.app.id, this.env.id);
+    this.runningJobs = jobs;
     if (!latestBackup) {
       exit.withError(`No backup found for site ${this.app.name}`);
     } else {
       console.log(`${(0, _format.getGlyphForStatus)('success')} Latest backup found with timestamp ${latestBackup.createdAt}`);
     }
-
-    // See if there is an existing export job for the latest backup
-    if (!(await this.getExportJob())) {
+    if (await this.getExportJob()) {
+      console.log(`Attaching to an existing export for the backup with timestamp ${latestBackup.createdAt}`);
+    } else if (this.runningJobs.length > 0) {
+      exit.withError('There is an export job already running for this site: ' + `https://dashboard.wpvip.com/apps/${this.app.id}/${this.env.uniqueLabel}/data/database/backups\n` + 'Currently, we allow only one export job per site. Please try again later.');
+    } else {
       console.log(`Creating a new export for the backup with timestamp ${latestBackup.createdAt}`);
       try {
         await createExportJob(this.app.id, this.env.id, latestBackup.id);
       } catch (err) {
         exit.withError(`Error creating export job: ${err === null || err === void 0 ? void 0 : err.message}`);
       }
-    } else {
-      console.log(`Attaching to an existing export for the backup with timestamp ${latestBackup.createdAt}`);
     }
     this.progressTracker.stepRunning(this.steps.PREPARE);
     this.progressTracker.startPrinting();