Merge branch 'edge' of github.com:lando/core into edge

Author: pirog

.gitignore

@@ -37,6 +37,9 @@ coverage/
 
 # lando
 .lando/id
+plugins/*
+!plugins/test
+!plugins/.gitkeep
 
 # docs
 .temp

app.js

@@ -92,6 +92,9 @@ module.exports = async (app, lando) => {
   // load in and parse v4 services
   app.events.on('pre-init', async () => await require('./hooks/app-add-v4-services')(app, lando));
 
+  // initialize proxy stuff
+  app.events.on('pre-init', async () => await require('./hooks/app-init-proxy')(app, lando));
+
   // add in hostname
   app.events.on('post-init', 1, async () => await require('./hooks/app-add-hostnames')(app, lando));
 
@@ -116,6 +119,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 proxy info as needed
+  app.events.on('post-init', async () => await require('./hooks/app-add-proxy-info')(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));
@@ -160,6 +166,9 @@ module.exports = async (app, lando) => {
   // i really wish thre was a better way to do this but alas i do not think there is
   app.events.on('pre-rebuild', 10, async () => await require('./hooks/app-shuffle-locals')(app, lando));
 
+  // start up proxy
+  app.events.on('pre-start', 1, async () => await require('./hooks/app-start-proxy')(app, lando));
+
   // Check for updates if the update cache is empty
   app.events.on('pre-start', 1, async () => await require('./hooks/app-check-for-updates')(app, lando));
 
@@ -184,6 +193,9 @@ module.exports = async (app, lando) => {
   // Add path info/shellenv tip if needed
   app.events.on('post-start', async () => await require('./hooks/app-add-updates-info')(app, lando));
 
+  // add proxy info as needed
+  app.events.on('post-start', async () => await require('./hooks/app-add-proxy-info')(app, lando));
+
   // Add update tip if needed
   app.events.on('post-start', async () => await require('./hooks/app-add-path-info')(app, lando));
 
@@ -199,6 +211,9 @@ module.exports = async (app, lando) => {
   // throw service not start errors
   app.events.on('post-start', 1, async () => await require('./hooks/app-check-v4-service-running')(app, lando));
 
+  // add app url scanning
+  app.events.on('post-start', 10, async () => await require('./hooks/app-add-url-scans')(app, lando));
+
   // Reset app info on a stop, this helps prevent wrong/duplicate information being reported on a restart
   app.events.on('post-stop', async () => require('./utils/get-app-info-defaults')(app));
 
@@ -238,6 +253,9 @@ module.exports = async (app, lando) => {
     app.events.on('post-start', 10, async () => await require('./hooks/app-run-legacy-scanner')(app, lando));
   }
 
+  // legacy sharing stuff
+  await require('./hooks/app-load-legacy-sharing')(app, lando);
+
   // REturn defualts
   return {
     env: {

plugins/proxy/builders/_proxy.js builders/_proxy.jsplugins/proxy/builders/_proxy.js renamed to builders/_proxy.js

@@ -88,5 +88,3 @@ tooling:
 
 plugins:
   "@lando/core": "../.."
-  "@lando/proxy": "../../plugins/proxy"
-  "@lando/scanner": "../../plugins/scanner"

examples/certs/.lando.yml

@@ -88,5 +88,3 @@ services:
 
 plugins:
   "@lando/core": "../.."
-  "@lando/proxy": "../../plugins/proxy"
-  "@lando/scanner": "../../plugins/scanner"

examples/command/.lando.yml

@@ -100,5 +100,3 @@ services:
 
 plugins:
   "@lando/core": "../.."
-  "@lando/proxy": "../../plugins/proxy"
-  "@lando/scanner": "../../plugins/scanner"

examples/mounts/.lando.yml

@@ -31,5 +31,3 @@ services:
 
 plugins:
   "@lando/core": "../../.."
-  "@lando/proxy": "../../../plugins/proxy"
-  "@lando/scanner": "../../../plugins/scanner"

examples/networking/.lando.lamp.yml

@@ -41,5 +41,3 @@ services:
 
 plugins:
   "@lando/core": "../../.."
-  "@lando/proxy": "../../../plugins/proxy"
-  "@lando/scanner": "../../../plugins/scanner"

examples/networking/.lando.lemp.yml

@@ -11,4 +11,3 @@ proxy:
 
 plugins:
   "@lando/core": "../.."
-  "@lando/proxy": "../../plugins/proxy"

examples/proxy/.lando.local.yml

@@ -103,4 +103,3 @@ services:
 
 plugins:
   "@lando/core": "../.."
-  "@lando/proxy": "../../plugins/proxy"