@florianpat/lando-core 3.23.3-compose → 3.23.22-test1

package/utils/run-tasks.js

@@ -35,8 +35,9 @@ module.exports = async (tasks, {
     fallbackRendererOptions = rendererOptions;
   }
 
-  // if terminal is DUMB then force the verbose renderer
-  if (process?.env?.TERM === 'dumb') renderer = 'verbose';
+  // some sitautions just need the bare minimum
+  if (process?.env?.TERM === 'dumb') renderer = 'simple';
+  if (process?.env?.CI && !require('is-interactive')()) renderer = 'simple';
 
   const defaults = {
     ctx: {data: {}, errors: [], results: [], skipped: 0, ran: 0, total: 0},

package/utils/setup-metrics.js

@@ -18,10 +18,19 @@ const getMetricsContext = () => {
 module.exports = (log, config) => {
   const Metrics = require('./../lib/metrics');
   const command = _.get(config, 'command._', 'unknown');
+
+  // group by endpoints and resolve multiples
+  const endpoints = _(_.groupBy(config.stats, 'url'))
+    .map((data, url) => ({
+      url,
+      report: data.map(data => data.report).every(report => report === true),
+    }))
+    .value();
+
   return new Metrics({
     log,
     id: config.id,
-    endpoints: config.stats,
+    endpoints,
     data: {
       command: `lando ${command}`,
       context: getMetricsContext(),

package/utils/shutdown-os.js

@@ -6,11 +6,12 @@ module.exports = ({
   message = 'Lando wants to restart your computer',
   password = undefined,
   type = 'restart',
-  wait = process.platform === 'win32' ? 5 : 'now',
+  wait = process.landoPlatform === 'win32' || process.platform === 'win32' ? 5 : 'now',
+  platform = process.landoPlatform ?? process.platform,
 } = {}) => {
   debug('shutdown with %o %o', type, {message, wait});
 
-  switch (process.platform) {
+  switch (platform) {
     case 'darwin':
       args.push('shutdown');
       // handle the restart type
@@ -48,6 +49,10 @@ module.exports = ({
       args.push('/c');
       args.push(message);
 
-      return require('./run-command')('shutdown', args, {debug});
+      return require('./run-command')('shutdown.exe', args, {debug});
+    case 'wsl':
+      args.push('-Command');
+      args.push(`wsl --terminate ${process.env.WSL_DISTRO_NAME}`);
+      return require('./run-command')('powershell.exe', args, {debug});
   }
 };

package/utils/spawn-sync-stringer.js

@@ -4,6 +4,7 @@ const {spawnSync} = require('child_process');
 
 module.exports = (...args) => {
   const result = spawnSync(...args);
+
   // stringify and trim
   result.stdout = result.stdout.toString().trim();
   result.stderr = result.stderr.toString().trim();

package/utils/update-shell-profile.js

@@ -6,6 +6,12 @@ const os = require('os');
 const read = require('./read-file');
 const write = require('./write-file');
 
+const trim = (data = []) => {
+  while (data.length > 0 && data[data.length - 1] === '') data.pop();
+  data.push('');
+  return data;
+};
+
 module.exports = (file, updates = []) => {
   // create empty file if it doesnt exist first
   if (!fs.existsSync(file)) {
@@ -17,9 +23,7 @@ module.exports = (file, updates = []) => {
     // get the content
     const content = read(file);
     // split into lines
-    const lines = content.split('\n');
-    // if we end up with second to last line that is empty then pop
-    if (lines[lines.length - 2].trim() === '') lines.pop();
+    const lines = trim(content.split('\n'));
 
     // loops through the updates and add/update as needed
     for (const [update, search] of updates) {
@@ -31,11 +35,8 @@ module.exports = (file, updates = []) => {
       }
     }
 
-    // if the last element doesnt contain a newline
-    if (!lines[lines.length - 1].includes(os.EOL)) lines.push(os.EOL);
-
     // Write the modified content back to the file
-    write(file, lines.join(os.EOL));
+    write(file, `${trim(lines).join(os.EOL)}${os.EOL}`);
 
   // handle errors
   } catch (error) {

package/utils/validate-ca.js

@@ -0,0 +1,31 @@
+'use strict';
+
+const forge = require('node-forge');
+const read = require('./read-file');
+
+module.exports = (cert, key, {
+  debug = require('debug')('@lando/validate-script'),
+} = {}) => {
+  try {
+    cert = forge.pki.certificateFromPem(read(cert));
+    key = forge.pki.privateKeyFromPem(read(key));
+
+    // verify the signature using the public key in the CA certificate
+    const md = forge.md.sha256.create();
+    md.update('taanab', 'utf8');
+    const signature = key.sign(md);
+
+    // if they dont match then throw
+    if (!cert.publicKey.verify(md.digest().bytes(), signature)) {
+      debug('CA and its private key do not match');
+      return false;
+    }
+
+    // otherwise we are good
+    return true;
+  } catch (error) {
+    debug('something is wrong with the CA %o', error.message);
+    debug('%o', error);
+    return false;
+  }
+};

package/utils/winpath-2-wslpath.js

@@ -0,0 +1,6 @@
+'use strict';
+
+module.exports = path => {
+  const {stdout} = require('./spawn-sync-stringer')('wslpath', ['-u', path], {encoding: 'utf-8'});
+  return stdout.trim();
+};

package/utils/wslpath-2-winpath.js

@@ -0,0 +1,6 @@
+'use strict';
+
+module.exports = path => {
+  const {stdout} = require('./spawn-sync-stringer')('wslpath', ['-w', path], {encoding: 'utf-8'});
+  return stdout.trim();
+};

package/hooks/lando-dep-check.js

@@ -1,26 +0,0 @@
-'use strict';
-
-module.exports = async lando => {
-  // only run if engine bootstrap or above and if engine/orchestrator have been installed
-  if (lando._bootstrapLevel >= 3) {
-    lando.log.verbose('build-engine exists: %s', lando.engine.dockerInstalled);
-    lando.log.verbose('orchestrator exists: %s', lando.engine.composeInstalled);
-
-    // BUILD ENGINE
-    if (lando.engine.dockerInstalled === false) {
-      if (lando.cli) {
-        const dep = process.platform === 'linux' ? 'DOCKER ENGINE' : 'DOCKER DESKTOP';
-        console.error(lando.cli.makeArt('noDockerDep', dep));
-        process.exit(1);
-      } else throw Error('docker could not be located!');
-    }
-
-    // ORCHESTRATOR
-    if (lando.engine.composeInstalled === false) {
-      if (lando.cli) {
-        console.error(lando.cli.makeArt('noDockerDep', 'DOCKER COMPOSE'));
-        process.exit(1);
-      } else throw Error('docker-compose could not be located!');
-    }
-  }
-};