@florianpat/lando-core 3.23.22-test2 → 3.23.22

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
-## v3.23.22-test2 - [January 3, 2025](https://github.com/florianPat/lando-core/releases/tag/v3.23.22-test2)
+## v3.23.22 - [January 6, 2025](https://github.com/florianPat/lando-core/releases/tag/v3.23.22)
 
 ## v3.23.22 - [December 17, 2024](https://github.com/lando/core/releases/tag/v3.23.22)
 

package/builders/_init.js

@@ -17,7 +17,7 @@ module.exports = {
     dataHome: null,
   },
   builder: (parent, config) => class LandoInit extends parent {
-    constructor(userConfRoot, home, app, env = {}, labels = {}, image = 'devwithlando/util:4') {
+    constructor(userConfRoot, home, app, _app, env = {}, labels = {}, image = 'devwithlando/util:4') {
       // Basic Init service
       const initService = {
         services: {
@@ -36,7 +36,7 @@ module.exports = {
       initService.services.init.environment.LANDO_SERVICE_TYPE = 'init';
       initService.services.init.labels['io.lando.service-container'] = 'TRUE';
       initService.services.init.labels['io.lando.init-container'] = 'TRUE';
-      super('init', _.merge({}, config, {env, home, labels, userConfRoot}), initService);
+      super('init', _.merge({}, config, {env, home, labels, userConfRoot, _app}), initService);
     };
   },
 };

package/hooks/app-run-events.js

@@ -3,33 +3,33 @@
 const _ = require('lodash');
 const remove = require('../utils/remove');
 const path = require('path');
+const formatters = require('../lib/formatters');
 
 module.exports = async (app, lando, cmds, data, event) => {
   const eventCommands = require('./../utils/parse-events-config')(cmds, app, data, lando);
-  // add perm sweeping to all v3 services
-  if (!_.isEmpty(eventCommands)) {
-    const permsweepers = _(eventCommands)
-      .filter(command => command.api === 3)
-      .map(command => ({id: command.id, services: _.get(command, 'opts.services', [])}))
-      .uniqBy('id')
-      .value();
-    lando.log.debug('added preemptive perm sweeping to evented v3 services %j', permsweepers.map(s => s.id));
-    _.forEach(permsweepers, ({id, services}) => {
-      eventCommands.unshift({
-        id,
-        cmd: '/helpers/user-perms.sh --silent',
-        compose: app.compose,
-        project: app.project,
-        opts: {
-          mode: 'attach',
-          user: 'root',
-          services,
-        },
-      });
-    });
-  }
   const injectable = _.has(app, 'engine') ? app : lando;
-  return injectable.engine.run(eventCommands).catch(err => {
+
+  const splitEventCommands = [];
+  while (!_.isEmpty(eventCommands)) {
+    splitEventCommands.push(
+      _.takeWhile(eventCommands,
+        (eventCommand, index) => index === 0 || (!!eventCommand.toolingTask === !!eventCommands[index - 1].toolingTask),
+      ),
+    );
+    eventCommands.splice(0, _.last(splitEventCommands).length);
+  }
+
+  return lando.Promise.mapSeries(splitEventCommands, eventCommands => {
+    return lando.Promise.mapSeries(eventCommands, eventCommand => {
+      if (undefined !== eventCommand.toolingTask) {
+        const inquiry = formatters.getInteractive(eventCommand.toolingTask.options, eventCommand.answers);
+        return formatters.handleInteractive(inquiry, eventCommand.answers, eventCommand.toolingTask.command, lando)
+          .then(answers => eventCommand.toolingTask.run(_.merge(eventCommand.answers, answers)));
+      } else {
+        return injectable.engine.run(eventCommands);
+      }
+    });
+  }).catch(err => {
     const command = _.tail(event.split('-')).join('-');
     if (app.addMessage) {
       const message = _.trim(_.get(err, 'message')) || 'UNKNOWN ERROR';

package/lib/app.js

@@ -57,7 +57,7 @@ module.exports = class App {
      * @alias app.name
      */
     this.name = require('../utils/slugify')(name);
-    this.project = require('../utils/docker-composify')(this.name);
+    this.project = this.name;
     this._serviceApi = 3;
     this._config = lando.config;
     this._defaultService = 'appserver';
@@ -515,11 +515,11 @@ module.exports = class App {
      * Event that only gets triggered if the app never started before (or was destroyed)
      *
      * @since 3.22.3
-     * @alias app.events:bootstrap
-     * @event bootstrap
+     * @alias app.events:pre-bootstrap
+     * @event pre-bootstrap
      * @property {App} app The app instance.
      */
-    .then(() => shouldBootstrap ? this.events.emit('bootstrap', this) : undefined)
+    .then(() => shouldBootstrap ? this.events.emit('pre-bootstrap', this) : undefined)
 
     /**
      * Event that runs before an app starts up.
@@ -547,6 +547,17 @@ module.exports = class App {
      * @event post_start
      */
     .then(() => this.events.emit('post-start'))
+
+    /**
+     * Event that only gets triggered if the app never started before (or was destroyed)
+     *
+     * @since 3.22.3
+     * @alias app.events:post-bootstrap
+     * @event post-bootstrap
+     * @property {App} app The app instance.
+     */
+    .then(() => shouldBootstrap ? this.events.emit('post-bootstrap', this) : undefined)
+
     .then(() => this.log.info('started app.'));
   };
 

package/lib/docker.js

@@ -92,7 +92,7 @@ module.exports = class Landerode extends Dockerode {
     // Filter by app name if an app name was given.
     .then(containers => {
       if (options.project) return _.filter(containers, c => c.app === options.project);
-      else if (options.app) return _.filter(containers, c => c.app === require('../utils/docker-composify')(options.app)); // eslint-disable-line max-len
+      else if (options.app) return _.filter(containers, c => c.app === options.app);
       return containers;
     })
     // Then finally filter by everything else

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@florianpat/lando-core",
   "description": "The libraries that power all of Lando. Fork by flo for compose integration",
-  "version": "3.23.22-test2",
+  "version": "3.23.22",
   "author": "Florian Patruck @florianPat",
   "license": "GPL-3.0",
   "repository": "florianPat/lando-core",
@@ -247,9 +247,9 @@
     "yargs-parser"
   ],
   "dist": {
-    "integrity": "sha512-rkbqOjZ703n2aGFlo7akhLeCZLKoo+hI1X9vP5Lq7MMETAm+Oqgihx2/G0fbNSQCDz9t0gZsqeDlcxr4fB1TOw==",
-    "shasum": "f9f769cbf15f8723079d17ceb64217090bc32606",
-    "filename": "florianpat-lando-core-3.23.22-test2.tgz",
-    "unpackedSize": 60947206
+    "integrity": "sha512-7Ak4ffLOApUfus6mu06+SGYIHKtpDFx45ACv5gQhuNtY8JgE/xyPL5EwCabkQXkZhwHKkN8nQXRUdFk9d7Tq/w==",
+    "shasum": "1f59804c71e8e5ddad072d8fa102ad50d6f3d956",
+    "filename": "florianpat-lando-core-3.23.22.tgz",
+    "unpackedSize": 60948228
   }
 }

package/utils/build-tooling-task.js

@@ -36,7 +36,7 @@ module.exports = (config, injected) => {
               {},
               require('./build-init-runner')(_.merge(
                 {},
-                require('./get-init-runner-defaults')(app._lando, {destination: app.root, name: app.project}),
+                require('./get-init-runner-defaults')(app._lando, {destination: app.root, name: app.project, _app: app}),
                 {cmd: command, workdir: '/app', env},
               )),
             );

package/utils/get-app.js

@@ -23,8 +23,7 @@ module.exports = (files, userConfRoot) => {
   if (!config.name) return {};
   // cast the name to a string...just to make sure.
   config.name = require('../utils/slugify')(config.name);
-  // slugify project
-  config.project = require('../utils/docker-composify')(config.name);
+  config.project = config.name;
 
   return _.merge({}, config, {
     configFiles: files,

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