@automattic/vip 2.27.0-dev5 → 2.27.0-dev6

package/dist/bin/vip-cache.js

@@ -17,5 +17,5 @@
 var _command = _interopRequireDefault(require("../lib/cli/command"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 (0, _command.default)({
-  requiredArgs: 2
+  requiredArgs: 1
 }).command('purge-url', 'Purge page cache').argv(process.argv);

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

@@ -17,5 +17,5 @@
 var _command = _interopRequireDefault(require("../lib/cli/command"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 (0, _command.default)({
-  requiredArgs: 1
+  requiredArgs: 0
 }).command('delete', 'Permanently delete an environment variable').command('get', 'Get the value of an environment variable').command('get-all', 'Get the values of all environment variable').command('list', 'List the names of all environment variables').command('set', 'Add or update an environment variable').argv(process.argv);

package/dist/bin/vip-validate.js

@@ -13,7 +13,7 @@ var _command = _interopRequireDefault(require("../lib/cli/command"));
 var _tracker = require("../lib/tracker");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 (0, _command.default)({
-  requiredArgs: 1
+  requiredArgs: 0
 }).command('preflight', 'Runs preflight tests to validate if your application is ready to be deployed').argv(process.argv, async () => {
   await (0, _tracker.trackEvent)('vip_validate_command_execute');
 });

package/dist/commands/export-sql.js

@@ -8,7 +8,7 @@ var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 var _fs = _interopRequireDefault(require("fs"));
 var _https = _interopRequireDefault(require("https"));
 var _path = _interopRequireDefault(require("path"));
-var _api = _interopRequireDefault(require("../lib/api"));
+var _api = _interopRequireWildcard(require("../lib/api"));
 var _format = require("../lib/cli/format");
 var _progress = require("../lib/cli/progress");
 var exit = _interopRequireWildcard(require("../lib/cli/exit"));
@@ -162,8 +162,10 @@ async function generateDownloadLink(appId, envId, backupId) {
  * @throws {Error} Throws an error if the job creation fails
  */
 async function createExportJob(appId, envId, backupId) {
+  // Disable global error handling so that we can handle errors ourselves
+  (0, _api.disableGlobalGraphQLErrorHandling)();
   const api = await (0, _api.default)();
-  const response = await api.mutate({
+  await api.mutate({
     mutation: CREATE_EXPORT_JOB_MUTATION,
     variables: {
       input: {
@@ -173,16 +175,9 @@ async function createExportJob(appId, envId, backupId) {
       }
     }
   });
-  const {
-    data: {
-      startDBBackupCopy: {
-        success
-      }
-    }
-  } = response;
-  if (!success) {
-    throw new Error();
-  }
+
+  // Re-enable global error handling
+  (0, _api.enableGlobalGraphQLErrorHandling)();
 }
 
 /**
@@ -195,6 +190,7 @@ class ExportSQLCommand {
     DOWNLOAD_LINK: 'downloadLink',
     DOWNLOAD: 'download'
   };
+
   /**
    * Creates an instance of SQLExportCommand
    *
@@ -231,7 +227,6 @@ class ExportSQLCommand {
       latestBackup,
       jobs
     } = await fetchLatestBackupAndJobStatus(this.app.id, this.env.id);
-    this.runningJobs = jobs.filter(job => job.progress.status === 'running');
 
     // Find the job that generates the export for the latest backup
     return jobs.find(job => {
@@ -316,10 +311,8 @@ class ExportSQLCommand {
   async run() {
     console.log(`Fetching the latest backup for ${this.app.name}`);
     const {
-      latestBackup,
-      jobs
+      latestBackup
     } = await fetchLatestBackupAndJobStatus(this.app.id, this.env.id);
-    this.runningJobs = jobs.filter(job => job.progress.status === 'running');
     if (!latestBackup) {
       exit.withError(`No backup found for site ${this.app.name}`);
     } else {
@@ -327,13 +320,15 @@ class ExportSQLCommand {
     }
     if (await this.getExportJob()) {
       console.log(`Attaching to an existing export for the backup with timestamp ${latestBackup.createdAt}`);
-    } else if (this.runningJobs.length > 0) {
-      exit.withError('There is an export job already running for this site: ' + `https://dashboard.wpvip.com/apps/${this.app.id}/${this.env.uniqueLabel}/data/database/backups\n` + 'Currently, we allow only one export job per site. Please try again later.');
     } else {
       console.log(`Creating a new export for the backup with timestamp ${latestBackup.createdAt}`);
       try {
         await createExportJob(this.app.id, this.env.id, latestBackup.id);
       } catch (err) {
+        // Todo: match error code instead of message substring
+        if (err !== null && err !== void 0 && err.message.includes('Backup Copy already in progress')) {
+          exit.withError('There is an export job already running for this site: ' + `https://dashboard.wpvip.com/apps/${this.app.id}/${this.env.uniqueLabel}/data/database/backups\n` + 'Currently, we allow only one export job per site. Please try again later.');
+        }
         exit.withError(`Error creating export job: ${err === null || err === void 0 ? void 0 : err.message}`);
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "2.27.0-dev5",
+  "version": "2.27.0-dev6",
   "description": "The VIP Javascript library & CLI",
   "main": "index.js",
   "bin": {