From d767c69ed348d864849fc68aedbc875da65a6abf Mon Sep 17 00:00:00 2001
From: Megan Marsh <megan@hashicorp.com>
Date: Thu, 3 Dec 2020 10:19:08 -0800
Subject: [PATCH] rebase and fix conflicts

fix tests
---
 config_test.go            | 100 --------------------------------------
 packer/plugin/discover.go |  14 +++---
 2 files changed, 7 insertions(+), 107 deletions(-)

diff --git a/config_test.go b/config_test.go
index a1d3e2ca3..b6b0beefc 100644
--- a/config_test.go
+++ b/config_test.go
@@ -12,108 +12,8 @@ import (
 	"testing"
 
 	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
-	"github.com/hashicorp/packer/packer/plugin"
 )
 
-func newConfig() config {
-	var conf config
-	conf.PluginMinPort = 10000
-	conf.PluginMaxPort = 25000
-	conf.Builders = packersdk.MapOfBuilder{}
-	conf.PostProcessors = packersdk.MapOfPostProcessor{}
-	conf.Provisioners = packersdk.MapOfProvisioner{}
-
-	return conf
-}
-func TestDiscoverReturnsIfMagicCookieSet(t *testing.T) {
-	config := newConfig()
-
-	os.Setenv(plugin.MagicCookieKey, plugin.MagicCookieValue)
-	defer os.Unsetenv(plugin.MagicCookieKey)
-
-	err := config.Discover()
-	if err != nil {
-		t.Fatalf("Should not have errored: %s", err)
-	}
-
-	if len(config.Builders) != 0 {
-		t.Fatalf("Should not have tried to find builders")
-	}
-}
-
-func TestEnvVarPackerPluginPath(t *testing.T) {
-	// Create a temporary directory to store plugins in
-	dir, _, cleanUpFunc, err := generateFakePlugins("custom_plugin_dir",
-		[]string{"packer-provisioner-partyparrot"})
-	if err != nil {
-		t.Fatalf("Error creating fake custom plugins: %s", err)
-	}
-
-	defer cleanUpFunc()
-
-	// Add temp dir to path.
-	os.Setenv("PACKER_PLUGIN_PATH", dir)
-	defer os.Unsetenv("PACKER_PLUGIN_PATH")
-
-	config := newConfig()
-
-	err = config.Discover()
-	if err != nil {
-		t.Fatalf("Should not have errored: %s", err)
-	}
-
-	if len(config.Provisioners) == 0 {
-		t.Fatalf("Should have found partyparrot provisioner")
-	}
-	if _, ok := config.Provisioners["partyparrot"]; !ok {
-		t.Fatalf("Should have found partyparrot provisioner.")
-	}
-}
-
-func TestEnvVarPackerPluginPath_MultiplePaths(t *testing.T) {
-	// Create a temporary directory to store plugins in
-	dir, _, cleanUpFunc, err := generateFakePlugins("custom_plugin_dir",
-		[]string{"packer-provisioner-partyparrot"})
-	if err != nil {
-		t.Fatalf("Error creating fake custom plugins: %s", err)
-	}
-
-	defer cleanUpFunc()
-
-	pathsep := ":"
-	if runtime.GOOS == "windows" {
-		pathsep = ";"
-	}
-
-	// Create a second dir to look in that will be empty
-	decoyDir, err := ioutil.TempDir("", "decoy")
-	if err != nil {
-		t.Fatalf("Failed to create a temporary test dir.")
-	}
-	defer os.Remove(decoyDir)
-
-	pluginPath := dir + pathsep + decoyDir
-
-	// Add temp dir to path.
-	os.Setenv("PACKER_PLUGIN_PATH", pluginPath)
-	defer os.Unsetenv("PACKER_PLUGIN_PATH")
-
-	config := newConfig()
-
-	err = config.Discover()
-	if err != nil {
-		t.Fatalf("Should not have errored: %s", err)
-	}
-
-	if len(config.Provisioners) == 0 {
-		t.Fatalf("Should have found partyparrot provisioner")
-	}
-	if _, ok := config.Provisioners["partyparrot"]; !ok {
-		t.Fatalf("Should have found partyparrot provisioner.")
-	}
-}
-
->>>>>>> move packer config constants next to the packer config
 func TestDecodeConfig(t *testing.T) {
 
 	packerConfig := `
diff --git a/packer/plugin/discover.go b/packer/plugin/discover.go
index 823c186b7..88f56e9dc 100644
--- a/packer/plugin/discover.go
+++ b/packer/plugin/discover.go
@@ -20,12 +20,12 @@ const PACKERSPACE = "-PACKERSPACE-"
 type Config struct {
 	PluginMinPort  int
 	PluginMaxPort  int
-	builders       packer.MapOfBuilder
-	provisioners   packer.MapOfProvisioner
-	postProcessors packer.MapOfPostProcessor
+	builders       packersdk.MapOfBuilder
+	provisioners   packersdk.MapOfProvisioner
+	postProcessors packersdk.MapOfPostProcessor
 }
 
-func (c *Config) GetPlugins() (packer.MapOfBuilder, packer.MapOfProvisioner, packer.MapOfPostProcessor) {
+func (c *Config) GetPlugins() (packersdk.MapOfBuilder, packersdk.MapOfProvisioner, packersdk.MapOfPostProcessor) {
 	return c.builders, c.provisioners, c.postProcessors
 }
 
@@ -38,13 +38,13 @@ func (c *Config) GetPlugins() (packer.MapOfBuilder, packer.MapOfProvisioner, pac
 // CWD has the highest priority.
 func (c *Config) Discover() error {
 	if c.builders == nil {
-		c.builders = packer.MapOfBuilder{}
+		c.builders = packersdk.MapOfBuilder{}
 	}
 	if c.provisioners == nil {
-		c.provisioners = packer.MapOfProvisioner{}
+		c.provisioners = packersdk.MapOfProvisioner{}
 	}
 	if c.postProcessors == nil {
-		c.postProcessors = packer.MapOfPostProcessor{}
+		c.postProcessors = packersdk.MapOfPostProcessor{}
 	}
 
 	// If we are already inside a plugin process we should not need to