@florianpat/lando-core 3.23.22-test2 → 3.23.27-1florianPat.0

package/utils/get-compose-x.js

@@ -27,7 +27,7 @@ const getDockerBin = (bin, base, pathFallback = true) => {
   }
 };
 
-module.exports = ({orchestratorVersion = '2.30.3', userConfRoot = os.tmpdir()} = {}) => {
+module.exports = ({orchestratorVersion = '2.31.0', userConfRoot = os.tmpdir()} = {}) => {
   const orchestratorBin = `docker-compose-v${orchestratorVersion}`;
   switch (process.platform) {
     case 'darwin':

package/utils/get-config-defaults.js

@@ -8,20 +8,20 @@ const os = require('os');
 const getBuildEngineVersion = (platform = process.landoPlatform ?? process.platform) => {
   switch (platform) {
     case 'darwin':
-      return '4.36.0';
+      return '4.37.2';
     case 'linux':
-      return '27.3.1';
+      return '27.5.0';
     case 'win32':
-      return '4.36.0';
+      return '4.37.1';
     case 'wsl':
-      return '4.36.0';
+      return '4.37.1';
   }
 };
 
 // Default config
 const defaultConfig = options => ({
   orchestratorSeparator: '_',
-  orchestratorVersion: '2.30.3',
+  orchestratorVersion: '2.31.0',
   configSources: [],
   coreBase: path.resolve(__dirname, '..'),
   disablePlugins: [],

package/utils/get-init-runner-defaults.js

@@ -10,6 +10,7 @@ module.exports = (lando, options) => {
     lando.config.userConfRoot,
     lando.config.home,
     options.destination,
+    _.get(options, '_app', {}),
     _.cloneDeep(lando.config.appEnv),
     _.cloneDeep(lando.config.appLabels),
     _.get(options, 'initImage', 'devwithlando/util:4'),
@@ -17,7 +18,7 @@ module.exports = (lando, options) => {
   const initDir = path.join(lando.config.userConfRoot, 'init', options.name);
   const initFiles = require('./dump-compose-data')(initData, initDir);
   // Start to build out some propz and shiz
-  const project = `${lando.config.product}init` + require('./docker-composify')(options.name);
+  const project = `${lando.config.product}init` + options.name;
   const separator = lando.config.orchestratorSeparator;
   // Return
   return {

package/utils/parse-events-config.js

@@ -38,6 +38,26 @@ module.exports = (cmds, app, data, lando) => _.map(cmds, cmd => {
   // Discover the service
   const command = getCommand(cmd);
   const service = getService(cmd, data, app._defaultService);
+
+  if ('lando' === service) {
+    const yargs = require('yargs');
+    const argv = yargs(_.isArray(command) ? command.join(' ') : command).parse();
+    const $0 = _.pullAt(argv._, [0])[0];
+    const toolingTask = _.find(app.tasks, task => $0 === task.command);
+    argv._eventArgs = argv._;
+    argv.$0 = undefined;
+    argv._ = undefined;
+    argv._app = app;
+
+    if (undefined === toolingTask) {
+      throw new Error('Could not find tooling command: ' + $0);
+    }
+    return {
+      toolingTask,
+      answers: argv,
+    };
+  }
+
   // compute stdio based on compose major version
   const cstdio = _.get(app, '_config.orchestratorMV', 2) ? 'inherit' : ['inherit', 'pipe', 'pipe'];
 
@@ -67,7 +87,7 @@ module.exports = (cmds, app, data, lando) => _.map(cmds, cmd => {
       {},
         require('./build-init-runner')(_.merge(
         {},
-        require('./get-init-runner-defaults')(lando, {destination: app.root, name: app.project}),
+        require('./get-init-runner-defaults')(lando, {destination: app.root, name: app.project, _app: app}),
         {cmd, workdir: '/app'},
       )),
       {isInitEventCommand: true},

package/utils/parse-tooling-config.js

@@ -19,11 +19,11 @@ const getDynamicKeys = (answer, answers = {}) => _(answers)
  * Set SERVICE from answers and strip out that noise from the rest of
  * stuff, check answers/argv for --service or -s, validate and then remove
  */
-const handleDynamic = (config, options = {}, answers = {}, execs = {}) => {
+const handleDynamic = (config, argv, options = {}, answers = {}, execs = {}) => {
   if (_.startsWith(config.service, ':')) {
     const answer = answers[config.service.split(':')[1]];
     // Remove dynamic service option from argv
-    _.remove(process.argv, arg => _.includes(getDynamicKeys(answer, answers).concat(answer), arg));
+    _.remove(argv, arg => _.includes(getDynamicKeys(answer, answers).concat(answer), arg));
     // get the service
     const service = answers[config.service.split(':')[1]];
     // Return updated config
@@ -40,9 +40,9 @@ const handleDynamic = (config, options = {}, answers = {}, execs = {}) => {
  * the first three assuming they are [node, lando.js, options.name]'
  * Check to see if we have global lando opts and remove them if we do
  */
-const handleOpts = (config, name, argopts = []) => {
+const handleOpts = (config, name, argv, argopts = []) => {
   // Append any user specificed opts
-  argopts = argopts.concat(process.argv.slice(process.argv.findIndex(value => value === name.split(' ')[0]) + 1));
+  argopts = argopts.concat(argv.slice(argv.findIndex(value => value === name.split(' ')[0]) + 1));
   // If we have no args then just return right away
   if (_.isEmpty(argopts)) return config;
   // Return
@@ -72,9 +72,9 @@ module.exports = (cmd, service, name, options = {}, answers = {}, execs = {}) =>
   // Put into an object so we can handle "multi-service" tooling
   .map(cmd => parseCommand(cmd, service, execs))
   // Handle dynamic services
-  .map(config => handleDynamic(config, options, answers, execs))
+  .map(config => handleDynamic(config, answers._eventArgs ?? process.argv, options, answers, execs))
   // Add in any argv extras if they've been passed in
-  .map(config => handleOpts(config, name, handlePassthruOpts(options, answers)))
+  .map(config => handleOpts(config, name, answers._eventArgs ?? process.argv, handlePassthruOpts(options, answers)))
   // Wrap the command in /bin/sh if that makes sense
   .map(config => _.merge({}, config, {command: require('./shell-escape')(config.command, true, config.args, config.exec)})) // eslint-disable-line max-len
   // Add any args to the command and compact to remove undefined

package/utils/to-lando-container.js

@@ -1,22 +1,36 @@
 'use strict';
 
-module.exports = ({Labels, Id, Status}, separator = '_') => {
+const path = require('path');
+
+module.exports = ({Labels, Id, Status}, separator = '_', src = []) => {
   // Get name of docker container.
   const app = Labels['com.docker.compose.project'];
   const service = Labels['com.docker.compose.service'];
   const num = Labels['com.docker.compose.container-number'];
   const lando = Labels['io.lando.container'];
   const special = Labels['io.lando.service-container'];
+
+  // if we have io.lando.root and io.lando.
+  if (Labels['io.lando.root'] && Labels['io.lando.landofiles']) {
+    src = Labels['io.lando.landofiles'].split(',').map(landofile => path.join(Labels['io.lando.root'], landofile));
+
+  // or legacy support for Labels['io.lando.src']
+  } else if (Labels['io.lando.src']) {
+    src = Labels['io.lando.src'].split(',');
+
+  // or its just unknown
+  } else src = 'unknown';
+
   // Build generic container.
   return {
     id: Id,
     service: service,
     name: [app, service, num].join(separator),
     app: (special !== 'TRUE') ? app : '_global_',
-    src: (Labels['io.lando.src']) ? Labels['io.lando.src'].split(',') : 'unknown',
     kind: (special !== 'TRUE') ? 'app' : 'service',
     lando: (lando === 'TRUE') ? true : false,
     instance: Labels['io.lando.id'] || 'unknown',
     status: Status,
+    src,
   };
 };