@automattic/vip 3.17.1 → 3.19.0

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

@@ -158,7 +158,7 @@ services:
   elasticsearch:
     type: compose
     services:
-      image: elasticsearch:8.18.1
+      image: elasticsearch:8.18.2
       command: /usr/local/bin/docker-entrypoint.sh
       environment:
         ELASTICSEARCH_IS_DEDICATED_NODE: 'no'

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

@@ -33,6 +33,7 @@ async function deleteEnvVarCommand(arg, opt) {
     command: `${baseUsage} ${name}`,
     env_id: opt.env.id,
     org_id: opt.app.organization.id,
+    org_sfid: opt.app.organization.salesforceId,
     skip_confirm: Boolean(opt.skipConfirmation),
     variable_name: name
   };

package/dist/bin/vip-config-envvar-get-all.js

@@ -39,7 +39,8 @@ async function getAllEnvVarsCommand(arg, opt) {
     command: usage,
     env_id: opt.env.id,
     format: opt.format,
-    org_id: opt.app.organization.id
+    org_id: opt.app.organization.id,
+    org_sfid: opt.app.organization.salesforceId
   };
   (0, _logging.debug)(`Request: Get all environment variables for ${(0, _logging.getEnvContext)(opt.app, opt.env)}`);
   await (0, _tracker.trackEvent)('envvar_get_all_command_execute', trackingParams);

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

@@ -31,6 +31,7 @@ async function getEnvVarCommand(arg, opt) {
     command: `${baseUsage} ${name}`,
     env_id: opt.env.id,
     org_id: opt.app.organization.id,
+    org_sfid: opt.app.organization.salesforceId,
     variable_name: name
   };
   (0, _logging.debug)(`Request: Get environment variable ${JSON.stringify(name)} for ${(0, _logging.getEnvContext)(opt.app, opt.env)}`);

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

@@ -30,7 +30,8 @@ async function listEnvVarsCommand(arg, opt) {
     command: usage,
     env_id: opt.env.id,
     format: opt.format,
-    org_id: opt.app.organization.id
+    org_id: opt.app.organization.id,
+    org_sfid: opt.app.organization.salesforceId
   };
   (0, _logging.debug)(`Request: list environment variables for ${(0, _logging.getEnvContext)(opt.app, opt.env)}`);
   await (0, _tracker.trackEvent)('envvar_list_command_execute', trackingParams);

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

@@ -33,6 +33,7 @@ async function setEnvVarCommand(arg, opt) {
     env_id: opt.env.id,
     from_file: Boolean(opt.fromFile),
     org_id: opt.app.organization.id,
+    org_sfid: opt.app.organization.salesforceId,
     skip_confirm: Boolean(opt.skipConfirmation),
     variable_name: name
   };

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

@@ -0,0 +1,55 @@
+#!/usr/bin/env node
+"use strict";
+
+var _chalk = _interopRequireDefault(require("chalk"));
+var _command = _interopRequireDefault(require("../lib/cli/command"));
+var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
+var _envVars = require("../lib/dev-environment/env-vars");
+var _logging = require("../lib/envvar/logging");
+var _tracker = require("../lib/tracker");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const exampleUsage = 'vip dev-env envvar delete';
+const usage = 'vip dev-env envvar delete -s vip-local';
+const examples = [{
+  usage: `${exampleUsage} MY_VARIABLE`,
+  description: 'Delete the environment variable "MY_VARIABLE" from the environment.'
+}];
+async function deleteEnvVarCommand(args, opt) {
+  (0, _logging.debug)('args: %o, opt: %o', args, opt);
+  const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
+  const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
+  const name = args[0]?.trim() ?? '';
+  const trackingPrefix = 'dev_env_envvar_delete_command_';
+  await (0, _tracker.trackEvent)(`${trackingPrefix}execute`, trackingInfo);
+  try {
+    let removed = false;
+    const data = await (0, _envVars.readEnvFile)(slug);
+    const envVars = [];
+    data.forEach(line => {
+      const [key] = line.split('=', 2).map(part => part.trim());
+      if (key !== name) {
+        envVars.push(line);
+      } else {
+        removed = true;
+      }
+    });
+    if (!removed) {
+      const message = `The environment variable "${name}" does not exist\n`;
+      process.stderr.write(_chalk.default.yellow(message));
+      process.exitCode = 1;
+    } else {
+      const updatedData = envVars.join('\n');
+      await (0, _envVars.updateEnvFile)(slug, updatedData);
+      process.stdout.write(_chalk.default.green(`The variable "${name}" has been successfully deleted.\n`));
+      process.stdout.write(_chalk.default.bgYellow(_chalk.default.bold('Important:')) + ' Please restart the environment for the changes to take effect.\n');
+    }
+    await (0, _tracker.trackEvent)(`${trackingPrefix}success`, trackingInfo);
+  } catch (error) {
+    await (0, _devEnvironmentCli.handleCLIException)(error, `${trackingPrefix}error`, trackingInfo);
+    process.exitCode = 1;
+  }
+}
+(0, _command.default)({
+  requiredArgs: 1,
+  usage
+}).option('slug', 'A unique name for a local environment. Default is "vip-local".', undefined, _devEnvironmentCli.processSlug).examples(examples).argv(process.argv, deleteEnvVarCommand);

package/dist/bin/vip-dev-env-envvar-get-all.js

@@ -0,0 +1,51 @@
+#!/usr/bin/env node
+"use strict";
+
+var _chalk = _interopRequireDefault(require("chalk"));
+var _command = _interopRequireDefault(require("../lib/cli/command"));
+var _format = require("../lib/cli/format");
+var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
+var _envVars = require("../lib/dev-environment/env-vars");
+var _logging = require("../lib/envvar/logging");
+var _tracker = require("../lib/tracker");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const exampleUsage = 'vip dev-env envvar get-all';
+const usage = 'vip dev-env envvar get-all -s vip-local';
+const examples = [{
+  usage: exampleUsage,
+  description: 'Retrieve a list of all environment variables in the default table format.'
+}, {
+  usage: `${exampleUsage} --format=csv`,
+  description: 'Retrieve a list of all environment variables in CSV format.'
+}];
+async function getAllEnvVarsCommand(args, opt) {
+  (0, _logging.debug)('args: %o, opt: %o', args, opt);
+  const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
+  const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
+  const format = opt.format ?? 'table';
+  const trackingPrefix = 'dev_env_envvar_get_all_command_';
+  await (0, _tracker.trackEvent)(`${trackingPrefix}execute`, trackingInfo);
+  try {
+    const data = await (0, _envVars.readEnvFile)(slug);
+    const envVars = data.map(line => {
+      const [key, value] = line.split('=', 2).map(part => part.trim());
+      return {
+        name: key,
+        value: (0, _envVars.parseEnvValue)(value)
+      };
+    });
+    if (envVars.length === 0) {
+      process.stderr.write(_chalk.default.yellow('There are no environment variables\n'));
+    } else {
+      process.stdout.write(`${(0, _format.formatData)(envVars, format)}\n`);
+    }
+    await (0, _tracker.trackEvent)(`${trackingPrefix}success`, trackingInfo);
+  } catch (error) {
+    await (0, _devEnvironmentCli.handleCLIException)(error, `${trackingPrefix}error`, trackingInfo);
+    process.exitCode = 1;
+  }
+}
+(0, _command.default)({
+  format: true,
+  usage
+}).option('slug', 'A unique name for a local environment. Default is "vip-local".', undefined, _devEnvironmentCli.processSlug).examples(examples).argv(process.argv, getAllEnvVarsCommand);

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

@@ -0,0 +1,43 @@
+#!/usr/bin/env node
+"use strict";
+
+var _chalk = _interopRequireDefault(require("chalk"));
+var _command = _interopRequireDefault(require("../lib/cli/command"));
+var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
+var _envVars = require("../lib/dev-environment/env-vars");
+var _logging = require("../lib/envvar/logging");
+var _tracker = require("../lib/tracker");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const exampleUsage = 'vip dev-env envvar get';
+const usage = 'vip dev-env envvar get -s vip-local';
+const examples = [{
+  usage: `${exampleUsage} MY_VARIABLE`,
+  description: 'Retrieve the value of the environment variable "MY_VARIABLE".'
+}];
+async function getEnvVarsCommand(args, opt) {
+  (0, _logging.debug)('args: %o, opt: %o', args, opt);
+  const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
+  const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
+  const name = args[0]?.trim() ?? '';
+  const trackingPrefix = 'dev_env_envvar_get_command_';
+  await (0, _tracker.trackEvent)(`${trackingPrefix}execute`, trackingInfo);
+  try {
+    const data = await (0, _envVars.readEnvFile)(slug);
+    const envVar = data.map(line => line.split('=', 2)).find(([key]) => name === key.trim());
+    if (undefined === envVar) {
+      process.stderr.write(_chalk.default.yellow(`The environment variable "${name}" does not exist\n`));
+      process.exitCode = 1;
+    } else {
+      const value = (0, _envVars.parseEnvValue)(envVar[1]);
+      process.stdout.write(`${value}\n`);
+    }
+    await (0, _tracker.trackEvent)(`${trackingPrefix}success`, trackingInfo);
+  } catch (error) {
+    await (0, _devEnvironmentCli.handleCLIException)(error, `${trackingPrefix}error`, trackingInfo);
+    process.exitCode = 1;
+  }
+}
+(0, _command.default)({
+  requiredArgs: 1,
+  usage
+}).option('slug', 'A unique name for a local environment. Default is "vip-local".', undefined, _devEnvironmentCli.processSlug).examples(examples).argv(process.argv, getEnvVarsCommand);

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

@@ -0,0 +1,46 @@
+#!/usr/bin/env node
+"use strict";
+
+var _chalk = _interopRequireDefault(require("chalk"));
+var _command = _interopRequireDefault(require("../lib/cli/command"));
+var _format = require("../lib/cli/format");
+var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
+var _envVars = require("../lib/dev-environment/env-vars");
+var _logging = require("../lib/envvar/logging");
+var _tracker = require("../lib/tracker");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const usage = 'vip dev-env envvar list';
+const examples = [{
+  usage: 'vip dev-env envvar list -s vip-local',
+  description: 'List the names of all environment variables.'
+}];
+async function listEnvVarsCommand(args, opt) {
+  (0, _logging.debug)('args: %o, opt: %o', args, opt);
+  const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
+  const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
+  const format = opt.format ?? 'table';
+  const trackingPrefix = 'dev_env_envvar_list_command_';
+  await (0, _tracker.trackEvent)(`${trackingPrefix}execute`, trackingInfo);
+  try {
+    const data = await (0, _envVars.readEnvFile)(slug);
+    const envVars = data.map(line => {
+      const [key] = line.split('=', 2);
+      return {
+        name: key.trim()
+      };
+    });
+    if (envVars.length === 0) {
+      process.stderr.write(_chalk.default.yellow('There are no environment variables\n'));
+    } else {
+      process.stdout.write(`${(0, _format.formatData)(envVars, format)}\n`);
+    }
+    await (0, _tracker.trackEvent)(`${trackingPrefix}success`, trackingInfo);
+  } catch (error) {
+    await (0, _devEnvironmentCli.handleCLIException)(error, `${trackingPrefix}error`, trackingInfo);
+    process.exitCode = 1;
+  }
+}
+(0, _command.default)({
+  format: true,
+  usage
+}).option('slug', 'A unique name for a local environment. Default is "vip-local".', undefined, _devEnvironmentCli.processSlug).examples(examples).argv(process.argv, listEnvVarsCommand);

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

@@ -0,0 +1,78 @@
+#!/usr/bin/env node
+"use strict";
+
+var _chalk = _interopRequireDefault(require("chalk"));
+var _command = _interopRequireDefault(require("../lib/cli/command"));
+var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
+var _envVars = require("../lib/dev-environment/env-vars");
+var _api = require("../lib/envvar/api");
+var _input = require("../lib/envvar/input");
+var _logging = require("../lib/envvar/logging");
+var _readFile = require("../lib/envvar/read-file");
+var _tracker = require("../lib/tracker");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const exampleUsage = 'vip dev-env envvar set';
+const usage = 'vip dev-env envvar set -s vip-local';
+const examples = [{
+  usage: `${exampleUsage} MY_VARIABLE`,
+  description: 'Add or update the environment variable "MY_VARIABLE" and assign its value at the prompt.'
+}, {
+  usage: `${exampleUsage} MY_VARIABLE MY_VALUE`,
+  description: 'Add or update the environment variable "MY_VARIABLE" and assign its value to "MY_VALUE".'
+}, {
+  usage: `${exampleUsage} MULTILINE_ENV_VAR --from-file=envvar-value.txt`,
+  description: 'Add or update the environment variable "MULTILINE_ENV_VAR" and assign the multiline contents of local file envvar-value.txt as its value.'
+}];
+async function deleteEnvVarCommand(args, opt) {
+  (0, _logging.debug)('args: %o, opt: %o', args, opt);
+  const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
+  const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
+  const name = args[0]?.trim() ?? '';
+  let newValue = args[1];
+  const trackingPrefix = 'dev_env_envvar_set_command_';
+  await (0, _tracker.trackEvent)(`${trackingPrefix}execute`, trackingInfo);
+  if (!(0, _api.validateNameWithMessage)(name)) {
+    await (0, _tracker.trackEvent)('dev_env_envvar_set_invalid_name', trackingInfo);
+    process.exit(1);
+  }
+  try {
+    const data = await (0, _envVars.readEnvFile)(slug);
+    if (newValue === undefined) {
+      if (opt.fromFile) {
+        newValue = await (0, _readFile.readVariableFromFile)(opt.fromFile);
+      } else {
+        process.stdout.write(`For multiline input, please use the ${_chalk.default.bold('--from-file')} option.\n\n`);
+        newValue = await (0, _input.promptForValue)(`Enter the value for ${name}:`).catch(async () => {
+          await (0, _tracker.trackEvent)('dev_env_envvar_set_user_cancelled_input', trackingInfo);
+          (0, _input.cancel)();
+        });
+      }
+    }
+    newValue = (0, _envVars.quoteEnvValue)(newValue);
+    let replaced = false;
+    const envVars = data.map(line => {
+      const [key] = line.split('=', 2).map(part => part.trim());
+      if (key === name) {
+        replaced = true;
+        return `${key}=${newValue}`;
+      }
+      return line;
+    });
+    if (!replaced) {
+      envVars.push(`${name}=${newValue}`);
+    }
+    const updatedData = envVars.join('\n');
+    await (0, _envVars.updateEnvFile)(slug, updatedData);
+    process.stdout.write(_chalk.default.green(`The variable "${name}" has been successfully updated.\n`));
+    process.stdout.write(_chalk.default.bgYellow(_chalk.default.bold('Important:')) + ' Please restart the environment for the changes to take effect.\n');
+    await (0, _tracker.trackEvent)(`${trackingPrefix}success`, trackingInfo);
+  } catch (error) {
+    await (0, _devEnvironmentCli.handleCLIException)(error, `${trackingPrefix}error`, trackingInfo);
+    process.exitCode = 1;
+  }
+}
+(0, _command.default)({
+  requiredArgs: 1,
+  wildcardCommand: true,
+  usage
+}).option('slug', 'A unique name for a local environment. Default is "vip-local".', undefined, _devEnvironmentCli.processSlug).option('from-file', 'Read environment variable value from a UTF-8-encoded text file (useful for multiline input). Accepts a relative or absolute path.').examples(examples).argv(process.argv, deleteEnvVarCommand);

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

@@ -0,0 +1,27 @@
+#!/usr/bin/env node
+"use strict";
+
+var _command = _interopRequireDefault(require("../lib/cli/command"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const usage = 'vip dev-env envvar';
+const exampleUsage = 'vip dev-env envvar --slug vip-local';
+const examples = [{
+  usage: `${exampleUsage} set MY_VARIABLE`,
+  description: 'Add or update the environment variable "MY_VARIABLE" and assign its value at the prompt.'
+}, {
+  usage: `${exampleUsage} get MY_VARIABLE`,
+  description: 'Retrieve the value of the environment variable "MY_VARIABLE".'
+}, {
+  usage: `${exampleUsage} get-all`,
+  description: 'Retrieve a list of all environment variables in the default table format.'
+}, {
+  usage: `${exampleUsage} list`,
+  description: 'List the names of all environment variables.'
+}, {
+  usage: `${exampleUsage} delete MY_VARIABLE`,
+  description: 'Delete the environment variable "MY_VARIABLE" from the environment.'
+}];
+(0, _command.default)({
+  requiredArgs: 0,
+  usage
+}).command('delete', 'Delete an environment variable.').command('get', 'Retrieve the value of an environment variable.').command('get-all', 'Retrieve the names and values of all environment variables.').command('list', 'List the names of all environment variables.').command('set', 'Add or update an environment variable.').examples(examples).argv(process.argv);

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

@@ -9,4 +9,4 @@ if (process.getuid?.() === 0) {
 }
 (0, _command.default)({
   requiredArgs: 0
-}).command('create', 'Create a new local environment.').command('update', 'Update the settings of a local environment.').command('start', 'Start a local environment.').command('stop', 'Stop a local environment.').command('destroy', 'Remove a local environment.').command('info', 'Retrieve information about a local environment.').command('list', 'Retrieve information about all local environments.').command('exec', 'Run a WP-CLI command against a local environment.').command('import', 'Import media or database files to a local environment.').command('shell', 'Create a shell and run commands against a local environment.').command('logs', 'Retrieve logs for a local environment.').command('sync', 'Sync the database of a VIP Platform environment to a local environment.').command('purge', 'Remove all local environments.').argv(process.argv);
+}).command('create', 'Create a new local environment.').command('update', 'Update the settings of a local environment.').command('start', 'Start a local environment.').command('stop', 'Stop a local environment.').command('destroy', 'Remove a local environment.').command('info', 'Retrieve information about a local environment.').command('list', 'Retrieve information about all local environments.').command('exec', 'Run a WP-CLI command against a local environment.').command('import', 'Import media or database files to a local environment.').command('shell', 'Create a shell and run commands against a local environment.').command('logs', 'Retrieve logs for a local environment.').command('sync', 'Sync the database of a VIP Platform environment to a local environment.').command('purge', 'Remove all local environments.').command('envvar', 'Manage environment variables for a local environment.').argv(process.argv);

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

@@ -67,7 +67,7 @@ function isSupportedUrl(urlToTest) {
   let url;
   try {
     url = new URL(urlToTest);
-  } catch (err) {
+  } catch {
     return false;
   }
   return url.protocol === 'http:' || url.protocol === 'https:';

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

@@ -108,29 +108,14 @@ function isValidMd5(md5) {
  * @param {string} fileNameOrURL
  * @param {boolean} isUrl
  * @param {string|null} md5
- * @param searchReplace
  */
 // eslint-disable-next-line complexity
-async function gates(app, env, fileNameOrURL, isUrl = false, md5 = null, searchReplace = []) {
+async function gates(app, env, fileNameOrURL, isUrl = false, md5 = null) {
   const {
     id: envId,
     appId
   } = env;
   const track = _tracker.trackEventWithEnv.bind(null, appId, envId);
-  if (isUrl) {
-    if (!md5) {
-      await track('import_sql_command_error', {
-        error_type: 'missing-md5'
-      });
-      exit.withError('MD5 hash is required when importing from a URL. Please provide the --md5 parameter with a valid MD5 hash of the remote file.');
-    }
-    if (searchReplace.length > 0) {
-      await track('import_sql_command_error', {
-        error_type: 'search-replace-with-url'
-      });
-      exit.withError('Search and replace operations are not supported when importing from a URL. Please remove the --search-replace option.');
-    }
-  }
   if (md5 && !isValidMd5(md5)) {
     await track('import_sql_command_error', {
       error_type: 'invalid-md5'
@@ -162,7 +147,7 @@ async function gates(app, env, fileNameOrURL, isUrl = false, md5 = null, searchR
     }
     try {
       await (0, _clientFileUploader.checkFileAccess)(fileName);
-    } catch (err) {
+    } catch {
       await track('import_sql_command_error', {
         error_type: 'sqlfile-unreadable'
       });
@@ -238,7 +223,7 @@ const examples = [
 },
 // URL import
 {
-  usage: 'vip @example-app.develop import sql https://example.org/file.sql --md5 b5b39269e9105d6e1e9cd50ff54e6282',
+  usage: 'vip @example-app.develop import sql https://example.org/file.sql',
   description: 'Import a remote SQL database backup file from the URL with MD5 hash verification to the develop environment of the "example-app" application.'
 },
 // `search-replace` flag
@@ -389,7 +374,7 @@ void (0, _command.default)({
   requiredArgs: 1,
   module: 'import-sql',
   usage
-}).command('status', 'Check the status of a SQL database import currently in progress.').option('skip-validate', 'Do not perform file validation prior to import. If the file contains unsupported entries, the import is likely to fail.').option('search-replace', 'Search for a string in the SQL file and replace it with a new string. Separate the values by a comma only; no spaces (e.g. --search-replace="from,to").').option('in-place', 'Overwrite the local input file with the results of the search and replace operation prior to import.').option('output', 'The local file path to save a copy of the results from the search and replace operation when the --search-replace option is passed. Ignored when used with the --in-place option.').option('skip-maintenance-mode', 'Imports data without putting the environment in maintenance mode. Available only for unlaunched environments. Caution: This may cause site instability during import.').option('md5', 'MD5 hash of the remote SQL file for verification. Required when importing from a URL.').examples(examples)
+}).command('status', 'Check the status of a SQL database import currently in progress.').option('skip-validate', 'Do not perform file validation prior to import. If the file contains unsupported entries, the import is likely to fail.').option('search-replace', 'Search for a string in the SQL file and replace it with a new string. Separate the values by a comma only; no spaces (e.g. --search-replace="from,to").').option('in-place', 'Overwrite the local input file with the results of the search and replace operation prior to import.').option('output', 'The local file path to save a copy of the results from the search and replace operation when the --search-replace option is passed. Ignored when used with the --in-place option.').option('skip-maintenance-mode', 'Imports data without putting the environment in maintenance mode. Available only for unlaunched environments. Caution: This may cause site instability during import.').option('md5', 'MD5 hash of the remote SQL file for verification. If not provided, the verification will not be performed.').examples(examples)
 // eslint-disable-next-line complexity
 .argv(process.argv, async (arg, opts) => {
   const {
@@ -425,7 +410,7 @@ void (0, _command.default)({
   });
 
   // halt operation of the import based on some rules
-  await gates(app, env, fileNameOrURL, isUrl, md5, searchReplace);
+  await gates(app, env, fileNameOrURL, isUrl, md5);
 
   // Log summary of import details
   const domain = env?.primaryDomain?.name ? env.primaryDomain.name : `#${env.id}`;

package/dist/bin/vip-logs.js

@@ -121,6 +121,7 @@ function getBaseTrackingParams(opt) {
   return {
     command: 'vip logs',
     org_id: opt.app.organization.id,
+    org_sfid: opt.app.organization.salesforceId,
     app_id: opt.app.id,
     env_id: opt.env.id,
     type: opt.type,

package/dist/bin/vip-slowlogs.js

@@ -113,6 +113,7 @@ function getBaseTrackingParams(opt) {
   return {
     command: 'vip slowlogs',
     org_id: opt.app.organization.id,
+    org_sfid: opt.app.organization.salesforceId,
     app_id: opt.app.id,
     env_id: opt.env.id,
     limit: opt.limit,

package/dist/bin/vip.js

@@ -21,7 +21,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', '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 database files to an environment.').command('logs', 'Retrieve Runtime Logs from an environment.').command('search-replace', 'Search for a string in a local SQL file and replace it with a new string.').command('slowlogs', 'Retrieve MySQL slow query logs from an environment.').command('db', "Access an environment's database.").command('sync', 'Sync the database from production to a non-production environment.').command('whoami', 'Retrieve details about the current authenticated VIP-CLI user.').command('validate', 'Scan a Node.js codebase for issues that could prevent building or deploying.').command('wp', 'Execute a WP-CLI command 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 database files to an environment.').command('logs', 'Retrieve Runtime Logs from an environment.').command('search-replace', 'Search for a string in a local SQL file and replace it with a new string.').command('slowlogs', 'Retrieve MySQL slow query logs from an environment.').command('db', "Access an environment's database.").command('sync', 'Sync the database from production to a non-production environment.').command('whoami', 'Retrieve details about the current authenticated VIP-CLI user.').command('wp', 'Execute a WP-CLI command against an environment.');
   cmd.argv(process.argv);
 };
 

package/dist/commands/backup-db.js

@@ -80,8 +80,6 @@ async function createBackupJob(appId, envId) {
 
 // Library for a possible command in the future: vip backup db @app.env
 class BackupDBCommand {
-  app;
-  env;
   job;
   jobStatus;
   jobAge;
@@ -91,11 +89,11 @@ class BackupDBCommand {
     PREPARE: 'prepare',
     GENERATE: 'generate'
   };
-  track;
   progressTracker;
-  constructor(app, env, trackerFn = async () => {}) {
+  constructor(app, env, track = async () => {}) {
     this.app = app;
     this.env = env;
+    this.track = track;
     this.progressTracker = new _progress.ProgressTracker([{
       id: this.steps.PREPARE,
       name: 'Preparing for backup generation'
@@ -103,7 +101,6 @@ class BackupDBCommand {
       id: this.steps.GENERATE,
       name: 'Generating backup'
     }]);
-    this.track = trackerFn;
   }
   log(msg) {
     if (this.silent) {

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

@@ -3,8 +3,10 @@
 
 exports.__esModule = true;
 exports.DevEnvSyncSQLCommand = void 0;
+exports.findSiteHomeUrl = findSiteHomeUrl;
 var _vipSearchReplace = require("@automattic/vip-search-replace");
 var _chalk = _interopRequireDefault(require("chalk"));
+var _debug = _interopRequireDefault(require("debug"));
 var _fs = _interopRequireDefault(require("fs"));
 var _promises = require("node:stream/promises");
 var _devEnvImportSql = require("./dev-env-import-sql");
@@ -17,6 +19,8 @@ var _utils = require("../lib/utils");
 var _lineByLine = require("../lib/validations/line-by-line");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const debug = (0, _debug.default)('@automattic/vip:bin:dev-environment');
+
 /**
  * Replaces the domain in the given URL
  *
@@ -44,11 +48,11 @@ function stripProtocol(url) {
  * @return Site home url. null if not found
  */
 function findSiteHomeUrl(sql) {
-  const regex = `['"](siteurl|home)['"],\\s?['"](.*?)['"]`;
-  const url = sql.match(regex)?.[2] || '';
+  const regex = /(['"])(?:siteurl|home)\1,\s*\1([Hh][Tt][Tt][Pp][Ss]?:\/\/.+?)\1/;
+  const url = regex.exec(sql)?.[2] ?? '';
   try {
-    new URL(url);
-    return url;
+    const parsed = new URL(url);
+    return parsed.hostname ? url : null;
   } catch {
     return null;
   }
@@ -174,6 +178,10 @@ class DevEnvSyncSQLCommand {
     if (!networkSites) return;
     const primaryUrl = networkSites.find(site => site?.blogId === 1)?.homeUrl;
     const primaryDomain = primaryUrl ? new URL(primaryUrl).hostname : '';
+    debug('Network sites: %j, primary URL: %s, primary domain: %s', networkSites.map(site => ({
+      blogId: site?.blogId,
+      homeUrl: site?.homeUrl
+    })), primaryUrl, primaryDomain);
     for (const site of networkSites) {
       if (!site?.blogId || site.blogId === 1) continue;
       const url = site?.homeUrl;
@@ -285,6 +293,7 @@ DROP PROCEDURE vip_sync_update_blog_domains;
     try {
       console.log('Extracting site urls from the SQL file...');
       this.siteUrls = await extractSiteUrls(this.sqlFile);
+      debug('Extracted site URLs: %j', this.siteUrls);
     } catch (err) {
       const error = err;
       await this.track('error', {

package/dist/commands/phpmyadmin.js

@@ -106,19 +106,16 @@ async function getPhpMyAdminStatus(appId, envId) {
   return resp?.data?.app?.environments?.[0]?.phpMyAdminStatus?.status;
 }
 class PhpMyAdminCommand {
-  app;
-  env;
   silent;
-  track;
   steps = {
     ENABLE: 'enable',
     GENERATE: 'generate'
   };
   progressTracker;
-  constructor(app, env, trackerFn = async () => {}) {
+  constructor(app, env, track = async () => {}) {
     this.app = app;
     this.env = env;
-    this.track = trackerFn;
+    this.track = track;
     this.progressTracker = new _progress.ProgressTracker([{
       id: this.steps.ENABLE,
       name: 'Enabling PHPMyAdmin for this environment'

package/dist/commands/wp-ssh.js

@@ -49,15 +49,13 @@ class NonZeroExitCodeError extends Error {
 }
 exports.NonZeroExitCodeError = NonZeroExitCodeError;
 class WPCliCommandOverSSH {
-  app;
-  env;
   track;
   constructor(app, env) {
     this.app = app;
     this.env = env;
     this.track = (0, _tracker.makeCommandTracker)('wp', {
-      app: this.app.id,
-      env: this.env.id,
+      app: app.id,
+      env: env.id,
       execution_type: 'ssh'
     });
   }
@@ -188,7 +186,7 @@ class WPCliCommandOverSSH {
   async getSSHAuthForCommand(command, extraTrackingInfo) {
     const api = (0, _api.default)();
     try {
-      return api.mutate({
+      return await api.mutate({
         mutation: TRIGGER_WP_CLI_COMMAND_MUTATION,
         variables: {
           input: {

package/dist/lib/analytics/clients/pendo.js

@@ -32,6 +32,7 @@ class Pendo {
       ...this.context,
       org_id: eventProps.org_slug,
       org_slug: eventProps.org_slug,
+      org_sfid: eventProps.org_sfid,
       userAgent: this.userAgent,
       userId: this.userId
     };
@@ -49,7 +50,8 @@ class Pendo {
       properties: eventProps,
       timestamp: Date.now(),
       type: 'track',
-      visitorId: `${this.context.userId}`
+      visitorId: `${this.context.userId}`,
+      accountId: `${this.context.org_sfid}`
     };
     debug('send()', body);
     const response = await (0, _http.default)(Pendo.ENDPOINT, {

package/dist/lib/analytics/clients/tracks.js

@@ -18,7 +18,6 @@ const validEventOrPropNamePattern = /^[a-z_][a-z0-9_]*$/;
 // TODO: add batch support (can include multiples in `events` array)
 
 class Tracks {
-  eventPrefix;
   userAgent;
   baseParams;
   static ENDPOINT = 'https://public-api.wordpress.com/rest/v1.1/tracks/record';