Seperate loading global and local plugins

Author: soapy1

internal/plugin/manager.go

@@ -22,6 +22,7 @@ import (
 	"github.com/hashicorp/vagrant-plugin-sdk/internal-shared/cacher"
 	"github.com/hashicorp/vagrant-plugin-sdk/internal-shared/cleanup"
 	"github.com/hashicorp/vagrant-plugin-sdk/internal-shared/protomappers"
+	"github.com/hashicorp/vagrant/internal/server/proto/ruby_vagrant"
 	"github.com/hashicorp/vagrant/internal/serverclient"
 )
 
@@ -137,7 +138,32 @@ func (m *Manager) LegacyEnabled() bool {
 
 // Load legacy Ruby based Vagrant plugins using a
 // running Vagrant runtime
-func (m *Manager) LoadLegacyPlugins(
+func (m *Manager) LoadLocalLegacyPlugins(
+	c *serverclient.RubyVagrantClient, // Client connection to the Legacy Ruby Vagrant server
+	r plugin.ClientProtocol, // go-plugin client connection to Ruby plugin server
+	path string, // project plugin path
+) (err error) {
+	m.m.Lock()
+	defer m.m.Unlock()
+
+	m.logger.Trace("loading ruby based legacy vagrant plugins")
+
+	plugins, err := c.GetLocalPlugins(path)
+	if err != nil {
+		m.logger.Trace("failed to fetch ruby based legacy vagrant plugin information",
+			"error", err,
+		)
+
+		return
+	}
+
+	err = m.RegisterLegacyPlugins(c, r, plugins)
+	return
+}
+
+// Load legacy Ruby based Vagrant plugins using a
+// running Vagrant runtime
+func (m *Manager) LoadGlobalLegacyPlugins(
 	c *serverclient.RubyVagrantClient, // Client connection to the Legacy Ruby Vagrant server
 	r plugin.ClientProtocol, // go-plugin client connection to Ruby plugin server
 ) (err error) {
@@ -151,15 +177,23 @@ func (m *Manager) LoadLegacyPlugins(
 
 	m.logger.Trace("loading ruby based legacy vagrant plugins")
 
-	plugins, err := c.GetPlugins()
+	plugins, err := c.GetGlobalPlugins()
 	if err != nil {
 		m.logger.Trace("failed to fetch ruby based legacy vagrant plugin information",
 			"error", err,
 		)
 
 		return
 	}
+	err = m.RegisterLegacyPlugins(c, r, plugins)
+	return
+}
 
+func (m *Manager) RegisterLegacyPlugins(
+	c *serverclient.RubyVagrantClient,
+	r plugin.ClientProtocol,
+	plugins []*ruby_vagrant.Plugin,
+) (err error) {
 	for _, p := range plugins {
 		m.logger.Info("loading ruby based legacy vagrant plugin",
 			"name", p.Name,

internal/runner/runner.go

@@ -125,7 +125,7 @@ func New(opts ...Option) (*Runner, error) {
 		return nil, err
 	}
 
-	if err := runner.plugins.LoadLegacyPlugins(
+	if err := runner.plugins.LoadGlobalLegacyPlugins(
 		runner.vagrantRubyClient, runner.vagrantRubyRuntime); err != nil {
 		return nil, err
 	}
@@ -156,6 +156,12 @@ func New(opts ...Option) (*Runner, error) {
 	return runner, nil
 }
 
+func (r *Runner) LoadLocalProjectPlugins(path string) error {
+	err := r.plugins.LoadLocalLegacyPlugins(
+		r.vagrantRubyClient, r.vagrantRubyRuntime, path)
+	return err
+}
+
 // Id returns the runner ID.
 func (r *Runner) Id() string {
 	return r.id

internal/serverclient/ruby_client.go

@@ -58,14 +58,22 @@ func (r *RubyVagrantClient) GRPCBroker() *plugin.GRPCBroker {
 	return r.broker
 }
 
-func (r *RubyVagrantClient) GetPlugins() ([]*ruby_vagrant.Plugin, error) {
+func (r *RubyVagrantClient) GetGlobalPlugins() ([]*ruby_vagrant.Plugin, error) {
 	plugins, err := r.client.GetGlobalPlugins(context.Background(), &empty.Empty{})
 	if err != nil {
 		return nil, err
 	}
 	return plugins.Plugins, nil
 }
 
+func (r *RubyVagrantClient) GetLocalPlugins(path string) ([]*ruby_vagrant.Plugin, error) {
+	plugins, err := r.client.GetLocalPlugins(context.Background(), &ruby_vagrant.GetPluginsRequest{ProjectPath: path})
+	if err != nil {
+		return nil, err
+	}
+	return plugins.Plugins, nil
+}
+
 func (r *RubyVagrantClient) ParseVagrantfile(path string) (*vagrant_plugin_sdk.Args_Hash, error) {
 	vf, err := r.client.ParseVagrantfile(
 		context.Background(),