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

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
-## v3.23.27-1florianPat.0 - [February 17, 2025](https://github.com/florianPat/lando-core/releases/tag/v3.23.27-1florianPat.0)
+## v3.23.27-4florianPat.0 - [March 4, 2025](https://github.com/florianPat/lando-core/releases/tag/v3.23.27-4florianPat.0)
 
 ## v3.23.26 - [January 24, 2025](https://github.com/lando/core/releases/tag/v3.23.26)
 

package/app.js

@@ -113,6 +113,9 @@ module.exports = async (app, lando) => {
   // Add tooling if applicable
   app.events.on('post-init', async () => await require('./hooks/app-add-tooling')(app, lando));
 
+  // Add _init tooling for bootstrap reference
+  app.events.on('pre-bootstrap', async () => await require('./hooks/app-add-init-tooling')(app, lando));
+
   // Collect info so we can inject LANDO_INFO
   // @NOTE: this is not currently the full lando info because a lot of it requires the app to be on
   app.events.on('post-init', 10, async () => await require('./hooks/app-set-lando-info')(app, lando));

package/hooks/app-add-init-tooling.js

@@ -0,0 +1,21 @@
+'use strict';
+
+const _ = require('lodash');
+
+module.exports = async (app, lando) => {
+  if (!_.isEmpty(_.get(app, 'config.tooling', {}))) {
+    app.log.verbose('additional tooling detected');
+
+    // Add the _init tasks for the bootstrap event!
+    // TODO(flo): They are duplicated through "app-add-tooling" but I do not care for now!
+    _.forEach(require('../utils/get-tooling-tasks')(app.config.tooling, app), task => {
+      if (task.service !== '_init') {
+        return;
+      }
+
+      app.log.debug('adding app cli task %s', task.name);
+      const injectable = _.has(app, 'engine') ? app : lando;
+      app.tasks.push(require('../utils/build-tooling-task')(task, injectable));
+    });
+  }
+};

package/lib/app.js

@@ -11,8 +11,8 @@ const fs = require('node:fs');
 /*
  * Helper to init and then report
  */
-const initAndReport = (app, method = 'start') => {
-  return app.init().then(() => {
+const initAndReport = (app, method, shouldBootstrap = false) => {
+  return app.init({shouldBootstrap}).then(() => {
     app.metrics.report(method, utils.metricsParse(app));
     return Promise.resolve(true);
   });
@@ -257,6 +257,8 @@ module.exports = class App {
     .then(() => this.log.info('destroyed app.'));
   };
 
+  static isBootstrapCommand = undefined;
+
   /**
    * Initializes the app
    *
@@ -270,21 +272,39 @@ module.exports = class App {
    * @fires ready
    * @return {Promise} A Promise.
    */
-  init({noEngine = false} = {}) {
+  init({noEngine = false, shouldBootstrap = false} = {}) {
     // We should only need to initialize once, if we have just go right to app ready
     if (this.initialized) return this.events.emit('ready', this);
+    if (undefined === App.isBootstrapCommand) {
+      App.isBootstrapCommand = !fs.existsSync(this._dir);
+    }
+    const bootstrapping = App.isBootstrapCommand && shouldBootstrap && !noEngine;
+    if (bootstrapping) {
+      console.log(require('yargonaut').chalk().cyan('Looks like this is the first time to start the app. Lets bootstrap it...'));
+    }
+
+    const composeEnvFiles = require('../utils/normalize-files')(_.get(this, 'config.compose_env_file', []), this.root);
+
+    return loadPlugins(this, this._lando)
+    /**
+     * Event that only gets triggered if the app never started before (or was destroyed)
+     *
+     * @since 3.23.25
+     * @alias app.events:pre-bootstrap
+     * @event pre-bootstrap
+     * @property {App} app The app instance.
+     */
+    .then(() => bootstrapping ? this.events.emit('pre-bootstrap', this) : undefined)
     // Get compose data if we have any, otherwise set to []
-    return require('../utils/load-compose-files')(
+    .then(() => noEngine === true ? [] : require('../utils/load-compose-files')(
       _.get(this, 'config.compose', []),
       this.root,
       this._dir,
       (composeFiles, outputFilePath) =>
-        this.engine.getComposeConfig({compose: composeFiles, project: this.project, outputFilePath}),
-    )
+        this.engine.getComposeConfig({compose: composeFiles, project: this.project, outputFilePath, opts: {envFiles: composeEnvFiles}}),
+    ))
     .then(composeFileData => {
-      if (undefined !== composeFileData) {
-        this.composeData = [new this.ComposeService('compose', {}, composeFileData)];
-      }
+      this.composeData = [new this.ComposeService('compose', {}, ...composeFileData)];
       // Validate and set env files
       this.envFiles = require('../utils/normalize-files')(_.get(this, 'config.env_file', []), this.root);
       // Log some things
@@ -303,8 +323,6 @@ module.exports = class App {
      * @event pre_init
      * @property {App} app The app instance.
      */
-    .then(() => loadPlugins(this, this._lando))
-
     .then(() => this.events.emit('pre-init', this))
     // Actually assemble this thing so its ready for that engine
     .then(() => {
@@ -501,25 +519,15 @@ module.exports = class App {
    * @alias app.start
    * @fires pre_start
    * @fires post_start
+   * @fires post_bootstrap
    * @return {Promise} A Promise.
    *
    */
   start() {
     // Log
     this.log.info('starting app...');
-    const shouldBootstrap = fs.existsSync(this._dir);
 
-    return initAndReport(this)
-
-    /**
-     * Event that only gets triggered if the app never started before (or was destroyed)
-     *
-     * @since 3.22.3
-     * @alias app.events:pre-bootstrap
-     * @event pre-bootstrap
-     * @property {App} app The app instance.
-     */
-    .then(() => shouldBootstrap ? this.events.emit('pre-bootstrap', this) : undefined)
+    return initAndReport(this, 'start', true)
 
     /**
      * Event that runs before an app starts up.
@@ -551,12 +559,12 @@ module.exports = class App {
     /**
      * Event that only gets triggered if the app never started before (or was destroyed)
      *
-     * @since 3.22.3
+     * @since 3.23.25
      * @alias app.events:post-bootstrap
      * @event post-bootstrap
      * @property {App} app The app instance.
      */
-    .then(() => shouldBootstrap ? this.events.emit('post-bootstrap', this) : undefined)
+    .then(() => App.isBootstrapCommand ? this.events.emit('post-bootstrap', this) : undefined)
 
     .then(() => this.log.info('started app.'));
   };

package/lib/compose.js

@@ -77,21 +77,22 @@ const parseOptions = (opts = {}) => {
 /*
  * Helper to standardize construction of docker commands
  */
-const buildCmd = (run, name, compose, {services, cmd}, opts = {}) => {
+const buildCmd = (run, name, compose, {services, cmd, envFiles}, opts = {}) => {
   if (!name) throw new Error('Need to give this composition a project name!');
   // @TODO: we need to strip out opts.user on start/stop because we often get it as part of run
   const project = ['--project-name', name];
   const files = _.flatten(_.map(compose, unit => ['--file', unit]));
+  const envFile = _.flatten(_.map(envFiles, unit => ['--env-file', unit]));
   const options = parseOptions(opts);
   const argz = _.flatten(_.compact([services, cmd]));
-  return _.flatten([project, files, run, options, argz]);
+  return _.flatten([project, files, envFile, run, options, argz]);
 };
 
 /*
  *  Helper to build build object needed by lando.shell.sh
  */
 const buildShell = (run, name, compose, opts = {}) => ({
-  cmd: buildCmd(run, name, compose, {services: opts.services, cmd: opts.cmd}, mergeOpts(run, opts)),
+  cmd: buildCmd(run, name, compose, {services: opts.services, cmd: opts.cmd, envFiles: opts.envFiles ?? []}, mergeOpts(run, opts)),
   opts: {mode: 'spawn', cstdio: opts.cstdio, silent: opts.silent},
 });
 

package/lib/engine.js

@@ -172,7 +172,7 @@ module.exports = class Engine {
    * return lando.engine.exists(compose);
    */
   exists(data) {
-    return this.engineCmd('exists', data);
+    return this.engineCmd('exists', _.merge({}, {separator: this.separator}, data));
   };
 
   /*
@@ -506,6 +506,7 @@ module.exports = class Engine {
    * @param {String} data.project A String of the project name (Usually this is the same as the app name)
    * @param {String} [data.outputFilePath='/path/to/file.yml'] String to output path
    * @param {Object} [data.opts] Options
+   * @param {Array} [data.opts.envFiles] An Array of paths to env files
    * @return {Promise} A Promise.
    * @example
    * return lando.engine.stop(app);

package/lib/formatters.js

@@ -135,7 +135,7 @@ exports.handleInteractive = (inquiry, argv, command, lando) => lando.Promise.try
       // NOTE: We need to clone deep here otherwise any apps with interactive options get 2x all their events
       // NOTE: Not exactly clear on why app here gets conflated with the app returned from lando.getApp
       const app = _.cloneDeep(lando.getApp(argv._app.root));
-      return app.init().then(() => {
+      return app.init({noEngine: true}).then(() => {
         inquiry = exports.getInteractive(_.find(app.tasks.concat(lando.tasks), {command: command}).options, argv);
         return inquirer.prompt(_.sortBy(inquiry, 'weight'));
       });

package/lib/router.js

@@ -55,7 +55,7 @@ exports.destroy = (data, compose, docker) => retryEach(data, datum => {
 exports.exists = (data, compose, docker, ids = []) => {
   if (data.compose) return compose('getId', data).then(id => !_.isEmpty(id));
   else {
-    return docker.list()
+    return docker.list({}, data.separator)
     .each(container => {
       ids.push(container.id);
       ids.push(container.name);

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.27-1florianPat.0",
+  "version": "3.23.27-4florianPat.0",
   "author": "Florian Patruck @florianPat",
   "license": "GPL-3.0",
   "repository": "florianPat/lando-core",
@@ -247,9 +247,9 @@
     "yargs-parser"
   ],
   "dist": {
-    "integrity": "sha512-EF8oq87DSgrav9p/64DkDyDuudJ/hW3soeFWiiuZzhjIIZ52UV98g6DGiIjVVyowcVtuAL6sAf/cidZkv7s+tQ==",
-    "shasum": "7fa58d190ddcacde2bb53ede9fffc5d92c0bb42c",
-    "filename": "florianpat-lando-core-3.23.27-1florianPat.0.tgz",
-    "unpackedSize": 60965868
+    "integrity": "sha512-/98U+xsnU1BnJCQAsZZlui8fGnMYfhATamRCi/wy9j29g76GPwXAR5/smdRmEq+Ibyt6SRSvxRVLp9cC7HvERw==",
+    "shasum": "4a4b0505a255aaf87c0a7e663f143a1c43de652d",
+    "filename": "florianpat-lando-core-3.23.27-4florianPat.0.tgz",
+    "unpackedSize": 60967690
   }
 }

package/utils/build-tooling-task.js

@@ -23,7 +23,7 @@ module.exports = (config, injected) => {
   const run = answers => {
     let initToolingRunner = null;
 
-    return injected.Promise.try(() => (_.isEmpty(app.compose)) ? app.init() : true)
+    return injected.Promise.try(() => (_.isEmpty(app.compose) && '_init' !== service) ? app.init() : true)
       // Kick off the pre event wrappers
       .then(() => app.events.emit(`pre-${eventName}`, config, answers))
       // Get an interable of our commandz
@@ -74,5 +74,6 @@ module.exports = (config, injected) => {
     describe,
     run,
     options,
+    service,
   };
 };

package/utils/get-docker-bin-path.js

@@ -5,8 +5,6 @@ const path = require('path');
 
 module.exports = (platform = process.landoPlatform ?? process.platform) => {
   switch (platform) {
-    case 'darwin':
-      return '/Applications/Docker.app/Contents/Resources/bin';
     case 'linux':
       return '/usr/share/lando/bin';
     case 'win32':

package/utils/get-tasks.js

@@ -3,6 +3,7 @@
 const _ = require('lodash');
 const fs = require('fs');
 const path = require('path');
+const App = require('../lib/app');
 
 /*
  * Paths to /
@@ -40,9 +41,10 @@ const loadCacheFile = file => {
  */
 const appRunner = command => (argv, lando) => {
   const app = lando.getApp(argv._app.root);
+  const service = _.get(app.config, `tooling.${command}.service`, '');
   return lando.events.emit('pre-app-runner', app)
   .then(() => lando.events.emit('pre-command-runner', app))
-  .then(() => app.init().then(() => _.find(app.tasks, {command}).run(argv)));
+  .then(() => app.init({noEngine: '_init' === service}).then(() => _.find(app.tasks, {command}).run(argv)));
 };
 
 /*
@@ -128,7 +130,7 @@ module.exports = (config = {}, argv = {}, tasks = []) => {
 
   // If the tooling command is being called lets assess whether we can get away with engine bootstrap level
   const ids = _(config.tooling).map(task => task.id).filter(_.identity).value();
-  const level = (_.includes(ids, argv._[0])) ? getBsLevel(config, argv._[0]) : 'app';
+  const level = !App.isBootstrapCommand && (_.includes(ids, argv._[0])) ? getBsLevel(config, argv._[0]) : 'app';
 
   // Load all the tasks, remember we need to remove "disabled" tasks (eg non-object tasks) here
   _.forEach(_.get(config, 'tooling', {}), (task, command) => {

package/utils/load-compose-files.js

@@ -12,7 +12,7 @@ const remove = require('./remove');
 module.exports = async (files, dir, landoComposeConfigDir = undefined, outputConfigFunction = undefined) => {
   const composeFilePaths = _(require('./normalize-files')(files, dir)).value();
   if (_.isEmpty(composeFilePaths)) {
-    return {};
+    return [];
   }
 
   if (undefined === outputConfigFunction) {
@@ -29,5 +29,5 @@ module.exports = async (files, dir, landoComposeConfigDir = undefined, outputCon
   fs.unlinkSync(outputFile);
   remove(path.dirname(outputFile));
 
-  return result;
+  return [result];
 };