@automattic/vip 2.36.3 → 2.37.0

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

@@ -35,7 +35,7 @@ services:
     ssl: true
     sslExpose: false
     services:
-      image: ghcr.io/automattic/vip-container-images/nginx:1.23.3
+      image: ghcr.io/automattic/vip-container-images/nginx:latest
       command: nginx -g "daemon off;"
       environment:
         LANDO_NO_SCRIPTS: 1

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

@@ -0,0 +1,251 @@
+#!/usr/bin/env node
+
+/**
+ * External dependencies
+ */
+"use strict";
+
+exports.__esModule = true;
+exports.appDeployCmd = appDeployCmd;
+exports.promptToContinue = promptToContinue;
+var _chalk = _interopRequireDefault(require("chalk"));
+var _debug = _interopRequireDefault(require("debug"));
+var _enquirer = require("enquirer");
+var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
+var _api = _interopRequireDefault(require("../lib/api"));
+var _command = _interopRequireDefault(require("../lib/cli/command"));
+var exit = _interopRequireWildcard(require("../lib/cli/exit"));
+var _format = require("../lib/cli/format");
+var _progress = require("../lib/cli/progress");
+var _clientFileUploader = require("../lib/client-file-uploader");
+var _customDeploy = require("../lib/custom-deploy/custom-deploy");
+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 && Object.prototype.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(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/**
+ * Internal dependencies
+ */
+const appQuery = `
+	id,
+	name,
+	type,
+	typeId
+	organization { id, name },
+	environments{
+		id
+		appId
+		type
+		name
+		launched
+		isK8sResident
+		syncProgress { status }
+		primaryDomain { name }
+		wpSites {
+			nodes {
+				homeUrl
+				id
+			}
+		}
+	}
+`;
+const START_DEPLOY_MUTATION = (0, _graphqlTag.default)`
+	mutation StartDeploy($input: AppEnvironmentDeployInput) {
+		startDeploy(input: $input) {
+			app {
+				id
+				name
+			}
+			message
+			success
+		}
+	}
+`;
+const debug = (0, _debug.default)('@automattic/vip:bin:vip-app-deploy');
+const DEPLOY_PREFLIGHT_PROGRESS_STEPS = [{
+  id: 'upload',
+  name: 'Uploading file'
+}, {
+  id: 'deploy',
+  name: 'Triggering deployment'
+}];
+/**
+ * Prompt the user to confirm the environment they are deploying to.
+ * @param {PromptToContinueParams} PromptToContinueParams
+ */
+async function promptToContinue(params) {
+  const promptToMatch = params.domain.toUpperCase();
+  const promptResponse = await (0, _enquirer.prompt)({
+    type: 'input',
+    name: 'confirmedDomain',
+    message: `You are about to deploy to a ${params.launched ? 'launched' : 'un-launched'} ${params.formattedEnvironment} site ${_chalk.default.yellow(params.domain)}.\nType '${_chalk.default.yellow(promptToMatch)}' (without the quotes) to continue:\n`
+  });
+  if (promptResponse.confirmedDomain !== promptToMatch) {
+    await params.track('deploy_app_unexpected_input');
+    exit.withError('The input did not match the expected environment label. Deploy aborted.');
+  }
+}
+async function appDeployCmd(arg = [], opts = {}) {
+  const app = opts.app;
+  const env = opts.env;
+  const [fileName] = arg;
+  const fileMeta = await (0, _clientFileUploader.getFileMeta)(fileName);
+  const inputBasename = fileMeta.basename;
+  debug('Options: ', opts);
+  debug('Args: ', arg);
+  const appId = env.appId;
+  const envId = env.id;
+  const track = _tracker.trackEventWithEnv.bind(null, appId, envId);
+  await (0, _customDeploy.gates)(app, env, fileMeta);
+  await track('deploy_app_command_execute');
+
+  // Upload file as different name to avoid overwriting existing same named files
+  const datePrefix = new Date().toISOString()
+  // eslint-disable-next-line no-useless-escape
+  .replace(/[\-T:\.Z]/g, '').slice(0, 14);
+  fileMeta.basename = `${datePrefix}-${fileMeta.basename}`;
+  const deployMessage = opts.message ?? '';
+  const forceDeploy = opts.force;
+  const domain = env?.primaryDomain?.name ? env.primaryDomain.name : `#${env.id}`;
+  if (!forceDeploy) {
+    const promptParams = {
+      launched: Boolean(env.launched),
+      formattedEnvironment: (0, _format.formatEnvironment)(env.type),
+      track,
+      domain
+    };
+    await promptToContinue(promptParams);
+  }
+
+  /**
+   * =========== WARNING =============
+   *
+   * NO `console.log` after this point!
+   * Yes, even inside called functions.
+   * It will break the progress printing.
+   *
+   * =========== WARNING =============
+   */
+  const progressTracker = new _progress.ProgressTracker(DEPLOY_PREFLIGHT_PROGRESS_STEPS);
+  let status = 'running';
+  const setProgressTrackerPrefixAndSuffix = () => {
+    progressTracker.prefix = `
+=============================================================
+Processing the file for deployment to your environment...
+`;
+    progressTracker.suffix = `\n${(0, _format.getGlyphForStatus)(status, progressTracker.runningSprite)} Running...`;
+  };
+  const failWithError = failureError => {
+    status = 'failed';
+    setProgressTrackerPrefixAndSuffix();
+    progressTracker.stopPrinting();
+    progressTracker.print({
+      clearAfter: true
+    });
+    exit.withError(failureError);
+  };
+  progressTracker.startPrinting(setProgressTrackerPrefixAndSuffix);
+  progressTracker.stepRunning('upload');
+
+  // Call the Public API
+  const api = await (0, _api.default)();
+  const progressCallback = percentage => {
+    progressTracker.setUploadPercentage(percentage);
+  };
+  const appInput = {
+    id: appId
+  };
+  const envInput = {
+    id: envId
+  };
+  const uploadParams = {
+    app: appInput,
+    env: envInput,
+    fileMeta,
+    progressCallback,
+    hashType: 'sha256'
+  };
+  const startDeployVariables = {
+    input: {}
+  };
+  try {
+    const {
+      fileMeta: {
+        basename
+      },
+      checksum,
+      result
+    } = await (0, _clientFileUploader.uploadImportSqlFileToS3)(uploadParams);
+    startDeployVariables.input = {
+      id: app.id,
+      environmentId: env.id,
+      basename: fileMeta.basename,
+      checksum,
+      deployMessage
+    };
+    debug({
+      basename,
+      checksum,
+      result,
+      startDeployVariables
+    });
+    debug('Upload complete. Initiating the deploy.');
+    progressTracker.stepSuccess('upload');
+    await track('deploy_app_upload_complete');
+  } catch (uploadError) {
+    await track('deploy_app_command_error', {
+      error_type: 'upload_failed',
+      upload_error: uploadError.message
+    });
+    progressTracker.stepFailed('upload');
+    return failWithError(uploadError);
+  }
+  progressTracker.stepRunning('deploy');
+
+  // Start the deploy
+  try {
+    const startDeployResults = await api.mutate({
+      mutation: START_DEPLOY_MUTATION,
+      variables: startDeployVariables
+    });
+    debug({
+      startDeployResults
+    });
+  } catch (gqlErr) {
+    progressTracker.stepFailed('deploy');
+    await track('deploy_app_command_error', {
+      error_type: 'StartDeploy-failed',
+      gql_err: gqlErr
+    });
+    progressTracker.stepFailed('deploy');
+    return failWithError(`StartDeploy call failed: ${gqlErr.message}`);
+  }
+  progressTracker.stepSuccess('deploy');
+  progressTracker.stopPrinting();
+  progressTracker.suffix = '';
+  progressTracker.print({
+    clearAfter: true
+  });
+  const deploymentsUrl = `https://dashboard.wpvip.com/apps/${appId}/${env.type}/code/deployments`;
+  console.log(`\n✅ ${_chalk.default.bold(_chalk.default.underline(_chalk.default.magenta(inputBasename)))} has been sent for deployment to ${_chalk.default.bold(_chalk.default.blue(domain))}. \nTo check deployment status, go to ${_chalk.default.bold('VIP Dashboard')}: ${deploymentsUrl}`);
+}
+
+// Command examples for the `vip deploy app` help prompt
+const examples = [
+// `app` subcommand
+{
+  usage: 'vip app @mysite.develop deploy file.zip',
+  description: 'Deploy the given compressed file to your site'
+}, {
+  usage: 'vip app @mysite.develop deploy file.zip --message "This is a deploy message"',
+  description: 'Deploy the given compressed file to your site'
+}, {
+  usage: 'vip app @mysite.develop deploy file.zip --force',
+  description: 'Deploy the given compressed file to your site without prompting'
+}];
+void (0, _command.default)({
+  appContext: true,
+  appQuery,
+  envContext: true,
+  requiredArgs: 1
+}).examples(examples).option('message', 'Custom message for deploy').option('force', 'Skip prompt').argv(process.argv, appDeployCmd);

package/dist/bin/vip-app.js

@@ -11,7 +11,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 (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').command('list', 'List your VIP applications').argv(process.argv, async arg => {
+}).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 => {
   await (0, _tracker.trackEvent)('app_command_execute');
   let res;
   try {

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

@@ -22,7 +22,7 @@ const examples = [{
 }];
 (0, _command.default)({
   requiredArgs: 1
-}).option('slug', 'Custom name of the dev environment').option(['r', 'search-replace'], 'Perform Search and Replace on the specified SQL file').option('in-place', 'Search and Replace explicitly on the given input file').option('skip-validate', 'Do not perform file validation.').examples(examples).argv(process.argv, async (unmatchedArgs, opt) => {
+}).option('slug', 'Custom name of the dev environment').option(['r', 'search-replace'], 'Perform Search and Replace on the specified SQL file').option('in-place', 'Search and Replace explicitly on the given input file').option('skip-validate', 'Do not perform file validation').option(['k', 'skip-reindex'], 'Do not reindex data in Elasticsearch after import').option('quiet', 'Suppress prompts and informational messages').examples(examples).argv(process.argv, async (unmatchedArgs, opt) => {
   const [fileName] = unmatchedArgs;
   const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
   const cmd = new _devEnvImportSql.DevEnvImportSQLCommand(fileName, opt, slug);

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

@@ -460,7 +460,7 @@ Processing the SQL import for your environment...
       fileMeta: {
         basename
       },
-      md5,
+      checksum: md5,
       result
     } = await (0, _clientFileUploader.uploadImportSqlFileToS3)({
       app,

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

@@ -24,9 +24,9 @@ class DevEnvImportSQLCommand {
     this.options = options;
     this.slug = slug;
   }
-  async run(silent = false) {
+  async run() {
     const lando = await (0, _devEnvironmentLando.bootstrapLando)();
-    await (0, _devEnvironmentCli.validateDependencies)(lando, this.slug, silent);
+    await (0, _devEnvironmentCli.validateDependencies)(lando, this.slug, this.options.quiet);
     (0, _sql.validateImportFileExtension)(this.fileName);
 
     // Check if file is compressed and if so, extract the
@@ -35,9 +35,13 @@ class DevEnvImportSQLCommand {
       const tmpDir = (0, _utils.makeTempDir)();
       const sqlFile = `${tmpDir}/sql-import.sql`;
       try {
-        console.log(`Extracting the compressed file ${this.fileName}...`);
+        if (!this.options.quiet) {
+          console.log(`Extracting the compressed file ${this.fileName}...`);
+        }
         await (0, _clientFileUploader.unzipFile)(this.fileName, sqlFile);
-        console.log(`${_chalk.default.green('✓')} Extracted to ${sqlFile}`);
+        if (!this.options.quiet) {
+          console.log(`${_chalk.default.green('✓')} Extracted to ${sqlFile}`);
+        }
         this.fileName = sqlFile;
       } catch (err) {
         exit.withError(`Error extracting the SQL file: ${err.message}`);
@@ -62,7 +66,7 @@ class DevEnvImportSQLCommand {
       });
     }
     const fd = await _fs.default.promises.open(resolvedPath, 'r');
-    const importArg = ['db', '--disable-auto-rehash'];
+    const importArg = ['db', '--disable-auto-rehash'].concat(this.options.quiet ? '--silent' : []);
     const origIsTTY = process.stdin.isTTY;
     try {
       /**
@@ -76,27 +80,26 @@ class DevEnvImportSQLCommand {
       await (0, _devEnvironmentCore.exec)(lando, this.slug, importArg, {
         stdio: [fd, 'pipe', 'pipe']
       });
-      if (!silent) {
+      if (!this.options.quiet) {
         console.log(`${_chalk.default.green.bold('Success:')} Database imported.`);
       }
     } finally {
       process.stdin.isTTY = origIsTTY;
     }
-    if (searchReplace && searchReplace.length && !inPlace) {
+    if (searchReplace?.length && !inPlace) {
       _fs.default.unlinkSync(resolvedPath);
     }
-    const cacheArg = ['wp', 'cache', 'flush'];
+    const cacheArg = ['wp', 'cache', 'flush'].concat(this.options.quiet ? '--quiet' : []);
     await (0, _devEnvironmentCore.exec)(lando, this.slug, cacheArg);
-    try {
-      await (0, _devEnvironmentCore.exec)(lando, this.slug, ['wp', 'cli', 'has-command', 'vip-search']);
-      const doIndex = await (0, _devEnvironmentCli.promptForBoolean)('Do you want to index data in Elasticsearch (used by Enterprise Search)?', true);
-      if (doIndex) {
+    if (undefined === this.options.skipReindex || !(0, _devEnvironmentCli.processBooleanOption)(this.options.skipReindex)) {
+      try {
+        await (0, _devEnvironmentCore.exec)(lando, this.slug, ['wp', 'cli', 'has-command', 'vip-search']);
         await (0, _devEnvironmentCore.exec)(lando, this.slug, ['wp', 'vip-search', 'index', '--setup', '--network-wide', '--skip-confirm']);
+      } catch {
+        // Exception means they don't have vip-search enabled.
       }
-    } catch (err) {
-      // Exception means they don't have vip-search enabled.
     }
-    const addUserArg = ['wp', 'dev-env-add-admin', '--username=vipgo', '--password=password'];
+    const addUserArg = ['wp', 'dev-env-add-admin', '--username=vipgo', '--password=password'].concat(this.options.quiet ? '--quiet' : []);
     await (0, _devEnvironmentCore.exec)(lando, this.slug, addUserArg);
   }
 }

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

@@ -157,10 +157,11 @@ class DevEnvSyncSQLCommand {
   async runImport() {
     const importOptions = {
       inPlace: true,
-      skipValidate: true
+      skipValidate: true,
+      quiet: true
     };
     const importCommand = new _devEnvImportSql.DevEnvImportSQLCommand(this.sqlFile, importOptions, this.slug);
-    await importCommand.run(true);
+    await importCommand.run();
   }
 
   /**

package/dist/lib/cli/command.js

@@ -27,7 +27,7 @@ function uncaughtError(err) {
     return;
   }
   if (err instanceof _userError.default) {
-    exit.withError(err.message);
+    exit.withError(err);
   }
   console.log(_chalk.default.red('✕'), 'Please contact VIP Support with the following information:');
   console.log(_chalk.default.dim(err.stack));
@@ -182,7 +182,7 @@ _args.default.argv = async function (argv, cb) {
         });
         exit.withError(`Failed to get app (${_opts.appQuery}) details: ${message}`);
       }
-      if (!res || !res.data || !res.data.apps || !res.data.apps.edges || !res.data.apps.edges.length) {
+      if (!res.data?.apps?.edges?.length) {
         await (0, _tracker.trackEvent)('command_appcontext_list_fetch_error', {
           error: 'No apps found'
         });
@@ -207,14 +207,16 @@ _args.default.argv = async function (argv, cb) {
 
       // Copy all app information
       appSelection.app = res.data.apps.edges.find(cur => cur.name === appSelection.app);
-      if (!appSelection || !appSelection.app || !appSelection.app.id) {
+      if (!appSelection.app?.id) {
         await (0, _tracker.trackEvent)('command_appcontext_list_select_error', {
           error: 'Invalid app selected'
         });
         exit.withError(`App ${_chalk.default.blueBright(appSelection.app.name)} does not exist`);
       }
       await (0, _tracker.trackEvent)('command_appcontext_list_select_success');
-      options.app = Object.assign({}, appSelection.app);
+      options.app = {
+        ...appSelection.app
+      };
     } else {
       let appLookup;
       try {
@@ -225,14 +227,16 @@ _args.default.argv = async function (argv, cb) {
         });
         exit.withError(`App ${_chalk.default.blueBright(options.app)} does not exist`);
       }
-      if (!appLookup || !appLookup.id) {
+      if (!appLookup?.id) {
         await (0, _tracker.trackEvent)('command_appcontext_param_error', {
           error: 'Invalid app specified'
         });
         exit.withError(`App ${_chalk.default.blueBright(options.app)} does not exist`);
       }
       await (0, _tracker.trackEvent)('command_appcontext_param_select');
-      options.app = Object.assign({}, appLookup);
+      options.app = {
+        ...appLookup
+      };
     }
     if (_opts.childEnvContext) {
       options.app.environments = options.app.environments.filter(cur => cur.id !== options.app.id);
@@ -254,7 +258,7 @@ _args.default.argv = async function (argv, cb) {
         exit.withError(`Environment ${_chalk.default.blueBright(options.env)} for app ${_chalk.default.blueBright(options.app.name)} does not exist`);
       }
       options.env = env;
-    } else if (!options.app || !options.app.environments || !options.app.environments.length) {
+    } else if (!options.app?.environments?.length) {
       console.log('To set up a new development environment, please contact VIP Support.');
       await (0, _tracker.trackEvent)('command_childcontext_fetch_error', {
         error: 'No child environments found'
@@ -281,7 +285,7 @@ _args.default.argv = async function (argv, cb) {
 
       // Get full environment info after user selection
       envSelection.env = options.app.environments.find(envObject => getEnvIdentifier(envObject) === envSelection.env);
-      if (!envSelection || !envSelection.env || !envSelection.env.id) {
+      if (!envSelection.env?.id) {
         await (0, _tracker.trackEvent)('command_childcontext_list_select_error', {
           error: 'Invalid environment selected'
         });
@@ -317,7 +321,7 @@ _args.default.argv = async function (argv, cb) {
       case 'import-sql':
         {
           const site = options.env;
-          if (site && site.primaryDomain) {
+          if (site?.primaryDomain) {
             const primaryDomainName = site.primaryDomain.name;
             info.push({
               key: 'Primary Domain Name',
@@ -326,7 +330,7 @@ _args.default.argv = async function (argv, cb) {
           }
 
           // Site launched details
-          const haveLaunchedField = Object.prototype.hasOwnProperty.call(site, 'launched');
+          const haveLaunchedField = Object.hasOwn(site, 'launched');
           if (haveLaunchedField) {
             const launched = site.launched ? '✅ Yes' : `${_chalk.default.red('x')} No`;
             info.push({
@@ -340,7 +344,7 @@ _args.default.argv = async function (argv, cb) {
               value: `${_chalk.default.blueBright(this.sub)}`
             });
           }
-          options.skipValidate = Object.prototype.hasOwnProperty.call(options, 'skipValidate') && Boolean(options.skipValidate) && !['false', 'no'].includes(options.skipValidate);
+          options.skipValidate = Object.hasOwn(options, 'skipValidate') && Boolean(options.skipValidate) && !['false', 'no'].includes(options.skipValidate);
           if (options.skipValidate) {
             info.push({
               key: 'Pre-Upload Validations',
@@ -410,17 +414,17 @@ _args.default.argv = async function (argv, cb) {
           key: 'Archive URL',
           value: _chalk.default.blue.underline(this.sub)
         });
-        options.overwriteExistingFiles = Object.prototype.hasOwnProperty.call(options, 'overwriteExistingFiles') && Boolean(options.overwriteExistingFiles) && !['false', 'no'].includes(options.overwriteExistingFiles);
+        options.overwriteExistingFiles = Object.hasOwn(options, 'overwriteExistingFiles') && Boolean(options.overwriteExistingFiles) && !['false', 'no'].includes(options.overwriteExistingFiles);
         info.push({
           key: 'Overwrite any existing files',
           value: options.overwriteExistingFiles ? '✅ Yes' : `${_chalk.default.red('x')} No`
         });
-        options.importIntermediateImages = Object.prototype.hasOwnProperty.call(options, 'importIntermediateImages') && Boolean(options.importIntermediateImages) && !['false', 'no'].includes(options.importIntermediateImages);
+        options.importIntermediateImages = Object.hasOwn(options, 'importIntermediateImages') && Boolean(options.importIntermediateImages) && !['false', 'no'].includes(options.importIntermediateImages);
         info.push({
           key: 'Import intermediate image files',
           value: options.importIntermediateImages ? '✅ Yes' : `${_chalk.default.red('x')} No`
         });
-        options.exportFileErrorsToJson = Object.prototype.hasOwnProperty.call(options, 'exportFileErrorsToJson') && Boolean(options.exportFileErrorsToJson) && !['false', 'no'].includes(options.exportFileErrorsToJson);
+        options.exportFileErrorsToJson = Object.hasOwn(options, 'exportFileErrorsToJson') && Boolean(options.exportFileErrorsToJson) && !['false', 'no'].includes(options.exportFileErrorsToJson);
         info.push({
           key: 'Export any file errors encountered to a JSON file instead of a plain text file',
           value: options.exportFileErrorsToJson ? '✅ Yes' : `${_chalk.default.red('x')} No`
@@ -440,11 +444,15 @@ _args.default.argv = async function (argv, cb) {
     res = await cb(this.sub, options);
     if (_opts.format && res) {
       if (res.header) {
-        console.log((0, _format.formatData)(res.header, 'keyValue'));
+        if (options.format !== 'json') {
+          console.log((0, _format.formatData)(res.header, 'keyValue'));
+        }
         res = res.data;
       }
       res = res.map(row => {
-        const out = Object.assign({}, row);
+        const out = {
+          ...row
+        };
         if (out.__typename) {
           // Apollo injects __typename
           delete out.__typename;
@@ -488,7 +496,7 @@ function validateOpts(opts) {
  * @returns {args}
  */
 function _default(opts) {
-  _opts = Object.assign({
+  _opts = {
     appContext: false,
     appQuery: 'id,name',
     childEnvContext: false,
@@ -496,8 +504,9 @@ function _default(opts) {
     format: false,
     requireConfirm: false,
     requiredArgs: 0,
-    wildcardCommand: false
-  }, opts);
+    wildcardCommand: false,
+    ...opts
+  };
   if (_opts.appContext || _opts.requireConfirm) {
     _args.default.option('app', 'Specify the app');
   }

package/dist/lib/cli/exit.js

@@ -3,14 +3,19 @@
 exports.__esModule = true;
 exports.withError = withError;
 var _chalk = require("chalk");
+var _debug = _interopRequireDefault(require("debug"));
 var _env = _interopRequireDefault(require("../../lib/env"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function withError(message) {
-  console.error(`${(0, _chalk.red)('Error: ')} ${message.toString().replace(/^Error:\s*/, '')}`);
+  const msg = message instanceof Error ? message.message : message;
+  console.error(`${(0, _chalk.red)('Error: ')} ${msg.replace(/^Error:\s*/, '')}`);
 
   // Debug ouput is printed below error output both for information
   // hierarchy and to make it more likely that the user copies it to their
   // clipboard when dragging across output.
-  console.log(`${(0, _chalk.yellow)('Debug: ')} VIP-CLI v${_env.default.app.version}, Node ${_env.default.node.version}, ${_env.default.os.name} ${_env.default.os.version}`);
+  console.log(`${(0, _chalk.yellow)('Debug: ')} VIP-CLI v${_env.default.app.version}, Node ${_env.default.node.version}, ${_env.default.os.name} ${_env.default.os.version} ${_env.default.os.arch}`);
+  if (_debug.default.names.length > 0 && message instanceof Error) {
+    console.error((0, _chalk.yellow)('Debug: '), message);
+  }
   process.exit(1);
 }

package/dist/lib/cli/format.js

@@ -105,10 +105,10 @@ function keyValue(values) {
 function requoteArgs(args) {
   return args.map(arg => {
     if (arg.includes('--') && arg.includes('=') && arg.includes(' ')) {
-      return arg.replace(/^--([^=]*)=(.*)$/, '--$1="$2"');
+      return arg.replace(/"/g, '\\"').replace(/^--([^=]*)=(.*)$/, '--$1="$2"');
     }
     if (arg.includes(' ') && !isJsonObject(arg)) {
-      return `"${arg}"`;
+      return `"${arg.replace(/"/g, '\\"')}"`;
     }
     return arg;
   });

package/dist/lib/client-file-uploader.js

@@ -4,7 +4,7 @@ exports.__esModule = true;
 exports.MULTIPART_THRESHOLD = exports.COMPRESS_THRESHOLD = void 0;
 exports.checkFileAccess = checkFileAccess;
 exports.detectCompressedMimeType = detectCompressedMimeType;
-exports.getFileMD5Hash = void 0;
+exports.getFileHash = void 0;
 exports.getFileMeta = getFileMeta;
 exports.getFileSize = getFileSize;
 exports.getPartBoundaries = getPartBoundaries;
@@ -55,24 +55,28 @@ const MAX_CONCURRENT_PART_UPLOADS = 5;
 // TODO: Replace with a proper definitions once we convert lib/cli/command.js to TypeScript
 
 const getWorkingTempDir = () => (0, _promises.mkdtemp)(_path.default.join(_os.default.tmpdir(), 'vip-client-file-uploader'));
-const getFileMD5Hash = async fileName => {
+const getFileHash = async (fileName, hashType = 'md5') => {
   const src = (0, _fs.createReadStream)(fileName);
-  const dst = (0, _crypto.createHash)('md5');
+  const dst = (0, _crypto.createHash)(hashType);
   try {
     await (0, _promises2.pipeline)(src, dst);
     return dst.digest().toString('hex');
   } catch (err) {
-    throw new Error(`could not generate file hash: ${err.message}`);
+    throw new Error(`Could not generate file hash: ${err.message}`, {
+      cause: err
+    });
   } finally {
     src.close();
   }
 };
-exports.getFileMD5Hash = getFileMD5Hash;
+exports.getFileHash = getFileHash;
 const gzipFile = async (uncompressedFileName, compressedFileName) => {
   try {
     await (0, _promises2.pipeline)((0, _fs.createReadStream)(uncompressedFileName), (0, _zlib.createGzip)(), (0, _fs.createWriteStream)(compressedFileName));
   } catch (err) {
-    throw new Error(`could not compress file: ${err.message}`);
+    throw new Error(`Could not compress file: ${err.message}`, {
+      cause: err
+    });
   }
 };
 
@@ -121,13 +125,16 @@ async function uploadImportSqlFileToS3({
   app,
   env,
   fileMeta,
-  progressCallback
+  progressCallback,
+  hashType = 'md5'
 }) {
   let tmpDir;
   try {
     tmpDir = await getWorkingTempDir();
   } catch (err) {
-    throw new Error(`Unable to create temporary working directory: ${err.message}`);
+    throw new Error(`Unable to create temporary working directory: ${err.message}`, {
+      cause: err
+    });
   }
   debug(`File ${_chalk.default.cyan(fileMeta.basename)} is ~ ${Math.floor(fileMeta.fileSize / _fileSize.MB_IN_BYTES)} MB\n`);
 
@@ -149,9 +156,9 @@ async function uploadImportSqlFileToS3({
     const calculation = `${(fewerBytes / _fileSize.MB_IN_BYTES).toFixed(2)}MB (${Math.floor(100 * fewerBytes / uncompressedFileSize)}%)`;
     debug(`** Compression resulted in a ${calculation} smaller file 📦 **\n`);
   }
-  debug('Calculating file md5 checksum...');
-  const md5 = await getFileMD5Hash(fileMeta.fileName);
-  debug(`Calculated file md5 checksum: ${md5}\n`);
+  debug(`Calculating file ${hashType} checksum...`);
+  const checksum = await getFileHash(fileMeta.fileName, hashType);
+  debug(`Calculated file ${hashType} checksum: ${checksum}\n`);
   const result = fileMeta.fileSize < MULTIPART_THRESHOLD ? await uploadUsingPutObject({
     app,
     env,
@@ -165,7 +172,7 @@ async function uploadImportSqlFileToS3({
   });
   return {
     fileMeta,
-    md5,
+    checksum,
     result
   };
 }
@@ -225,7 +232,9 @@ async function uploadUsingPutObject({
   try {
     parsedResponse = await parser.parseStringPromise(result);
   } catch (err) {
-    throw new Error(`Invalid response from cloud service. ${err.message}`);
+    throw new Error(`Invalid response from cloud service. ${err.message}`, {
+      cause: err
+    });
   }
   const {
     Code,