From 8558d1241f01bf9bf96f8ef4a6c6252d975e2bd8 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Wed, 2 Dec 2020 10:50:37 -0800 Subject: [PATCH] move TestUi func to sdk --- .../common/step_run_spot_instance_test.go | 5 +- .../azure/chroot/step_create_image_test.go | 4 +- .../chroot/step_create_new_diskset_test.go | 4 +- .../step_create_shared_image_version_test.go | 4 +- .../chroot/step_create_snapshotset_test.go | 8 +-- ...ep_verify_shared_image_destination_test.go | 4 +- .../step_verify_shared_image_source_test.go | 4 +- builder/docker/communicator_test.go | 6 +- builder/hyperv/iso/builder_test.go | 2 +- builder/hyperv/vmcx/builder_test.go | 2 +- .../common/step_convert_to_template_test.go | 4 +- .../step_finalize_template_config_test.go | 4 +- builder/proxmox/common/step_start_vm_test.go | 4 +- .../common/step_type_boot_command_test.go | 4 +- builder/proxmox/iso/step_finalize_iso_test.go | 4 +- builder/proxmox/iso/step_upload_iso_test.go | 4 +- builder/qemu/step_copy_disk_test.go | 4 +- builder/qemu/step_run_test.go | 66 +++++++++---------- builder/qemu/step_shutdown_test.go | 8 +-- builder/vmware/iso/step_create_vmx_test.go | 2 +- packer-plugin-sdk/packer/ui_mock.go | 12 ++++ .../checksum/post-processor_test.go | 3 +- .../compress/post-processor_test.go | 3 +- provisioner/ansible-local/provisioner_test.go | 2 +- 24 files changed, 88 insertions(+), 79 deletions(-) diff --git a/builder/amazon/common/step_run_spot_instance_test.go b/builder/amazon/common/step_run_spot_instance_test.go index 44c93ed2a..cc5b8d6f5 100644 --- a/builder/amazon/common/step_run_spot_instance_test.go +++ b/builder/amazon/common/step_run_spot_instance_test.go @@ -9,7 +9,6 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" - "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/communicator" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" @@ -240,7 +239,7 @@ func TestRun(t *testing.T) { volumeId := aws.String("volume-id") ec2Mock := defaultEc2Mock(instanceId, spotRequestId, volumeId) - uiMock := packer.TestUi(t) + uiMock := packersdk.TestUi(t) state := tStateSpot() state.Put("ec2", ec2Mock) @@ -332,7 +331,7 @@ func TestRun_NoSpotTags(t *testing.T) { volumeId := aws.String("volume-id") ec2Mock := defaultEc2Mock(instanceId, spotRequestId, volumeId) - uiMock := packer.TestUi(t) + uiMock := packersdk.TestUi(t) state := tStateSpot() state.Put("ec2", ec2Mock) diff --git a/builder/azure/chroot/step_create_image_test.go b/builder/azure/chroot/step_create_image_test.go index 4bb32e9cd..5873e228f 100644 --- a/builder/azure/chroot/step_create_image_test.go +++ b/builder/azure/chroot/step_create_image_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" @@ -116,7 +116,7 @@ func TestStepCreateImage_Run(t *testing.T) { state.Put("azureclient", &client.AzureClientSetMock{ ImagesClientMock: ic, }) - state.Put("ui", packer.TestUi(t)) + state.Put("ui", packersdk.TestUi(t)) state.Put(stateBagKey_Diskset, tt.diskset) t.Run(tt.name, func(t *testing.T) { diff --git a/builder/azure/chroot/step_create_new_diskset_test.go b/builder/azure/chroot/step_create_new_diskset_test.go index f85ea0d1f..a76685e87 100644 --- a/builder/azure/chroot/step_create_new_diskset_test.go +++ b/builder/azure/chroot/step_create_new_diskset_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" @@ -224,7 +224,7 @@ func TestStepCreateNewDisk_Run(t *testing.T) { DisksClientMock: m, GalleryImageVersionsClientMock: giv, }) - state.Put("ui", packer.TestUi(t)) + state.Put("ui", packersdk.TestUi(t)) if got := s.Run(context.TODO(), state); !reflect.DeepEqual(got, tt.want) { t.Errorf("StepCreateNewDisk.Run() = %v, want %v", got, tt.want) diff --git a/builder/azure/chroot/step_create_shared_image_version_test.go b/builder/azure/chroot/step_create_shared_image_version_test.go index e08265a41..5983ca41e 100644 --- a/builder/azure/chroot/step_create_shared_image_version_test.go +++ b/builder/azure/chroot/step_create_shared_image_version_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" @@ -126,7 +126,7 @@ func TestStepCreateSharedImageVersion_Run(t *testing.T) { state.Put("azureclient", &client.AzureClientSetMock{ GalleryImageVersionsClientMock: m, }) - state.Put("ui", packer.TestUi(t)) + state.Put("ui", packersdk.TestUi(t)) state.Put(stateBagKey_Snapshotset, tt.snapshotset) t.Run(tt.name, func(t *testing.T) { diff --git a/builder/azure/chroot/step_create_snapshotset_test.go b/builder/azure/chroot/step_create_snapshotset_test.go index 861edcb2c..eb12488fb 100644 --- a/builder/azure/chroot/step_create_snapshotset_test.go +++ b/builder/azure/chroot/step_create_snapshotset_test.go @@ -11,8 +11,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) func TestStepCreateSnapshot_Run(t *testing.T) { @@ -101,7 +101,7 @@ func TestStepCreateSnapshot_Run(t *testing.T) { state.Put("azureclient", &client.AzureClientSetMock{ SnapshotsClientMock: m, }) - state.Put("ui", packer.TestUi(t)) + state.Put("ui", packersdk.TestUi(t)) state.Put(stateBagKey_Diskset, tt.diskset) t.Run(tt.name, func(t *testing.T) { @@ -136,7 +136,7 @@ func TestStepCreateSnapshot_Cleanup_skipped(t *testing.T) { state.Put("azureclient", &client.AzureClientSetMock{ SnapshotsClientMock: m, }) - state.Put("ui", packer.TestUi(t)) + state.Put("ui", packersdk.TestUi(t)) s := &StepCreateSnapshotset{ SkipCleanup: true, @@ -185,7 +185,7 @@ func TestStepCreateSnapshot_Cleanup(t *testing.T) { state.Put("azureclient", &client.AzureClientSetMock{ SnapshotsClientMock: m, }) - state.Put("ui", packer.TestUi(t)) + state.Put("ui", packersdk.TestUi(t)) s := &StepCreateSnapshotset{ SkipCleanup: false, diff --git a/builder/azure/chroot/step_verify_shared_image_destination_test.go b/builder/azure/chroot/step_verify_shared_image_destination_test.go index 22dafaf94..6bbefe0d2 100644 --- a/builder/azure/chroot/step_verify_shared_image_destination_test.go +++ b/builder/azure/chroot/step_verify_shared_image_destination_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" @@ -164,7 +164,7 @@ func TestStepVerifySharedImageDestination_Run(t *testing.T) { GalleryImagesClientMock: gi, GalleryImageVersionsClientMock: giv, }) - state.Put("ui", packer.TestUi(t)) + state.Put("ui", packersdk.TestUi(t)) t.Run(tt.name, func(t *testing.T) { s := &StepVerifySharedImageDestination{ diff --git a/builder/azure/chroot/step_verify_shared_image_source_test.go b/builder/azure/chroot/step_verify_shared_image_source_test.go index d29b8042a..e12479573 100644 --- a/builder/azure/chroot/step_verify_shared_image_source_test.go +++ b/builder/azure/chroot/step_verify_shared_image_source_test.go @@ -12,8 +12,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) func TestStepVerifySharedImageSource_Run(t *testing.T) { @@ -163,7 +163,7 @@ func TestStepVerifySharedImageSource_Run(t *testing.T) { GalleryImageVersionsClientMock: giv, GalleryImagesClientMock: gi, }) - state.Put("ui", packer.TestUi(t)) + state.Put("ui", packersdk.TestUi(t)) t.Run(tt.name, func(t *testing.T) { s := &StepVerifySharedImageSource{ diff --git a/builder/docker/communicator_test.go b/builder/docker/communicator_test.go index b97f000b5..3b30f2c48 100644 --- a/builder/docker/communicator_test.go +++ b/builder/docker/communicator_test.go @@ -18,7 +18,7 @@ import ( // TestUploadDownload verifies that basic upload / download functionality works func TestUploadDownload(t *testing.T) { - ui := packer.TestUi(t) + ui := packersdk.TestUi(t) tpl, err := template.Parse(strings.NewReader(dockerBuilderConfig)) if err != nil { @@ -101,7 +101,7 @@ func TestUploadDownload(t *testing.T) { // need to use github.com/cbednarski/rerun to verify since this problem occurs // only intermittently. func TestLargeDownload(t *testing.T) { - ui := packer.TestUi(t) + ui := packersdk.TestUi(t) tpl, err := template.Parse(strings.NewReader(dockerLargeBuilderConfig)) if err != nil { @@ -205,7 +205,7 @@ func TestLargeDownload(t *testing.T) { // TestFixUploadOwner verifies that owner of uploaded files is the user the container is running as. func TestFixUploadOwner(t *testing.T) { - ui := packer.TestUi(t) + ui := packersdk.TestUi(t) tpl, err := template.Parse(strings.NewReader(testFixUploadOwnerTemplate)) if err != nil { diff --git a/builder/hyperv/iso/builder_test.go b/builder/hyperv/iso/builder_test.go index 98732c577..1cdf5cd34 100644 --- a/builder/hyperv/iso/builder_test.go +++ b/builder/hyperv/iso/builder_test.go @@ -602,7 +602,7 @@ func TestUserVariablesInBootCommand(t *testing.T) { t.Fatalf("should not have error: %s", err) } - ui := packer.TestUi(t) + ui := packersdk.TestUi(t) hook := &packersdk.MockHook{} driver := &hypervcommon.DriverMock{} diff --git a/builder/hyperv/vmcx/builder_test.go b/builder/hyperv/vmcx/builder_test.go index 334d05005..edbf9a988 100644 --- a/builder/hyperv/vmcx/builder_test.go +++ b/builder/hyperv/vmcx/builder_test.go @@ -494,7 +494,7 @@ func TestUserVariablesInBootCommand(t *testing.T) { t.Fatalf("should not have error: %s", err) } - ui := packer.TestUi(t) + ui := packersdk.TestUi(t) hook := &packersdk.MockHook{} driver := &hypervcommon.DriverMock{} diff --git a/builder/proxmox/common/step_convert_to_template_test.go b/builder/proxmox/common/step_convert_to_template_test.go index 26fc7dfb3..7468cecd4 100644 --- a/builder/proxmox/common/step_convert_to_template_test.go +++ b/builder/proxmox/common/step_convert_to_template_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type converterMock struct { @@ -79,7 +79,7 @@ func TestConvertToTemplate(t *testing.T) { } state := new(multistep.BasicStateBag) - state.Put("ui", packer.TestUi(t)) + state.Put("ui", packersdk.TestUi(t)) state.Put("vmRef", proxmox.NewVmRef(vmid)) state.Put("proxmoxClient", converter) diff --git a/builder/proxmox/common/step_finalize_template_config_test.go b/builder/proxmox/common/step_finalize_template_config_test.go index 38c691e17..62d43fc2b 100644 --- a/builder/proxmox/common/step_finalize_template_config_test.go +++ b/builder/proxmox/common/step_finalize_template_config_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type finalizerMock struct { @@ -157,7 +157,7 @@ func TestTemplateFinalize(t *testing.T) { } state := new(multistep.BasicStateBag) - state.Put("ui", packer.TestUi(t)) + state.Put("ui", packersdk.TestUi(t)) state.Put("config", c.builderConfig) state.Put("vmRef", proxmox.NewVmRef(1)) state.Put("proxmoxClient", finalizer) diff --git a/builder/proxmox/common/step_start_vm_test.go b/builder/proxmox/common/step_start_vm_test.go index e51577297..3debeacba 100644 --- a/builder/proxmox/common/step_start_vm_test.go +++ b/builder/proxmox/common/step_start_vm_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type startedVMCleanerMock struct { @@ -85,7 +85,7 @@ func TestCleanupStartVM(t *testing.T) { } state := new(multistep.BasicStateBag) - state.Put("ui", packer.TestUi(t)) + state.Put("ui", packersdk.TestUi(t)) state.Put("proxmoxClient", cleaner) if c.setVmRef { state.Put("vmRef", proxmox.NewVmRef(1)) diff --git a/builder/proxmox/common/step_type_boot_command_test.go b/builder/proxmox/common/step_type_boot_command_test.go index 104c3fd60..8c333717b 100644 --- a/builder/proxmox/common/step_type_boot_command_test.go +++ b/builder/proxmox/common/step_type_boot_command_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type commandTyperMock struct { @@ -128,7 +128,7 @@ func TestTypeBootCommand(t *testing.T) { } state := new(multistep.BasicStateBag) - state.Put("ui", packer.TestUi(t)) + state.Put("ui", packersdk.TestUi(t)) state.Put("config", c.builderConfig) state.Put("http_port", int(0)) state.Put("vmRef", proxmox.NewVmRef(1)) diff --git a/builder/proxmox/iso/step_finalize_iso_test.go b/builder/proxmox/iso/step_finalize_iso_test.go index 6556bb495..9ea16e2c1 100644 --- a/builder/proxmox/iso/step_finalize_iso_test.go +++ b/builder/proxmox/iso/step_finalize_iso_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type finalizerMock struct { @@ -116,7 +116,7 @@ func TestISOTemplateFinalize(t *testing.T) { } state := new(multistep.BasicStateBag) - state.Put("ui", packer.TestUi(t)) + state.Put("ui", packersdk.TestUi(t)) state.Put("iso-config", c.builderConfig) state.Put("vmRef", proxmox.NewVmRef(1)) state.Put("proxmoxClient", finalizer) diff --git a/builder/proxmox/iso/step_upload_iso_test.go b/builder/proxmox/iso/step_upload_iso_test.go index d747594f8..c26ebf682 100644 --- a/builder/proxmox/iso/step_upload_iso_test.go +++ b/builder/proxmox/iso/step_upload_iso_test.go @@ -6,9 +6,9 @@ import ( "io" "testing" - "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type uploaderMock struct { @@ -105,7 +105,7 @@ func TestUploadISO(t *testing.T) { m := &uploaderMock{fail: c.failUpload} state := new(multistep.BasicStateBag) - state.Put("ui", packer.TestUi(t)) + state.Put("ui", packersdk.TestUi(t)) state.Put("iso-config", c.builderConfig) state.Put(downloadPathKey, c.downloadPath) state.Put("proxmoxClient", m) diff --git a/builder/qemu/step_copy_disk_test.go b/builder/qemu/step_copy_disk_test.go index efeb53401..95b6c8bf5 100644 --- a/builder/qemu/step_copy_disk_test.go +++ b/builder/qemu/step_copy_disk_test.go @@ -4,14 +4,14 @@ import ( "context" "testing" - "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/stretchr/testify/assert" ) func copyTestState(t *testing.T, d *DriverMock) multistep.StateBag { state := new(multistep.BasicStateBag) - state.Put("ui", packer.TestUi(t)) + state.Put("ui", packersdk.TestUi(t)) state.Put("driver", d) state.Put("iso_path", "example_source.qcow2") diff --git a/builder/qemu/step_run_test.go b/builder/qemu/step_run_test.go index 1a1822db4..d275fb401 100644 --- a/builder/qemu/step_run_test.go +++ b/builder/qemu/step_run_test.go @@ -4,10 +4,10 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/communicator" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/stretchr/testify/assert" ) @@ -92,7 +92,7 @@ func Test_UserOverrides(t *testing.T) { step := &stepRun{ atLeastVersion2: true, - ui: packer.TestUi(t), + ui: packersdk.TestUi(t), } args, err := step.getCommandArgs(tc.Config, state) if err != nil { @@ -130,7 +130,7 @@ func Test_DriveAndDeviceArgs(t *testing.T) { map[string]interface{}{}, &stepRun{ atLeastVersion2: true, - ui: packer.TestUi(t), + ui: packersdk.TestUi(t), }, []string{ "-display", "gtk", @@ -155,7 +155,7 @@ func Test_DriveAndDeviceArgs(t *testing.T) { &stepRun{ DiskImage: true, atLeastVersion2: true, - ui: packer.TestUi(t), + ui: packersdk.TestUi(t), }, []string{ "-display", "gtk", @@ -183,7 +183,7 @@ func Test_DriveAndDeviceArgs(t *testing.T) { &stepRun{ DiskImage: true, atLeastVersion2: true, - ui: packer.TestUi(t), + ui: packersdk.TestUi(t), }, []string{ "-display", "gtk", @@ -212,7 +212,7 @@ func Test_DriveAndDeviceArgs(t *testing.T) { }, &stepRun{ atLeastVersion2: true, - ui: packer.TestUi(t), + ui: packersdk.TestUi(t), }, []string{ "-display", "gtk", @@ -244,7 +244,7 @@ func Test_DriveAndDeviceArgs(t *testing.T) { }, &stepRun{ atLeastVersion2: true, - ui: packer.TestUi(t), + ui: packersdk.TestUi(t), }, []string{ "-display", "gtk", @@ -274,7 +274,7 @@ func Test_DriveAndDeviceArgs(t *testing.T) { }, &stepRun{ atLeastVersion2: true, - ui: packer.TestUi(t), + ui: packersdk.TestUi(t), }, []string{ "-display", "gtk", @@ -294,7 +294,7 @@ func Test_DriveAndDeviceArgs(t *testing.T) { }, &stepRun{ atLeastVersion2: true, - ui: packer.TestUi(t), + ui: packersdk.TestUi(t), }, []string{ "-display", "gtk", @@ -314,7 +314,7 @@ func Test_DriveAndDeviceArgs(t *testing.T) { }, &stepRun{ atLeastVersion2: true, - ui: packer.TestUi(t), + ui: packersdk.TestUi(t), }, []string{ "-display", "gtk", @@ -338,7 +338,7 @@ func Test_DriveAndDeviceArgs(t *testing.T) { }, &stepRun{ atLeastVersion2: false, - ui: packer.TestUi(t), + ui: packersdk.TestUi(t), }, []string{ "-boot", "once=d", @@ -360,7 +360,7 @@ func Test_DriveAndDeviceArgs(t *testing.T) { }, &stepRun{ atLeastVersion2: true, - ui: packer.TestUi(t), + ui: packersdk.TestUi(t), }, []string{ "-display", "gtk", @@ -386,7 +386,7 @@ func Test_DriveAndDeviceArgs(t *testing.T) { &stepRun{ DiskImage: true, atLeastVersion2: true, - ui: packer.TestUi(t), + ui: packersdk.TestUi(t), }, []string{ "-display", "gtk", @@ -436,7 +436,7 @@ func Test_OptionalConfigOptionsGetSet(t *testing.T) { state := runTestState(t, c) step := &stepRun{ atLeastVersion2: true, - ui: packer.TestUi(t), + ui: packersdk.TestUi(t), } args, err := step.getCommandArgs(c, state) if err != nil { @@ -475,7 +475,7 @@ func Test_Defaults(t *testing.T) { { &Config{}, map[string]interface{}{}, - &stepRun{ui: packer.TestUi(t)}, + &stepRun{ui: packersdk.TestUi(t)}, []string{"-boot", "once=d"}, "Boot value should default to once=d", }, @@ -484,7 +484,7 @@ func Test_Defaults(t *testing.T) { map[string]interface{}{}, &stepRun{ DiskImage: true, - ui: packer.TestUi(t), + ui: packersdk.TestUi(t), }, []string{"-boot", "c"}, "Boot value should be set to c when DiskImage is set on step", @@ -495,7 +495,7 @@ func Test_Defaults(t *testing.T) { QMPSocketPath: "/path/to/socket", }, map[string]interface{}{}, - &stepRun{ui: packer.TestUi(t)}, + &stepRun{ui: packersdk.TestUi(t)}, []string{"-qmp", "unix:/path/to/socket,server,nowait"}, "Args should contain -qmp when qmp_enable is set", }, @@ -504,7 +504,7 @@ func Test_Defaults(t *testing.T) { QMPEnable: true, }, map[string]interface{}{}, - &stepRun{ui: packer.TestUi(t)}, + &stepRun{ui: packersdk.TestUi(t)}, []string{"-qmp", "unix:,server,nowait"}, "Args contain -qmp even when socket path isn't set, if qmp enabled", }, @@ -513,14 +513,14 @@ func Test_Defaults(t *testing.T) { VMName: "partyname", }, map[string]interface{}{}, - &stepRun{ui: packer.TestUi(t)}, + &stepRun{ui: packersdk.TestUi(t)}, []string{"-name", "partyname"}, "Name is set from config", }, { &Config{}, map[string]interface{}{}, - &stepRun{ui: packer.TestUi(t)}, + &stepRun{ui: packersdk.TestUi(t)}, []string{"-name", ""}, "Name is set from config, even when name is blank (which won't " + "happen for real thanks to defaulting in build prepare)", @@ -531,7 +531,7 @@ func Test_Defaults(t *testing.T) { MachineType: "fancymachine", }, map[string]interface{}{}, - &stepRun{ui: packer.TestUi(t)}, + &stepRun{ui: packersdk.TestUi(t)}, []string{"-machine", "type=fancymachine"}, "Don't add accelerator tag when no accelerator is set.", }, @@ -541,7 +541,7 @@ func Test_Defaults(t *testing.T) { MachineType: "fancymachine", }, map[string]interface{}{}, - &stepRun{ui: packer.TestUi(t)}, + &stepRun{ui: packersdk.TestUi(t)}, []string{"-machine", "type=fancymachine,accel=kvm"}, "Add accelerator tag when accelerator is set.", }, @@ -550,7 +550,7 @@ func Test_Defaults(t *testing.T) { NetBridge: "fakebridge", }, map[string]interface{}{}, - &stepRun{ui: packer.TestUi(t)}, + &stepRun{ui: packersdk.TestUi(t)}, []string{"-netdev", "bridge,id=user.0,br=fakebridge"}, "Add netbridge tag when netbridge is set.", }, @@ -563,7 +563,7 @@ func Test_Defaults(t *testing.T) { }, }, map[string]interface{}{}, - &stepRun{ui: packer.TestUi(t)}, + &stepRun{ui: packersdk.TestUi(t)}, []string{"-netdev", "user,id=user.0"}, "No host forwarding when no net bridge and no communicator", }, @@ -581,7 +581,7 @@ func Test_Defaults(t *testing.T) { map[string]interface{}{ "commHostPort": 1111, }, - &stepRun{ui: packer.TestUi(t)}, + &stepRun{ui: packersdk.TestUi(t)}, []string{"-netdev", "user,id=user.0,hostfwd=tcp::1111-:4567"}, "Host forwarding when a communicator is configured", }, @@ -592,7 +592,7 @@ func Test_Defaults(t *testing.T) { map[string]interface{}{ "vnc_port": 5959, }, - &stepRun{ui: packer.TestUi(t)}, + &stepRun{ui: packersdk.TestUi(t)}, []string{"-vnc", "1.1.1.1:5959"}, "no VNC password should be set", }, @@ -604,7 +604,7 @@ func Test_Defaults(t *testing.T) { map[string]interface{}{ "vnc_port": 5959, }, - &stepRun{ui: packer.TestUi(t)}, + &stepRun{ui: packersdk.TestUi(t)}, []string{"-vnc", "1.1.1.1:5959,password"}, "VNC password should be set", }, @@ -613,7 +613,7 @@ func Test_Defaults(t *testing.T) { MemorySize: 2345, }, map[string]interface{}{}, - &stepRun{ui: packer.TestUi(t)}, + &stepRun{ui: packersdk.TestUi(t)}, []string{"-m", "2345M"}, "Memory is set, with unit M", }, @@ -622,7 +622,7 @@ func Test_Defaults(t *testing.T) { CpuCount: 2, }, map[string]interface{}{}, - &stepRun{ui: packer.TestUi(t)}, + &stepRun{ui: packersdk.TestUi(t)}, []string{"-smp", "cpus=2,sockets=2"}, "both cpus and sockets are set to config's CpuCount", }, @@ -631,7 +631,7 @@ func Test_Defaults(t *testing.T) { CpuCount: 2, }, map[string]interface{}{}, - &stepRun{ui: packer.TestUi(t)}, + &stepRun{ui: packersdk.TestUi(t)}, []string{"-smp", "cpus=2,sockets=2"}, "both cpus and sockets are set to config's CpuCount", }, @@ -642,7 +642,7 @@ func Test_Defaults(t *testing.T) { map[string]interface{}{ "floppy_path": "/path/to/floppy", }, - &stepRun{ui: packer.TestUi(t)}, + &stepRun{ui: packersdk.TestUi(t)}, []string{"-fda", "/path/to/floppy"}, "floppy path should be set under fda flag, when it exists", }, @@ -655,7 +655,7 @@ func Test_Defaults(t *testing.T) { map[string]interface{}{}, &stepRun{ atLeastVersion2: true, - ui: packer.TestUi(t), + ui: packersdk.TestUi(t), }, []string{"-display", "fakedisplay"}, "Display option should value config display", @@ -667,7 +667,7 @@ func Test_Defaults(t *testing.T) { map[string]interface{}{}, &stepRun{ atLeastVersion2: true, - ui: packer.TestUi(t), + ui: packersdk.TestUi(t), }, []string{"-display", "gtk"}, "Display option should default to gtk", diff --git a/builder/qemu/step_shutdown_test.go b/builder/qemu/step_shutdown_test.go index c132c38be..7e2a77359 100644 --- a/builder/qemu/step_shutdown_test.go +++ b/builder/qemu/step_shutdown_test.go @@ -5,14 +5,14 @@ import ( "testing" "time" - "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/communicator" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) func Test_Shutdown_Null_success(t *testing.T) { state := new(multistep.BasicStateBag) - state.Put("ui", packer.TestUi(t)) + state.Put("ui", packersdk.TestUi(t)) driverMock := new(DriverMock) driverMock.WaitForShutdownState = true state.Put("driver", driverMock) @@ -37,7 +37,7 @@ func Test_Shutdown_Null_success(t *testing.T) { func Test_Shutdown_Null_failure(t *testing.T) { state := new(multistep.BasicStateBag) - state.Put("ui", packer.TestUi(t)) + state.Put("ui", packersdk.TestUi(t)) driverMock := new(DriverMock) driverMock.WaitForShutdownState = false state.Put("driver", driverMock) @@ -61,7 +61,7 @@ func Test_Shutdown_Null_failure(t *testing.T) { func Test_Shutdown_NoShutdownCommand(t *testing.T) { state := new(multistep.BasicStateBag) - state.Put("ui", packer.TestUi(t)) + state.Put("ui", packersdk.TestUi(t)) driverMock := new(DriverMock) state.Put("driver", driverMock) diff --git a/builder/vmware/iso/step_create_vmx_test.go b/builder/vmware/iso/step_create_vmx_test.go index bef646c65..19c441de5 100644 --- a/builder/vmware/iso/step_create_vmx_test.go +++ b/builder/vmware/iso/step_create_vmx_test.go @@ -96,7 +96,7 @@ func readFloppyOutput(path string) (string, error) { } func setupVMwareBuild(t *testing.T, builderConfig map[string]string, provisionerConfig map[string]string) error { - ui := packer.TestUi(t) + ui := packersdk.TestUi(t) // create builder config and update with user-supplied options cfgBuilder := map[string]string{} diff --git a/packer-plugin-sdk/packer/ui_mock.go b/packer-plugin-sdk/packer/ui_mock.go index ca62c184f..8ca8beafb 100644 --- a/packer-plugin-sdk/packer/ui_mock.go +++ b/packer-plugin-sdk/packer/ui_mock.go @@ -1,9 +1,21 @@ package packer import ( + "bytes" "io" + "io/ioutil" + "testing" ) +func TestUi(t *testing.T) Ui { + var buf bytes.Buffer + return &BasicUi{ + Reader: &buf, + Writer: ioutil.Discard, + ErrorWriter: ioutil.Discard, + } +} + type MockUi struct { AskCalled bool AskQuery string diff --git a/post-processor/checksum/post-processor_test.go b/post-processor/checksum/post-processor_test.go index c54da0148..430583ad2 100644 --- a/post-processor/checksum/post-processor_test.go +++ b/post-processor/checksum/post-processor_test.go @@ -10,7 +10,6 @@ import ( "testing" "github.com/hashicorp/packer/builder/file" - "github.com/hashicorp/packer/packer" packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/hashicorp/packer/packer-plugin-sdk/template" ) @@ -47,7 +46,7 @@ func TestChecksumSHA1(t *testing.T) { func setup(t *testing.T) (packersdk.Ui, packersdk.Artifact, error) { // Create fake UI and Cache - ui := packer.TestUi(t) + ui := packersdk.TestUi(t) // Create config for file builder const fileConfig = `{"builders":[{"type":"file","target":"package.txt","content":"Hello world!"}]}` diff --git a/post-processor/compress/post-processor_test.go b/post-processor/compress/post-processor_test.go index 577ff2de6..d30bca9b6 100644 --- a/post-processor/compress/post-processor_test.go +++ b/post-processor/compress/post-processor_test.go @@ -10,7 +10,6 @@ import ( "testing" "github.com/hashicorp/packer/builder/file" - "github.com/hashicorp/packer/packer" packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/hashicorp/packer/packer-plugin-sdk/template" ) @@ -187,7 +186,7 @@ func TestCompressInterpolation(t *testing.T) { func setup(t *testing.T) (packersdk.Ui, packersdk.Artifact, error) { // Create fake UI and Cache - ui := packer.TestUi(t) + ui := packersdk.TestUi(t) // Create config for file builder const fileConfig = `{"builders":[{"type":"file","target":"package.txt","content":"Hello world!"}]}` diff --git a/provisioner/ansible-local/provisioner_test.go b/provisioner/ansible-local/provisioner_test.go index 19d7f87e4..755443464 100644 --- a/provisioner/ansible-local/provisioner_test.go +++ b/provisioner/ansible-local/provisioner_test.go @@ -329,7 +329,7 @@ func testProvisionerProvisionDockerWithPlaybookFiles(t *testing.T, templateStrin t.Skip("This test is only run with PACKER_ACC=1") } - ui := packer.TestUi(t) + ui := packersdk.TestUi(t) tpl, err := template.Parse(strings.NewReader(templateString)) if err != nil {