From 9e47696dffc36af5501615505c9bef7902963315 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Wed, 18 Nov 2020 10:34:59 -0800 Subject: [PATCH] move helper/config to bundle with the other template definitions --- builder/alicloud/ecs/builder.go | 2 +- builder/alicloud/ecs/builder_test.go | 2 +- builder/alicloud/ecs/image_config.go | 2 +- builder/alicloud/ecs/run_config.go | 2 +- builder/alicloud/ecs/step_create_instance.go | 2 +- builder/alicloud/ecs/step_region_copy_image.go | 2 +- builder/amazon/chroot/builder.go | 2 +- builder/amazon/chroot/step_register_ami.go | 2 +- builder/amazon/common/ami_config.go | 2 +- builder/amazon/common/ami_config_test.go | 2 +- builder/amazon/common/block_device.go | 2 +- builder/amazon/common/block_device_test.go | 2 +- builder/amazon/common/step_ami_region_copy.go | 2 +- builder/amazon/common/step_ami_region_copy_test.go | 2 +- builder/amazon/common/step_modify_ebs_instance.go | 2 +- builder/amazon/common/step_source_ami_info.go | 2 +- builder/amazon/ebs/builder.go | 2 +- builder/amazon/ebssurrogate/builder.go | 2 +- builder/amazon/ebssurrogate/step_register_ami.go | 2 +- builder/amazon/ebsvolume/builder.go | 2 +- builder/amazon/instance/builder.go | 2 +- builder/amazon/instance/step_register_ami.go | 2 +- builder/azure/arm/config.go | 2 +- builder/azure/chroot/builder.go | 2 +- builder/azure/dtl/config.go | 2 +- builder/cloudstack/config.go | 2 +- builder/digitalocean/config.go | 2 +- builder/docker/config.go | 2 +- builder/file/config.go | 2 +- builder/googlecompute/config.go | 2 +- builder/googlecompute/step_create_instance_test.go | 2 +- builder/googlecompute/step_wait_startup_script_test.go | 2 +- builder/hcloud/config.go | 2 +- builder/hyperone/config.go | 2 +- builder/hyperv/iso/builder.go | 2 +- builder/hyperv/vmcx/builder.go | 2 +- builder/jdcloud/builder.go | 2 +- builder/linode/config.go | 2 +- builder/lxc/config.go | 2 +- builder/lxd/config.go | 2 +- builder/ncloud/config.go | 2 +- builder/null/config.go | 2 +- builder/oneandone/config.go | 2 +- builder/openstack/builder.go | 2 +- builder/oracle/classic/config.go | 2 +- builder/oracle/oci/config.go | 2 +- builder/osc/bsu/builder.go | 2 +- builder/osc/bsusurrogate/builder.go | 2 +- builder/osc/bsuvolume/builder.go | 2 +- builder/osc/chroot/builder.go | 2 +- builder/parallels/iso/builder.go | 2 +- builder/parallels/pvm/config.go | 2 +- builder/profitbricks/config.go | 2 +- builder/proxmox/clone/config.go | 2 +- builder/proxmox/common/config.go | 2 +- builder/qemu/config.go | 2 +- builder/scaleway/config.go | 2 +- builder/tencentcloud/cvm/builder.go | 2 +- builder/triton/builder.go | 2 +- builder/ucloud/uhost/builder.go | 2 +- builder/vagrant/builder.go | 2 +- builder/virtualbox/iso/builder.go | 2 +- builder/virtualbox/ovf/config.go | 2 +- builder/virtualbox/vm/config.go | 2 +- builder/vmware/common/driver_esx5_test.go | 2 +- builder/vmware/iso/config.go | 2 +- builder/vmware/vmx/config.go | 2 +- builder/vsphere/clone/config.go | 2 +- builder/vsphere/clone/step_customize.go | 2 +- builder/vsphere/iso/config.go | 2 +- builder/yandex/config.go | 2 +- hcl2template/common_test.go | 2 +- hcl2template/internal/mock.go | 2 +- helper/communicator/config.go | 2 +- packer-plugin-sdk/shell-local/config.go | 2 +- {helper => packer-plugin-sdk/template}/config/custom_types.go | 0 .../template}/config/custom_types_test.go | 0 {helper => packer-plugin-sdk/template}/config/decode.go | 0 {helper => packer-plugin-sdk/template}/config/decode_test.go | 0 .../template}/config/deprecated_options.go | 0 packer/core_test.go | 2 +- post-processor/alicloud-import/post-processor.go | 2 +- post-processor/amazon-import/post-processor.go | 2 +- post-processor/artifice/post-processor.go | 2 +- post-processor/checksum/post-processor.go | 2 +- post-processor/compress/post-processor.go | 2 +- post-processor/digitalocean-import/post-processor.go | 2 +- post-processor/docker-import/post-processor.go | 2 +- post-processor/docker-push/post-processor.go | 2 +- post-processor/docker-save/post-processor.go | 2 +- post-processor/docker-tag/post-processor.go | 2 +- post-processor/exoscale-import/post-processor.go | 2 +- post-processor/googlecompute-export/post-processor.go | 2 +- post-processor/googlecompute-import/post-processor.go | 2 +- post-processor/manifest/post-processor.go | 2 +- post-processor/ucloud-import/post-processor.go | 2 +- post-processor/vagrant-cloud/post-processor.go | 2 +- post-processor/vagrant/post-processor.go | 2 +- post-processor/vsphere-template/post-processor.go | 2 +- post-processor/vsphere-template/step_mark_as_template.go | 2 +- post-processor/vsphere/post-processor.go | 2 +- post-processor/yandex-export/post-processor.go | 2 +- post-processor/yandex-import/post-processor.go | 2 +- provisioner/ansible-local/provisioner.go | 2 +- provisioner/ansible/provisioner.go | 2 +- provisioner/ansible/provisioner_test.go | 2 +- provisioner/azure-dtlartifact/provisioner.go | 2 +- provisioner/breakpoint/provisioner.go | 2 +- provisioner/chef-client/provisioner.go | 2 +- provisioner/chef-solo/provisioner.go | 2 +- provisioner/converge/provisioner.go | 2 +- provisioner/file/provisioner.go | 2 +- provisioner/inspec/provisioner.go | 2 +- provisioner/powershell/provisioner.go | 2 +- provisioner/puppet-masterless/provisioner.go | 2 +- provisioner/puppet-server/provisioner.go | 2 +- provisioner/salt-masterless/provisioner.go | 2 +- provisioner/shell/provisioner.go | 2 +- provisioner/sleep/provisioner.go | 2 +- provisioner/windows-restart/provisioner.go | 2 +- provisioner/windows-shell/provisioner.go | 2 +- 121 files changed, 116 insertions(+), 116 deletions(-) rename {helper => packer-plugin-sdk/template}/config/custom_types.go (100%) rename {helper => packer-plugin-sdk/template}/config/custom_types_test.go (100%) rename {helper => packer-plugin-sdk/template}/config/decode.go (100%) rename {helper => packer-plugin-sdk/template}/config/decode_test.go (100%) rename {helper => packer-plugin-sdk/template}/config/deprecated_options.go (100%) diff --git a/builder/alicloud/ecs/builder.go b/builder/alicloud/ecs/builder.go index f509767ca..9fc5f679f 100644 --- a/builder/alicloud/ecs/builder.go +++ b/builder/alicloud/ecs/builder.go @@ -10,11 +10,11 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "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/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/alicloud/ecs/builder_test.go b/builder/alicloud/ecs/builder_test.go index 9a691de77..9b92a5c5d 100644 --- a/builder/alicloud/ecs/builder_test.go +++ b/builder/alicloud/ecs/builder_test.go @@ -4,8 +4,8 @@ import ( "reflect" "testing" - helperconfig "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + helperconfig "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) func testBuilderConfig() map[string]interface{} { diff --git a/builder/alicloud/ecs/image_config.go b/builder/alicloud/ecs/image_config.go index 575a1c1c5..37eb06ce5 100644 --- a/builder/alicloud/ecs/image_config.go +++ b/builder/alicloud/ecs/image_config.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/hashicorp/packer/hcl2template" - "github.com/hashicorp/packer/helper/config" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/alicloud/ecs/run_config.go b/builder/alicloud/ecs/run_config.go index a8988bb0a..f9450ed15 100644 --- a/builder/alicloud/ecs/run_config.go +++ b/builder/alicloud/ecs/run_config.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "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 da6696e25..0d9958d40 100644 --- a/builder/alicloud/ecs/step_create_instance.go +++ b/builder/alicloud/ecs/step_create_instance.go @@ -12,9 +12,9 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests" "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/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) type stepCreateAlicloudInstance struct { diff --git a/builder/alicloud/ecs/step_region_copy_image.go b/builder/alicloud/ecs/step_region_copy_image.go index c0ec5e3f3..6905b179d 100644 --- a/builder/alicloud/ecs/step_region_copy_image.go +++ b/builder/alicloud/ecs/step_region_copy_image.go @@ -7,9 +7,9 @@ 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/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) type stepRegionCopyAlicloudImage struct { diff --git a/builder/amazon/chroot/builder.go b/builder/amazon/chroot/builder.go index 8964ec157..43cbd64ce 100644 --- a/builder/amazon/chroot/builder.go +++ b/builder/amazon/chroot/builder.go @@ -16,13 +16,13 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/hcl2template" - "github.com/hashicorp/packer/helper/config" "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/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/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/chroot/step_register_ami.go b/builder/amazon/chroot/step_register_ami.go index 628a62f7b..74f10e271 100644 --- a/builder/amazon/chroot/step_register_ami.go +++ b/builder/amazon/chroot/step_register_ami.go @@ -7,10 +7,10 @@ import ( "github.com/aws/aws-sdk-go/aws" "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/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/random" + confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) // StepRegisterAMI creates the AMI. diff --git a/builder/amazon/common/ami_config.go b/builder/amazon/common/ami_config.go index 2675a2d4f..338f69f2c 100644 --- a/builder/amazon/common/ami_config.go +++ b/builder/amazon/common/ami_config.go @@ -8,7 +8,7 @@ import ( "regexp" "github.com/hashicorp/packer/hcl2template" - "github.com/hashicorp/packer/helper/config" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/common/ami_config_test.go b/builder/amazon/common/ami_config_test.go index 2448965db..5764a6045 100644 --- a/builder/amazon/common/ami_config_test.go +++ b/builder/amazon/common/ami_config_test.go @@ -8,7 +8,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" - "github.com/hashicorp/packer/helper/config" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) func testAMIConfig() *AMIConfig { diff --git a/builder/amazon/common/block_device.go b/builder/amazon/common/block_device.go index 5c2ae01d3..55654de14 100644 --- a/builder/amazon/common/block_device.go +++ b/builder/amazon/common/block_device.go @@ -9,7 +9,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/helper/config" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/common/block_device_test.go b/builder/amazon/common/block_device_test.go index b434ca02b..3d7e55fd7 100644 --- a/builder/amazon/common/block_device_test.go +++ b/builder/amazon/common/block_device_test.go @@ -6,7 +6,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/packer/helper/config" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) func TestBlockDevice(t *testing.T) { diff --git a/builder/amazon/common/step_ami_region_copy.go b/builder/amazon/common/step_ami_region_copy.go index 01a9bea21..1395b3f80 100644 --- a/builder/amazon/common/step_ami_region_copy.go +++ b/builder/amazon/common/step_ami_region_copy.go @@ -8,9 +8,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) 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 93e370307..a9f511a61 100644 --- a/builder/amazon/common/step_ami_region_copy_test.go +++ b/builder/amazon/common/step_ami_region_copy_test.go @@ -11,9 +11,9 @@ 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/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) // Define a mock struct to be used in unit tests for common aws steps. diff --git a/builder/amazon/common/step_modify_ebs_instance.go b/builder/amazon/common/step_modify_ebs_instance.go index e3a08e5d0..a578bcb24 100644 --- a/builder/amazon/common/step_modify_ebs_instance.go +++ b/builder/amazon/common/step_modify_ebs_instance.go @@ -7,9 +7,9 @@ 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/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) type StepModifyEBSBackedInstance struct { diff --git a/builder/amazon/common/step_source_ami_info.go b/builder/amazon/common/step_source_ami_info.go index 53b609dc7..3c387a1c0 100644 --- a/builder/amazon/common/step_source_ami_info.go +++ b/builder/amazon/common/step_source_ami_info.go @@ -8,9 +8,9 @@ import ( "time" "github.com/aws/aws-sdk-go/service/ec2" - confighelper "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) // StepSourceAMIInfo extracts critical information from the source AMI diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go index 5c37146f0..2179d3d14 100644 --- a/builder/amazon/ebs/builder.go +++ b/builder/amazon/ebs/builder.go @@ -18,12 +18,12 @@ import ( awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" - "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/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/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/ebssurrogate/builder.go b/builder/amazon/ebssurrogate/builder.go index 53073100c..305c87c91 100644 --- a/builder/amazon/ebssurrogate/builder.go +++ b/builder/amazon/ebssurrogate/builder.go @@ -16,12 +16,12 @@ import ( awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" - "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/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/config" "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 69a696a7f..66865250f 100644 --- a/builder/amazon/ebssurrogate/step_register_ami.go +++ b/builder/amazon/ebssurrogate/step_register_ami.go @@ -7,10 +7,10 @@ import ( "github.com/aws/aws-sdk-go/aws" "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/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/random" + confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) // StepRegisterAMI creates the AMI. diff --git a/builder/amazon/ebsvolume/builder.go b/builder/amazon/ebsvolume/builder.go index 7bd18bd3e..1f52bc872 100644 --- a/builder/amazon/ebsvolume/builder.go +++ b/builder/amazon/ebsvolume/builder.go @@ -15,12 +15,12 @@ import ( awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" - "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/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/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/amazon/instance/builder.go b/builder/amazon/instance/builder.go index ebd9ad339..6a706b0ae 100644 --- a/builder/amazon/instance/builder.go +++ b/builder/amazon/instance/builder.go @@ -17,12 +17,12 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/helper/communicator" - "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/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/config" "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 513baa4bd..10992c1cc 100644 --- a/builder/amazon/instance/step_register_ami.go +++ b/builder/amazon/instance/step_register_ami.go @@ -7,10 +7,10 @@ import ( "github.com/aws/aws-sdk-go/aws" "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/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/random" + confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) type StepRegisterAMI struct { diff --git a/builder/azure/arm/config.go b/builder/azure/arm/config.go index ef70b38c9..6ba3a662a 100644 --- a/builder/azure/arm/config.go +++ b/builder/azure/arm/config.go @@ -30,9 +30,9 @@ import ( "github.com/hashicorp/packer/builder/azure/pkcs12" "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "golang.org/x/crypto/ssh" diff --git a/builder/azure/chroot/builder.go b/builder/azure/chroot/builder.go index 6387e5603..58e146d3e 100644 --- a/builder/azure/chroot/builder.go +++ b/builder/azure/chroot/builder.go @@ -18,12 +18,12 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" 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/packer" "github.com/hashicorp/packer/packer-plugin-sdk/chroot" "github.com/hashicorp/packer/packer-plugin-sdk/common" "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/config" "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/dtl/config.go b/builder/azure/dtl/config.go index 7268fc612..fdb960905 100644 --- a/builder/azure/dtl/config.go +++ b/builder/azure/dtl/config.go @@ -25,9 +25,9 @@ import ( "github.com/hashicorp/packer/builder/azure/pkcs12" "github.com/hashicorp/packer/helper/communicator" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "golang.org/x/crypto/ssh" diff --git a/builder/cloudstack/config.go b/builder/cloudstack/config.go index 99adfa718..0d05c3325 100644 --- a/builder/cloudstack/config.go +++ b/builder/cloudstack/config.go @@ -10,10 +10,10 @@ import ( "time" "github.com/hashicorp/packer/helper/communicator" - "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/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/builder/digitalocean/config.go b/builder/digitalocean/config.go index ee67b8bdc..9f68ca001 100644 --- a/builder/digitalocean/config.go +++ b/builder/digitalocean/config.go @@ -11,9 +11,9 @@ import ( "time" "github.com/hashicorp/packer/helper/communicator" - "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/template/config" "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/docker/config.go b/builder/docker/config.go index 463f13dfd..5fe0e8b54 100644 --- a/builder/docker/config.go +++ b/builder/docker/config.go @@ -8,9 +8,9 @@ import ( "os" "github.com/hashicorp/packer/helper/communicator" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/builder/file/config.go b/builder/file/config.go index d5ddedd8a..5560f73e5 100644 --- a/builder/file/config.go +++ b/builder/file/config.go @@ -5,9 +5,9 @@ package file import ( "fmt" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/googlecompute/config.go b/builder/googlecompute/config.go index 9cc372f07..cdf4581e5 100644 --- a/builder/googlecompute/config.go +++ b/builder/googlecompute/config.go @@ -12,9 +12,9 @@ import ( "time" "github.com/hashicorp/packer/helper/communicator" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" compute "google.golang.org/api/compute/v1" diff --git a/builder/googlecompute/step_create_instance_test.go b/builder/googlecompute/step_create_instance_test.go index 791c6ffbe..42fa74d8c 100644 --- a/builder/googlecompute/step_create_instance_test.go +++ b/builder/googlecompute/step_create_instance_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/stretchr/testify/assert" ) diff --git a/builder/googlecompute/step_wait_startup_script_test.go b/builder/googlecompute/step_wait_startup_script_test.go index d22fbbd61..0e783f8dd 100644 --- a/builder/googlecompute/step_wait_startup_script_test.go +++ b/builder/googlecompute/step_wait_startup_script_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/stretchr/testify/assert" ) diff --git a/builder/hcloud/config.go b/builder/hcloud/config.go index 5bdee0ee7..55d31e799 100644 --- a/builder/hcloud/config.go +++ b/builder/hcloud/config.go @@ -9,10 +9,10 @@ import ( "time" "github.com/hashicorp/packer/helper/communicator" - "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/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "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/hyperone/config.go b/builder/hyperone/config.go index 4b5b5ee06..78a5ede64 100644 --- a/builder/hyperone/config.go +++ b/builder/hyperone/config.go @@ -12,11 +12,11 @@ import ( "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" - "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/json" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "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/hyperv/iso/builder.go b/builder/hyperv/iso/builder.go index dcbdae5af..b5df8e57c 100644 --- a/builder/hyperv/iso/builder.go +++ b/builder/hyperv/iso/builder.go @@ -14,13 +14,13 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" hypervcommon "github.com/hashicorp/packer/builder/hyperv/common" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "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/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/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/hyperv/vmcx/builder.go b/builder/hyperv/vmcx/builder.go index 8c57ad792..ad91ec126 100644 --- a/builder/hyperv/vmcx/builder.go +++ b/builder/hyperv/vmcx/builder.go @@ -14,13 +14,13 @@ import ( hypervcommon "github.com/hashicorp/packer/builder/hyperv/common" 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/packer" "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" "github.com/hashicorp/packer/packer-plugin-sdk/common" "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/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/jdcloud/builder.go b/builder/jdcloud/builder.go index c226ca01b..8dc291b6f 100644 --- a/builder/jdcloud/builder.go +++ b/builder/jdcloud/builder.go @@ -6,10 +6,10 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "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/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/linode/config.go b/builder/linode/config.go index a66a180d7..f749fa113 100644 --- a/builder/linode/config.go +++ b/builder/linode/config.go @@ -12,9 +12,9 @@ import ( "time" "github.com/hashicorp/packer/helper/communicator" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/lxc/config.go b/builder/lxc/config.go index f7cfa8ee7..c02187794 100644 --- a/builder/lxc/config.go +++ b/builder/lxc/config.go @@ -8,9 +8,9 @@ import ( "os" "time" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/builder/lxd/config.go b/builder/lxd/config.go index 0369158b2..f737d283b 100644 --- a/builder/lxd/config.go +++ b/builder/lxd/config.go @@ -6,9 +6,9 @@ package lxd import ( "fmt" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/builder/ncloud/config.go b/builder/ncloud/config.go index d3fd8ec61..9db019e74 100644 --- a/builder/ncloud/config.go +++ b/builder/ncloud/config.go @@ -11,9 +11,9 @@ import ( "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" "github.com/hashicorp/packer/helper/communicator" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/null/config.go b/builder/null/config.go index 62f82e04f..500cb0674 100644 --- a/builder/null/config.go +++ b/builder/null/config.go @@ -6,9 +6,9 @@ import ( "fmt" "github.com/hashicorp/packer/helper/communicator" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/oneandone/config.go b/builder/oneandone/config.go index 66c49b87f..c11e2e925 100644 --- a/builder/oneandone/config.go +++ b/builder/oneandone/config.go @@ -9,9 +9,9 @@ import ( "github.com/1and1/oneandone-cloudserver-sdk-go" "github.com/hashicorp/packer/helper/communicator" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/builder/openstack/builder.go b/builder/openstack/builder.go index ddc9adad6..a61b1d547 100644 --- a/builder/openstack/builder.go +++ b/builder/openstack/builder.go @@ -11,11 +11,11 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "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/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/oracle/classic/config.go b/builder/oracle/classic/config.go index fcb28a527..a463fe787 100644 --- a/builder/oracle/classic/config.go +++ b/builder/oracle/classic/config.go @@ -10,9 +10,9 @@ import ( "time" "github.com/hashicorp/packer/helper/communicator" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/oracle/oci/config.go b/builder/oracle/oci/config.go index 20096d9d5..4f2ca5e50 100644 --- a/builder/oracle/oci/config.go +++ b/builder/oracle/oci/config.go @@ -14,9 +14,9 @@ import ( "strings" "github.com/hashicorp/packer/helper/communicator" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ocicommon "github.com/oracle/oci-go-sdk/common" ociauth "github.com/oracle/oci-go-sdk/common/auth" diff --git a/builder/osc/bsu/builder.go b/builder/osc/bsu/builder.go index 5d0d1124a..0f05b93ad 100644 --- a/builder/osc/bsu/builder.go +++ b/builder/osc/bsu/builder.go @@ -14,11 +14,11 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" osccommon "github.com/hashicorp/packer/builder/osc/common" "github.com/hashicorp/packer/helper/communicator" - "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/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/osc/bsusurrogate/builder.go b/builder/osc/bsusurrogate/builder.go index dde2cf8d7..b4e2f2db2 100644 --- a/builder/osc/bsusurrogate/builder.go +++ b/builder/osc/bsusurrogate/builder.go @@ -12,11 +12,11 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" osccommon "github.com/hashicorp/packer/builder/osc/common" "github.com/hashicorp/packer/helper/communicator" - "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/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/osc/bsuvolume/builder.go b/builder/osc/bsuvolume/builder.go index 57a78253c..05a2f9c43 100644 --- a/builder/osc/bsuvolume/builder.go +++ b/builder/osc/bsuvolume/builder.go @@ -12,11 +12,11 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" osccommon "github.com/hashicorp/packer/builder/osc/common" "github.com/hashicorp/packer/helper/communicator" - "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/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/osc/chroot/builder.go b/builder/osc/chroot/builder.go index 7d049385f..7740bc357 100644 --- a/builder/osc/chroot/builder.go +++ b/builder/osc/chroot/builder.go @@ -13,11 +13,11 @@ 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/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "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/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/parallels/iso/builder.go b/builder/parallels/iso/builder.go index ff67ebddd..0fa823f0a 100644 --- a/builder/parallels/iso/builder.go +++ b/builder/parallels/iso/builder.go @@ -11,13 +11,13 @@ 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/config" "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/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/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/parallels/pvm/config.go b/builder/parallels/pvm/config.go index 3b5aafdce..27e7b5a43 100644 --- a/builder/parallels/pvm/config.go +++ b/builder/parallels/pvm/config.go @@ -8,12 +8,12 @@ import ( "os" parallelscommon "github.com/hashicorp/packer/builder/parallels/common" - "github.com/hashicorp/packer/helper/config" "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/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/profitbricks/config.go b/builder/profitbricks/config.go index ccecb3e68..3c9b994d3 100644 --- a/builder/profitbricks/config.go +++ b/builder/profitbricks/config.go @@ -7,9 +7,9 @@ import ( "os" "github.com/hashicorp/packer/helper/communicator" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/builder/proxmox/clone/config.go b/builder/proxmox/clone/config.go index e9a8721d6..01fa6971d 100644 --- a/builder/proxmox/clone/config.go +++ b/builder/proxmox/clone/config.go @@ -4,8 +4,8 @@ package proxmoxclone import ( proxmox "github.com/hashicorp/packer/builder/proxmox/common" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) type Config struct { diff --git a/builder/proxmox/common/config.go b/builder/proxmox/common/config.go index 66d17a318..916b3fdb7 100644 --- a/builder/proxmox/common/config.go +++ b/builder/proxmox/common/config.go @@ -12,11 +12,11 @@ import ( "time" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "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/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "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/qemu/config.go b/builder/qemu/config.go index 358a26589..cc0814667 100644 --- a/builder/qemu/config.go +++ b/builder/qemu/config.go @@ -13,12 +13,12 @@ import ( "runtime" "strings" - "github.com/hashicorp/packer/helper/config" "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/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/scaleway/config.go b/builder/scaleway/config.go index 7411d33b7..58a62b949 100644 --- a/builder/scaleway/config.go +++ b/builder/scaleway/config.go @@ -11,10 +11,10 @@ import ( "github.com/hashicorp/packer/builder/scaleway/version" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/useragent" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "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/tencentcloud/cvm/builder.go b/builder/tencentcloud/cvm/builder.go index 18e86175b..ecdfde864 100644 --- a/builder/tencentcloud/cvm/builder.go +++ b/builder/tencentcloud/cvm/builder.go @@ -8,11 +8,11 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "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/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/triton/builder.go b/builder/triton/builder.go index 26d1274cd..ca41cb270 100644 --- a/builder/triton/builder.go +++ b/builder/triton/builder.go @@ -6,10 +6,10 @@ import ( "github.com/hashicorp/go-multierror" "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "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/config" ) const ( diff --git a/builder/ucloud/uhost/builder.go b/builder/ucloud/uhost/builder.go index 8d7c7de0d..c2cd520f1 100644 --- a/builder/ucloud/uhost/builder.go +++ b/builder/ucloud/uhost/builder.go @@ -10,11 +10,11 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" "github.com/hashicorp/packer/helper/communicator" - "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/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/vagrant/builder.go b/builder/vagrant/builder.go index 3bc7a1200..82862db07 100644 --- a/builder/vagrant/builder.go +++ b/builder/vagrant/builder.go @@ -15,12 +15,12 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "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/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/virtualbox/iso/builder.go b/builder/virtualbox/iso/builder.go index e6fd54587..eb21cdc59 100644 --- a/builder/virtualbox/iso/builder.go +++ b/builder/virtualbox/iso/builder.go @@ -11,12 +11,12 @@ 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/config" "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/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/virtualbox/ovf/config.go b/builder/virtualbox/ovf/config.go index 1851ec94c..d30d408a1 100644 --- a/builder/virtualbox/ovf/config.go +++ b/builder/virtualbox/ovf/config.go @@ -7,11 +7,11 @@ import ( "fmt" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/helper/config" "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/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/virtualbox/vm/config.go b/builder/virtualbox/vm/config.go index ce3f71e3d..95a60bce8 100644 --- a/builder/virtualbox/vm/config.go +++ b/builder/virtualbox/vm/config.go @@ -9,11 +9,11 @@ import ( "time" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/helper/config" "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/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/vmware/common/driver_esx5_test.go b/builder/vmware/common/driver_esx5_test.go index fd17fc73a..84dd2b745 100644 --- a/builder/vmware/common/driver_esx5_test.go +++ b/builder/vmware/common/driver_esx5_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) func TestESX5Driver_implDriver(t *testing.T) { diff --git a/builder/vmware/iso/config.go b/builder/vmware/iso/config.go index 9443394cd..fc6903576 100644 --- a/builder/vmware/iso/config.go +++ b/builder/vmware/iso/config.go @@ -10,12 +10,12 @@ import ( "strings" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" - "github.com/hashicorp/packer/helper/config" "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/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/vmware/vmx/config.go b/builder/vmware/vmx/config.go index 2d613d138..0be17d7fb 100644 --- a/builder/vmware/vmx/config.go +++ b/builder/vmware/vmx/config.go @@ -8,12 +8,12 @@ import ( "os" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" - "github.com/hashicorp/packer/helper/config" "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/multistep/commonsteps" "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/vsphere/clone/config.go b/builder/vsphere/clone/config.go index 3de3be585..ced3d6d44 100644 --- a/builder/vsphere/clone/config.go +++ b/builder/vsphere/clone/config.go @@ -6,10 +6,10 @@ package clone import ( "github.com/hashicorp/packer/builder/vsphere/common" "github.com/hashicorp/packer/helper/communicator" - "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/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/vsphere/clone/step_customize.go b/builder/vsphere/clone/step_customize.go index e05cb38b4..c5ebecf96 100644 --- a/builder/vsphere/clone/step_customize.go +++ b/builder/vsphere/clone/step_customize.go @@ -9,9 +9,9 @@ import ( "net" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/vmware/govmomi/vim25/types" ) diff --git a/builder/vsphere/iso/config.go b/builder/vsphere/iso/config.go index e3bb7849b..44d2acee1 100644 --- a/builder/vsphere/iso/config.go +++ b/builder/vsphere/iso/config.go @@ -6,10 +6,10 @@ package iso import ( "github.com/hashicorp/packer/builder/vsphere/common" "github.com/hashicorp/packer/helper/communicator" - "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/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/builder/yandex/config.go b/builder/yandex/config.go index 25fc61cd6..37e75b60c 100644 --- a/builder/yandex/config.go +++ b/builder/yandex/config.go @@ -11,9 +11,9 @@ import ( "time" "github.com/hashicorp/packer/helper/communicator" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/hcl2template/common_test.go b/hcl2template/common_test.go index 08f4ea10b..ac65ac3e7 100644 --- a/hcl2template/common_test.go +++ b/hcl2template/common_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/hcl/v2/hclparse" "github.com/hashicorp/packer/builder/null" . "github.com/hashicorp/packer/hcl2template/internal" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) diff --git a/hcl2template/internal/mock.go b/hcl2template/internal/mock.go index bf746ed5c..8b1dff62c 100644 --- a/hcl2template/internal/mock.go +++ b/hcl2template/internal/mock.go @@ -7,8 +7,8 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/json" ) diff --git a/helper/communicator/config.go b/helper/communicator/config.go index dc1e9b23a..0dcc21bbc 100644 --- a/helper/communicator/config.go +++ b/helper/communicator/config.go @@ -13,10 +13,10 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" helperssh "github.com/hashicorp/packer/helper/communicator/ssh" - "github.com/hashicorp/packer/helper/config" "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/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/masterzen/winrm" "golang.org/x/crypto/ssh" diff --git a/packer-plugin-sdk/shell-local/config.go b/packer-plugin-sdk/shell-local/config.go index f8cd434ad..9ee2d614d 100644 --- a/packer-plugin-sdk/shell-local/config.go +++ b/packer-plugin-sdk/shell-local/config.go @@ -10,9 +10,9 @@ import ( "runtime" "strings" - configHelper "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/shell" + configHelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/helper/config/custom_types.go b/packer-plugin-sdk/template/config/custom_types.go similarity index 100% rename from helper/config/custom_types.go rename to packer-plugin-sdk/template/config/custom_types.go diff --git a/helper/config/custom_types_test.go b/packer-plugin-sdk/template/config/custom_types_test.go similarity index 100% rename from helper/config/custom_types_test.go rename to packer-plugin-sdk/template/config/custom_types_test.go diff --git a/helper/config/decode.go b/packer-plugin-sdk/template/config/decode.go similarity index 100% rename from helper/config/decode.go rename to packer-plugin-sdk/template/config/decode.go diff --git a/helper/config/decode_test.go b/packer-plugin-sdk/template/config/decode_test.go similarity index 100% rename from helper/config/decode_test.go rename to packer-plugin-sdk/template/config/decode_test.go diff --git a/helper/config/deprecated_options.go b/packer-plugin-sdk/template/config/deprecated_options.go similarity index 100% rename from helper/config/deprecated_options.go rename to packer-plugin-sdk/template/config/deprecated_options.go diff --git a/packer/core_test.go b/packer/core_test.go index d60af3472..2c5c70aa7 100644 --- a/packer/core_test.go +++ b/packer/core_test.go @@ -8,8 +8,8 @@ import ( "reflect" "testing" - configHelper "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer-plugin-sdk/template" + configHelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) func TestCoreBuildNames(t *testing.T) { diff --git a/post-processor/alicloud-import/post-processor.go b/post-processor/alicloud-import/post-processor.go index cc87a221d..f965ad77b 100644 --- a/post-processor/alicloud-import/post-processor.go +++ b/post-processor/alicloud-import/post-processor.go @@ -19,8 +19,8 @@ import ( "github.com/aliyun/aliyun-oss-go-sdk/oss" "github.com/hashicorp/hcl/v2/hcldec" packerecs "github.com/hashicorp/packer/builder/alicloud/ecs" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/post-processor/amazon-import/post-processor.go b/post-processor/amazon-import/post-processor.go index a97d8501c..df4062c6a 100644 --- a/post-processor/amazon-import/post-processor.go +++ b/post-processor/amazon-import/post-processor.go @@ -16,10 +16,10 @@ import ( "github.com/aws/aws-sdk-go/service/s3/s3manager" "github.com/hashicorp/hcl/v2/hcldec" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "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/retry" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/post-processor/artifice/post-processor.go b/post-processor/artifice/post-processor.go index 2131d2c01..104d144fe 100644 --- a/post-processor/artifice/post-processor.go +++ b/post-processor/artifice/post-processor.go @@ -8,9 +8,9 @@ import ( "strings" "github.com/hashicorp/hcl/v2/hcldec" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/post-processor/checksum/post-processor.go b/post-processor/checksum/post-processor.go index c2cc5b080..5d0a9c2b5 100644 --- a/post-processor/checksum/post-processor.go +++ b/post-processor/checksum/post-processor.go @@ -15,9 +15,9 @@ import ( "path/filepath" "github.com/hashicorp/hcl/v2/hcldec" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/post-processor/compress/post-processor.go b/post-processor/compress/post-processor.go index fb37aeceb..0864a5dff 100644 --- a/post-processor/compress/post-processor.go +++ b/post-processor/compress/post-processor.go @@ -15,9 +15,9 @@ import ( "github.com/biogo/hts/bgzf" "github.com/hashicorp/hcl/v2/hcldec" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/klauspost/pgzip" "github.com/pierrec/lz4" diff --git a/post-processor/digitalocean-import/post-processor.go b/post-processor/digitalocean-import/post-processor.go index 5914de3f0..fe652ecf1 100644 --- a/post-processor/digitalocean-import/post-processor.go +++ b/post-processor/digitalocean-import/post-processor.go @@ -21,9 +21,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/digitalocean" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/post-processor/docker-import/post-processor.go b/post-processor/docker-import/post-processor.go index a0562395a..7cde7c926 100644 --- a/post-processor/docker-import/post-processor.go +++ b/post-processor/docker-import/post-processor.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/docker" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" ) diff --git a/post-processor/docker-push/post-processor.go b/post-processor/docker-push/post-processor.go index 6683aa299..facce79b5 100644 --- a/post-processor/docker-push/post-processor.go +++ b/post-processor/docker-push/post-processor.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/docker" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" dockerimport "github.com/hashicorp/packer/post-processor/docker-import" dockertag "github.com/hashicorp/packer/post-processor/docker-tag" diff --git a/post-processor/docker-save/post-processor.go b/post-processor/docker-save/post-processor.go index 1cbe7e5f0..bfa44d065 100644 --- a/post-processor/docker-save/post-processor.go +++ b/post-processor/docker-save/post-processor.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/docker" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" dockerimport "github.com/hashicorp/packer/post-processor/docker-import" dockertag "github.com/hashicorp/packer/post-processor/docker-tag" diff --git a/post-processor/docker-tag/post-processor.go b/post-processor/docker-tag/post-processor.go index c8cd44608..254e63859 100644 --- a/post-processor/docker-tag/post-processor.go +++ b/post-processor/docker-tag/post-processor.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/docker" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" dockerimport "github.com/hashicorp/packer/post-processor/docker-import" ) diff --git a/post-processor/exoscale-import/post-processor.go b/post-processor/exoscale-import/post-processor.go index 14f5aa23b..685ef903f 100644 --- a/post-processor/exoscale-import/post-processor.go +++ b/post-processor/exoscale-import/post-processor.go @@ -20,9 +20,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/file" "github.com/hashicorp/packer/builder/qemu" - "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/template/config" "github.com/hashicorp/packer/post-processor/artifice" "github.com/hashicorp/packer/post-processor/exoscale-import/version" ) diff --git a/post-processor/googlecompute-export/post-processor.go b/post-processor/googlecompute-export/post-processor.go index 3f8b6071a..f3bcc684a 100644 --- a/post-processor/googlecompute-export/post-processor.go +++ b/post-processor/googlecompute-export/post-processor.go @@ -12,11 +12,11 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/googlecompute" "github.com/hashicorp/packer/helper/communicator" - "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/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" ) diff --git a/post-processor/googlecompute-import/post-processor.go b/post-processor/googlecompute-import/post-processor.go index c86ddbac3..ee10949ba 100644 --- a/post-processor/googlecompute-import/post-processor.go +++ b/post-processor/googlecompute-import/post-processor.go @@ -16,9 +16,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/googlecompute" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" "github.com/hashicorp/packer/post-processor/compress" diff --git a/post-processor/manifest/post-processor.go b/post-processor/manifest/post-processor.go index 0ee7cdb68..26e9ac191 100644 --- a/post-processor/manifest/post-processor.go +++ b/post-processor/manifest/post-processor.go @@ -14,9 +14,9 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/post-processor/ucloud-import/post-processor.go b/post-processor/ucloud-import/post-processor.go index 22fabbbf5..1296f326d 100644 --- a/post-processor/ucloud-import/post-processor.go +++ b/post-processor/ucloud-import/post-processor.go @@ -13,10 +13,10 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" - "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/retry" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/ucloud/ucloud-sdk-go/services/ufile" "github.com/ucloud/ucloud-sdk-go/services/uhost" diff --git a/post-processor/vagrant-cloud/post-processor.go b/post-processor/vagrant-cloud/post-processor.go index dfc74e8ad..602393620 100644 --- a/post-processor/vagrant-cloud/post-processor.go +++ b/post-processor/vagrant-cloud/post-processor.go @@ -19,11 +19,11 @@ import ( "strings" "github.com/hashicorp/hcl/v2/hcldec" - "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/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/post-processor/vagrant/post-processor.go b/post-processor/vagrant/post-processor.go index 79fd37473..06f546523 100644 --- a/post-processor/vagrant/post-processor.go +++ b/post-processor/vagrant/post-processor.go @@ -16,9 +16,9 @@ import ( "text/template" "github.com/hashicorp/hcl/v2/hcldec" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" "github.com/hashicorp/packer/post-processor/artifice" diff --git a/post-processor/vsphere-template/post-processor.go b/post-processor/vsphere-template/post-processor.go index 437a90dfb..2d3fc18b4 100644 --- a/post-processor/vsphere-template/post-processor.go +++ b/post-processor/vsphere-template/post-processor.go @@ -13,11 +13,11 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" 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/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" "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/config" "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_mark_as_template.go b/post-processor/vsphere-template/step_mark_as_template.go index 664b60e9b..e4af31f83 100644 --- a/post-processor/vsphere-template/step_mark_as_template.go +++ b/post-processor/vsphere-template/step_mark_as_template.go @@ -7,9 +7,9 @@ import ( "regexp" "strings" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/post-processor/vsphere" "github.com/vmware/govmomi" "github.com/vmware/govmomi/object" diff --git a/post-processor/vsphere/post-processor.go b/post-processor/vsphere/post-processor.go index f9661076c..ba3645db5 100644 --- a/post-processor/vsphere/post-processor.go +++ b/post-processor/vsphere/post-processor.go @@ -15,10 +15,10 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/common" shelllocal "github.com/hashicorp/packer/packer-plugin-sdk/shell-local" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/post-processor/yandex-export/post-processor.go b/post-processor/yandex-export/post-processor.go index 0586f6009..8c48da450 100644 --- a/post-processor/yandex-export/post-processor.go +++ b/post-processor/yandex-export/post-processor.go @@ -13,12 +13,12 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/yandex" - "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/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/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" ) diff --git a/post-processor/yandex-import/post-processor.go b/post-processor/yandex-import/post-processor.go index fa6f8ab2f..8800e2381 100644 --- a/post-processor/yandex-import/post-processor.go +++ b/post-processor/yandex-import/post-processor.go @@ -11,9 +11,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/packer/builder/file" "github.com/hashicorp/packer/builder/yandex" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" "github.com/hashicorp/packer/post-processor/compress" diff --git a/provisioner/ansible-local/provisioner.go b/provisioner/ansible-local/provisioner.go index 96dfc3593..96f9cf0be 100644 --- a/provisioner/ansible-local/provisioner.go +++ b/provisioner/ansible-local/provisioner.go @@ -10,9 +10,9 @@ import ( "strings" "github.com/hashicorp/hcl/v2/hcldec" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" diff --git a/provisioner/ansible/provisioner.go b/provisioner/ansible/provisioner.go index 3cf28ce8a..63de5f4df 100644 --- a/provisioner/ansible/provisioner.go +++ b/provisioner/ansible/provisioner.go @@ -30,11 +30,11 @@ import ( "golang.org/x/crypto/ssh" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "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/multistep/commonsteps" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "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 076ebd2c9..b73e5c543 100644 --- a/provisioner/ansible/provisioner_test.go +++ b/provisioner/ansible/provisioner_test.go @@ -14,9 +14,9 @@ import ( "strings" "testing" - confighelper "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" + confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/stretchr/testify/assert" ) diff --git a/provisioner/azure-dtlartifact/provisioner.go b/provisioner/azure-dtlartifact/provisioner.go index 034d29ee6..68e83ed79 100644 --- a/provisioner/azure-dtlartifact/provisioner.go +++ b/provisioner/azure-dtlartifact/provisioner.go @@ -14,8 +14,8 @@ import ( "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/provisioner/breakpoint/provisioner.go b/provisioner/breakpoint/provisioner.go index 8fa9b1e11..b1fb64611 100644 --- a/provisioner/breakpoint/provisioner.go +++ b/provisioner/breakpoint/provisioner.go @@ -9,9 +9,9 @@ import ( "golang.org/x/sync/errgroup" "github.com/hashicorp/hcl/v2/hcldec" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/provisioner/chef-client/provisioner.go b/provisioner/chef-client/provisioner.go index 22b9bd363..feef39f9e 100644 --- a/provisioner/chef-client/provisioner.go +++ b/provisioner/chef-client/provisioner.go @@ -16,10 +16,10 @@ import ( "strings" "github.com/hashicorp/hcl/v2/hcldec" - "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/guestexec" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) diff --git a/provisioner/chef-solo/provisioner.go b/provisioner/chef-solo/provisioner.go index d9faa035c..07bf75432 100644 --- a/provisioner/chef-solo/provisioner.go +++ b/provisioner/chef-solo/provisioner.go @@ -16,10 +16,10 @@ import ( "strings" "github.com/hashicorp/hcl/v2/hcldec" - "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/guestexec" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/provisioner/converge/provisioner.go b/provisioner/converge/provisioner.go index 1a60d2715..a34323cdf 100644 --- a/provisioner/converge/provisioner.go +++ b/provisioner/converge/provisioner.go @@ -16,9 +16,9 @@ import ( "encoding/json" "github.com/hashicorp/hcl/v2/hcldec" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/provisioner/file/provisioner.go b/provisioner/file/provisioner.go index 0715797e4..abf6e0ad4 100644 --- a/provisioner/file/provisioner.go +++ b/provisioner/file/provisioner.go @@ -13,9 +13,9 @@ import ( "strings" "github.com/hashicorp/hcl/v2/hcldec" - "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/provisioner/inspec/provisioner.go b/provisioner/inspec/provisioner.go index 1d8ab0606..fdf13cc5a 100644 --- a/provisioner/inspec/provisioner.go +++ b/provisioner/inspec/provisioner.go @@ -28,10 +28,10 @@ import ( "golang.org/x/crypto/ssh" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "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/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/provisioner/powershell/provisioner.go b/provisioner/powershell/provisioner.go index cb7d03da5..2f44644e1 100644 --- a/provisioner/powershell/provisioner.go +++ b/provisioner/powershell/provisioner.go @@ -17,12 +17,12 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "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/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" diff --git a/provisioner/puppet-masterless/provisioner.go b/provisioner/puppet-masterless/provisioner.go index 6fc71e93f..a851aa7e2 100644 --- a/provisioner/puppet-masterless/provisioner.go +++ b/provisioner/puppet-masterless/provisioner.go @@ -13,10 +13,10 @@ import ( "strings" "github.com/hashicorp/hcl/v2/hcldec" - "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/guestexec" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/provisioner/puppet-server/provisioner.go b/provisioner/puppet-server/provisioner.go index 070990926..e652e3c5b 100644 --- a/provisioner/puppet-server/provisioner.go +++ b/provisioner/puppet-server/provisioner.go @@ -12,10 +12,10 @@ import ( "strings" "github.com/hashicorp/hcl/v2/hcldec" - "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/guestexec" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/provisioner/salt-masterless/provisioner.go b/provisioner/salt-masterless/provisioner.go index 64a850d6a..743f1fe8f 100644 --- a/provisioner/salt-masterless/provisioner.go +++ b/provisioner/salt-masterless/provisioner.go @@ -16,10 +16,10 @@ import ( "github.com/hashicorp/go-getter/v2" "github.com/hashicorp/hcl/v2/hcldec" - "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/guestexec" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) diff --git a/provisioner/shell/provisioner.go b/provisioner/shell/provisioner.go index 826d0f99f..4d6cd376f 100644 --- a/provisioner/shell/provisioner.go +++ b/provisioner/shell/provisioner.go @@ -18,11 +18,11 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "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/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) diff --git a/provisioner/sleep/provisioner.go b/provisioner/sleep/provisioner.go index f3414c961..e530e4761 100644 --- a/provisioner/sleep/provisioner.go +++ b/provisioner/sleep/provisioner.go @@ -7,8 +7,8 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) type Provisioner struct { diff --git a/provisioner/windows-restart/provisioner.go b/provisioner/windows-restart/provisioner.go index b33ba29c4..a14603b63 100644 --- a/provisioner/windows-restart/provisioner.go +++ b/provisioner/windows-restart/provisioner.go @@ -14,10 +14,10 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - "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/retry" + "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/masterzen/winrm" ) diff --git a/provisioner/windows-shell/provisioner.go b/provisioner/windows-shell/provisioner.go index 28b633e69..25db70ef2 100644 --- a/provisioner/windows-shell/provisioner.go +++ b/provisioner/windows-shell/provisioner.go @@ -16,11 +16,11 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" "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/config" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer-plugin-sdk/tmp" )