From 921e7edb483f966678b87aa7334b039382091e7d Mon Sep 17 00:00:00 2001 From: sophia Date: Wed, 30 Mar 2022 09:37:04 -0500 Subject: [PATCH] Reduce scope of plugins that can be returned from the core plugin manager --- internal/core/core_manager.go | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/internal/core/core_manager.go b/internal/core/core_manager.go index 299407827..27f997a2d 100644 --- a/internal/core/core_manager.go +++ b/internal/core/core_manager.go @@ -9,7 +9,6 @@ import ( plg "github.com/hashicorp/go-plugin" sdkcore "github.com/hashicorp/vagrant-plugin-sdk/core" "github.com/hashicorp/vagrant-plugin-sdk/internal-shared/protomappers" - "github.com/hashicorp/vagrant/internal/plugin" "google.golang.org/protobuf/encoding/protojson" ) @@ -43,10 +42,6 @@ func (m *CoreManager) generatePlugin(fn func() (plg interface{})) (plg interface // Get a fresh instance of a core plugin func (m *CoreManager) GetPlugin(pluginType sdkcore.Type) (plg interface{}, err error) { switch pluginType { - case sdkcore.BasisType: - return m.generatePlugin(func() (plg interface{}) { - return &Basis{} - }) case sdkcore.BoxCollectionType: return m.generatePlugin(func() (plg interface{}) { return &BoxCollection{} @@ -59,30 +54,10 @@ func (m *CoreManager) GetPlugin(pluginType sdkcore.Type) (plg interface{}, err e return m.generatePlugin(func() (plg interface{}) { return &Box{} }) - case sdkcore.MachineType: - return m.generatePlugin(func() (plg interface{}) { - return &Machine{} - }) - case sdkcore.PluginManagerType: - return m.generatePlugin(func() (plg interface{}) { - return plugin.NewManager(m.ctx, m.logger.Named("plugin-manager")) - }) - case sdkcore.ProjectType: - return m.generatePlugin(func() (plg interface{}) { - return &Project{} - }) case sdkcore.StateBagType: return m.generatePlugin(func() (plg interface{}) { return NewStateBag() }) - case sdkcore.TargetIndexType: - return m.generatePlugin(func() (plg interface{}) { - return &TargetIndex{} - }) - case sdkcore.TargetType: - return m.generatePlugin(func() (plg interface{}) { - return &Target{} - }) } return }