@automattic/vip 2.8.0-alpha → 2.8.0

package/README.md

@@ -27,6 +27,23 @@ By default, we record information about the usage of this tool using an in-house
 
 ## Changelog
 
+### 2.8.0 (25 January 2021)
+- #952  FORNO-1047: Fix SQL Import for compressed files
+- #955  Add Error prefix for "Failed to fetch logs" msg
+- #946  Add support for the site logs tailing feature
+- #953  [dev-env] Updated list of available wordpress images for dev-env
+- #933  Update dependency debug to v4.3.3
+
+https://github.com/Automattic/vip/releases/tag/v2.8.0
+
+### 2.7.1 (10 January 2021)
+- #950 Switch to npm-shrinkwrap
+- #947  [dev-env] List all dev env alias
+- #944  Add `vip whoami` command
+- #942  Envvar: Show message when there is an attempt to change the New Relic key.
+
+https://github.com/Automattic/vip/releases/tag/v2.7.1
+
 ### 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

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/bin/vip-import-sql.js

@@ -54,6 +54,8 @@ var _progress = require("../lib/cli/progress");
 
 var _isMultiSite = require("../lib/validations/is-multi-site");
 
+var _path = _interopRequireDefault(require("path"));
+
 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; }
@@ -367,9 +369,11 @@ const displayPlaybook = ({
 
   const {
     app,
-    env,
-    searchReplace,
-    skipValidate
+    env
+  } = opts;
+  let {
+    skipValidate,
+    searchReplace
   } = opts;
   const {
     id: envId,
@@ -377,6 +381,14 @@ const displayPlaybook = ({
   } = env;
   const [fileName] = arg;
   const isMultiSite = await (0, _isMultiSite.isMultiSiteInSiteMeta)(appId, envId);
+  const fileMeta = await (0, _clientFileUploader.getFileMeta)(fileName);
+
+  if (fileMeta.isCompressed) {
+    console.log(_chalk.default.yellowBright('You are importing a compressed file. Validation and search-replace operation will be skipped.'));
+    skipValidate = true;
+    searchReplace = undefined;
+  }
+
   debug('Options: ', opts);
   debug('Args: ', arg);
 
@@ -481,14 +493,15 @@ Processing the SQL import for your environment...
   try {
     const {
       fileMeta: {
-        basename,
-        md5
+        basename
       },
+      md5,
       result
     } = await (0, _clientFileUploader.uploadImportSqlFileToS3)({
       app,
       env,
       fileName: fileNameToUpload,
+      fileMeta,
       progressCallback
     });
     startImportVariables.input = {

package/dist/bin/vip-logs.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 /**
- * Internal dependencies
+ * External dependencies
  */
 "use strict";
 
@@ -13,6 +13,8 @@ exports.followLogs = followLogs;
 exports.validateInputs = validateInputs;
 exports.appQuery = void 0;
 
+var _chalk = _interopRequireDefault(require("chalk"));
+
 var _command = _interopRequireDefault(require("../lib/cli/command"));
 
 var _rollbar = require("../lib/rollbar");
@@ -31,6 +33,9 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+/**
+ * Internal dependencies
+ */
 const LIMIT_MIN = 1;
 const LIMIT_MAX = 5000;
 const ALLOWED_TYPES = ['app', 'batch'];
@@ -102,14 +107,14 @@ async function followLogs(opt) {
       }); // If the first request fails we don't want to retry (it's probably not recoverable)
 
       if (isFirstRequest) {
-        console.error('Error fetching initial logs');
+        console.error(`${_chalk.default.red('Error:')} Failed to fetch logs.`);
         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(`Failed to fetch logs. Trying again in ${delay} seconds`);
+      console.error(`${_chalk.default.red('Error:')} Failed to fetch logs. Trying again in ${delay} seconds.`);
 
       _rollbar.rollbar.error(error);
     }

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

@@ -105,15 +105,11 @@ async function getFileMeta(fileName) {
     const mimeType = await detectCompressedMimeType(fileName); // TODO Only allow a subset of Mime Types...?
 
     const isCompressed = ['application/zip', 'application/gzip'].includes(mimeType);
-    debug('Calculating file md5 checksum...');
-    const md5 = await getFileMD5Hash(fileName);
-    debug(`Calculated file md5 checksum: ${md5}\n`);
     resolve({
       basename,
       fileName,
       fileSize,
-      isCompressed,
-      md5
+      isCompressed
     });
   });
 }
@@ -122,9 +118,9 @@ async function uploadImportSqlFileToS3({
   app,
   env,
   fileName,
+  fileMeta,
   progressCallback
 }) {
-  const fileMeta = await getFileMeta(fileName);
   let tmpDir;
 
   try {
@@ -152,6 +148,9 @@ async function uploadImportSqlFileToS3({
     debug(`** Compression resulted in a ${calculation} smaller file 📦 **\n`);
   }
 
+  debug('Calculating file md5 checksum...');
+  const md5 = await getFileMD5Hash(fileName);
+  debug(`Calculated file md5 checksum: ${md5}\n`);
   const result = fileMeta.fileSize < MULTIPART_THRESHOLD ? await uploadUsingPutObject({
     app,
     env,
@@ -165,6 +164,7 @@ async function uploadImportSqlFileToS3({
   });
   return {
     fileMeta,
+    md5,
     result
   };
 }

package/npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "2.7.1",
+  "version": "2.8.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

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