From 64023620189ab52f06bf33528dc03749eb07cb5a Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Wed, 11 Nov 2020 10:21:37 -0800 Subject: [PATCH] create packer-plugin-sdk directory and begin moving the relevant folders into it. --- builder/alicloud/ecs/access_config.go | 2 +- builder/alicloud/ecs/builder.go | 2 +- builder/alicloud/ecs/image_config.go | 2 +- builder/alicloud/ecs/run_config.go | 2 +- builder/amazon/chroot/builder.go | 2 +- builder/amazon/chroot/step_create_volume.go | 2 +- builder/amazon/chroot/step_mount_device.go | 2 +- builder/amazon/common/access_config.go | 2 +- builder/amazon/common/ami_config.go | 2 +- builder/amazon/common/block_device.go | 2 +- builder/amazon/common/run_config.go | 2 +- builder/amazon/common/step_create_tags.go | 2 +- builder/amazon/common/step_modify_ami_attributes.go | 2 +- builder/amazon/common/step_run_source_instance.go | 2 +- builder/amazon/common/step_run_spot_instance.go | 2 +- builder/amazon/common/tags.go | 2 +- builder/amazon/ebs/builder.go | 2 +- builder/amazon/ebssurrogate/block_device.go | 2 +- builder/amazon/ebssurrogate/builder.go | 2 +- builder/amazon/ebssurrogate/root_block_device.go | 2 +- builder/amazon/ebssurrogate/step_snapshot_volumes.go | 2 +- builder/amazon/ebsvolume/block_device.go | 2 +- builder/amazon/ebsvolume/builder.go | 2 +- builder/amazon/ebsvolume/step_tag_ebs_volumes.go | 2 +- builder/amazon/instance/builder.go | 2 +- builder/amazon/instance/step_bundle_volume.go | 2 +- builder/amazon/instance/step_upload_bundle.go | 2 +- builder/azure/arm/config.go | 2 +- builder/azure/chroot/builder.go | 2 +- builder/azure/chroot/step_mount_device.go | 2 +- builder/azure/dtl/config.go | 2 +- builder/cloudstack/config.go | 2 +- builder/cloudstack/step_create_instance.go | 2 +- builder/digitalocean/config.go | 2 +- builder/docker/communicator_test.go | 2 +- builder/docker/config.go | 2 +- builder/docker/driver_docker.go | 2 +- builder/file/config.go | 2 +- builder/googlecompute/config.go | 2 +- builder/hcloud/config.go | 2 +- builder/hyperone/builder.go | 2 +- builder/hyperone/config.go | 2 +- builder/hyperone/utils.go | 2 +- builder/hyperv/common/config.go | 2 +- builder/hyperv/common/output_config.go | 2 +- builder/hyperv/common/output_config_test.go | 2 +- builder/hyperv/common/ssh_config.go | 2 +- builder/hyperv/common/step_type_boot_command.go | 2 +- builder/hyperv/iso/builder.go | 2 +- builder/hyperv/vmcx/builder.go | 2 +- builder/jdcloud/builder.go | 2 +- builder/jdcloud/common.go | 2 +- builder/jdcloud/credential_config.go | 2 +- builder/jdcloud/instance_config.go | 2 +- builder/linode/config.go | 2 +- builder/lxc/builder.go | 2 +- builder/lxc/config.go | 2 +- builder/lxd/builder.go | 2 +- builder/lxd/config.go | 2 +- builder/ncloud/config.go | 2 +- builder/null/config.go | 2 +- builder/oneandone/config.go | 2 +- builder/openstack/access_config.go | 2 +- builder/openstack/builder.go | 2 +- builder/openstack/image_config.go | 2 +- builder/openstack/run_config.go | 2 +- builder/oracle/classic/config.go | 2 +- builder/oracle/classic/pv_config.go | 2 +- builder/oracle/classic/step_upload_image.go | 2 +- builder/oracle/oci/config.go | 2 +- builder/osc/bsu/builder.go | 2 +- builder/osc/bsusurrogate/builder.go | 2 +- builder/osc/bsusurrogate/root_block_device.go | 2 +- builder/osc/bsuvolume/block_device.go | 2 +- builder/osc/bsuvolume/builder.go | 2 +- builder/osc/bsuvolume/step_tag_bsu_volumes.go | 2 +- builder/osc/chroot/builder.go | 2 +- builder/osc/chroot/run_local_commands.go | 2 +- builder/osc/chroot/step_create_volume.go | 2 +- builder/osc/chroot/step_mount_device.go | 2 +- builder/osc/common/access_config.go | 2 +- builder/osc/common/block_device.go | 2 +- builder/osc/common/omi_config.go | 2 +- builder/osc/common/run_config.go | 2 +- builder/osc/common/step_create_tags.go | 2 +- builder/osc/common/step_run_source_vm.go | 2 +- builder/osc/common/step_update_omi.go | 2 +- builder/osc/common/tags.go | 2 +- builder/parallels/common/hw_config.go | 2 +- builder/parallels/common/hw_config_test.go | 2 +- builder/parallels/common/output_config.go | 2 +- builder/parallels/common/output_config_test.go | 2 +- builder/parallels/common/prlctl_config.go | 2 +- builder/parallels/common/prlctl_config_test.go | 2 +- builder/parallels/common/prlctl_post_config.go | 2 +- builder/parallels/common/prlctl_post_config_test.go | 2 +- builder/parallels/common/prlctl_version_config.go | 2 +- builder/parallels/common/prlctl_version_config_test.go | 2 +- builder/parallels/common/ssh_config.go | 2 +- builder/parallels/common/ssh_config_test.go | 2 +- builder/parallels/common/step_prlctl.go | 2 +- builder/parallels/common/step_type_boot_command.go | 2 +- builder/parallels/common/step_upload_parallels_tools.go | 2 +- builder/parallels/common/tools_config.go | 2 +- builder/parallels/common/tools_config_test.go | 2 +- builder/parallels/iso/builder.go | 2 +- builder/parallels/pvm/config.go | 2 +- builder/profitbricks/config.go | 2 +- builder/proxmox/common/config.go | 2 +- builder/proxmox/common/step_type_boot_command.go | 2 +- builder/proxmox/iso/config_test.go | 2 +- builder/qemu/comm_config.go | 2 +- builder/qemu/comm_config_test.go | 2 +- builder/qemu/config.go | 2 +- builder/qemu/step_run.go | 2 +- builder/qemu/step_type_boot_command.go | 2 +- builder/scaleway/config.go | 2 +- builder/tencentcloud/cvm/access_config.go | 2 +- builder/tencentcloud/cvm/builder.go | 2 +- builder/tencentcloud/cvm/image_config.go | 2 +- builder/tencentcloud/cvm/run_config.go | 2 +- builder/triton/access_config.go | 2 +- builder/triton/config.go | 2 +- builder/triton/source_machine_config.go | 2 +- builder/triton/target_image_config.go | 2 +- builder/ucloud/common/access_config.go | 2 +- builder/ucloud/common/image_config.go | 2 +- builder/ucloud/common/run_config.go | 2 +- builder/ucloud/uhost/builder.go | 2 +- builder/vagrant/builder.go | 2 +- builder/virtualbox/common/comm_config.go | 2 +- builder/virtualbox/common/comm_config_test.go | 2 +- builder/virtualbox/common/export_config.go | 2 +- builder/virtualbox/common/export_config_test.go | 2 +- builder/virtualbox/common/guest_additions_config.go | 2 +- builder/virtualbox/common/guest_additions_config_test.go | 2 +- builder/virtualbox/common/hw_config.go | 2 +- builder/virtualbox/common/hw_config_test.go | 2 +- builder/virtualbox/common/output_config.go | 2 +- builder/virtualbox/common/output_config_test.go | 2 +- builder/virtualbox/common/run_config.go | 2 +- builder/virtualbox/common/run_config_test.go | 2 +- builder/virtualbox/common/shutdown_config.go | 2 +- builder/virtualbox/common/shutdown_config_test.go | 2 +- builder/virtualbox/common/step_download_guest_additions.go | 2 +- builder/virtualbox/common/step_type_boot_command.go | 2 +- builder/virtualbox/common/step_upload_guest_additions.go | 2 +- builder/virtualbox/common/step_vboxmanage.go | 2 +- builder/virtualbox/common/vbox_version_config.go | 2 +- builder/virtualbox/common/vbox_version_config_test.go | 2 +- builder/virtualbox/common/vboxbundle_config.go | 2 +- builder/virtualbox/common/vboxbundle_config_test.go | 2 +- builder/virtualbox/common/vboxmanage_config.go | 2 +- builder/virtualbox/common/vboxmanage_config_test.go | 2 +- builder/virtualbox/iso/builder.go | 2 +- builder/virtualbox/ovf/config.go | 2 +- builder/virtualbox/vm/config.go | 2 +- builder/vmware/common/disk_config.go | 2 +- builder/vmware/common/driver_config.go | 2 +- builder/vmware/common/driver_config_test.go | 2 +- builder/vmware/common/driver_esx5.go | 2 +- builder/vmware/common/export_config.go | 2 +- builder/vmware/common/hw_config.go | 2 +- builder/vmware/common/hw_config_test.go | 2 +- builder/vmware/common/output_config.go | 2 +- builder/vmware/common/output_config_test.go | 2 +- builder/vmware/common/run_config.go | 2 +- builder/vmware/common/run_config_test.go | 2 +- builder/vmware/common/ssh_config.go | 2 +- builder/vmware/common/ssh_config_test.go | 2 +- builder/vmware/common/step_upload_tools.go | 2 +- builder/vmware/common/step_vnc_boot_command.go | 2 +- builder/vmware/common/tools_config.go | 2 +- builder/vmware/common/tools_config_test.go | 2 +- builder/vmware/common/vmx_config.go | 2 +- builder/vmware/common/vmx_config_test.go | 2 +- builder/vmware/iso/config.go | 2 +- builder/vmware/iso/step_create_vmx.go | 2 +- builder/vmware/iso/step_create_vmx_test.go | 2 +- builder/vmware/vmx/config.go | 2 +- builder/vsphere/clone/config.go | 2 +- builder/vsphere/common/output_config.go | 2 +- builder/vsphere/common/step_boot_command.go | 2 +- builder/vsphere/common/step_export.go | 2 +- builder/vsphere/common/step_import_to_content_library.go | 2 +- builder/vsphere/iso/config.go | 2 +- builder/yandex/access_config.go | 2 +- builder/yandex/config.go | 2 +- command/build.go | 2 +- command/fix.go | 2 +- command/hcl2_upgrade.go | 2 +- command/meta.go | 2 +- common/bootcommand/config.go | 2 +- common/bootcommand/config_test.go | 2 +- common/chroot/interpolate_context_provider.go | 2 +- common/chroot/run_local_commands.go | 2 +- common/extra_iso_config.go | 2 +- common/floppy_config.go | 2 +- common/http_config.go | 2 +- common/iso_config.go | 2 +- common/shell-local/config.go | 2 +- common/shell-local/run.go | 2 +- common/shutdowncommand/config.go | 2 +- common/shutdowncommand/config_test.go | 2 +- common/template/funcs.go | 2 +- helper/builder/testing/testing.go | 2 +- helper/communicator/config.go | 4 ++-- helper/communicator/config_test.go | 2 +- helper/communicator/step_connect.go | 2 +- helper/communicator/step_connect_ssh.go | 2 +- helper/communicator/step_connect_winrm.go | 2 +- helper/config/decode.go | 2 +- helper/config/decode_test.go | 2 +- helper/ssh/tunnel.go | 2 +- helper/ssh/tunnel_test.go | 2 +- .../sdk-internals}/communicator/none/communicator.go | 0 .../sdk-internals}/communicator/none/communicator_test.go | 0 .../sdk-internals}/communicator/ssh/communicator.go | 0 .../sdk-internals}/communicator/ssh/communicator_test.go | 0 .../sdk-internals}/communicator/ssh/connect.go | 0 .../sdk-internals}/communicator/ssh/connect_test.go | 0 .../sdk-internals}/communicator/ssh/connection.go | 0 .../sdk-internals}/communicator/ssh/keyboard_interactive.go | 0 .../communicator/ssh/keyboard_interactive_test.go | 0 .../sdk-internals}/communicator/ssh/password.go | 0 .../sdk-internals}/communicator/ssh/password_test.go | 0 .../sdk-internals}/communicator/ssh/tunnel.go | 0 .../sdk-internals}/communicator/winrm/communicator.go | 0 .../sdk-internals}/communicator/winrm/communicator_test.go | 0 .../sdk-internals}/communicator/winrm/config.go | 0 .../sdk-internals}/communicator/winrm/time.go | 0 .../sdk-internals}/communicator/winrm/time_test.go | 0 .../interpolate/aws/secretsmanager/secretsmanager.go | 0 .../interpolate/aws/secretsmanager/secretsmanager_test.go | 0 .../template}/interpolate/aws/secretsmanager/types.go | 0 {template => packer-plugin-sdk/template}/interpolate/funcs.go | 0 .../template}/interpolate/funcs_test.go | 0 {template => packer-plugin-sdk/template}/interpolate/i.go | 0 .../template}/interpolate/i_test.go | 0 {template => packer-plugin-sdk/template}/interpolate/parse.go | 0 .../template}/interpolate/parse_test.go | 0 .../template}/interpolate/render.go | 0 .../template}/interpolate/render_test.go | 0 {template => packer-plugin-sdk/template}/parse.go | 0 {template => packer-plugin-sdk/template}/parse_test.go | 0 {template => packer-plugin-sdk/template}/template.go | 0 {template => packer-plugin-sdk/template}/template.hcl2spec.go | 0 {template => packer-plugin-sdk/template}/template_test.go | 0 .../template}/test-fixtures/error-beginning.json | 0 .../template}/test-fixtures/error-duplicate-config.json | 0 .../template}/test-fixtures/error-duplicate-variables.json | 0 .../template}/test-fixtures/error-end.json | 0 .../template}/test-fixtures/error-middle.json | 0 .../template}/test-fixtures/malformed.json | 0 .../template}/test-fixtures/parse-basic-config.json | 0 .../template}/test-fixtures/parse-basic.json | 0 .../template}/test-fixtures/parse-builder-no-type.json | 0 .../template}/test-fixtures/parse-builder-repeat.json | 0 .../template}/test-fixtures/parse-comment.json | 0 .../template}/test-fixtures/parse-contents.json | 0 .../template}/test-fixtures/parse-description.json | 0 .../template}/test-fixtures/parse-min-version.json | 0 .../template}/test-fixtures/parse-monolithic.json | 0 .../template}/test-fixtures/parse-pp-basic.json | 0 .../template}/test-fixtures/parse-pp-except.json | 0 .../template}/test-fixtures/parse-pp-keep.json | 0 .../template}/test-fixtures/parse-pp-map.json | 0 .../template}/test-fixtures/parse-pp-multi.json | 0 .../template}/test-fixtures/parse-pp-no-type.json | 0 .../template}/test-fixtures/parse-pp-only.json | 0 .../template}/test-fixtures/parse-pp-slice.json | 0 .../template}/test-fixtures/parse-pp-string.json | 0 .../template}/test-fixtures/parse-provisioner-basic.json | 0 .../template}/test-fixtures/parse-provisioner-config.json | 0 .../template}/test-fixtures/parse-provisioner-except.json | 0 .../template}/test-fixtures/parse-provisioner-no-type.json | 0 .../template}/test-fixtures/parse-provisioner-only.json | 0 .../template}/test-fixtures/parse-provisioner-override.json | 0 .../test-fixtures/parse-provisioner-pause-before.json | 0 .../template}/test-fixtures/parse-provisioner-retry.json | 0 .../template}/test-fixtures/parse-provisioner-timeout.json | 0 .../template}/test-fixtures/parse-variable-default.json | 0 .../template}/test-fixtures/parse-variable-required.json | 0 .../template}/test-fixtures/validate-bad-override.json | 0 .../template}/test-fixtures/validate-bad-pp-except.json | 0 .../template}/test-fixtures/validate-bad-pp-only.json | 0 .../template}/test-fixtures/validate-bad-prov-except.json | 0 .../template}/test-fixtures/validate-bad-prov-only.json | 0 .../template}/test-fixtures/validate-good-override.json | 0 .../template}/test-fixtures/validate-good-pp-except.json | 0 .../template}/test-fixtures/validate-good-pp-only.json | 0 .../template}/test-fixtures/validate-good-prov-except.json | 0 .../template}/test-fixtures/validate-good-prov-only.json | 0 .../template}/test-fixtures/validate-good-prov-timeout.json | 0 .../template}/test-fixtures/validate-no-builders.json | 0 packer/core.go | 4 ++-- 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/checksum/post-processor_test.go | 2 +- post-processor/compress/post-processor.go | 2 +- post-processor/compress/post-processor_test.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/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/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-local/provisioner_test.go | 2 +- provisioner/ansible/provisioner.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-masterless/provisioner_test.go | 2 +- provisioner/puppet-server/provisioner.go | 2 +- provisioner/salt-masterless/provisioner.go | 2 +- provisioner/shell/provisioner.go | 2 +- provisioner/windows-restart/provisioner.go | 2 +- provisioner/windows-shell/provisioner.go | 2 +- 337 files changed, 259 insertions(+), 259 deletions(-) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/none/communicator.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/none/communicator_test.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/ssh/communicator.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/ssh/communicator_test.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/ssh/connect.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/ssh/connect_test.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/ssh/connection.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/ssh/keyboard_interactive.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/ssh/keyboard_interactive_test.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/ssh/password.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/ssh/password_test.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/ssh/tunnel.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/winrm/communicator.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/winrm/communicator_test.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/winrm/config.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/winrm/time.go (100%) rename {sdk-internals => packer-plugin-sdk/sdk-internals}/communicator/winrm/time_test.go (100%) rename {template => packer-plugin-sdk/template}/interpolate/aws/secretsmanager/secretsmanager.go (100%) rename {template => packer-plugin-sdk/template}/interpolate/aws/secretsmanager/secretsmanager_test.go (100%) rename {template => packer-plugin-sdk/template}/interpolate/aws/secretsmanager/types.go (100%) rename {template => packer-plugin-sdk/template}/interpolate/funcs.go (100%) rename {template => packer-plugin-sdk/template}/interpolate/funcs_test.go (100%) rename {template => packer-plugin-sdk/template}/interpolate/i.go (100%) rename {template => packer-plugin-sdk/template}/interpolate/i_test.go (100%) rename {template => packer-plugin-sdk/template}/interpolate/parse.go (100%) rename {template => packer-plugin-sdk/template}/interpolate/parse_test.go (100%) rename {template => packer-plugin-sdk/template}/interpolate/render.go (100%) rename {template => packer-plugin-sdk/template}/interpolate/render_test.go (100%) rename {template => packer-plugin-sdk/template}/parse.go (100%) rename {template => packer-plugin-sdk/template}/parse_test.go (100%) rename {template => packer-plugin-sdk/template}/template.go (100%) rename {template => packer-plugin-sdk/template}/template.hcl2spec.go (100%) rename {template => packer-plugin-sdk/template}/template_test.go (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/error-beginning.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/error-duplicate-config.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/error-duplicate-variables.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/error-end.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/error-middle.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/malformed.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-basic-config.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-basic.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-builder-no-type.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-builder-repeat.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-comment.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-contents.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-description.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-min-version.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-monolithic.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-pp-basic.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-pp-except.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-pp-keep.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-pp-map.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-pp-multi.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-pp-no-type.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-pp-only.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-pp-slice.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-pp-string.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-provisioner-basic.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-provisioner-config.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-provisioner-except.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-provisioner-no-type.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-provisioner-only.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-provisioner-override.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-provisioner-pause-before.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-provisioner-retry.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-provisioner-timeout.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-variable-default.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/parse-variable-required.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/validate-bad-override.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/validate-bad-pp-except.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/validate-bad-pp-only.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/validate-bad-prov-except.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/validate-bad-prov-only.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/validate-good-override.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/validate-good-pp-except.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/validate-good-pp-only.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/validate-good-prov-except.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/validate-good-prov-only.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/validate-good-prov-timeout.json (100%) rename {template => packer-plugin-sdk/template}/test-fixtures/validate-no-builders.json (100%) diff --git a/builder/alicloud/ecs/access_config.go b/builder/alicloud/ecs/access_config.go index 3def01411..222f1ce12 100644 --- a/builder/alicloud/ecs/access_config.go +++ b/builder/alicloud/ecs/access_config.go @@ -12,7 +12,7 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" "github.com/hashicorp/packer/builder/alicloud/version" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/go-homedir" ) diff --git a/builder/alicloud/ecs/builder.go b/builder/alicloud/ecs/builder.go index 95091ad98..446d324a1 100644 --- a/builder/alicloud/ecs/builder.go +++ b/builder/alicloud/ecs/builder.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/alicloud/ecs/image_config.go b/builder/alicloud/ecs/image_config.go index ef3c5292c..575a1c1c5 100644 --- a/builder/alicloud/ecs/image_config.go +++ b/builder/alicloud/ecs/image_config.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The "AlicloudDiskDevice" object us used for the `ECSSystemDiskMapping` and diff --git a/builder/alicloud/ecs/run_config.go b/builder/alicloud/ecs/run_config.go index 7381e6294..500487139 100644 --- a/builder/alicloud/ecs/run_config.go +++ b/builder/alicloud/ecs/run_config.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/packer/common/uuid" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type RunConfig struct { diff --git a/builder/amazon/chroot/builder.go b/builder/amazon/chroot/builder.go index fb80639fe..a87170c2d 100644 --- a/builder/amazon/chroot/builder.go +++ b/builder/amazon/chroot/builder.go @@ -22,7 +22,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/amazon/chroot/step_create_volume.go b/builder/amazon/chroot/step_create_volume.go index 7b01eced3..36c6414d7 100644 --- a/builder/amazon/chroot/step_create_volume.go +++ b/builder/amazon/chroot/step_create_volume.go @@ -11,7 +11,7 @@ import ( awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // StepCreateVolume creates a new volume from the snapshot of the root diff --git a/builder/amazon/chroot/step_mount_device.go b/builder/amazon/chroot/step_mount_device.go index af796d4b6..17d9cd74e 100644 --- a/builder/amazon/chroot/step_mount_device.go +++ b/builder/amazon/chroot/step_mount_device.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type mountPathData struct { diff --git a/builder/amazon/common/access_config.go b/builder/amazon/common/access_config.go index cd6aafb44..bd3e9e933 100644 --- a/builder/amazon/common/access_config.go +++ b/builder/amazon/common/access_config.go @@ -18,7 +18,7 @@ import ( awsbase "github.com/hashicorp/aws-sdk-go-base" cleanhttp "github.com/hashicorp/go-cleanhttp" "github.com/hashicorp/packer/builder/amazon/common/awserrors" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" vaultapi "github.com/hashicorp/vault/api" ) diff --git a/builder/amazon/common/ami_config.go b/builder/amazon/common/ami_config.go index e498ebbaa..2675a2d4f 100644 --- a/builder/amazon/common/ami_config.go +++ b/builder/amazon/common/ami_config.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // AMIConfig is for common configuration related to creating AMIs. diff --git a/builder/amazon/common/block_device.go b/builder/amazon/common/block_device.go index 6dc35d719..5c2ae01d3 100644 --- a/builder/amazon/common/block_device.go +++ b/builder/amazon/common/block_device.go @@ -10,7 +10,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/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // These will be attached when launching your instance. Your diff --git a/builder/amazon/common/run_config.go b/builder/amazon/common/run_config.go index 3e57d3a57..80162f34c 100644 --- a/builder/amazon/common/run_config.go +++ b/builder/amazon/common/run_config.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/packer/common/uuid" "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) var reShutdownBehavior = regexp.MustCompile("^(stop|terminate)$") diff --git a/builder/amazon/common/step_create_tags.go b/builder/amazon/common/step_create_tags.go index 4805b1255..aadb70716 100644 --- a/builder/amazon/common/step_create_tags.go +++ b/builder/amazon/common/step_create_tags.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/packer/common/retry" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type StepCreateTags struct { diff --git a/builder/amazon/common/step_modify_ami_attributes.go b/builder/amazon/common/step_modify_ami_attributes.go index e51bcda41..6879e3f7f 100644 --- a/builder/amazon/common/step_modify_ami_attributes.go +++ b/builder/amazon/common/step_modify_ami_attributes.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type StepModifyAMIAttributes struct { diff --git a/builder/amazon/common/step_run_source_instance.go b/builder/amazon/common/step_run_source_instance.go index ed228a128..45f7144c9 100644 --- a/builder/amazon/common/step_run_source_instance.go +++ b/builder/amazon/common/step_run_source_instance.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type StepRunSourceInstance struct { diff --git a/builder/amazon/common/step_run_spot_instance.go b/builder/amazon/common/step_run_spot_instance.go index dc196817a..2b4a52e07 100644 --- a/builder/amazon/common/step_run_spot_instance.go +++ b/builder/amazon/common/step_run_spot_instance.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type EC2BlockDeviceMappingsBuilder interface { diff --git a/builder/amazon/common/tags.go b/builder/amazon/common/tags.go index f15925134..8842db6e6 100644 --- a/builder/amazon/common/tags.go +++ b/builder/amazon/common/tags.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/packer/common/packerbuilderdata" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type TagMap map[string]string diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go index f3d099042..04142b796 100644 --- a/builder/amazon/ebs/builder.go +++ b/builder/amazon/ebs/builder.go @@ -23,7 +23,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/amazon/ebssurrogate/block_device.go b/builder/amazon/ebssurrogate/block_device.go index 18e442f22..dc00d4d00 100644 --- a/builder/amazon/ebssurrogate/block_device.go +++ b/builder/amazon/ebssurrogate/block_device.go @@ -5,7 +5,7 @@ package ebssurrogate import ( "github.com/aws/aws-sdk-go/service/ec2" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type BlockDevice struct { diff --git a/builder/amazon/ebssurrogate/builder.go b/builder/amazon/ebssurrogate/builder.go index a351bfe89..6934ce0dc 100644 --- a/builder/amazon/ebssurrogate/builder.go +++ b/builder/amazon/ebssurrogate/builder.go @@ -21,7 +21,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const BuilderId = "mitchellh.amazon.ebssurrogate" diff --git a/builder/amazon/ebssurrogate/root_block_device.go b/builder/amazon/ebssurrogate/root_block_device.go index 146803a09..2a52b37ba 100644 --- a/builder/amazon/ebssurrogate/root_block_device.go +++ b/builder/amazon/ebssurrogate/root_block_device.go @@ -5,7 +5,7 @@ package ebssurrogate import ( "errors" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type RootBlockDevice struct { diff --git a/builder/amazon/ebssurrogate/step_snapshot_volumes.go b/builder/amazon/ebssurrogate/step_snapshot_volumes.go index 543b9edb5..9facef0e0 100644 --- a/builder/amazon/ebssurrogate/step_snapshot_volumes.go +++ b/builder/amazon/ebssurrogate/step_snapshot_volumes.go @@ -12,7 +12,7 @@ import ( awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // StepSnapshotVolumes creates snapshots of the created volumes. diff --git a/builder/amazon/ebsvolume/block_device.go b/builder/amazon/ebsvolume/block_device.go index 2d7166373..47f22c9b2 100644 --- a/builder/amazon/ebsvolume/block_device.go +++ b/builder/amazon/ebsvolume/block_device.go @@ -6,7 +6,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/hcl2template" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type BlockDevice struct { diff --git a/builder/amazon/ebsvolume/builder.go b/builder/amazon/ebsvolume/builder.go index ac31f94f7..f9324c0ca 100644 --- a/builder/amazon/ebsvolume/builder.go +++ b/builder/amazon/ebsvolume/builder.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const BuilderId = "mitchellh.amazon.ebsvolume" diff --git a/builder/amazon/ebsvolume/step_tag_ebs_volumes.go b/builder/amazon/ebsvolume/step_tag_ebs_volumes.go index 5d8bea217..ecbf2c56d 100644 --- a/builder/amazon/ebsvolume/step_tag_ebs_volumes.go +++ b/builder/amazon/ebsvolume/step_tag_ebs_volumes.go @@ -10,7 +10,7 @@ import ( awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type stepTagEBSVolumes struct { diff --git a/builder/amazon/instance/builder.go b/builder/amazon/instance/builder.go index d07e26150..a717a7750 100644 --- a/builder/amazon/instance/builder.go +++ b/builder/amazon/instance/builder.go @@ -22,7 +22,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/amazon/instance/step_bundle_volume.go b/builder/amazon/instance/step_bundle_volume.go index fe8f291ab..affbe0845 100644 --- a/builder/amazon/instance/step_bundle_volume.go +++ b/builder/amazon/instance/step_bundle_volume.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type bundleCmdData struct { diff --git a/builder/amazon/instance/step_upload_bundle.go b/builder/amazon/instance/step_upload_bundle.go index b19a1a3d7..794ba593e 100644 --- a/builder/amazon/instance/step_upload_bundle.go +++ b/builder/amazon/instance/step_upload_bundle.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type uploadCmdData struct { diff --git a/builder/azure/arm/config.go b/builder/azure/arm/config.go index 799ae51f2..ce8913d72 100644 --- a/builder/azure/arm/config.go +++ b/builder/azure/arm/config.go @@ -33,7 +33,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "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 e0e0eacc4..a34ceb223 100644 --- a/builder/azure/chroot/builder.go +++ b/builder/azure/chroot/builder.go @@ -23,7 +23,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest/azure" diff --git a/builder/azure/chroot/step_mount_device.go b/builder/azure/chroot/step_mount_device.go index 99fbb9d90..82ae6cb5d 100644 --- a/builder/azure/chroot/step_mount_device.go +++ b/builder/azure/chroot/step_mount_device.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) var _ multistep.Step = &StepMountDevice{} diff --git a/builder/azure/dtl/config.go b/builder/azure/dtl/config.go index d46cd82dc..309c56a9c 100644 --- a/builder/azure/dtl/config.go +++ b/builder/azure/dtl/config.go @@ -28,7 +28,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "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 183b6f6d5..5ef0f5e29 100644 --- a/builder/cloudstack/config.go +++ b/builder/cloudstack/config.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // Config holds all the details needed to configure the builder. diff --git a/builder/cloudstack/step_create_instance.go b/builder/cloudstack/step_create_instance.go index 3a6b3d2c3..aaba68bd6 100644 --- a/builder/cloudstack/step_create_instance.go +++ b/builder/cloudstack/step_create_instance.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/digitalocean/config.go b/builder/digitalocean/config.go index 37ff5640c..7a722b5f9 100644 --- a/builder/digitalocean/config.go +++ b/builder/digitalocean/config.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/builder/docker/communicator_test.go b/builder/docker/communicator_test.go index afaa5e60f..6abba8cd5 100644 --- a/builder/docker/communicator_test.go +++ b/builder/docker/communicator_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template" "github.com/hashicorp/packer/provisioner/file" "github.com/hashicorp/packer/provisioner/shell" - "github.com/hashicorp/packer/template" ) // TestUploadDownload verifies that basic upload / download functionality works diff --git a/builder/docker/config.go b/builder/docker/config.go index aa0b785e4..28743f448 100644 --- a/builder/docker/config.go +++ b/builder/docker/config.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/builder/docker/driver_docker.go b/builder/docker/driver_docker.go index ba5693b91..81058a754 100644 --- a/builder/docker/driver_docker.go +++ b/builder/docker/driver_docker.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/go-version" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type DockerDriver struct { diff --git a/builder/file/config.go b/builder/file/config.go index 730c497f5..ac97a2f74 100644 --- a/builder/file/config.go +++ b/builder/file/config.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) var ErrTargetRequired = fmt.Errorf("target required") diff --git a/builder/googlecompute/config.go b/builder/googlecompute/config.go index 055cd2a28..6908f4f1d 100644 --- a/builder/googlecompute/config.go +++ b/builder/googlecompute/config.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" compute "google.golang.org/api/compute/v1" ) diff --git a/builder/hcloud/config.go b/builder/hcloud/config.go index 878c7cc1f..7478e7cdb 100644 --- a/builder/hcloud/config.go +++ b/builder/hcloud/config.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hetznercloud/hcloud-go/hcloud" "github.com/mitchellh/mapstructure" ) diff --git a/builder/hyperone/builder.go b/builder/hyperone/builder.go index 525db4abf..c5f1f3c1a 100644 --- a/builder/hyperone/builder.go +++ b/builder/hyperone/builder.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "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 8f9b32aab..e88ee39ad 100644 --- a/builder/hyperone/config.go +++ b/builder/hyperone/config.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/go-homedir" "github.com/mitchellh/mapstructure" ) diff --git a/builder/hyperone/utils.go b/builder/hyperone/utils.go index 696747de6..594e6a164 100644 --- a/builder/hyperone/utils.go +++ b/builder/hyperone/utils.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "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 84473e2dc..74de2cbe6 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/common" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const ( diff --git a/builder/hyperv/common/output_config.go b/builder/hyperv/common/output_config.go index 3a1538312..f1839f83e 100644 --- a/builder/hyperv/common/output_config.go +++ b/builder/hyperv/common/output_config.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/hashicorp/packer/common" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type OutputConfig struct { diff --git a/builder/hyperv/common/output_config_test.go b/builder/hyperv/common/output_config_test.go index a5aa0b8fe..a5ac7dfd9 100644 --- a/builder/hyperv/common/output_config_test.go +++ b/builder/hyperv/common/output_config_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/common" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestOutputConfigPrepare(t *testing.T) { diff --git a/builder/hyperv/common/ssh_config.go b/builder/hyperv/common/ssh_config.go index 152230ccd..48ffad38a 100644 --- a/builder/hyperv/common/ssh_config.go +++ b/builder/hyperv/common/ssh_config.go @@ -2,7 +2,7 @@ package common import ( "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type SSHConfig struct { diff --git a/builder/hyperv/common/step_type_boot_command.go b/builder/hyperv/common/step_type_boot_command.go index 8b7ed40e4..c34c5a04c 100644 --- a/builder/hyperv/common/step_type_boot_command.go +++ b/builder/hyperv/common/step_type_boot_command.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/common/bootcommand" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type bootCommandTemplateData struct { diff --git a/builder/hyperv/iso/builder.go b/builder/hyperv/iso/builder.go index 8fa9d9844..91e2bc676 100644 --- a/builder/hyperv/iso/builder.go +++ b/builder/hyperv/iso/builder.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const ( diff --git a/builder/hyperv/vmcx/builder.go b/builder/hyperv/vmcx/builder.go index b2968abf6..ec4dea9a0 100644 --- a/builder/hyperv/vmcx/builder.go +++ b/builder/hyperv/vmcx/builder.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const ( diff --git a/builder/jdcloud/builder.go b/builder/jdcloud/builder.go index 9fb801018..8ed2c59cd 100644 --- a/builder/jdcloud/builder.go +++ b/builder/jdcloud/builder.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func (b *Builder) ConfigSpec() hcldec.ObjectSpec { return b.config.FlatMapstructure().HCL2Spec() } diff --git a/builder/jdcloud/common.go b/builder/jdcloud/common.go index 1de7efe22..d89965846 100644 --- a/builder/jdcloud/common.go +++ b/builder/jdcloud/common.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/multistep" - "github.com/hashicorp/packer/template/interpolate" + "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/credential_config.go b/builder/jdcloud/credential_config.go index 28768b8e7..0648c6565 100644 --- a/builder/jdcloud/credential_config.go +++ b/builder/jdcloud/credential_config.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/jdcloud-api/jdcloud-sdk-go/core" 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/instance_config.go b/builder/jdcloud/instance_config.go index c63ae046b..1d43142f9 100644 --- a/builder/jdcloud/instance_config.go +++ b/builder/jdcloud/instance_config.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type JDCloudInstanceSpecConfig struct { diff --git a/builder/linode/config.go b/builder/linode/config.go index 44a1a9d2b..08aadc3df 100644 --- a/builder/linode/config.go +++ b/builder/linode/config.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/builder/lxc/builder.go b/builder/lxc/builder.go index ec0205f97..feca45e90 100644 --- a/builder/lxc/builder.go +++ b/builder/lxc/builder.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/lxc/config.go b/builder/lxc/config.go index c9a58026b..bd2a781fe 100644 --- a/builder/lxc/config.go +++ b/builder/lxc/config.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/builder/lxd/builder.go b/builder/lxd/builder.go index 5130e8d19..1a4ae2778 100644 --- a/builder/lxd/builder.go +++ b/builder/lxd/builder.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/lxd/config.go b/builder/lxd/config.go index 707f6aaec..840cdaabe 100644 --- a/builder/lxd/config.go +++ b/builder/lxd/config.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "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 55437c6ae..18a544879 100644 --- a/builder/ncloud/config.go +++ b/builder/ncloud/config.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // Config is structure to use packer builder plugin for Naver Cloud Platform diff --git a/builder/null/config.go b/builder/null/config.go index 6c7fcb9c2..490bc04e2 100644 --- a/builder/null/config.go +++ b/builder/null/config.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/builder/oneandone/config.go b/builder/oneandone/config.go index a0a5e6109..f48666930 100644 --- a/builder/oneandone/config.go +++ b/builder/oneandone/config.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/builder/openstack/access_config.go b/builder/openstack/access_config.go index 0fe669666..fafcdae65 100644 --- a/builder/openstack/access_config.go +++ b/builder/openstack/access_config.go @@ -17,7 +17,7 @@ import ( "github.com/gophercloud/utils/openstack/clientconfig" "github.com/hashicorp/go-cleanhttp" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // AccessConfig is for common configuration related to openstack access diff --git a/builder/openstack/builder.go b/builder/openstack/builder.go index 44df3ff9e..99c226c9a 100644 --- a/builder/openstack/builder.go +++ b/builder/openstack/builder.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/openstack/image_config.go b/builder/openstack/image_config.go index f5c8d5a11..d36e5caae 100644 --- a/builder/openstack/image_config.go +++ b/builder/openstack/image_config.go @@ -7,7 +7,7 @@ import ( "strings" imageservice "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // ImageConfig is for common configuration related to creating Images. diff --git a/builder/openstack/run_config.go b/builder/openstack/run_config.go index f8bc3b514..6acd5f152 100644 --- a/builder/openstack/run_config.go +++ b/builder/openstack/run_config.go @@ -9,7 +9,7 @@ import ( "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" "github.com/hashicorp/packer/common/uuid" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // RunConfig contains configuration for running an instance from a source image diff --git a/builder/oracle/classic/config.go b/builder/oracle/classic/config.go index 6f66d7a81..2cdf75b9e 100644 --- a/builder/oracle/classic/config.go +++ b/builder/oracle/classic/config.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/builder/oracle/classic/pv_config.go b/builder/oracle/classic/pv_config.go index e101dc8d8..8321dee5f 100644 --- a/builder/oracle/classic/pv_config.go +++ b/builder/oracle/classic/pv_config.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const imageListDefault = "/oracle/public/OL_7.2_UEKR4_x86_64" diff --git a/builder/oracle/classic/step_upload_image.go b/builder/oracle/classic/step_upload_image.go index 746637042..5833ebfaf 100644 --- a/builder/oracle/classic/step_upload_image.go +++ b/builder/oracle/classic/step_upload_image.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type stepUploadImage struct { diff --git a/builder/oracle/oci/config.go b/builder/oracle/oci/config.go index cc47c893e..847b19f45 100644 --- a/builder/oracle/oci/config.go +++ b/builder/oracle/oci/config.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "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 83de3d0c0..1d3507cfc 100644 --- a/builder/osc/bsu/builder.go +++ b/builder/osc/bsu/builder.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/osc/bsusurrogate/builder.go b/builder/osc/bsusurrogate/builder.go index b38ea3d8d..fe276aa3b 100644 --- a/builder/osc/bsusurrogate/builder.go +++ b/builder/osc/bsusurrogate/builder.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const BuilderId = "oapi.outscale.bsusurrogate" diff --git a/builder/osc/bsusurrogate/root_block_device.go b/builder/osc/bsusurrogate/root_block_device.go index 78616f3d4..987636b12 100644 --- a/builder/osc/bsusurrogate/root_block_device.go +++ b/builder/osc/bsusurrogate/root_block_device.go @@ -3,7 +3,7 @@ package bsusurrogate import ( "errors" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type RootBlockDevice struct { diff --git a/builder/osc/bsuvolume/block_device.go b/builder/osc/bsuvolume/block_device.go index 3217fef7f..e2ee2d375 100644 --- a/builder/osc/bsuvolume/block_device.go +++ b/builder/osc/bsuvolume/block_device.go @@ -2,7 +2,7 @@ package bsuvolume import ( osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type BlockDevice struct { diff --git a/builder/osc/bsuvolume/builder.go b/builder/osc/bsuvolume/builder.go index 48fd55e26..d04366dfd 100644 --- a/builder/osc/bsuvolume/builder.go +++ b/builder/osc/bsuvolume/builder.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const BuilderId = "oapi.outscale.bsuvolume" diff --git a/builder/osc/bsuvolume/step_tag_bsu_volumes.go b/builder/osc/bsuvolume/step_tag_bsu_volumes.go index 06ef9421f..400916c95 100644 --- a/builder/osc/bsuvolume/step_tag_bsu_volumes.go +++ b/builder/osc/bsuvolume/step_tag_bsu_volumes.go @@ -7,7 +7,7 @@ import ( "github.com/antihax/optional" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "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 389fd60d3..3bc45dc51 100644 --- a/builder/osc/chroot/builder.go +++ b/builder/osc/chroot/builder.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/osc/chroot/run_local_commands.go b/builder/osc/chroot/run_local_commands.go index 9a93f8791..b34f3a397 100644 --- a/builder/osc/chroot/run_local_commands.go +++ b/builder/osc/chroot/run_local_commands.go @@ -6,7 +6,7 @@ import ( sl "github.com/hashicorp/packer/common/shell-local" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func RunLocalCommands(commands []string, wrappedCommand CommandWrapper, ictx interpolate.Context, ui packer.Ui) error { diff --git a/builder/osc/chroot/step_create_volume.go b/builder/osc/chroot/step_create_volume.go index cd6bfc499..b60263003 100644 --- a/builder/osc/chroot/step_create_volume.go +++ b/builder/osc/chroot/step_create_volume.go @@ -10,7 +10,7 @@ import ( osccommon "github.com/hashicorp/packer/builder/osc/common" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "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 5a27c1403..5007a339e 100644 --- a/builder/osc/chroot/step_mount_device.go +++ b/builder/osc/chroot/step_mount_device.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type mountPathData struct { diff --git a/builder/osc/common/access_config.go b/builder/osc/common/access_config.go index 46530429b..beb040dfe 100644 --- a/builder/osc/common/access_config.go +++ b/builder/osc/common/access_config.go @@ -7,7 +7,7 @@ import ( "net/http" "os" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/block_device.go b/builder/osc/common/block_device.go index 765adbc80..32484de3e 100644 --- a/builder/osc/common/block_device.go +++ b/builder/osc/common/block_device.go @@ -5,7 +5,7 @@ import ( "log" "strings" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/omi_config.go b/builder/osc/common/omi_config.go index c4c8e5e0d..a316d0298 100644 --- a/builder/osc/common/omi_config.go +++ b/builder/osc/common/omi_config.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // OMIConfig is for common configuration related to creating OMIs. diff --git a/builder/osc/common/run_config.go b/builder/osc/common/run_config.go index ff79d6bc6..d090489cb 100644 --- a/builder/osc/common/run_config.go +++ b/builder/osc/common/run_config.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/packer/common/uuid" "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) var reShutdownBehavior = regexp.MustCompile("^(stop|terminate)$") diff --git a/builder/osc/common/step_create_tags.go b/builder/osc/common/step_create_tags.go index f9a8e46b9..f0382f560 100644 --- a/builder/osc/common/step_create_tags.go +++ b/builder/osc/common/step_create_tags.go @@ -9,7 +9,7 @@ import ( retry "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "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 996973a34..2eb251c47 100644 --- a/builder/osc/common/step_run_source_vm.go +++ b/builder/osc/common/step_run_source_vm.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const ( diff --git a/builder/osc/common/step_update_omi.go b/builder/osc/common/step_update_omi.go index 2be6b4e4f..9857d8482 100644 --- a/builder/osc/common/step_update_omi.go +++ b/builder/osc/common/step_update_omi.go @@ -7,7 +7,7 @@ import ( "github.com/antihax/optional" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "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 77b6525bf..bcb78451b 100644 --- a/builder/osc/common/tags.go +++ b/builder/osc/common/tags.go @@ -7,7 +7,7 @@ import ( "github.com/antihax/optional" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/parallels/common/hw_config.go b/builder/parallels/common/hw_config.go index f803450c8..06e27c411 100644 --- a/builder/parallels/common/hw_config.go +++ b/builder/parallels/common/hw_config.go @@ -5,7 +5,7 @@ package common import ( "fmt" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type HWConfig struct { diff --git a/builder/parallels/common/hw_config_test.go b/builder/parallels/common/hw_config_test.go index 9576eecc7..d6b40ea13 100644 --- a/builder/parallels/common/hw_config_test.go +++ b/builder/parallels/common/hw_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestHWConfigPrepare(t *testing.T) { diff --git a/builder/parallels/common/output_config.go b/builder/parallels/common/output_config.go index 8508c427e..edc93a721 100644 --- a/builder/parallels/common/output_config.go +++ b/builder/parallels/common/output_config.go @@ -8,7 +8,7 @@ import ( "path" "github.com/hashicorp/packer/common" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // OutputConfig contains the configuration for builder's output. diff --git a/builder/parallels/common/output_config_test.go b/builder/parallels/common/output_config_test.go index 0256b5730..6e5ad3752 100644 --- a/builder/parallels/common/output_config_test.go +++ b/builder/parallels/common/output_config_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/hashicorp/packer/common" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestOutputConfigPrepare(t *testing.T) { diff --git a/builder/parallels/common/prlctl_config.go b/builder/parallels/common/prlctl_config.go index d22217651..4db738c82 100644 --- a/builder/parallels/common/prlctl_config.go +++ b/builder/parallels/common/prlctl_config.go @@ -3,7 +3,7 @@ package common import ( - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // PrlctlConfig contains the configuration for running "prlctl" commands diff --git a/builder/parallels/common/prlctl_config_test.go b/builder/parallels/common/prlctl_config_test.go index 31bb5ae91..006ee44d3 100644 --- a/builder/parallels/common/prlctl_config_test.go +++ b/builder/parallels/common/prlctl_config_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestPrlctlConfigPrepare_Prlctl(t *testing.T) { diff --git a/builder/parallels/common/prlctl_post_config.go b/builder/parallels/common/prlctl_post_config.go index 6b8dc43cc..c071e24e9 100644 --- a/builder/parallels/common/prlctl_post_config.go +++ b/builder/parallels/common/prlctl_post_config.go @@ -3,7 +3,7 @@ package common import ( - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // PrlctlPostConfig contains the configuration for running "prlctl" commands diff --git a/builder/parallels/common/prlctl_post_config_test.go b/builder/parallels/common/prlctl_post_config_test.go index bbbcfad89..0f6abf065 100644 --- a/builder/parallels/common/prlctl_post_config_test.go +++ b/builder/parallels/common/prlctl_post_config_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestPrlctlPostConfigPrepare_PrlctlPost(t *testing.T) { diff --git a/builder/parallels/common/prlctl_version_config.go b/builder/parallels/common/prlctl_version_config.go index fd6a5e54e..cd6e7de2e 100644 --- a/builder/parallels/common/prlctl_version_config.go +++ b/builder/parallels/common/prlctl_version_config.go @@ -3,7 +3,7 @@ package common import ( - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // PrlctlVersionConfig contains the configuration for `prlctl` version. diff --git a/builder/parallels/common/prlctl_version_config_test.go b/builder/parallels/common/prlctl_version_config_test.go index cadfb8a4f..32f24f0a6 100644 --- a/builder/parallels/common/prlctl_version_config_test.go +++ b/builder/parallels/common/prlctl_version_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestPrlctlVersionConfigPrepare_BootWait(t *testing.T) { diff --git a/builder/parallels/common/ssh_config.go b/builder/parallels/common/ssh_config.go index 14ba9d1df..270239b35 100644 --- a/builder/parallels/common/ssh_config.go +++ b/builder/parallels/common/ssh_config.go @@ -2,7 +2,7 @@ package common import ( "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // SSHConfig contains the configuration for SSH communicator. diff --git a/builder/parallels/common/ssh_config_test.go b/builder/parallels/common/ssh_config_test.go index 5b190ba6d..e9b42c69a 100644 --- a/builder/parallels/common/ssh_config_test.go +++ b/builder/parallels/common/ssh_config_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func testSSHConfig() *SSHConfig { diff --git a/builder/parallels/common/step_prlctl.go b/builder/parallels/common/step_prlctl.go index eac00f916..43f9941d2 100644 --- a/builder/parallels/common/step_prlctl.go +++ b/builder/parallels/common/step_prlctl.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type commandTemplate struct { diff --git a/builder/parallels/common/step_type_boot_command.go b/builder/parallels/common/step_type_boot_command.go index fdb54ae97..95b7dc5f8 100644 --- a/builder/parallels/common/step_type_boot_command.go +++ b/builder/parallels/common/step_type_boot_command.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/packer/common/bootcommand" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type bootCommandTemplateData struct { diff --git a/builder/parallels/common/step_upload_parallels_tools.go b/builder/parallels/common/step_upload_parallels_tools.go index 85620ff93..b1c2f10dd 100644 --- a/builder/parallels/common/step_upload_parallels_tools.go +++ b/builder/parallels/common/step_upload_parallels_tools.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // This step uploads the Parallels Tools ISO to the virtual machine. diff --git a/builder/parallels/common/tools_config.go b/builder/parallels/common/tools_config.go index 470f25840..00565d1fa 100644 --- a/builder/parallels/common/tools_config.go +++ b/builder/parallels/common/tools_config.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // These are the different valid mode values for "parallels_tools_mode" which diff --git a/builder/parallels/common/tools_config_test.go b/builder/parallels/common/tools_config_test.go index 59321a524..89156fdcd 100644 --- a/builder/parallels/common/tools_config_test.go +++ b/builder/parallels/common/tools_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func testToolsConfig() *ToolsConfig { diff --git a/builder/parallels/iso/builder.go b/builder/parallels/iso/builder.go index 92ca28f42..40549cc20 100644 --- a/builder/parallels/iso/builder.go +++ b/builder/parallels/iso/builder.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const BuilderId = "rickard-von-essen.parallels" diff --git a/builder/parallels/pvm/config.go b/builder/parallels/pvm/config.go index bd9b421f6..0f74308d2 100644 --- a/builder/parallels/pvm/config.go +++ b/builder/parallels/pvm/config.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/packer/common/shutdowncommand" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // Config is the configuration structure for the builder. diff --git a/builder/profitbricks/config.go b/builder/profitbricks/config.go index 275f7b5f2..58155eb90 100644 --- a/builder/profitbricks/config.go +++ b/builder/profitbricks/config.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/builder/proxmox/common/config.go b/builder/proxmox/common/config.go index 1428345f9..63d9277f4 100644 --- a/builder/proxmox/common/config.go +++ b/builder/proxmox/common/config.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/builder/proxmox/common/step_type_boot_command.go b/builder/proxmox/common/step_type_boot_command.go index 17c1ec962..3ba1c910b 100644 --- a/builder/proxmox/common/step_type_boot_command.go +++ b/builder/proxmox/common/step_type_boot_command.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/packer/common/bootcommand" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // stepTypeBootCommand takes the started VM, and sends the keystrokes required to start diff --git a/builder/proxmox/iso/config_test.go b/builder/proxmox/iso/config_test.go index fe519a05b..509d360a2 100644 --- a/builder/proxmox/iso/config_test.go +++ b/builder/proxmox/iso/config_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/hashicorp/packer/template" + "github.com/hashicorp/packer/packer-plugin-sdk/template" ) func TestBasicExampleFromDocsIsValid(t *testing.T) { diff --git a/builder/qemu/comm_config.go b/builder/qemu/comm_config.go index 46b3ab082..45fe39f5d 100644 --- a/builder/qemu/comm_config.go +++ b/builder/qemu/comm_config.go @@ -5,7 +5,7 @@ import ( "errors" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type CommConfig struct { diff --git a/builder/qemu/comm_config_test.go b/builder/qemu/comm_config_test.go index 4912c7d96..150621d0f 100644 --- a/builder/qemu/comm_config_test.go +++ b/builder/qemu/comm_config_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func testCommConfig() *CommConfig { diff --git a/builder/qemu/config.go b/builder/qemu/config.go index 1af05df37..13f6c6320 100644 --- a/builder/qemu/config.go +++ b/builder/qemu/config.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/packer/common/shutdowncommand" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) var accels = map[string]struct{}{ diff --git a/builder/qemu/step_run.go b/builder/qemu/step_run.go index 8fe59f6dc..1273a846e 100644 --- a/builder/qemu/step_run.go +++ b/builder/qemu/step_run.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/go-version" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // stepRun runs the virtual machine diff --git a/builder/qemu/step_type_boot_command.go b/builder/qemu/step_type_boot_command.go index c836db9e3..d183e9777 100644 --- a/builder/qemu/step_type_boot_command.go +++ b/builder/qemu/step_type_boot_command.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/packer/common/bootcommand" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/go-vnc" ) diff --git a/builder/scaleway/config.go b/builder/scaleway/config.go index d5ffba5fc..1c85f9bf0 100644 --- a/builder/scaleway/config.go +++ b/builder/scaleway/config.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/useragent" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" diff --git a/builder/tencentcloud/cvm/access_config.go b/builder/tencentcloud/cvm/access_config.go index 91eb484b8..a1c021fc6 100644 --- a/builder/tencentcloud/cvm/access_config.go +++ b/builder/tencentcloud/cvm/access_config.go @@ -7,7 +7,7 @@ import ( "fmt" "os" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312" ) diff --git a/builder/tencentcloud/cvm/builder.go b/builder/tencentcloud/cvm/builder.go index 30cc4c42d..89c799c18 100644 --- a/builder/tencentcloud/cvm/builder.go +++ b/builder/tencentcloud/cvm/builder.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const BuilderId = "tencent.cloud" diff --git a/builder/tencentcloud/cvm/image_config.go b/builder/tencentcloud/cvm/image_config.go index 3d5b3a324..91f89427f 100644 --- a/builder/tencentcloud/cvm/image_config.go +++ b/builder/tencentcloud/cvm/image_config.go @@ -6,7 +6,7 @@ import ( "fmt" "unicode/utf8" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type TencentCloudImageConfig struct { diff --git a/builder/tencentcloud/cvm/run_config.go b/builder/tencentcloud/cvm/run_config.go index 52fb4d292..31deea558 100644 --- a/builder/tencentcloud/cvm/run_config.go +++ b/builder/tencentcloud/cvm/run_config.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/packer/common/uuid" "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/pkg/errors" ) diff --git a/builder/triton/access_config.go b/builder/triton/access_config.go index 3617f9a90..92dded501 100644 --- a/builder/triton/access_config.go +++ b/builder/triton/access_config.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" tgo "github.com/joyent/triton-go" "github.com/joyent/triton-go/authentication" "github.com/joyent/triton-go/compute" diff --git a/builder/triton/config.go b/builder/triton/config.go index e01fce6dc..6d0a6b128 100644 --- a/builder/triton/config.go +++ b/builder/triton/config.go @@ -5,7 +5,7 @@ package triton import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/builder/triton/source_machine_config.go b/builder/triton/source_machine_config.go index 8733a06b0..cb0292fdb 100644 --- a/builder/triton/source_machine_config.go +++ b/builder/triton/source_machine_config.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/hashicorp/packer/hcl2template" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // SourceMachineConfig represents the configuration to run a machine using diff --git a/builder/triton/target_image_config.go b/builder/triton/target_image_config.go index a9ce24695..f3c62fce4 100644 --- a/builder/triton/target_image_config.go +++ b/builder/triton/target_image_config.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/hashicorp/packer/hcl2template" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // TargetImageConfig represents the configuration for the image to be created diff --git a/builder/ucloud/common/access_config.go b/builder/ucloud/common/access_config.go index 3e0c060e6..192fd35b9 100644 --- a/builder/ucloud/common/access_config.go +++ b/builder/ucloud/common/access_config.go @@ -11,7 +11,7 @@ import ( "runtime" "github.com/hashicorp/packer/builder/ucloud/version" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/ucloud/ucloud-sdk-go/external" "github.com/ucloud/ucloud-sdk-go/private/protocol/http" "github.com/ucloud/ucloud-sdk-go/services/uaccount" diff --git a/builder/ucloud/common/image_config.go b/builder/ucloud/common/image_config.go index 2f327b484..cf312000c 100644 --- a/builder/ucloud/common/image_config.go +++ b/builder/ucloud/common/image_config.go @@ -7,7 +7,7 @@ import ( "fmt" "regexp" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type ImageDestination struct { diff --git a/builder/ucloud/common/run_config.go b/builder/ucloud/common/run_config.go index 84539ba58..30d541848 100644 --- a/builder/ucloud/common/run_config.go +++ b/builder/ucloud/common/run_config.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/packer/common/uuid" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type RunConfig struct { diff --git a/builder/ucloud/uhost/builder.go b/builder/ucloud/uhost/builder.go index ecabecb48..21c9204df 100644 --- a/builder/ucloud/uhost/builder.go +++ b/builder/ucloud/uhost/builder.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/vagrant/builder.go b/builder/vagrant/builder.go index f1bbefc99..8dd88464e 100644 --- a/builder/vagrant/builder.go +++ b/builder/vagrant/builder.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // Builder implements packer.Builder and builds the actual VirtualBox diff --git a/builder/virtualbox/common/comm_config.go b/builder/virtualbox/common/comm_config.go index 03256814a..8fa25b0d3 100644 --- a/builder/virtualbox/common/comm_config.go +++ b/builder/virtualbox/common/comm_config.go @@ -6,7 +6,7 @@ import ( "errors" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type CommConfig struct { diff --git a/builder/virtualbox/common/comm_config_test.go b/builder/virtualbox/common/comm_config_test.go index 777dca492..eb0bc4060 100644 --- a/builder/virtualbox/common/comm_config_test.go +++ b/builder/virtualbox/common/comm_config_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func testCommConfig() *CommConfig { diff --git a/builder/virtualbox/common/export_config.go b/builder/virtualbox/common/export_config.go index f8a468265..113d6cb64 100644 --- a/builder/virtualbox/common/export_config.go +++ b/builder/virtualbox/common/export_config.go @@ -5,7 +5,7 @@ package common import ( "errors" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type ExportConfig struct { diff --git a/builder/virtualbox/common/export_config_test.go b/builder/virtualbox/common/export_config_test.go index fdf6ccc6d..a08a047c0 100644 --- a/builder/virtualbox/common/export_config_test.go +++ b/builder/virtualbox/common/export_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestExportConfigPrepare_BootWait(t *testing.T) { diff --git a/builder/virtualbox/common/guest_additions_config.go b/builder/virtualbox/common/guest_additions_config.go index 5b57c154c..3f8b25bd0 100644 --- a/builder/virtualbox/common/guest_additions_config.go +++ b/builder/virtualbox/common/guest_additions_config.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // These are the different valid mode values for "guest_additions_mode" which diff --git a/builder/virtualbox/common/guest_additions_config_test.go b/builder/virtualbox/common/guest_additions_config_test.go index 210dd2d81..8bd0aa715 100644 --- a/builder/virtualbox/common/guest_additions_config_test.go +++ b/builder/virtualbox/common/guest_additions_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestGuestAdditionsConfigPrepare(t *testing.T) { diff --git a/builder/virtualbox/common/hw_config.go b/builder/virtualbox/common/hw_config.go index 739bc1850..2b86383e4 100644 --- a/builder/virtualbox/common/hw_config.go +++ b/builder/virtualbox/common/hw_config.go @@ -5,7 +5,7 @@ package common import ( "fmt" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type HWConfig struct { diff --git a/builder/virtualbox/common/hw_config_test.go b/builder/virtualbox/common/hw_config_test.go index 9576eecc7..d6b40ea13 100644 --- a/builder/virtualbox/common/hw_config_test.go +++ b/builder/virtualbox/common/hw_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestHWConfigPrepare(t *testing.T) { diff --git a/builder/virtualbox/common/output_config.go b/builder/virtualbox/common/output_config.go index aedfa5cf7..3790998a6 100644 --- a/builder/virtualbox/common/output_config.go +++ b/builder/virtualbox/common/output_config.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/hashicorp/packer/common" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type OutputConfig struct { diff --git a/builder/virtualbox/common/output_config_test.go b/builder/virtualbox/common/output_config_test.go index a5aa0b8fe..a5ac7dfd9 100644 --- a/builder/virtualbox/common/output_config_test.go +++ b/builder/virtualbox/common/output_config_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/common" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestOutputConfigPrepare(t *testing.T) { diff --git a/builder/virtualbox/common/run_config.go b/builder/virtualbox/common/run_config.go index 14c2bf923..a2f8a7ff8 100644 --- a/builder/virtualbox/common/run_config.go +++ b/builder/virtualbox/common/run_config.go @@ -5,7 +5,7 @@ package common import ( "fmt" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type RunConfig struct { diff --git a/builder/virtualbox/common/run_config_test.go b/builder/virtualbox/common/run_config_test.go index b29fb5ee8..e96d50c6a 100644 --- a/builder/virtualbox/common/run_config_test.go +++ b/builder/virtualbox/common/run_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestRunConfigPrepare_VRDPBindAddress(t *testing.T) { diff --git a/builder/virtualbox/common/shutdown_config.go b/builder/virtualbox/common/shutdown_config.go index 29f0b0b72..963f32d91 100644 --- a/builder/virtualbox/common/shutdown_config.go +++ b/builder/virtualbox/common/shutdown_config.go @@ -5,7 +5,7 @@ package common import ( "time" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type ShutdownConfig struct { diff --git a/builder/virtualbox/common/shutdown_config_test.go b/builder/virtualbox/common/shutdown_config_test.go index 3e177fd5f..4d68d6e1c 100644 --- a/builder/virtualbox/common/shutdown_config_test.go +++ b/builder/virtualbox/common/shutdown_config_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func testShutdownConfig() *ShutdownConfig { diff --git a/builder/virtualbox/common/step_download_guest_additions.go b/builder/virtualbox/common/step_download_guest_additions.go index ba111fea2..3e3e2936e 100644 --- a/builder/virtualbox/common/step_download_guest_additions.go +++ b/builder/virtualbox/common/step_download_guest_additions.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer/tmp" - "github.com/hashicorp/packer/template/interpolate" ) var additionsVersionMap = map[string]string{ diff --git a/builder/virtualbox/common/step_type_boot_command.go b/builder/virtualbox/common/step_type_boot_command.go index 404a02a32..e152318ef 100644 --- a/builder/virtualbox/common/step_type_boot_command.go +++ b/builder/virtualbox/common/step_type_boot_command.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const KeyLeftShift uint32 = 0xFFE1 diff --git a/builder/virtualbox/common/step_upload_guest_additions.go b/builder/virtualbox/common/step_upload_guest_additions.go index 98f46a982..739f20c8c 100644 --- a/builder/virtualbox/common/step_upload_guest_additions.go +++ b/builder/virtualbox/common/step_upload_guest_additions.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type guestAdditionsPathTemplate struct { diff --git a/builder/virtualbox/common/step_vboxmanage.go b/builder/virtualbox/common/step_vboxmanage.go index 12fe42671..1428a9d21 100644 --- a/builder/virtualbox/common/step_vboxmanage.go +++ b/builder/virtualbox/common/step_vboxmanage.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type commandTemplate struct { diff --git a/builder/virtualbox/common/vbox_version_config.go b/builder/virtualbox/common/vbox_version_config.go index 4e81f4fa0..be7b793a4 100644 --- a/builder/virtualbox/common/vbox_version_config.go +++ b/builder/virtualbox/common/vbox_version_config.go @@ -5,7 +5,7 @@ package common import ( "fmt" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type VBoxVersionConfig struct { diff --git a/builder/virtualbox/common/vbox_version_config_test.go b/builder/virtualbox/common/vbox_version_config_test.go index 398a0aa11..0ed1f9e33 100644 --- a/builder/virtualbox/common/vbox_version_config_test.go +++ b/builder/virtualbox/common/vbox_version_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestVBoxVersionConfigPrepare_BootWait(t *testing.T) { diff --git a/builder/virtualbox/common/vboxbundle_config.go b/builder/virtualbox/common/vboxbundle_config.go index 8936eacf2..8386a7f63 100644 --- a/builder/virtualbox/common/vboxbundle_config.go +++ b/builder/virtualbox/common/vboxbundle_config.go @@ -3,7 +3,7 @@ package common import ( - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type VBoxBundleConfig struct { diff --git a/builder/virtualbox/common/vboxbundle_config_test.go b/builder/virtualbox/common/vboxbundle_config_test.go index 53ccca8b6..2509a2f34 100644 --- a/builder/virtualbox/common/vboxbundle_config_test.go +++ b/builder/virtualbox/common/vboxbundle_config_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestVBoxBundleConfigPrepare_VBoxBundle(t *testing.T) { diff --git a/builder/virtualbox/common/vboxmanage_config.go b/builder/virtualbox/common/vboxmanage_config.go index c73010c2a..3664d3098 100644 --- a/builder/virtualbox/common/vboxmanage_config.go +++ b/builder/virtualbox/common/vboxmanage_config.go @@ -3,7 +3,7 @@ package common import ( - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) //In order to perform extra customization of the virtual machine, a template can diff --git a/builder/virtualbox/common/vboxmanage_config_test.go b/builder/virtualbox/common/vboxmanage_config_test.go index a35fe2cae..1b7f0c671 100644 --- a/builder/virtualbox/common/vboxmanage_config_test.go +++ b/builder/virtualbox/common/vboxmanage_config_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestVBoxManageConfigPrepare_VBoxManage(t *testing.T) { diff --git a/builder/virtualbox/iso/builder.go b/builder/virtualbox/iso/builder.go index 207473f7a..f2b18b94f 100644 --- a/builder/virtualbox/iso/builder.go +++ b/builder/virtualbox/iso/builder.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const BuilderId = "mitchellh.virtualbox" diff --git a/builder/virtualbox/ovf/config.go b/builder/virtualbox/ovf/config.go index ac8be5e7b..ab14c132c 100644 --- a/builder/virtualbox/ovf/config.go +++ b/builder/virtualbox/ovf/config.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/packer/common/bootcommand" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // Config is the configuration structure for the builder. diff --git a/builder/virtualbox/vm/config.go b/builder/virtualbox/vm/config.go index 6f4b6b823..690141c97 100644 --- a/builder/virtualbox/vm/config.go +++ b/builder/virtualbox/vm/config.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/packer/common/bootcommand" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // Config is the configuration structure for the builder. diff --git a/builder/vmware/common/disk_config.go b/builder/vmware/common/disk_config.go index a6e844db7..96fc8fe09 100644 --- a/builder/vmware/common/disk_config.go +++ b/builder/vmware/common/disk_config.go @@ -3,7 +3,7 @@ package common import ( - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type DiskConfig struct { diff --git a/builder/vmware/common/driver_config.go b/builder/vmware/common/driver_config.go index 8e45ff293..82fc0a23d 100644 --- a/builder/vmware/common/driver_config.go +++ b/builder/vmware/common/driver_config.go @@ -6,7 +6,7 @@ import ( "fmt" "os" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type DriverConfig struct { diff --git a/builder/vmware/common/driver_config_test.go b/builder/vmware/common/driver_config_test.go index ccb7d545e..6bba215a9 100644 --- a/builder/vmware/common/driver_config_test.go +++ b/builder/vmware/common/driver_config_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestDriverConfigPrepare(t *testing.T) { diff --git a/builder/vmware/common/driver_esx5.go b/builder/vmware/common/driver_esx5.go index 9b2ceff90..d713a5cc4 100644 --- a/builder/vmware/common/driver_esx5.go +++ b/builder/vmware/common/driver_esx5.go @@ -32,7 +32,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" helperssh "github.com/hashicorp/packer/helper/ssh" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/sdk-internals/communicator/ssh" + "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh" gossh "golang.org/x/crypto/ssh" ) diff --git a/builder/vmware/common/export_config.go b/builder/vmware/common/export_config.go index 0d38e6176..505795041 100644 --- a/builder/vmware/common/export_config.go +++ b/builder/vmware/common/export_config.go @@ -5,7 +5,7 @@ package common import ( "fmt" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type ExportConfig struct { diff --git a/builder/vmware/common/hw_config.go b/builder/vmware/common/hw_config.go index 4a432d92e..ecc764921 100644 --- a/builder/vmware/common/hw_config.go +++ b/builder/vmware/common/hw_config.go @@ -8,7 +8,7 @@ import ( "runtime" "strings" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type HWConfig struct { diff --git a/builder/vmware/common/hw_config_test.go b/builder/vmware/common/hw_config_test.go index d523aecb3..46d1d6ff1 100644 --- a/builder/vmware/common/hw_config_test.go +++ b/builder/vmware/common/hw_config_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestHWConfigPrepare(t *testing.T) { diff --git a/builder/vmware/common/output_config.go b/builder/vmware/common/output_config.go index 5cc859a64..bcc0c7df4 100644 --- a/builder/vmware/common/output_config.go +++ b/builder/vmware/common/output_config.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/hashicorp/packer/common" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type OutputConfig struct { diff --git a/builder/vmware/common/output_config_test.go b/builder/vmware/common/output_config_test.go index 6dd522d98..6d46d2089 100644 --- a/builder/vmware/common/output_config_test.go +++ b/builder/vmware/common/output_config_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/hashicorp/packer/common" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestOutputConfigPrepare(t *testing.T) { diff --git a/builder/vmware/common/run_config.go b/builder/vmware/common/run_config.go index 06af92bca..67d2da30d 100644 --- a/builder/vmware/common/run_config.go +++ b/builder/vmware/common/run_config.go @@ -5,7 +5,7 @@ package common import ( "fmt" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // ~> **Note:** If [vnc_over_websocket](#vnc_over_websocket) is set to true, any other VNC configuration will be ignored. diff --git a/builder/vmware/common/run_config_test.go b/builder/vmware/common/run_config_test.go index 6b2cea1cc..6119223eb 100644 --- a/builder/vmware/common/run_config_test.go +++ b/builder/vmware/common/run_config_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/hashicorp/packer/common/bootcommand" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestRunConfig_Prepare(t *testing.T) { diff --git a/builder/vmware/common/ssh_config.go b/builder/vmware/common/ssh_config.go index aa83c3692..b386c629b 100644 --- a/builder/vmware/common/ssh_config.go +++ b/builder/vmware/common/ssh_config.go @@ -4,7 +4,7 @@ package common import ( "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type SSHConfig struct { diff --git a/builder/vmware/common/ssh_config_test.go b/builder/vmware/common/ssh_config_test.go index 5b190ba6d..e9b42c69a 100644 --- a/builder/vmware/common/ssh_config_test.go +++ b/builder/vmware/common/ssh_config_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func testSSHConfig() *SSHConfig { diff --git a/builder/vmware/common/step_upload_tools.go b/builder/vmware/common/step_upload_tools.go index d76836b10..94f7072f4 100644 --- a/builder/vmware/common/step_upload_tools.go +++ b/builder/vmware/common/step_upload_tools.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type toolsUploadPathTemplate struct { diff --git a/builder/vmware/common/step_vnc_boot_command.go b/builder/vmware/common/step_vnc_boot_command.go index 0471fbc07..ff35cfed2 100644 --- a/builder/vmware/common/step_vnc_boot_command.go +++ b/builder/vmware/common/step_vnc_boot_command.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/common/bootcommand" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/go-vnc" ) diff --git a/builder/vmware/common/tools_config.go b/builder/vmware/common/tools_config.go index dd37831bf..53cad2e00 100644 --- a/builder/vmware/common/tools_config.go +++ b/builder/vmware/common/tools_config.go @@ -5,7 +5,7 @@ package common import ( "fmt" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type ToolsConfig struct { diff --git a/builder/vmware/common/tools_config_test.go b/builder/vmware/common/tools_config_test.go index 8294661ca..272671c14 100644 --- a/builder/vmware/common/tools_config_test.go +++ b/builder/vmware/common/tools_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestToolsConfigPrepare_Empty(t *testing.T) { diff --git a/builder/vmware/common/vmx_config.go b/builder/vmware/common/vmx_config.go index b7ee6a0e7..6c5b330d0 100644 --- a/builder/vmware/common/vmx_config.go +++ b/builder/vmware/common/vmx_config.go @@ -3,7 +3,7 @@ package common import ( - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type VMXConfig struct { diff --git a/builder/vmware/common/vmx_config_test.go b/builder/vmware/common/vmx_config_test.go index cf6bdc6fd..a192d6d6a 100644 --- a/builder/vmware/common/vmx_config_test.go +++ b/builder/vmware/common/vmx_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestVMXConfigPrepare(t *testing.T) { diff --git a/builder/vmware/iso/config.go b/builder/vmware/iso/config.go index becb555c3..e40f7320c 100644 --- a/builder/vmware/iso/config.go +++ b/builder/vmware/iso/config.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/packer/common/shutdowncommand" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/builder/vmware/iso/step_create_vmx.go b/builder/vmware/iso/step_create_vmx.go index d764d5aeb..04c796a5e 100644 --- a/builder/vmware/iso/step_create_vmx.go +++ b/builder/vmware/iso/step_create_vmx.go @@ -12,8 +12,8 @@ import ( 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/template/interpolate" "github.com/hashicorp/packer/packer/tmp" - "github.com/hashicorp/packer/template/interpolate" ) type vmxTemplateData struct { diff --git a/builder/vmware/iso/step_create_vmx_test.go b/builder/vmware/iso/step_create_vmx_test.go index 480afccc3..9982998f8 100644 --- a/builder/vmware/iso/step_create_vmx_test.go +++ b/builder/vmware/iso/step_create_vmx_test.go @@ -16,8 +16,8 @@ import ( "testing" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template" "github.com/hashicorp/packer/provisioner/shell" - "github.com/hashicorp/packer/template" ) var vmxTestBuilderConfig = map[string]string{ diff --git a/builder/vmware/vmx/config.go b/builder/vmware/vmx/config.go index e7c34616e..060030a85 100644 --- a/builder/vmware/vmx/config.go +++ b/builder/vmware/vmx/config.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/packer/common/shutdowncommand" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // Config is the configuration structure for the builder. diff --git a/builder/vsphere/clone/config.go b/builder/vsphere/clone/config.go index f7b2fd588..1d0bd7388 100644 --- a/builder/vsphere/clone/config.go +++ b/builder/vsphere/clone/config.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/builder/vsphere/common/output_config.go b/builder/vsphere/common/output_config.go index 8692a507a..ddf9af1c4 100644 --- a/builder/vsphere/common/output_config.go +++ b/builder/vsphere/common/output_config.go @@ -9,7 +9,7 @@ import ( "path/filepath" "github.com/hashicorp/packer/common" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type OutputConfig struct { diff --git a/builder/vsphere/common/step_boot_command.go b/builder/vsphere/common/step_boot_command.go index 5f831f070..1c8f28cc6 100644 --- a/builder/vsphere/common/step_boot_command.go +++ b/builder/vsphere/common/step_boot_command.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/packer/common/bootcommand" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "golang.org/x/mobile/event/key" ) diff --git a/builder/vsphere/common/step_export.go b/builder/vsphere/common/step_export.go index a50a329b4..057b732c7 100644 --- a/builder/vsphere/common/step_export.go +++ b/builder/vsphere/common/step_export.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/pkg/errors" "github.com/vmware/govmomi/nfc" "github.com/vmware/govmomi/vim25/soap" diff --git a/builder/vsphere/common/step_import_to_content_library.go b/builder/vsphere/common/step_import_to_content_library.go index 2e5be7a39..91720389c 100644 --- a/builder/vsphere/common/step_import_to_content_library.go +++ b/builder/vsphere/common/step_import_to_content_library.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/builder/vsphere/driver" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/vmware/govmomi/vapi/vcenter" ) diff --git a/builder/vsphere/iso/config.go b/builder/vsphere/iso/config.go index 791f80cc9..95cf4e3bd 100644 --- a/builder/vsphere/iso/config.go +++ b/builder/vsphere/iso/config.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/builder/yandex/access_config.go b/builder/yandex/access_config.go index 89a150e05..9554d0b83 100644 --- a/builder/yandex/access_config.go +++ b/builder/yandex/access_config.go @@ -8,7 +8,7 @@ import ( "os" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/yandex-cloud/go-sdk/iamkey" ) diff --git a/builder/yandex/config.go b/builder/yandex/config.go index 12b7245b3..7a0f6b75a 100644 --- a/builder/yandex/config.go +++ b/builder/yandex/config.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const defaultGpuPlatformID = "gpu-standard-v1" diff --git a/command/build.go b/command/build.go index ce1421315..da0036ed1 100644 --- a/command/build.go +++ b/command/build.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/hcl/v2/hclparse" "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template" + "github.com/hashicorp/packer/packer-plugin-sdk/template" "github.com/hashicorp/packer/version" "golang.org/x/sync/semaphore" diff --git a/command/fix.go b/command/fix.go index 7e382eed9..6672d9035 100644 --- a/command/fix.go +++ b/command/fix.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/hashicorp/packer/fix" - "github.com/hashicorp/packer/template" + "github.com/hashicorp/packer/packer-plugin-sdk/template" "github.com/posener/complete" ) diff --git a/command/hcl2_upgrade.go b/command/hcl2_upgrade.go index 9da3dc645..40e39fc62 100644 --- a/command/hcl2_upgrade.go +++ b/command/hcl2_upgrade.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/hcl/v2/hclwrite" hcl2shim "github.com/hashicorp/packer/hcl2template/shim" - "github.com/hashicorp/packer/template" + "github.com/hashicorp/packer/packer-plugin-sdk/template" "github.com/posener/complete" "github.com/zclconf/go-cty/cty" ) diff --git a/command/meta.go b/command/meta.go index 50c767892..2d35fc9ab 100644 --- a/command/meta.go +++ b/command/meta.go @@ -9,7 +9,7 @@ import ( kvflag "github.com/hashicorp/packer/helper/flag-kv" "github.com/hashicorp/packer/helper/wrappedstreams" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template" + "github.com/hashicorp/packer/packer-plugin-sdk/template" ) // FlagSetFlags is an enum to define what flags are present in the diff --git a/common/bootcommand/config.go b/common/bootcommand/config.go index 8a1cff791..ad5e8b700 100644 --- a/common/bootcommand/config.go +++ b/common/bootcommand/config.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The boot configuration is very important: `boot_command` specifies the keys diff --git a/common/bootcommand/config_test.go b/common/bootcommand/config_test.go index 0f56e1c15..6abf9b0ad 100644 --- a/common/bootcommand/config_test.go +++ b/common/bootcommand/config_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestConfigPrepare(t *testing.T) { diff --git a/common/chroot/interpolate_context_provider.go b/common/chroot/interpolate_context_provider.go index ee19a19de..9d30b0dc1 100644 --- a/common/chroot/interpolate_context_provider.go +++ b/common/chroot/interpolate_context_provider.go @@ -1,6 +1,6 @@ package chroot -import "github.com/hashicorp/packer/template/interpolate" +import "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" type interpolateContextProvider interface { GetContext() interpolate.Context diff --git a/common/chroot/run_local_commands.go b/common/chroot/run_local_commands.go index 8141d09e5..c760abb8c 100644 --- a/common/chroot/run_local_commands.go +++ b/common/chroot/run_local_commands.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/packer/common" sl "github.com/hashicorp/packer/common/shell-local" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func RunLocalCommands(commands []string, wrappedCommand common.CommandWrapper, ictx interpolate.Context, ui packer.Ui) error { diff --git a/common/extra_iso_config.go b/common/extra_iso_config.go index 56665bbc3..5f4707c27 100644 --- a/common/extra_iso_config.go +++ b/common/extra_iso_config.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // An iso (CD) containing custom files can be made available for your build. diff --git a/common/floppy_config.go b/common/floppy_config.go index 5a78b4f7a..175d36f73 100644 --- a/common/floppy_config.go +++ b/common/floppy_config.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // A floppy can be made available for your build. This is most useful for diff --git a/common/http_config.go b/common/http_config.go index 4977b68ce..0cb176eb4 100644 --- a/common/http_config.go +++ b/common/http_config.go @@ -5,7 +5,7 @@ package common import ( "errors" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // Packer will create an http server serving `http_directory` when it is set, a diff --git a/common/iso_config.go b/common/iso_config.go index a84d5076d..14addecd1 100644 --- a/common/iso_config.go +++ b/common/iso_config.go @@ -12,7 +12,7 @@ import ( getter "github.com/hashicorp/go-getter/v2" urlhelper "github.com/hashicorp/go-getter/v2/helper/url" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // By default, Packer will symlink, download or copy image files to the Packer diff --git a/common/shell-local/config.go b/common/shell-local/config.go index cc819ae30..e86d82676 100644 --- a/common/shell-local/config.go +++ b/common/shell-local/config.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/packer/common/shell" configHelper "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/common/shell-local/run.go b/common/shell-local/run.go index 7bf657123..85ade3696 100644 --- a/common/shell-local/run.go +++ b/common/shell-local/run.go @@ -13,8 +13,8 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer/tmp" - "github.com/hashicorp/packer/template/interpolate" ) func Run(ctx context.Context, ui packer.Ui, config *Config, generatedData map[string]interface{}) (bool, error) { diff --git a/common/shutdowncommand/config.go b/common/shutdowncommand/config.go index efea7db8d..ba8427206 100644 --- a/common/shutdowncommand/config.go +++ b/common/shutdowncommand/config.go @@ -5,7 +5,7 @@ package shutdowncommand import ( "time" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type ShutdownConfig struct { diff --git a/common/shutdowncommand/config_test.go b/common/shutdowncommand/config_test.go index ada363a2f..50380b926 100644 --- a/common/shutdowncommand/config_test.go +++ b/common/shutdowncommand/config_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func testShutdownConfig() *ShutdownConfig { diff --git a/common/template/funcs.go b/common/template/funcs.go index 06911cfdb..01d19d25a 100644 --- a/common/template/funcs.go +++ b/common/template/funcs.go @@ -9,7 +9,7 @@ import ( "sync" consulapi "github.com/hashicorp/consul/api" - awssmapi "github.com/hashicorp/packer/template/interpolate/aws/secretsmanager" + awssmapi "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate/aws/secretsmanager" vaultapi "github.com/hashicorp/vault/api" ) diff --git a/helper/builder/testing/testing.go b/helper/builder/testing/testing.go index 06b0a31b6..dc4129e74 100644 --- a/helper/builder/testing/testing.go +++ b/helper/builder/testing/testing.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template" + "github.com/hashicorp/packer/packer-plugin-sdk/template" ) // TestEnvVar must be set to a non-empty value for acceptance tests to run. diff --git a/helper/communicator/config.go b/helper/communicator/config.go index e6a346db7..62b0fafde 100644 --- a/helper/communicator/config.go +++ b/helper/communicator/config.go @@ -16,8 +16,8 @@ import ( "github.com/hashicorp/packer/helper/multistep" helperssh "github.com/hashicorp/packer/helper/ssh" "github.com/hashicorp/packer/packer" - packerssh "github.com/hashicorp/packer/sdk-internals/communicator/ssh" - "github.com/hashicorp/packer/template/interpolate" + 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" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" diff --git a/helper/communicator/config_test.go b/helper/communicator/config_test.go index b09916d0c..a6bbba87f 100644 --- a/helper/communicator/config_test.go +++ b/helper/communicator/config_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/packer/helper/multistep" - "github.com/hashicorp/packer/template/interpolate" + "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 a8dc18dd0..6fed68d23 100644 --- a/helper/communicator/step_connect.go +++ b/helper/communicator/step_connect.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/sdk-internals/communicator/none" + "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 4f00000df..80ccf3422 100644 --- a/helper/communicator/step_connect_ssh.go +++ b/helper/communicator/step_connect_ssh.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" helperssh "github.com/hashicorp/packer/helper/ssh" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/sdk-internals/communicator/ssh" + "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh" gossh "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" "golang.org/x/net/proxy" diff --git a/helper/communicator/step_connect_winrm.go b/helper/communicator/step_connect_winrm.go index 81ec99a2f..21c6fef7b 100644 --- a/helper/communicator/step_connect_winrm.go +++ b/helper/communicator/step_connect_winrm.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/sdk-internals/communicator/winrm" + "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/config/decode.go b/helper/config/decode.go index 0bd1b0950..4aa78530e 100644 --- a/helper/config/decode.go +++ b/helper/config/decode.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/go-multierror" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" "github.com/ryanuber/go-glob" "github.com/zclconf/go-cty/cty" diff --git a/helper/config/decode_test.go b/helper/config/decode_test.go index 4bc68d93a..d5caafb4c 100644 --- a/helper/config/decode_test.go +++ b/helper/config/decode_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) func TestDecode(t *testing.T) { diff --git a/helper/ssh/tunnel.go b/helper/ssh/tunnel.go index ea73a57f7..a9695d011 100644 --- a/helper/ssh/tunnel.go +++ b/helper/ssh/tunnel.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/hashicorp/packer/sdk-internals/communicator/ssh" + "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh" ) // ParseTunnelArgument parses an SSH tunneling argument compatible with the openssh client form. diff --git a/helper/ssh/tunnel_test.go b/helper/ssh/tunnel_test.go index cc81de031..e834201b7 100644 --- a/helper/ssh/tunnel_test.go +++ b/helper/ssh/tunnel_test.go @@ -3,7 +3,7 @@ package ssh import ( "testing" - "github.com/hashicorp/packer/sdk-internals/communicator/ssh" + "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh" ) const ( diff --git a/sdk-internals/communicator/none/communicator.go b/packer-plugin-sdk/sdk-internals/communicator/none/communicator.go similarity index 100% rename from sdk-internals/communicator/none/communicator.go rename to packer-plugin-sdk/sdk-internals/communicator/none/communicator.go diff --git a/sdk-internals/communicator/none/communicator_test.go b/packer-plugin-sdk/sdk-internals/communicator/none/communicator_test.go similarity index 100% rename from sdk-internals/communicator/none/communicator_test.go rename to packer-plugin-sdk/sdk-internals/communicator/none/communicator_test.go diff --git a/sdk-internals/communicator/ssh/communicator.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/communicator.go similarity index 100% rename from sdk-internals/communicator/ssh/communicator.go rename to packer-plugin-sdk/sdk-internals/communicator/ssh/communicator.go diff --git a/sdk-internals/communicator/ssh/communicator_test.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/communicator_test.go similarity index 100% rename from sdk-internals/communicator/ssh/communicator_test.go rename to packer-plugin-sdk/sdk-internals/communicator/ssh/communicator_test.go diff --git a/sdk-internals/communicator/ssh/connect.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/connect.go similarity index 100% rename from sdk-internals/communicator/ssh/connect.go rename to packer-plugin-sdk/sdk-internals/communicator/ssh/connect.go diff --git a/sdk-internals/communicator/ssh/connect_test.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/connect_test.go similarity index 100% rename from sdk-internals/communicator/ssh/connect_test.go rename to packer-plugin-sdk/sdk-internals/communicator/ssh/connect_test.go diff --git a/sdk-internals/communicator/ssh/connection.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/connection.go similarity index 100% rename from sdk-internals/communicator/ssh/connection.go rename to packer-plugin-sdk/sdk-internals/communicator/ssh/connection.go diff --git a/sdk-internals/communicator/ssh/keyboard_interactive.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/keyboard_interactive.go similarity index 100% rename from sdk-internals/communicator/ssh/keyboard_interactive.go rename to packer-plugin-sdk/sdk-internals/communicator/ssh/keyboard_interactive.go diff --git a/sdk-internals/communicator/ssh/keyboard_interactive_test.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/keyboard_interactive_test.go similarity index 100% rename from sdk-internals/communicator/ssh/keyboard_interactive_test.go rename to packer-plugin-sdk/sdk-internals/communicator/ssh/keyboard_interactive_test.go diff --git a/sdk-internals/communicator/ssh/password.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/password.go similarity index 100% rename from sdk-internals/communicator/ssh/password.go rename to packer-plugin-sdk/sdk-internals/communicator/ssh/password.go diff --git a/sdk-internals/communicator/ssh/password_test.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/password_test.go similarity index 100% rename from sdk-internals/communicator/ssh/password_test.go rename to packer-plugin-sdk/sdk-internals/communicator/ssh/password_test.go diff --git a/sdk-internals/communicator/ssh/tunnel.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/tunnel.go similarity index 100% rename from sdk-internals/communicator/ssh/tunnel.go rename to packer-plugin-sdk/sdk-internals/communicator/ssh/tunnel.go diff --git a/sdk-internals/communicator/winrm/communicator.go b/packer-plugin-sdk/sdk-internals/communicator/winrm/communicator.go similarity index 100% rename from sdk-internals/communicator/winrm/communicator.go rename to packer-plugin-sdk/sdk-internals/communicator/winrm/communicator.go diff --git a/sdk-internals/communicator/winrm/communicator_test.go b/packer-plugin-sdk/sdk-internals/communicator/winrm/communicator_test.go similarity index 100% rename from sdk-internals/communicator/winrm/communicator_test.go rename to packer-plugin-sdk/sdk-internals/communicator/winrm/communicator_test.go diff --git a/sdk-internals/communicator/winrm/config.go b/packer-plugin-sdk/sdk-internals/communicator/winrm/config.go similarity index 100% rename from sdk-internals/communicator/winrm/config.go rename to packer-plugin-sdk/sdk-internals/communicator/winrm/config.go diff --git a/sdk-internals/communicator/winrm/time.go b/packer-plugin-sdk/sdk-internals/communicator/winrm/time.go similarity index 100% rename from sdk-internals/communicator/winrm/time.go rename to packer-plugin-sdk/sdk-internals/communicator/winrm/time.go diff --git a/sdk-internals/communicator/winrm/time_test.go b/packer-plugin-sdk/sdk-internals/communicator/winrm/time_test.go similarity index 100% rename from sdk-internals/communicator/winrm/time_test.go rename to packer-plugin-sdk/sdk-internals/communicator/winrm/time_test.go diff --git a/template/interpolate/aws/secretsmanager/secretsmanager.go b/packer-plugin-sdk/template/interpolate/aws/secretsmanager/secretsmanager.go similarity index 100% rename from template/interpolate/aws/secretsmanager/secretsmanager.go rename to packer-plugin-sdk/template/interpolate/aws/secretsmanager/secretsmanager.go diff --git a/template/interpolate/aws/secretsmanager/secretsmanager_test.go b/packer-plugin-sdk/template/interpolate/aws/secretsmanager/secretsmanager_test.go similarity index 100% rename from template/interpolate/aws/secretsmanager/secretsmanager_test.go rename to packer-plugin-sdk/template/interpolate/aws/secretsmanager/secretsmanager_test.go diff --git a/template/interpolate/aws/secretsmanager/types.go b/packer-plugin-sdk/template/interpolate/aws/secretsmanager/types.go similarity index 100% rename from template/interpolate/aws/secretsmanager/types.go rename to packer-plugin-sdk/template/interpolate/aws/secretsmanager/types.go diff --git a/template/interpolate/funcs.go b/packer-plugin-sdk/template/interpolate/funcs.go similarity index 100% rename from template/interpolate/funcs.go rename to packer-plugin-sdk/template/interpolate/funcs.go diff --git a/template/interpolate/funcs_test.go b/packer-plugin-sdk/template/interpolate/funcs_test.go similarity index 100% rename from template/interpolate/funcs_test.go rename to packer-plugin-sdk/template/interpolate/funcs_test.go diff --git a/template/interpolate/i.go b/packer-plugin-sdk/template/interpolate/i.go similarity index 100% rename from template/interpolate/i.go rename to packer-plugin-sdk/template/interpolate/i.go diff --git a/template/interpolate/i_test.go b/packer-plugin-sdk/template/interpolate/i_test.go similarity index 100% rename from template/interpolate/i_test.go rename to packer-plugin-sdk/template/interpolate/i_test.go diff --git a/template/interpolate/parse.go b/packer-plugin-sdk/template/interpolate/parse.go similarity index 100% rename from template/interpolate/parse.go rename to packer-plugin-sdk/template/interpolate/parse.go diff --git a/template/interpolate/parse_test.go b/packer-plugin-sdk/template/interpolate/parse_test.go similarity index 100% rename from template/interpolate/parse_test.go rename to packer-plugin-sdk/template/interpolate/parse_test.go diff --git a/template/interpolate/render.go b/packer-plugin-sdk/template/interpolate/render.go similarity index 100% rename from template/interpolate/render.go rename to packer-plugin-sdk/template/interpolate/render.go diff --git a/template/interpolate/render_test.go b/packer-plugin-sdk/template/interpolate/render_test.go similarity index 100% rename from template/interpolate/render_test.go rename to packer-plugin-sdk/template/interpolate/render_test.go diff --git a/template/parse.go b/packer-plugin-sdk/template/parse.go similarity index 100% rename from template/parse.go rename to packer-plugin-sdk/template/parse.go diff --git a/template/parse_test.go b/packer-plugin-sdk/template/parse_test.go similarity index 100% rename from template/parse_test.go rename to packer-plugin-sdk/template/parse_test.go diff --git a/template/template.go b/packer-plugin-sdk/template/template.go similarity index 100% rename from template/template.go rename to packer-plugin-sdk/template/template.go diff --git a/template/template.hcl2spec.go b/packer-plugin-sdk/template/template.hcl2spec.go similarity index 100% rename from template/template.hcl2spec.go rename to packer-plugin-sdk/template/template.hcl2spec.go diff --git a/template/template_test.go b/packer-plugin-sdk/template/template_test.go similarity index 100% rename from template/template_test.go rename to packer-plugin-sdk/template/template_test.go diff --git a/template/test-fixtures/error-beginning.json b/packer-plugin-sdk/template/test-fixtures/error-beginning.json similarity index 100% rename from template/test-fixtures/error-beginning.json rename to packer-plugin-sdk/template/test-fixtures/error-beginning.json diff --git a/template/test-fixtures/error-duplicate-config.json b/packer-plugin-sdk/template/test-fixtures/error-duplicate-config.json similarity index 100% rename from template/test-fixtures/error-duplicate-config.json rename to packer-plugin-sdk/template/test-fixtures/error-duplicate-config.json diff --git a/template/test-fixtures/error-duplicate-variables.json b/packer-plugin-sdk/template/test-fixtures/error-duplicate-variables.json similarity index 100% rename from template/test-fixtures/error-duplicate-variables.json rename to packer-plugin-sdk/template/test-fixtures/error-duplicate-variables.json diff --git a/template/test-fixtures/error-end.json b/packer-plugin-sdk/template/test-fixtures/error-end.json similarity index 100% rename from template/test-fixtures/error-end.json rename to packer-plugin-sdk/template/test-fixtures/error-end.json diff --git a/template/test-fixtures/error-middle.json b/packer-plugin-sdk/template/test-fixtures/error-middle.json similarity index 100% rename from template/test-fixtures/error-middle.json rename to packer-plugin-sdk/template/test-fixtures/error-middle.json diff --git a/template/test-fixtures/malformed.json b/packer-plugin-sdk/template/test-fixtures/malformed.json similarity index 100% rename from template/test-fixtures/malformed.json rename to packer-plugin-sdk/template/test-fixtures/malformed.json diff --git a/template/test-fixtures/parse-basic-config.json b/packer-plugin-sdk/template/test-fixtures/parse-basic-config.json similarity index 100% rename from template/test-fixtures/parse-basic-config.json rename to packer-plugin-sdk/template/test-fixtures/parse-basic-config.json diff --git a/template/test-fixtures/parse-basic.json b/packer-plugin-sdk/template/test-fixtures/parse-basic.json similarity index 100% rename from template/test-fixtures/parse-basic.json rename to packer-plugin-sdk/template/test-fixtures/parse-basic.json diff --git a/template/test-fixtures/parse-builder-no-type.json b/packer-plugin-sdk/template/test-fixtures/parse-builder-no-type.json similarity index 100% rename from template/test-fixtures/parse-builder-no-type.json rename to packer-plugin-sdk/template/test-fixtures/parse-builder-no-type.json diff --git a/template/test-fixtures/parse-builder-repeat.json b/packer-plugin-sdk/template/test-fixtures/parse-builder-repeat.json similarity index 100% rename from template/test-fixtures/parse-builder-repeat.json rename to packer-plugin-sdk/template/test-fixtures/parse-builder-repeat.json diff --git a/template/test-fixtures/parse-comment.json b/packer-plugin-sdk/template/test-fixtures/parse-comment.json similarity index 100% rename from template/test-fixtures/parse-comment.json rename to packer-plugin-sdk/template/test-fixtures/parse-comment.json diff --git a/template/test-fixtures/parse-contents.json b/packer-plugin-sdk/template/test-fixtures/parse-contents.json similarity index 100% rename from template/test-fixtures/parse-contents.json rename to packer-plugin-sdk/template/test-fixtures/parse-contents.json diff --git a/template/test-fixtures/parse-description.json b/packer-plugin-sdk/template/test-fixtures/parse-description.json similarity index 100% rename from template/test-fixtures/parse-description.json rename to packer-plugin-sdk/template/test-fixtures/parse-description.json diff --git a/template/test-fixtures/parse-min-version.json b/packer-plugin-sdk/template/test-fixtures/parse-min-version.json similarity index 100% rename from template/test-fixtures/parse-min-version.json rename to packer-plugin-sdk/template/test-fixtures/parse-min-version.json diff --git a/template/test-fixtures/parse-monolithic.json b/packer-plugin-sdk/template/test-fixtures/parse-monolithic.json similarity index 100% rename from template/test-fixtures/parse-monolithic.json rename to packer-plugin-sdk/template/test-fixtures/parse-monolithic.json diff --git a/template/test-fixtures/parse-pp-basic.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-basic.json similarity index 100% rename from template/test-fixtures/parse-pp-basic.json rename to packer-plugin-sdk/template/test-fixtures/parse-pp-basic.json diff --git a/template/test-fixtures/parse-pp-except.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-except.json similarity index 100% rename from template/test-fixtures/parse-pp-except.json rename to packer-plugin-sdk/template/test-fixtures/parse-pp-except.json diff --git a/template/test-fixtures/parse-pp-keep.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-keep.json similarity index 100% rename from template/test-fixtures/parse-pp-keep.json rename to packer-plugin-sdk/template/test-fixtures/parse-pp-keep.json diff --git a/template/test-fixtures/parse-pp-map.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-map.json similarity index 100% rename from template/test-fixtures/parse-pp-map.json rename to packer-plugin-sdk/template/test-fixtures/parse-pp-map.json diff --git a/template/test-fixtures/parse-pp-multi.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-multi.json similarity index 100% rename from template/test-fixtures/parse-pp-multi.json rename to packer-plugin-sdk/template/test-fixtures/parse-pp-multi.json diff --git a/template/test-fixtures/parse-pp-no-type.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-no-type.json similarity index 100% rename from template/test-fixtures/parse-pp-no-type.json rename to packer-plugin-sdk/template/test-fixtures/parse-pp-no-type.json diff --git a/template/test-fixtures/parse-pp-only.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-only.json similarity index 100% rename from template/test-fixtures/parse-pp-only.json rename to packer-plugin-sdk/template/test-fixtures/parse-pp-only.json diff --git a/template/test-fixtures/parse-pp-slice.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-slice.json similarity index 100% rename from template/test-fixtures/parse-pp-slice.json rename to packer-plugin-sdk/template/test-fixtures/parse-pp-slice.json diff --git a/template/test-fixtures/parse-pp-string.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-string.json similarity index 100% rename from template/test-fixtures/parse-pp-string.json rename to packer-plugin-sdk/template/test-fixtures/parse-pp-string.json diff --git a/template/test-fixtures/parse-provisioner-basic.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-basic.json similarity index 100% rename from template/test-fixtures/parse-provisioner-basic.json rename to packer-plugin-sdk/template/test-fixtures/parse-provisioner-basic.json diff --git a/template/test-fixtures/parse-provisioner-config.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-config.json similarity index 100% rename from template/test-fixtures/parse-provisioner-config.json rename to packer-plugin-sdk/template/test-fixtures/parse-provisioner-config.json diff --git a/template/test-fixtures/parse-provisioner-except.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-except.json similarity index 100% rename from template/test-fixtures/parse-provisioner-except.json rename to packer-plugin-sdk/template/test-fixtures/parse-provisioner-except.json diff --git a/template/test-fixtures/parse-provisioner-no-type.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-no-type.json similarity index 100% rename from template/test-fixtures/parse-provisioner-no-type.json rename to packer-plugin-sdk/template/test-fixtures/parse-provisioner-no-type.json diff --git a/template/test-fixtures/parse-provisioner-only.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-only.json similarity index 100% rename from template/test-fixtures/parse-provisioner-only.json rename to packer-plugin-sdk/template/test-fixtures/parse-provisioner-only.json diff --git a/template/test-fixtures/parse-provisioner-override.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-override.json similarity index 100% rename from template/test-fixtures/parse-provisioner-override.json rename to packer-plugin-sdk/template/test-fixtures/parse-provisioner-override.json diff --git a/template/test-fixtures/parse-provisioner-pause-before.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-pause-before.json similarity index 100% rename from template/test-fixtures/parse-provisioner-pause-before.json rename to packer-plugin-sdk/template/test-fixtures/parse-provisioner-pause-before.json diff --git a/template/test-fixtures/parse-provisioner-retry.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-retry.json similarity index 100% rename from template/test-fixtures/parse-provisioner-retry.json rename to packer-plugin-sdk/template/test-fixtures/parse-provisioner-retry.json diff --git a/template/test-fixtures/parse-provisioner-timeout.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-timeout.json similarity index 100% rename from template/test-fixtures/parse-provisioner-timeout.json rename to packer-plugin-sdk/template/test-fixtures/parse-provisioner-timeout.json diff --git a/template/test-fixtures/parse-variable-default.json b/packer-plugin-sdk/template/test-fixtures/parse-variable-default.json similarity index 100% rename from template/test-fixtures/parse-variable-default.json rename to packer-plugin-sdk/template/test-fixtures/parse-variable-default.json diff --git a/template/test-fixtures/parse-variable-required.json b/packer-plugin-sdk/template/test-fixtures/parse-variable-required.json similarity index 100% rename from template/test-fixtures/parse-variable-required.json rename to packer-plugin-sdk/template/test-fixtures/parse-variable-required.json diff --git a/template/test-fixtures/validate-bad-override.json b/packer-plugin-sdk/template/test-fixtures/validate-bad-override.json similarity index 100% rename from template/test-fixtures/validate-bad-override.json rename to packer-plugin-sdk/template/test-fixtures/validate-bad-override.json diff --git a/template/test-fixtures/validate-bad-pp-except.json b/packer-plugin-sdk/template/test-fixtures/validate-bad-pp-except.json similarity index 100% rename from template/test-fixtures/validate-bad-pp-except.json rename to packer-plugin-sdk/template/test-fixtures/validate-bad-pp-except.json diff --git a/template/test-fixtures/validate-bad-pp-only.json b/packer-plugin-sdk/template/test-fixtures/validate-bad-pp-only.json similarity index 100% rename from template/test-fixtures/validate-bad-pp-only.json rename to packer-plugin-sdk/template/test-fixtures/validate-bad-pp-only.json diff --git a/template/test-fixtures/validate-bad-prov-except.json b/packer-plugin-sdk/template/test-fixtures/validate-bad-prov-except.json similarity index 100% rename from template/test-fixtures/validate-bad-prov-except.json rename to packer-plugin-sdk/template/test-fixtures/validate-bad-prov-except.json diff --git a/template/test-fixtures/validate-bad-prov-only.json b/packer-plugin-sdk/template/test-fixtures/validate-bad-prov-only.json similarity index 100% rename from template/test-fixtures/validate-bad-prov-only.json rename to packer-plugin-sdk/template/test-fixtures/validate-bad-prov-only.json diff --git a/template/test-fixtures/validate-good-override.json b/packer-plugin-sdk/template/test-fixtures/validate-good-override.json similarity index 100% rename from template/test-fixtures/validate-good-override.json rename to packer-plugin-sdk/template/test-fixtures/validate-good-override.json diff --git a/template/test-fixtures/validate-good-pp-except.json b/packer-plugin-sdk/template/test-fixtures/validate-good-pp-except.json similarity index 100% rename from template/test-fixtures/validate-good-pp-except.json rename to packer-plugin-sdk/template/test-fixtures/validate-good-pp-except.json diff --git a/template/test-fixtures/validate-good-pp-only.json b/packer-plugin-sdk/template/test-fixtures/validate-good-pp-only.json similarity index 100% rename from template/test-fixtures/validate-good-pp-only.json rename to packer-plugin-sdk/template/test-fixtures/validate-good-pp-only.json diff --git a/template/test-fixtures/validate-good-prov-except.json b/packer-plugin-sdk/template/test-fixtures/validate-good-prov-except.json similarity index 100% rename from template/test-fixtures/validate-good-prov-except.json rename to packer-plugin-sdk/template/test-fixtures/validate-good-prov-except.json diff --git a/template/test-fixtures/validate-good-prov-only.json b/packer-plugin-sdk/template/test-fixtures/validate-good-prov-only.json similarity index 100% rename from template/test-fixtures/validate-good-prov-only.json rename to packer-plugin-sdk/template/test-fixtures/validate-good-prov-only.json diff --git a/template/test-fixtures/validate-good-prov-timeout.json b/packer-plugin-sdk/template/test-fixtures/validate-good-prov-timeout.json similarity index 100% rename from template/test-fixtures/validate-good-prov-timeout.json rename to packer-plugin-sdk/template/test-fixtures/validate-good-prov-timeout.json diff --git a/template/test-fixtures/validate-no-builders.json b/packer-plugin-sdk/template/test-fixtures/validate-no-builders.json similarity index 100% rename from template/test-fixtures/validate-no-builders.json rename to packer-plugin-sdk/template/test-fixtures/validate-no-builders.json diff --git a/packer/core.go b/packer/core.go index 400914b33..218c764a8 100644 --- a/packer/core.go +++ b/packer/core.go @@ -15,8 +15,8 @@ import ( multierror "github.com/hashicorp/go-multierror" version "github.com/hashicorp/go-version" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/packer/template" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // Core is the main executor of Packer. If Packer is being used as a diff --git a/packer/core_test.go b/packer/core_test.go index 864080072..d60af3472 100644 --- a/packer/core_test.go +++ b/packer/core_test.go @@ -9,7 +9,7 @@ import ( "testing" configHelper "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/template" + "github.com/hashicorp/packer/packer-plugin-sdk/template" ) func TestCoreBuildNames(t *testing.T) { diff --git a/post-processor/alicloud-import/post-processor.go b/post-processor/alicloud-import/post-processor.go index 67fa91e5f..cc87a221d 100644 --- a/post-processor/alicloud-import/post-processor.go +++ b/post-processor/alicloud-import/post-processor.go @@ -21,7 +21,7 @@ import ( packerecs "github.com/hashicorp/packer/builder/alicloud/ecs" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const ( diff --git a/post-processor/amazon-import/post-processor.go b/post-processor/amazon-import/post-processor.go index 51e5eb829..32849f704 100644 --- a/post-processor/amazon-import/post-processor.go +++ b/post-processor/amazon-import/post-processor.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/packer/common/retry" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const BuilderId = "packer.post-processor.amazon-import" diff --git a/post-processor/artifice/post-processor.go b/post-processor/artifice/post-processor.go index 9c80aba75..9efcc4df6 100644 --- a/post-processor/artifice/post-processor.go +++ b/post-processor/artifice/post-processor.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The artifact-override post-processor allows you to specify arbitrary files as diff --git a/post-processor/checksum/post-processor.go b/post-processor/checksum/post-processor.go index ce8496812..207dda872 100644 --- a/post-processor/checksum/post-processor.go +++ b/post-processor/checksum/post-processor.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/post-processor/checksum/post-processor_test.go b/post-processor/checksum/post-processor_test.go index e52974ec4..ce527ab23 100644 --- a/post-processor/checksum/post-processor_test.go +++ b/post-processor/checksum/post-processor_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/packer/builder/file" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template" + "github.com/hashicorp/packer/packer-plugin-sdk/template" ) const expectedFileContents = "Hello world!" diff --git a/post-processor/compress/post-processor.go b/post-processor/compress/post-processor.go index 6b84852cb..2eeab4bf9 100644 --- a/post-processor/compress/post-processor.go +++ b/post-processor/compress/post-processor.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/klauspost/pgzip" "github.com/pierrec/lz4" "github.com/ulikunitz/xz" diff --git a/post-processor/compress/post-processor_test.go b/post-processor/compress/post-processor_test.go index 5b4cfcd9f..1e1a7b8a4 100644 --- a/post-processor/compress/post-processor_test.go +++ b/post-processor/compress/post-processor_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/packer/builder/file" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template" + "github.com/hashicorp/packer/packer-plugin-sdk/template" ) func TestDetectFilename(t *testing.T) { diff --git a/post-processor/digitalocean-import/post-processor.go b/post-processor/digitalocean-import/post-processor.go index 74b63aec1..6cda2f483 100644 --- a/post-processor/digitalocean-import/post-processor.go +++ b/post-processor/digitalocean-import/post-processor.go @@ -24,7 +24,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const BuilderId = "packer.post-processor.digitalocean-import" diff --git a/post-processor/docker-import/post-processor.go b/post-processor/docker-import/post-processor.go index 711ff7af2..68260ea6e 100644 --- a/post-processor/docker-import/post-processor.go +++ b/post-processor/docker-import/post-processor.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" - "github.com/hashicorp/packer/template/interpolate" ) const BuilderId = "packer.post-processor.docker-import" diff --git a/post-processor/docker-push/post-processor.go b/post-processor/docker-push/post-processor.go index 7c642988f..ba264d418 100644 --- a/post-processor/docker-push/post-processor.go +++ b/post-processor/docker-push/post-processor.go @@ -10,9 +10,9 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "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" - "github.com/hashicorp/packer/template/interpolate" ) const BuilderIdImport = "packer.post-processor.docker-import" diff --git a/post-processor/docker-save/post-processor.go b/post-processor/docker-save/post-processor.go index db572a200..0ab8a3374 100644 --- a/post-processor/docker-save/post-processor.go +++ b/post-processor/docker-save/post-processor.go @@ -12,9 +12,9 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "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" - "github.com/hashicorp/packer/template/interpolate" ) const BuilderId = "packer.post-processor.docker-save" diff --git a/post-processor/docker-tag/post-processor.go b/post-processor/docker-tag/post-processor.go index 466176402..4a26e5b41 100644 --- a/post-processor/docker-tag/post-processor.go +++ b/post-processor/docker-tag/post-processor.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" dockerimport "github.com/hashicorp/packer/post-processor/docker-import" - "github.com/hashicorp/packer/template/interpolate" ) const BuilderId = "packer.post-processor.docker-tag" diff --git a/post-processor/googlecompute-export/post-processor.go b/post-processor/googlecompute-export/post-processor.go index 264338884..d24018617 100644 --- a/post-processor/googlecompute-export/post-processor.go +++ b/post-processor/googlecompute-export/post-processor.go @@ -16,8 +16,8 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" - "github.com/hashicorp/packer/template/interpolate" ) type Config struct { diff --git a/post-processor/googlecompute-import/post-processor.go b/post-processor/googlecompute-import/post-processor.go index e61af45cd..09fcee685 100644 --- a/post-processor/googlecompute-import/post-processor.go +++ b/post-processor/googlecompute-import/post-processor.go @@ -19,9 +19,9 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" "github.com/hashicorp/packer/post-processor/compress" - "github.com/hashicorp/packer/template/interpolate" ) type Config struct { diff --git a/post-processor/manifest/post-processor.go b/post-processor/manifest/post-processor.go index c723d17fd..7b5fa88a9 100644 --- a/post-processor/manifest/post-processor.go +++ b/post-processor/manifest/post-processor.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/post-processor/ucloud-import/post-processor.go b/post-processor/ucloud-import/post-processor.go index 276ab907a..9850c70e6 100644 --- a/post-processor/ucloud-import/post-processor.go +++ b/post-processor/ucloud-import/post-processor.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/packer/common/retry" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "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" "github.com/ucloud/ucloud-sdk-go/ucloud" diff --git a/post-processor/vagrant-cloud/post-processor.go b/post-processor/vagrant-cloud/post-processor.go index 088bcb6d0..487fde5b1 100644 --- a/post-processor/vagrant-cloud/post-processor.go +++ b/post-processor/vagrant-cloud/post-processor.go @@ -23,7 +23,7 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) var builtins = map[string]string{ diff --git a/post-processor/vagrant/post-processor.go b/post-processor/vagrant/post-processor.go index 43cde6855..91a5344bb 100644 --- a/post-processor/vagrant/post-processor.go +++ b/post-processor/vagrant/post-processor.go @@ -19,9 +19,9 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer/tmp" "github.com/hashicorp/packer/post-processor/artifice" - "github.com/hashicorp/packer/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/post-processor/vsphere-template/post-processor.go b/post-processor/vsphere-template/post-processor.go index bc3e314f5..3d3675cd8 100644 --- a/post-processor/vsphere-template/post-processor.go +++ b/post-processor/vsphere-template/post-processor.go @@ -19,8 +19,8 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" - "github.com/hashicorp/packer/template/interpolate" "github.com/vmware/govmomi" ) diff --git a/post-processor/vsphere/post-processor.go b/post-processor/vsphere/post-processor.go index b816f31cb..9c25dff10 100644 --- a/post-processor/vsphere/post-processor.go +++ b/post-processor/vsphere/post-processor.go @@ -19,7 +19,7 @@ import ( shelllocal "github.com/hashicorp/packer/common/shell-local" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) var ovftool string = "ovftool" diff --git a/post-processor/yandex-export/post-processor.go b/post-processor/yandex-export/post-processor.go index c3d225e42..40f8639fa 100644 --- a/post-processor/yandex-export/post-processor.go +++ b/post-processor/yandex-export/post-processor.go @@ -18,8 +18,8 @@ import ( "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" - "github.com/hashicorp/packer/template/interpolate" ) const defaultStorageEndpoint = "storage.yandexcloud.net" diff --git a/post-processor/yandex-import/post-processor.go b/post-processor/yandex-import/post-processor.go index a4913eebb..e855fe5da 100644 --- a/post-processor/yandex-import/post-processor.go +++ b/post-processor/yandex-import/post-processor.go @@ -14,10 +14,10 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" "github.com/hashicorp/packer/post-processor/compress" yandexexport "github.com/hashicorp/packer/post-processor/yandex-export" - "github.com/hashicorp/packer/template/interpolate" "github.com/yandex-cloud/go-genproto/yandex/cloud/iam/v1/awscompatibility" ) diff --git a/provisioner/ansible-local/provisioner.go b/provisioner/ansible-local/provisioner.go index 75338465d..62077fd67 100644 --- a/provisioner/ansible-local/provisioner.go +++ b/provisioner/ansible-local/provisioner.go @@ -14,8 +14,8 @@ import ( "github.com/hashicorp/packer/common/uuid" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer/tmp" - "github.com/hashicorp/packer/template/interpolate" ) const DefaultStagingDir = "/tmp/packer-provisioner-ansible-local" diff --git a/provisioner/ansible-local/provisioner_test.go b/provisioner/ansible-local/provisioner_test.go index 1b8e5e34a..9d55d549d 100644 --- a/provisioner/ansible-local/provisioner_test.go +++ b/provisioner/ansible-local/provisioner_test.go @@ -13,8 +13,8 @@ import ( "github.com/hashicorp/packer/builder/docker" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template" "github.com/hashicorp/packer/provisioner/file" - "github.com/hashicorp/packer/template" ) func TestProvisioner_Impl(t *testing.T) { diff --git a/provisioner/ansible/provisioner.go b/provisioner/ansible/provisioner.go index a82aab702..27dee7bbb 100644 --- a/provisioner/ansible/provisioner.go +++ b/provisioner/ansible/provisioner.go @@ -34,8 +34,8 @@ import ( "github.com/hashicorp/packer/common/adapter" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer/tmp" - "github.com/hashicorp/packer/template/interpolate" ) type Config struct { diff --git a/provisioner/azure-dtlartifact/provisioner.go b/provisioner/azure-dtlartifact/provisioner.go index 5772b98d1..9065bd07e 100644 --- a/provisioner/azure-dtlartifact/provisioner.go +++ b/provisioner/azure-dtlartifact/provisioner.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type DtlArtifact struct { diff --git a/provisioner/breakpoint/provisioner.go b/provisioner/breakpoint/provisioner.go index d1674bf1a..2e5da91a8 100644 --- a/provisioner/breakpoint/provisioner.go +++ b/provisioner/breakpoint/provisioner.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/provisioner/chef-client/provisioner.go b/provisioner/chef-client/provisioner.go index 3d953aef8..ac9d0bdb9 100644 --- a/provisioner/chef-client/provisioner.go +++ b/provisioner/chef-client/provisioner.go @@ -21,7 +21,7 @@ import ( "github.com/hashicorp/packer/common/uuid" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type guestOSTypeConfig struct { diff --git a/provisioner/chef-solo/provisioner.go b/provisioner/chef-solo/provisioner.go index cc9178794..3775d8cf1 100644 --- a/provisioner/chef-solo/provisioner.go +++ b/provisioner/chef-solo/provisioner.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/packer/common/guestexec" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type guestOSTypeConfig struct { diff --git a/provisioner/converge/provisioner.go b/provisioner/converge/provisioner.go index 47aa4843d..ee8aa25a0 100644 --- a/provisioner/converge/provisioner.go +++ b/provisioner/converge/provisioner.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // Config for Converge provisioner diff --git a/provisioner/file/provisioner.go b/provisioner/file/provisioner.go index 3b25a1df6..acbeebcf6 100644 --- a/provisioner/file/provisioner.go +++ b/provisioner/file/provisioner.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/provisioner/inspec/provisioner.go b/provisioner/inspec/provisioner.go index 0644663ff..edcda418f 100644 --- a/provisioner/inspec/provisioner.go +++ b/provisioner/inspec/provisioner.go @@ -32,7 +32,7 @@ import ( "github.com/hashicorp/packer/common/adapter" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) var SupportedBackends = map[string]bool{"docker": true, "local": true, "ssh": true, "winrm": true} diff --git a/provisioner/powershell/provisioner.go b/provisioner/powershell/provisioner.go index fd3f34fda..639314b96 100644 --- a/provisioner/powershell/provisioner.go +++ b/provisioner/powershell/provisioner.go @@ -24,8 +24,8 @@ import ( "github.com/hashicorp/packer/common/uuid" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer/tmp" - "github.com/hashicorp/packer/template/interpolate" ) var retryableSleep = 2 * time.Second diff --git a/provisioner/puppet-masterless/provisioner.go b/provisioner/puppet-masterless/provisioner.go index a398a4204..4ec0c36a5 100644 --- a/provisioner/puppet-masterless/provisioner.go +++ b/provisioner/puppet-masterless/provisioner.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/packer/common/guestexec" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/provisioner/puppet-masterless/provisioner_test.go b/provisioner/puppet-masterless/provisioner_test.go index 582b8d311..2a9b21e6b 100644 --- a/provisioner/puppet-masterless/provisioner_test.go +++ b/provisioner/puppet-masterless/provisioner_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/stretchr/testify/assert" ) diff --git a/provisioner/puppet-server/provisioner.go b/provisioner/puppet-server/provisioner.go index c4625f508..f971a1c49 100644 --- a/provisioner/puppet-server/provisioner.go +++ b/provisioner/puppet-server/provisioner.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/packer/common/guestexec" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/provisioner/salt-masterless/provisioner.go b/provisioner/salt-masterless/provisioner.go index 2e12b1af5..638912f9f 100644 --- a/provisioner/salt-masterless/provisioner.go +++ b/provisioner/salt-masterless/provisioner.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/packer/common/guestexec" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/provisioner/shell/provisioner.go b/provisioner/shell/provisioner.go index b66a6d793..aec7dc021 100644 --- a/provisioner/shell/provisioner.go +++ b/provisioner/shell/provisioner.go @@ -23,8 +23,8 @@ import ( "github.com/hashicorp/packer/common/shell" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer/tmp" - "github.com/hashicorp/packer/template/interpolate" ) type Config struct { diff --git a/provisioner/windows-restart/provisioner.go b/provisioner/windows-restart/provisioner.go index 8fc800ed8..3cbbc3518 100644 --- a/provisioner/windows-restart/provisioner.go +++ b/provisioner/windows-restart/provisioner.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/packer/common/retry" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/template/interpolate" + "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 e081c7151..7654154d3 100644 --- a/provisioner/windows-shell/provisioner.go +++ b/provisioner/windows-shell/provisioner.go @@ -21,8 +21,8 @@ import ( "github.com/hashicorp/packer/common/shell" "github.com/hashicorp/packer/helper/config" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer/tmp" - "github.com/hashicorp/packer/template/interpolate" ) //FIXME query remote host or use %SYSTEMROOT%, %TEMP% and more creative filename