up tests

builder/amazon/common/run_config_test.go

@@ -6,6 +6,7 @@ import (
 	"regexp"
 	"testing"
 
+	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/communicator"
 )
 
@@ -73,7 +74,7 @@ func TestRunConfigPrepare_SourceAmiFilterOwnersBlank(t *testing.T) {
 	c := testConfigFilter()
 	filter_key := "name"
 	filter_value := "foo"
-	c.SourceAmiFilter = AmiFilterOptions{Filters: map[string]string{filter_key: filter_value}}
+	c.SourceAmiFilter.Filters = map[string]string{filter_key: filter_value}
 	if err := c.Prepare(nil); len(err) != 1 {
 		t.Fatalf("Should error if Owners is not specified)")
 	}
@@ -84,7 +85,12 @@ func TestRunConfigPrepare_SourceAmiFilterGood(t *testing.T) {
 	owner := "123"
 	filter_key := "name"
 	filter_value := "foo"
-	goodFilter := AmiFilterOptions{Owners: []string{owner}, Filters: map[string]string{filter_key: filter_value}}
+	goodFilter := AmiFilterOptions{
+		Owners: []string{owner},
+		KVFilter: hcl2template.KVFilter{
+			Filters: map[string]string{filter_key: filter_value},
+		},
+	}
 	c.SourceAmiFilter = goodFilter
 	if err := c.Prepare(nil); len(err) != 0 {
 		t.Fatalf("err: %s", err)

builder/amazon/common/step_run_spot_instance_test.go

@@ -44,9 +44,9 @@ func getBasicStep() *StepRunSpotInstance {
 		InstanceType:                      "t2.micro",
 		SourceAMI:                         "",
 		SpotPrice:                         "auto",
-		SpotTags:                          TagMap(nil),
-		Tags:                              TagMap{},
-		VolumeTags:                        TagMap(nil),
+		SpotTags:                          nil,
+		Tags:                              map[string]string{},
+		VolumeTags:                        nil,
 		UserData:                          "",
 		UserDataFile:                      "",
 	}

builder/osc/common/run_config_test.go

@@ -6,6 +6,7 @@ import (
 	"regexp"
 	"testing"
 
+	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/communicator"
 )
 
@@ -72,7 +73,11 @@ func TestRunConfigPrepare_SourceOmiFilterOwnersBlank(t *testing.T) {
 	c := testConfigFilter()
 	filter_key := "name"
 	filter_value := "foo"
-	c.SourceOmiFilter = OmiFilterOptions{Filters: map[string]string{filter_key: filter_value}}
+	c.SourceOmiFilter = OmiFilterOptions{
+		KVFilter: hcl2template.KVFilter{
+			Filters: map[string]string{filter_key: filter_value},
+		},
+	}
 	if err := c.Prepare(nil); len(err) != 1 {
 		t.Fatalf("Should error if Owners is not specified)")
 	}
@@ -83,7 +88,12 @@ func TestRunConfigPrepare_SourceOmiFilterGood(t *testing.T) {
 	owner := "123"
 	filter_key := "name"
 	filter_value := "foo"
-	goodFilter := OmiFilterOptions{Owners: []string{owner}, Filters: map[string]string{filter_key: filter_value}}
+	goodFilter := OmiFilterOptions{
+		Owners: []string{owner},
+		KVFilter: hcl2template.KVFilter{
+			Filters: map[string]string{filter_key: filter_value},
+		},
+	}
 	c.SourceOmiFilter = goodFilter
 	if err := c.Prepare(nil); len(err) != 0 {
 		t.Fatalf("err: %s", err)