@automattic/vip 2.32.2 → 2.32.3

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 ## Changelog
 
+### 2.32.3
+
+- #1456 Fix DB engine validation regex
+- #1455 Fix SQL import command
+- #1454 chore(deps): update lando to 5efb9eb
+- #1453 Refactor logout
+- #1425 Add Slowlogs command
+- #1341 feat(dev-env): Add a concept of init-only containers
+- #1344 fix(dev-env): Do not run URL scan unless really need to
+- #1414 [dev-env] Tweak error handling dev-env sync
+- #1452 chore(dev-deps): update TypeScript-related packages
+- #1420 feat(dev-env): Adds automigration logic to dev-env
+- #1451 chore(dev-deps): update testing tools
+- #1448 chore(dev-deps): update babel packages to 7.22.9
+- #1421 refactor: Convert dev-environment to TypeScript
+- #1450 refactor: convert `validations` to TS
+
 ### 2.32.2
 
 - #1443 On-demand Database Backup: Use a less error-prone way of detecting if we're rate limited

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

@@ -17,7 +17,7 @@ services:
     type: compose
     services:
       image: ghcr.io/automattic/vip-container-images/dev-tools:0.9
-      command: sleep infinity
+      command: exit 0
       volumes:
         - devtools:/dev-tools
         - scripts:/scripts
@@ -28,6 +28,7 @@ services:
     volumes:
       devtools: {}
       scripts:
+    initOnly: true
 
   nginx:
     type: compose
@@ -154,6 +155,7 @@ services:
     type: compose
     services:
       image: ghcr.io/automattic/vip-container-images/wordpress:<%= wordpress.tag %>
+#      command: /usr/local/bin/entrypoint.sh
       command: sh -c "rsync -a --chown=www-data:www-data /wp/ /shared/; sleep infinity"
       volumes:
         - ./wordpress:/shared
@@ -162,6 +164,10 @@ services:
           target: /scripts
           volume:
             nocopy: true
+#      environment:
+#        LANDO_NO_SCRIPTS: 1
+#        LANDO_NEEDS_EXEC: 1
+#    initOnly: true
 
 <% if ( muPlugins.mode == 'image' ) { %>
   vip-mu-plugins:
@@ -181,6 +187,7 @@ services:
         LANDO_NEEDS_EXEC: 1
     volumes:
       mu-plugins: {}
+    initOnly: true
 <% } %>
 
 <% if ( appCode.mode == 'image' ) { %>
@@ -188,7 +195,7 @@ services:
     type: compose
     services:
       image: ghcr.io/automattic/vip-container-images/skeleton:latest
-      command: sleep infinity
+      command: exit 0
       volumes:
         - clientcode_clientmuPlugins:/clientcode/client-mu-plugins
         - clientcode_images:/clientcode/images
@@ -205,6 +212,7 @@ services:
       clientcode_private: {}
       clientcode_themes: {}
       clientcode_vipconfig: {}
+    initOnly: true
 <% } %>
 
 <% if ( mailpit ) { %>

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

@@ -30,13 +30,7 @@ const examples = [{
 }];
 (0, _command.default)({
   wildcardCommand: true
-}).option('slug', 'Custom name of the dev environment').option('force', 'Disabling validations before task execution', undefined, value => {
-  var _value$toLowerCase;
-  return 'false' !== (value === null || value === void 0 ? void 0 : (_value$toLowerCase = value.toLowerCase) === null || _value$toLowerCase === void 0 ? void 0 : _value$toLowerCase.call(value));
-}).option('quiet', 'Suppress output', undefined, value => {
-  var _value$toLowerCase2;
-  return 'false' !== (value === null || value === void 0 ? void 0 : (_value$toLowerCase2 = value.toLowerCase) === null || _value$toLowerCase2 === void 0 ? void 0 : _value$toLowerCase2.call(value));
-}).examples(examples).argv(process.argv, async (unmatchedArgs, opt) => {
+}).option('slug', 'Custom name of the dev environment').option('force', 'Disable validations before task execution', undefined, _devEnvironmentCli.processBooleanOption).option('quiet', 'Suppress output', undefined, _devEnvironmentCli.processBooleanOption).examples(examples).argv(process.argv, async (unmatchedArgs, opt) => {
   const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
   await (0, _devEnvironmentCli.validateDependencies)(lando, slug, opt.quiet);

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

@@ -18,14 +18,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  */
 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',

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

@@ -73,7 +73,7 @@ const examples = [{
     await (0, _devEnvironmentCli.handleCLIException)(error, 'dev_env_start_command_error', trackingInfo);
     process.exitCode = 1;
   }
-  await (0, _devEnvironmentCli.postStart)(slug, {
+  (0, _devEnvironmentCli.postStart)(slug, {
     openVSCode: !!opt.vscode
   });
 });

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

@@ -21,6 +21,7 @@ var _userError = _interopRequireDefault(require("../lib/user-error"));
 var _devEnvSyncSql = require("../commands/dev-env-sync-sql");
 var _devEnvironment = require("../lib/constants/dev-environment");
 var _tracker = require("../lib/tracker");
+var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const examples = [{
   usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} sync sql @my-test.develop --slug=my_site`,
@@ -54,11 +55,12 @@ const appQuery = `
   envContext: true,
   requiredArgs: 0,
   module: 'dev-env-sync-sql'
-}).option('slug', 'Custom name of the dev environment').examples(examples).argv(process.argv, async (arg, {
-  app,
-  env,
-  slug
-}) => {
+}).option('slug', 'Custom name of the dev environment').option('force', 'Disable validations before running sync', undefined, _devEnvironmentCli.processBooleanOption).examples(examples).argv(process.argv, async (arg, opt) => {
+  const {
+    app,
+    env
+  } = opt;
+  const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
   const trackerFn = (0, _tracker.makeCommandTracker)('dev_env_sync_sql', {
     app: app.id,
     env: env.uniqueLabel,
@@ -68,7 +70,7 @@ const appQuery = `
   await trackerFn('execute');
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
   const envPath = (0, _devEnvironmentCore.getEnvironmentPath)(slug);
-  if (!(await (0, _devEnvironmentLando.isEnvUp)(lando, envPath))) {
+  if (!(await (0, _devEnvironmentLando.isEnvUp)(lando, envPath)) && !opt.force) {
     await trackerFn('env_not_running_error', {
       errorMessage: 'Environment was not running'
     });

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

@@ -39,7 +39,6 @@ cmd.argv(process.argv, async (arg, opt) => {
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_update_command_execute', trackingInfo);
   try {
-    var _currentInstanceData$;
     const environmentAlreadyExists = await (0, _devEnvironmentCore.doesEnvironmentExist)((0, _devEnvironmentCore.getEnvironmentPath)(slug));
     if (!environmentAlreadyExists) {
       throw new Error(_devEnvironment.DEV_ENVIRONMENT_NOT_FOUND);
@@ -63,7 +62,7 @@ cmd.argv(process.argv, async (arg, opt) => {
       mariadb: currentInstanceData.mariadb,
       phpmyadmin: currentInstanceData.phpmyadmin,
       xdebug: currentInstanceData.xdebug,
-      mailpit: (_currentInstanceData$ = currentInstanceData.mailpit) !== null && _currentInstanceData$ !== void 0 ? _currentInstanceData$ : currentInstanceData.mailhog,
+      mailpit: currentInstanceData.mailpit ?? currentInstanceData.mailhog,
       photon: currentInstanceData.photon,
       mediaRedirectDomain: currentInstanceData.mediaRedirectDomain,
       multisite: false,

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

@@ -271,8 +271,8 @@ const displayPlaybook = ({
     var _app$environments, _selectedEnvironmentO;
     // eslint-disable-next-line no-multi-spaces
     console.log(`  multisite: ${isMultiSite.toString()}`);
-    const selectedEnvironmentObj = app === null || app === void 0 ? void 0 : (_app$environments = app.environments) === null || _app$environments === void 0 ? void 0 : _app$environments.find(env => unformattedEnvironment === env.type);
-    siteArray = selectedEnvironmentObj === null || selectedEnvironmentObj === void 0 ? void 0 : (_selectedEnvironmentO = selectedEnvironmentObj.wpSites) === null || _selectedEnvironmentO === void 0 ? void 0 : _selectedEnvironmentO.nodes;
+    const selectedEnvironmentObj = app === null || app === void 0 || (_app$environments = app.environments) === null || _app$environments === void 0 ? void 0 : _app$environments.find(env => unformattedEnvironment === env.type);
+    siteArray = selectedEnvironmentObj === null || selectedEnvironmentObj === void 0 || (_selectedEnvironmentO = selectedEnvironmentObj.wpSites) === null || _selectedEnvironmentO === void 0 ? void 0 : _selectedEnvironmentO.nodes;
   }
   if (!tableNames.length) {
     debug('Validation was skipped, no playbook information will be displayed');

package/dist/bin/vip-logout.js

@@ -0,0 +1,23 @@
+#!/usr/bin/env node
+
+/**
+ * External dependencies
+ */
+
+/**
+ * Internal dependencies
+ */
+"use strict";
+
+var _command = _interopRequireDefault(require("../lib/cli/command"));
+var _logout = _interopRequireDefault(require("../lib/logout"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+void (0, _command.default)({
+  usage: 'vip logout'
+}).examples([{
+  usage: 'vip logout',
+  description: 'Logs out current user.'
+}]).argv(process.argv, async () => {
+  await (0, _logout.default)();
+  console.log('You are successfully logged out.');
+});

package/dist/bin/vip-slowlogs.js

@@ -0,0 +1,192 @@
+#!/usr/bin/env node
+/**
+ * External dependencies
+ */
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.appQuery = void 0;
+exports.followLogs = followLogs;
+exports.getSlowlogs = getSlowlogs;
+exports.validateInputs = validateInputs;
+var _chalk = _interopRequireDefault(require("chalk"));
+var _promises = require("timers/promises");
+var _command = _interopRequireDefault(require("../lib/cli/command"));
+var _tracker = require("../lib/tracker");
+var slowlogsLib = _interopRequireWildcard(require("../lib/app-slowlogs/app-slowlogs"));
+var exit = _interopRequireWildcard(require("../lib/cli/exit"));
+var _format = require("../lib/cli/format");
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/**
+ * Internal dependencies
+ */
+const LIMIT_MIN = 1;
+const LIMIT_MAX = 500;
+const ALLOWED_FORMATS = ['csv', 'json', 'text'];
+const DEFAULT_POLLING_DELAY_IN_SECONDS = 30;
+const MIN_POLLING_DELAY_IN_SECONDS = 5;
+const MAX_POLLING_DELAY_IN_SECONDS = 300;
+async function getSlowlogs(arg, opt) {
+  validateInputs(opt.limit, opt.format);
+  const trackingParams = getBaseTrackingParams(opt);
+  await (0, _tracker.trackEvent)('slowlogs_command_execute', trackingParams);
+  let slowlogs;
+  try {
+    slowlogs = await slowlogsLib.getRecentSlowlogs(opt.app.id, opt.env.id, opt.limit);
+  } catch (error) {
+    const err = error;
+    await (0, _tracker.trackEvent)('slowlogs_command_error', {
+      ...trackingParams,
+      error: err.message
+    });
+    return exit.withError(err.message);
+  }
+  await (0, _tracker.trackEvent)('slowlogs_command_success', {
+    ...trackingParams,
+    total: slowlogs.nodes.length
+  });
+  if (!slowlogs.nodes.length) {
+    console.error('No logs found');
+    return;
+  }
+  printSlowlogs(slowlogs.nodes, opt.format);
+}
+async function followLogs(opt) {
+  let after = null;
+  let isFirstRequest = true;
+  // How many times have we polled?
+  let requestNumber = 0;
+  const trackingParams = getBaseTrackingParams(opt);
+
+  // Set an initial default delay
+  let delay = DEFAULT_POLLING_DELAY_IN_SECONDS;
+
+  // eslint-disable-next-line no-constant-condition, @typescript-eslint/no-unnecessary-condition
+  while (true) {
+    const limit = isFirstRequest ? opt.limit : LIMIT_MAX;
+    requestNumber++;
+    trackingParams.request_number = requestNumber;
+    trackingParams.request_delay = delay;
+    trackingParams.limit = limit;
+    let slowlogs;
+    try {
+      // eslint-disable-next-line no-await-in-loop
+      slowlogs = await slowlogsLib.getRecentSlowlogs(opt.app.id, opt.env.id, limit, after);
+
+      // eslint-disable-next-line no-await-in-loop
+      await (0, _tracker.trackEvent)('slowlogs_command_follow_success', {
+        ...trackingParams,
+        total: slowlogs.nodes.length
+      });
+    } catch (error) {
+      const err = error;
+      // eslint-disable-next-line no-await-in-loop
+      await (0, _tracker.trackEvent)('slowlogs_command_follow_error', {
+        ...trackingParams,
+        error: err.message
+      });
+
+      // If the first request fails we don't want to retry (it's probably not recoverable)
+      if (isFirstRequest) {
+        console.error(`${_chalk.default.red('Error:')} Failed to fetch slowlogs.`);
+        break;
+      }
+      // Increase the delay on errors to avoid overloading the server, up to a max of 5 minutes
+      delay += DEFAULT_POLLING_DELAY_IN_SECONDS;
+      delay = Math.min(delay, MAX_POLLING_DELAY_IN_SECONDS);
+      console.error(`${_chalk.default.red('Error:')} Failed to fetch slowlogs. Trying again in ${delay} seconds.`);
+    }
+    if (slowlogs) {
+      if (slowlogs.nodes.length) {
+        printSlowlogs(slowlogs.nodes, opt.format);
+      }
+      after = slowlogs.nextCursor;
+      isFirstRequest = false;
+
+      // Keep a sane lower limit of MIN_POLLING_DELAY_IN_SECONDS just in case something goes wrong in the server-side
+      delay = Math.max(slowlogs.pollingDelaySeconds || DEFAULT_POLLING_DELAY_IN_SECONDS, MIN_POLLING_DELAY_IN_SECONDS);
+    }
+
+    // eslint-disable-next-line no-await-in-loop
+    await (0, _promises.setTimeout)(delay * 1000);
+  }
+}
+function getBaseTrackingParams(opt) {
+  return {
+    command: 'vip slowlogs',
+    org_id: opt.app.organization.id,
+    app_id: opt.app.id,
+    env_id: opt.env.id,
+    limit: opt.limit,
+    follow: opt.follow ?? false,
+    format: opt.format
+  };
+}
+function printSlowlogs(slowlogs, format) {
+  // Strip out __typename
+  slowlogs = slowlogs.map(log => {
+    const {
+      timestamp,
+      rowsSent,
+      rowsExamined,
+      queryTime,
+      requestUri,
+      query
+    } = log;
+    return {
+      timestamp,
+      rowsSent,
+      rowsExamined,
+      queryTime,
+      requestUri,
+      query
+    };
+  });
+  console.log((0, _format.formatData)(slowlogs, format));
+}
+function validateInputs(limit, format) {
+  if (!ALLOWED_FORMATS.includes(format)) {
+    exit.withError(`Invalid format: ${format}. The supported formats are: ${ALLOWED_FORMATS.join(', ')}.`);
+  }
+  if (!Number.isInteger(limit) || limit < LIMIT_MIN || limit > slowlogsLib.LIMIT_MAX) {
+    exit.withError(`Invalid limit: ${limit}. It should be a number between ${LIMIT_MIN} and ${slowlogsLib.LIMIT_MAX}.`);
+  }
+}
+const appQuery = `
+	id
+	name
+	environments {
+		id
+		appId
+		name
+		type
+	}
+	organization {
+		id
+		name
+	}
+`;
+exports.appQuery = appQuery;
+void (0, _command.default)({
+  appContext: true,
+  appQuery,
+  envContext: true,
+  format: true,
+  module: 'slowlogs'
+}).option('limit', 'The maximum number of log lines', 500).option('format', 'Output the log lines in CSV or JSON format', 'text').examples([{
+  description: 'Get the most recent app slowlogs',
+  usage: 'vip @mysite.production slowlogs'
+}, {
+  usage: 'vip @mysite.production slowlogs --limit 100',
+  description: 'Get the most recent 100 slowlog entries'
+}, {
+  usage: 'vip @mysite.production slowlogs --limit 100 --format csv',
+  description: 'Get the most recent 100 slowlog entries formatted as comma-separated values (CSV)'
+}, {
+  usage: 'vip @mysite.production slowlogs --limit 100 --format json',
+  description: 'Get the most recent 100 slowlog entries formatted as JSON'
+}]).argv(process.argv, getSlowlogs);

package/dist/bin/vip-validate-preflight.js

@@ -111,10 +111,10 @@ async function getBuildConfiguration(application, environment) {
   }
 }
 async function vipValidatePreflightCommand(arg, opt) {
-  var _opt$env$appId, _opt$env, _opt$env$id, _opt$env2, _opt$app$repo, _opt$app, _opt$env3, _opt$env3$environment;
+  var _opt$env, _opt$env2, _opt$app, _opt$env3;
   harmoniaArgs = await validateArgs(opt);
-  const appId = (_opt$env$appId = (_opt$env = opt.env) === null || _opt$env === void 0 ? void 0 : _opt$env.appId) !== null && _opt$env$appId !== void 0 ? _opt$env$appId : 0;
-  const envId = (_opt$env$id = (_opt$env2 = opt.env) === null || _opt$env2 === void 0 ? void 0 : _opt$env2.id) !== null && _opt$env$id !== void 0 ? _opt$env$id : 0;
+  const appId = ((_opt$env = opt.env) === null || _opt$env === void 0 ? void 0 : _opt$env.appId) ?? 0;
+  const envId = ((_opt$env2 = opt.env) === null || _opt$env2 === void 0 ? void 0 : _opt$env2.id) ?? 0;
   const baseTrackingParams = {
     env_id: envId,
     app_id: appId,
@@ -144,7 +144,7 @@ async function vipValidatePreflightCommand(arg, opt) {
   const siteOptions = new _vipGoPreflightChecks.SiteConfig({
     siteID: envId,
     nodejsVersion: harmoniaArgs.nodejsVersion,
-    repository: (_opt$app$repo = (_opt$app = opt.app) === null || _opt$app === void 0 ? void 0 : _opt$app.repo) !== null && _opt$app$repo !== void 0 ? _opt$app$repo : 'no-repo',
+    repository: ((_opt$app = opt.app) === null || _opt$app === void 0 ? void 0 : _opt$app.repo) ?? 'no-repo',
     baseURL: 'http://localhost:' + harmoniaArgs.port,
     dockerBuildEnvs: harmoniaArgs.nodeBuildDockerEnv,
     topRequests: [],
@@ -167,7 +167,7 @@ async function vipValidatePreflightCommand(arg, opt) {
     return exit.withError(`Could not find a 'package.json' in the current folder (${opt.path}).`);
   }
   const customEnvVars = {};
-  if (((_opt$env3 = opt.env) === null || _opt$env3 === void 0 ? void 0 : (_opt$env3$environment = _opt$env3.environmentVariables) === null || _opt$env3$environment === void 0 ? void 0 : _opt$env3$environment.nodes.length) > 0) {
+  if (((_opt$env3 = opt.env) === null || _opt$env3 === void 0 || (_opt$env3 = _opt$env3.environmentVariables) === null || _opt$env3 === void 0 ? void 0 : _opt$env3.nodes.length) > 0) {
     opt.env.environmentVariables.nodes.forEach(envVar => {
       customEnvVars[envVar.name] = envVar.value;
     });
@@ -368,7 +368,6 @@ async function handleResults(harmonia, results) {
   process.exit(0);
 }
 async function validateArgs(opt) {
-  var _opt$wait, _opt$port;
   const args = {};
 
   // Verbose
@@ -387,12 +386,11 @@ async function validateArgs(opt) {
     outputJson = true;
   }
   if (opt.app) {
-    var _opt$nodeVersion;
     // Get build information from API and store it in the env object
     const buildConfig = await getBuildConfiguration(opt.app, opt.env);
     args.app_id = opt.app.id;
     args.env_id = opt.env.id;
-    args.nodejsVersion = (_opt$nodeVersion = opt.nodeVersion) !== null && _opt$nodeVersion !== void 0 ? _opt$nodeVersion : buildConfig.nodeJSVersion;
+    args.nodejsVersion = opt.nodeVersion ?? buildConfig.nodeJSVersion;
     args.buildType = buildConfig.buildType;
     args.npmToken = buildConfig.npmToken;
     args.nodeBuildDockerEnv = buildConfig.nodeBuildDockerEnv;
@@ -419,8 +417,8 @@ async function validateArgs(opt) {
       args.nodejsVersion = opt.nodeVersion;
     }
   }
-  args.wait = (_opt$wait = opt.wait) !== null && _opt$wait !== void 0 ? _opt$wait : 3000;
-  args.port = (_opt$port = opt.port) !== null && _opt$port !== void 0 ? _opt$port : Math.floor(Math.random() * 1000) + 3001; // Get a PORT from 3001 and 3999
+  args.wait = opt.wait ?? 3000;
+  args.port = opt.port ?? Math.floor(Math.random() * 1000) + 3001; // Get a PORT from 3001 and 3999
 
   return args;
 }

package/dist/bin/vip-whoami.js

@@ -21,7 +21,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 async function whoamiCommand() {
-  var _currentUser$displayN, _currentUser$id;
   const trackingParams = {
     command: 'vip whoami'
   };
@@ -38,7 +37,7 @@ async function whoamiCommand() {
     exit.withError(`Failed to fetch information about the currently logged-in user error: ${error.message}`);
   }
   await (0, _tracker.trackEvent)('whoami_command_success', trackingParams);
-  const output = [`- Howdy ${(_currentUser$displayN = currentUser.displayName) !== null && _currentUser$displayN !== void 0 ? _currentUser$displayN : 'user'}!`, `- Your user ID is ${(_currentUser$id = currentUser.id) !== null && _currentUser$id !== void 0 ? _currentUser$id : ' not found'}`];
+  const output = [`- Howdy ${currentUser.displayName ?? 'user'}!`, `- Your user ID is ${currentUser.id ?? ' not found'}`];
   if (currentUser.isVIP) {
     output.push('- Your account has VIP Staff permissions');
   }

package/dist/bin/vip.js

@@ -12,7 +12,6 @@ var _config = _interopRequireDefault(require("../lib/cli/config"));
 var _command = _interopRequireWildcard(require("../lib/cli/command"));
 var _token2 = _interopRequireDefault(require("../lib/token"));
 var _tracker = require("../lib/tracker");
-var _logout = _interopRequireDefault(require("../lib/logout"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -29,10 +28,7 @@ if (_config.default && _config.default.environment !== 'production') {
 const tokenURL = 'https://dashboard.wpvip.com/me/cli/token';
 const runCmd = async function () {
   const cmd = (0, _command.default)();
-  cmd.command('logout', 'Logout from your current session', async () => {
-    await (0, _logout.default)();
-    console.log('You are successfully logged out.');
-  }).command('app', 'List and modify your VIP applications').command('cache', 'Manage page cache for your VIP applications').command('config', 'Set configuration for your VIP applications').command('dev-env', 'Use local dev-environment').command('export', 'Export data from your VIP application').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('sync', 'Sync production to a development environment').command('whoami', 'Display details about the currently logged-in user').command('validate', 'Validate your VIP application and environment').command('wp', 'Run WP CLI commands against an environment');
+  cmd.command('logout', 'Logout from your current session').command('app', 'List and modify your VIP applications').command('cache', 'Manage page cache for your VIP applications').command('config', 'Set configuration for your VIP applications').command('dev-env', 'Use local dev-environment').command('export', 'Export data from your VIP application').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', 'Get slowlogs from your VIP applications').command('sync', 'Sync production to a development environment').command('whoami', 'Display details about the currently logged-in user').command('validate', 'Validate your VIP application and environment').command('wp', 'Run WP CLI commands against an environment');
   cmd.argv(process.argv);
 };
 function doesArgvHaveAtLeastOneParam(argv, params) {

package/dist/commands/backup-db.js

@@ -61,7 +61,7 @@ const DB_BACKUP_JOB_STATUS_QUERY = (0, _graphqlTag.default)`
 `;
 exports.DB_BACKUP_JOB_STATUS_QUERY = DB_BACKUP_JOB_STATUS_QUERY;
 async function getBackupJob(appId, envId) {
-  var _app$environments, _app$environments$, _app$environments$$jo;
+  var _app$environments;
   const api = await (0, _api.default)();
   const response = await api.query({
     query: DB_BACKUP_JOB_STATUS_QUERY,
@@ -76,7 +76,7 @@ async function getBackupJob(appId, envId) {
       app
     }
   } = response;
-  return app === null || app === void 0 ? void 0 : (_app$environments = app.environments) === null || _app$environments === void 0 ? void 0 : (_app$environments$ = _app$environments[0]) === null || _app$environments$ === void 0 ? void 0 : (_app$environments$$jo = _app$environments$.jobs) === null || _app$environments$$jo === void 0 ? void 0 : _app$environments$$jo[0];
+  return app === null || app === void 0 || (_app$environments = app.environments) === null || _app$environments === void 0 || (_app$environments = _app$environments[0]) === null || _app$environments === void 0 || (_app$environments = _app$environments.jobs) === null || _app$environments === void 0 ? void 0 : _app$environments[0];
 }
 async function createBackupJob(appId, envId) {
   // Disable global error handling so that we can handle errors ourselves
@@ -134,10 +134,10 @@ class BackupDBCommand {
     this.progressTracker.stopPrinting();
   }
   async loadBackupJob() {
-    var _this$app$id, _this$env$id, _this$job$metadata$fi, _this$job, _this$job$metadata, _this$job$metadata$fi2, _this$job$progress$st, _this$job2, _this$job2$progress, _this$job3;
-    this.job = await getBackupJob((_this$app$id = this.app.id) !== null && _this$app$id !== void 0 ? _this$app$id : 0, (_this$env$id = this.env.id) !== null && _this$env$id !== void 0 ? _this$env$id : 0);
-    this.backupName = (_this$job$metadata$fi = (_this$job = this.job) === null || _this$job === void 0 ? void 0 : (_this$job$metadata = _this$job.metadata) === null || _this$job$metadata === void 0 ? void 0 : (_this$job$metadata$fi2 = _this$job$metadata.find(meta => (meta === null || meta === void 0 ? void 0 : meta.name) === 'backupName')) === null || _this$job$metadata$fi2 === void 0 ? void 0 : _this$job$metadata$fi2.value) !== null && _this$job$metadata$fi !== void 0 ? _this$job$metadata$fi : 'Unknown';
-    this.jobStatus = (_this$job$progress$st = (_this$job2 = this.job) === null || _this$job2 === void 0 ? void 0 : (_this$job2$progress = _this$job2.progress) === null || _this$job2$progress === void 0 ? void 0 : _this$job2$progress.status) !== null && _this$job$progress$st !== void 0 ? _this$job$progress$st : undefined;
+    var _this$job, _this$job2, _this$job3;
+    this.job = await getBackupJob(this.app.id ?? 0, this.env.id ?? 0);
+    this.backupName = ((_this$job = this.job) === null || _this$job === void 0 || (_this$job = _this$job.metadata) === null || _this$job === void 0 || (_this$job = _this$job.find(meta => (meta === null || meta === void 0 ? void 0 : meta.name) === 'backupName')) === null || _this$job === void 0 ? void 0 : _this$job.value) ?? 'Unknown';
+    this.jobStatus = ((_this$job2 = this.job) === null || _this$job2 === void 0 || (_this$job2 = _this$job2.progress) === null || _this$job2 === void 0 ? void 0 : _this$job2.status) ?? undefined;
     if ((_this$job3 = this.job) !== null && _this$job3 !== void 0 && _this$job3.completedAt) {
       this.jobAge = (new Date().getTime() - new Date(this.job.completedAt).getTime()) / 1000 / 60;
     } else {
@@ -157,18 +157,17 @@ class BackupDBCommand {
       this.log('Database backup already in progress...');
     } else {
       try {
-        var _this$app$id2, _this$env$id2;
         this.log('Generating a new database backup...');
         this.progressTracker.stepRunning(this.steps.PREPARE);
         this.progressTracker.startPrinting();
-        await createBackupJob((_this$app$id2 = this.app.id) !== null && _this$app$id2 !== void 0 ? _this$app$id2 : 0, (_this$env$id2 = this.env.id) !== null && _this$env$id2 !== void 0 ? _this$env$id2 : 0);
+        await createBackupJob(this.app.id ?? 0, this.env.id ?? 0);
       } catch (err) {
         var _error$graphQLErrors, _graphQLError$extensi;
         const error = err;
         const graphQLError = (_error$graphQLErrors = error.graphQLErrors) === null || _error$graphQLErrors === void 0 ? void 0 : _error$graphQLErrors[0];
         this.progressTracker.stepFailed(this.steps.PREPARE);
         this.stopProgressTracker();
-        if ((graphQLError === null || graphQLError === void 0 ? void 0 : (_graphQLError$extensi = graphQLError.extensions) === null || _graphQLError$extensi === void 0 ? void 0 : _graphQLError$extensi.errorHttpCode) === 429) {
+        if ((graphQLError === null || graphQLError === void 0 || (_graphQLError$extensi = graphQLError.extensions) === null || _graphQLError$extensi === void 0 ? void 0 : _graphQLError$extensi.errorHttpCode) === 429) {
           const retryAfter = graphQLError.extensions.retryAfter;
           await this.track('error', {
             error_type: 'rate_limit_exceeded',

package/dist/lib/api/app.js

@@ -18,7 +18,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 async function _default(app, fields = 'id,name', fragments = '') {
   const api = await (0, _api.default)();
   if (isNaN(+app)) {
-    var _res$data$apps, _res$data$apps$edges;
+    var _res$data$apps;
     const res = await api.query({
       query: (0, _graphqlTag.default)`query App( $name: String ) {
 					apps( first: 1, name: $name ) {
@@ -34,7 +34,7 @@ async function _default(app, fields = 'id,name', fragments = '') {
         name: app
       }
     });
-    if (!((_res$data$apps = res.data.apps) !== null && _res$data$apps !== void 0 && (_res$data$apps$edges = _res$data$apps.edges) !== null && _res$data$apps$edges !== void 0 && _res$data$apps$edges.length)) {
+    if (!((_res$data$apps = res.data.apps) !== null && _res$data$apps !== void 0 && (_res$data$apps = _res$data$apps.edges) !== null && _res$data$apps !== void 0 && _res$data$apps.length)) {
       return {};
     }
     return res.data.apps.edges[0];

package/dist/lib/api/cache-purge.js

@@ -43,7 +43,7 @@ const appQuery = `
 `;
 exports.appQuery = appQuery;
 async function purgeCache(appId, envId, urls) {
-  var _response$data$purgeP, _response$data;
+  var _response$data;
   const api = await (0, _api.default)();
   const variables = {
     appId,
@@ -54,5 +54,5 @@ async function purgeCache(appId, envId, urls) {
     mutation,
     variables
   });
-  return (_response$data$purgeP = (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.purgePageCache) !== null && _response$data$purgeP !== void 0 ? _response$data$purgeP : null;
+  return ((_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.purgePageCache) ?? null;
 }

package/dist/lib/api/http.js

@@ -31,7 +31,6 @@ const debug = (0, _debug.default)('@automattic/vip:http');
  * @return {Promise} Return value of the `fetch` call
  */
 var _default = async (path, options = {}) => {
-  var _options$headers;
   let url = path;
 
   // For convenience, we support just passing in the path to this function...
@@ -44,12 +43,12 @@ var _default = async (path, options = {}) => {
   debug('running fetch', url);
   return (0, _nodeFetch.default)(url, {
     ...options,
-    agent: proxyAgent !== null && proxyAgent !== void 0 ? proxyAgent : undefined,
+    agent: proxyAgent ?? undefined,
     headers: {
       Authorization: `Bearer ${authToken.raw}`,
       'User-Agent': _env.default.userAgent,
       'Content-Type': 'application/json',
-      ...((_options$headers = options.headers) !== null && _options$headers !== void 0 ? _options$headers : {})
+      ...(options.headers ?? {})
     },
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     body: typeof options.body === 'object' ? JSON.stringify(options.body) : options.body

package/dist/lib/app-logs/app-logs.js

@@ -44,7 +44,7 @@ const QUERY_ENVIRONMENT_LOGS = (0, _graphqlTag.default)`
 	}
 `;
 async function getRecentLogs(appId, envId, type, limit, after) {
-  var _response$data$app, _response$data$app$en, _response$data$app$en2;
+  var _response$data$app;
   const api = await (0, _api.default)({
     exitOnError: false
   });
@@ -58,7 +58,7 @@ async function getRecentLogs(appId, envId, type, limit, after) {
       after
     }
   });
-  const logs = (_response$data$app = response.data.app) === null || _response$data$app === void 0 ? void 0 : (_response$data$app$en = _response$data$app.environments) === null || _response$data$app$en === void 0 ? void 0 : (_response$data$app$en2 = _response$data$app$en[0]) === null || _response$data$app$en2 === void 0 ? void 0 : _response$data$app$en2.logs;
+  const logs = (_response$data$app = response.data.app) === null || _response$data$app === void 0 || (_response$data$app = _response$data$app.environments) === null || _response$data$app === void 0 || (_response$data$app = _response$data$app[0]) === null || _response$data$app === void 0 ? void 0 : _response$data$app.logs;
   if (!(logs !== null && logs !== void 0 && logs.nodes)) {
     throw new Error('Unable to query logs');
   }