@automattic/vip 2.24.0 → 2.24.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Changelog
 
+## 2.24.1 (10 Dec 2022)
+
+- #1193 Fix regression in vip dev-env import sql related to the fact we don't mount User's home dir anymore
+
 ## 2.24.0 (06 Dec 2022)
 
 - #1139 fix(dev-env): Fall back to copy when rename fails due to EXDEV

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

@@ -65,9 +65,7 @@ const examples = [{
     }
     const importArg = ['wp', 'db', 'import', inContainerPath];
     await (0, _devEnvironmentCore.exec)(lando, slug, importArg);
-    if (searchReplace && searchReplace.length && !inPlace) {
-      _fs.default.unlinkSync(resolvedPath);
-    }
+    _fs.default.unlinkSync(resolvedPath);
     const cacheArg = ['wp', 'cache', 'flush'];
     await (0, _devEnvironmentCore.exec)(lando, slug, cacheArg);
     try {

package/dist/lib/dev-environment/dev-environment-core.js

@@ -20,6 +20,7 @@ exports.resolveImportPath = resolveImportPath;
 exports.startEnvironment = startEnvironment;
 exports.stopEnvironment = stopEnvironment;
 exports.updateEnvironment = updateEnvironment;
+exports.writeEnvironmentData = writeEnvironmentData;
 var _debug = _interopRequireDefault(require("debug"));
 var _xdgBasedir = _interopRequireDefault(require("xdg-basedir"));
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
@@ -57,7 +58,6 @@ const nginxFileTemplatePath = _path.default.join(__dirname, '..', '..', '..', 'a
 const landoFileName = '.lando.yml';
 const nginxFileName = 'extra.conf';
 const instanceDataFileName = 'instance_data.json';
-const homeDirPathInsideContainers = '/user';
 const uploadPathString = 'uploads';
 const nginxPathString = 'nginx';
 async function startEnvironment(lando, slug, options) {
@@ -236,6 +236,20 @@ function readEnvironmentData(slug) {
   }
   return instanceData;
 }
+
+/**
+ * Writes the instance data.
+ *
+ * @param {string} slug Env slug
+ * @param {InstanceData} data instance data
+ * @returns {Promise} Promise
+ */
+function writeEnvironmentData(slug, data) {
+  debug('Will try to write instance data for environment', slug);
+  const instancePath = getEnvironmentPath(slug);
+  const instanceDataTargetPath = _path.default.join(instancePath, instanceDataFileName);
+  return _fs.default.promises.writeFile(instanceDataTargetPath, JSON.stringify(data, null, 2));
+}
 async function prepareLandoEnv(instanceData, instancePath) {
   const landoFile = await _ejs.default.renderFile(landoFileTemplatePath, instanceData);
   const nginxFile = await _ejs.default.renderFile(nginxFileTemplatePath, instanceData);
@@ -345,7 +359,7 @@ async function getApplicationInformation(appId, envType) {
 }
 async function resolveImportPath(slug, fileName, searchReplace, inPlace) {
   debug(`Will try to resolve path - ${fileName}`);
-  let resolvedPath = (0, _devEnvironmentCli.resolvePath)(fileName);
+  const resolvedPath = (0, _devEnvironmentCli.resolvePath)(fileName);
   const instancePath = getEnvironmentPath(slug);
   debug(`Instance path for ${slug} is ${instancePath}`);
   const environmentExists = _fs.default.existsSync(instancePath);
@@ -359,6 +373,7 @@ async function resolveImportPath(slug, fileName, searchReplace, inPlace) {
   if (_fs.default.lstatSync(resolvedPath).isDirectory()) {
     throw new _userError.default(`The provided file ${resolvedPath} is a directory. Please point to a sql file.`);
   }
+  let baseName;
 
   // Run Search and Replace if the --search-replace flag was provided
   if (searchReplace && searchReplace.length) {
@@ -372,36 +387,18 @@ async function resolveImportPath(slug, fileName, searchReplace, inPlace) {
     if (typeof outputFileName !== 'string') {
       throw new Error('Unable to determine location of the intermediate search & replace file.');
     }
-    const baseName = _path.default.basename(outputFileName);
-    resolvedPath = _path.default.join(instancePath, baseName);
-    try {
-      _fs.default.renameSync(outputFileName, resolvedPath);
-      debug(`Renamed ${outputFileName} to ${resolvedPath}`);
-    } catch (err) {
-      if (err.code !== 'EXDEV') {
-        throw err;
-      }
-      debug('Could not rename across filesystems. Copying the file instead.');
-      _fs.default.copyFileSync(outputFileName, resolvedPath);
-      debug(`Copied ${outputFileName} to ${resolvedPath}`);
-      _fs.default.unlinkSync(outputFileName);
-      debug(`Removed ${outputFileName}`);
-    }
-  }
-
-  /**
-   * Docker container does not have acces to the host filesystem.
-   * However lando maps os.homedir() to /user in the container. So if we replace the path in the same way
-   * in the Docker container will get the file from within the mapped volume under /user.
-   */
-  let inContainerPath = resolvedPath.replace(_os.default.homedir(), homeDirPathInsideContainers);
-  if (_path.default.sep === '\\') {
-    // Because the file path generated for windows will have \ instead of / we need to replace that as well so that the path inside the container (unix) still works.
-    inContainerPath = inContainerPath.replace(/\\/g, '/');
+    baseName = _path.default.basename(outputFileName);
+  } else {
+    baseName = _path.default.basename(resolvedPath);
   }
+  const targetPath = _path.default.join(instancePath, baseName);
+  const inContainerPath = `/app/${baseName}`;
+  debug(`Copying ${resolvedPath} to ${targetPath}`);
+  _fs.default.copyFileSync(resolvedPath, targetPath, _fs.default.constants.COPYFILE_FICLONE);
+  debug(`Copied ${resolvedPath} to ${targetPath}`);
   debug(`Import file path ${resolvedPath} will be mapped to ${inContainerPath}`);
   return {
-    resolvedPath,
+    resolvedPath: targetPath,
     inContainerPath
   };
 }

package/dist/lib/dev-environment/dev-environment-lando.js

@@ -21,6 +21,8 @@ var _build = _interopRequireDefault(require("lando/plugins/lando-tooling/lib/bui
 var _chalk = _interopRequireDefault(require("chalk"));
 var _app = _interopRequireDefault(require("lando/lib/app"));
 var _userError = _interopRequireDefault(require("../user-error"));
+var _dns = _interopRequireDefault(require("dns"));
+var _devEnvironmentCore = require("./dev-environment-core");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * 
@@ -97,6 +99,26 @@ async function landoRebuild(lando, instancePath) {
 }
 function addHooks(app, lando) {
   app.events.on('post-start', 1, () => healthcheckHook(app, lando));
+  lando.events.on('pre-engine-build', 5, async data => {
+    const instanceData = (0, _devEnvironmentCore.readEnvironmentData)(app._name);
+    let registryResolvable = false;
+    try {
+      registryResolvable = (await _dns.default.promises.lookup('ghcr.io')).address || false;
+      debug('Registry ghcr.io is resolvable');
+    } catch (err) {
+      debug('Registry ghcr.io is not resolvable, image pull might be broken.');
+      registryResolvable = false;
+    }
+    data.opts.pull = registryResolvable && instanceData.pullAfter < Date.now();
+    if (Array.isArray(data.opts.pullable) && Array.isArray(data.opts.local) && data.opts.local.length === 0 && !data.opts.pull) {
+      data.opts.local = data.opts.pullable;
+      data.opts.pullable = [];
+    }
+    if (data.opts.pull || !instanceData.pullAfter) {
+      instanceData.pullAfter = Date.now() + 7 * 24 * 60 * 60 * 1000;
+      (0, _devEnvironmentCore.writeEnvironmentData)(app._name, instanceData);
+    }
+  });
 }
 const healthChecks = {
   database: 'mysql -uroot --silent --execute "SHOW DATABASES;"',

package/npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "2.24.0",
+  "version": "2.24.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -4558,6 +4558,7 @@
             "@types/node": "*",
             "anymatch": "^3.0.3",
             "fb-watchman": "^2.0.0",
+            "fsevents": "^2.1.2",
             "graceful-fs": "^4.2.4",
             "jest-regex-util": "^26.0.0",
             "jest-serializer": "^26.6.2",
@@ -5297,6 +5298,7 @@
       "requires": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
+        "fsevents": "~2.3.2",
         "glob-parent": "~5.1.2",
         "is-binary-path": "~2.1.0",
         "is-glob": "~4.0.1",
@@ -7742,6 +7744,13 @@
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
+    "fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "optional": true
+    },
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -9339,6 +9348,7 @@
         "@types/node": "*",
         "anymatch": "^3.0.3",
         "fb-watchman": "^2.0.0",
+        "fsevents": "^2.3.2",
         "graceful-fs": "^4.2.4",
         "jest-regex-util": "^27.0.6",
         "jest-serializer": "^27.0.6",
@@ -10220,6 +10230,14 @@
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
           "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw=="
         },
+        "cli-table": {
+          "version": "0.3.11",
+          "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.11.tgz",
+          "integrity": "sha512-IqLQi4lO0nIB4tcdTpN4LCB9FI3uqrJZK7RC515EnhZ6qBaglkIgICb1wjeAqpdoOabm1+SuQtkXIPdYC93jhQ==",
+          "requires": {
+            "colors": "1.0.3"
+          }
+        },
         "cliui": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
@@ -12217,9 +12235,9 @@
       "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="
     },
     "prettier": {
-      "version": "npm:wp-prettier@2.0.5",
-      "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-2.0.5.tgz",
-      "integrity": "sha512-5GCgdeevIXwR3cW4Qj5XWC5MO1iSCz8+IPn0mMw6awAt/PBiey8yyO7MhePRsaMqghJAhg6Q3QLYWSnUHWkG6A==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz",
+      "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==",
       "dev": true
     },
     "pretty-format": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "2.24.0",
+  "version": "2.24.1",
   "description": "The VIP Javascript library & CLI",
   "main": "index.js",
   "bin": {
@@ -53,7 +53,7 @@
     "prepare": "npm run clean && npm run build",
     "postinstall": "node ./helpers/check-version.js",
     "build": "babel src -d dist",
-    "build:watch": "babel src -d dist --watch",
+    "build:watch": "babel src -d dist --watch --source-maps",
     "flow": "flow",
     "jest": "jest",
     "lint": "eslint index.js src __tests__",
@@ -107,7 +107,7 @@
     "flow-bin": "0.190.1",
     "jest": "27.2.1",
     "nock": "13.0.11",
-    "prettier": "npm:wp-prettier@2.0.5",
+    "prettier": "^2.0.5",
     "publish-please": "5.5.2",
     "rimraf": "3.0.2"
   },