From 7c93e6b0f16dc7c27d6fba067068c35d4ccd6d14 Mon Sep 17 00:00:00 2001
From: Chris Roberts <croberts@hashicorp.com>
Date: Mon, 25 Apr 2022 15:47:57 -0700
Subject: [PATCH] Update plugin related functions for manager changes

---
 internal/core/basis.go | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/internal/core/basis.go b/internal/core/basis.go
index 34a451732..a6974235c 100644
--- a/internal/core/basis.go
+++ b/internal/core/basis.go
@@ -699,12 +699,7 @@ func (b *Basis) component(
 	if typ == component.CommandType {
 		name = strings.Split(name, " ")[0]
 	}
-	p, err := b.plugins.Find(name, typ)
-	if err != nil {
-		return nil, err
-	}
-
-	c, err := p.InstanceOf(typ)
+	c, err := b.plugins.Find(name, typ)
 	if err != nil {
 		return nil, err
 	}
@@ -716,11 +711,11 @@ func (b *Basis) component(
 		Value: c.Component,
 		Info: &vagrant_server.Component{
 			Type:       vagrant_server.Component_Type(typ),
-			Name:       p.Name,
+			Name:       name,
 			ServerAddr: b.Client().ServerTarget(),
 		},
 		hooks:   hooks,
-		mappers: append(b.mappers, p.Mappers...),
+		mappers: append(b.mappers, c.Mappers...),
 		plugin:  c,
 	}, nil
 }
@@ -736,13 +731,28 @@ func (b *Basis) typeComponents(
 		return nil, err
 	}
 
+	b.logger.Info("fetching all typed plugins",
+		"type", typ.String(),
+	)
 	for _, p := range plugins {
-		c, err := b.component(ctx, typ, p.Name)
+		b.logger.Info("fetching typed component",
+			"plugin", p,
+			"type", typ.String(),
+		)
+		c, err := b.component(ctx, typ, p)
 		if err != nil {
+			b.logger.Error("failed to fetch component",
+				"plugin", p,
+				"type", typ.String(),
+			)
 			return nil, err
 		}
-		result[p.Name] = c
+		result[p] = c
 	}
+	b.logger.Info("fetched all typed plugins",
+		"type", typ.String(),
+		"count", len(result),
+	)
 	return result, nil
 }