From 185deeeb380ef88d038b4c7bb1391c429d865da0 Mon Sep 17 00:00:00 2001
From: Moss <moss@hashicorp.com>
Date: Mon, 6 Apr 2020 16:14:14 +0200
Subject: [PATCH] Fix provisioner acc-test builder and provisioner store

---
 builder/amazon/ebs/acceptance/builder_acceptance.go     | 5 +++--
 builder/virtualbox/iso/acceptance/builder_acceptance.go | 5 +++--
 provisioner/powershell/provisioner_acc_test.go          | 4 +++-
 provisioner/shell/provisioner_acc_test.go               | 9 ++++++---
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/builder/amazon/ebs/acceptance/builder_acceptance.go b/builder/amazon/ebs/acceptance/builder_acceptance.go
index 93fa5d9ac..ea349d3fb 100644
--- a/builder/amazon/ebs/acceptance/builder_acceptance.go
+++ b/builder/amazon/ebs/acceptance/builder_acceptance.go
@@ -9,7 +9,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/hashicorp/packer/command"
+	amazonebsbuilder "github.com/hashicorp/packer/builder/amazon/ebs"
+
 	"github.com/hashicorp/packer/packer"
 
 	testshelper "github.com/hashicorp/packer/helper/tests"
@@ -55,6 +56,6 @@ func (s *AmazonEBSAccTest) CleanUp() error {
 
 func (s *AmazonEBSAccTest) GetBuilderStore() packer.MapOfBuilder {
 	return packer.MapOfBuilder{
-		"amazon-ebs": func() (packer.Builder, error) { return command.Builders["amazon-ebs"], nil },
+		"amazon-ebs": func() (packer.Builder, error) { return &amazonebsbuilder.Builder{}, nil },
 	}
 }
diff --git a/builder/virtualbox/iso/acceptance/builder_acceptance.go b/builder/virtualbox/iso/acceptance/builder_acceptance.go
index dc4452ec3..c31fd90d6 100644
--- a/builder/virtualbox/iso/acceptance/builder_acceptance.go
+++ b/builder/virtualbox/iso/acceptance/builder_acceptance.go
@@ -9,7 +9,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/hashicorp/packer/command"
+	"github.com/hashicorp/packer/builder/virtualbox/iso"
+
 	"github.com/hashicorp/packer/packer"
 
 	testshelper "github.com/hashicorp/packer/helper/tests"
@@ -40,6 +41,6 @@ func (v *VirtualBoxISOAccTest) CleanUp() error {
 
 func (v *VirtualBoxISOAccTest) GetBuilderStore() packer.MapOfBuilder {
 	return packer.MapOfBuilder{
-		"virtualbox-iso": func() (packer.Builder, error) { return command.Builders["virtualbox-iso"], nil },
+		"virtualbox-iso": func() (packer.Builder, error) { return &iso.Builder{}, nil },
 	}
 }
diff --git a/provisioner/powershell/provisioner_acc_test.go b/provisioner/powershell/provisioner_acc_test.go
index 520136b21..819b347be 100644
--- a/provisioner/powershell/provisioner_acc_test.go
+++ b/provisioner/powershell/provisioner_acc_test.go
@@ -9,6 +9,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/hashicorp/packer/provisioner/powershell"
+
 	"github.com/hashicorp/go-uuid"
 	"github.com/hashicorp/packer/command"
 	"github.com/hashicorp/packer/helper/tests/acc"
@@ -57,7 +59,7 @@ func (s *PowershellProvisionerAccTest) GetConfig() (string, error) {
 
 func (s *PowershellProvisionerAccTest) GetProvisionerStore() packer.MapOfProvisioner {
 	return packer.MapOfProvisioner{
-		"powershell": func() (packer.Provisioner, error) { return command.Provisioners["powershell"], nil },
+		"powershell": func() (packer.Provisioner, error) { return &powershell.Provisioner{}, nil },
 	}
 }
 
diff --git a/provisioner/shell/provisioner_acc_test.go b/provisioner/shell/provisioner_acc_test.go
index ffccd7915..10c3b7513 100644
--- a/provisioner/shell/provisioner_acc_test.go
+++ b/provisioner/shell/provisioner_acc_test.go
@@ -3,13 +3,16 @@ package shell_test
 import (
 	"bytes"
 	"fmt"
-	"github.com/hashicorp/packer/helper/tests/acc"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
 	"testing"
 
+	"github.com/hashicorp/packer/helper/tests/acc"
+	"github.com/hashicorp/packer/provisioner/file"
+	"github.com/hashicorp/packer/provisioner/shell"
+
 	"github.com/hashicorp/packer/packer"
 
 	"github.com/hashicorp/go-uuid"
@@ -45,8 +48,8 @@ func (s *ShellProvisionerAccTest) GetConfig() (string, error) {
 
 func (s *ShellProvisionerAccTest) GetProvisionerStore() packer.MapOfProvisioner {
 	return packer.MapOfProvisioner{
-		"shell": func() (packer.Provisioner, error) { return command.Provisioners["shell"], nil },
-		"file":  func() (packer.Provisioner, error) { return command.Provisioners["file"], nil },
+		"shell": func() (packer.Provisioner, error) { return &shell.Provisioner{}, nil },
+		"file":  func() (packer.Provisioner, error) { return &file.Provisioner{}, nil },
 	}
 }