@automattic/vip 2.7.0-dev2 → 2.7.0

package/README.md

@@ -27,6 +27,13 @@ By default, we record information about the usage of this tool using an in-house
 
 ## Changelog
 
+### 2.7.0 (07 December 2021)
+- #941  [dev-env] Bump lando CLI dependency
+- #938  Hide roll back message after SQL Import failure for launched sites
+- #936  Sets jest maxWorkers to 4
+
+https://github.com/Automattic/vip/releases/tag/v2.7.0
+
 ### 2.6.0 (23 November 2021)
 - #921  [dev-env] Introuces update to change existing environment
 - #928  [dev-env] Switch lando to use our fork

package/config/config.json

@@ -1,6 +1,6 @@
 {
   "tracksUserType": "vip:user_id",
   "tracksAnonUserType": "anon",
-  "tracksEventPrefix": "vip_cli_dev_",
-  "environment": "development"
+  "tracksEventPrefix": "vip_cli_",
+  "environment": "production"
 }

package/dist/lib/site-import/status.js

@@ -48,6 +48,7 @@ const IMPORT_SQL_PROGRESS_QUERY = (0, _graphqlTag.default)`
 			environments(id: $envId) {
 				id
 				isK8sResident
+				launched
 				jobs(types: "sql_import") {
 					id
 					type
@@ -106,7 +107,8 @@ async function getStatus(api, appId, envId) {
   const [environment] = environments;
   const {
     importStatus,
-    jobs
+    jobs,
+    launched
   } = environment;
 
   if (!environment.isK8sResident && !(jobs !== null && jobs !== void 0 && jobs.length)) {
@@ -116,15 +118,16 @@ async function getStatus(api, appId, envId) {
   const [importJob] = jobs;
   return {
     importStatus,
-    importJob
+    importJob,
+    launched
   };
 }
 
-function getErrorMessage(importFailed) {
+function getErrorMessage(importFailed, launched = false) {
   debug({
     importFailed
   });
-  const rollbackMessage = `Your site is ${_chalk.default.blue('automatically being rolled back')} to the last backup prior to your import job.
+  const rollbackMessage = launched ? '' : `Your site is ${_chalk.default.blue('automatically being rolled back')} to the last backup prior to your import job.
 `;
   let message = importFailed.error;
 
@@ -262,7 +265,8 @@ ${maybeExitPrompt}
       }
 
       const {
-        importStatus
+        importStatus,
+        launched
       } = status;
       let {
         importJob
@@ -352,7 +356,8 @@ ${maybeExitPrompt}
 
       if (!jobSteps.length) {
         return reject({
-          error: 'Could not enumerate the import job steps'
+          error: 'Could not enumerate the import job steps',
+          launched
         });
       }
 
@@ -375,7 +380,8 @@ ${maybeExitPrompt}
           commandOutput: failedImportStep.output,
           error: 'Import step failed',
           stepName: failedImportStep.name,
-          errorText: failedImportStep.error
+          errorText: failedImportStep.error,
+          launched
         });
       }
 
@@ -385,7 +391,8 @@ ${maybeExitPrompt}
       if (jobStatus === 'error') {
         return reject({
           error: 'Import job failed',
-          steps: jobSteps
+          steps: jobSteps,
+          launched
         });
       }
 
@@ -425,7 +432,7 @@ ${maybeExitPrompt}
     progressTracker.print({
       clearAfter: true
     });
-    exit.withError(getErrorMessage(importFailed));
+    exit.withError(getErrorMessage(importFailed, importFailed.launched));
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "2.7.0-dev2",
+  "version": "2.7.0",
   "description": "The VIP Javascript library & CLI",
   "main": "index.js",
   "bin": {
@@ -117,7 +117,7 @@
     "ini": "2.0.0",
     "json2csv": "5.0.6",
     "jwt-decode": "2.2.0",
-    "lando": "git+https://github.com/Automattic/lando-cli.git#v3.5.1-patch2021_11_22",
+    "lando": "git+https://github.com/Automattic/lando-cli.git#v3.5.1-patch2021_12_06",
     "node-fetch": "^2.6.1",
     "opn": "5.5.0",
     "rollbar": "2.22.0",