@automattic/vip 3.17.1 → 3.18.0

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

@@ -3,6 +3,7 @@
 exports.__esModule = true;
 exports.bootstrapLando = bootstrapLando;
 exports.checkEnvHealth = checkEnvHealth;
+exports.getProxyContainer = getProxyContainer;
 exports.isEnvUp = isEnvUp;
 exports.landoDestroy = landoDestroy;
 exports.landoExec = landoExec;
@@ -12,6 +13,7 @@ exports.landoRebuild = landoRebuild;
 exports.landoShell = landoShell;
 exports.landoStart = landoStart;
 exports.landoStop = landoStop;
+exports.removeProxyCache = removeProxyCache;
 exports.validateDockerInstalled = validateDockerInstalled;
 var _chalk = _interopRequireDefault(require("chalk"));
 var _debug = _interopRequireDefault(require("debug"));
@@ -63,7 +65,7 @@ async function getLandoConfig() {
     await (0, _promises2.mkdir)(fakeHomeDir, {
       recursive: true
     });
-  } catch (err) {
+  } catch {
     // Ignore
   }
   const config = {
@@ -246,6 +248,17 @@ async function getBridgeNetwork(lando) {
     return null;
   }
 }
+async function removeProxyCache(lando) {
+  const {
+    userConfRoot,
+    proxyCache
+  } = lando.config;
+  try {
+    await (0, _promises2.unlink)(_nodePath.default.join(userConfRoot, 'cache', proxyCache ?? 'proxyCache'));
+  } catch {
+    // Swallow
+  }
+}
 async function cleanUpLandoProxy(lando) {
   const network = await getBridgeNetwork(lando);
   if (network?.Containers && Object.keys(network.Containers).length === 1) {
@@ -257,6 +270,7 @@ async function cleanUpLandoProxy(lando) {
     } catch (err) {
       debug('Error removing proxy container: %s', err.message);
     }
+    await removeProxyCache(lando);
   }
 }
 async function landoStop(lando, instancePath) {
@@ -525,6 +539,20 @@ async function landoShell(lando, instancePath, service, user, command) {
     _app: app
   });
 }
+async function getProxyContainer(lando) {
+  const proxyContainerName = lando.config.proxyContainer;
+  const {
+    docker
+  } = lando.engine;
+  const containers = await docker.listContainers({
+    all: true
+  });
+  if (containers.some(container => container.Names.includes(`/${proxyContainerName}`))) {
+    const container = docker.getContainer(proxyContainerName);
+    return container.inspect();
+  }
+  return null;
+}
 
 /**
  * Sometimes the proxy network seems to disapper leaving only orphant stopped proxy container.
@@ -535,21 +563,12 @@ async function landoShell(lando, instancePath, service, user, command) {
  * can safely add a network and a new proxy container.
  */
 async function ensureNoOrphantProxyContainer(lando) {
-  const proxyContainerName = lando.config.proxyContainer;
-  const docker = lando.engine.docker;
-  const containers = await docker.listContainers({
-    all: true
-  });
-  const proxyContainerExists = containers.some(container => container.Names.includes(`/${proxyContainerName}`));
-  if (!proxyContainerExists) {
-    return;
-  }
-  const proxyContainer = docker.getContainer(proxyContainerName);
-  const status = await proxyContainer.inspect();
-  if (status.State.Running) {
-    return;
+  const proxyContainer = await getProxyContainer(lando);
+  if (proxyContainer && !proxyContainer.State.Running) {
+    const containerName = proxyContainer.Name.startsWith('/') ? proxyContainer.Name.slice(1) : proxyContainer.Name;
+    const container = lando.engine.docker.getContainer(containerName);
+    await container.remove();
   }
-  await proxyContainer.remove();
 }
 function validateDockerInstalled(lando) {
   const {

package/dist/lib/dev-environment/env-vars.js

@@ -0,0 +1,75 @@
+"use strict";
+
+exports.__esModule = true;
+exports.getEnvFilePath = getEnvFilePath;
+exports.parseEnvValue = parseEnvValue;
+exports.preparseEnvData = preparseEnvData;
+exports.quoteEnvValue = quoteEnvValue;
+exports.readEnvFile = readEnvFile;
+exports.updateEnvFile = updateEnvFile;
+var _promises = require("node:fs/promises");
+var _nodePath = require("node:path");
+var _devEnvironmentCore = require("./dev-environment-core");
+var _devEnvironment = require("../constants/dev-environment");
+function preparseEnvData(data) {
+  return data.split(/\r?\n/).map(line => line.trim()).filter(line => line && !line.startsWith('#'));
+}
+function parseEnvValue(value) {
+  if (value.startsWith('"') && value.endsWith('"')) {
+    return value.slice(1, -1).replace(/\\(["$\\nrt])/g, (match, char) => {
+      switch (char) {
+        case '"':
+        case '$':
+        case '\\':
+          return char;
+        case 'n':
+          return '\n';
+        case 'r':
+          return '\r';
+        case 't':
+          return '\t';
+        default:
+          return match;
+      }
+    });
+  }
+  if (value.startsWith("'") && value.endsWith("'")) {
+    return value.slice(1, -1).replace(/\\'/g, "'");
+  }
+  return value;
+}
+function quoteEnvValue(value) {
+  return `"${value.replace(/[\\"$\n\r\t]/g, match => {
+    switch (match) {
+      case '\\':
+      case '"':
+      case '$':
+        return '\\' + match;
+      case '\n':
+        return '\\n';
+      case '\r':
+        return '\\r';
+      case '\t':
+        return '\\t';
+      default:
+        return match;
+    }
+  })}"`;
+}
+async function getEnvFilePath(slug, checkEnvExists = true) {
+  const environmentPath = (0, _devEnvironmentCore.getEnvironmentPath)(slug);
+  if (checkEnvExists && !(await (0, _devEnvironmentCore.doesEnvironmentExist)(environmentPath))) {
+    throw new Error(_devEnvironment.DEV_ENVIRONMENT_NOT_FOUND);
+  }
+  return (0, _nodePath.join)(environmentPath, '.env');
+}
+async function readEnvFile(slug) {
+  const name = await getEnvFilePath(slug);
+  const content = await (0, _promises.readFile)(name, 'utf-8');
+  return preparseEnvData(content);
+}
+async function updateEnvFile(slug, content) {
+  const name = await getEnvFilePath(slug, false);
+  await (0, _promises.writeFile)(`${name}.tmp`, content, 'utf-8');
+  await (0, _promises.rename)(`${name}.tmp`, name);
+}