@automattic/vip 3.4.0 → 3.4.2

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

@@ -39,6 +39,8 @@ services:
       command: nginx -g "daemon off;"
       environment:
         LANDO_NEEDS_EXEC: 1
+        LANDO_WEBROOT_USER: nginx
+        LANDO_WEBROOT_GROUP: nginx
       volumes:
         - ./nginx/extra.conf:/etc/nginx/conf.extra/extra.conf
 <% wpVolumes() %>

package/dist/bin/vip-app-deploy-validate.js

@@ -20,6 +20,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
  * Internal dependencies
  */
 const debug = (0, _debug.default)('@automattic/vip:bin:vip-app-deploy-validate');
+const baseUsage = 'vip app deploy validate';
 async function appDeployValidateCmd(arg = [], opts = {}) {
   const app = opts.app;
   const env = opts.env;
@@ -37,14 +38,15 @@ async function appDeployValidateCmd(arg = [], opts = {}) {
   } else {
     await (0, _customDeploy2.validateTarFile)(fileName);
   }
-  console.log(_chalk.default.green('✓ Compressed file has been successfully validated with no errors!'));
+  console.log(_chalk.default.green('✓ Compressed file has been successfully validated with no errors.'));
 }
 
 // Command examples for the `vip app deploy validate` help prompt
 const examples = [{
-  usage: 'vip app @mysite.develop deploy validate <file.zip|file.tar.gz>',
-  description: 'Validate the compressed file to see if it can be deployed to your site'
+  usage: 'vip app deploy validate file.tar.gz',
+  description: 'Validate the directory structure of the local archived file named "file.tar.gz".'
 }];
 void (0, _command.default)({
-  requiredArgs: 1
-}).examples(examples).option('app', 'The application name or ID').option('env', 'The environment name or ID').argv(process.argv, appDeployValidateCmd);
+  requiredArgs: 1,
+  usage: baseUsage
+}).examples(examples).argv(process.argv, appDeployValidateCmd);

package/dist/bin/vip-app-deploy.js

@@ -35,6 +35,7 @@ const START_DEPLOY_MUTATION = (0, _graphqlTag.default)`
 	}
 `;
 const debug = (0, _debug.default)('@automattic/vip:bin:vip-app-deploy');
+const baseUsage = 'vip app deploy';
 const DEPLOY_PREFLIGHT_PROGRESS_STEPS = [{
   id: 'upload',
   name: 'Uploading file'
@@ -221,15 +222,16 @@ Processing the file for deployment to your environment...
 const examples = [
 // `app` subcommand
 {
-  usage: 'vip app @mysite.develop deploy file.zip',
-  description: 'Deploy the given compressed file to your site'
+  usage: 'WPVIP_DEPLOY_TOKEN=1234 vip @example-app.develop app deploy file.zip',
+  description: 'Deploy a local archived file named "file.zip" that contains application code to a VIP Platform environment that has Custom Deployment enabled.'
 }, {
-  usage: 'vip app @mysite.develop deploy file.zip --message "This is a deploy message"',
-  description: 'Deploy the given compressed file to your site'
+  usage: 'WPVIP_DEPLOY_TOKEN=1234 vip @example-app.develop app deploy file.tgz --message="A description for this deploy"',
+  description: 'Add a descriptive message for the Custom Deployment of the archived file named "file.tgz".'
 }, {
-  usage: 'vip app @mysite.develop deploy file.zip --skip-confirmation',
-  description: 'Deploy the given compressed file to your site without prompting'
+  usage: 'WPVIP_DEPLOY_TOKEN=1234 vip @example-app.develop app deploy file.tar.gz --skip-confirmation',
+  description: 'Skip the confirmation prompt for the Custom Deployment of the archived file named "file.tar.gz" to the environment.'
 }];
 void (0, _command.default)({
-  requiredArgs: 1
-}).command('validate', 'Validate a file before deploying in Custom Deployments').examples(examples).option('message', 'Custom message for deploy').option('skip-confirmation', 'Skip confirmation prompt').option('force', 'Skip confirmation prompt (deprecated)').option('app', 'The application name or ID').option('env', 'The environment name or ID').argv(process.argv, appDeployCmd);
+  requiredArgs: 1,
+  usage: baseUsage
+}).command('validate', 'Validate the directory structure of an archived file.').examples(examples).option('message', 'Add a description of a deployment.').option('skip-confirmation', 'Skip the confirmation prompt.').option('force', 'Skip confirmation prompt (deprecated)').option('app', 'Target an application. Accepts a string value for the application name or an integer for the application ID.').option('env', 'Target an environment. Accepts a string value for the environment type.').argv(process.argv, appDeployCmd);

package/dist/bin/vip-app-list.js

@@ -6,27 +6,32 @@ var _api = _interopRequireDefault(require("../lib/api"));
 var _command = _interopRequireDefault(require("../lib/cli/command"));
 var _tracker = require("../lib/tracker");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const baseUsage = 'vip app list';
 (0, _command.default)({
-  format: true
-}).argv(process.argv, async () => {
+  format: true,
+  usage: baseUsage
+}).examples([{
+  usage: baseUsage + '\n' + '    - ┌──────┬─────────────────┬─────────────────────────────────┐\n' + '    - │ id   │ name            │ repo                            │\n' + '    - ┌──────┬─────────────────┬─────────────────────────────────┐\n' + '    - │ 8886 │ example-app     │ wpcomvip/my-org-example-app     │\n' + '    - ┌──────┬─────────────────┬─────────────────────────────────┐\n' + '    - │ 4325 │ mytestmultisite │ wpcomvip/my-org-mytestmultisite │\n' + '    - └──────┴─────────────────┴─────────────────────────────────┘\n',
+  description: 'Retrieve a list of applications that can be accessed by the current authenticated VIP-CLI user.'
+}]).argv(process.argv, async () => {
   const api = (0, _api.default)();
   await (0, _tracker.trackEvent)('app_list_command_execute');
   let response;
   try {
     response = await api.query({
       query: (0, _graphqlTag.default)`
-				query Apps($first: Int, $after: String) {
-					apps(first: $first, after: $after) {
-						total
-						nextCursor
-						edges {
-							id
-							name
-							repo
+					query Apps($first: Int, $after: String) {
+						apps(first: $first, after: $after) {
+							total
+							nextCursor
+							edges {
+								id
+								name
+								repo
+							}
 						}
 					}
-				}
-			`,
+				`,
       variables: {
         first: 100,
         after: null // TODO make dynamic

package/dist/bin/vip-app.js

@@ -11,7 +11,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 (0, _command.default)({
   requiredArgs: 1,
   format: true
-}).example('vip app <app>', 'Pass an app name or ID to get details about that app').example('vip app 123', 'Get details about the app with ID 123').example('vip app vip-test', 'Get details about the app named vip-test').example('vip app @mysite.develop deploy <file.zip>', 'Deploy the given compressed file to your site').command('list', 'List your VIP applications').command('deploy', 'Deploy to your app from a file').argv(process.argv, async arg => {
+}).example('vip app list', 'Retrieve a list of applications that can be accessed by the current authenticated VIP-CLI user.').example('vip app example-app', 'Retrieve information about the application named "example-app" and its environments.').example('WPVIP_DEPLOY_TOKEN=1234 vip @example-app.develop app deploy file.zip', 'Deploy a local archived file named "file.zip" that contains application code to a VIP Platform environment that has Custom Deployment enabled.').command('list', 'Retrieve a list of applications that can be accessed by the current authenticated VIP-CLI user.').command('deploy', 'Deploy an archived file of application code to an environment that has Custom Deployment enabled.').argv(process.argv, async arg => {
   await (0, _tracker.trackEvent)('app_command_execute');
   let res;
   try {

package/dist/bin/vip-cache-purge-url.js

@@ -11,12 +11,14 @@ var _tracker = require("../lib/tracker");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const usage = 'vip cache purge-url';
+const exampleUsage = 'vip @example-app.develop cache purge-url';
 const examples = [{
-  usage: 'vip cache purge-url <URL>',
-  description: 'Purge a URL from page cache'
+  usage: `${exampleUsage} https://example-app-develop.go-vip.co/sample-page/` + '\n    - Purged URL: https://example-app.develop.go-vip.co/sample-page/',
+  description: 'Purge the page cache for a single URL.'
 }, {
-  usage: 'vip cache purge-url --from-file=/dev/vip/urls.txt',
-  description: 'Purge multiple URLs from page cache'
+  usage: `${exampleUsage} --from-file=./urls.txt`,
+  description: 'Purge the page cache for multiple URLs, each listed on a single line in a local file.'
 }];
 async function cachePurgeCommand(urls = [], opt = {}) {
   const trackingParams = {
@@ -59,5 +61,5 @@ async function cachePurgeCommand(urls = [], opt = {}) {
   appQuery: _cachePurge.appQuery,
   envContext: true,
   wildcardCommand: true,
-  usage: 'vip cache purge-url <URL>'
-}).option('from-file', 'Read URLs from file (useful to purge multiple URLs)').examples(examples).argv(process.argv, cachePurgeCommand);
+  usage
+}).option('from-file', 'Read one or more URLs from a file, each listed on a single line.').examples(examples).argv(process.argv, cachePurgeCommand);

package/dist/bin/vip-cache.js

@@ -3,6 +3,16 @@
 
 var _command = _interopRequireDefault(require("../lib/cli/command"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const usage = 'vip cache';
+const exampleUsage = 'vip @example-app.develop cache';
+const examples = [{
+  usage: `${exampleUsage} purge-url https://example-app-develop.go-vip.co/sample-page/` + '\n    - Purged URL: https://example-app.develop.go-vip.co/sample-page/',
+  description: 'Purge the page cache for a single URL.'
+}, {
+  usage: `${exampleUsage} purge-url --from-file=./urls.txt`,
+  description: 'Purge the page cache for multiple URLs, each listed on a single line in a local file.'
+}];
 (0, _command.default)({
-  requiredArgs: 1
-}).command('purge-url', 'Purge page cache').argv(process.argv);
+  requiredArgs: 1,
+  usage
+}).command('purge-url', 'Purge page cache for one or more URLs.').examples(examples).argv(process.argv);

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

@@ -46,7 +46,7 @@ async function deleteEnvVarCommand(arg, opt) {
       await (0, _tracker.trackEvent)('envvar_delete_user_cancelled_input', trackingParams);
       (0, _input.cancel)();
     });
-    if (!(await (0, _input.confirm)(`Are you sure? ${_chalk.default.bold.red('Deletion is permanent')} (y/N)`))) {
+    if (!(await (0, _input.confirm)(`Are you sure? ${_chalk.default.bold.red('Deletion is permanent')}`))) {
       await (0, _tracker.trackEvent)('envvar_delete_user_cancelled_confirmation', trackingParams);
       (0, _input.cancel)();
     }

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

@@ -65,7 +65,7 @@ async function setEnvVarCommand(arg, opt) {
       console.log('===== Received value printed above =====');
       console.log();
     }
-    if (!(await (0, _input.confirm)(`Please ${_chalk.default.bold('confirm')} the input value above (y/N)`))) {
+    if (!(await (0, _input.confirm)(`Please ${_chalk.default.bold('confirm')} the input value above`))) {
       await (0, _tracker.trackEvent)('envvar_set_user_cancelled_confirmation', trackingParams);
       (0, _input.cancel)();
     }

package/dist/bin/vip.js

@@ -22,7 +22,7 @@ const tokenURL = 'https://dashboard.wpvip.com/me/cli/token';
 const customDeployToken = process.env.WPVIP_DEPLOY_TOKEN;
 const runCmd = async function () {
   const cmd = (0, _command.default)();
-  cmd.command('logout', 'Log out the current authenticated VIP-CLI user.').command('app', 'List and modify your VIP applications').command('backup', 'Generate a backup of an environment.').command('cache', 'Manage page cache for your VIP applications').command('config', 'Manage environment configurations.').command('dev-env', 'Create and manage VIP Local Development Environments.').command('export', 'Export a copy of data associated with an environment.').command('import', 'Import media or SQL files into your VIP applications').command('logs', 'Get logs from your VIP applications').command('search-replace', 'Perform search and replace tasks on files').command('slowlogs', 'Retrieve MySQL slow query logs from an environment.').command('db', "Access an environment's database.").command('sync', 'Sync production to a development environment').command('whoami', 'Retrieve details about the current authenticated VIP-CLI user.').command('validate', 'Validate your VIP application and environment').command('wp', 'Run WP CLI commands against an environment');
+  cmd.command('logout', 'Log out the current authenticated VIP-CLI user.').command('app', 'Interact with applications that the current authenticated VIP-CLI user has permission to access.').command('backup', 'Generate a backup of an environment.').command('cache', 'Manage page cache for an environment.').command('config', 'Manage environment configurations.').command('dev-env', 'Create and manage VIP Local Development Environments.').command('export', 'Export a copy of data associated with an environment.').command('import', 'Import media or SQL files into your VIP applications').command('logs', 'Get logs from your VIP applications').command('search-replace', 'Perform search and replace tasks on files').command('slowlogs', 'Retrieve MySQL slow query logs from an environment.').command('db', "Access an environment's database.").command('sync', 'Sync production to a development environment').command('whoami', 'Retrieve details about the current authenticated VIP-CLI user.').command('validate', 'Validate your VIP application and environment').command('wp', 'Run WP CLI commands against an environment');
   cmd.argv(process.argv);
 };
 

package/dist/commands/export-sql.js

@@ -13,6 +13,7 @@ var _backupStorageAvailability = require("../lib/backup-storage-availability/bac
 var exit = _interopRequireWildcard(require("../lib/cli/exit"));
 var _format = require("../lib/cli/format");
 var _progress = require("../lib/cli/progress");
+var _retry = require("../lib/retry");
 var _utils = require("../lib/utils");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -83,7 +84,7 @@ const CREATE_EXPORT_JOB_MUTATION = exports.CREATE_EXPORT_JOB_MUTATION = (0, _gra
  * @param {number} envId Environment ID
  * @return {Promise} A promise which resolves to the latest backup and job status
  */
-async function fetchLatestBackupAndJobStatus(appId, envId) {
+async function fetchLatestBackupAndJobStatusBase(appId, envId) {
   const api = (0, _api.default)();
   const response = await api.query({
     query: BACKUP_AND_JOB_STATUS_QUERY,
@@ -107,6 +108,13 @@ async function fetchLatestBackupAndJobStatus(appId, envId) {
     jobs
   };
 }
+async function fetchLatestBackupAndJobStatus(appId, envId) {
+  return await (0, _retry.retry)({
+    retryOnlyIf: options => {
+      return (options.error.message || '').indexOf('Unexpected token < in JSON at position 0') !== -1;
+    }
+  }, () => fetchLatestBackupAndJobStatusBase(appId, envId));
+}
 
 /**
  * Generates a download link for a backup

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

@@ -512,7 +512,10 @@ async function promptForWordPress(defaultObject) {
 
   // image with selection
   const tagChoices = await getTagChoices();
-  let option = defaultObject?.tag ?? tagChoices[0].value;
+  if (typeof defaultObject === 'string' && !tagChoices.find(choice => choice.value === defaultObject)) {
+    throw new Error(`Unknown or unsupported WordPress version: ${defaultObject}.`);
+  }
+  let option = typeof defaultObject === 'string' ? defaultObject : defaultObject?.tag ?? tagChoices[0].value;
   if (isStdinTTY) {
     const message = `${messagePrefix}Which version would you like`;
     const selectTag = new _enquirer.Select({

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

@@ -577,7 +577,7 @@ async function maybeUpdateWordPressImage(lando, slug) {
     type: 'select',
     name: 'upgrade',
     message: 'Would you like to upgrade WordPress? ',
-    choices: ['no', 'yes', "no (don't ask anymore)"]
+    choices: ['yes', 'no', "no (don't ask anymore)"]
   });
 
   // If the user takes the new WP version path
@@ -585,7 +585,7 @@ async function maybeUpdateWordPressImage(lando, slug) {
     console.log('Upgrading from: ' + _chalk.default.yellow(currentWordPressTag) + ' to:');
 
     // Select a new image
-    const choice = await (0, _devEnvironmentCli.promptForWordPress)(null);
+    const choice = await (0, _devEnvironmentCli.promptForWordPress)(newestWordPressImage?.tag ?? null);
     const version = versions.find(({
       tag
     }) => tag.trim() === choice.tag.trim());

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

@@ -404,7 +404,8 @@ async function checkEnvHealth(lando, instancePath) {
   }
   if (urlsToScan.length) {
     scanResults = scanResults.concat(await app.scanUrls(urlsToScan, {
-      max: 1
+      max: 1,
+      waitCodes: [502, 504]
     }));
   }
   const result = {};

package/dist/lib/retry.js

@@ -0,0 +1,153 @@
+"use strict";
+
+exports.__esModule = true;
+exports.EXPONENTIAL_BACKOFF_STARTING_IN_50_MS = exports.EXPONENTIAL_BACKOFF_STARTING_IN_200_MS = exports.EXPONENTIAL_BACKOFF_STARTING_IN_100_MS = void 0;
+exports.exponentialBackoff = exponentialBackoff;
+exports.retry = retry;
+// copied over from our internal lib
+
+const EXPONENTIAL_BACKOFF_STARTING_IN_50_MS = exports.EXPONENTIAL_BACKOFF_STARTING_IN_50_MS = exponentialBackoff(50);
+const EXPONENTIAL_BACKOFF_STARTING_IN_100_MS = exports.EXPONENTIAL_BACKOFF_STARTING_IN_100_MS = exponentialBackoff(100);
+const EXPONENTIAL_BACKOFF_STARTING_IN_200_MS = exports.EXPONENTIAL_BACKOFF_STARTING_IN_200_MS = exponentialBackoff(200);
+const MAX_INTERVAL_BETWEEN_ATTEMPTS = 600000; // 10 minutes
+
+const NOOP = async () => {};
+const DEFAULT_OPTIONS = {
+  maxRetries: 4,
+  interval: EXPONENTIAL_BACKOFF_STARTING_IN_100_MS,
+  retryOnlyIf: () => Promise.resolve(true),
+  onRetry: NOOP,
+  onFailedAttempt: NOOP
+};
+/**
+ * We don't need a strict Error instance, which can help in cases (probably
+ * just tests) where code throws an object instead of an Error instance. We
+ * really just need to check for an object with a message property.
+ */
+function isErrorLike(value) {
+  return value instanceof Error || null !== value && 'object' === typeof value && 'message' in value;
+}
+
+/**
+ * Execute a <task> and retries <options.maxRetries> times while it fails.
+ * @param {Object} [options] - The options.
+ * @param {number} [options.maxRetries] - The max number of retry attempts to be executed.
+ * @param {function|number} [options.interval] - The time to wait between retries in milliseconds.
+ *   It can be either a number or a function.
+ *   Function arguments: retryAttemptNumber.
+ *   Expected return: a number representing the time in milliseconds.
+ * @param {function} [options.retryOnlyIf] - A function used to determine if a retry should be attempted.
+ *   Arguments: Object<{ error, attemptNumber }>.
+ *   Expected return: boolean|Promise<boolean>.
+ * @param {function} [options.onRetry] - A callback function executed right before a retry attempt.
+ *   Arguments: Object<{ retryNumber: attemptNumber }>.
+ *   Expected return: void|Promise<void>.
+ * @param {function} [options.onFailedAttempt] - A callback function executed right after a failed attempt.
+ *   Arguments: Object<{ error, attemptNumber, attemptDuration }>.
+ *   Expected return: void|Promise<void>.
+ * @param {function} task - The task to be executed.
+ * @return {any} - The value returned by the provided <task> function when it is successfully executed
+ */
+
+async function retry(optionsOrTask, task) {
+  let options = optionsOrTask;
+  if (arguments.length < 3 && typeof optionsOrTask === 'function') {
+    task = optionsOrTask;
+    options = {};
+  }
+  const finalOptions = {
+    ...DEFAULT_OPTIONS,
+    ...options
+  };
+  const {
+    maxRetries,
+    interval,
+    retryOnlyIf,
+    onRetry,
+    onFailedAttempt
+  } = finalOptions;
+  validateTask(task);
+  validateOptions(finalOptions);
+  const maxAttempts = maxRetries + 1;
+  for (let attemptNumber = 1; attemptNumber <= maxAttempts; attemptNumber++) {
+    /* eslint-disable no-await-in-loop */
+    const attemptStart = Date.now();
+    try {
+      return await task();
+    } catch (caughtError) {
+      const attemptEnd = Date.now();
+      const attemptDuration = attemptEnd - attemptStart;
+      const attemptStartTime = new Date(attemptStart);
+      const attemptEndTime = new Date(attemptEnd);
+      const error = isErrorLike(caughtError) ? caughtError : new Error(String(caughtError));
+      await onFailedAttempt({
+        error,
+        attemptNumber,
+        attemptDuration,
+        attemptStartTime,
+        attemptEndTime
+      });
+      const shouldRetry = await retryOnlyIf({
+        error,
+        attemptNumber
+      });
+      if (attemptNumber === maxAttempts || shouldRetry !== true) {
+        throw error;
+      }
+      await awaitInterval(interval, attemptNumber);
+      await onRetry({
+        retryNumber: attemptNumber
+      });
+    }
+  }
+  throw new Error('Error, wrong retry options set');
+}
+function isValidInterval(interval) {
+  if ('function' === typeof interval) {
+    return true;
+  }
+  return typeof interval === 'number' && Number.isInteger(interval) && interval >= 0 && interval <= MAX_INTERVAL_BETWEEN_ATTEMPTS;
+}
+async function awaitInterval(interval, attemptNumber) {
+  let newInterval;
+  if (typeof interval === 'function') {
+    newInterval = interval(attemptNumber);
+    if (!isValidInterval(newInterval)) {
+      throw new Error(`Invalid calculated interval for retry attempt ${attemptNumber}: "${newInterval}" (type: ${typeof newInterval})`);
+    }
+  } else {
+    newInterval = interval;
+  }
+  return new Promise(resolve => setTimeout(resolve, newInterval));
+}
+function validateTask(task) {
+  if (typeof task !== 'function') {
+    throw new Error('Invalid task: it should be a function');
+  }
+}
+function validateOptions({
+  maxRetries,
+  interval,
+  onFailedAttempt,
+  retryOnlyIf
+}) {
+  if (!Number.isInteger(maxRetries) || maxRetries < 0) {
+    throw new Error('Invalid option "maxRetries": it should be an integer number >= 0');
+  }
+  if (!isValidInterval(interval)) {
+    const definition = `an integer number between 0 and ${MAX_INTERVAL_BETWEEN_ATTEMPTS}`;
+    throw new Error(`Invalid option "interval": it should be either ${definition}, or a synchronous function which returns ${definition}`);
+  }
+  if (!isValidInterval(interval)) {
+    throw new Error('Invalid option "interval": it should be either an integer number >= 0, or a synchronous function which returns an integer number >= 0');
+  }
+  if (typeof onFailedAttempt !== 'function') {
+    throw new Error('Invalid option "onFailedAttempt": it should be a function');
+  }
+  if (typeof retryOnlyIf !== 'function') {
+    throw new Error('Invalid option "retryOnlyIf": it should be a function');
+  }
+}
+function exponentialBackoff(startMilliseconds) {
+  return retryAttemptNumber => Math.pow(2, retryAttemptNumber - 1) * startMilliseconds;
+}

package/dist/lib/validations/custom-deploy.js

@@ -15,9 +15,9 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const errorMessages = {
-  missingThemes: 'Missing `themes` directory from root folder!',
+  missingThemes: 'Missing `themes` directory from root folder.',
   symlink: 'Symlink detected: ',
-  singleRootDir: 'The compressed file must contain a single root directory!',
+  singleRootDir: 'The compressed file must contain a single root directory.',
   invalidExt: 'Invalid file extension. Please provide a .zip, .tar.gz, or a .tgz file.',
   invalidChars: (filename, invalidChars) => `Filename ${filename} contains disallowed characters: ${invalidChars}`
 };

package/dist/lib/validations/sql.js

@@ -271,9 +271,15 @@ const checks = {
     recommendation: ''
   },
   siteHomeUrlLando: {
-    matcher: "'(siteurl|home)',\\s?'(.*?)'",
+    matcher: "'(siteurl|home)',\\s?'([^']+)'",
     matchHandler: (lineNumber, results, expectedDomain) => {
-      const foundDomain = results[2].replace(/https?:\/\//, '');
+      let foundDomain = results[2];
+      if (!/^https?:\/\//i.test(foundDomain)) {
+        return {
+          falsePositive: true
+        };
+      }
+      foundDomain = foundDomain.replace(/^https?:\/\//, '');
       if (!foundDomain.trim()) {
         return {
           falsePositive: true

package/docs/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## Changelog
 
+### 3.4.1
+
+* Updating vip cache commands descriptions and examples to follow the VIP-CLI style guide
+* Dev-env: Upgrade WordPress upgrade prompt to "yes" and pre-select latest version not trunk
+* build(deps-dev): bump @types/node from 18.19.36 to 18.19.37
+* fix(dev-env): retry healthcheck only on 502 and 504 status codes
+* fix(dev-env): set the user/group for `nginx` container to `nginx:nginx`
+
+**Full Changelog**: https://github.com/Automattic/vip-cli/compare/3.4.0...3.4.1
+
 ### 3.4.0
 
 * Updating command option descriptions to follow the VIP-CLI style guide

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@automattic/vip",
-  "version": "3.4.0",
+  "version": "3.4.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@automattic/vip",
-      "version": "3.4.0",
+      "version": "3.4.2",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -132,7 +132,7 @@
         "@types/single-line-log": "1.1.2",
         "@types/tar": "^6.1.13",
         "@types/update-notifier": "^6.0.8",
-        "@types/uuid": "^9.0.7",
+        "@types/uuid": "^10.0.0",
         "@types/xml2js": "^0.4.14",
         "dockerode": "^4.0.0",
         "eslint": "^8.35.0",
@@ -3884,9 +3884,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "18.19.36",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.36.tgz",
-      "integrity": "sha512-tX1BNmYSWEvViftB26VLNxT6mEr37M7+ldUtq7rlKnv4/2fKYsJIOmqJAjT6h1DNuwQjIKgw3VJ/Dtw3yiTIQw==",
+      "version": "18.19.39",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.39.tgz",
+      "integrity": "sha512-nPwTRDKUctxw3di5b4TfT3I0sWDiWoPQCZjXhvdkINntwr8lcoVCKsTgnXeRubKIlfnV+eN/HYk6Jb40tbcEAQ==",
       "dependencies": {
         "undici-types": "~5.26.4"
       }
@@ -3992,9 +3992,9 @@
       }
     },
     "node_modules/@types/uuid": {
-      "version": "9.0.8",
-      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.8.tgz",
-      "integrity": "sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-10.0.0.tgz",
+      "integrity": "sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==",
       "dev": true
     },
     "node_modules/@types/xml2js": {
@@ -12643,9 +12643,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.4.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
-      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz",
+      "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -16306,9 +16306,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "18.19.36",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.36.tgz",
-      "integrity": "sha512-tX1BNmYSWEvViftB26VLNxT6mEr37M7+ldUtq7rlKnv4/2fKYsJIOmqJAjT6h1DNuwQjIKgw3VJ/Dtw3yiTIQw==",
+      "version": "18.19.39",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.39.tgz",
+      "integrity": "sha512-nPwTRDKUctxw3di5b4TfT3I0sWDiWoPQCZjXhvdkINntwr8lcoVCKsTgnXeRubKIlfnV+eN/HYk6Jb40tbcEAQ==",
       "requires": {
         "undici-types": "~5.26.4"
       }
@@ -16415,9 +16415,9 @@
       }
     },
     "@types/uuid": {
-      "version": "9.0.8",
-      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.8.tgz",
-      "integrity": "sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-10.0.0.tgz",
+      "integrity": "sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==",
       "dev": true
     },
     "@types/xml2js": {
@@ -22653,9 +22653,9 @@
       }
     },
     "typescript": {
-      "version": "5.4.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
-      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz",
+      "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==",
       "dev": true
     },
     "typical": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "3.4.0",
+  "version": "3.4.2",
   "description": "The VIP Javascript library & CLI",
   "main": "index.js",
   "bin": {
@@ -131,7 +131,7 @@
     "@types/single-line-log": "1.1.2",
     "@types/tar": "^6.1.13",
     "@types/update-notifier": "^6.0.8",
-    "@types/uuid": "^9.0.7",
+    "@types/uuid": "^10.0.0",
     "@types/xml2js": "^0.4.14",
     "dockerode": "^4.0.0",
     "eslint": "^8.35.0",