@automattic/vip 2.31.1-dev → 2.31.1-dev3

package/.editorconfig

@@ -0,0 +1,11 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = tab
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.json,*.yaml,*.yml]
+indent_style = space

package/.prettierignore

@@ -0,0 +1,6 @@
+*.generated.d.ts
+/CHANGELOG.md
+/__fixtures__/
+/dist/
+/flow-typed/
+/src/graphqlTypes.d.ts

package/CONTRIBUTING.md

@@ -35,35 +35,38 @@ Who doesn't like a good console.log for debugging?
 Well, sometimes it's insufficient, luckily it's not too complicated to use a debugger.
 
 1. First, make sure to run the `npm run build:watch`, this will generate source maps
-2. Run the command you want via `node --inspect`, like so:  `node --inspect ./dist/bin/vip-dev-env-import-sql.js`
+2. Run the command you want via `node --inspect`, like so: `node --inspect ./dist/bin/vip-dev-env-import-sql.js`
 3. Note the port the debugger is listening on:
+
 ```
 Debugger listening on ws://127.0.0.1:9229/db6c03e9-2585-4a08-a1c6-1fee0295c9ff
 For help, see: https://nodejs.org/en/docs/inspector
 ```
+
 4. In your editor of choice attach to the debugger. For VSCode: Hit 'Run and Debug' panel, hit the "gear" icon (open launch.json), make your `Attach` configuration entry to look like so:
-Make sure the `port` matches the port from step 3, and the `runtimeExecutable` matches the exact `node` executable you ran. If you use a version manager like `nvm`, its especially important to check this.
+   Make sure the `port` matches the port from step 3, and the `runtimeExecutable` matches the exact `node` executable you ran. If you use a version manager like `nvm`, its especially important to check this.
 
 ```json
-	{
-		"name": "Attach",
-		"port": 9229,
-		"request": "attach",
-		"skipFiles": ["<node_internals>/**"],
-		"type": "node",
-		"runtimeExecutable": "/Users/user/.nvm/versions/node/v14.18.2/bin/node"
-	}
+{
+	"name": "Attach",
+	"port": 9229,
+	"request": "attach",
+	"skipFiles": [ "<node_internals>/**" ],
+	"type": "node",
+	"runtimeExecutable": "/Users/user/.nvm/versions/node/v14.18.2/bin/node"
+}
 ```
 
 5. Set your breakpoints and whatnot, hit the play button.
 6. Confirm that you attached the debugger to continue command execution
 7. Squash them bugs 🐛🔨.
 8. [Optional but recommended] Pay it forward and implement a similar approach to other internal/external tooling.
+
 ### Adding commands
 
-* New command names should use the singular form (e.g. site vs sites).
-* Add new commands to `package.json#bin`.
-* Run `npm link` so that `arg` knows how to spawn the command locally. (Skipping this step will result in `Error: spawn vip-command ENOENT`.)
+- New command names should use the singular form (e.g. site vs sites).
+- Add new commands to `package.json#bin`.
+- Run `npm link` so that `arg` knows how to spawn the command locally. (Skipping this step will result in `Error: spawn vip-command ENOENT`.)
 
 ### Adding libraries
 
@@ -83,13 +86,14 @@ Our release flow for VIP CLI follows this pattern:
 - Finally, release your changes as a new minor or major NPM version. Ping in the #vip-platform channel to notify folks of a new release, but please feel free to release your changes without any blockers from the team. Any team member that is part of the Automattic NPM organization can release a new version; if you aren't a member, generic credentials are available in the Secret Store.
 
 ### Changelogs
+
 Changelogs allow customers to keep up with all the changes happening across our VIP Platform. Changelogs for VIP CLI are posted to the [VIP Cloud Changelog P2](https://wpvipchangelog.wordpress.com/), along with the repository’s `README.md`.
 
 ## Releasing / Publishing
 
 ### Pre-publish Checks
 
-We use [`publish-please`](https://github.com/inikulin/publish-please) for some pre-publish confidence checks to avoid common mistakes.
+We use a custom pre-publish [script](https://github.com/Automattic/vip/blob/trunk/hellpers/prepublishOnly.js) that performs some confidence checks to avoid common mistakes.
 
 Further checks can be added to this flow as needed.
 
@@ -126,7 +130,7 @@ Then, let's publish:
 1. Push the tag to GitHub (`git push --tags`)
 1. Push the trunk branch `git push`
 1. Make sure you're part of the Automattic organization in npm
-1. Publish the release to npm (`npm run publish-please --access public`) the script will do some extra checks (npm version, branch, etc) to ensure everything is correct. If all looks good, proceed.
+1. Publish the release to npm (`npm publish --access public`) the script will do some extra checks (node version, branch, etc) to ensure everything is correct. If all looks good, the new version will be published and you can proceed.
 1. Edit [the release on GitHub](https://github.com/Automattic/vip/releases) to include a description of the changes and publish (this can just copy the details from the changelog).
 1. Push `trunk` changes (mostly the version bump) to `develop` (`git checkout develop && git merge trunk` )
 
@@ -139,10 +143,7 @@ Sometimes, we want to release a version we can test before releasing it to the p
 In order to do that, please follow this:
 
 1. Manually change the version in `package.json` and `package-lock.json` to a dev version. Example: `1.4.0-dev1`
-2. Go to publish-please's config in `.publishrc`
-3. Change the `publishTag` to `next` and `gitTag` to `false` (publish-please will expect the latest commit to have a git tag, but we don't want it in this case)
-4. Commit your changes to `trunk`
-5. Run `npm run publish-please`
+1. Run `npm publish --tag next` (When `--tag` is specified, we bypass the usual branch protection that doesn't allow you to publish form a brunch other than `trunk`).
 
 You can repeat this with every new version until you're happy with your version and ready to a public release. We currently don't support multiple branches for multiple versions. When it's the case, this process needs to be done for every version in every branch.
 

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

@@ -21,17 +21,19 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
   try {
     response = await api.query({
       // $FlowFixMe: gql template is not supported by flow
-      query: (0, _graphqlTag.default)`query Apps( $first: Int, $after: String ) {
-						apps( first: $first, after: $after ) {
-							total,
-							nextCursor
-							edges {
-								id,
-								name,
-								repo
-							}
+      query: (0, _graphqlTag.default)`
+				query Apps($first: Int, $after: String) {
+					apps(first: $first, after: $after) {
+						total
+						nextCursor
+						edges {
+							id
+							name
+							repo
 						}
-					}`,
+					}
+				}
+			`,
       variables: {
         first: 100,
         after: null // TODO make dynamic

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

@@ -30,8 +30,11 @@ const dockerWindowsPathCmd = 'wsl -d docker-desktop bash -c "sysctl -w vm.max_ma
 const examples = [{
   usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} start`,
   description: 'Starts a local dev environment'
+}, {
+  usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} start --vscode`,
+  description: 'Start a local environment and generate a Workspace file for developing in Visual Studio Code'
 }];
-(0, _command.default)().option('slug', 'Custom name of the dev environment').option('skip-rebuild', 'Only start stopped services').option(['w', 'skip-wp-versions-check'], 'Skip propting for wordpress update if non latest').option('vscode', 'Open environment workspace in VSCode').examples(examples).argv(process.argv, async (arg, opt) => {
+(0, _command.default)().option('slug', 'Custom name of the dev environment').option('skip-rebuild', 'Only start stopped services').option(['w', 'skip-wp-versions-check'], 'Skip prompt to update WordPress version if not on latest').option('vscode', 'Generate a Visual Studio Code Workspace file').examples(examples).argv(process.argv, async (arg, opt) => {
   const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
   await (0, _devEnvironmentCli.validateDependencies)(lando, slug);

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

@@ -24,7 +24,7 @@ var _tracker = require("../lib/tracker");
 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`,
-  description: 'Syncs with the `my-test` site\'s `develop` environment database into `my_site`'
+  description: "Syncs with the `my-test` site's `develop` environment database into `my_site`"
 }];
 const appQuery = `
 	id,

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

@@ -46,7 +46,7 @@ const appQuery = `
   module: 'export-sql',
   requiredArgs: 0,
   usage: 'vip export sql'
-}).option('output', 'Specify the location where you want to save the export file').option('generate-backup', 'Generate a new backup instead of using the available ones').examples(examples).argv(process.argv, async (arg, {
+}).option('output', 'Specify the location where you want to save the export file').option('generate-backup', 'Exports a freshly created database backup instead of using the latest existing one').examples(examples).argv(process.argv, async (arg, {
   app,
   env,
   output,
@@ -54,7 +54,8 @@ const appQuery = `
 }) => {
   const trackerFn = (0, _tracker.makeCommandTracker)('export_sql', {
     app: app.id,
-    env: env.uniqueLabel
+    env: env.uniqueLabel,
+    generate_backup: generateBackup
   });
   await trackerFn('execute');
   const exportCommand = new _exportSql.ExportSQLCommand(app, env, {

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

@@ -41,8 +41,8 @@ const appQuery = `
 	}
 `;
 const ABORT_IMPORT_MUTATION = (0, _graphqlTag.default)`
-	mutation AbortMediaImport( $input: AppEnvironmentAbortMediaImportInput ) {
-		abortMediaImport( input: $input ) {
+	mutation AbortMediaImport($input: AppEnvironmentAbortMediaImportInput) {
+		abortMediaImport(input: $input) {
 			applicationId
 			environmentId
 			mediaImportStatusChange {
@@ -60,7 +60,7 @@ const ABORT_IMPORT_MUTATION = (0, _graphqlTag.default)`
   envContext: true,
   requiredArgs: 0,
   requireConfirm: `
-${_chalk.default.red.bold('By running this command, the Media Import running on your App will stop and can\'t be resumed.')}
+${_chalk.default.red.bold("By running this command, the Media Import running on your App will stop and can't be resumed.")}
 ${_chalk.default.red.bold('Are you sure you want to abort this Media Import?')}
 `
 }).argv(process.argv, async (arg, {

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

@@ -38,8 +38,8 @@ const appQuery = `
 	}
 `;
 const START_IMPORT_MUTATION = (0, _graphqlTag.default)`
-	mutation StartMediaImport( $input: AppEnvironmentStartMediaImportInput ) {
-		startMediaImport( input: $input ) {
+	mutation StartMediaImport($input: AppEnvironmentStartMediaImportInput) {
+		startMediaImport(input: $input) {
 			applicationId
 			environmentId
 			mediaImportStatus {
@@ -83,7 +83,7 @@ function isSupportedUrl(urlToTest) {
   module: 'import-media',
   requiredArgs: 1,
   requireConfirm: `
-${_chalk.default.red.bold('NOTE: If the provided archive\'s directory structure contains an `uploads/` directory,')}
+${_chalk.default.red.bold("NOTE: If the provided archive's directory structure contains an `uploads/` directory,")}
 ${_chalk.default.red.bold('only the files present inside that directory will be imported and the rest will be ignored.')}
 ${_chalk.default.red.bold('If no `uploads/` directory is found, all files will be imported, as is.')}
 

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

@@ -296,7 +296,8 @@ const displayPlaybook = ({
         if (wpSite.id === 1) {
           siteRegex = /^wp_[a-z]+/i;
         } else {
-          siteRegex = new RegExp(`^wp_${wpSite.id}_[a-z]+`, 'i');
+          // eslint-disable-next-line security/detect-non-literal-regexp
+          siteRegex = new RegExp(`^wp_${parseInt(wpSite.id, 10)}_[a-z]+`, 'i');
         }
         const tableNamesInGroup = tableNames.filter(name => siteRegex.test(name));
         return {

package/dist/bin/vip-sync.js

@@ -35,14 +35,14 @@ const appQuery = `id,name,environments{
     await api.mutate({
       // $FlowFixMe: gql template is not supported by flow
       mutation: (0, _graphqlTag.default)`
-						mutation SyncEnvironmentMutation($input: AppEnvironmentSyncInput){
-							syncEnvironment(input: $input){
-								environment{
-									id
-								}
-							}
+				mutation SyncEnvironmentMutation($input: AppEnvironmentSyncInput) {
+					syncEnvironment(input: $input) {
+						environment {
+							id
 						}
-					`,
+					}
+				}
+			`,
       variables: {
         input: {
           id: opts.app.id,
@@ -106,15 +106,29 @@ const appQuery = `id,name,environments{
       // The rest of the iterations are just for moving the spinner
       api.query({
         // $FlowFixMe: gql template is not supported by flow
-        query: (0, _graphqlTag.default)`query App( $id: Int, $sync: Int ) {
-							app( id: $id ){
-								id,name,environments{
-									id,name,defaultDomain,branch,datacenter,syncProgress( sync: $sync ){
-										status,sync,steps{name,status}
+        query: (0, _graphqlTag.default)`
+						query App($id: Int, $sync: Int) {
+							app(id: $id) {
+								id
+								name
+								environments {
+									id
+									name
+									defaultDomain
+									branch
+									datacenter
+									syncProgress(sync: $sync) {
+										status
+										sync
+										steps {
+											name
+											status
+										}
 									}
 								}
 							}
-						}`,
+						}
+					`,
         fetchPolicy: 'network-only',
         variables: {
           id: opts.app.id,

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

@@ -68,19 +68,20 @@ async function getBuildConfiguration(application, environment) {
   // Disable the global GraphQL error handling, so we can catch Unauthorized errors and recommend next steps.
   (0, _api.disableGlobalGraphQLErrorHandling)();
   const buildConfigQuery = (0, _graphqlTag.default)`
-	query BuildConfig( $appId: Int, $envId: Int ) {
-        app(id: $appId) {
-            environments(id: $envId) {
-                id,
-                buildConfiguration {
-					buildType
-					nodeBuildDockerEnv,
-					nodeJSVersion,
-					npmToken,
-                }
-            }
-        }
-	}`;
+		query BuildConfig($appId: Int, $envId: Int) {
+			app(id: $appId) {
+				environments(id: $envId) {
+					id
+					buildConfiguration {
+						buildType
+						nodeBuildDockerEnv
+						nodeJSVersion
+						npmToken
+					}
+				}
+			}
+		}
+	`;
   try {
     const result = await api.query({
       query: buildConfigQuery,
@@ -122,7 +123,7 @@ async function vipValidatePreflightCommand(arg, opt) {
   };
   await (0, _tracker.trackEvent)('validate_preflight_command_execute', baseTrackingParams);
   logToConsole('  /\\  /\\__ _ _ __ _ __ ___   ___  _ __ (_) __ _ ');
-  logToConsole(' / /_/ / _` | \'__| \'_ ` _ \\ / _ \\| \'_ \\| |/ _` |');
+  logToConsole(" / /_/ / _` | '__| '_ ` _ \\ / _ \\| '_ \\| |/ _` |");
   logToConsole('/ __  / (_| | |  | | | | | | (_) | | | | | (_| |');
   logToConsole('\\/ /_/ \\__,_|_|  |_| |_| |_|\\___/|_| |_|_|\\__,_|');
   logToConsole('VIP Harmonia - Application testing made easy\n');
@@ -155,6 +156,7 @@ async function vipValidatePreflightCommand(arg, opt) {
   const packageJSONfile = _path.default.resolve(opt.path, 'package.json');
   let packageJSON;
   try {
+    // eslint-disable-next-line security/detect-non-literal-require
     packageJSON = require(packageJSONfile);
     siteOptions.setPackageJSON(packageJSON);
   } catch (error) {

package/dist/bin/vip-wp.js

@@ -100,15 +100,15 @@ const getTokenForCommand = async (appId, envId, command) => {
   return api.mutate({
     // $FlowFixMe: gql template is not supported by flow
     mutation: (0, _graphqlTag.default)`
-				mutation TriggerWPCLICommandMutation($input: AppEnvironmentTriggerWPCLICommandInput ){
-					triggerWPCLICommandOnAppEnvironment( input: $input ) {
-						inputToken
-						command {
-							guid
-						}
+			mutation TriggerWPCLICommandMutation($input: AppEnvironmentTriggerWPCLICommandInput) {
+				triggerWPCLICommandOnAppEnvironment(input: $input) {
+					inputToken
+					command {
+						guid
 					}
 				}
-			`,
+			}
+		`,
     variables: {
       input: {
         id: appId,
@@ -125,8 +125,8 @@ const cancelCommand = async guid => {
   return api.mutate({
     // $FlowFixMe: gql template is not supported by flow
     mutation: (0, _graphqlTag.default)`
-			mutation cancelWPCLICommand($input: CancelWPCLICommandInput ){
-				cancelWPCLICommand( input: $input ) {
+			mutation cancelWPCLICommand($input: CancelWPCLICommandInput) {
+				cancelWPCLICommand(input: $input) {
 					command {
 						id
 					}

package/dist/commands/backup-db.js

@@ -34,6 +34,8 @@ const CREATE_DB_BACKUP_JOB_MUTATION = (0, _graphqlTag.default)`
 		}
 	}
 `;
+
+// TODO: Replace this with the codegen
 exports.CREATE_DB_BACKUP_JOB_MUTATION = CREATE_DB_BACKUP_JOB_MUTATION;
 const DB_BACKUP_JOB_STATUS_QUERY = (0, _graphqlTag.default)`
 	query AppBackupJobStatus($appId: Int!, $envId: Int!) {
@@ -104,12 +106,12 @@ class BackupDBCommand {
     PREPARE: 'prepare',
     GENERATE: 'generate'
   };
-  constructor(app, env, trackerFn = () => {}) {
+  constructor(app, env, trackerFn = async () => {}) {
     this.app = app;
     this.env = env;
     this.progressTracker = new _progress.ProgressTracker([{
       id: this.steps.PREPARE,
-      name: 'Preparing'
+      name: 'Preparing for backup generation'
     }, {
       id: this.steps.GENERATE,
       name: 'Generating backup'
@@ -117,11 +119,13 @@ class BackupDBCommand {
     this.track = trackerFn;
   }
   log(msg) {
-    if (this.silent) return;
+    if (this.silent) {
+      return;
+    }
     console.log(msg);
   }
   isDone(job) {
-    return !job.inProgressLock;
+    return !(job !== null && job !== void 0 && job.inProgressLock);
   }
 
   /**
@@ -134,54 +138,53 @@ class BackupDBCommand {
     this.progressTracker.stopPrinting();
   }
   async loadBackupJob() {
-    var _this$job, _this$job$metadata$fi, _this$job2, _this$job2$progress, _this$job3;
+    var _this$job$metadata$fi, _this$job$metadata$fi2, _this$job$progress;
     this.job = await getBackupJob(this.app.id, this.env.id);
-    this.backupName = ((_this$job = this.job) === null || _this$job === void 0 ? void 0 : (_this$job$metadata$fi = _this$job.metadata.find(meta => meta.name === 'backupName')) === null || _this$job$metadata$fi === void 0 ? void 0 : _this$job$metadata$fi.value) || 'Unknown';
-    this.jobStatus = (_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;
-    if ((_this$job3 = this.job) !== null && _this$job3 !== void 0 && _this$job3.completedAt) {
-      this.jobAge = (new Date() - new Date(this.job.completedAt)) / 1000 / 60;
+    this.backupName = (_this$job$metadata$fi = (_this$job$metadata$fi2 = this.job.metadata.find(meta => 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 = this.job.progress) === null || _this$job$progress === void 0 ? void 0 : _this$job$progress.status;
+    if (this.job.completedAt) {
+      this.jobAge = (new Date().getTime() - new Date(this.job.completedAt).getTime()) / 1000 / 60;
     } else {
       this.jobAge = undefined;
     }
     return this.job;
   }
   async run(silent = false) {
-    var _this$job4;
+    var _this$job;
     this.silent = silent;
-    const readMoreMessage = '\nRead more about the limitations around database backups & exports here: https://docs.wpvip.com/technical-references/vip-dashboard/backups/ \n';
     let noticeMessage = `\n${_chalk.default.yellow('NOTICE: ')}`;
-    noticeMessage += 'A fresh database backup will be generated only if there hasn\'t one already been created recently, either by our automated system or by a user on your site';
-    noticeMessage += readMoreMessage;
+    noticeMessage += 'If a recent database backup does not exist, a new one will be generated for this environment. ';
+    noticeMessage += 'Learn more about this: https://docs.wpvip.com/technical-references/vip-dashboard/backups/#2-download-a-full-database-backup \n';
     this.log(noticeMessage);
     await this.loadBackupJob();
-    if ((_this$job4 = this.job) !== null && _this$job4 !== void 0 && _this$job4.inProgressLock) {
+    if ((_this$job = this.job) !== null && _this$job !== void 0 && _this$job.inProgressLock) {
       this.log('Database backup already in progress...');
     } else {
       try {
-        this.log('Creating a new database backup...');
+        this.log('Generating a new database backup...');
         this.progressTracker.stepRunning(this.steps.PREPARE);
         this.progressTracker.startPrinting();
         await createBackupJob(this.app.id, this.env.id);
-      } catch (err) {
-        var _err$message;
+      } catch (stepErr) {
+        const err = stepErr;
         this.progressTracker.stepFailed(this.steps.PREPARE);
         this.stopProgressTracker();
-        if ((_err$message = err.message) !== null && _err$message !== void 0 && _err$message.includes('Database backups limit reached')) {
+        if (err.message.includes('Database backups limit reached')) {
           await this.track('error', {
             error_type: 'rate_limit_exceeded',
             error_message: `Couldn't create a new database backup job: ${err === null || err === void 0 ? void 0 : err.message}`,
-            stack: err === null || err === void 0 ? void 0 : err.stack
+            stack: err.stack
           });
-          let errMessage = err.message.replace('Database backups limit reached', 'New database backup generation failed because there was already one created recently, either by our automated system or by a user on your site');
-          errMessage = errMessage.replace('Retry after', '\nTo create a new backup, you can wait until:');
-          errMessage += `\n\nYou can also export the latest backup using the ${_chalk.default.green('vip @app.env export sql')} command`;
-          errMessage += readMoreMessage;
+          let errMessage = err.message.replace('Database backups limit reached', 'A new database backup was not generated because a recently generated backup already exists.');
+          errMessage = errMessage.replace('Retry after', '\nIf you would like to run the same command, you can retry on or after:');
+          errMessage += `\nAlternatively, you can export the latest existing database backup by running: ${_chalk.default.green('vip @app.env export sql')}, right away.`;
+          errMessage += '\nLearn more about limitations around generating database backups: https://docs.wpvip.com/technical-references/vip-dashboard/backups/#0-limitations \n';
           exit.withError(errMessage);
         }
         await this.track('error', {
           error_type: 'db_backup_job_creation_failed',
           error_message: `Database Backup job creation failed: ${err === null || err === void 0 ? void 0 : err.message}`,
-          stack: err === null || err === void 0 ? void 0 : err.stack
+          stack: err.stack
         });
         exit.withError(`Couldn't create a new database backup job: ${err === null || err === void 0 ? void 0 : err.message}`);
       }
@@ -190,7 +193,8 @@ class BackupDBCommand {
     this.progressTracker.stepRunning(this.steps.GENERATE);
     try {
       await (0, _utils.pollUntil)(this.loadBackupJob.bind(this), DB_BACKUP_PROGRESS_POLL_INTERVAL, this.isDone.bind(this));
-    } catch (err) {
+    } catch (e) {
+      const err = e;
       this.progressTracker.stepFailed(this.steps.GENERATE);
       this.stopProgressTracker();
       await this.track('error', {
@@ -206,7 +210,7 @@ class BackupDBCommand {
     if (this.jobStatus !== 'success') {
       exit.withError('Failed to create a new database backup');
     } else {
-      this.log(`New database backup created at ${this.backupName}`);
+      this.log('New database backup created');
     }
   }
 }

package/dist/commands/export-sql.js

@@ -32,7 +32,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 const EXPORT_SQL_PROGRESS_POLL_INTERVAL = 1000;
 const BACKUP_AND_JOB_STATUS_QUERY = (0, _graphqlTag.default)`
-	query AppBackupAndJobStatus( $appId: Int!, $envId: Int! ) {
+	query AppBackupAndJobStatus($appId: Int!, $envId: Int!) {
 		app(id: $appId) {
 			id
 			environments(id: $envId) {
@@ -186,7 +186,6 @@ async function createExportJob(appId, envId, backupId) {
  */
 class ExportSQLCommand {
   steps = {
-    GENERATE: 'generate',
     PREPARE: 'prepare',
     CREATE: 'create',
     DOWNLOAD_LINK: 'downloadLink',
@@ -207,7 +206,7 @@ class ExportSQLCommand {
     this.generateBackup = options.generateBackup || false;
     this.progressTracker = new _progress.ProgressTracker([{
       id: this.steps.PREPARE,
-      name: 'Preparing'
+      name: 'Preparing for backup download'
     }, {
       id: this.steps.CREATE,
       name: 'Creating backup copy'

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

@@ -19,16 +19,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  */
 
 const mutation = (0, _graphqlTag.default)`
-	mutation PurgePageCacheMutation(
-		$appId: Int!
-		$envId: Int!
-		$urls: [String!]!
-	) {
-		purgePageCache( input: {
-			appId: $appId
-			environmentId: $envId
-			urls: $urls
-		} ) {
+	mutation PurgePageCacheMutation($appId: Int!, $envId: Int!, $urls: [String!]!) {
+		purgePageCache(input: { appId: $appId, environmentId: $envId, urls: $urls }) {
 			success
 			urls
 		}

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

@@ -21,11 +21,17 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const LIMIT_MAX = 5000;
 exports.LIMIT_MAX = LIMIT_MAX;
 const QUERY_ENVIRONMENT_LOGS = (0, _graphqlTag.default)`
-	query GetAppLogs( $appId: Int, $envId: Int, $type: AppEnvironmentLogType, $limit: Int, $after: String ) {
-		app( id: $appId ) {
-			environments( id: $envId ) {
+	query GetAppLogs(
+		$appId: Int
+		$envId: Int
+		$type: AppEnvironmentLogType
+		$limit: Int
+		$after: String
+	) {
+		app(id: $appId) {
+			environments(id: $envId) {
 				id
-				logs( type: $type, limit: $limit, after: $after ) {
+				logs(type: $type, limit: $limit, after: $after) {
 					nodes {
 						timestamp
 						message

package/dist/lib/cli/format.js

@@ -94,8 +94,8 @@ function keyValue(values) {
     value
   } of values) {
     let formattedValue;
-    switch (key.toLowerCase()) {
-      // NOSONAR
+    switch (key.toLowerCase() // NOSONAR
+    ) {
       case 'environment':
         formattedValue = formatEnvironment(value);
         break;