diff --git a/builder/alicloud/ecs/builder.go b/builder/alicloud/ecs/builder.go index acf768e60..f509767ca 100644 --- a/builder/alicloud/ecs/builder.go +++ b/builder/alicloud/ecs/builder.go @@ -11,10 +11,10 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/alicloud/ecs/packer_helper.go b/builder/alicloud/ecs/packer_helper.go index 5ea704278..4074d7ad7 100644 --- a/builder/alicloud/ecs/packer_helper.go +++ b/builder/alicloud/ecs/packer_helper.go @@ -4,8 +4,8 @@ import ( "fmt" "strconv" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func cleanUpMessage(state multistep.StateBag, module string) { diff --git a/builder/alicloud/ecs/ssh_helper.go b/builder/alicloud/ecs/ssh_helper.go index 21354d017..d400b9347 100644 --- a/builder/alicloud/ecs/ssh_helper.go +++ b/builder/alicloud/ecs/ssh_helper.go @@ -3,7 +3,7 @@ package ecs import ( "time" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) var ( diff --git a/builder/alicloud/ecs/step_attach_keypair.go b/builder/alicloud/ecs/step_attach_keypair.go index d2a2a9c02..16596eef1 100644 --- a/builder/alicloud/ecs/step_attach_keypair.go +++ b/builder/alicloud/ecs/step_attach_keypair.go @@ -6,8 +6,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepAttachKeyPair struct { diff --git a/builder/alicloud/ecs/step_check_source_image.go b/builder/alicloud/ecs/step_check_source_image.go index 3eedec595..66c26dc96 100644 --- a/builder/alicloud/ecs/step_check_source_image.go +++ b/builder/alicloud/ecs/step_check_source_image.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCheckAlicloudSourceImage struct { diff --git a/builder/alicloud/ecs/step_config_eip.go b/builder/alicloud/ecs/step_config_eip.go index a04efabb1..4053a6bcd 100644 --- a/builder/alicloud/ecs/step_config_eip.go +++ b/builder/alicloud/ecs/step_config_eip.go @@ -9,8 +9,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepConfigAlicloudEIP struct { diff --git a/builder/alicloud/ecs/step_config_key_pair.go b/builder/alicloud/ecs/step_config_key_pair.go index 767c50aa1..428198bec 100644 --- a/builder/alicloud/ecs/step_config_key_pair.go +++ b/builder/alicloud/ecs/step_config_key_pair.go @@ -8,8 +8,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepConfigAlicloudKeyPair struct { diff --git a/builder/alicloud/ecs/step_config_public_ip.go b/builder/alicloud/ecs/step_config_public_ip.go index a83b55115..8d8c7403e 100644 --- a/builder/alicloud/ecs/step_config_public_ip.go +++ b/builder/alicloud/ecs/step_config_public_ip.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepConfigAlicloudPublicIP struct { diff --git a/builder/alicloud/ecs/step_config_security_group.go b/builder/alicloud/ecs/step_config_security_group.go index 5913198b6..694a10817 100644 --- a/builder/alicloud/ecs/step_config_security_group.go +++ b/builder/alicloud/ecs/step_config_security_group.go @@ -6,8 +6,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/alicloud/ecs/step_config_vpc.go b/builder/alicloud/ecs/step_config_vpc.go index 0ccfed678..53ecb8476 100644 --- a/builder/alicloud/ecs/step_config_vpc.go +++ b/builder/alicloud/ecs/step_config_vpc.go @@ -7,8 +7,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/alicloud/ecs/step_config_vswitch.go b/builder/alicloud/ecs/step_config_vswitch.go index ee85c6c07..38e51a346 100644 --- a/builder/alicloud/ecs/step_config_vswitch.go +++ b/builder/alicloud/ecs/step_config_vswitch.go @@ -6,8 +6,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/alicloud/ecs/step_create_image.go b/builder/alicloud/ecs/step_create_image.go index 970c6783a..a1f47b61a 100644 --- a/builder/alicloud/ecs/step_create_image.go +++ b/builder/alicloud/ecs/step_create_image.go @@ -9,8 +9,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/alicloud/ecs/step_create_instance.go b/builder/alicloud/ecs/step_create_instance.go index 81ee510ff..da6696e25 100644 --- a/builder/alicloud/ecs/step_create_instance.go +++ b/builder/alicloud/ecs/step_create_instance.go @@ -13,8 +13,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" confighelper "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCreateAlicloudInstance struct { diff --git a/builder/alicloud/ecs/step_create_snapshot.go b/builder/alicloud/ecs/step_create_snapshot.go index 32f155e08..056a4ba87 100644 --- a/builder/alicloud/ecs/step_create_snapshot.go +++ b/builder/alicloud/ecs/step_create_snapshot.go @@ -7,8 +7,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/errors" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCreateAlicloudSnapshot struct { diff --git a/builder/alicloud/ecs/step_create_tags.go b/builder/alicloud/ecs/step_create_tags.go index fd6b2b712..f374dcba4 100644 --- a/builder/alicloud/ecs/step_create_tags.go +++ b/builder/alicloud/ecs/step_create_tags.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCreateTags struct { diff --git a/builder/alicloud/ecs/step_delete_images_snapshots.go b/builder/alicloud/ecs/step_delete_images_snapshots.go index cd79229bd..bffbb5068 100644 --- a/builder/alicloud/ecs/step_delete_images_snapshots.go +++ b/builder/alicloud/ecs/step_delete_images_snapshots.go @@ -6,8 +6,8 @@ import ( "log" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepDeleteAlicloudImageSnapshots struct { diff --git a/builder/alicloud/ecs/step_pre_validate.go b/builder/alicloud/ecs/step_pre_validate.go index 283a6b334..8481f34f4 100644 --- a/builder/alicloud/ecs/step_pre_validate.go +++ b/builder/alicloud/ecs/step_pre_validate.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepPreValidate struct { diff --git a/builder/alicloud/ecs/step_region_copy_image.go b/builder/alicloud/ecs/step_region_copy_image.go index ae5ebc693..c0ec5e3f3 100644 --- a/builder/alicloud/ecs/step_region_copy_image.go +++ b/builder/alicloud/ecs/step_region_copy_image.go @@ -8,8 +8,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" confighelper "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepRegionCopyAlicloudImage struct { diff --git a/builder/alicloud/ecs/step_run_instance.go b/builder/alicloud/ecs/step_run_instance.go index 559dfff63..d84d2028c 100644 --- a/builder/alicloud/ecs/step_run_instance.go +++ b/builder/alicloud/ecs/step_run_instance.go @@ -6,8 +6,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepRunAlicloudInstance struct { diff --git a/builder/alicloud/ecs/step_share_image.go b/builder/alicloud/ecs/step_share_image.go index 7a4f6b675..552f41de4 100644 --- a/builder/alicloud/ecs/step_share_image.go +++ b/builder/alicloud/ecs/step_share_image.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepShareAlicloudImage struct { diff --git a/builder/alicloud/ecs/step_stop_instance.go b/builder/alicloud/ecs/step_stop_instance.go index f7d561cf9..7b6daaaab 100644 --- a/builder/alicloud/ecs/step_stop_instance.go +++ b/builder/alicloud/ecs/step_stop_instance.go @@ -8,8 +8,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepStopAlicloudInstance struct { diff --git a/builder/amazon/chroot/builder.go b/builder/amazon/chroot/builder.go index f41272f2f..8964ec157 100644 --- a/builder/amazon/chroot/builder.go +++ b/builder/amazon/chroot/builder.go @@ -17,11 +17,11 @@ import ( awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/chroot" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/chroot/step_attach_volume.go b/builder/amazon/chroot/step_attach_volume.go index 651a2ff8a..d87b03ca0 100644 --- a/builder/amazon/chroot/step_attach_volume.go +++ b/builder/amazon/chroot/step_attach_volume.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepAttachVolume attaches the previously created volume to an diff --git a/builder/amazon/chroot/step_check_root_device.go b/builder/amazon/chroot/step_check_root_device.go index 3933680e3..cb1d06d8e 100644 --- a/builder/amazon/chroot/step_check_root_device.go +++ b/builder/amazon/chroot/step_check_root_device.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepCheckRootDevice makes sure the root device on the AMI is EBS-backed. diff --git a/builder/amazon/chroot/step_create_volume.go b/builder/amazon/chroot/step_create_volume.go index 36c6414d7..f59bf689d 100644 --- a/builder/amazon/chroot/step_create_volume.go +++ b/builder/amazon/chroot/step_create_volume.go @@ -9,8 +9,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/chroot/step_early_unflock.go b/builder/amazon/chroot/step_early_unflock.go index e08dc672f..a5378557f 100644 --- a/builder/amazon/chroot/step_early_unflock.go +++ b/builder/amazon/chroot/step_early_unflock.go @@ -5,9 +5,9 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/chroot" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepEarlyUnflock unlocks the flock. diff --git a/builder/amazon/chroot/step_flock.go b/builder/amazon/chroot/step_flock.go index f3fd9d29e..5465a72fe 100644 --- a/builder/amazon/chroot/step_flock.go +++ b/builder/amazon/chroot/step_flock.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepFlock provisions the instance within a chroot. diff --git a/builder/amazon/chroot/step_instance_info.go b/builder/amazon/chroot/step_instance_info.go index 01b0d0ac7..618577146 100644 --- a/builder/amazon/chroot/step_instance_info.go +++ b/builder/amazon/chroot/step_instance_info.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws/ec2metadata" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepInstanceInfo verifies that this builder is running on an EC2 instance. diff --git a/builder/amazon/chroot/step_mount_device.go b/builder/amazon/chroot/step_mount_device.go index c9dcfc042..d167e73eb 100644 --- a/builder/amazon/chroot/step_mount_device.go +++ b/builder/amazon/chroot/step_mount_device.go @@ -10,9 +10,9 @@ import ( "strings" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/chroot/step_prepare_device.go b/builder/amazon/chroot/step_prepare_device.go index a6a27eb95..970c29b13 100644 --- a/builder/amazon/chroot/step_prepare_device.go +++ b/builder/amazon/chroot/step_prepare_device.go @@ -6,8 +6,8 @@ import ( "log" "os" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" ) diff --git a/builder/amazon/chroot/step_register_ami.go b/builder/amazon/chroot/step_register_ami.go index b44692cb4..628a62f7b 100644 --- a/builder/amazon/chroot/step_register_ami.go +++ b/builder/amazon/chroot/step_register_ami.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" awscommon "github.com/hashicorp/packer/builder/amazon/common" confighelper "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/random" ) diff --git a/builder/amazon/chroot/step_snapshot.go b/builder/amazon/chroot/step_snapshot.go index 408c1f0c5..ba7391516 100644 --- a/builder/amazon/chroot/step_snapshot.go +++ b/builder/amazon/chroot/step_snapshot.go @@ -7,8 +7,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepSnapshot creates a snapshot of the created volume. diff --git a/builder/amazon/common/interpolate_build_info.go b/builder/amazon/common/interpolate_build_info.go index 8087a88c9..5617db61f 100644 --- a/builder/amazon/common/interpolate_build_info.go +++ b/builder/amazon/common/interpolate_build_info.go @@ -3,7 +3,7 @@ package common import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" ) diff --git a/builder/amazon/common/interpolate_build_info_test.go b/builder/amazon/common/interpolate_build_info_test.go index 1dac35894..ea98bb417 100644 --- a/builder/amazon/common/interpolate_build_info_test.go +++ b/builder/amazon/common/interpolate_build_info_test.go @@ -6,7 +6,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" ) diff --git a/builder/amazon/common/ssh.go b/builder/amazon/common/ssh.go index 959f3ce2c..add5308ec 100644 --- a/builder/amazon/common/ssh.go +++ b/builder/amazon/common/ssh.go @@ -7,7 +7,7 @@ import ( "time" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type ec2Describer interface { diff --git a/builder/amazon/common/ssh_test.go b/builder/amazon/common/ssh_test.go index f098613a0..73099b7ef 100644 --- a/builder/amazon/common/ssh_test.go +++ b/builder/amazon/common/ssh_test.go @@ -5,7 +5,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) const ( diff --git a/builder/amazon/common/state.go b/builder/amazon/common/state.go index 113a36ab8..07ad956fe 100644 --- a/builder/amazon/common/state.go +++ b/builder/amazon/common/state.go @@ -14,7 +14,7 @@ import ( "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StateRefreshFunc is a function type used for StateChangeConf that is diff --git a/builder/amazon/common/step_ami_region_copy.go b/builder/amazon/common/step_ami_region_copy.go index c38db6771..01a9bea21 100644 --- a/builder/amazon/common/step_ami_region_copy.go +++ b/builder/amazon/common/step_ami_region_copy.go @@ -9,8 +9,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepAMIRegionCopy struct { diff --git a/builder/amazon/common/step_ami_region_copy_test.go b/builder/amazon/common/step_ami_region_copy_test.go index 9fc636519..93e370307 100644 --- a/builder/amazon/common/step_ami_region_copy_test.go +++ b/builder/amazon/common/step_ami_region_copy_test.go @@ -12,8 +12,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Define a mock struct to be used in unit tests for common aws steps. diff --git a/builder/amazon/common/step_cleanup_volumes.go b/builder/amazon/common/step_cleanup_volumes.go index cfe7a7574..67c0a7939 100644 --- a/builder/amazon/common/step_cleanup_volumes.go +++ b/builder/amazon/common/step_cleanup_volumes.go @@ -6,8 +6,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // stepCleanupVolumes cleans up any orphaned volumes that were not designated to diff --git a/builder/amazon/common/step_create_ssm_tunnel.go b/builder/amazon/common/step_create_ssm_tunnel.go index 1086f477c..2b1de42af 100644 --- a/builder/amazon/common/step_create_ssm_tunnel.go +++ b/builder/amazon/common/step_create_ssm_tunnel.go @@ -10,8 +10,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ssm" pssm "github.com/hashicorp/packer/builder/amazon/common/ssm" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/net" ) diff --git a/builder/amazon/common/step_create_tags.go b/builder/amazon/common/step_create_tags.go index a6a97c4c8..c875f5e49 100644 --- a/builder/amazon/common/step_create_tags.go +++ b/builder/amazon/common/step_create_tags.go @@ -9,8 +9,8 @@ import ( "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/packer/builder/amazon/common/awserrors" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/retry" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/common/step_deregister_ami.go b/builder/amazon/common/step_deregister_ami.go index c593862e0..8ab5685c7 100644 --- a/builder/amazon/common/step_deregister_ami.go +++ b/builder/amazon/common/step_deregister_ami.go @@ -6,8 +6,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepDeregisterAMI struct { diff --git a/builder/amazon/common/step_get_password.go b/builder/amazon/common/step_get_password.go index cbdca2814..007f8c5f2 100644 --- a/builder/amazon/common/step_get_password.go +++ b/builder/amazon/common/step_get_password.go @@ -13,8 +13,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/retry" ) diff --git a/builder/amazon/common/step_iam_instance_profile.go b/builder/amazon/common/step_iam_instance_profile.go index d743c4e16..91a6ec2b0 100644 --- a/builder/amazon/common/step_iam_instance_profile.go +++ b/builder/amazon/common/step_iam_instance_profile.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/iam" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/amazon/common/step_key_pair.go b/builder/amazon/common/step_key_pair.go index 2f70d3a35..a477524de 100644 --- a/builder/amazon/common/step_key_pair.go +++ b/builder/amazon/common/step_key_pair.go @@ -9,8 +9,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/retry" ) diff --git a/builder/amazon/common/step_modify_ami_attributes.go b/builder/amazon/common/step_modify_ami_attributes.go index d4ab8f5c1..b60caff4c 100644 --- a/builder/amazon/common/step_modify_ami_attributes.go +++ b/builder/amazon/common/step_modify_ami_attributes.go @@ -7,8 +7,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/common/step_modify_ebs_instance.go b/builder/amazon/common/step_modify_ebs_instance.go index 6b2492b7a..e3a08e5d0 100644 --- a/builder/amazon/common/step_modify_ebs_instance.go +++ b/builder/amazon/common/step_modify_ebs_instance.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" confighelper "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepModifyEBSBackedInstance struct { diff --git a/builder/amazon/common/step_network_info.go b/builder/amazon/common/step_network_info.go index 89d63590d..b66bef233 100644 --- a/builder/amazon/common/step_network_info.go +++ b/builder/amazon/common/step_network_info.go @@ -8,8 +8,8 @@ import ( "sort" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepNetworkInfo queries AWS for information about diff --git a/builder/amazon/common/step_pre_validate.go b/builder/amazon/common/step_pre_validate.go index 197676fa2..993b4d940 100644 --- a/builder/amazon/common/step_pre_validate.go +++ b/builder/amazon/common/step_pre_validate.go @@ -10,8 +10,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" "github.com/hashicorp/packer/builder/amazon/common/awserrors" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/retry" ) diff --git a/builder/amazon/common/step_run_source_instance.go b/builder/amazon/common/step_run_source_instance.go index 23e8981ff..10a5f4af8 100644 --- a/builder/amazon/common/step_run_source_instance.go +++ b/builder/amazon/common/step_run_source_instance.go @@ -13,8 +13,8 @@ import ( "github.com/hashicorp/packer/builder/amazon/common/awserrors" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/retry" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/common/step_run_spot_instance.go b/builder/amazon/common/step_run_spot_instance.go index 24ee1d70e..039198f78 100644 --- a/builder/amazon/common/step_run_spot_instance.go +++ b/builder/amazon/common/step_run_spot_instance.go @@ -14,8 +14,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2/ec2iface" "github.com/hashicorp/packer/builder/amazon/common/awserrors" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/random" "github.com/hashicorp/packer/packer-plugin-sdk/retry" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" diff --git a/builder/amazon/common/step_run_spot_instance_test.go b/builder/amazon/common/step_run_spot_instance_test.go index d00bf74dd..5df8070f1 100644 --- a/builder/amazon/common/step_run_spot_instance_test.go +++ b/builder/amazon/common/step_run_spot_instance_test.go @@ -10,8 +10,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Create statebag for running test diff --git a/builder/amazon/common/step_security_group.go b/builder/amazon/common/step_security_group.go index 5e4dc2301..d77f4bfb4 100644 --- a/builder/amazon/common/step_security_group.go +++ b/builder/amazon/common/step_security_group.go @@ -11,8 +11,8 @@ import ( "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/amazon/common/step_set_generated_data.go b/builder/amazon/common/step_set_generated_data.go index cf6a52694..f90b669b2 100644 --- a/builder/amazon/common/step_set_generated_data.go +++ b/builder/amazon/common/step_set_generated_data.go @@ -4,7 +4,7 @@ import ( "context" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" ) diff --git a/builder/amazon/common/step_source_ami_info.go b/builder/amazon/common/step_source_ami_info.go index a3e4de37f..53b609dc7 100644 --- a/builder/amazon/common/step_source_ami_info.go +++ b/builder/amazon/common/step_source_ami_info.go @@ -9,8 +9,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" confighelper "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepSourceAMIInfo extracts critical information from the source AMI diff --git a/builder/amazon/common/step_stop_ebs_instance.go b/builder/amazon/common/step_stop_ebs_instance.go index 21363470f..db0591e44 100644 --- a/builder/amazon/common/step_stop_ebs_instance.go +++ b/builder/amazon/common/step_stop_ebs_instance.go @@ -7,8 +7,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/packer/builder/amazon/common/awserrors" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/retry" ) diff --git a/builder/amazon/common/tags.go b/builder/amazon/common/tags.go index 20aec10b8..299574c25 100644 --- a/builder/amazon/common/tags.go +++ b/builder/amazon/common/tags.go @@ -5,8 +5,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go index 726d4bba9..5c37146f0 100644 --- a/builder/amazon/ebs/builder.go +++ b/builder/amazon/ebs/builder.go @@ -19,10 +19,10 @@ import ( "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/ebs/step_create_ami.go b/builder/amazon/ebs/step_create_ami.go index a17455125..25efa7666 100644 --- a/builder/amazon/ebs/step_create_ami.go +++ b/builder/amazon/ebs/step_create_ami.go @@ -10,8 +10,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/builder/amazon/common/awserrors" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/random" "github.com/hashicorp/packer/packer-plugin-sdk/retry" ) diff --git a/builder/amazon/ebssurrogate/builder.go b/builder/amazon/ebssurrogate/builder.go index 60522be96..53073100c 100644 --- a/builder/amazon/ebssurrogate/builder.go +++ b/builder/amazon/ebssurrogate/builder.go @@ -17,10 +17,10 @@ import ( "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/ebssurrogate/step_register_ami.go b/builder/amazon/ebssurrogate/step_register_ami.go index 445c34f2a..69a696a7f 100644 --- a/builder/amazon/ebssurrogate/step_register_ami.go +++ b/builder/amazon/ebssurrogate/step_register_ami.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" awscommon "github.com/hashicorp/packer/builder/amazon/common" confighelper "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/random" ) diff --git a/builder/amazon/ebssurrogate/step_snapshot_volumes.go b/builder/amazon/ebssurrogate/step_snapshot_volumes.go index 9facef0e0..3888fddce 100644 --- a/builder/amazon/ebssurrogate/step_snapshot_volumes.go +++ b/builder/amazon/ebssurrogate/step_snapshot_volumes.go @@ -10,8 +10,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" multierror "github.com/hashicorp/go-multierror" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/ebsvolume/builder.go b/builder/amazon/ebsvolume/builder.go index c79cf2ee1..7bd18bd3e 100644 --- a/builder/amazon/ebsvolume/builder.go +++ b/builder/amazon/ebsvolume/builder.go @@ -16,10 +16,10 @@ import ( "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/ebsvolume/step_tag_ebs_volumes.go b/builder/amazon/ebsvolume/step_tag_ebs_volumes.go index ecbf2c56d..911b2c138 100644 --- a/builder/amazon/ebsvolume/step_tag_ebs_volumes.go +++ b/builder/amazon/ebsvolume/step_tag_ebs_volumes.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/instance/builder.go b/builder/amazon/instance/builder.go index 1b798c002..ebd9ad339 100644 --- a/builder/amazon/instance/builder.go +++ b/builder/amazon/instance/builder.go @@ -18,10 +18,10 @@ import ( awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/instance/step_bundle_volume.go b/builder/amazon/instance/step_bundle_volume.go index affbe0845..6bcee9b43 100644 --- a/builder/amazon/instance/step_bundle_volume.go +++ b/builder/amazon/instance/step_bundle_volume.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/instance/step_register_ami.go b/builder/amazon/instance/step_register_ami.go index d6075cf48..513baa4bd 100644 --- a/builder/amazon/instance/step_register_ami.go +++ b/builder/amazon/instance/step_register_ami.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" awscommon "github.com/hashicorp/packer/builder/amazon/common" confighelper "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/random" ) diff --git a/builder/amazon/instance/step_upload_bundle.go b/builder/amazon/instance/step_upload_bundle.go index 794ba593e..8ff2d18c4 100644 --- a/builder/amazon/instance/step_upload_bundle.go +++ b/builder/amazon/instance/step_upload_bundle.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/instance/step_upload_x509_cert.go b/builder/amazon/instance/step_upload_x509_cert.go index 9295d50df..37cf4ae6a 100644 --- a/builder/amazon/instance/step_upload_x509_cert.go +++ b/builder/amazon/instance/step_upload_x509_cert.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepUploadX509Cert struct{} diff --git a/builder/azure/arm/builder.go b/builder/azure/arm/builder.go index 09c3e900c..bee0539a1 100644 --- a/builder/azure/arm/builder.go +++ b/builder/azure/arm/builder.go @@ -19,9 +19,9 @@ import ( "github.com/hashicorp/packer/builder/azure/common/constants" "github.com/hashicorp/packer/builder/azure/common/lin" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) type Builder struct { diff --git a/builder/azure/arm/step.go b/builder/azure/arm/step.go index 7fc7396b6..a9f53a34e 100644 --- a/builder/azure/arm/step.go +++ b/builder/azure/arm/step.go @@ -2,7 +2,7 @@ package arm import ( "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func processStepResult( diff --git a/builder/azure/arm/step_capture_image.go b/builder/azure/arm/step_capture_image.go index f8fe17b59..025fc96d3 100644 --- a/builder/azure/arm/step_capture_image.go +++ b/builder/azure/arm/step_capture_image.go @@ -6,8 +6,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCaptureImage struct { diff --git a/builder/azure/arm/step_capture_image_test.go b/builder/azure/arm/step_capture_image_test.go index bd898b039..4f4d0f0fb 100644 --- a/builder/azure/arm/step_capture_image_test.go +++ b/builder/azure/arm/step_capture_image_test.go @@ -7,7 +7,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCaptureImageShouldFailIfCaptureFails(t *testing.T) { diff --git a/builder/azure/arm/step_certificate_in_keyvault.go b/builder/azure/arm/step_certificate_in_keyvault.go index d646acead..1d1b5800d 100644 --- a/builder/azure/arm/step_certificate_in_keyvault.go +++ b/builder/azure/arm/step_certificate_in_keyvault.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/packer/builder/azure/common" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCertificateInKeyVault struct { diff --git a/builder/azure/arm/step_certificate_in_keyvault_test.go b/builder/azure/arm/step_certificate_in_keyvault_test.go index a246a7746..ce0dcfa79 100644 --- a/builder/azure/arm/step_certificate_in_keyvault_test.go +++ b/builder/azure/arm/step_certificate_in_keyvault_test.go @@ -7,8 +7,8 @@ import ( azcommon "github.com/hashicorp/packer/builder/azure/common" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestNewStepCertificateInKeyVault(t *testing.T) { diff --git a/builder/azure/arm/step_create_resource_group.go b/builder/azure/arm/step_create_resource_group.go index f745d5054..ff0bab59c 100644 --- a/builder/azure/arm/step_create_resource_group.go +++ b/builder/azure/arm/step_create_resource_group.go @@ -7,8 +7,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-02-01/resources" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCreateResourceGroup struct { diff --git a/builder/azure/arm/step_create_resource_group_test.go b/builder/azure/arm/step_create_resource_group_test.go index 2073aa32c..9ee79a550 100644 --- a/builder/azure/arm/step_create_resource_group_test.go +++ b/builder/azure/arm/step_create_resource_group_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreateResourceGroupShouldFailIfBothGroupNames(t *testing.T) { diff --git a/builder/azure/arm/step_delete_additional_disks.go b/builder/azure/arm/step_delete_additional_disks.go index c51155242..6ff15a893 100644 --- a/builder/azure/arm/step_delete_additional_disks.go +++ b/builder/azure/arm/step_delete_additional_disks.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepDeleteAdditionalDisk struct { diff --git a/builder/azure/arm/step_delete_additional_disks_test.go b/builder/azure/arm/step_delete_additional_disks_test.go index 3d249fd0d..9aba4b3fe 100644 --- a/builder/azure/arm/step_delete_additional_disks_test.go +++ b/builder/azure/arm/step_delete_additional_disks_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepDeleteAdditionalDiskShouldFailIfGetFails(t *testing.T) { diff --git a/builder/azure/arm/step_deploy_template.go b/builder/azure/arm/step_deploy_template.go index 3a2564f6d..481af6156 100644 --- a/builder/azure/arm/step_deploy_template.go +++ b/builder/azure/arm/step_deploy_template.go @@ -9,8 +9,8 @@ import ( "time" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/retry" ) diff --git a/builder/azure/arm/step_deploy_template_test.go b/builder/azure/arm/step_deploy_template_test.go index 329a36fde..92e43177f 100644 --- a/builder/azure/arm/step_deploy_template_test.go +++ b/builder/azure/arm/step_deploy_template_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepDeployTemplateShouldFailIfDeployFails(t *testing.T) { diff --git a/builder/azure/arm/step_get_additional_disks.go b/builder/azure/arm/step_get_additional_disks.go index 23d16f425..51468a3cd 100644 --- a/builder/azure/arm/step_get_additional_disks.go +++ b/builder/azure/arm/step_get_additional_disks.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepGetDataDisk struct { diff --git a/builder/azure/arm/step_get_additional_disks_test.go b/builder/azure/arm/step_get_additional_disks_test.go index f9685bef4..454fa1792 100644 --- a/builder/azure/arm/step_get_additional_disks_test.go +++ b/builder/azure/arm/step_get_additional_disks_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepGetAdditionalDiskShouldFailIfGetFails(t *testing.T) { diff --git a/builder/azure/arm/step_get_certificate.go b/builder/azure/arm/step_get_certificate.go index 2c05bf191..ca19b262e 100644 --- a/builder/azure/arm/step_get_certificate.go +++ b/builder/azure/arm/step_get_certificate.go @@ -6,8 +6,8 @@ import ( "time" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepGetCertificate struct { diff --git a/builder/azure/arm/step_get_certificate_test.go b/builder/azure/arm/step_get_certificate_test.go index 5ce807afe..61574e126 100644 --- a/builder/azure/arm/step_get_certificate_test.go +++ b/builder/azure/arm/step_get_certificate_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepGetCertificateShouldFailIfGetFails(t *testing.T) { diff --git a/builder/azure/arm/step_get_ip_address.go b/builder/azure/arm/step_get_ip_address.go index ef838b339..03620ae00 100644 --- a/builder/azure/arm/step_get_ip_address.go +++ b/builder/azure/arm/step_get_ip_address.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type EndpointType int diff --git a/builder/azure/arm/step_get_ip_address_test.go b/builder/azure/arm/step_get_ip_address_test.go index 38b71fa5f..a23cecddd 100644 --- a/builder/azure/arm/step_get_ip_address_test.go +++ b/builder/azure/arm/step_get_ip_address_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepGetIPAddressShouldFailIfGetFails(t *testing.T) { diff --git a/builder/azure/arm/step_get_os_disk.go b/builder/azure/arm/step_get_os_disk.go index 62337fa2a..78eda273b 100644 --- a/builder/azure/arm/step_get_os_disk.go +++ b/builder/azure/arm/step_get_os_disk.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepGetOSDisk struct { diff --git a/builder/azure/arm/step_get_os_disk_test.go b/builder/azure/arm/step_get_os_disk_test.go index f9e633319..7e27b7ab1 100644 --- a/builder/azure/arm/step_get_os_disk_test.go +++ b/builder/azure/arm/step_get_os_disk_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepGetOSDiskShouldFailIfGetFails(t *testing.T) { diff --git a/builder/azure/arm/step_power_off_compute.go b/builder/azure/arm/step_power_off_compute.go index 86f51935b..f6100ae9a 100644 --- a/builder/azure/arm/step_power_off_compute.go +++ b/builder/azure/arm/step_power_off_compute.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepPowerOffCompute struct { diff --git a/builder/azure/arm/step_power_off_compute_test.go b/builder/azure/arm/step_power_off_compute_test.go index 8239f2122..991a603ce 100644 --- a/builder/azure/arm/step_power_off_compute_test.go +++ b/builder/azure/arm/step_power_off_compute_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepPowerOffComputeShouldFailIfPowerOffFails(t *testing.T) { diff --git a/builder/azure/arm/step_publish_to_shared_image_gallery.go b/builder/azure/arm/step_publish_to_shared_image_gallery.go index 5f0a0f158..ed7f050b9 100644 --- a/builder/azure/arm/step_publish_to_shared_image_gallery.go +++ b/builder/azure/arm/step_publish_to_shared_image_gallery.go @@ -7,8 +7,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute" "github.com/Azure/go-autorest/autorest/date" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepPublishToSharedImageGallery struct { diff --git a/builder/azure/arm/step_publish_to_shared_image_gallery_test.go b/builder/azure/arm/step_publish_to_shared_image_gallery_test.go index d11fb052b..ad87b47d4 100644 --- a/builder/azure/arm/step_publish_to_shared_image_gallery_test.go +++ b/builder/azure/arm/step_publish_to_shared_image_gallery_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepPublishToSharedImageGalleryShouldNotPublishForVhd(t *testing.T) { diff --git a/builder/azure/arm/step_set_certificate.go b/builder/azure/arm/step_set_certificate.go index 46621e306..563cc55c1 100644 --- a/builder/azure/arm/step_set_certificate.go +++ b/builder/azure/arm/step_set_certificate.go @@ -4,8 +4,8 @@ import ( "context" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepSetCertificate struct { diff --git a/builder/azure/arm/step_set_certificate_test.go b/builder/azure/arm/step_set_certificate_test.go index 387d620a9..69d5377fd 100644 --- a/builder/azure/arm/step_set_certificate_test.go +++ b/builder/azure/arm/step_set_certificate_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepSetCertificateShouldPassIfGetPasses(t *testing.T) { diff --git a/builder/azure/arm/step_snapshot_data_disks.go b/builder/azure/arm/step_snapshot_data_disks.go index dba6f7634..63e9b0f71 100644 --- a/builder/azure/arm/step_snapshot_data_disks.go +++ b/builder/azure/arm/step_snapshot_data_disks.go @@ -8,8 +8,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute" "github.com/Azure/go-autorest/autorest/to" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepSnapshotDataDisks struct { diff --git a/builder/azure/arm/step_snapshot_data_disks_test.go b/builder/azure/arm/step_snapshot_data_disks_test.go index 9f34f0cce..88b1dfaf6 100644 --- a/builder/azure/arm/step_snapshot_data_disks_test.go +++ b/builder/azure/arm/step_snapshot_data_disks_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepSnapshotDataDisksShouldFailIfSnapshotFails(t *testing.T) { diff --git a/builder/azure/arm/step_snapshot_os_disk.go b/builder/azure/arm/step_snapshot_os_disk.go index 28fc844a9..bc84d0d94 100644 --- a/builder/azure/arm/step_snapshot_os_disk.go +++ b/builder/azure/arm/step_snapshot_os_disk.go @@ -7,8 +7,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute" "github.com/Azure/go-autorest/autorest/to" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepSnapshotOSDisk struct { diff --git a/builder/azure/arm/step_snapshot_os_disk_test.go b/builder/azure/arm/step_snapshot_os_disk_test.go index 7148a6eb0..7e0e99aa1 100644 --- a/builder/azure/arm/step_snapshot_os_disk_test.go +++ b/builder/azure/arm/step_snapshot_os_disk_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepSnapshotOSDiskShouldFailIfSnapshotFails(t *testing.T) { diff --git a/builder/azure/arm/step_test.go b/builder/azure/arm/step_test.go index 1f75b1936..1c6b37e70 100644 --- a/builder/azure/arm/step_test.go +++ b/builder/azure/arm/step_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestProcessStepResultShouldContinueForNonErrors(t *testing.T) { diff --git a/builder/azure/arm/step_validate_template.go b/builder/azure/arm/step_validate_template.go index 30ec3728b..4f3204659 100644 --- a/builder/azure/arm/step_validate_template.go +++ b/builder/azure/arm/step_validate_template.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepValidateTemplate struct { diff --git a/builder/azure/arm/step_validate_template_test.go b/builder/azure/arm/step_validate_template_test.go index 22251f489..7e127a2aa 100644 --- a/builder/azure/arm/step_validate_template_test.go +++ b/builder/azure/arm/step_validate_template_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepValidateTemplateShouldFailIfValidateFails(t *testing.T) { diff --git a/builder/azure/chroot/builder.go b/builder/azure/chroot/builder.go index 3e97083ae..6387e5603 100644 --- a/builder/azure/chroot/builder.go +++ b/builder/azure/chroot/builder.go @@ -19,11 +19,11 @@ import ( azcommon "github.com/hashicorp/packer/builder/azure/common" "github.com/hashicorp/packer/builder/azure/common/client" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/chroot" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" diff --git a/builder/azure/chroot/builder_test.go b/builder/azure/chroot/builder_test.go index dee9436a9..08e6132e5 100644 --- a/builder/azure/chroot/builder_test.go +++ b/builder/azure/chroot/builder_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" ) diff --git a/builder/azure/chroot/step_attach_disk.go b/builder/azure/chroot/step_attach_disk.go index efbc2b430..53a0b16c3 100644 --- a/builder/azure/chroot/step_attach_disk.go +++ b/builder/azure/chroot/step_attach_disk.go @@ -7,8 +7,8 @@ import ( "time" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) var _ multistep.Step = &StepAttachDisk{} diff --git a/builder/azure/chroot/step_attach_disk_test.go b/builder/azure/chroot/step_attach_disk_test.go index acbdfa4e1..69261b298 100644 --- a/builder/azure/chroot/step_attach_disk_test.go +++ b/builder/azure/chroot/step_attach_disk_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/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepAttachDisk_Run(t *testing.T) { diff --git a/builder/azure/chroot/step_create_image.go b/builder/azure/chroot/step_create_image.go index a818c4cd7..952374f7d 100644 --- a/builder/azure/chroot/step_create_image.go +++ b/builder/azure/chroot/step_create_image.go @@ -10,8 +10,8 @@ import ( "github.com/Azure/go-autorest/autorest/azure" "github.com/Azure/go-autorest/autorest/to" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) var _ multistep.Step = &StepCreateImage{} diff --git a/builder/azure/chroot/step_create_image_test.go b/builder/azure/chroot/step_create_image_test.go index 43bbebd50..4bb32e9cd 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/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" diff --git a/builder/azure/chroot/step_create_new_diskset.go b/builder/azure/chroot/step_create_new_diskset.go index 3d188b2a5..ad690ecad 100644 --- a/builder/azure/chroot/step_create_new_diskset.go +++ b/builder/azure/chroot/step_create_new_diskset.go @@ -8,8 +8,8 @@ import ( "time" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest/to" diff --git a/builder/azure/chroot/step_create_new_diskset_test.go b/builder/azure/chroot/step_create_new_diskset_test.go index 596752e2e..f85ea0d1f 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/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" diff --git a/builder/azure/chroot/step_create_shared_image_version.go b/builder/azure/chroot/step_create_shared_image_version.go index 614ad100f..d32da7e92 100644 --- a/builder/azure/chroot/step_create_shared_image_version.go +++ b/builder/azure/chroot/step_create_shared_image_version.go @@ -10,8 +10,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest/to" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCreateSharedImageVersion struct { 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 4b8be5542..e08265a41 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/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" diff --git a/builder/azure/chroot/step_create_snapshotset.go b/builder/azure/chroot/step_create_snapshotset.go index a03fbe5c9..6af98710a 100644 --- a/builder/azure/chroot/step_create_snapshotset.go +++ b/builder/azure/chroot/step_create_snapshotset.go @@ -8,8 +8,8 @@ import ( "time" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest/to" diff --git a/builder/azure/chroot/step_create_snapshotset_test.go b/builder/azure/chroot/step_create_snapshotset_test.go index c7baf74e5..861edcb2c 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/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreateSnapshot_Run(t *testing.T) { diff --git a/builder/azure/chroot/step_mount_device.go b/builder/azure/chroot/step_mount_device.go index e6833075d..315b61d5b 100644 --- a/builder/azure/chroot/step_mount_device.go +++ b/builder/azure/chroot/step_mount_device.go @@ -12,9 +12,9 @@ import ( "runtime" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/azure/chroot/step_mount_device_test.go b/builder/azure/chroot/step_mount_device_test.go index fa46b4806..ee601ef52 100644 --- a/builder/azure/chroot/step_mount_device_test.go +++ b/builder/azure/chroot/step_mount_device_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepMountDevice_Run(t *testing.T) { diff --git a/builder/azure/chroot/step_resolve_plaform_image_version.go b/builder/azure/chroot/step_resolve_plaform_image_version.go index 77a2e7531..d0f4a9ed2 100644 --- a/builder/azure/chroot/step_resolve_plaform_image_version.go +++ b/builder/azure/chroot/step_resolve_plaform_image_version.go @@ -8,8 +8,8 @@ import ( "github.com/Azure/go-autorest/autorest/to" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepResolvePlatformImageVersion resolves the exact PIR version when the version is 'latest' diff --git a/builder/azure/chroot/step_resolve_plaform_image_version_test.go b/builder/azure/chroot/step_resolve_plaform_image_version_test.go index 0030b8090..687037f64 100644 --- a/builder/azure/chroot/step_resolve_plaform_image_version_test.go +++ b/builder/azure/chroot/step_resolve_plaform_image_version_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" diff --git a/builder/azure/chroot/step_verify_shared_image_destination.go b/builder/azure/chroot/step_verify_shared_image_destination.go index 7877948fe..156e8413f 100644 --- a/builder/azure/chroot/step_verify_shared_image_destination.go +++ b/builder/azure/chroot/step_verify_shared_image_destination.go @@ -9,8 +9,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest/to" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) var _ multistep.Step = &StepVerifySharedImageDestination{} 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 b34d24840..22dafaf94 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/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" diff --git a/builder/azure/chroot/step_verify_shared_image_source.go b/builder/azure/chroot/step_verify_shared_image_source.go index ff64a565a..5f6d243c6 100644 --- a/builder/azure/chroot/step_verify_shared_image_source.go +++ b/builder/azure/chroot/step_verify_shared_image_source.go @@ -9,8 +9,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest/to" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) var _ multistep.Step = &StepVerifySharedImageSource{} 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 69ad4065d..d29b8042a 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/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepVerifySharedImageSource_Run(t *testing.T) { diff --git a/builder/azure/chroot/step_verify_source_disk.go b/builder/azure/chroot/step_verify_source_disk.go index 43a0343ef..1bf65a436 100644 --- a/builder/azure/chroot/step_verify_source_disk.go +++ b/builder/azure/chroot/step_verify_source_disk.go @@ -10,8 +10,8 @@ import ( "github.com/Azure/go-autorest/autorest/to" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepVerifySourceDisk struct { diff --git a/builder/azure/chroot/step_verify_source_disk_test.go b/builder/azure/chroot/step_verify_source_disk_test.go index dd3732b10..d0149a439 100644 --- a/builder/azure/chroot/step_verify_source_disk_test.go +++ b/builder/azure/chroot/step_verify_source_disk_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/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func Test_StepVerifySourceDisk_Run(t *testing.T) { diff --git a/builder/azure/common/lin/ssh.go b/builder/azure/common/lin/ssh.go index c8b09c45e..5e48273d9 100644 --- a/builder/azure/common/lin/ssh.go +++ b/builder/azure/common/lin/ssh.go @@ -2,7 +2,7 @@ package lin import ( "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func SSHHost(state multistep.StateBag) (string, error) { diff --git a/builder/azure/common/state_bag.go b/builder/azure/common/state_bag.go index 57889c03f..ced0362f1 100644 --- a/builder/azure/common/state_bag.go +++ b/builder/azure/common/state_bag.go @@ -1,6 +1,6 @@ package common -import "github.com/hashicorp/packer/helper/multistep" +import "github.com/hashicorp/packer/packer-plugin-sdk/multistep" func IsStateCancelled(stateBag multistep.StateBag) bool { _, ok := stateBag.GetOk(multistep.StateCancelled) diff --git a/builder/azure/dtl/builder.go b/builder/azure/dtl/builder.go index fb840dc3d..ad32a4d83 100644 --- a/builder/azure/dtl/builder.go +++ b/builder/azure/dtl/builder.go @@ -18,9 +18,9 @@ import ( "github.com/hashicorp/packer/builder/azure/common/constants" "github.com/hashicorp/packer/builder/azure/common/lin" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) type Builder struct { diff --git a/builder/azure/dtl/step.go b/builder/azure/dtl/step.go index 6418e5c15..39320e5bd 100644 --- a/builder/azure/dtl/step.go +++ b/builder/azure/dtl/step.go @@ -2,7 +2,7 @@ package dtl import ( "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func processStepResult( diff --git a/builder/azure/dtl/step_capture_image.go b/builder/azure/dtl/step_capture_image.go index 30f726a7d..6e0f84fb3 100644 --- a/builder/azure/dtl/step_capture_image.go +++ b/builder/azure/dtl/step_capture_image.go @@ -7,8 +7,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2018-09-15/dtl" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCaptureImage struct { diff --git a/builder/azure/dtl/step_delete_virtual_machine.go b/builder/azure/dtl/step_delete_virtual_machine.go index a94f72d6a..d85d18407 100644 --- a/builder/azure/dtl/step_delete_virtual_machine.go +++ b/builder/azure/dtl/step_delete_virtual_machine.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepDeleteVirtualMachine struct { diff --git a/builder/azure/dtl/step_deploy_template.go b/builder/azure/dtl/step_deploy_template.go index 0cface5ff..cae494bd6 100644 --- a/builder/azure/dtl/step_deploy_template.go +++ b/builder/azure/dtl/step_deploy_template.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepDeployTemplate struct { diff --git a/builder/azure/dtl/step_power_off_compute.go b/builder/azure/dtl/step_power_off_compute.go index 794c3b751..2bc224c34 100644 --- a/builder/azure/dtl/step_power_off_compute.go +++ b/builder/azure/dtl/step_power_off_compute.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepPowerOffCompute struct { diff --git a/builder/azure/dtl/step_publish_to_shared_image_gallery.go b/builder/azure/dtl/step_publish_to_shared_image_gallery.go index 3ed56794e..e4c6d8231 100644 --- a/builder/azure/dtl/step_publish_to_shared_image_gallery.go +++ b/builder/azure/dtl/step_publish_to_shared_image_gallery.go @@ -6,8 +6,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepPublishToSharedImageGallery struct { diff --git a/builder/azure/dtl/step_save_winrm_password.go b/builder/azure/dtl/step_save_winrm_password.go index 241396228..ab81bcc80 100644 --- a/builder/azure/dtl/step_save_winrm_password.go +++ b/builder/azure/dtl/step_save_winrm_password.go @@ -3,8 +3,8 @@ package dtl import ( "context" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepSaveWinRMPassword struct { diff --git a/builder/azure/dtl/step_test.go b/builder/azure/dtl/step_test.go index 71ebb2b7a..1dedc7e85 100644 --- a/builder/azure/dtl/step_test.go +++ b/builder/azure/dtl/step_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestProcessStepResultShouldContinueForNonErrors(t *testing.T) { diff --git a/builder/cloudstack/builder.go b/builder/cloudstack/builder.go index 7a4f0cdc4..9dde567e3 100644 --- a/builder/cloudstack/builder.go +++ b/builder/cloudstack/builder.go @@ -6,9 +6,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/cloudstack/config.go b/builder/cloudstack/config.go index ce2760438..99adfa718 100644 --- a/builder/cloudstack/config.go +++ b/builder/cloudstack/config.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/cloudstack/ssh.go b/builder/cloudstack/ssh.go index 269c2a583..3be57e3e9 100644 --- a/builder/cloudstack/ssh.go +++ b/builder/cloudstack/ssh.go @@ -3,7 +3,7 @@ package cloudstack import ( "fmt" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func commPort(state multistep.StateBag) (int, error) { diff --git a/builder/cloudstack/step_configure_networking.go b/builder/cloudstack/step_configure_networking.go index 17ee7d92f..7de5a0a35 100644 --- a/builder/cloudstack/step_configure_networking.go +++ b/builder/cloudstack/step_configure_networking.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/cloudstack/step_create_instance.go b/builder/cloudstack/step_create_instance.go index aaba68bd6..682f0659b 100644 --- a/builder/cloudstack/step_create_instance.go +++ b/builder/cloudstack/step_create_instance.go @@ -8,8 +8,8 @@ import ( "net" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/cloudstack/step_create_security_group.go b/builder/cloudstack/step_create_security_group.go index 816948397..e479d0558 100644 --- a/builder/cloudstack/step_create_security_group.go +++ b/builder/cloudstack/step_create_security_group.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/cloudstack/step_create_template.go b/builder/cloudstack/step_create_template.go index 4b72d206d..f3f0ad03f 100644 --- a/builder/cloudstack/step_create_template.go +++ b/builder/cloudstack/step_create_template.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/cloudstack/step_detach_iso.go b/builder/cloudstack/step_detach_iso.go index 444293c2c..9e0a17d7c 100644 --- a/builder/cloudstack/step_detach_iso.go +++ b/builder/cloudstack/step_detach_iso.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/cloudstack/step_keypair.go b/builder/cloudstack/step_keypair.go index b47655596..41761c976 100644 --- a/builder/cloudstack/step_keypair.go +++ b/builder/cloudstack/step_keypair.go @@ -7,8 +7,8 @@ import ( "runtime" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/cloudstack/step_prepare_config.go b/builder/cloudstack/step_prepare_config.go index 7c6e1a4ff..f7cbcd637 100644 --- a/builder/cloudstack/step_prepare_config.go +++ b/builder/cloudstack/step_prepare_config.go @@ -6,8 +6,8 @@ import ( "io/ioutil" "regexp" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/cloudstack/step_shutdown_instance.go b/builder/cloudstack/step_shutdown_instance.go index 77186e13b..c14a41f82 100644 --- a/builder/cloudstack/step_shutdown_instance.go +++ b/builder/cloudstack/step_shutdown_instance.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/digitalocean/builder.go b/builder/digitalocean/builder.go index 836f7b6b8..76cf9fbc3 100644 --- a/builder/digitalocean/builder.go +++ b/builder/digitalocean/builder.go @@ -12,9 +12,9 @@ import ( "github.com/digitalocean/godo" "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "golang.org/x/oauth2" ) diff --git a/builder/digitalocean/step_create_droplet.go b/builder/digitalocean/step_create_droplet.go index e246abf5e..021534677 100644 --- a/builder/digitalocean/step_create_droplet.go +++ b/builder/digitalocean/step_create_droplet.go @@ -9,8 +9,8 @@ import ( "io/ioutil" "github.com/digitalocean/godo" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCreateDroplet struct { diff --git a/builder/digitalocean/step_create_ssh_key.go b/builder/digitalocean/step_create_ssh_key.go index 5e104b506..36eaf0ed3 100644 --- a/builder/digitalocean/step_create_ssh_key.go +++ b/builder/digitalocean/step_create_ssh_key.go @@ -12,8 +12,8 @@ import ( "runtime" "github.com/digitalocean/godo" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" "golang.org/x/crypto/ssh" ) diff --git a/builder/digitalocean/step_droplet_info.go b/builder/digitalocean/step_droplet_info.go index dc7a9ed8a..7f4c50149 100644 --- a/builder/digitalocean/step_droplet_info.go +++ b/builder/digitalocean/step_droplet_info.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/digitalocean/godo" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepDropletInfo struct{} diff --git a/builder/digitalocean/step_power_off.go b/builder/digitalocean/step_power_off.go index fab35569a..f75fe898b 100644 --- a/builder/digitalocean/step_power_off.go +++ b/builder/digitalocean/step_power_off.go @@ -6,8 +6,8 @@ import ( "log" "github.com/digitalocean/godo" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepPowerOff struct{} diff --git a/builder/digitalocean/step_shutdown.go b/builder/digitalocean/step_shutdown.go index 339e034b7..8076ad539 100644 --- a/builder/digitalocean/step_shutdown.go +++ b/builder/digitalocean/step_shutdown.go @@ -7,8 +7,8 @@ import ( "time" "github.com/digitalocean/godo" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepShutdown struct{} diff --git a/builder/digitalocean/step_snapshot.go b/builder/digitalocean/step_snapshot.go index 511c3a377..b28a5e38c 100644 --- a/builder/digitalocean/step_snapshot.go +++ b/builder/digitalocean/step_snapshot.go @@ -8,8 +8,8 @@ import ( "time" "github.com/digitalocean/godo" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepSnapshot struct { diff --git a/builder/docker/builder.go b/builder/docker/builder.go index d5e7dcf41..87b29680e 100644 --- a/builder/docker/builder.go +++ b/builder/docker/builder.go @@ -6,9 +6,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" ) diff --git a/builder/docker/comm.go b/builder/docker/comm.go index 6feabc3b2..dbc4198fb 100644 --- a/builder/docker/comm.go +++ b/builder/docker/comm.go @@ -3,7 +3,7 @@ package docker import ( "log" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func commHost(host string) func(multistep.StateBag) (string, error) { diff --git a/builder/docker/step_commit.go b/builder/docker/step_commit.go index 33ccb090b..ca5948336 100644 --- a/builder/docker/step_commit.go +++ b/builder/docker/step_commit.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepCommit commits the container to a image. diff --git a/builder/docker/step_commit_test.go b/builder/docker/step_commit_test.go index 16548b069..c7c9e7067 100644 --- a/builder/docker/step_commit_test.go +++ b/builder/docker/step_commit_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testStepCommitState(t *testing.T) multistep.StateBag { diff --git a/builder/docker/step_connect_docker.go b/builder/docker/step_connect_docker.go index 0d064b269..bff5108eb 100644 --- a/builder/docker/step_connect_docker.go +++ b/builder/docker/step_connect_docker.go @@ -6,7 +6,7 @@ import ( "os/exec" "strings" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepConnectDocker struct{} diff --git a/builder/docker/step_export.go b/builder/docker/step_export.go index 99a8a1d11..107761ce8 100644 --- a/builder/docker/step_export.go +++ b/builder/docker/step_export.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepExport exports the container to a flat tar file. diff --git a/builder/docker/step_export_test.go b/builder/docker/step_export_test.go index aa3fd124b..cdffcc4b6 100644 --- a/builder/docker/step_export_test.go +++ b/builder/docker/step_export_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testStepExportState(t *testing.T) multistep.StateBag { diff --git a/builder/docker/step_pull.go b/builder/docker/step_pull.go index d2cf3cdda..b18d01444 100644 --- a/builder/docker/step_pull.go +++ b/builder/docker/step_pull.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepPull struct{} diff --git a/builder/docker/step_pull_test.go b/builder/docker/step_pull_test.go index b01b42107..c921612dd 100644 --- a/builder/docker/step_pull_test.go +++ b/builder/docker/step_pull_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepPull_impl(t *testing.T) { diff --git a/builder/docker/step_run.go b/builder/docker/step_run.go index 89f953dd2..ce9c46a40 100644 --- a/builder/docker/step_run.go +++ b/builder/docker/step_run.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepRun struct { diff --git a/builder/docker/step_run_test.go b/builder/docker/step_run_test.go index c76c7c637..cc5908951 100644 --- a/builder/docker/step_run_test.go +++ b/builder/docker/step_run_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testStepRunState(t *testing.T) multistep.StateBag { diff --git a/builder/docker/step_set_generated_data.go b/builder/docker/step_set_generated_data.go index 972dd6495..9576cab17 100644 --- a/builder/docker/step_set_generated_data.go +++ b/builder/docker/step_set_generated_data.go @@ -3,7 +3,7 @@ package docker import ( "context" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" ) diff --git a/builder/docker/step_set_generated_data_test.go b/builder/docker/step_set_generated_data_test.go index 9fa826129..930956095 100644 --- a/builder/docker/step_set_generated_data_test.go +++ b/builder/docker/step_set_generated_data_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" ) diff --git a/builder/docker/step_temp_dir.go b/builder/docker/step_temp_dir.go index 39808cdd2..9879939d7 100644 --- a/builder/docker/step_temp_dir.go +++ b/builder/docker/step_temp_dir.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepTempDir creates a temporary directory that we use in order to diff --git a/builder/docker/step_temp_dir_test.go b/builder/docker/step_temp_dir_test.go index ee7245150..d58906df9 100644 --- a/builder/docker/step_temp_dir_test.go +++ b/builder/docker/step_temp_dir_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepTempDir_impl(t *testing.T) { diff --git a/builder/docker/step_test.go b/builder/docker/step_test.go index 0c7d56649..b048c3f6e 100644 --- a/builder/docker/step_test.go +++ b/builder/docker/step_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/file/builder.go b/builder/file/builder.go index 0f5b78734..f2a8d2969 100644 --- a/builder/file/builder.go +++ b/builder/file/builder.go @@ -14,8 +14,8 @@ import ( "path/filepath" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) const BuilderId = "packer.file" diff --git a/builder/googlecompute/builder.go b/builder/googlecompute/builder.go index f8d7a896b..f3b73d0ef 100644 --- a/builder/googlecompute/builder.go +++ b/builder/googlecompute/builder.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) // The unique ID for this builder. diff --git a/builder/googlecompute/step_check_existing_image.go b/builder/googlecompute/step_check_existing_image.go index 0574a0234..faabae456 100644 --- a/builder/googlecompute/step_check_existing_image.go +++ b/builder/googlecompute/step_check_existing_image.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepCheckExistingImage represents a Packer build step that checks if the diff --git a/builder/googlecompute/step_check_existing_image_test.go b/builder/googlecompute/step_check_existing_image_test.go index d4b9a9541..162d6188b 100644 --- a/builder/googlecompute/step_check_existing_image_test.go +++ b/builder/googlecompute/step_check_existing_image_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCheckExistingImage_impl(t *testing.T) { diff --git a/builder/googlecompute/step_create_image.go b/builder/googlecompute/step_create_image.go index 0de8211b0..0c37d6acf 100644 --- a/builder/googlecompute/step_create_image.go +++ b/builder/googlecompute/step_create_image.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepCreateImage represents a Packer build step that creates GCE machine diff --git a/builder/googlecompute/step_create_image_test.go b/builder/googlecompute/step_create_image_test.go index 2a3017f0a..f8084412c 100644 --- a/builder/googlecompute/step_create_image_test.go +++ b/builder/googlecompute/step_create_image_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" ) diff --git a/builder/googlecompute/step_create_instance.go b/builder/googlecompute/step_create_instance.go index 6c892da60..371fee64a 100644 --- a/builder/googlecompute/step_create_instance.go +++ b/builder/googlecompute/step_create_instance.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepCreateInstance represents a Packer build step that creates GCE instances. diff --git a/builder/googlecompute/step_create_instance_test.go b/builder/googlecompute/step_create_instance_test.go index 82ccfe881..791c6ffbe 100644 --- a/builder/googlecompute/step_create_instance_test.go +++ b/builder/googlecompute/step_create_instance_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" ) diff --git a/builder/googlecompute/step_create_windows_password.go b/builder/googlecompute/step_create_windows_password.go index 6f1aeb22f..d86116091 100644 --- a/builder/googlecompute/step_create_windows_password.go +++ b/builder/googlecompute/step_create_windows_password.go @@ -13,8 +13,8 @@ import ( "os" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepCreateWindowsPassword represents a Packer build step that sets the windows password on a Windows GCE instance. diff --git a/builder/googlecompute/step_create_windows_password_test.go b/builder/googlecompute/step_create_windows_password_test.go index 6abb6243d..03dd188dd 100644 --- a/builder/googlecompute/step_create_windows_password_test.go +++ b/builder/googlecompute/step_create_windows_password_test.go @@ -6,7 +6,7 @@ import ( "io/ioutil" "os" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "testing" ) diff --git a/builder/googlecompute/step_import_os_login_ssh_key.go b/builder/googlecompute/step_import_os_login_ssh_key.go index 84bfb8b8c..833e73fb0 100644 --- a/builder/googlecompute/step_import_os_login_ssh_key.go +++ b/builder/googlecompute/step_import_os_login_ssh_key.go @@ -6,8 +6,8 @@ import ( "encoding/hex" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "google.golang.org/api/oauth2/v2" ) diff --git a/builder/googlecompute/step_import_os_login_ssh_key_test.go b/builder/googlecompute/step_import_os_login_ssh_key_test.go index f31df1b0d..0ed20bb1a 100644 --- a/builder/googlecompute/step_import_os_login_ssh_key_test.go +++ b/builder/googlecompute/step_import_os_login_ssh_key_test.go @@ -6,7 +6,7 @@ import ( "encoding/hex" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "google.golang.org/api/oauth2/v2" ) diff --git a/builder/googlecompute/step_instance_info.go b/builder/googlecompute/step_instance_info.go index b36d2f1d8..cd388df9f 100644 --- a/builder/googlecompute/step_instance_info.go +++ b/builder/googlecompute/step_instance_info.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // stepInstanceInfo represents a Packer build step that gathers GCE instance info. diff --git a/builder/googlecompute/step_instance_info_test.go b/builder/googlecompute/step_instance_info_test.go index 7435df7fc..502bbedfd 100644 --- a/builder/googlecompute/step_instance_info_test.go +++ b/builder/googlecompute/step_instance_info_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepInstanceInfo_impl(t *testing.T) { diff --git a/builder/googlecompute/step_start_tunnel.go b/builder/googlecompute/step_start_tunnel.go index 34a5d1e67..bda9e8d32 100644 --- a/builder/googlecompute/step_start_tunnel.go +++ b/builder/googlecompute/step_start_tunnel.go @@ -19,8 +19,8 @@ import ( "time" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/net" "github.com/hashicorp/packer/packer-plugin-sdk/retry" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" diff --git a/builder/googlecompute/step_teardown_instance.go b/builder/googlecompute/step_teardown_instance.go index e7757862b..b545634f4 100644 --- a/builder/googlecompute/step_teardown_instance.go +++ b/builder/googlecompute/step_teardown_instance.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepTeardownInstance represents a Packer build step that tears down GCE diff --git a/builder/googlecompute/step_teardown_instance_test.go b/builder/googlecompute/step_teardown_instance_test.go index 129c4e596..96db676f6 100644 --- a/builder/googlecompute/step_teardown_instance_test.go +++ b/builder/googlecompute/step_teardown_instance_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepTeardownInstance_impl(t *testing.T) { diff --git a/builder/googlecompute/step_test.go b/builder/googlecompute/step_test.go index a50bde49f..db9ff3dab 100644 --- a/builder/googlecompute/step_test.go +++ b/builder/googlecompute/step_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/googlecompute/step_wait_startup_script.go b/builder/googlecompute/step_wait_startup_script.go index 82f7e4b16..25c64988b 100644 --- a/builder/googlecompute/step_wait_startup_script.go +++ b/builder/googlecompute/step_wait_startup_script.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/retry" ) diff --git a/builder/googlecompute/step_wait_startup_script_test.go b/builder/googlecompute/step_wait_startup_script_test.go index 0bbe242ba..d22fbbd61 100644 --- a/builder/googlecompute/step_wait_startup_script_test.go +++ b/builder/googlecompute/step_wait_startup_script_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" ) diff --git a/builder/googlecompute/winrm.go b/builder/googlecompute/winrm.go index 767787401..7d5370866 100644 --- a/builder/googlecompute/winrm.go +++ b/builder/googlecompute/winrm.go @@ -2,7 +2,7 @@ package googlecompute import ( "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // winrmConfig returns the WinRM configuration. diff --git a/builder/hcloud/builder.go b/builder/hcloud/builder.go index a07378c58..f46b62c33 100644 --- a/builder/hcloud/builder.go +++ b/builder/hcloud/builder.go @@ -6,9 +6,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hetznercloud/hcloud-go/hcloud" ) diff --git a/builder/hcloud/config.go b/builder/hcloud/config.go index 349743b1b..5bdee0ee7 100644 --- a/builder/hcloud/config.go +++ b/builder/hcloud/config.go @@ -10,9 +10,9 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" "github.com/hetznercloud/hcloud-go/hcloud" diff --git a/builder/hcloud/step_create_server.go b/builder/hcloud/step_create_server.go index f0d2f863a..05d84407a 100644 --- a/builder/hcloud/step_create_server.go +++ b/builder/hcloud/step_create_server.go @@ -7,8 +7,8 @@ import ( "sort" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hetznercloud/hcloud-go/hcloud" ) diff --git a/builder/hcloud/step_create_snapshot.go b/builder/hcloud/step_create_snapshot.go index f2365fc1e..26550d66e 100644 --- a/builder/hcloud/step_create_snapshot.go +++ b/builder/hcloud/step_create_snapshot.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hetznercloud/hcloud-go/hcloud" ) diff --git a/builder/hcloud/step_create_sshkey.go b/builder/hcloud/step_create_sshkey.go index 757efda4e..fa6a05e68 100644 --- a/builder/hcloud/step_create_sshkey.go +++ b/builder/hcloud/step_create_sshkey.go @@ -11,8 +11,8 @@ import ( "os" "runtime" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" "github.com/hetznercloud/hcloud-go/hcloud" "golang.org/x/crypto/ssh" diff --git a/builder/hcloud/step_shutdown_server.go b/builder/hcloud/step_shutdown_server.go index 4aafd5852..25cba2de8 100644 --- a/builder/hcloud/step_shutdown_server.go +++ b/builder/hcloud/step_shutdown_server.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hetznercloud/hcloud-go/hcloud" ) diff --git a/builder/hyperone/builder.go b/builder/hyperone/builder.go index 15f3716dc..d1cb42047 100644 --- a/builder/hyperone/builder.go +++ b/builder/hyperone/builder.go @@ -6,9 +6,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" openapi "github.com/hyperonecom/h1-client-go" ) diff --git a/builder/hyperone/config.go b/builder/hyperone/config.go index 1b677ed29..4b5b5ee06 100644 --- a/builder/hyperone/config.go +++ b/builder/hyperone/config.go @@ -13,10 +13,10 @@ import ( "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/hashicorp/packer/packer-plugin-sdk/json" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" "github.com/mitchellh/go-homedir" diff --git a/builder/hyperone/step_chroot_provision.go b/builder/hyperone/step_chroot_provision.go index ffbc5a6fc..7efa606ed 100644 --- a/builder/hyperone/step_chroot_provision.go +++ b/builder/hyperone/step_chroot_provision.go @@ -3,9 +3,9 @@ package hyperone import ( "context" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) type stepChrootProvision struct{} diff --git a/builder/hyperone/step_copy_files.go b/builder/hyperone/step_copy_files.go index 739b76e62..7eade9313 100644 --- a/builder/hyperone/step_copy_files.go +++ b/builder/hyperone/step_copy_files.go @@ -6,8 +6,8 @@ import ( "log" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCopyFiles struct{} diff --git a/builder/hyperone/step_create_image.go b/builder/hyperone/step_create_image.go index 923566cd1..9b12e3a53 100644 --- a/builder/hyperone/step_create_image.go +++ b/builder/hyperone/step_create_image.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" openapi "github.com/hyperonecom/h1-client-go" ) diff --git a/builder/hyperone/step_create_ssh_key.go b/builder/hyperone/step_create_ssh_key.go index 3bf19fe33..1180ae61f 100644 --- a/builder/hyperone/step_create_ssh_key.go +++ b/builder/hyperone/step_create_ssh_key.go @@ -10,8 +10,8 @@ import ( "os" "runtime" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "golang.org/x/crypto/ssh" ) diff --git a/builder/hyperone/step_create_vm.go b/builder/hyperone/step_create_vm.go index b1e1f0c9b..05b4b340b 100644 --- a/builder/hyperone/step_create_vm.go +++ b/builder/hyperone/step_create_vm.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" openapi "github.com/hyperonecom/h1-client-go" ) diff --git a/builder/hyperone/step_create_vm_from_disk.go b/builder/hyperone/step_create_vm_from_disk.go index b81a93b32..39969e780 100644 --- a/builder/hyperone/step_create_vm_from_disk.go +++ b/builder/hyperone/step_create_vm_from_disk.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" openapi "github.com/hyperonecom/h1-client-go" ) diff --git a/builder/hyperone/step_detach_disk.go b/builder/hyperone/step_detach_disk.go index 0a1451ae1..d258cabb2 100644 --- a/builder/hyperone/step_detach_disk.go +++ b/builder/hyperone/step_detach_disk.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" openapi "github.com/hyperonecom/h1-client-go" ) diff --git a/builder/hyperone/step_mount_chroot.go b/builder/hyperone/step_mount_chroot.go index a4e01a09c..c4b5dd0d6 100644 --- a/builder/hyperone/step_mount_chroot.go +++ b/builder/hyperone/step_mount_chroot.go @@ -6,8 +6,8 @@ import ( "log" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepMountChroot struct{} diff --git a/builder/hyperone/step_mount_extra.go b/builder/hyperone/step_mount_extra.go index ae798526e..318803746 100644 --- a/builder/hyperone/step_mount_extra.go +++ b/builder/hyperone/step_mount_extra.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepMountExtra struct{} diff --git a/builder/hyperone/step_post_mount_commands.go b/builder/hyperone/step_post_mount_commands.go index 5fc074263..7d943f34a 100644 --- a/builder/hyperone/step_post_mount_commands.go +++ b/builder/hyperone/step_post_mount_commands.go @@ -3,8 +3,8 @@ package hyperone import ( "context" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type postMountCommandsData struct { diff --git a/builder/hyperone/step_pre_mount_commands.go b/builder/hyperone/step_pre_mount_commands.go index 4a1e4dd11..b96551af2 100644 --- a/builder/hyperone/step_pre_mount_commands.go +++ b/builder/hyperone/step_pre_mount_commands.go @@ -3,8 +3,8 @@ package hyperone import ( "context" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type preMountCommandsData struct { diff --git a/builder/hyperone/step_prepare_device.go b/builder/hyperone/step_prepare_device.go index c0d42852c..a4474fe3a 100644 --- a/builder/hyperone/step_prepare_device.go +++ b/builder/hyperone/step_prepare_device.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) const ( diff --git a/builder/hyperone/step_stop_vm.go b/builder/hyperone/step_stop_vm.go index 7d83334d4..4189cf15b 100644 --- a/builder/hyperone/step_stop_vm.go +++ b/builder/hyperone/step_stop_vm.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" openapi "github.com/hyperonecom/h1-client-go" ) diff --git a/builder/hyperone/utils.go b/builder/hyperone/utils.go index 594e6a164..8d83d26c0 100644 --- a/builder/hyperone/utils.go +++ b/builder/hyperone/utils.go @@ -7,8 +7,8 @@ import ( "log" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" openapi "github.com/hyperonecom/h1-client-go" ) diff --git a/builder/hyperv/common/config.go b/builder/hyperv/common/config.go index 3502bd2ab..dc12a27cb 100644 --- a/builder/hyperv/common/config.go +++ b/builder/hyperv/common/config.go @@ -11,7 +11,7 @@ import ( powershell "github.com/hashicorp/packer/builder/hyperv/common/powershell" "github.com/hashicorp/packer/builder/hyperv/common/powershell/hyperv" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/hyperv/common/ssh.go b/builder/hyperv/common/ssh.go index c152e419c..c116f2f3f 100644 --- a/builder/hyperv/common/ssh.go +++ b/builder/hyperv/common/ssh.go @@ -3,7 +3,7 @@ package common import ( "log" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func CommHost(host string) func(multistep.StateBag) (string, error) { diff --git a/builder/hyperv/common/step_clone_vm.go b/builder/hyperv/common/step_clone_vm.go index 5213574e1..a6a101e4f 100644 --- a/builder/hyperv/common/step_clone_vm.go +++ b/builder/hyperv/common/step_clone_vm.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step clones an existing virtual machine. diff --git a/builder/hyperv/common/step_collate_artifacts.go b/builder/hyperv/common/step_collate_artifacts.go index 580ba28d0..7f0561e90 100644 --- a/builder/hyperv/common/step_collate_artifacts.go +++ b/builder/hyperv/common/step_collate_artifacts.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCollateArtifacts struct { diff --git a/builder/hyperv/common/step_collate_artifacts_test.go b/builder/hyperv/common/step_collate_artifacts_test.go index d88ca59bc..88fa325ad 100644 --- a/builder/hyperv/common/step_collate_artifacts_test.go +++ b/builder/hyperv/common/step_collate_artifacts_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCollateArtifacts_impl(t *testing.T) { diff --git a/builder/hyperv/common/step_compact_disk.go b/builder/hyperv/common/step_compact_disk.go index 437473b16..75f174d22 100644 --- a/builder/hyperv/common/step_compact_disk.go +++ b/builder/hyperv/common/step_compact_disk.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCompactDisk struct { diff --git a/builder/hyperv/common/step_compact_disk_test.go b/builder/hyperv/common/step_compact_disk_test.go index f8943d25f..a88a637e2 100644 --- a/builder/hyperv/common/step_compact_disk_test.go +++ b/builder/hyperv/common/step_compact_disk_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCompactDisk_impl(t *testing.T) { diff --git a/builder/hyperv/common/step_configure_ip.go b/builder/hyperv/common/step_configure_ip.go index 5e5baac31..70682a6df 100644 --- a/builder/hyperv/common/step_configure_ip.go +++ b/builder/hyperv/common/step_configure_ip.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepConfigureIp struct { diff --git a/builder/hyperv/common/step_configure_vlan.go b/builder/hyperv/common/step_configure_vlan.go index 60d8fdf3a..810c200c2 100644 --- a/builder/hyperv/common/step_configure_vlan.go +++ b/builder/hyperv/common/step_configure_vlan.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepConfigureVlan struct { diff --git a/builder/hyperv/common/step_create_build_dir.go b/builder/hyperv/common/step_create_build_dir.go index f7a51a625..d66257bac 100644 --- a/builder/hyperv/common/step_create_build_dir.go +++ b/builder/hyperv/common/step_create_build_dir.go @@ -7,8 +7,8 @@ import ( "log" "os" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) diff --git a/builder/hyperv/common/step_create_build_dir_test.go b/builder/hyperv/common/step_create_build_dir_test.go index ab0c0c49a..80e4d391f 100644 --- a/builder/hyperv/common/step_create_build_dir_test.go +++ b/builder/hyperv/common/step_create_build_dir_test.go @@ -7,7 +7,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreateBuildDir_imp(t *testing.T) { diff --git a/builder/hyperv/common/step_create_external_switch.go b/builder/hyperv/common/step_create_external_switch.go index 04c4d2d4c..ec8d41339 100644 --- a/builder/hyperv/common/step_create_external_switch.go +++ b/builder/hyperv/common/step_create_external_switch.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/hyperv/common/step_create_switch.go b/builder/hyperv/common/step_create_switch.go index 7ea5f5c24..2e46036cd 100644 --- a/builder/hyperv/common/step_create_switch.go +++ b/builder/hyperv/common/step_create_switch.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) const ( diff --git a/builder/hyperv/common/step_create_vm.go b/builder/hyperv/common/step_create_vm.go index 920edfa45..1b5e22c73 100644 --- a/builder/hyperv/common/step_create_vm.go +++ b/builder/hyperv/common/step_create_vm.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step creates the actual virtual machine. diff --git a/builder/hyperv/common/step_create_vm_test.go b/builder/hyperv/common/step_create_vm_test.go index 93725d9cb..d97623895 100644 --- a/builder/hyperv/common/step_create_vm_test.go +++ b/builder/hyperv/common/step_create_vm_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreateVM_impl(t *testing.T) { diff --git a/builder/hyperv/common/step_disable_vlan.go b/builder/hyperv/common/step_disable_vlan.go index 3bae16d7c..f2caf89a4 100644 --- a/builder/hyperv/common/step_disable_vlan.go +++ b/builder/hyperv/common/step_disable_vlan.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepDisableVlan struct { diff --git a/builder/hyperv/common/step_enable_integration_service.go b/builder/hyperv/common/step_enable_integration_service.go index 25675b749..4a1a3a7d5 100644 --- a/builder/hyperv/common/step_enable_integration_service.go +++ b/builder/hyperv/common/step_enable_integration_service.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepEnableIntegrationService struct { diff --git a/builder/hyperv/common/step_export_vm.go b/builder/hyperv/common/step_export_vm.go index 08513d0f7..f94d4f7e1 100644 --- a/builder/hyperv/common/step_export_vm.go +++ b/builder/hyperv/common/step_export_vm.go @@ -5,8 +5,8 @@ import ( "fmt" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepExportVm struct { diff --git a/builder/hyperv/common/step_export_vm_test.go b/builder/hyperv/common/step_export_vm_test.go index 81cc34af9..dcffa5bc2 100644 --- a/builder/hyperv/common/step_export_vm_test.go +++ b/builder/hyperv/common/step_export_vm_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepExportVm_impl(t *testing.T) { diff --git a/builder/hyperv/common/step_mount_dvddrive.go b/builder/hyperv/common/step_mount_dvddrive.go index f0eeaba61..37b10bf8e 100644 --- a/builder/hyperv/common/step_mount_dvddrive.go +++ b/builder/hyperv/common/step_mount_dvddrive.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepMountDvdDrive struct { diff --git a/builder/hyperv/common/step_mount_floppydrive.go b/builder/hyperv/common/step_mount_floppydrive.go index 014aaf086..e2cb9e1b1 100644 --- a/builder/hyperv/common/step_mount_floppydrive.go +++ b/builder/hyperv/common/step_mount_floppydrive.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) diff --git a/builder/hyperv/common/step_mount_guest_additions.go b/builder/hyperv/common/step_mount_guest_additions.go index 852e8e274..4f215220d 100644 --- a/builder/hyperv/common/step_mount_guest_additions.go +++ b/builder/hyperv/common/step_mount_guest_additions.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepMountGuestAdditions struct { diff --git a/builder/hyperv/common/step_mount_secondary_dvd_images.go b/builder/hyperv/common/step_mount_secondary_dvd_images.go index a6cbd7e6b..fe1921ff8 100644 --- a/builder/hyperv/common/step_mount_secondary_dvd_images.go +++ b/builder/hyperv/common/step_mount_secondary_dvd_images.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepMountSecondaryDvdImages struct { diff --git a/builder/hyperv/common/step_polling_installation.go b/builder/hyperv/common/step_polling_installation.go index 40754f725..a2db5f9cb 100644 --- a/builder/hyperv/common/step_polling_installation.go +++ b/builder/hyperv/common/step_polling_installation.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) const port string = "13000" diff --git a/builder/hyperv/common/step_reboot_vm.go b/builder/hyperv/common/step_reboot_vm.go index b2053804f..335f66c1f 100644 --- a/builder/hyperv/common/step_reboot_vm.go +++ b/builder/hyperv/common/step_reboot_vm.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepRebootVm struct { diff --git a/builder/hyperv/common/step_run.go b/builder/hyperv/common/step_run.go index 41a0be191..035aa35bf 100644 --- a/builder/hyperv/common/step_run.go +++ b/builder/hyperv/common/step_run.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepRun struct { diff --git a/builder/hyperv/common/step_set_boot_order.go b/builder/hyperv/common/step_set_boot_order.go index ab94ce968..7e4b9d3d1 100644 --- a/builder/hyperv/common/step_set_boot_order.go +++ b/builder/hyperv/common/step_set_boot_order.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepSetBootOrder struct { diff --git a/builder/hyperv/common/step_set_boot_order_test.go b/builder/hyperv/common/step_set_boot_order_test.go index 0c1b1e539..bd1916ac9 100644 --- a/builder/hyperv/common/step_set_boot_order_test.go +++ b/builder/hyperv/common/step_set_boot_order_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type bootOrderTest struct { diff --git a/builder/hyperv/common/step_set_first_boot_device.go b/builder/hyperv/common/step_set_first_boot_device.go index c8b56f8f0..cf3c60fa4 100644 --- a/builder/hyperv/common/step_set_first_boot_device.go +++ b/builder/hyperv/common/step_set_first_boot_device.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepSetFirstBootDevice struct { diff --git a/builder/hyperv/common/step_set_first_boot_device_test.go b/builder/hyperv/common/step_set_first_boot_device_test.go index 264363e98..80e4b28b3 100644 --- a/builder/hyperv/common/step_set_first_boot_device_test.go +++ b/builder/hyperv/common/step_set_first_boot_device_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type parseBootDeviceIdentifierTest struct { diff --git a/builder/hyperv/common/step_shutdown.go b/builder/hyperv/common/step_shutdown.go index 6620b901f..741c6d815 100644 --- a/builder/hyperv/common/step_shutdown.go +++ b/builder/hyperv/common/step_shutdown.go @@ -8,8 +8,8 @@ import ( "log" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step shuts down the machine. It first attempts to do so gracefully, diff --git a/builder/hyperv/common/step_sleep.go b/builder/hyperv/common/step_sleep.go index 1bbcfac56..5420c7f0d 100644 --- a/builder/hyperv/common/step_sleep.go +++ b/builder/hyperv/common/step_sleep.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepSleep struct { diff --git a/builder/hyperv/common/step_test.go b/builder/hyperv/common/step_test.go index 34c8eea3e..30691fa20 100644 --- a/builder/hyperv/common/step_test.go +++ b/builder/hyperv/common/step_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/hyperv/common/step_type_boot_command.go b/builder/hyperv/common/step_type_boot_command.go index 84fed0a5a..3fbd0871f 100644 --- a/builder/hyperv/common/step_type_boot_command.go +++ b/builder/hyperv/common/step_type_boot_command.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/hyperv/common/step_unmount_dvddrive.go b/builder/hyperv/common/step_unmount_dvddrive.go index 665d00808..bdd98e30f 100644 --- a/builder/hyperv/common/step_unmount_dvddrive.go +++ b/builder/hyperv/common/step_unmount_dvddrive.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepUnmountDvdDrive struct { diff --git a/builder/hyperv/common/step_unmount_floppydrive.go b/builder/hyperv/common/step_unmount_floppydrive.go index 7c212ce5c..eccfb5dc4 100644 --- a/builder/hyperv/common/step_unmount_floppydrive.go +++ b/builder/hyperv/common/step_unmount_floppydrive.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepUnmountFloppyDrive struct { diff --git a/builder/hyperv/common/step_unmount_guest_additions.go b/builder/hyperv/common/step_unmount_guest_additions.go index bb51eb7ce..663d64077 100644 --- a/builder/hyperv/common/step_unmount_guest_additions.go +++ b/builder/hyperv/common/step_unmount_guest_additions.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepUnmountGuestAdditions struct { diff --git a/builder/hyperv/common/step_unmount_secondary_dvd_images.go b/builder/hyperv/common/step_unmount_secondary_dvd_images.go index 9cf192d4d..c33617fe0 100644 --- a/builder/hyperv/common/step_unmount_secondary_dvd_images.go +++ b/builder/hyperv/common/step_unmount_secondary_dvd_images.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepUnmountSecondaryDvdImages struct { diff --git a/builder/hyperv/common/step_wait_for_install_to_complete.go b/builder/hyperv/common/step_wait_for_install_to_complete.go index 265eb6572..da4ac90ba 100644 --- a/builder/hyperv/common/step_wait_for_install_to_complete.go +++ b/builder/hyperv/common/step_wait_for_install_to_complete.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) const ( diff --git a/builder/hyperv/iso/builder.go b/builder/hyperv/iso/builder.go index c398b1b3e..dcbdae5af 100644 --- a/builder/hyperv/iso/builder.go +++ b/builder/hyperv/iso/builder.go @@ -15,11 +15,11 @@ import ( hypervcommon "github.com/hashicorp/packer/builder/hyperv/common" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/hyperv/iso/builder_test.go b/builder/hyperv/iso/builder_test.go index 54c05477a..0103b656a 100644 --- a/builder/hyperv/iso/builder_test.go +++ b/builder/hyperv/iso/builder_test.go @@ -10,8 +10,8 @@ import ( "testing" hypervcommon "github.com/hashicorp/packer/builder/hyperv/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testConfig() map[string]interface{} { diff --git a/builder/hyperv/vmcx/builder.go b/builder/hyperv/vmcx/builder.go index d61d8794e..8c57ad792 100644 --- a/builder/hyperv/vmcx/builder.go +++ b/builder/hyperv/vmcx/builder.go @@ -15,11 +15,11 @@ import ( powershell "github.com/hashicorp/packer/builder/hyperv/common/powershell" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/hyperv/vmcx/builder_test.go b/builder/hyperv/vmcx/builder_test.go index b9b1ffc8c..e6c25b9f5 100644 --- a/builder/hyperv/vmcx/builder_test.go +++ b/builder/hyperv/vmcx/builder_test.go @@ -10,8 +10,8 @@ import ( "os" hypervcommon "github.com/hashicorp/packer/builder/hyperv/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testConfig() map[string]interface{} { diff --git a/builder/jdcloud/builder.go b/builder/jdcloud/builder.go index e5f0c45ac..c226ca01b 100644 --- a/builder/jdcloud/builder.go +++ b/builder/jdcloud/builder.go @@ -7,9 +7,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/jdcloud/common.go b/builder/jdcloud/common.go index 540863dd9..f60889450 100644 --- a/builder/jdcloud/common.go +++ b/builder/jdcloud/common.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/client" vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/client" diff --git a/builder/jdcloud/step_config_credentials.go b/builder/jdcloud/step_config_credentials.go index 360a27629..848f44874 100644 --- a/builder/jdcloud/step_config_credentials.go +++ b/builder/jdcloud/step_config_credentials.go @@ -5,8 +5,8 @@ import ( "fmt" "io/ioutil" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis" ) diff --git a/builder/jdcloud/step_create_image.go b/builder/jdcloud/step_create_image.go index c126d8047..4e1fde048 100644 --- a/builder/jdcloud/step_create_image.go +++ b/builder/jdcloud/step_create_image.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis" ) diff --git a/builder/jdcloud/step_create_instance.go b/builder/jdcloud/step_create_instance.go index 4395b1932..745b98085 100644 --- a/builder/jdcloud/step_create_instance.go +++ b/builder/jdcloud/step_create_instance.go @@ -6,8 +6,8 @@ import ( "regexp" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/jdcloud-api/jdcloud-sdk-go/core" "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis" vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" diff --git a/builder/jdcloud/step_stop_instance.go b/builder/jdcloud/step_stop_instance.go index 0468b7469..a167b0fc6 100644 --- a/builder/jdcloud/step_stop_instance.go +++ b/builder/jdcloud/step_stop_instance.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis" ) diff --git a/builder/jdcloud/step_validate_parameters.go b/builder/jdcloud/step_validate_parameters.go index adfab5e14..708617957 100644 --- a/builder/jdcloud/step_validate_parameters.go +++ b/builder/jdcloud/step_validate_parameters.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis" vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis" ) diff --git a/builder/linode/builder.go b/builder/linode/builder.go index 771ba8123..670cc2d35 100644 --- a/builder/linode/builder.go +++ b/builder/linode/builder.go @@ -12,9 +12,9 @@ import ( "github.com/linode/linodego" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) // The unique ID for this builder. diff --git a/builder/linode/step_create_image.go b/builder/linode/step_create_image.go index 4e5ea5a64..58da16e73 100644 --- a/builder/linode/step_create_image.go +++ b/builder/linode/step_create_image.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/linode/linodego" ) diff --git a/builder/linode/step_create_linode.go b/builder/linode/step_create_linode.go index 90dc6342a..50db58696 100644 --- a/builder/linode/step_create_linode.go +++ b/builder/linode/step_create_linode.go @@ -5,8 +5,8 @@ import ( "errors" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/linode/linodego" ) diff --git a/builder/linode/step_create_ssh_key.go b/builder/linode/step_create_ssh_key.go index 2e0776ade..c5f7ad4cb 100644 --- a/builder/linode/step_create_ssh_key.go +++ b/builder/linode/step_create_ssh_key.go @@ -10,8 +10,8 @@ import ( "io/ioutil" "os" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "golang.org/x/crypto/ssh" ) diff --git a/builder/linode/step_shutdown_linode.go b/builder/linode/step_shutdown_linode.go index 30ca39c57..82069e19c 100644 --- a/builder/linode/step_shutdown_linode.go +++ b/builder/linode/step_shutdown_linode.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/linode/linodego" ) diff --git a/builder/lxc/builder.go b/builder/lxc/builder.go index a888cb77b..53195c764 100644 --- a/builder/lxc/builder.go +++ b/builder/lxc/builder.go @@ -6,9 +6,9 @@ import ( "path/filepath" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/lxc/step_export.go b/builder/lxc/step_export.go index 890949bde..f017f551a 100644 --- a/builder/lxc/step_export.go +++ b/builder/lxc/step_export.go @@ -9,8 +9,8 @@ import ( "os/user" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepExport struct{} diff --git a/builder/lxc/step_lxc_create.go b/builder/lxc/step_lxc_create.go index c09626cd1..afcc2da79 100644 --- a/builder/lxc/step_lxc_create.go +++ b/builder/lxc/step_lxc_create.go @@ -7,8 +7,8 @@ import ( "os/user" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepLxcCreate struct{} diff --git a/builder/lxc/step_prepare_output_dir.go b/builder/lxc/step_prepare_output_dir.go index 5537c5a8c..65e7b40b0 100644 --- a/builder/lxc/step_prepare_output_dir.go +++ b/builder/lxc/step_prepare_output_dir.go @@ -6,8 +6,8 @@ import ( "os" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepPrepareOutputDir struct{} diff --git a/builder/lxc/step_provision.go b/builder/lxc/step_provision.go index 578b25906..5d8beae4c 100644 --- a/builder/lxc/step_provision.go +++ b/builder/lxc/step_provision.go @@ -4,9 +4,9 @@ import ( "context" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) // StepProvision provisions the instance within a chroot. diff --git a/builder/lxc/step_wait_init.go b/builder/lxc/step_wait_init.go index 5b7873cb4..c4e733edc 100644 --- a/builder/lxc/step_wait_init.go +++ b/builder/lxc/step_wait_init.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepWaitInit struct { diff --git a/builder/lxd/builder.go b/builder/lxd/builder.go index e0f168b4d..34be34e62 100644 --- a/builder/lxd/builder.go +++ b/builder/lxd/builder.go @@ -4,9 +4,9 @@ import ( "context" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/lxd/step_lxd_launch.go b/builder/lxd/step_lxd_launch.go index 7bff6fd42..420c6564a 100644 --- a/builder/lxd/step_lxd_launch.go +++ b/builder/lxd/step_lxd_launch.go @@ -7,8 +7,8 @@ import ( "strconv" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepLxdLaunch struct{} diff --git a/builder/lxd/step_provision.go b/builder/lxd/step_provision.go index 7c57d7e5b..1fa1b47c0 100644 --- a/builder/lxd/step_provision.go +++ b/builder/lxd/step_provision.go @@ -4,9 +4,9 @@ import ( "context" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) // StepProvision provisions the container diff --git a/builder/lxd/step_publish.go b/builder/lxd/step_publish.go index 461f3a9bd..7f7d838b1 100644 --- a/builder/lxd/step_publish.go +++ b/builder/lxd/step_publish.go @@ -5,8 +5,8 @@ import ( "fmt" "regexp" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepPublish struct{} diff --git a/builder/ncloud/builder.go b/builder/ncloud/builder.go index 6562b69ff..284a881d3 100644 --- a/builder/ncloud/builder.go +++ b/builder/ncloud/builder.go @@ -6,9 +6,9 @@ import ( "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) // Builder assume this implements packer.Builder diff --git a/builder/ncloud/step.go b/builder/ncloud/step.go index 8b312fae7..537692de8 100644 --- a/builder/ncloud/step.go +++ b/builder/ncloud/step.go @@ -1,7 +1,7 @@ package ncloud import ( - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func processStepResult(err error, sayError func(error), state multistep.StateBag) multistep.StepAction { diff --git a/builder/ncloud/step_create_block_storage_instance.go b/builder/ncloud/step_create_block_storage_instance.go index 17ac68ba1..d0f584507 100644 --- a/builder/ncloud/step_create_block_storage_instance.go +++ b/builder/ncloud/step_create_block_storage_instance.go @@ -9,8 +9,8 @@ import ( "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepCreateBlockStorageInstance struct is for making extra block storage diff --git a/builder/ncloud/step_create_block_storage_instance_test.go b/builder/ncloud/step_create_block_storage_instance_test.go index 1731eec6d..f5fb575a0 100644 --- a/builder/ncloud/step_create_block_storage_instance_test.go +++ b/builder/ncloud/step_create_block_storage_instance_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreateBlockStorageInstanceShouldFailIfOperationCreateBlockStorageInstanceFails(t *testing.T) { diff --git a/builder/ncloud/step_create_login_key.go b/builder/ncloud/step_create_login_key.go index 1a302c665..7cf7ae505 100644 --- a/builder/ncloud/step_create_login_key.go +++ b/builder/ncloud/step_create_login_key.go @@ -6,8 +6,8 @@ import ( "time" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type LoginKey struct { diff --git a/builder/ncloud/step_create_login_key_test.go b/builder/ncloud/step_create_login_key_test.go index 3583f47a5..df6cedd44 100644 --- a/builder/ncloud/step_create_login_key_test.go +++ b/builder/ncloud/step_create_login_key_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreateLoginKeyShouldFailIfOperationCreateLoginKeyFails(t *testing.T) { diff --git a/builder/ncloud/step_create_public_ip_instance.go b/builder/ncloud/step_create_public_ip_instance.go index 4a0900a9a..17820c241 100644 --- a/builder/ncloud/step_create_public_ip_instance.go +++ b/builder/ncloud/step_create_public_ip_instance.go @@ -8,8 +8,8 @@ import ( "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCreatePublicIPInstance struct { diff --git a/builder/ncloud/step_create_public_ip_instance_test.go b/builder/ncloud/step_create_public_ip_instance_test.go index 25b4d3c11..c4045fd03 100644 --- a/builder/ncloud/step_create_public_ip_instance_test.go +++ b/builder/ncloud/step_create_public_ip_instance_test.go @@ -8,7 +8,7 @@ import ( "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreatePublicIPInstanceShouldFailIfOperationCreatePublicIPInstanceFails(t *testing.T) { diff --git a/builder/ncloud/step_create_server_image.go b/builder/ncloud/step_create_server_image.go index 12e20478e..9b36b3ffc 100644 --- a/builder/ncloud/step_create_server_image.go +++ b/builder/ncloud/step_create_server_image.go @@ -7,8 +7,8 @@ import ( "time" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCreateServerImage struct { diff --git a/builder/ncloud/step_create_server_image_test.go b/builder/ncloud/step_create_server_image_test.go index cfe31b91b..3d42a2a26 100644 --- a/builder/ncloud/step_create_server_image_test.go +++ b/builder/ncloud/step_create_server_image_test.go @@ -7,7 +7,7 @@ import ( "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreateServerImageShouldFailIfOperationCreateServerImageFails(t *testing.T) { diff --git a/builder/ncloud/step_create_server_instance.go b/builder/ncloud/step_create_server_instance.go index 7c1e7382e..48b1b11ef 100644 --- a/builder/ncloud/step_create_server_instance.go +++ b/builder/ncloud/step_create_server_instance.go @@ -10,8 +10,8 @@ import ( "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCreateServerInstance struct { diff --git a/builder/ncloud/step_create_server_instance_test.go b/builder/ncloud/step_create_server_instance_test.go index 676c3fa3f..b740f1466 100644 --- a/builder/ncloud/step_create_server_instance_test.go +++ b/builder/ncloud/step_create_server_instance_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreateServerInstanceShouldFailIfOperationCreateFails(t *testing.T) { diff --git a/builder/ncloud/step_delete_block_storage_instance.go b/builder/ncloud/step_delete_block_storage_instance.go index fb4bc892b..a3cdc70a5 100644 --- a/builder/ncloud/step_delete_block_storage_instance.go +++ b/builder/ncloud/step_delete_block_storage_instance.go @@ -8,8 +8,8 @@ import ( "time" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepDeleteBlockStorageInstance struct { diff --git a/builder/ncloud/step_delete_block_storage_instance_test.go b/builder/ncloud/step_delete_block_storage_instance_test.go index 9f4d6de80..e5448bbb4 100644 --- a/builder/ncloud/step_delete_block_storage_instance_test.go +++ b/builder/ncloud/step_delete_block_storage_instance_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepDeleteBlockStorageInstanceShouldFailIfOperationDeleteBlockStorageInstanceFails(t *testing.T) { diff --git a/builder/ncloud/step_get_rootpassword.go b/builder/ncloud/step_get_rootpassword.go index 0de8cf351..94daf1382 100644 --- a/builder/ncloud/step_get_rootpassword.go +++ b/builder/ncloud/step_get_rootpassword.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepGetRootPassword struct { diff --git a/builder/ncloud/step_get_rootpassword_test.go b/builder/ncloud/step_get_rootpassword_test.go index c048a8144..4bff59c1d 100644 --- a/builder/ncloud/step_get_rootpassword_test.go +++ b/builder/ncloud/step_get_rootpassword_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepGetRootPasswordShouldFailIfOperationGetRootPasswordFails(t *testing.T) { diff --git a/builder/ncloud/step_stop_server_instance.go b/builder/ncloud/step_stop_server_instance.go index a4fad0bf3..b95dca774 100644 --- a/builder/ncloud/step_stop_server_instance.go +++ b/builder/ncloud/step_stop_server_instance.go @@ -7,8 +7,8 @@ import ( "time" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepStopServerInstance struct { diff --git a/builder/ncloud/step_stop_server_instance_test.go b/builder/ncloud/step_stop_server_instance_test.go index 4b5afe605..f63386349 100644 --- a/builder/ncloud/step_stop_server_instance_test.go +++ b/builder/ncloud/step_stop_server_instance_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepStopServerInstanceShouldFailIfOperationStopFails(t *testing.T) { diff --git a/builder/ncloud/step_terminate_server_instance.go b/builder/ncloud/step_terminate_server_instance.go index 12e6da11b..b8de7b79f 100644 --- a/builder/ncloud/step_terminate_server_instance.go +++ b/builder/ncloud/step_terminate_server_instance.go @@ -6,8 +6,8 @@ import ( "time" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepTerminateServerInstance struct { diff --git a/builder/ncloud/step_terminate_server_instance_test.go b/builder/ncloud/step_terminate_server_instance_test.go index 3db5f3ec8..ff5fafd59 100644 --- a/builder/ncloud/step_terminate_server_instance_test.go +++ b/builder/ncloud/step_terminate_server_instance_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepTerminateServerInstanceShouldFailIfOperationTerminationFails(t *testing.T) { diff --git a/builder/ncloud/step_validate_template.go b/builder/ncloud/step_validate_template.go index fbc21f9a3..52866e5ee 100644 --- a/builder/ncloud/step_validate_template.go +++ b/builder/ncloud/step_validate_template.go @@ -9,8 +9,8 @@ import ( "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/olekukonko/tablewriter" ) diff --git a/builder/ncloud/step_validate_template_test.go b/builder/ncloud/step_validate_template_test.go index 7e9212c7f..42d582561 100644 --- a/builder/ncloud/step_validate_template_test.go +++ b/builder/ncloud/step_validate_template_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepValidateTemplateShouldFailIfValidateFails(t *testing.T) { diff --git a/builder/null/builder.go b/builder/null/builder.go index 3fd7606dd..a48da95fb 100644 --- a/builder/null/builder.go +++ b/builder/null/builder.go @@ -5,9 +5,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) const BuilderId = "fnoeding.null" diff --git a/builder/null/ssh.go b/builder/null/ssh.go index 373f8158b..335c93dca 100644 --- a/builder/null/ssh.go +++ b/builder/null/ssh.go @@ -1,7 +1,7 @@ package null import ( - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func CommHost(host string) func(multistep.StateBag) (string, error) { diff --git a/builder/oneandone/builder.go b/builder/oneandone/builder.go index 01b24ec40..915d1c470 100644 --- a/builder/oneandone/builder.go +++ b/builder/oneandone/builder.go @@ -7,9 +7,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) const BuilderId = "packer.oneandone" diff --git a/builder/oneandone/step_create_server.go b/builder/oneandone/step_create_server.go index 6d70db862..3cd1e7de7 100644 --- a/builder/oneandone/step_create_server.go +++ b/builder/oneandone/step_create_server.go @@ -7,8 +7,8 @@ import ( "time" "github.com/1and1/oneandone-cloudserver-sdk-go" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCreateServer struct{} diff --git a/builder/oneandone/step_create_sshkey.go b/builder/oneandone/step_create_sshkey.go index 8a3613560..2da8f5839 100644 --- a/builder/oneandone/step_create_sshkey.go +++ b/builder/oneandone/step_create_sshkey.go @@ -7,8 +7,8 @@ import ( "fmt" "io/ioutil" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "golang.org/x/crypto/ssh" ) diff --git a/builder/oneandone/step_take_snapshot.go b/builder/oneandone/step_take_snapshot.go index d5c3c757f..c5b128ef5 100644 --- a/builder/oneandone/step_take_snapshot.go +++ b/builder/oneandone/step_take_snapshot.go @@ -4,8 +4,8 @@ import ( "context" "github.com/1and1/oneandone-cloudserver-sdk-go" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepTakeSnapshot struct{} diff --git a/builder/openstack/builder.go b/builder/openstack/builder.go index 69c4c780e..ddc9adad6 100644 --- a/builder/openstack/builder.go +++ b/builder/openstack/builder.go @@ -12,10 +12,10 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/openstack/server.go b/builder/openstack/server.go index f509452d6..af7b3c3dc 100644 --- a/builder/openstack/server.go +++ b/builder/openstack/server.go @@ -8,7 +8,7 @@ import ( "github.com/gophercloud/gophercloud" "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StateRefreshFunc is a function type used for StateChangeConf that is diff --git a/builder/openstack/ssh.go b/builder/openstack/ssh.go index dab50dc24..95fb1e32c 100644 --- a/builder/openstack/ssh.go +++ b/builder/openstack/ssh.go @@ -9,7 +9,7 @@ import ( "github.com/gophercloud/gophercloud" "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/floatingips" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // CommHost looks up the host for the communicator. diff --git a/builder/openstack/step_add_image_members.go b/builder/openstack/step_add_image_members.go index d8087c542..cbbb9f5e6 100644 --- a/builder/openstack/step_add_image_members.go +++ b/builder/openstack/step_add_image_members.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/gophercloud/gophercloud/openstack/imageservice/v2/members" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepAddImageMembers struct{} diff --git a/builder/openstack/step_allocate_ip.go b/builder/openstack/step_allocate_ip.go index 8b0701491..6ba8c0262 100644 --- a/builder/openstack/step_allocate_ip.go +++ b/builder/openstack/step_allocate_ip.go @@ -6,8 +6,8 @@ import ( "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/floatingips" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepAllocateIp struct { diff --git a/builder/openstack/step_create_image.go b/builder/openstack/step_create_image.go index 637e3c70e..b2f792d0d 100644 --- a/builder/openstack/step_create_image.go +++ b/builder/openstack/step_create_image.go @@ -11,8 +11,8 @@ import ( "github.com/gophercloud/gophercloud" "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCreateImage struct { diff --git a/builder/openstack/step_create_volume.go b/builder/openstack/step_create_volume.go index 1e74ba1e9..687d92a54 100644 --- a/builder/openstack/step_create_volume.go +++ b/builder/openstack/step_create_volume.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCreateVolume struct { diff --git a/builder/openstack/step_detach_volume.go b/builder/openstack/step_detach_volume.go index fe6d76922..d711e87a2 100644 --- a/builder/openstack/step_detach_volume.go +++ b/builder/openstack/step_detach_volume.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/volumeactions" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepDetachVolume struct { diff --git a/builder/openstack/step_discover_network.go b/builder/openstack/step_discover_network.go index 4f653685a..811c98a55 100644 --- a/builder/openstack/step_discover_network.go +++ b/builder/openstack/step_discover_network.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepDiscoverNetwork struct { diff --git a/builder/openstack/step_get_password.go b/builder/openstack/step_get_password.go index fd9bfa156..f039198fb 100644 --- a/builder/openstack/step_get_password.go +++ b/builder/openstack/step_get_password.go @@ -9,8 +9,8 @@ import ( "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "golang.org/x/crypto/ssh" ) diff --git a/builder/openstack/step_key_pair.go b/builder/openstack/step_key_pair.go index 46d22182e..1faa67787 100644 --- a/builder/openstack/step_key_pair.go +++ b/builder/openstack/step_key_pair.go @@ -11,8 +11,8 @@ import ( "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" "golang.org/x/crypto/ssh" ) diff --git a/builder/openstack/step_load_flavor.go b/builder/openstack/step_load_flavor.go index bc9d4aa35..7e7176640 100644 --- a/builder/openstack/step_load_flavor.go +++ b/builder/openstack/step_load_flavor.go @@ -7,8 +7,8 @@ import ( "github.com/gophercloud/gophercloud/openstack/compute/v2/flavors" flavors_utils "github.com/gophercloud/utils/openstack/compute/v2/flavors" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepLoadFlavor gets the FlavorRef from a Flavor. It first assumes diff --git a/builder/openstack/step_run_source_server.go b/builder/openstack/step_run_source_server.go index 59cf63afe..007023de8 100644 --- a/builder/openstack/step_run_source_server.go +++ b/builder/openstack/step_run_source_server.go @@ -9,8 +9,8 @@ import ( "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/bootfromvolume" "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs" "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepRunSourceServer struct { diff --git a/builder/openstack/step_source_image_info.go b/builder/openstack/step_source_image_info.go index 5344431fd..3b7c5b798 100644 --- a/builder/openstack/step_source_image_info.go +++ b/builder/openstack/step_source_image_info.go @@ -9,8 +9,8 @@ import ( "github.com/gophercloud/gophercloud/openstack/imageservice/v2/imageimport" "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" "github.com/gophercloud/gophercloud/pagination" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepSourceImageInfo struct { diff --git a/builder/openstack/step_stop_server.go b/builder/openstack/step_stop_server.go index 9e6f35b74..f4e00e25e 100644 --- a/builder/openstack/step_stop_server.go +++ b/builder/openstack/step_stop_server.go @@ -8,8 +8,8 @@ import ( "github.com/gophercloud/gophercloud" "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/startstop" "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepStopServer struct{} diff --git a/builder/openstack/step_update_image_mindisk.go b/builder/openstack/step_update_image_mindisk.go index 63ec2709d..15412f29b 100644 --- a/builder/openstack/step_update_image_mindisk.go +++ b/builder/openstack/step_update_image_mindisk.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepUpdateImageMinDisk struct{} diff --git a/builder/openstack/step_update_image_tags.go b/builder/openstack/step_update_image_tags.go index 31d0c767f..8f0adf582 100644 --- a/builder/openstack/step_update_image_tags.go +++ b/builder/openstack/step_update_image_tags.go @@ -6,8 +6,8 @@ import ( "strings" imageservice "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepUpdateImageTags struct{} diff --git a/builder/openstack/step_update_image_visibility.go b/builder/openstack/step_update_image_visibility.go index a3ecaae18..fb2ab9fd1 100644 --- a/builder/openstack/step_update_image_visibility.go +++ b/builder/openstack/step_update_image_visibility.go @@ -5,8 +5,8 @@ import ( "fmt" imageservice "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepUpdateImageVisibility struct{} diff --git a/builder/openstack/step_wait_for_rackconnect.go b/builder/openstack/step_wait_for_rackconnect.go index 3816962bf..3386642f5 100644 --- a/builder/openstack/step_wait_for_rackconnect.go +++ b/builder/openstack/step_wait_for_rackconnect.go @@ -6,8 +6,8 @@ import ( "time" "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepWaitForRackConnect struct { diff --git a/builder/oracle/classic/builder.go b/builder/oracle/classic/builder.go index 3b086bbe0..fc97066f1 100644 --- a/builder/oracle/classic/builder.go +++ b/builder/oracle/classic/builder.go @@ -13,9 +13,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" ocommon "github.com/hashicorp/packer/builder/oracle/common" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) // BuilderId uniquely identifies the builder diff --git a/builder/oracle/classic/step_add_keys.go b/builder/oracle/classic/step_add_keys.go index c68574d16..60a448560 100644 --- a/builder/oracle/classic/step_add_keys.go +++ b/builder/oracle/classic/step_add_keys.go @@ -6,8 +6,8 @@ import ( "fmt" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepAddKeysToAPI struct { diff --git a/builder/oracle/classic/step_attach_volume.go b/builder/oracle/classic/step_attach_volume.go index ffa525aa6..e0882f35b 100644 --- a/builder/oracle/classic/step_attach_volume.go +++ b/builder/oracle/classic/step_attach_volume.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepAttachVolume struct { diff --git a/builder/oracle/classic/step_connect_builder.go b/builder/oracle/classic/step_connect_builder.go index 1e8aa021e..88639c793 100644 --- a/builder/oracle/classic/step_connect_builder.go +++ b/builder/oracle/classic/step_connect_builder.go @@ -4,7 +4,7 @@ import ( "context" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepConnectBuilder struct { diff --git a/builder/oracle/classic/step_create_image.go b/builder/oracle/classic/step_create_image.go index abff43c4d..481d03406 100644 --- a/builder/oracle/classic/step_create_image.go +++ b/builder/oracle/classic/step_create_image.go @@ -6,8 +6,8 @@ import ( "log" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCreateImage struct { diff --git a/builder/oracle/classic/step_create_instance.go b/builder/oracle/classic/step_create_instance.go index 0d685a983..35fd4e9b6 100644 --- a/builder/oracle/classic/step_create_instance.go +++ b/builder/oracle/classic/step_create_instance.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCreateInstance struct{} diff --git a/builder/oracle/classic/step_create_ip_reservation.go b/builder/oracle/classic/step_create_ip_reservation.go index 7f3a1b3e7..367ba9221 100644 --- a/builder/oracle/classic/step_create_ip_reservation.go +++ b/builder/oracle/classic/step_create_ip_reservation.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/oracle/classic/step_create_persistent_volume.go b/builder/oracle/classic/step_create_persistent_volume.go index 02438d343..349fc0b8b 100644 --- a/builder/oracle/classic/step_create_persistent_volume.go +++ b/builder/oracle/classic/step_create_persistent_volume.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCreatePersistentVolume struct { diff --git a/builder/oracle/classic/step_create_pv_builder.go b/builder/oracle/classic/step_create_pv_builder.go index b1f991f35..a544c9615 100644 --- a/builder/oracle/classic/step_create_pv_builder.go +++ b/builder/oracle/classic/step_create_pv_builder.go @@ -6,8 +6,8 @@ import ( "log" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCreatePVBuilder struct { diff --git a/builder/oracle/classic/step_create_pv_master.go b/builder/oracle/classic/step_create_pv_master.go index e9f16903f..28e85fe6d 100644 --- a/builder/oracle/classic/step_create_pv_master.go +++ b/builder/oracle/classic/step_create_pv_master.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCreatePVMaster struct { diff --git a/builder/oracle/classic/step_list_images.go b/builder/oracle/classic/step_list_images.go index 0248bae84..8b30d2cbb 100644 --- a/builder/oracle/classic/step_list_images.go +++ b/builder/oracle/classic/step_list_images.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepListImages struct{} diff --git a/builder/oracle/classic/step_security.go b/builder/oracle/classic/step_security.go index f69b6c9b0..d6ad9252c 100644 --- a/builder/oracle/classic/step_security.go +++ b/builder/oracle/classic/step_security.go @@ -7,8 +7,8 @@ import ( "strings" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepSecurity struct { diff --git a/builder/oracle/classic/step_snapshot.go b/builder/oracle/classic/step_snapshot.go index f11f718e0..993bc2835 100644 --- a/builder/oracle/classic/step_snapshot.go +++ b/builder/oracle/classic/step_snapshot.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepSnapshot struct { diff --git a/builder/oracle/classic/step_terminate_pv_master.go b/builder/oracle/classic/step_terminate_pv_master.go index 527d63ba6..0d4d2a013 100644 --- a/builder/oracle/classic/step_terminate_pv_master.go +++ b/builder/oracle/classic/step_terminate_pv_master.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepTerminatePVMaster struct { diff --git a/builder/oracle/classic/step_upload_image.go b/builder/oracle/classic/step_upload_image.go index 5833ebfaf..04fd1e896 100644 --- a/builder/oracle/classic/step_upload_image.go +++ b/builder/oracle/classic/step_upload_image.go @@ -6,8 +6,8 @@ import ( "log" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/oracle/common/step_ssh_key_pair.go b/builder/oracle/common/step_ssh_key_pair.go index 187eb28af..3a87a824a 100644 --- a/builder/oracle/common/step_ssh_key_pair.go +++ b/builder/oracle/common/step_ssh_key_pair.go @@ -11,8 +11,8 @@ import ( "runtime" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "golang.org/x/crypto/ssh" ) diff --git a/builder/oracle/oci/builder.go b/builder/oracle/oci/builder.go index 97704068b..0368ac678 100644 --- a/builder/oracle/oci/builder.go +++ b/builder/oracle/oci/builder.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" ocommon "github.com/hashicorp/packer/builder/oracle/common" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/oracle/oci-go-sdk/core" ) diff --git a/builder/oracle/oci/step_create_instance.go b/builder/oracle/oci/step_create_instance.go index 6746fdad4..0ebe41eab 100644 --- a/builder/oracle/oci/step_create_instance.go +++ b/builder/oracle/oci/step_create_instance.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCreateInstance struct{} diff --git a/builder/oracle/oci/step_create_instance_test.go b/builder/oracle/oci/step_create_instance_test.go index 6ab2ceb67..436802c69 100644 --- a/builder/oracle/oci/step_create_instance_test.go +++ b/builder/oracle/oci/step_create_instance_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreateInstance(t *testing.T) { diff --git a/builder/oracle/oci/step_get_default_credentials.go b/builder/oracle/oci/step_get_default_credentials.go index 0ed44b7f6..602565050 100644 --- a/builder/oracle/oci/step_get_default_credentials.go +++ b/builder/oracle/oci/step_get_default_credentials.go @@ -6,8 +6,8 @@ import ( "log" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepGetDefaultCredentials struct { diff --git a/builder/oracle/oci/step_image.go b/builder/oracle/oci/step_image.go index b3d37da0a..460aa9c91 100644 --- a/builder/oracle/oci/step_image.go +++ b/builder/oracle/oci/step_image.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepImage struct{} diff --git a/builder/oracle/oci/step_image_test.go b/builder/oracle/oci/step_image_test.go index 955d557a9..c142872ec 100644 --- a/builder/oracle/oci/step_image_test.go +++ b/builder/oracle/oci/step_image_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepImage(t *testing.T) { diff --git a/builder/oracle/oci/step_instance_info.go b/builder/oracle/oci/step_instance_info.go index 63b9120c1..e1052b5ed 100644 --- a/builder/oracle/oci/step_instance_info.go +++ b/builder/oracle/oci/step_instance_info.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepInstanceInfo struct{} diff --git a/builder/oracle/oci/step_instance_info_test.go b/builder/oracle/oci/step_instance_info_test.go index d4e18dd44..6b13cc1a7 100644 --- a/builder/oracle/oci/step_instance_info_test.go +++ b/builder/oracle/oci/step_instance_info_test.go @@ -6,8 +6,8 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestInstanceInfo(t *testing.T) { diff --git a/builder/oracle/oci/step_test.go b/builder/oracle/oci/step_test.go index deeff1b1a..1c95870fd 100644 --- a/builder/oracle/oci/step_test.go +++ b/builder/oracle/oci/step_test.go @@ -4,8 +4,8 @@ import ( "bytes" "os" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // TODO(apryde): It would be good not to have to write a key file to disk to diff --git a/builder/osc/bsu/builder.go b/builder/osc/bsu/builder.go index b0dee623d..5d0d1124a 100644 --- a/builder/osc/bsu/builder.go +++ b/builder/osc/bsu/builder.go @@ -15,10 +15,10 @@ import ( osccommon "github.com/hashicorp/packer/builder/osc/common" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/osc/bsu/step_create_omi.go b/builder/osc/bsu/step_create_omi.go index 015a1008f..0b7935173 100644 --- a/builder/osc/bsu/step_create_omi.go +++ b/builder/osc/bsu/step_create_omi.go @@ -7,8 +7,8 @@ import ( "github.com/antihax/optional" osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/bsusurrogate/builder.go b/builder/osc/bsusurrogate/builder.go index d8c033ea1..dde2cf8d7 100644 --- a/builder/osc/bsusurrogate/builder.go +++ b/builder/osc/bsusurrogate/builder.go @@ -13,10 +13,10 @@ import ( osccommon "github.com/hashicorp/packer/builder/osc/common" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/osc/bsusurrogate/step_register_omi.go b/builder/osc/bsusurrogate/step_register_omi.go index 3d8541df8..f63a87135 100644 --- a/builder/osc/bsusurrogate/step_register_omi.go +++ b/builder/osc/bsusurrogate/step_register_omi.go @@ -6,8 +6,8 @@ import ( "github.com/antihax/optional" osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/bsusurrogate/step_snapshop_volumes.go b/builder/osc/bsusurrogate/step_snapshop_volumes.go index cc0743e38..2f1d027dd 100644 --- a/builder/osc/bsusurrogate/step_snapshop_volumes.go +++ b/builder/osc/bsusurrogate/step_snapshop_volumes.go @@ -9,8 +9,8 @@ import ( "github.com/antihax/optional" multierror "github.com/hashicorp/go-multierror" osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/bsuvolume/builder.go b/builder/osc/bsuvolume/builder.go index 798cec71a..57a78253c 100644 --- a/builder/osc/bsuvolume/builder.go +++ b/builder/osc/bsuvolume/builder.go @@ -13,10 +13,10 @@ import ( osccommon "github.com/hashicorp/packer/builder/osc/common" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/osc/bsuvolume/step_tag_bsu_volumes.go b/builder/osc/bsuvolume/step_tag_bsu_volumes.go index 400916c95..4d313ffd3 100644 --- a/builder/osc/bsuvolume/step_tag_bsu_volumes.go +++ b/builder/osc/bsuvolume/step_tag_bsu_volumes.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/antihax/optional" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/chroot/builder.go b/builder/osc/chroot/builder.go index fe382f04f..7d049385f 100644 --- a/builder/osc/chroot/builder.go +++ b/builder/osc/chroot/builder.go @@ -14,10 +14,10 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" osccommon "github.com/hashicorp/packer/builder/osc/common" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/osc/chroot/cleanup.go b/builder/osc/chroot/cleanup.go index 0befac174..37691305a 100644 --- a/builder/osc/chroot/cleanup.go +++ b/builder/osc/chroot/cleanup.go @@ -1,7 +1,7 @@ package chroot import ( - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Cleanup is an interface that some steps implement for early cleanup. diff --git a/builder/osc/chroot/step_check_root_device.go b/builder/osc/chroot/step_check_root_device.go index 22ec04c29..418fd3909 100644 --- a/builder/osc/chroot/step_check_root_device.go +++ b/builder/osc/chroot/step_check_root_device.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/chroot/step_chroot_provision.go b/builder/osc/chroot/step_chroot_provision.go index 1f35d88e6..ef659c41b 100644 --- a/builder/osc/chroot/step_chroot_provision.go +++ b/builder/osc/chroot/step_chroot_provision.go @@ -4,9 +4,9 @@ import ( "context" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) // StepChrootProvision provisions the instance within a chroot. diff --git a/builder/osc/chroot/step_copy_files.go b/builder/osc/chroot/step_copy_files.go index 78625a8d3..a7c7adbcb 100644 --- a/builder/osc/chroot/step_copy_files.go +++ b/builder/osc/chroot/step_copy_files.go @@ -7,8 +7,8 @@ import ( "log" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepCopyFiles copies some files from the host into the chroot environment. diff --git a/builder/osc/chroot/step_create_omi.go b/builder/osc/chroot/step_create_omi.go index b9f65ea28..cfd43fdb4 100644 --- a/builder/osc/chroot/step_create_omi.go +++ b/builder/osc/chroot/step_create_omi.go @@ -6,8 +6,8 @@ import ( "github.com/antihax/optional" osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/chroot/step_create_volume.go b/builder/osc/chroot/step_create_volume.go index b60263003..f2fdc7ab3 100644 --- a/builder/osc/chroot/step_create_volume.go +++ b/builder/osc/chroot/step_create_volume.go @@ -8,8 +8,8 @@ import ( "github.com/antihax/optional" osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/chroot/step_early_cleanup.go b/builder/osc/chroot/step_early_cleanup.go index 42d7d66c5..e84ac77e2 100644 --- a/builder/osc/chroot/step_early_cleanup.go +++ b/builder/osc/chroot/step_early_cleanup.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepEarlyCleanup performs some of the cleanup steps early in order to diff --git a/builder/osc/chroot/step_early_unflock.go b/builder/osc/chroot/step_early_unflock.go index b16becc61..3a39fb7fe 100644 --- a/builder/osc/chroot/step_early_unflock.go +++ b/builder/osc/chroot/step_early_unflock.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepEarlyUnflock unlocks the flock. diff --git a/builder/osc/chroot/step_flock.go b/builder/osc/chroot/step_flock.go index f3fd9d29e..5465a72fe 100644 --- a/builder/osc/chroot/step_flock.go +++ b/builder/osc/chroot/step_flock.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepFlock provisions the instance within a chroot. diff --git a/builder/osc/chroot/step_link_volume.go b/builder/osc/chroot/step_link_volume.go index 7e51caebd..6940e64c4 100644 --- a/builder/osc/chroot/step_link_volume.go +++ b/builder/osc/chroot/step_link_volume.go @@ -6,8 +6,8 @@ import ( "github.com/antihax/optional" osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/chroot/step_mount_device.go b/builder/osc/chroot/step_mount_device.go index 5007a339e..936425ac0 100644 --- a/builder/osc/chroot/step_mount_device.go +++ b/builder/osc/chroot/step_mount_device.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/osc/chroot/step_mount_extra.go b/builder/osc/chroot/step_mount_extra.go index 089bf7e75..f9b70dc4f 100644 --- a/builder/osc/chroot/step_mount_extra.go +++ b/builder/osc/chroot/step_mount_extra.go @@ -8,8 +8,8 @@ import ( "os/exec" "syscall" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepMountExtra mounts the attached device. diff --git a/builder/osc/chroot/step_post_mount_commands.go b/builder/osc/chroot/step_post_mount_commands.go index 704af428f..303ddeee5 100644 --- a/builder/osc/chroot/step_post_mount_commands.go +++ b/builder/osc/chroot/step_post_mount_commands.go @@ -3,8 +3,8 @@ package chroot import ( "context" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type postMountCommandsData struct { diff --git a/builder/osc/chroot/step_pre_mount_commands.go b/builder/osc/chroot/step_pre_mount_commands.go index 9a60256fe..26e93adf3 100644 --- a/builder/osc/chroot/step_pre_mount_commands.go +++ b/builder/osc/chroot/step_pre_mount_commands.go @@ -3,8 +3,8 @@ package chroot import ( "context" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type preMountCommandsData struct { diff --git a/builder/osc/chroot/step_prepare_device.go b/builder/osc/chroot/step_prepare_device.go index 0939d33cd..65af71acf 100644 --- a/builder/osc/chroot/step_prepare_device.go +++ b/builder/osc/chroot/step_prepare_device.go @@ -6,8 +6,8 @@ import ( "log" "os" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepPrepareDevice finds an available device and sets it. diff --git a/builder/osc/chroot/step_snapshot.go b/builder/osc/chroot/step_snapshot.go index cb9ee6add..04e036462 100644 --- a/builder/osc/chroot/step_snapshot.go +++ b/builder/osc/chroot/step_snapshot.go @@ -7,8 +7,8 @@ import ( "github.com/antihax/optional" osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/chroot/step_vm_info.go b/builder/osc/chroot/step_vm_info.go index 3662ad9a8..fa9d6079e 100644 --- a/builder/osc/chroot/step_vm_info.go +++ b/builder/osc/chroot/step_vm_info.go @@ -6,8 +6,8 @@ import ( "log" "github.com/antihax/optional" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/interpolate_build_info.go b/builder/osc/common/interpolate_build_info.go index 00f530319..820c63296 100644 --- a/builder/osc/common/interpolate_build_info.go +++ b/builder/osc/common/interpolate_build_info.go @@ -1,7 +1,7 @@ package common import ( - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/interpolate_build_info_test.go b/builder/osc/common/interpolate_build_info_test.go index 5e2deef3a..949e73c04 100644 --- a/builder/osc/common/interpolate_build_info_test.go +++ b/builder/osc/common/interpolate_build_info_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/ssh.go b/builder/osc/common/ssh.go index 38d0c0f8a..46cc4368f 100644 --- a/builder/osc/common/ssh.go +++ b/builder/osc/common/ssh.go @@ -9,7 +9,7 @@ import ( "net/http" "github.com/antihax/optional" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_cleanup_volumes.go b/builder/osc/common/step_cleanup_volumes.go index 92bda011d..171dfaa40 100644 --- a/builder/osc/common/step_cleanup_volumes.go +++ b/builder/osc/common/step_cleanup_volumes.go @@ -6,8 +6,8 @@ import ( "reflect" "github.com/antihax/optional" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_create_tags.go b/builder/osc/common/step_create_tags.go index 49f784de8..db06dec96 100644 --- a/builder/osc/common/step_create_tags.go +++ b/builder/osc/common/step_create_tags.go @@ -7,8 +7,8 @@ import ( "github.com/antihax/optional" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/hashicorp/packer/builder/osc/common/retry" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_deregister_omi.go b/builder/osc/common/step_deregister_omi.go index 390810092..f080d3d3c 100644 --- a/builder/osc/common/step_deregister_omi.go +++ b/builder/osc/common/step_deregister_omi.go @@ -8,8 +8,8 @@ import ( "github.com/antihax/optional" "github.com/outscale/osc-sdk-go/osc" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepDeregisterOMI struct { diff --git a/builder/osc/common/step_get_password.go b/builder/osc/common/step_get_password.go index df1e42740..ccef02481 100644 --- a/builder/osc/common/step_get_password.go +++ b/builder/osc/common/step_get_password.go @@ -13,8 +13,8 @@ import ( "github.com/antihax/optional" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_key_pair.go b/builder/osc/common/step_key_pair.go index 006499acd..6589c4831 100644 --- a/builder/osc/common/step_key_pair.go +++ b/builder/osc/common/step_key_pair.go @@ -8,8 +8,8 @@ import ( "github.com/antihax/optional" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_network_info.go b/builder/osc/common/step_network_info.go index 20372a362..e1fdb8bfe 100644 --- a/builder/osc/common/step_network_info.go +++ b/builder/osc/common/step_network_info.go @@ -8,8 +8,8 @@ import ( "sort" "github.com/antihax/optional" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_pre_validate.go b/builder/osc/common/step_pre_validate.go index a5d44e030..7c3151505 100644 --- a/builder/osc/common/step_pre_validate.go +++ b/builder/osc/common/step_pre_validate.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/antihax/optional" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_public_ip.go b/builder/osc/common/step_public_ip.go index 9702a0b91..51d4f2c8c 100644 --- a/builder/osc/common/step_public_ip.go +++ b/builder/osc/common/step_public_ip.go @@ -6,8 +6,8 @@ import ( "github.com/antihax/optional" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_run_source_vm.go b/builder/osc/common/step_run_source_vm.go index d5ba558c6..36188058a 100644 --- a/builder/osc/common/step_run_source_vm.go +++ b/builder/osc/common/step_run_source_vm.go @@ -14,8 +14,8 @@ import ( "github.com/hashicorp/packer/builder/osc/common/retry" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/osc/common/step_security_group.go b/builder/osc/common/step_security_group.go index 8c368cc34..789f101e7 100644 --- a/builder/osc/common/step_security_group.go +++ b/builder/osc/common/step_security_group.go @@ -8,8 +8,8 @@ import ( "github.com/antihax/optional" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_source_omi_info.go b/builder/osc/common/step_source_omi_info.go index 1bc6e05cb..64e1df704 100644 --- a/builder/osc/common/step_source_omi_info.go +++ b/builder/osc/common/step_source_omi_info.go @@ -8,8 +8,8 @@ import ( "time" "github.com/antihax/optional" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_stop_bsu_backed_vm.go b/builder/osc/common/step_stop_bsu_backed_vm.go index 11dd2654c..5c45a126b 100644 --- a/builder/osc/common/step_stop_bsu_backed_vm.go +++ b/builder/osc/common/step_stop_bsu_backed_vm.go @@ -7,8 +7,8 @@ import ( "github.com/antihax/optional" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/hashicorp/packer/builder/osc/common/retry" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_update_bsu_vm.go b/builder/osc/common/step_update_bsu_vm.go index e348916a8..48cbbcd13 100644 --- a/builder/osc/common/step_update_bsu_vm.go +++ b/builder/osc/common/step_update_bsu_vm.go @@ -3,7 +3,7 @@ package common import ( "context" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepUpdateBSUBackedVm struct { diff --git a/builder/osc/common/step_update_omi.go b/builder/osc/common/step_update_omi.go index 9857d8482..d523426de 100644 --- a/builder/osc/common/step_update_omi.go +++ b/builder/osc/common/step_update_omi.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/antihax/optional" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/tags.go b/builder/osc/common/tags.go index bcb78451b..446c191bb 100644 --- a/builder/osc/common/tags.go +++ b/builder/osc/common/tags.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/antihax/optional" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/parallels/common/ssh.go b/builder/parallels/common/ssh.go index 50f4e4e9c..6059b4a42 100644 --- a/builder/parallels/common/ssh.go +++ b/builder/parallels/common/ssh.go @@ -3,7 +3,7 @@ package common import ( "log" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // CommHost returns the VM's IP address which should be used to access it by SSH. diff --git a/builder/parallels/common/step_attach_floppy.go b/builder/parallels/common/step_attach_floppy.go index cdedb9922..7d310ab75 100644 --- a/builder/parallels/common/step_attach_floppy.go +++ b/builder/parallels/common/step_attach_floppy.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepAttachFloppy is a step that attaches a floppy to the virtual machine. diff --git a/builder/parallels/common/step_attach_floppy_test.go b/builder/parallels/common/step_attach_floppy_test.go index 2d951cf05..87b07d0f5 100644 --- a/builder/parallels/common/step_attach_floppy_test.go +++ b/builder/parallels/common/step_attach_floppy_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepAttachFloppy_impl(t *testing.T) { diff --git a/builder/parallels/common/step_attach_parallels_tools.go b/builder/parallels/common/step_attach_parallels_tools.go index 5745ce4f9..638408115 100644 --- a/builder/parallels/common/step_attach_parallels_tools.go +++ b/builder/parallels/common/step_attach_parallels_tools.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepAttachParallelsTools is a step that attaches Parallels Tools ISO image diff --git a/builder/parallels/common/step_compact_disk.go b/builder/parallels/common/step_compact_disk.go index 14c6fa49d..e757336ef 100644 --- a/builder/parallels/common/step_compact_disk.go +++ b/builder/parallels/common/step_compact_disk.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepCompactDisk is a step that removes all empty blocks from expanding diff --git a/builder/parallels/common/step_compact_disk_test.go b/builder/parallels/common/step_compact_disk_test.go index e32ef217b..79b54d6f0 100644 --- a/builder/parallels/common/step_compact_disk_test.go +++ b/builder/parallels/common/step_compact_disk_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCompactDisk_impl(t *testing.T) { diff --git a/builder/parallels/common/step_output_dir.go b/builder/parallels/common/step_output_dir.go index c71f61bce..97115d8e4 100644 --- a/builder/parallels/common/step_output_dir.go +++ b/builder/parallels/common/step_output_dir.go @@ -8,8 +8,8 @@ import ( "path/filepath" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepOutputDir sets up the output directory by creating it if it does diff --git a/builder/parallels/common/step_output_dir_test.go b/builder/parallels/common/step_output_dir_test.go index 53c1d885c..70380fd51 100644 --- a/builder/parallels/common/step_output_dir_test.go +++ b/builder/parallels/common/step_output_dir_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testStepOutputDir(t *testing.T) *StepOutputDir { diff --git a/builder/parallels/common/step_prepare_parallels_tools.go b/builder/parallels/common/step_prepare_parallels_tools.go index 251018cea..075f36bfe 100644 --- a/builder/parallels/common/step_prepare_parallels_tools.go +++ b/builder/parallels/common/step_prepare_parallels_tools.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepPrepareParallelsTools is a step that prepares parameters related diff --git a/builder/parallels/common/step_prepare_parallels_tools_test.go b/builder/parallels/common/step_prepare_parallels_tools_test.go index 4f46fc642..5fd2e065c 100644 --- a/builder/parallels/common/step_prepare_parallels_tools_test.go +++ b/builder/parallels/common/step_prepare_parallels_tools_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepPrepareParallelsTools_impl(t *testing.T) { diff --git a/builder/parallels/common/step_prlctl.go b/builder/parallels/common/step_prlctl.go index 43f9941d2..5f31812b6 100644 --- a/builder/parallels/common/step_prlctl.go +++ b/builder/parallels/common/step_prlctl.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/parallels/common/step_run.go b/builder/parallels/common/step_run.go index 062312069..a0772fdd0 100644 --- a/builder/parallels/common/step_run.go +++ b/builder/parallels/common/step_run.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepRun is a step that starts the virtual machine. diff --git a/builder/parallels/common/step_shutdown.go b/builder/parallels/common/step_shutdown.go index f2c7b7e5a..cd1f5a232 100644 --- a/builder/parallels/common/step_shutdown.go +++ b/builder/parallels/common/step_shutdown.go @@ -8,8 +8,8 @@ import ( "log" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepShutdown is a step that shuts down the machine. It first attempts to do diff --git a/builder/parallels/common/step_shutdown_test.go b/builder/parallels/common/step_shutdown_test.go index 0d137431f..861be6cd7 100644 --- a/builder/parallels/common/step_shutdown_test.go +++ b/builder/parallels/common/step_shutdown_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepShutdown_impl(t *testing.T) { diff --git a/builder/parallels/common/step_test.go b/builder/parallels/common/step_test.go index 0964784f7..4dc7bd18b 100644 --- a/builder/parallels/common/step_test.go +++ b/builder/parallels/common/step_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/parallels/common/step_type_boot_command.go b/builder/parallels/common/step_type_boot_command.go index dbf90c46a..31f55e8f7 100644 --- a/builder/parallels/common/step_type_boot_command.go +++ b/builder/parallels/common/step_type_boot_command.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/parallels/common/step_upload_parallels_tools.go b/builder/parallels/common/step_upload_parallels_tools.go index b1c2f10dd..f70e7b60b 100644 --- a/builder/parallels/common/step_upload_parallels_tools.go +++ b/builder/parallels/common/step_upload_parallels_tools.go @@ -6,8 +6,8 @@ import ( "log" "os" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/parallels/common/step_upload_parallels_tools_test.go b/builder/parallels/common/step_upload_parallels_tools_test.go index aeff516d3..5e8b3f8d7 100644 --- a/builder/parallels/common/step_upload_parallels_tools_test.go +++ b/builder/parallels/common/step_upload_parallels_tools_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepUploadParallelsTools_impl(t *testing.T) { diff --git a/builder/parallels/common/step_upload_version.go b/builder/parallels/common/step_upload_version.go index 6731b8c32..072bece70 100644 --- a/builder/parallels/common/step_upload_version.go +++ b/builder/parallels/common/step_upload_version.go @@ -6,8 +6,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepUploadVersion is a step that uploads a file containing the version of diff --git a/builder/parallels/common/step_upload_version_test.go b/builder/parallels/common/step_upload_version_test.go index 998d35f0e..ddce60e3c 100644 --- a/builder/parallels/common/step_upload_version_test.go +++ b/builder/parallels/common/step_upload_version_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepUploadVersion_impl(t *testing.T) { diff --git a/builder/parallels/iso/builder.go b/builder/parallels/iso/builder.go index f05094fa4..ff67ebddd 100644 --- a/builder/parallels/iso/builder.go +++ b/builder/parallels/iso/builder.go @@ -12,11 +12,11 @@ import ( parallelscommon "github.com/hashicorp/packer/builder/parallels/common" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/parallels/iso/step_attach_iso.go b/builder/parallels/iso/step_attach_iso.go index 509fcbdd2..ccaced1c0 100644 --- a/builder/parallels/iso/step_attach_iso.go +++ b/builder/parallels/iso/step_attach_iso.go @@ -6,8 +6,8 @@ import ( "log" parallelscommon "github.com/hashicorp/packer/builder/parallels/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step attaches the ISO to the virtual machine. diff --git a/builder/parallels/iso/step_create_disk.go b/builder/parallels/iso/step_create_disk.go index d7b62fbf2..dbe71e4b7 100644 --- a/builder/parallels/iso/step_create_disk.go +++ b/builder/parallels/iso/step_create_disk.go @@ -6,8 +6,8 @@ import ( "strconv" parallelscommon "github.com/hashicorp/packer/builder/parallels/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step creates the virtual disk that will be used as the diff --git a/builder/parallels/iso/step_create_vm.go b/builder/parallels/iso/step_create_vm.go index 801f83899..ad7a32f81 100644 --- a/builder/parallels/iso/step_create_vm.go +++ b/builder/parallels/iso/step_create_vm.go @@ -6,8 +6,8 @@ import ( "strconv" parallelscommon "github.com/hashicorp/packer/builder/parallels/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step creates the actual virtual machine. diff --git a/builder/parallels/iso/step_set_boot_order.go b/builder/parallels/iso/step_set_boot_order.go index 3b052407c..7d50251be 100644 --- a/builder/parallels/iso/step_set_boot_order.go +++ b/builder/parallels/iso/step_set_boot_order.go @@ -5,8 +5,8 @@ import ( "fmt" parallelscommon "github.com/hashicorp/packer/builder/parallels/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step sets the device boot order for the virtual machine. diff --git a/builder/parallels/pvm/builder.go b/builder/parallels/pvm/builder.go index 757b5b9a4..532c37658 100644 --- a/builder/parallels/pvm/builder.go +++ b/builder/parallels/pvm/builder.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" parallelscommon "github.com/hashicorp/packer/builder/parallels/common" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) // Builder implements packer.Builder and builds the actual Parallels diff --git a/builder/parallels/pvm/config.go b/builder/parallels/pvm/config.go index 651f64419..3b5aafdce 100644 --- a/builder/parallels/pvm/config.go +++ b/builder/parallels/pvm/config.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/parallels/pvm/step_import.go b/builder/parallels/pvm/step_import.go index dcbc1cf6e..1530ee301 100644 --- a/builder/parallels/pvm/step_import.go +++ b/builder/parallels/pvm/step_import.go @@ -5,8 +5,8 @@ import ( "fmt" parallelscommon "github.com/hashicorp/packer/builder/parallels/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step imports an PVM VM into Parallels. diff --git a/builder/parallels/pvm/step_test.go b/builder/parallels/pvm/step_test.go index 9d891c637..6c9983a82 100644 --- a/builder/parallels/pvm/step_test.go +++ b/builder/parallels/pvm/step_test.go @@ -5,8 +5,8 @@ import ( "testing" parallelscommon "github.com/hashicorp/packer/builder/parallels/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/profitbricks/builder.go b/builder/profitbricks/builder.go index dada47170..2261a96f5 100644 --- a/builder/profitbricks/builder.go +++ b/builder/profitbricks/builder.go @@ -6,9 +6,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) const BuilderId = "packer.profitbricks" diff --git a/builder/profitbricks/step_create_server.go b/builder/profitbricks/step_create_server.go index 7798ace73..21464c673 100644 --- a/builder/profitbricks/step_create_server.go +++ b/builder/profitbricks/step_create_server.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/profitbricks/profitbricks-sdk-go" ) diff --git a/builder/profitbricks/step_create_ssh_key.go b/builder/profitbricks/step_create_ssh_key.go index 8490dffc3..19d8a2044 100644 --- a/builder/profitbricks/step_create_ssh_key.go +++ b/builder/profitbricks/step_create_ssh_key.go @@ -6,8 +6,8 @@ import ( "encoding/pem" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "golang.org/x/crypto/ssh" ) diff --git a/builder/profitbricks/step_take_snapshot.go b/builder/profitbricks/step_take_snapshot.go index dfb1ff61a..c545f8521 100644 --- a/builder/profitbricks/step_take_snapshot.go +++ b/builder/profitbricks/step_take_snapshot.go @@ -5,8 +5,8 @@ import ( "encoding/json" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/profitbricks/profitbricks-sdk-go" ) diff --git a/builder/proxmox/clone/builder.go b/builder/proxmox/clone/builder.go index 178f73587..f84fb216e 100644 --- a/builder/proxmox/clone/builder.go +++ b/builder/proxmox/clone/builder.go @@ -4,8 +4,8 @@ import ( proxmoxapi "github.com/Telmate/proxmox-api-go/proxmox" "github.com/hashicorp/hcl/v2/hcldec" proxmox "github.com/hashicorp/packer/builder/proxmox/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "context" "fmt" diff --git a/builder/proxmox/clone/step_ssh_key_pair.go b/builder/proxmox/clone/step_ssh_key_pair.go index 1fd0844d0..c963986a4 100644 --- a/builder/proxmox/clone/step_ssh_key_pair.go +++ b/builder/proxmox/clone/step_ssh_key_pair.go @@ -6,9 +6,9 @@ import ( "os" common "github.com/hashicorp/packer/builder/proxmox/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/helper/ssh" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/proxmox/common/builder.go b/builder/proxmox/common/builder.go index bbb5e7c9d..b592a6fdb 100644 --- a/builder/proxmox/common/builder.go +++ b/builder/proxmox/common/builder.go @@ -8,9 +8,9 @@ import ( "github.com/Telmate/proxmox-api-go/proxmox" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) func NewSharedBuilder(id string, config Config, preSteps []multistep.Step, postSteps []multistep.Step, vmCreator ProxmoxVMCreator) *Builder { diff --git a/builder/proxmox/common/config.go b/builder/proxmox/common/config.go index 4a3184282..66d17a318 100644 --- a/builder/proxmox/common/config.go +++ b/builder/proxmox/common/config.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" "github.com/mitchellh/mapstructure" diff --git a/builder/proxmox/common/step_convert_to_template.go b/builder/proxmox/common/step_convert_to_template.go index b0fc13b47..3d177bfc9 100644 --- a/builder/proxmox/common/step_convert_to_template.go +++ b/builder/proxmox/common/step_convert_to_template.go @@ -6,8 +6,8 @@ import ( "log" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // stepConvertToTemplate takes the running VM configured in earlier steps, stops it, and diff --git a/builder/proxmox/common/step_convert_to_template_test.go b/builder/proxmox/common/step_convert_to_template_test.go index a7f472e3a..26fc7dfb3 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/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type converterMock struct { diff --git a/builder/proxmox/common/step_finalize_template_config.go b/builder/proxmox/common/step_finalize_template_config.go index 0aebb9aca..901d30bff 100644 --- a/builder/proxmox/common/step_finalize_template_config.go +++ b/builder/proxmox/common/step_finalize_template_config.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // stepFinalizeTemplateConfig does any required modifications to the configuration _after_ diff --git a/builder/proxmox/common/step_finalize_template_config_test.go b/builder/proxmox/common/step_finalize_template_config_test.go index 646e6f73d..38c691e17 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/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type finalizerMock struct { diff --git a/builder/proxmox/common/step_start_vm.go b/builder/proxmox/common/step_start_vm.go index d5877a6a2..09951660f 100644 --- a/builder/proxmox/common/step_start_vm.go +++ b/builder/proxmox/common/step_start_vm.go @@ -7,8 +7,8 @@ import ( "strconv" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // stepStartVM takes the given configuration and starts a VM on the given Proxmox node. diff --git a/builder/proxmox/common/step_start_vm_test.go b/builder/proxmox/common/step_start_vm_test.go index cb19670f5..e51577297 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/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type startedVMCleanerMock struct { diff --git a/builder/proxmox/common/step_success.go b/builder/proxmox/common/step_success.go index 06de9f21d..cbedd1684 100644 --- a/builder/proxmox/common/step_success.go +++ b/builder/proxmox/common/step_success.go @@ -3,7 +3,7 @@ package proxmox import ( "context" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // stepSuccess runs after the full build has succeeded. diff --git a/builder/proxmox/common/step_type_boot_command.go b/builder/proxmox/common/step_type_boot_command.go index fafdd8e9d..878d9b837 100644 --- a/builder/proxmox/common/step_type_boot_command.go +++ b/builder/proxmox/common/step_type_boot_command.go @@ -9,9 +9,9 @@ import ( "time" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/proxmox/common/step_type_boot_command_test.go b/builder/proxmox/common/step_type_boot_command_test.go index 7070b312d..104c3fd60 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/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type commandTyperMock struct { diff --git a/builder/proxmox/iso/builder.go b/builder/proxmox/iso/builder.go index 4f17e213f..8cc248aec 100644 --- a/builder/proxmox/iso/builder.go +++ b/builder/proxmox/iso/builder.go @@ -6,9 +6,9 @@ import ( proxmoxapi "github.com/Telmate/proxmox-api-go/proxmox" "github.com/hashicorp/hcl/v2/hcldec" proxmox "github.com/hashicorp/packer/builder/proxmox/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) // The unique id for the builder diff --git a/builder/proxmox/iso/config.go b/builder/proxmox/iso/config.go index 331f0ff08..a5545f9eb 100644 --- a/builder/proxmox/iso/config.go +++ b/builder/proxmox/iso/config.go @@ -11,7 +11,7 @@ import ( proxmox "github.com/hashicorp/packer/builder/proxmox/common" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) type Config struct { diff --git a/builder/proxmox/iso/step_finalize_iso.go b/builder/proxmox/iso/step_finalize_iso.go index 88ef44bd2..ee504c0e7 100644 --- a/builder/proxmox/iso/step_finalize_iso.go +++ b/builder/proxmox/iso/step_finalize_iso.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // stepFinalizeISOTemplate does any ISO-builder specific modifications after diff --git a/builder/proxmox/iso/step_finalize_iso_test.go b/builder/proxmox/iso/step_finalize_iso_test.go index a35a7f5a2..6556bb495 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/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type finalizerMock struct { diff --git a/builder/proxmox/iso/step_upload_additional_isos.go b/builder/proxmox/iso/step_upload_additional_isos.go index f23b949be..e2b7af894 100644 --- a/builder/proxmox/iso/step_upload_additional_isos.go +++ b/builder/proxmox/iso/step_upload_additional_isos.go @@ -7,8 +7,8 @@ import ( "path/filepath" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // stepUploadAdditionalISOs uploads all additional ISO files that are mountet diff --git a/builder/proxmox/iso/step_upload_iso.go b/builder/proxmox/iso/step_upload_iso.go index 79096bfe0..3edef379a 100644 --- a/builder/proxmox/iso/step_upload_iso.go +++ b/builder/proxmox/iso/step_upload_iso.go @@ -8,8 +8,8 @@ import ( "path/filepath" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // stepUploadISO uploads an ISO file to Proxmox so we can boot from it diff --git a/builder/proxmox/iso/step_upload_iso_test.go b/builder/proxmox/iso/step_upload_iso_test.go index 0099c1271..d747594f8 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/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) type uploaderMock struct { diff --git a/builder/qemu/builder.go b/builder/qemu/builder.go index d382c7b8e..fc24b592c 100644 --- a/builder/qemu/builder.go +++ b/builder/qemu/builder.go @@ -11,9 +11,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) const BuilderId = "transcend.qemu" diff --git a/builder/qemu/config.go b/builder/qemu/config.go index db294ec01..358a26589 100644 --- a/builder/qemu/config.go +++ b/builder/qemu/config.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/qemu/driver.go b/builder/qemu/driver.go index d4b600c11..9aeb8f279 100644 --- a/builder/qemu/driver.go +++ b/builder/qemu/driver.go @@ -15,7 +15,7 @@ import ( "time" "unicode" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type DriverCancelCallback func(state multistep.StateBag) bool diff --git a/builder/qemu/ssh.go b/builder/qemu/ssh.go index d722df9e1..25778c021 100644 --- a/builder/qemu/ssh.go +++ b/builder/qemu/ssh.go @@ -3,7 +3,7 @@ package qemu import ( "log" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func commHost(host string) func(multistep.StateBag) (string, error) { diff --git a/builder/qemu/step_configure_qmp.go b/builder/qemu/step_configure_qmp.go index 8a2d10249..de87d99bf 100644 --- a/builder/qemu/step_configure_qmp.go +++ b/builder/qemu/step_configure_qmp.go @@ -8,8 +8,8 @@ import ( "time" "github.com/digitalocean/go-qemu/qmp" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step configures the VM to enable the QMP listener. diff --git a/builder/qemu/step_configure_vnc.go b/builder/qemu/step_configure_vnc.go index 0a8c34590..87a095dc7 100644 --- a/builder/qemu/step_configure_vnc.go +++ b/builder/qemu/step_configure_vnc.go @@ -6,8 +6,8 @@ import ( "log" "math/rand" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/net" ) diff --git a/builder/qemu/step_convert_disk.go b/builder/qemu/step_convert_disk.go index cb0f17ea3..1f7952248 100644 --- a/builder/qemu/step_convert_disk.go +++ b/builder/qemu/step_convert_disk.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/retry" "os" diff --git a/builder/qemu/step_copy_disk.go b/builder/qemu/step_copy_disk.go index 28a091426..c5600a31b 100644 --- a/builder/qemu/step_copy_disk.go +++ b/builder/qemu/step_copy_disk.go @@ -5,8 +5,8 @@ import ( "fmt" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step copies the virtual disk that will be used as the diff --git a/builder/qemu/step_copy_disk_test.go b/builder/qemu/step_copy_disk_test.go index b7241621e..efeb53401 100644 --- a/builder/qemu/step_copy_disk_test.go +++ b/builder/qemu/step_copy_disk_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" ) diff --git a/builder/qemu/step_create_disk.go b/builder/qemu/step_create_disk.go index 288bb02dc..03de4fe7e 100644 --- a/builder/qemu/step_create_disk.go +++ b/builder/qemu/step_create_disk.go @@ -6,8 +6,8 @@ import ( "log" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step creates the virtual disk that will be used as the diff --git a/builder/qemu/step_create_disk_test.go b/builder/qemu/step_create_disk_test.go index 22fa59283..6756d7e58 100644 --- a/builder/qemu/step_create_disk_test.go +++ b/builder/qemu/step_create_disk_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" ) diff --git a/builder/qemu/step_http_ip_discover.go b/builder/qemu/step_http_ip_discover.go index dd0f88dea..416cdac56 100644 --- a/builder/qemu/step_http_ip_discover.go +++ b/builder/qemu/step_http_ip_discover.go @@ -5,8 +5,8 @@ import ( "fmt" "net" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Step to discover the http ip diff --git a/builder/qemu/step_http_ip_discover_test.go b/builder/qemu/step_http_ip_discover_test.go index 456602f8a..263bcb752 100644 --- a/builder/qemu/step_http_ip_discover_test.go +++ b/builder/qemu/step_http_ip_discover_test.go @@ -5,8 +5,8 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepHTTPIPDiscover_Run(t *testing.T) { diff --git a/builder/qemu/step_port_forward.go b/builder/qemu/step_port_forward.go index 537043973..77dcc1248 100644 --- a/builder/qemu/step_port_forward.go +++ b/builder/qemu/step_port_forward.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/net" ) diff --git a/builder/qemu/step_prepare_output_dir.go b/builder/qemu/step_prepare_output_dir.go index 09a3087ec..75118fdf0 100644 --- a/builder/qemu/step_prepare_output_dir.go +++ b/builder/qemu/step_prepare_output_dir.go @@ -6,8 +6,8 @@ import ( "os" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepPrepareOutputDir struct{} diff --git a/builder/qemu/step_resize_disk.go b/builder/qemu/step_resize_disk.go index 09863e327..c2daf20cf 100644 --- a/builder/qemu/step_resize_disk.go +++ b/builder/qemu/step_resize_disk.go @@ -5,8 +5,8 @@ import ( "fmt" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step resizes the virtual disk that will be used as the diff --git a/builder/qemu/step_resize_disk_test.go b/builder/qemu/step_resize_disk_test.go index 796ec20cb..ecfa5b6ea 100644 --- a/builder/qemu/step_resize_disk_test.go +++ b/builder/qemu/step_resize_disk_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" ) diff --git a/builder/qemu/step_run.go b/builder/qemu/step_run.go index 1273a846e..ab2b36886 100644 --- a/builder/qemu/step_run.go +++ b/builder/qemu/step_run.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/hashicorp/go-version" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/qemu/step_run_test.go b/builder/qemu/step_run_test.go index d025a8063..7f3bfe4c5 100644 --- a/builder/qemu/step_run_test.go +++ b/builder/qemu/step_run_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/stretchr/testify/assert" ) diff --git a/builder/qemu/step_set_iso.go b/builder/qemu/step_set_iso.go index b912574b5..3f6263be7 100644 --- a/builder/qemu/step_set_iso.go +++ b/builder/qemu/step_set_iso.go @@ -5,8 +5,8 @@ import ( "fmt" "net/http" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/net" ) diff --git a/builder/qemu/step_shutdown.go b/builder/qemu/step_shutdown.go index 7fde1de77..3dbe1743a 100644 --- a/builder/qemu/step_shutdown.go +++ b/builder/qemu/step_shutdown.go @@ -8,8 +8,8 @@ import ( "time" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step shuts down the machine. It first attempts to do so gracefully, diff --git a/builder/qemu/step_shutdown_test.go b/builder/qemu/step_shutdown_test.go index 46ea3efb8..47214b4ee 100644 --- a/builder/qemu/step_shutdown_test.go +++ b/builder/qemu/step_shutdown_test.go @@ -6,8 +6,8 @@ import ( "time" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func Test_Shutdown_Null_success(t *testing.T) { diff --git a/builder/qemu/step_test.go b/builder/qemu/step_test.go index 4a782d1d4..ff015f747 100644 --- a/builder/qemu/step_test.go +++ b/builder/qemu/step_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/qemu/step_type_boot_command.go b/builder/qemu/step_type_boot_command.go index 70446bde3..27a6f8e48 100644 --- a/builder/qemu/step_type_boot_command.go +++ b/builder/qemu/step_type_boot_command.go @@ -7,9 +7,9 @@ import ( "net" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/go-vnc" ) diff --git a/builder/qemu/step_wait_guest_address.go b/builder/qemu/step_wait_guest_address.go index 7e6f9ad1e..938083e5b 100644 --- a/builder/qemu/step_wait_guest_address.go +++ b/builder/qemu/step_wait_guest_address.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/digitalocean/go-qemu/qmp" ) diff --git a/builder/scaleway/builder.go b/builder/scaleway/builder.go index f1f222f1f..9db7423cd 100644 --- a/builder/scaleway/builder.go +++ b/builder/scaleway/builder.go @@ -10,9 +10,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/builder/scaleway/step_create_image.go b/builder/scaleway/step_create_image.go index 98085d3af..5875700d6 100644 --- a/builder/scaleway/step_create_image.go +++ b/builder/scaleway/step_create_image.go @@ -6,8 +6,8 @@ import ( "log" "github.com/hashicorp/go-uuid" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/api/marketplace/v1" "github.com/scaleway/scaleway-sdk-go/scw" diff --git a/builder/scaleway/step_create_server.go b/builder/scaleway/step_create_server.go index 3342305b1..52c802b5f 100644 --- a/builder/scaleway/step_create_server.go +++ b/builder/scaleway/step_create_server.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/builder/scaleway/step_create_ssh_key.go b/builder/scaleway/step_create_ssh_key.go index 308913a7b..5d746029f 100644 --- a/builder/scaleway/step_create_ssh_key.go +++ b/builder/scaleway/step_create_ssh_key.go @@ -11,8 +11,8 @@ import ( "os" "runtime" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "golang.org/x/crypto/ssh" ) diff --git a/builder/scaleway/step_pre_validate.go b/builder/scaleway/step_pre_validate.go index 0e32b2e5d..c1926a41f 100644 --- a/builder/scaleway/step_pre_validate.go +++ b/builder/scaleway/step_pre_validate.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/builder/scaleway/step_pre_validate_test.go b/builder/scaleway/step_pre_validate_test.go index 51e7d927c..fb40998ab 100644 --- a/builder/scaleway/step_pre_validate_test.go +++ b/builder/scaleway/step_pre_validate_test.go @@ -10,8 +10,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/builder/scaleway/step_remove_volume.go b/builder/scaleway/step_remove_volume.go index a9abc2d3b..451047b3c 100644 --- a/builder/scaleway/step_remove_volume.go +++ b/builder/scaleway/step_remove_volume.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/builder/scaleway/step_server_info.go b/builder/scaleway/step_server_info.go index 7d5f7d1ba..28dec4cd5 100644 --- a/builder/scaleway/step_server_info.go +++ b/builder/scaleway/step_server_info.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/builder/scaleway/step_shutdown.go b/builder/scaleway/step_shutdown.go index 60d76d907..9cb016e5a 100644 --- a/builder/scaleway/step_shutdown.go +++ b/builder/scaleway/step_shutdown.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/builder/scaleway/step_snapshot.go b/builder/scaleway/step_snapshot.go index 8b4fab470..29f56d97a 100644 --- a/builder/scaleway/step_snapshot.go +++ b/builder/scaleway/step_snapshot.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/builder/tencentcloud/cvm/builder.go b/builder/tencentcloud/cvm/builder.go index ff9526a81..18e86175b 100644 --- a/builder/tencentcloud/cvm/builder.go +++ b/builder/tencentcloud/cvm/builder.go @@ -9,10 +9,10 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/tencentcloud/cvm/common.go b/builder/tencentcloud/cvm/common.go index 020ae4390..d3fd7c398 100644 --- a/builder/tencentcloud/cvm/common.go +++ b/builder/tencentcloud/cvm/common.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/retry" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors" diff --git a/builder/tencentcloud/cvm/step_check_source_image.go b/builder/tencentcloud/cvm/step_check_source_image.go index 156525c2c..f2fc01265 100644 --- a/builder/tencentcloud/cvm/step_check_source_image.go +++ b/builder/tencentcloud/cvm/step_check_source_image.go @@ -5,7 +5,7 @@ import ( "fmt" "regexp" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_config_key_pair.go b/builder/tencentcloud/cvm/step_config_key_pair.go index a4ae97159..7d0534273 100644 --- a/builder/tencentcloud/cvm/step_config_key_pair.go +++ b/builder/tencentcloud/cvm/step_config_key_pair.go @@ -8,7 +8,7 @@ import ( "runtime" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_config_security_group.go b/builder/tencentcloud/cvm/step_config_security_group.go index 97d70e3c1..97af73848 100644 --- a/builder/tencentcloud/cvm/step_config_security_group.go +++ b/builder/tencentcloud/cvm/step_config_security_group.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_config_subnet.go b/builder/tencentcloud/cvm/step_config_subnet.go index 91ab42b7f..10c9b01d3 100644 --- a/builder/tencentcloud/cvm/step_config_subnet.go +++ b/builder/tencentcloud/cvm/step_config_subnet.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_config_vpc.go b/builder/tencentcloud/cvm/step_config_vpc.go index 707afb467..e89ec86f6 100644 --- a/builder/tencentcloud/cvm/step_config_vpc.go +++ b/builder/tencentcloud/cvm/step_config_vpc.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_copy_image.go b/builder/tencentcloud/cvm/step_copy_image.go index abc30d86b..bcfbd171f 100644 --- a/builder/tencentcloud/cvm/step_copy_image.go +++ b/builder/tencentcloud/cvm/step_copy_image.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_create_image.go b/builder/tencentcloud/cvm/step_create_image.go index f0fee3bc2..f55ad28ce 100644 --- a/builder/tencentcloud/cvm/step_create_image.go +++ b/builder/tencentcloud/cvm/step_create_image.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_detach_temp_key_pair.go b/builder/tencentcloud/cvm/step_detach_temp_key_pair.go index 6c5533e4d..b8cc2ca67 100644 --- a/builder/tencentcloud/cvm/step_detach_temp_key_pair.go +++ b/builder/tencentcloud/cvm/step_detach_temp_key_pair.go @@ -3,7 +3,7 @@ package cvm import ( "context" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_pre_validate.go b/builder/tencentcloud/cvm/step_pre_validate.go index 400535579..d07d8f058 100644 --- a/builder/tencentcloud/cvm/step_pre_validate.go +++ b/builder/tencentcloud/cvm/step_pre_validate.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_run_instance.go b/builder/tencentcloud/cvm/step_run_instance.go index 09e889d3e..811b71ed9 100644 --- a/builder/tencentcloud/cvm/step_run_instance.go +++ b/builder/tencentcloud/cvm/step_run_instance.go @@ -7,7 +7,7 @@ import ( "io/ioutil" "log" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_share_image.go b/builder/tencentcloud/cvm/step_share_image.go index b7ae237f7..d83bb9fa5 100644 --- a/builder/tencentcloud/cvm/step_share_image.go +++ b/builder/tencentcloud/cvm/step_share_image.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" ) diff --git a/builder/triton/builder.go b/builder/triton/builder.go index d9fd2b335..26d1274cd 100644 --- a/builder/triton/builder.go +++ b/builder/triton/builder.go @@ -7,9 +7,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) const ( diff --git a/builder/triton/ssh.go b/builder/triton/ssh.go index bc34fd6a9..0adf15c45 100644 --- a/builder/triton/ssh.go +++ b/builder/triton/ssh.go @@ -3,7 +3,7 @@ package triton import ( "log" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func commHost(host string) func(multistep.StateBag) (string, error) { diff --git a/builder/triton/step_create_image_from_machine.go b/builder/triton/step_create_image_from_machine.go index b7df6a0f6..bb2d66255 100644 --- a/builder/triton/step_create_image_from_machine.go +++ b/builder/triton/step_create_image_from_machine.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepCreateImageFromMachine creates an image with the specified attributes diff --git a/builder/triton/step_create_image_from_machine_test.go b/builder/triton/step_create_image_from_machine_test.go index 34eb95c8c..8423e85d5 100644 --- a/builder/triton/step_create_image_from_machine_test.go +++ b/builder/triton/step_create_image_from_machine_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreateImageFromMachine(t *testing.T) { diff --git a/builder/triton/step_create_source_machine.go b/builder/triton/step_create_source_machine.go index 24080ba23..0da7f603e 100644 --- a/builder/triton/step_create_source_machine.go +++ b/builder/triton/step_create_source_machine.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepCreateSourceMachine creates an machine with the specified attributes diff --git a/builder/triton/step_create_source_machine_test.go b/builder/triton/step_create_source_machine_test.go index 78d97ad5e..d70bfd6a0 100644 --- a/builder/triton/step_create_source_machine_test.go +++ b/builder/triton/step_create_source_machine_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreateSourceMachine(t *testing.T) { diff --git a/builder/triton/step_delete_machine.go b/builder/triton/step_delete_machine.go index aacb0d426..d1d005c25 100644 --- a/builder/triton/step_delete_machine.go +++ b/builder/triton/step_delete_machine.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepDeleteMachine deletes the machine with the ID specified in state["machine"] diff --git a/builder/triton/step_delete_machine_test.go b/builder/triton/step_delete_machine_test.go index 421024d58..1615f4f7d 100644 --- a/builder/triton/step_delete_machine_test.go +++ b/builder/triton/step_delete_machine_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepDeleteMachine(t *testing.T) { diff --git a/builder/triton/step_stop_machine.go b/builder/triton/step_stop_machine.go index 2e859dec6..f6b243a23 100644 --- a/builder/triton/step_stop_machine.go +++ b/builder/triton/step_stop_machine.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepStopMachine stops the machine with the given Machine ID, and waits diff --git a/builder/triton/step_stop_machine_test.go b/builder/triton/step_stop_machine_test.go index 8f0f39d2d..ded3e5053 100644 --- a/builder/triton/step_stop_machine_test.go +++ b/builder/triton/step_stop_machine_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepStopMachine(t *testing.T) { diff --git a/builder/triton/step_test.go b/builder/triton/step_test.go index bccc398c7..448a33a8f 100644 --- a/builder/triton/step_test.go +++ b/builder/triton/step_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/triton/step_wait_for_stop_to_not_fail.go b/builder/triton/step_wait_for_stop_to_not_fail.go index e6c6ced64..ce226c871 100644 --- a/builder/triton/step_wait_for_stop_to_not_fail.go +++ b/builder/triton/step_wait_for_stop_to_not_fail.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepWaitForStopNotToFail waits for 10 seconds before returning with continue diff --git a/builder/ucloud/common/utils.go b/builder/ucloud/common/utils.go index b922608d1..71d2bb04b 100644 --- a/builder/ucloud/common/utils.go +++ b/builder/ucloud/common/utils.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/ucloud/ucloud-sdk-go/services/uhost" ) diff --git a/builder/ucloud/uhost/builder.go b/builder/ucloud/uhost/builder.go index 8ec378d54..8d7c7de0d 100644 --- a/builder/ucloud/uhost/builder.go +++ b/builder/ucloud/uhost/builder.go @@ -11,10 +11,10 @@ import ( ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/ucloud/uhost/step_check_source_image.go b/builder/ucloud/uhost/step_check_source_image.go index d1feae7b6..afeec3978 100644 --- a/builder/ucloud/uhost/step_check_source_image.go +++ b/builder/ucloud/uhost/step_check_source_image.go @@ -3,9 +3,10 @@ package uhost import ( "context" "fmt" + ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepCheckSourceImageId struct { diff --git a/builder/ucloud/uhost/step_config_security_group.go b/builder/ucloud/uhost/step_config_security_group.go index f561bd003..297f7d002 100644 --- a/builder/ucloud/uhost/step_config_security_group.go +++ b/builder/ucloud/uhost/step_config_security_group.go @@ -5,8 +5,8 @@ import ( "fmt" ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/ucloud/ucloud-sdk-go/ucloud" ) diff --git a/builder/ucloud/uhost/step_config_subnet.go b/builder/ucloud/uhost/step_config_subnet.go index affb43ccd..6170b3f95 100644 --- a/builder/ucloud/uhost/step_config_subnet.go +++ b/builder/ucloud/uhost/step_config_subnet.go @@ -5,8 +5,8 @@ import ( "fmt" ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepConfigSubnet struct { diff --git a/builder/ucloud/uhost/step_config_vpc.go b/builder/ucloud/uhost/step_config_vpc.go index b6792318c..dc54ddcf7 100644 --- a/builder/ucloud/uhost/step_config_vpc.go +++ b/builder/ucloud/uhost/step_config_vpc.go @@ -6,8 +6,8 @@ import ( ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepConfigVPC struct { diff --git a/builder/ucloud/uhost/step_copy_image.go b/builder/ucloud/uhost/step_copy_image.go index 55c9f0c62..4f8eec37e 100644 --- a/builder/ucloud/uhost/step_copy_image.go +++ b/builder/ucloud/uhost/step_copy_image.go @@ -9,8 +9,8 @@ import ( ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" "github.com/hashicorp/packer/packer-plugin-sdk/retry" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/ucloud/ucloud-sdk-go/ucloud" ) diff --git a/builder/ucloud/uhost/step_create_image.go b/builder/ucloud/uhost/step_create_image.go index 42207ee2a..58e5da238 100644 --- a/builder/ucloud/uhost/step_create_image.go +++ b/builder/ucloud/uhost/step_create_image.go @@ -8,8 +8,8 @@ import ( ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" "github.com/hashicorp/packer/packer-plugin-sdk/retry" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/ucloud/ucloud-sdk-go/services/uhost" "github.com/ucloud/ucloud-sdk-go/ucloud" ) diff --git a/builder/ucloud/uhost/step_create_instance.go b/builder/ucloud/uhost/step_create_instance.go index bb6738569..03d863a40 100644 --- a/builder/ucloud/uhost/step_create_instance.go +++ b/builder/ucloud/uhost/step_create_instance.go @@ -10,8 +10,8 @@ import ( "time" ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/retry" "github.com/ucloud/ucloud-sdk-go/services/uhost" "github.com/ucloud/ucloud-sdk-go/ucloud" diff --git a/builder/ucloud/uhost/step_pre_validate.go b/builder/ucloud/uhost/step_pre_validate.go index becb80b29..41b50e9a6 100644 --- a/builder/ucloud/uhost/step_pre_validate.go +++ b/builder/ucloud/uhost/step_pre_validate.go @@ -4,8 +4,8 @@ import ( "context" ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepPreValidate struct { diff --git a/builder/ucloud/uhost/step_stop_instance.go b/builder/ucloud/uhost/step_stop_instance.go index 15daea961..214d5e312 100644 --- a/builder/ucloud/uhost/step_stop_instance.go +++ b/builder/ucloud/uhost/step_stop_instance.go @@ -8,8 +8,8 @@ import ( ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" "github.com/hashicorp/packer/packer-plugin-sdk/retry" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/ucloud/ucloud-sdk-go/services/uhost" "github.com/ucloud/ucloud-sdk-go/ucloud" ) diff --git a/builder/vagrant/builder.go b/builder/vagrant/builder.go index f8ff77497..3bc7a1200 100644 --- a/builder/vagrant/builder.go +++ b/builder/vagrant/builder.go @@ -16,11 +16,11 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/vagrant/ssh.go b/builder/vagrant/ssh.go index d4a56cb17..4d15819cb 100644 --- a/builder/vagrant/ssh.go +++ b/builder/vagrant/ssh.go @@ -1,7 +1,7 @@ package vagrant import ( - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func CommHost() func(multistep.StateBag) (string, error) { diff --git a/builder/vagrant/step_add_box.go b/builder/vagrant/step_add_box.go index 00b8af9b9..43693d184 100644 --- a/builder/vagrant/step_add_box.go +++ b/builder/vagrant/step_add_box.go @@ -5,8 +5,8 @@ import ( "log" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepAddBox struct { diff --git a/builder/vagrant/step_add_box_test.go b/builder/vagrant/step_add_box_test.go index 29feca5d1..475bcf501 100644 --- a/builder/vagrant/step_add_box_test.go +++ b/builder/vagrant/step_add_box_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepAdd_Impl(t *testing.T) { diff --git a/builder/vagrant/step_create_vagrantfile.go b/builder/vagrant/step_create_vagrantfile.go index ec6262dcc..b6ec461af 100644 --- a/builder/vagrant/step_create_vagrantfile.go +++ b/builder/vagrant/step_create_vagrantfile.go @@ -8,8 +8,8 @@ import ( "path/filepath" "text/template" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCreateVagrantfile struct { diff --git a/builder/vagrant/step_create_vagrantfile_test.go b/builder/vagrant/step_create_vagrantfile_test.go index 58df30284..2d8ff805c 100644 --- a/builder/vagrant/step_create_vagrantfile_test.go +++ b/builder/vagrant/step_create_vagrantfile_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreateVagrantfile_Impl(t *testing.T) { diff --git a/builder/vagrant/step_package.go b/builder/vagrant/step_package.go index 4cb9e2c18..8b2bd023f 100644 --- a/builder/vagrant/step_package.go +++ b/builder/vagrant/step_package.go @@ -4,8 +4,8 @@ import ( "context" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepPackage struct { diff --git a/builder/vagrant/step_ssh_config.go b/builder/vagrant/step_ssh_config.go index cdeab0361..e5a6c96d2 100644 --- a/builder/vagrant/step_ssh_config.go +++ b/builder/vagrant/step_ssh_config.go @@ -5,7 +5,7 @@ import ( "log" "strconv" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Vagrant already sets up ssh on the guests; our job is to find out what diff --git a/builder/vagrant/step_ssh_config_test.go b/builder/vagrant/step_ssh_config_test.go index d781ef338..cf7f42a56 100644 --- a/builder/vagrant/step_ssh_config_test.go +++ b/builder/vagrant/step_ssh_config_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepSSHConfig_Impl(t *testing.T) { diff --git a/builder/vagrant/step_up.go b/builder/vagrant/step_up.go index e78834f36..d427de57a 100644 --- a/builder/vagrant/step_up.go +++ b/builder/vagrant/step_up.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepUp struct { diff --git a/builder/virtualbox/common/comm.go b/builder/virtualbox/common/comm.go index cd43522db..a8811ae8d 100644 --- a/builder/virtualbox/common/comm.go +++ b/builder/virtualbox/common/comm.go @@ -1,7 +1,7 @@ package common import ( - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func CommHost(host string) func(multistep.StateBag) (string, error) { diff --git a/builder/virtualbox/common/step_attach_floppy.go b/builder/virtualbox/common/step_attach_floppy.go index 82a058e17..c607fbe32 100644 --- a/builder/virtualbox/common/step_attach_floppy.go +++ b/builder/virtualbox/common/step_attach_floppy.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) diff --git a/builder/virtualbox/common/step_attach_floppy_test.go b/builder/virtualbox/common/step_attach_floppy_test.go index 75d51c333..e34308799 100644 --- a/builder/virtualbox/common/step_attach_floppy_test.go +++ b/builder/virtualbox/common/step_attach_floppy_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepAttachFloppy_impl(t *testing.T) { diff --git a/builder/virtualbox/common/step_attach_isos.go b/builder/virtualbox/common/step_attach_isos.go index efbe26254..b72d9eccf 100644 --- a/builder/virtualbox/common/step_attach_isos.go +++ b/builder/virtualbox/common/step_attach_isos.go @@ -6,8 +6,8 @@ import ( "log" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step attaches the boot ISO, cd_files iso, and guest additions to the diff --git a/builder/virtualbox/common/step_configure_vrdp.go b/builder/virtualbox/common/step_configure_vrdp.go index 626cb12ee..77a6a7aca 100644 --- a/builder/virtualbox/common/step_configure_vrdp.go +++ b/builder/virtualbox/common/step_configure_vrdp.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/net" ) diff --git a/builder/virtualbox/common/step_download_guest_additions.go b/builder/virtualbox/common/step_download_guest_additions.go index e47d99dc7..e812ab436 100644 --- a/builder/virtualbox/common/step_download_guest_additions.go +++ b/builder/virtualbox/common/step_download_guest_additions.go @@ -9,9 +9,9 @@ import ( "os" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) diff --git a/builder/virtualbox/common/step_export.go b/builder/virtualbox/common/step_export.go index 7a3dd13f4..b1c5d6987 100644 --- a/builder/virtualbox/common/step_export.go +++ b/builder/virtualbox/common/step_export.go @@ -6,8 +6,8 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step cleans up forwarded ports and exports the VM to an OVF. diff --git a/builder/virtualbox/common/step_export_test.go b/builder/virtualbox/common/step_export_test.go index c5adc0a45..71fabf56b 100644 --- a/builder/virtualbox/common/step_export_test.go +++ b/builder/virtualbox/common/step_export_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepExport_impl(t *testing.T) { diff --git a/builder/virtualbox/common/step_http_ip_discover.go b/builder/virtualbox/common/step_http_ip_discover.go index ce4c2d7f5..17bbe42b9 100644 --- a/builder/virtualbox/common/step_http_ip_discover.go +++ b/builder/virtualbox/common/step_http_ip_discover.go @@ -2,7 +2,8 @@ package common import ( "context" - "github.com/hashicorp/packer/helper/multistep" + + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Step to discover the http ip diff --git a/builder/virtualbox/common/step_http_ip_discover_test.go b/builder/virtualbox/common/step_http_ip_discover_test.go index dbdccdb96..0a5bc8d47 100644 --- a/builder/virtualbox/common/step_http_ip_discover_test.go +++ b/builder/virtualbox/common/step_http_ip_discover_test.go @@ -2,8 +2,9 @@ package common import ( "context" - "github.com/hashicorp/packer/helper/multistep" "testing" + + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepHTTPIPDiscover_Run(t *testing.T) { diff --git a/builder/virtualbox/common/step_port_forwarding.go b/builder/virtualbox/common/step_port_forwarding.go index be96667b2..19b3a6689 100644 --- a/builder/virtualbox/common/step_port_forwarding.go +++ b/builder/virtualbox/common/step_port_forwarding.go @@ -7,8 +7,8 @@ import ( "strings" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/net" ) diff --git a/builder/virtualbox/common/step_remove_devices.go b/builder/virtualbox/common/step_remove_devices.go index 4ff9aad3b..fbbce66da 100644 --- a/builder/virtualbox/common/step_remove_devices.go +++ b/builder/virtualbox/common/step_remove_devices.go @@ -6,8 +6,8 @@ import ( "log" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/retry" ) diff --git a/builder/virtualbox/common/step_remove_devices_test.go b/builder/virtualbox/common/step_remove_devices_test.go index d28de98c4..95174bec5 100644 --- a/builder/virtualbox/common/step_remove_devices_test.go +++ b/builder/virtualbox/common/step_remove_devices_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepRemoveDevices_impl(t *testing.T) { diff --git a/builder/virtualbox/common/step_run.go b/builder/virtualbox/common/step_run.go index 8144087b2..ca148a876 100644 --- a/builder/virtualbox/common/step_run.go +++ b/builder/virtualbox/common/step_run.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step starts the virtual machine. diff --git a/builder/virtualbox/common/step_shutdown.go b/builder/virtualbox/common/step_shutdown.go index 75d570977..acc3c3513 100644 --- a/builder/virtualbox/common/step_shutdown.go +++ b/builder/virtualbox/common/step_shutdown.go @@ -7,8 +7,8 @@ import ( "log" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step shuts down the machine. It first attempts to do so gracefully, diff --git a/builder/virtualbox/common/step_shutdown_test.go b/builder/virtualbox/common/step_shutdown_test.go index c0cec95ed..001195bbb 100644 --- a/builder/virtualbox/common/step_shutdown_test.go +++ b/builder/virtualbox/common/step_shutdown_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepShutdown_impl(t *testing.T) { diff --git a/builder/virtualbox/common/step_ssh_key_pair.go b/builder/virtualbox/common/step_ssh_key_pair.go index d23143dcd..e0e851756 100644 --- a/builder/virtualbox/common/step_ssh_key_pair.go +++ b/builder/virtualbox/common/step_ssh_key_pair.go @@ -6,9 +6,9 @@ import ( "os" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/helper/ssh" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/virtualbox/common/step_suppress_messages.go b/builder/virtualbox/common/step_suppress_messages.go index 0a9def96c..52d69d5f9 100644 --- a/builder/virtualbox/common/step_suppress_messages.go +++ b/builder/virtualbox/common/step_suppress_messages.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step sets some variables in VirtualBox so that annoying diff --git a/builder/virtualbox/common/step_suppress_messages_test.go b/builder/virtualbox/common/step_suppress_messages_test.go index c37af7826..e93ca958b 100644 --- a/builder/virtualbox/common/step_suppress_messages_test.go +++ b/builder/virtualbox/common/step_suppress_messages_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepSuppressMessages_impl(t *testing.T) { diff --git a/builder/virtualbox/common/step_test.go b/builder/virtualbox/common/step_test.go index c8a12abb6..7cb9dd45e 100644 --- a/builder/virtualbox/common/step_test.go +++ b/builder/virtualbox/common/step_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/virtualbox/common/step_type_boot_command.go b/builder/virtualbox/common/step_type_boot_command.go index b2f11d632..4e7587eae 100644 --- a/builder/virtualbox/common/step_type_boot_command.go +++ b/builder/virtualbox/common/step_type_boot_command.go @@ -6,9 +6,9 @@ import ( "time" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/virtualbox/common/step_upload_guest_additions.go b/builder/virtualbox/common/step_upload_guest_additions.go index 739f20c8c..272ac5f1f 100644 --- a/builder/virtualbox/common/step_upload_guest_additions.go +++ b/builder/virtualbox/common/step_upload_guest_additions.go @@ -6,8 +6,8 @@ import ( "log" "os" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/virtualbox/common/step_upload_version.go b/builder/virtualbox/common/step_upload_version.go index 3d84e00ba..638aa1dac 100644 --- a/builder/virtualbox/common/step_upload_version.go +++ b/builder/virtualbox/common/step_upload_version.go @@ -6,8 +6,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step uploads a file containing the VirtualBox version, which diff --git a/builder/virtualbox/common/step_upload_version_test.go b/builder/virtualbox/common/step_upload_version_test.go index 998d35f0e..ddce60e3c 100644 --- a/builder/virtualbox/common/step_upload_version_test.go +++ b/builder/virtualbox/common/step_upload_version_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepUploadVersion_impl(t *testing.T) { diff --git a/builder/virtualbox/common/step_vboxmanage.go b/builder/virtualbox/common/step_vboxmanage.go index 1428a9d21..6950fcb4f 100644 --- a/builder/virtualbox/common/step_vboxmanage.go +++ b/builder/virtualbox/common/step_vboxmanage.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/virtualbox/iso/builder.go b/builder/virtualbox/iso/builder.go index f901ef763..e6fd54587 100644 --- a/builder/virtualbox/iso/builder.go +++ b/builder/virtualbox/iso/builder.go @@ -12,11 +12,11 @@ import ( vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/virtualbox/iso/step_create_disk.go b/builder/virtualbox/iso/step_create_disk.go index 1a8a80ad6..14869ce71 100644 --- a/builder/virtualbox/iso/step_create_disk.go +++ b/builder/virtualbox/iso/step_create_disk.go @@ -5,8 +5,8 @@ import ( "fmt" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "path/filepath" "strconv" diff --git a/builder/virtualbox/iso/step_create_vm.go b/builder/virtualbox/iso/step_create_vm.go index 604ce8fea..2a6597b18 100644 --- a/builder/virtualbox/iso/step_create_vm.go +++ b/builder/virtualbox/iso/step_create_vm.go @@ -7,8 +7,8 @@ import ( "strings" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step creates the actual virtual machine. diff --git a/builder/virtualbox/ovf/builder.go b/builder/virtualbox/ovf/builder.go index c6b6b7814..e15dd870b 100644 --- a/builder/virtualbox/ovf/builder.go +++ b/builder/virtualbox/ovf/builder.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) // Builder implements packer.Builder and builds the actual VirtualBox diff --git a/builder/virtualbox/ovf/config.go b/builder/virtualbox/ovf/config.go index 29cf5c5ac..1851ec94c 100644 --- a/builder/virtualbox/ovf/config.go +++ b/builder/virtualbox/ovf/config.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/virtualbox/ovf/step_import.go b/builder/virtualbox/ovf/step_import.go index b3dd53a19..fcb081a9c 100644 --- a/builder/virtualbox/ovf/step_import.go +++ b/builder/virtualbox/ovf/step_import.go @@ -5,8 +5,8 @@ import ( "fmt" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step imports an OVF VM into VirtualBox. diff --git a/builder/virtualbox/ovf/step_import_test.go b/builder/virtualbox/ovf/step_import_test.go index ae7425a22..69c2d5462 100644 --- a/builder/virtualbox/ovf/step_import_test.go +++ b/builder/virtualbox/ovf/step_import_test.go @@ -5,7 +5,7 @@ import ( "testing" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepImport_impl(t *testing.T) { diff --git a/builder/virtualbox/ovf/step_test.go b/builder/virtualbox/ovf/step_test.go index 4f9a0f9d8..59b251a99 100644 --- a/builder/virtualbox/ovf/step_test.go +++ b/builder/virtualbox/ovf/step_test.go @@ -5,8 +5,8 @@ import ( "testing" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/virtualbox/vm/builder.go b/builder/virtualbox/vm/builder.go index 6611753ec..4118d8827 100644 --- a/builder/virtualbox/vm/builder.go +++ b/builder/virtualbox/vm/builder.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) // Builder implements packer.Builder and builds the actual VirtualBox diff --git a/builder/virtualbox/vm/config.go b/builder/virtualbox/vm/config.go index c1ec25dbe..ce3f71e3d 100644 --- a/builder/virtualbox/vm/config.go +++ b/builder/virtualbox/vm/config.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/virtualbox/vm/step_create_snapshot.go b/builder/virtualbox/vm/step_create_snapshot.go index 8252c6f82..05a10177a 100644 --- a/builder/virtualbox/vm/step_create_snapshot.go +++ b/builder/virtualbox/vm/step_create_snapshot.go @@ -6,8 +6,8 @@ import ( "log" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCreateSnapshot struct { diff --git a/builder/virtualbox/vm/step_import.go b/builder/virtualbox/vm/step_import.go index 3e0a11fe4..6efdbe115 100644 --- a/builder/virtualbox/vm/step_import.go +++ b/builder/virtualbox/vm/step_import.go @@ -3,7 +3,7 @@ package vm import ( "context" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step imports an OVF VM into VirtualBox. diff --git a/builder/virtualbox/vm/step_set_snapshot.go b/builder/virtualbox/vm/step_set_snapshot.go index 401bacf15..2158a5187 100644 --- a/builder/virtualbox/vm/step_set_snapshot.go +++ b/builder/virtualbox/vm/step_set_snapshot.go @@ -5,8 +5,8 @@ import ( "fmt" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepSetSnapshot struct { diff --git a/builder/vmware/common/artifact.go b/builder/vmware/common/artifact.go index fedb70a84..39949716b 100644 --- a/builder/vmware/common/artifact.go +++ b/builder/vmware/common/artifact.go @@ -4,8 +4,8 @@ import ( "fmt" "strconv" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) const ( diff --git a/builder/vmware/common/driver.go b/builder/vmware/common/driver.go index 9ff431320..6f3a40393 100644 --- a/builder/vmware/common/driver.go +++ b/builder/vmware/common/driver.go @@ -15,7 +15,7 @@ import ( "strings" "time" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // A driver is able to talk to VMware, control virtual machines, etc. diff --git a/builder/vmware/common/driver_esx5.go b/builder/vmware/common/driver_esx5.go index d713a5cc4..710752258 100644 --- a/builder/vmware/common/driver_esx5.go +++ b/builder/vmware/common/driver_esx5.go @@ -29,9 +29,9 @@ import ( "github.com/hashicorp/go-getter/v2" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" helperssh "github.com/hashicorp/packer/helper/ssh" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh" gossh "golang.org/x/crypto/ssh" ) diff --git a/builder/vmware/common/driver_esx5_test.go b/builder/vmware/common/driver_esx5_test.go index ebe8a0f71..fd17fc73a 100644 --- a/builder/vmware/common/driver_esx5_test.go +++ b/builder/vmware/common/driver_esx5_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestESX5Driver_implDriver(t *testing.T) { diff --git a/builder/vmware/common/driver_fusion5.go b/builder/vmware/common/driver_fusion5.go index 02fdf8cf9..57f2bbda5 100644 --- a/builder/vmware/common/driver_fusion5.go +++ b/builder/vmware/common/driver_fusion5.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Fusion5Driver is a driver that can run VMware Fusion 5. diff --git a/builder/vmware/common/driver_mock.go b/builder/vmware/common/driver_mock.go index 9ece83841..66bac08af 100644 --- a/builder/vmware/common/driver_mock.go +++ b/builder/vmware/common/driver_mock.go @@ -4,7 +4,7 @@ import ( "net" "sync" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type DriverMock struct { diff --git a/builder/vmware/common/driver_player5.go b/builder/vmware/common/driver_player5.go index a8616c089..4ce3b5c7a 100644 --- a/builder/vmware/common/driver_player5.go +++ b/builder/vmware/common/driver_player5.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Player5Driver is a driver that can run VMware Player 5 on Linux. diff --git a/builder/vmware/common/driver_workstation9.go b/builder/vmware/common/driver_workstation9.go index c11733460..a64543b2e 100644 --- a/builder/vmware/common/driver_workstation9.go +++ b/builder/vmware/common/driver_workstation9.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Workstation9Driver is a driver that can run VMware Workstation 9 diff --git a/builder/vmware/common/ssh.go b/builder/vmware/common/ssh.go index 31e1a7eab..5f093605f 100644 --- a/builder/vmware/common/ssh.go +++ b/builder/vmware/common/ssh.go @@ -6,7 +6,7 @@ import ( "log" "net" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func CommHost(config *SSHConfig) func(multistep.StateBag) (string, error) { diff --git a/builder/vmware/common/step_clean_files.go b/builder/vmware/common/step_clean_files.go index a9644d225..93072441f 100644 --- a/builder/vmware/common/step_clean_files.go +++ b/builder/vmware/common/step_clean_files.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // These are the extensions of files that are important for the function diff --git a/builder/vmware/common/step_clean_vmx.go b/builder/vmware/common/step_clean_vmx.go index e913fa165..f89865a06 100644 --- a/builder/vmware/common/step_clean_vmx.go +++ b/builder/vmware/common/step_clean_vmx.go @@ -6,8 +6,8 @@ import ( "log" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step cleans up the VMX by removing or changing this prior to diff --git a/builder/vmware/common/step_clean_vmx_test.go b/builder/vmware/common/step_clean_vmx_test.go index 3987fb2c4..3ef263729 100644 --- a/builder/vmware/common/step_clean_vmx_test.go +++ b/builder/vmware/common/step_clean_vmx_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCleanVMX_impl(t *testing.T) { diff --git a/builder/vmware/common/step_compact_disk.go b/builder/vmware/common/step_compact_disk.go index 957f4a254..7605af6ca 100644 --- a/builder/vmware/common/step_compact_disk.go +++ b/builder/vmware/common/step_compact_disk.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step compacts the virtual disk for the VM unless the "skip_compaction" diff --git a/builder/vmware/common/step_compact_disk_test.go b/builder/vmware/common/step_compact_disk_test.go index df0fc5fca..575cd869d 100644 --- a/builder/vmware/common/step_compact_disk_test.go +++ b/builder/vmware/common/step_compact_disk_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCompactDisk_impl(t *testing.T) { diff --git a/builder/vmware/common/step_configure_vmx.go b/builder/vmware/common/step_configure_vmx.go index 833008291..68dc5709b 100644 --- a/builder/vmware/common/step_configure_vmx.go +++ b/builder/vmware/common/step_configure_vmx.go @@ -7,8 +7,8 @@ import ( "regexp" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step configures a VMX by setting some default settings as well diff --git a/builder/vmware/common/step_configure_vmx_test.go b/builder/vmware/common/step_configure_vmx_test.go index 09926acd7..136931161 100644 --- a/builder/vmware/common/step_configure_vmx_test.go +++ b/builder/vmware/common/step_configure_vmx_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" ) diff --git a/builder/vmware/common/step_configure_vnc.go b/builder/vmware/common/step_configure_vnc.go index 6cc7ad3a7..4b8823f4f 100644 --- a/builder/vmware/common/step_configure_vnc.go +++ b/builder/vmware/common/step_configure_vnc.go @@ -6,8 +6,8 @@ import ( "log" "math/rand" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/net" ) diff --git a/builder/vmware/common/step_create_disks.go b/builder/vmware/common/step_create_disks.go index 4bca0f453..6038f1234 100644 --- a/builder/vmware/common/step_create_disks.go +++ b/builder/vmware/common/step_create_disks.go @@ -6,8 +6,8 @@ import ( "log" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step creates the virtual disks for the VM. diff --git a/builder/vmware/common/step_create_disks_test.go b/builder/vmware/common/step_create_disks_test.go index 9fd0ad14d..9791fc026 100644 --- a/builder/vmware/common/step_create_disks_test.go +++ b/builder/vmware/common/step_create_disks_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" ) diff --git a/builder/vmware/common/step_export.go b/builder/vmware/common/step_export.go index 52ff1a210..4ab7b4431 100644 --- a/builder/vmware/common/step_export.go +++ b/builder/vmware/common/step_export.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step exports a VM built on ESXi using ovftool diff --git a/builder/vmware/common/step_export_test.go b/builder/vmware/common/step_export_test.go index 9c8b3f740..93c3fc276 100644 --- a/builder/vmware/common/step_export_test.go +++ b/builder/vmware/common/step_export_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" ) diff --git a/builder/vmware/common/step_http_ip_discover.go b/builder/vmware/common/step_http_ip_discover.go index 38928fb36..8d80ebe24 100644 --- a/builder/vmware/common/step_http_ip_discover.go +++ b/builder/vmware/common/step_http_ip_discover.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Step to discover the http ip diff --git a/builder/vmware/common/step_http_ip_discover_test.go b/builder/vmware/common/step_http_ip_discover_test.go index 5678bdd20..009f61972 100644 --- a/builder/vmware/common/step_http_ip_discover_test.go +++ b/builder/vmware/common/step_http_ip_discover_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepHTTPIPDiscover_Run(t *testing.T) { diff --git a/builder/vmware/common/step_output_dir.go b/builder/vmware/common/step_output_dir.go index f063e1f08..5123754d5 100644 --- a/builder/vmware/common/step_output_dir.go +++ b/builder/vmware/common/step_output_dir.go @@ -6,8 +6,8 @@ import ( "log" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepOutputDir sets up the output directory by creating it if it does diff --git a/builder/vmware/common/step_output_dir_test.go b/builder/vmware/common/step_output_dir_test.go index 51a5d9348..79610b7f7 100644 --- a/builder/vmware/common/step_output_dir_test.go +++ b/builder/vmware/common/step_output_dir_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testOutputDir(t *testing.T) string { diff --git a/builder/vmware/common/step_prepare_tools.go b/builder/vmware/common/step_prepare_tools.go index bd64f8885..3a1070070 100644 --- a/builder/vmware/common/step_prepare_tools.go +++ b/builder/vmware/common/step_prepare_tools.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepPrepareTools struct { diff --git a/builder/vmware/common/step_prepare_tools_test.go b/builder/vmware/common/step_prepare_tools_test.go index e70f7d43b..0e4db027b 100644 --- a/builder/vmware/common/step_prepare_tools_test.go +++ b/builder/vmware/common/step_prepare_tools_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepPrepareTools_impl(t *testing.T) { diff --git a/builder/vmware/common/step_register.go b/builder/vmware/common/step_register.go index 76de180f4..baf33268d 100644 --- a/builder/vmware/common/step_register.go +++ b/builder/vmware/common/step_register.go @@ -6,8 +6,8 @@ import ( "log" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepRegister struct { diff --git a/builder/vmware/common/step_register_test.go b/builder/vmware/common/step_register_test.go index a9bcc7b61..1d48f3486 100644 --- a/builder/vmware/common/step_register_test.go +++ b/builder/vmware/common/step_register_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepRegister_impl(t *testing.T) { diff --git a/builder/vmware/common/step_remote_upload.go b/builder/vmware/common/step_remote_upload.go index 8790c2659..c54ed9072 100644 --- a/builder/vmware/common/step_remote_upload.go +++ b/builder/vmware/common/step_remote_upload.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // stepRemoteUpload uploads some thing from the state bag to a remote driver diff --git a/builder/vmware/common/step_remote_upload_test.go b/builder/vmware/common/step_remote_upload_test.go index aab618f57..518f4dd7e 100644 --- a/builder/vmware/common/step_remote_upload_test.go +++ b/builder/vmware/common/step_remote_upload_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepRemoteUpload_Cleanup(t *testing.T) { diff --git a/builder/vmware/common/step_run.go b/builder/vmware/common/step_run.go index e9ac27331..090a36262 100644 --- a/builder/vmware/common/step_run.go +++ b/builder/vmware/common/step_run.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step runs the created virtual machine. diff --git a/builder/vmware/common/step_run_test.go b/builder/vmware/common/step_run_test.go index e89dcb1cf..176bdc8c5 100644 --- a/builder/vmware/common/step_run_test.go +++ b/builder/vmware/common/step_run_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepRun_impl(t *testing.T) { diff --git a/builder/vmware/common/step_shutdown.go b/builder/vmware/common/step_shutdown.go index 3c3855ab3..a75514a29 100644 --- a/builder/vmware/common/step_shutdown.go +++ b/builder/vmware/common/step_shutdown.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step shuts down the machine. It first attempts to do so gracefully, diff --git a/builder/vmware/common/step_shutdown_test.go b/builder/vmware/common/step_shutdown_test.go index 952a0914e..707de7012 100644 --- a/builder/vmware/common/step_shutdown_test.go +++ b/builder/vmware/common/step_shutdown_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testLocalOutputDir(t *testing.T) *LocalOutputDir { diff --git a/builder/vmware/common/step_suppress_messages.go b/builder/vmware/common/step_suppress_messages.go index 30e49fe8a..0ab45c27c 100644 --- a/builder/vmware/common/step_suppress_messages.go +++ b/builder/vmware/common/step_suppress_messages.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step suppresses any messages that VMware product might show. diff --git a/builder/vmware/common/step_suppress_messages_test.go b/builder/vmware/common/step_suppress_messages_test.go index 24044d470..ff5d1d767 100644 --- a/builder/vmware/common/step_suppress_messages_test.go +++ b/builder/vmware/common/step_suppress_messages_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepSuppressMessages_impl(t *testing.T) { diff --git a/builder/vmware/common/step_test.go b/builder/vmware/common/step_test.go index d1daffab5..56ba540c3 100644 --- a/builder/vmware/common/step_test.go +++ b/builder/vmware/common/step_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/vmware/common/step_upload_tools.go b/builder/vmware/common/step_upload_tools.go index 94f7072f4..5282a7191 100644 --- a/builder/vmware/common/step_upload_tools.go +++ b/builder/vmware/common/step_upload_tools.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/vmware/common/step_upload_vmx.go b/builder/vmware/common/step_upload_vmx.go index 861ab900e..764c3c439 100644 --- a/builder/vmware/common/step_upload_vmx.go +++ b/builder/vmware/common/step_upload_vmx.go @@ -5,8 +5,8 @@ import ( "fmt" "path/filepath" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // This step upload the VMX to the remote host diff --git a/builder/vmware/common/step_vnc_boot_command.go b/builder/vmware/common/step_vnc_boot_command.go index 5e7837d8b..5841ba4c2 100644 --- a/builder/vmware/common/step_vnc_boot_command.go +++ b/builder/vmware/common/step_vnc_boot_command.go @@ -6,9 +6,9 @@ import ( "log" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/go-vnc" ) diff --git a/builder/vmware/common/step_vnc_connect.go b/builder/vmware/common/step_vnc_connect.go index 7499c8279..85c3ab365 100644 --- a/builder/vmware/common/step_vnc_connect.go +++ b/builder/vmware/common/step_vnc_connect.go @@ -8,8 +8,8 @@ import ( "net" "net/url" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/mitchellh/go-vnc" "golang.org/x/net/websocket" ) diff --git a/builder/vmware/iso/builder.go b/builder/vmware/iso/builder.go index 4110e1778..e12edd4ee 100644 --- a/builder/vmware/iso/builder.go +++ b/builder/vmware/iso/builder.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) type Builder struct { diff --git a/builder/vmware/iso/config.go b/builder/vmware/iso/config.go index 508204a2d..9443394cd 100644 --- a/builder/vmware/iso/config.go +++ b/builder/vmware/iso/config.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/vmware/iso/step_create_vmx.go b/builder/vmware/iso/step_create_vmx.go index 4c67cabd6..e2dd96af9 100644 --- a/builder/vmware/iso/step_create_vmx.go +++ b/builder/vmware/iso/step_create_vmx.go @@ -10,8 +10,8 @@ import ( "strings" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) diff --git a/builder/vmware/vmx/builder.go b/builder/vmware/vmx/builder.go index d849dd613..fe6594e86 100644 --- a/builder/vmware/vmx/builder.go +++ b/builder/vmware/vmx/builder.go @@ -10,9 +10,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) // Builder implements packer.Builder and builds the actual VMware diff --git a/builder/vmware/vmx/config.go b/builder/vmware/vmx/config.go index f9f38e52e..2d613d138 100644 --- a/builder/vmware/vmx/config.go +++ b/builder/vmware/vmx/config.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/vmware/vmx/step_clone_vmx.go b/builder/vmware/vmx/step_clone_vmx.go index 174a98249..76bcdc73c 100644 --- a/builder/vmware/vmx/step_clone_vmx.go +++ b/builder/vmware/vmx/step_clone_vmx.go @@ -9,8 +9,8 @@ import ( "regexp" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) diff --git a/builder/vmware/vmx/step_clone_vmx_test.go b/builder/vmware/vmx/step_clone_vmx_test.go index da2828061..a3033c35b 100644 --- a/builder/vmware/vmx/step_clone_vmx_test.go +++ b/builder/vmware/vmx/step_clone_vmx_test.go @@ -9,7 +9,7 @@ import ( "testing" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" ) diff --git a/builder/vmware/vmx/step_test.go b/builder/vmware/vmx/step_test.go index 81439b3c4..a30b06418 100644 --- a/builder/vmware/vmx/step_test.go +++ b/builder/vmware/vmx/step_test.go @@ -5,8 +5,8 @@ import ( "testing" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/vsphere/clone/builder.go b/builder/vsphere/clone/builder.go index 18ebe85a1..cec0ee29d 100644 --- a/builder/vsphere/clone/builder.go +++ b/builder/vsphere/clone/builder.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/packer/builder/vsphere/common" "github.com/hashicorp/packer/builder/vsphere/driver" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) type Builder struct { diff --git a/builder/vsphere/clone/config.go b/builder/vsphere/clone/config.go index 8ac7a0f43..3de3be585 100644 --- a/builder/vsphere/clone/config.go +++ b/builder/vsphere/clone/config.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" packerCommon "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/vsphere/clone/step_clone.go b/builder/vsphere/clone/step_clone.go index e0a504b54..8a8ca1ccf 100644 --- a/builder/vsphere/clone/step_clone.go +++ b/builder/vsphere/clone/step_clone.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/packer/builder/vsphere/common" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type vAppConfig struct { diff --git a/builder/vsphere/clone/step_customize.go b/builder/vsphere/clone/step_customize.go index 109be74ae..e05cb38b4 100644 --- a/builder/vsphere/clone/step_customize.go +++ b/builder/vsphere/clone/step_customize.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/packer/builder/vsphere/driver" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/vmware/govmomi/vim25/types" ) diff --git a/builder/vsphere/common/cleanup_vm.go b/builder/vsphere/common/cleanup_vm.go index 51c76c571..c5055c5fc 100644 --- a/builder/vsphere/common/cleanup_vm.go +++ b/builder/vsphere/common/cleanup_vm.go @@ -2,8 +2,8 @@ package common import ( "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func CleanupVM(state multistep.StateBag) { diff --git a/builder/vsphere/common/cleanup_vm_test.go b/builder/vsphere/common/cleanup_vm_test.go index cdec04ab9..ad6bb3b02 100644 --- a/builder/vsphere/common/cleanup_vm_test.go +++ b/builder/vsphere/common/cleanup_vm_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func cleanupTestState(mockVM driver.VirtualMachine) multistep.StateBag { diff --git a/builder/vsphere/common/common_test.go b/builder/vsphere/common/common_test.go index 6242ca4b6..e96110ef7 100644 --- a/builder/vsphere/common/common_test.go +++ b/builder/vsphere/common/common_test.go @@ -4,8 +4,8 @@ import ( "bytes" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func basicStateBag(errorBuffer *strings.Builder) *multistep.BasicStateBag { diff --git a/builder/vsphere/common/config_ssh.go b/builder/vsphere/common/config_ssh.go index d4104a4e8..db6c5ea4c 100644 --- a/builder/vsphere/common/config_ssh.go +++ b/builder/vsphere/common/config_ssh.go @@ -1,7 +1,7 @@ package common import ( - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func CommHost(host string) func(multistep.StateBag) (string, error) { diff --git a/builder/vsphere/common/step_add_cdrom.go b/builder/vsphere/common/step_add_cdrom.go index d6a6f62b8..f272736dc 100644 --- a/builder/vsphere/common/step_add_cdrom.go +++ b/builder/vsphere/common/step_add_cdrom.go @@ -8,8 +8,8 @@ import ( "fmt" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type CDRomConfig struct { diff --git a/builder/vsphere/common/step_add_cdrom_test.go b/builder/vsphere/common/step_add_cdrom_test.go index e1116660c..c5752fec7 100644 --- a/builder/vsphere/common/step_add_cdrom_test.go +++ b/builder/vsphere/common/step_add_cdrom_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestCDRomConfig_Prepare(t *testing.T) { diff --git a/builder/vsphere/common/step_add_floppy.go b/builder/vsphere/common/step_add_floppy.go index 213f08429..c82b08850 100644 --- a/builder/vsphere/common/step_add_floppy.go +++ b/builder/vsphere/common/step_add_floppy.go @@ -8,8 +8,8 @@ import ( "fmt" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type FloppyConfig struct { diff --git a/builder/vsphere/common/step_add_floppy_test.go b/builder/vsphere/common/step_add_floppy_test.go index 52963526a..63f742fae 100644 --- a/builder/vsphere/common/step_add_floppy_test.go +++ b/builder/vsphere/common/step_add_floppy_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepAddFloppy_Run(t *testing.T) { diff --git a/builder/vsphere/common/step_boot_command.go b/builder/vsphere/common/step_boot_command.go index a0eff022a..8d6658ad9 100644 --- a/builder/vsphere/common/step_boot_command.go +++ b/builder/vsphere/common/step_boot_command.go @@ -7,9 +7,9 @@ import ( "time" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "golang.org/x/mobile/event/key" ) diff --git a/builder/vsphere/common/step_config_params.go b/builder/vsphere/common/step_config_params.go index 54e92082b..c317f25f5 100644 --- a/builder/vsphere/common/step_config_params.go +++ b/builder/vsphere/common/step_config_params.go @@ -10,8 +10,8 @@ import ( "github.com/vmware/govmomi/vim25/types" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type ConfigParamsConfig struct { diff --git a/builder/vsphere/common/step_connect.go b/builder/vsphere/common/step_connect.go index b651eda06..e67762976 100644 --- a/builder/vsphere/common/step_connect.go +++ b/builder/vsphere/common/step_connect.go @@ -8,7 +8,7 @@ import ( "fmt" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type ConnectConfig struct { diff --git a/builder/vsphere/common/step_download.go b/builder/vsphere/common/step_download.go index 25b980356..5b1adbda6 100644 --- a/builder/vsphere/common/step_download.go +++ b/builder/vsphere/common/step_download.go @@ -6,8 +6,8 @@ import ( "net/url" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Defining this interface ensures that we use the common step download, or the diff --git a/builder/vsphere/common/step_download_test.go b/builder/vsphere/common/step_download_test.go index 631006655..fd7a8a0ca 100644 --- a/builder/vsphere/common/step_download_test.go +++ b/builder/vsphere/common/step_download_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) /// create mock step diff --git a/builder/vsphere/common/step_export.go b/builder/vsphere/common/step_export.go index c6a01c5a7..d3c857304 100644 --- a/builder/vsphere/common/step_export.go +++ b/builder/vsphere/common/step_export.go @@ -17,9 +17,9 @@ import ( "strings" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/pkg/errors" "github.com/vmware/govmomi/nfc" diff --git a/builder/vsphere/common/step_hardware.go b/builder/vsphere/common/step_hardware.go index 43f0f60d3..654a4145d 100644 --- a/builder/vsphere/common/step_hardware.go +++ b/builder/vsphere/common/step_hardware.go @@ -8,8 +8,8 @@ import ( "fmt" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type HardwareConfig struct { diff --git a/builder/vsphere/common/step_hardware_test.go b/builder/vsphere/common/step_hardware_test.go index 08eb22c50..e3b965bfe 100644 --- a/builder/vsphere/common/step_hardware_test.go +++ b/builder/vsphere/common/step_hardware_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestHardwareConfig_Prepare(t *testing.T) { diff --git a/builder/vsphere/common/step_http_ip_discover.go b/builder/vsphere/common/step_http_ip_discover.go index 0168ddf1b..c0d6e8cd0 100644 --- a/builder/vsphere/common/step_http_ip_discover.go +++ b/builder/vsphere/common/step_http_ip_discover.go @@ -5,7 +5,7 @@ import ( "fmt" "net" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Step to discover the http ip diff --git a/builder/vsphere/common/step_http_ip_discover_test.go b/builder/vsphere/common/step_http_ip_discover_test.go index a4225774f..1f03353eb 100644 --- a/builder/vsphere/common/step_http_ip_discover_test.go +++ b/builder/vsphere/common/step_http_ip_discover_test.go @@ -5,7 +5,7 @@ import ( "net" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepHTTPIPDiscover_Run(t *testing.T) { diff --git a/builder/vsphere/common/step_import_to_content_library.go b/builder/vsphere/common/step_import_to_content_library.go index 91720389c..9eacdd5ec 100644 --- a/builder/vsphere/common/step_import_to_content_library.go +++ b/builder/vsphere/common/step_import_to_content_library.go @@ -7,8 +7,8 @@ import ( "fmt" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/vmware/govmomi/vapi/vcenter" ) diff --git a/builder/vsphere/common/step_remote_upload.go b/builder/vsphere/common/step_remote_upload.go index 413d0c051..631ab0924 100644 --- a/builder/vsphere/common/step_remote_upload.go +++ b/builder/vsphere/common/step_remote_upload.go @@ -7,8 +7,8 @@ import ( "path/filepath" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepRemoteUpload struct { diff --git a/builder/vsphere/common/step_remote_upload_test.go b/builder/vsphere/common/step_remote_upload_test.go index 44188dbfe..c1f5ef7c9 100644 --- a/builder/vsphere/common/step_remote_upload_test.go +++ b/builder/vsphere/common/step_remote_upload_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepRemoteUpload_Run(t *testing.T) { diff --git a/builder/vsphere/common/step_remove_cdrom.go b/builder/vsphere/common/step_remove_cdrom.go index 00bd6dc94..c3920ec29 100644 --- a/builder/vsphere/common/step_remove_cdrom.go +++ b/builder/vsphere/common/step_remove_cdrom.go @@ -7,8 +7,8 @@ import ( "context" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type RemoveCDRomConfig struct { diff --git a/builder/vsphere/common/step_remove_cdrom_test.go b/builder/vsphere/common/step_remove_cdrom_test.go index 1017e48b0..2442ab796 100644 --- a/builder/vsphere/common/step_remove_cdrom_test.go +++ b/builder/vsphere/common/step_remove_cdrom_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepRemoveCDRom_Run(t *testing.T) { diff --git a/builder/vsphere/common/step_remove_floppy.go b/builder/vsphere/common/step_remove_floppy.go index 7141e04b9..4662c18b4 100644 --- a/builder/vsphere/common/step_remove_floppy.go +++ b/builder/vsphere/common/step_remove_floppy.go @@ -4,8 +4,8 @@ import ( "context" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepRemoveFloppy struct { diff --git a/builder/vsphere/common/step_remove_floppy_test.go b/builder/vsphere/common/step_remove_floppy_test.go index 1b76bb0fa..86a3e33b5 100644 --- a/builder/vsphere/common/step_remove_floppy_test.go +++ b/builder/vsphere/common/step_remove_floppy_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepRemoveFloppy_Run(t *testing.T) { diff --git a/builder/vsphere/common/step_run.go b/builder/vsphere/common/step_run.go index 9fcdadb1e..9262cb31e 100644 --- a/builder/vsphere/common/step_run.go +++ b/builder/vsphere/common/step_run.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type RunConfig struct { diff --git a/builder/vsphere/common/step_shutdown.go b/builder/vsphere/common/step_shutdown.go index 8c71cc2d3..089aba26f 100644 --- a/builder/vsphere/common/step_shutdown.go +++ b/builder/vsphere/common/step_shutdown.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/packer/builder/vsphere/driver" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type ShutdownConfig struct { diff --git a/builder/vsphere/common/step_snapshot.go b/builder/vsphere/common/step_snapshot.go index 09a698698..ed595621d 100644 --- a/builder/vsphere/common/step_snapshot.go +++ b/builder/vsphere/common/step_snapshot.go @@ -4,8 +4,8 @@ import ( "context" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCreateSnapshot struct { diff --git a/builder/vsphere/common/step_ssh_key_pair.go b/builder/vsphere/common/step_ssh_key_pair.go index 643d4f09c..3b2769461 100644 --- a/builder/vsphere/common/step_ssh_key_pair.go +++ b/builder/vsphere/common/step_ssh_key_pair.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/packer/builder/vsphere/driver" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/helper/ssh" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/vsphere/common/step_template.go b/builder/vsphere/common/step_template.go index 96dc57408..91c14ff58 100644 --- a/builder/vsphere/common/step_template.go +++ b/builder/vsphere/common/step_template.go @@ -4,8 +4,8 @@ import ( "context" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepConvertToTemplate struct { diff --git a/builder/vsphere/common/step_wait_for_ip.go b/builder/vsphere/common/step_wait_for_ip.go index d3ddb4ee8..9a37534c4 100644 --- a/builder/vsphere/common/step_wait_for_ip.go +++ b/builder/vsphere/common/step_wait_for_ip.go @@ -11,8 +11,8 @@ import ( "time" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type WaitIpConfig struct { diff --git a/builder/vsphere/iso/builder.go b/builder/vsphere/iso/builder.go index 5db736fea..837f4d7a6 100644 --- a/builder/vsphere/iso/builder.go +++ b/builder/vsphere/iso/builder.go @@ -7,9 +7,9 @@ import ( "github.com/hashicorp/packer/builder/vsphere/common" "github.com/hashicorp/packer/builder/vsphere/driver" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) type Builder struct { diff --git a/builder/vsphere/iso/common_test.go b/builder/vsphere/iso/common_test.go index 583660a92..531e9dd73 100644 --- a/builder/vsphere/iso/common_test.go +++ b/builder/vsphere/iso/common_test.go @@ -3,8 +3,8 @@ package iso import ( "bytes" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func basicStateBag() *multistep.BasicStateBag { diff --git a/builder/vsphere/iso/config.go b/builder/vsphere/iso/config.go index 21e78b58e..e3bb7849b 100644 --- a/builder/vsphere/iso/config.go +++ b/builder/vsphere/iso/config.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" packerCommon "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/vsphere/iso/step_create.go b/builder/vsphere/iso/step_create.go index fa47f284f..562d2cf24 100644 --- a/builder/vsphere/iso/step_create.go +++ b/builder/vsphere/iso/step_create.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/packer/builder/vsphere/common" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Defines a Network Adapter diff --git a/builder/vsphere/iso/step_create_test.go b/builder/vsphere/iso/step_create_test.go index dbe530778..aca46d155 100644 --- a/builder/vsphere/iso/step_create_test.go +++ b/builder/vsphere/iso/step_create_test.go @@ -11,8 +11,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/hashicorp/packer/builder/vsphere/common" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestCreateConfig_Prepare(t *testing.T) { diff --git a/builder/yandex/builder.go b/builder/yandex/builder.go index 590579173..bbde04e84 100644 --- a/builder/yandex/builder.go +++ b/builder/yandex/builder.go @@ -7,9 +7,9 @@ import ( "github.com/google/uuid" "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" "github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1" diff --git a/builder/yandex/ssh.go b/builder/yandex/ssh.go index c32f16b53..ffebeab41 100644 --- a/builder/yandex/ssh.go +++ b/builder/yandex/ssh.go @@ -1,7 +1,7 @@ package yandex import ( - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func commHost(state multistep.StateBag) (string, error) { diff --git a/builder/yandex/step_create_image.go b/builder/yandex/step_create_image.go index 86ad11371..429888a92 100644 --- a/builder/yandex/step_create_image.go +++ b/builder/yandex/step_create_image.go @@ -6,8 +6,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" "github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1" diff --git a/builder/yandex/step_create_instance.go b/builder/yandex/step_create_instance.go index 2ae35f71d..757b24c2a 100644 --- a/builder/yandex/step_create_instance.go +++ b/builder/yandex/step_create_instance.go @@ -7,8 +7,8 @@ import ( "io/ioutil" "github.com/c2h5oh/datasize" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" diff --git a/builder/yandex/step_create_instance_test.go b/builder/yandex/step_create_instance_test.go index af8ee67af..b0f9cf6d7 100644 --- a/builder/yandex/step_create_instance_test.go +++ b/builder/yandex/step_create_instance_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/builder/yandex/step_create_ssh_key.go b/builder/yandex/step_create_ssh_key.go index 1a66af9f9..19178848a 100644 --- a/builder/yandex/step_create_ssh_key.go +++ b/builder/yandex/step_create_ssh_key.go @@ -10,8 +10,8 @@ import ( "io/ioutil" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "golang.org/x/crypto/ssh" ) diff --git a/builder/yandex/step_instance_info.go b/builder/yandex/step_instance_info.go index fa85c052d..3e7f0e3d5 100644 --- a/builder/yandex/step_instance_info.go +++ b/builder/yandex/step_instance_info.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1" ycsdk "github.com/yandex-cloud/go-sdk" diff --git a/builder/yandex/step_teardown_instance.go b/builder/yandex/step_teardown_instance.go index 291fa004e..0d34afe21 100644 --- a/builder/yandex/step_teardown_instance.go +++ b/builder/yandex/step_teardown_instance.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1" ycsdk "github.com/yandex-cloud/go-sdk" diff --git a/builder/yandex/step_wait_cloudinit_script.go b/builder/yandex/step_wait_cloudinit_script.go index dcfdccd6e..593def95c 100644 --- a/builder/yandex/step_wait_cloudinit_script.go +++ b/builder/yandex/step_wait_cloudinit_script.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/retry" ) diff --git a/builder/yandex/util.go b/builder/yandex/util.go index 9c10aa842..f11905f5a 100644 --- a/builder/yandex/util.go +++ b/builder/yandex/util.go @@ -2,8 +2,8 @@ package yandex import ( "github.com/c2h5oh/datasize" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func stepHaltWithError(state multistep.StateBag, err error) multistep.StepAction { diff --git a/helper/communicator/comm_host.go b/helper/communicator/comm_host.go index 8bebcc888..6c7e55eb5 100644 --- a/helper/communicator/comm_host.go +++ b/helper/communicator/comm_host.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Generic commHost function that should work for most cloud builders. diff --git a/helper/communicator/config.go b/helper/communicator/config.go index 62b0fafde..25b1e074f 100644 --- a/helper/communicator/config.go +++ b/helper/communicator/config.go @@ -13,9 +13,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" helperssh "github.com/hashicorp/packer/helper/ssh" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" packerssh "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/masterzen/winrm" diff --git a/helper/communicator/config_test.go b/helper/communicator/config_test.go index a6bbba87f..6eed1848f 100644 --- a/helper/communicator/config_test.go +++ b/helper/communicator/config_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/masterzen/winrm" ) diff --git a/helper/communicator/step_connect.go b/helper/communicator/step_connect.go index 6fed68d23..8ecaa6b0e 100644 --- a/helper/communicator/step_connect.go +++ b/helper/communicator/step_connect.go @@ -6,8 +6,8 @@ import ( "log" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/none" gossh "golang.org/x/crypto/ssh" ) diff --git a/helper/communicator/step_connect_ssh.go b/helper/communicator/step_connect_ssh.go index 80ccf3422..7e6edb05c 100644 --- a/helper/communicator/step_connect_ssh.go +++ b/helper/communicator/step_connect_ssh.go @@ -13,9 +13,9 @@ import ( "golang.org/x/crypto/ssh/terminal" - "github.com/hashicorp/packer/helper/multistep" helperssh "github.com/hashicorp/packer/helper/ssh" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh" gossh "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" diff --git a/helper/communicator/step_connect_test.go b/helper/communicator/step_connect_test.go index fb61f6463..e31741b86 100644 --- a/helper/communicator/step_connect_test.go +++ b/helper/communicator/step_connect_test.go @@ -5,8 +5,8 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepConnect_impl(t *testing.T) { diff --git a/helper/communicator/step_connect_winrm.go b/helper/communicator/step_connect_winrm.go index 21c6fef7b..62d248701 100644 --- a/helper/communicator/step_connect_winrm.go +++ b/helper/communicator/step_connect_winrm.go @@ -13,8 +13,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/winrm" winrmcmd "github.com/masterzen/winrm" "golang.org/x/net/http/httpproxy" diff --git a/helper/communicator/step_debug_ssh_keys.go b/helper/communicator/step_debug_ssh_keys.go index e6623fdf1..cd67e0641 100644 --- a/helper/communicator/step_debug_ssh_keys.go +++ b/helper/communicator/step_debug_ssh_keys.go @@ -5,8 +5,8 @@ import ( "fmt" "io/ioutil" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepDumpSSHKey is a multistep Step implementation that writes the ssh diff --git a/helper/communicator/step_ssh_keygen.go b/helper/communicator/step_ssh_keygen.go index 3bdf2899b..73e340529 100644 --- a/helper/communicator/step_ssh_keygen.go +++ b/helper/communicator/step_ssh_keygen.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/packer/helper/communicator/sshkey" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepSSHKeyGen is a Packer build step that generates SSH key pairs. diff --git a/packer-plugin-sdk/chroot/cleanup.go b/packer-plugin-sdk/chroot/cleanup.go index 0befac174..37691305a 100644 --- a/packer-plugin-sdk/chroot/cleanup.go +++ b/packer-plugin-sdk/chroot/cleanup.go @@ -1,7 +1,7 @@ package chroot import ( - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // Cleanup is an interface that some steps implement for early cleanup. diff --git a/packer-plugin-sdk/chroot/step_chroot_provision.go b/packer-plugin-sdk/chroot/step_chroot_provision.go index 5c0ab810a..e3e9030a7 100644 --- a/packer-plugin-sdk/chroot/step_chroot_provision.go +++ b/packer-plugin-sdk/chroot/step_chroot_provision.go @@ -4,10 +4,10 @@ import ( "context" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) // StepChrootProvision provisions the instance within a chroot. diff --git a/packer-plugin-sdk/chroot/step_copy_files.go b/packer-plugin-sdk/chroot/step_copy_files.go index a4f71f84f..1d2efa7cf 100644 --- a/packer-plugin-sdk/chroot/step_copy_files.go +++ b/packer-plugin-sdk/chroot/step_copy_files.go @@ -8,9 +8,9 @@ import ( "path/filepath" "runtime" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepCopyFiles copies some files from the host into the chroot environment. diff --git a/packer-plugin-sdk/chroot/step_copy_files_test.go b/packer-plugin-sdk/chroot/step_copy_files_test.go index 40d5e46f4..e5ebabc85 100644 --- a/packer-plugin-sdk/chroot/step_copy_files_test.go +++ b/packer-plugin-sdk/chroot/step_copy_files_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // testUI returns a test ui plus a function to retrieve the errors written to the ui diff --git a/packer-plugin-sdk/chroot/step_early_cleanup.go b/packer-plugin-sdk/chroot/step_early_cleanup.go index 42d7d66c5..e84ac77e2 100644 --- a/packer-plugin-sdk/chroot/step_early_cleanup.go +++ b/packer-plugin-sdk/chroot/step_early_cleanup.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepEarlyCleanup performs some of the cleanup steps early in order to diff --git a/packer-plugin-sdk/chroot/step_mount_extra.go b/packer-plugin-sdk/chroot/step_mount_extra.go index f3f194f9b..8d460718c 100644 --- a/packer-plugin-sdk/chroot/step_mount_extra.go +++ b/packer-plugin-sdk/chroot/step_mount_extra.go @@ -8,9 +8,9 @@ import ( "os/exec" "syscall" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepMountExtra mounts the attached device. diff --git a/packer-plugin-sdk/chroot/step_post_mount_commands.go b/packer-plugin-sdk/chroot/step_post_mount_commands.go index 4391795f5..d6ee85968 100644 --- a/packer-plugin-sdk/chroot/step_post_mount_commands.go +++ b/packer-plugin-sdk/chroot/step_post_mount_commands.go @@ -3,9 +3,9 @@ package chroot import ( "context" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type postMountCommandsData struct { diff --git a/packer-plugin-sdk/chroot/step_pre_mount_commands.go b/packer-plugin-sdk/chroot/step_pre_mount_commands.go index c71ad96c7..20404659f 100644 --- a/packer-plugin-sdk/chroot/step_pre_mount_commands.go +++ b/packer-plugin-sdk/chroot/step_pre_mount_commands.go @@ -3,9 +3,9 @@ package chroot import ( "context" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type preMountCommandsData struct { diff --git a/helper/multistep/LICENSE.md b/packer-plugin-sdk/multistep/LICENSE.md similarity index 100% rename from helper/multistep/LICENSE.md rename to packer-plugin-sdk/multistep/LICENSE.md diff --git a/helper/multistep/basic_runner.go b/packer-plugin-sdk/multistep/basic_runner.go similarity index 100% rename from helper/multistep/basic_runner.go rename to packer-plugin-sdk/multistep/basic_runner.go diff --git a/helper/multistep/basic_runner_test.go b/packer-plugin-sdk/multistep/basic_runner_test.go similarity index 100% rename from helper/multistep/basic_runner_test.go rename to packer-plugin-sdk/multistep/basic_runner_test.go diff --git a/packer-plugin-sdk/commonsteps/doc.go b/packer-plugin-sdk/multistep/commonsteps/doc.go similarity index 100% rename from packer-plugin-sdk/commonsteps/doc.go rename to packer-plugin-sdk/multistep/commonsteps/doc.go diff --git a/packer-plugin-sdk/commonsteps/extra_iso_config.go b/packer-plugin-sdk/multistep/commonsteps/extra_iso_config.go similarity index 100% rename from packer-plugin-sdk/commonsteps/extra_iso_config.go rename to packer-plugin-sdk/multistep/commonsteps/extra_iso_config.go diff --git a/packer-plugin-sdk/commonsteps/extra_iso_config_test.go b/packer-plugin-sdk/multistep/commonsteps/extra_iso_config_test.go similarity index 100% rename from packer-plugin-sdk/commonsteps/extra_iso_config_test.go rename to packer-plugin-sdk/multistep/commonsteps/extra_iso_config_test.go diff --git a/packer-plugin-sdk/commonsteps/floppy_config.go b/packer-plugin-sdk/multistep/commonsteps/floppy_config.go similarity index 100% rename from packer-plugin-sdk/commonsteps/floppy_config.go rename to packer-plugin-sdk/multistep/commonsteps/floppy_config.go diff --git a/packer-plugin-sdk/commonsteps/floppy_config_test.go b/packer-plugin-sdk/multistep/commonsteps/floppy_config_test.go similarity index 100% rename from packer-plugin-sdk/commonsteps/floppy_config_test.go rename to packer-plugin-sdk/multistep/commonsteps/floppy_config_test.go diff --git a/packer-plugin-sdk/commonsteps/http_config.go b/packer-plugin-sdk/multistep/commonsteps/http_config.go similarity index 100% rename from packer-plugin-sdk/commonsteps/http_config.go rename to packer-plugin-sdk/multistep/commonsteps/http_config.go diff --git a/packer-plugin-sdk/commonsteps/http_config_test.go b/packer-plugin-sdk/multistep/commonsteps/http_config_test.go similarity index 100% rename from packer-plugin-sdk/commonsteps/http_config_test.go rename to packer-plugin-sdk/multistep/commonsteps/http_config_test.go diff --git a/packer-plugin-sdk/commonsteps/iso_config.go b/packer-plugin-sdk/multistep/commonsteps/iso_config.go similarity index 100% rename from packer-plugin-sdk/commonsteps/iso_config.go rename to packer-plugin-sdk/multistep/commonsteps/iso_config.go diff --git a/packer-plugin-sdk/commonsteps/iso_config_test.go b/packer-plugin-sdk/multistep/commonsteps/iso_config_test.go similarity index 100% rename from packer-plugin-sdk/commonsteps/iso_config_test.go rename to packer-plugin-sdk/multistep/commonsteps/iso_config_test.go diff --git a/packer-plugin-sdk/commonsteps/multistep_debug.go b/packer-plugin-sdk/multistep/commonsteps/multistep_debug.go similarity index 94% rename from packer-plugin-sdk/commonsteps/multistep_debug.go rename to packer-plugin-sdk/multistep/commonsteps/multistep_debug.go index 9ef48f4d4..74b45a61c 100644 --- a/packer-plugin-sdk/commonsteps/multistep_debug.go +++ b/packer-plugin-sdk/multistep/commonsteps/multistep_debug.go @@ -5,8 +5,8 @@ import ( "log" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // MultistepDebugFn will return a proper multistep.DebugPauseFn to diff --git a/packer-plugin-sdk/commonsteps/multistep_runner.go b/packer-plugin-sdk/multistep/commonsteps/multistep_runner.go similarity index 98% rename from packer-plugin-sdk/commonsteps/multistep_runner.go rename to packer-plugin-sdk/multistep/commonsteps/multistep_runner.go index 7eecffbe4..d9654cc6c 100644 --- a/packer-plugin-sdk/commonsteps/multistep_runner.go +++ b/packer-plugin-sdk/multistep/commonsteps/multistep_runner.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func newRunner(steps []multistep.Step, config common.PackerConfig, ui packer.Ui) (multistep.Runner, multistep.DebugPauseFn) { diff --git a/packer-plugin-sdk/commonsteps/step_cleanup_temp_keys.go b/packer-plugin-sdk/multistep/commonsteps/step_cleanup_temp_keys.go similarity index 97% rename from packer-plugin-sdk/commonsteps/step_cleanup_temp_keys.go rename to packer-plugin-sdk/multistep/commonsteps/step_cleanup_temp_keys.go index aa1c7c4f8..0bb41c342 100644 --- a/packer-plugin-sdk/commonsteps/step_cleanup_temp_keys.go +++ b/packer-plugin-sdk/multistep/commonsteps/step_cleanup_temp_keys.go @@ -6,8 +6,8 @@ import ( "log" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type StepCleanupTempKeys struct { diff --git a/packer-plugin-sdk/commonsteps/step_create_cdrom.go b/packer-plugin-sdk/multistep/commonsteps/step_create_cdrom.go similarity index 99% rename from packer-plugin-sdk/commonsteps/step_create_cdrom.go rename to packer-plugin-sdk/multistep/commonsteps/step_create_cdrom.go index 151468514..0729ae09c 100644 --- a/packer-plugin-sdk/commonsteps/step_create_cdrom.go +++ b/packer-plugin-sdk/multistep/commonsteps/step_create_cdrom.go @@ -11,8 +11,8 @@ import ( "runtime" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/shell-local/localexec" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) diff --git a/packer-plugin-sdk/commonsteps/step_create_cdrom_test.go b/packer-plugin-sdk/multistep/commonsteps/step_create_cdrom_test.go similarity index 97% rename from packer-plugin-sdk/commonsteps/step_create_cdrom_test.go rename to packer-plugin-sdk/multistep/commonsteps/step_create_cdrom_test.go index cfdf05404..efec6b9fc 100644 --- a/packer-plugin-sdk/commonsteps/step_create_cdrom_test.go +++ b/packer-plugin-sdk/multistep/commonsteps/step_create_cdrom_test.go @@ -8,8 +8,8 @@ import ( "path" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreateCD_Impl(t *testing.T) { diff --git a/packer-plugin-sdk/commonsteps/step_create_floppy.go b/packer-plugin-sdk/multistep/commonsteps/step_create_floppy.go similarity index 99% rename from packer-plugin-sdk/commonsteps/step_create_floppy.go rename to packer-plugin-sdk/multistep/commonsteps/step_create_floppy.go index dd6d07218..5354143df 100644 --- a/packer-plugin-sdk/commonsteps/step_create_floppy.go +++ b/packer-plugin-sdk/multistep/commonsteps/step_create_floppy.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" "github.com/mitchellh/go-fs" "github.com/mitchellh/go-fs/fat" diff --git a/packer-plugin-sdk/commonsteps/step_create_floppy_test.go b/packer-plugin-sdk/multistep/commonsteps/step_create_floppy_test.go similarity index 99% rename from packer-plugin-sdk/commonsteps/step_create_floppy_test.go rename to packer-plugin-sdk/multistep/commonsteps/step_create_floppy_test.go index 78bc135d7..d4cde0c94 100644 --- a/packer-plugin-sdk/commonsteps/step_create_floppy_test.go +++ b/packer-plugin-sdk/multistep/commonsteps/step_create_floppy_test.go @@ -12,8 +12,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) const TestFixtures = "test-fixtures" diff --git a/packer-plugin-sdk/commonsteps/step_download.go b/packer-plugin-sdk/multistep/commonsteps/step_download.go similarity index 99% rename from packer-plugin-sdk/commonsteps/step_download.go rename to packer-plugin-sdk/multistep/commonsteps/step_download.go index b90bd3ef3..36a38ae7c 100644 --- a/packer-plugin-sdk/commonsteps/step_download.go +++ b/packer-plugin-sdk/multistep/commonsteps/step_download.go @@ -17,9 +17,9 @@ import ( getter "github.com/hashicorp/go-getter/v2" urlhelper "github.com/hashicorp/go-getter/v2/helper/url" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/filelock" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepDownload downloads a remote file using the download client within diff --git a/packer-plugin-sdk/commonsteps/step_download_test.go b/packer-plugin-sdk/multistep/commonsteps/step_download_test.go similarity index 99% rename from packer-plugin-sdk/commonsteps/step_download_test.go rename to packer-plugin-sdk/multistep/commonsteps/step_download_test.go index 35e60ddf1..77ae98a68 100644 --- a/packer-plugin-sdk/commonsteps/step_download_test.go +++ b/packer-plugin-sdk/multistep/commonsteps/step_download_test.go @@ -17,8 +17,8 @@ import ( "github.com/google/go-cmp/cmp" urlhelper "github.com/hashicorp/go-getter/v2/helper/url" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) diff --git a/packer-plugin-sdk/commonsteps/step_http_server.go b/packer-plugin-sdk/multistep/commonsteps/step_http_server.go similarity index 96% rename from packer-plugin-sdk/commonsteps/step_http_server.go rename to packer-plugin-sdk/multistep/commonsteps/step_http_server.go index f2c1e08c0..6da16718e 100644 --- a/packer-plugin-sdk/commonsteps/step_http_server.go +++ b/packer-plugin-sdk/multistep/commonsteps/step_http_server.go @@ -6,8 +6,8 @@ import ( "net/http" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/net" ) diff --git a/packer-plugin-sdk/commonsteps/step_output_dir.go b/packer-plugin-sdk/multistep/commonsteps/step_output_dir.go similarity index 96% rename from packer-plugin-sdk/commonsteps/step_output_dir.go rename to packer-plugin-sdk/multistep/commonsteps/step_output_dir.go index 2dbdda596..c1e43716a 100644 --- a/packer-plugin-sdk/commonsteps/step_output_dir.go +++ b/packer-plugin-sdk/multistep/commonsteps/step_output_dir.go @@ -8,8 +8,8 @@ import ( "path/filepath" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepOutputDir sets up the output directory by creating it if it does diff --git a/packer-plugin-sdk/commonsteps/step_output_dir_test.go b/packer-plugin-sdk/multistep/commonsteps/step_output_dir_test.go similarity index 98% rename from packer-plugin-sdk/commonsteps/step_output_dir_test.go rename to packer-plugin-sdk/multistep/commonsteps/step_output_dir_test.go index cf658e8a1..f10e2ddd3 100644 --- a/packer-plugin-sdk/commonsteps/step_output_dir_test.go +++ b/packer-plugin-sdk/multistep/commonsteps/step_output_dir_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testState(t *testing.T) multistep.StateBag { diff --git a/packer-plugin-sdk/commonsteps/step_provision.go b/packer-plugin-sdk/multistep/commonsteps/step_provision.go similarity index 98% rename from packer-plugin-sdk/commonsteps/step_provision.go rename to packer-plugin-sdk/multistep/commonsteps/step_provision.go index 1ec20e365..9b7cc47e2 100644 --- a/packer-plugin-sdk/commonsteps/step_provision.go +++ b/packer-plugin-sdk/multistep/commonsteps/step_provision.go @@ -9,8 +9,8 @@ import ( "time" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) // StepProvision runs the provisioners. diff --git a/packer-plugin-sdk/commonsteps/step_provision_test.go b/packer-plugin-sdk/multistep/commonsteps/step_provision_test.go similarity index 98% rename from packer-plugin-sdk/commonsteps/step_provision_test.go rename to packer-plugin-sdk/multistep/commonsteps/step_provision_test.go index ddca131fe..903fea023 100644 --- a/packer-plugin-sdk/commonsteps/step_provision_test.go +++ b/packer-plugin-sdk/multistep/commonsteps/step_provision_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func testCommConfig() *communicator.Config { diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/SomeDir/myfile.txt b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/SomeDir/myfile.txt similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/SomeDir/myfile.txt rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/SomeDir/myfile.txt diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-0/file1 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-0/file1 similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-0/file1 rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-0/file1 diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-0/file2 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-0/file2 similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-0/file2 rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-0/file2 diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-0/file3 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-0/file3 similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-0/file3 rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-0/file3 diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file1 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file1 similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file1 rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file1 diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file2 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file2 similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file2 rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file2 diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file3 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file3 similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file3 rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file3 diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir1/file1 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir1/file1 similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir1/file1 rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir1/file1 diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1 similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1 rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1 diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2 similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2 rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2 diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1 similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1 rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1 diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2 similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2 rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2 diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/root/another.txt b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/another.txt similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/root/another.txt rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/another.txt diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/root/another.txt.sha1sum b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/another.txt.sha1sum similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/root/another.txt.sha1sum rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/another.txt.sha1sum diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/root/basic.txt b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/basic.txt similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/root/basic.txt rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/basic.txt diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/root/basic.txt.sha1sum b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/basic.txt.sha1sum similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/root/basic.txt.sha1sum rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/basic.txt.sha1sum diff --git a/packer-plugin-sdk/commonsteps/test-fixtures/root/subfolder.sum b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/subfolder.sum similarity index 100% rename from packer-plugin-sdk/commonsteps/test-fixtures/root/subfolder.sum rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/subfolder.sum diff --git a/helper/multistep/debug_runner.go b/packer-plugin-sdk/multistep/debug_runner.go similarity index 100% rename from helper/multistep/debug_runner.go rename to packer-plugin-sdk/multistep/debug_runner.go diff --git a/helper/multistep/debug_runner_test.go b/packer-plugin-sdk/multistep/debug_runner_test.go similarity index 100% rename from helper/multistep/debug_runner_test.go rename to packer-plugin-sdk/multistep/debug_runner_test.go diff --git a/helper/multistep/doc.go b/packer-plugin-sdk/multistep/doc.go similarity index 100% rename from helper/multistep/doc.go rename to packer-plugin-sdk/multistep/doc.go diff --git a/helper/multistep/if.go b/packer-plugin-sdk/multistep/if.go similarity index 100% rename from helper/multistep/if.go rename to packer-plugin-sdk/multistep/if.go diff --git a/helper/multistep/multistep.go b/packer-plugin-sdk/multistep/multistep.go similarity index 100% rename from helper/multistep/multistep.go rename to packer-plugin-sdk/multistep/multistep.go diff --git a/helper/multistep/multistep_test.go b/packer-plugin-sdk/multistep/multistep_test.go similarity index 100% rename from helper/multistep/multistep_test.go rename to packer-plugin-sdk/multistep/multistep_test.go diff --git a/helper/multistep/statebag.go b/packer-plugin-sdk/multistep/statebag.go similarity index 100% rename from helper/multistep/statebag.go rename to packer-plugin-sdk/multistep/statebag.go diff --git a/helper/multistep/statebag_test.go b/packer-plugin-sdk/multistep/statebag_test.go similarity index 100% rename from helper/multistep/statebag_test.go rename to packer-plugin-sdk/multistep/statebag_test.go diff --git a/packer-plugin-sdk/packerbuilderdata/generated_data.go b/packer-plugin-sdk/packerbuilderdata/generated_data.go index 932627297..c8b986081 100644 --- a/packer-plugin-sdk/packerbuilderdata/generated_data.go +++ b/packer-plugin-sdk/packerbuilderdata/generated_data.go @@ -1,6 +1,6 @@ package packerbuilderdata -import "github.com/hashicorp/packer/helper/multistep" +import "github.com/hashicorp/packer/packer-plugin-sdk/multistep" // This is used in the BasicPlaceholderData() func in the packer/provisioner.go // To force users to access generated data via the "generated" func. diff --git a/packer-plugin-sdk/packerbuilderdata/generated_data_test.go b/packer-plugin-sdk/packerbuilderdata/generated_data_test.go index 6cd5761f8..001754f76 100644 --- a/packer-plugin-sdk/packerbuilderdata/generated_data_test.go +++ b/packer-plugin-sdk/packerbuilderdata/generated_data_test.go @@ -3,7 +3,7 @@ package packerbuilderdata import ( "testing" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestGeneratedData_Put(t *testing.T) { diff --git a/packer-plugin-sdk/shell-local/run.go b/packer-plugin-sdk/shell-local/run.go index 4713b0827..8e52f5a09 100644 --- a/packer-plugin-sdk/shell-local/run.go +++ b/packer-plugin-sdk/shell-local/run.go @@ -12,7 +12,7 @@ import ( "strings" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) diff --git a/post-processor/googlecompute-export/post-processor.go b/post-processor/googlecompute-export/post-processor.go index c5707266c..3f8b6071a 100644 --- a/post-processor/googlecompute-export/post-processor.go +++ b/post-processor/googlecompute-export/post-processor.go @@ -13,10 +13,10 @@ import ( "github.com/hashicorp/packer/builder/googlecompute" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" ) diff --git a/post-processor/vagrant-cloud/post-processor.go b/post-processor/vagrant-cloud/post-processor.go index 8c91d5f3a..dfc74e8ad 100644 --- a/post-processor/vagrant-cloud/post-processor.go +++ b/post-processor/vagrant-cloud/post-processor.go @@ -20,10 +20,10 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/post-processor/vagrant-cloud/step_confirm_upload.go b/post-processor/vagrant-cloud/step_confirm_upload.go index 6216f5be3..e338fcf8f 100644 --- a/post-processor/vagrant-cloud/step_confirm_upload.go +++ b/post-processor/vagrant-cloud/step_confirm_upload.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepConfirmUpload struct { diff --git a/post-processor/vagrant-cloud/step_create_provider.go b/post-processor/vagrant-cloud/step_create_provider.go index da0c297e3..a6cfaa02f 100644 --- a/post-processor/vagrant-cloud/step_create_provider.go +++ b/post-processor/vagrant-cloud/step_create_provider.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type Provider struct { diff --git a/post-processor/vagrant-cloud/step_create_version.go b/post-processor/vagrant-cloud/step_create_version.go index 6830dc4a4..75bd3f0a4 100644 --- a/post-processor/vagrant-cloud/step_create_version.go +++ b/post-processor/vagrant-cloud/step_create_version.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type Version struct { diff --git a/post-processor/vagrant-cloud/step_prepare_upload.go b/post-processor/vagrant-cloud/step_prepare_upload.go index fcf8b46eb..463b5afbc 100644 --- a/post-processor/vagrant-cloud/step_prepare_upload.go +++ b/post-processor/vagrant-cloud/step_prepare_upload.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type Upload struct { diff --git a/post-processor/vagrant-cloud/step_release_version.go b/post-processor/vagrant-cloud/step_release_version.go index 18ec9efd7..d8e41a05a 100644 --- a/post-processor/vagrant-cloud/step_release_version.go +++ b/post-processor/vagrant-cloud/step_release_version.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type stepReleaseVersion struct { diff --git a/post-processor/vagrant-cloud/step_upload.go b/post-processor/vagrant-cloud/step_upload.go index ef0b59d19..669011520 100644 --- a/post-processor/vagrant-cloud/step_upload.go +++ b/post-processor/vagrant-cloud/step_upload.go @@ -7,8 +7,8 @@ import ( "net/http" "time" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/retry" ) diff --git a/post-processor/vagrant-cloud/step_verify_box.go b/post-processor/vagrant-cloud/step_verify_box.go index 573815986..4cf25a62e 100644 --- a/post-processor/vagrant-cloud/step_verify_box.go +++ b/post-processor/vagrant-cloud/step_verify_box.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type Box struct { diff --git a/post-processor/vsphere-template/post-processor.go b/post-processor/vsphere-template/post-processor.go index 017529604..437a90dfb 100644 --- a/post-processor/vsphere-template/post-processor.go +++ b/post-processor/vsphere-template/post-processor.go @@ -14,10 +14,10 @@ import ( vmwcommon "github.com/hashicorp/packer/builder/vmware/common" vsphere "github.com/hashicorp/packer/builder/vsphere/common" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" vspherepost "github.com/hashicorp/packer/post-processor/vsphere" diff --git a/post-processor/vsphere-template/step_choose_datacenter.go b/post-processor/vsphere-template/step_choose_datacenter.go index f7ba17803..0dd9f8b55 100644 --- a/post-processor/vsphere-template/step_choose_datacenter.go +++ b/post-processor/vsphere-template/step_choose_datacenter.go @@ -3,8 +3,8 @@ package vsphere_template import ( "context" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/vmware/govmomi" "github.com/vmware/govmomi/find" ) diff --git a/post-processor/vsphere-template/step_create_folder.go b/post-processor/vsphere-template/step_create_folder.go index 181cca0a7..8d16506ac 100644 --- a/post-processor/vsphere-template/step_create_folder.go +++ b/post-processor/vsphere-template/step_create_folder.go @@ -5,8 +5,8 @@ import ( "fmt" "path" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/vmware/govmomi" "github.com/vmware/govmomi/object" ) diff --git a/post-processor/vsphere-template/step_create_snapshot.go b/post-processor/vsphere-template/step_create_snapshot.go index 7fd0bdde1..6a091e841 100644 --- a/post-processor/vsphere-template/step_create_snapshot.go +++ b/post-processor/vsphere-template/step_create_snapshot.go @@ -4,8 +4,8 @@ import ( "context" "strings" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/post-processor/vsphere" "github.com/vmware/govmomi" ) diff --git a/post-processor/vsphere-template/step_mark_as_template.go b/post-processor/vsphere-template/step_mark_as_template.go index 4bb231c88..664b60e9b 100644 --- a/post-processor/vsphere-template/step_mark_as_template.go +++ b/post-processor/vsphere-template/step_mark_as_template.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/post-processor/vsphere" "github.com/vmware/govmomi" "github.com/vmware/govmomi/object" diff --git a/post-processor/yandex-export/post-processor.go b/post-processor/yandex-export/post-processor.go index 48bf1b30e..0586f6009 100644 --- a/post-processor/yandex-export/post-processor.go +++ b/post-processor/yandex-export/post-processor.go @@ -14,10 +14,10 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/yandex" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" diff --git a/post-processor/yandex-export/post-processor_test.go b/post-processor/yandex-export/post-processor_test.go index 83f2cb8b8..ac5e850a0 100644 --- a/post-processor/yandex-export/post-processor_test.go +++ b/post-processor/yandex-export/post-processor_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/packer/builder/yandex" "github.com/stretchr/testify/require" - "github.com/hashicorp/packer/helper/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestPostProcessor_Configure(t *testing.T) { diff --git a/provisioner/ansible/provisioner.go b/provisioner/ansible/provisioner.go index a0e5318ba..3cf28ce8a 100644 --- a/provisioner/ansible/provisioner.go +++ b/provisioner/ansible/provisioner.go @@ -34,7 +34,7 @@ import ( "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/adapter" "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) diff --git a/provisioner/ansible/provisioner_test.go b/provisioner/ansible/provisioner_test.go index b3ebb2380..076ebd2c9 100644 --- a/provisioner/ansible/provisioner_test.go +++ b/provisioner/ansible/provisioner_test.go @@ -16,7 +16,7 @@ import ( confighelper "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/stretchr/testify/assert" ) diff --git a/provisioner/powershell/provisioner.go b/provisioner/powershell/provisioner.go index 843093005..cb7d03da5 100644 --- a/provisioner/powershell/provisioner.go +++ b/provisioner/powershell/provisioner.go @@ -19,8 +19,8 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/guestexec" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/retry" "github.com/hashicorp/packer/packer-plugin-sdk/shell" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" diff --git a/provisioner/powershell/provisioner_test.go b/provisioner/powershell/provisioner_test.go index 6d395d285..e5611385b 100644 --- a/provisioner/powershell/provisioner_test.go +++ b/provisioner/powershell/provisioner_test.go @@ -12,7 +12,7 @@ import ( "time" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/stretchr/testify/assert" ) diff --git a/provisioner/shell/provisioner.go b/provisioner/shell/provisioner.go index 90db6131c..826d0f99f 100644 --- a/provisioner/shell/provisioner.go +++ b/provisioner/shell/provisioner.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/retry" "github.com/hashicorp/packer/packer-plugin-sdk/shell" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" diff --git a/provisioner/shell/provisioner_test.go b/provisioner/shell/provisioner_test.go index e6bc5a9d4..8f88bcc53 100644 --- a/provisioner/shell/provisioner_test.go +++ b/provisioner/shell/provisioner_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) func testConfig() map[string]interface{} { diff --git a/provisioner/windows-shell/provisioner.go b/provisioner/windows-shell/provisioner.go index 5fc36f9c6..28b633e69 100644 --- a/provisioner/windows-shell/provisioner.go +++ b/provisioner/windows-shell/provisioner.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/retry" "github.com/hashicorp/packer/packer-plugin-sdk/shell" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" diff --git a/provisioner/windows-shell/provisioner_test.go b/provisioner/windows-shell/provisioner_test.go index 378e22d46..1e33eb639 100644 --- a/provisioner/windows-shell/provisioner_test.go +++ b/provisioner/windows-shell/provisioner_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" ) func testConfig() map[string]interface{} {