diff --git a/builder/googlecompute/step_start_tunnel.go b/builder/googlecompute/step_start_tunnel.go index 4b74a2e4e..724216ebc 100644 --- a/builder/googlecompute/step_start_tunnel.go +++ b/builder/googlecompute/step_start_tunnel.go @@ -23,7 +23,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) // StepStartTunnel represents a Packer build step that launches an IAP tunnel diff --git a/builder/hyperv/common/powershell/powershell.go b/builder/hyperv/common/powershell/powershell.go index 3d899ffce..5c10e991c 100644 --- a/builder/hyperv/common/powershell/powershell.go +++ b/builder/hyperv/common/powershell/powershell.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) const ( diff --git a/builder/hyperv/common/step_create_build_dir.go b/builder/hyperv/common/step_create_build_dir.go index dc6b69a04..f7a51a625 100644 --- a/builder/hyperv/common/step_create_build_dir.go +++ b/builder/hyperv/common/step_create_build_dir.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) type StepCreateBuildDir struct { diff --git a/builder/hyperv/common/step_mount_floppydrive.go b/builder/hyperv/common/step_mount_floppydrive.go index 5ded58d29..014aaf086 100644 --- a/builder/hyperv/common/step_mount_floppydrive.go +++ b/builder/hyperv/common/step_mount_floppydrive.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) const ( diff --git a/builder/lxc/communicator.go b/builder/lxc/communicator.go index 6994a2828..b91d811d0 100644 --- a/builder/lxc/communicator.go +++ b/builder/lxc/communicator.go @@ -13,7 +13,7 @@ import ( "syscall" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) type LxcAttachCommunicator struct { diff --git a/builder/openstack/step_key_pair.go b/builder/openstack/step_key_pair.go index 87a6ed011..46d22182e 100644 --- a/builder/openstack/step_key_pair.go +++ b/builder/openstack/step_key_pair.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" "golang.org/x/crypto/ssh" ) diff --git a/builder/osc/chroot/communicator.go b/builder/osc/chroot/communicator.go index c5306fe2f..8fc79163e 100644 --- a/builder/osc/chroot/communicator.go +++ b/builder/osc/chroot/communicator.go @@ -14,7 +14,7 @@ import ( "syscall" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) // Communicator is a special communicator that works by executing diff --git a/builder/parallels/common/driver_9.go b/builder/parallels/common/driver_9.go index 5a5d9393f..9e088f10a 100644 --- a/builder/parallels/common/driver_9.go +++ b/builder/parallels/common/driver_9.go @@ -15,7 +15,7 @@ import ( "github.com/ChrisTrenkamp/goxpath" "github.com/ChrisTrenkamp/goxpath/tree/xmltree" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) // Parallels9Driver is a base type for Parallels builders. diff --git a/builder/virtualbox/common/step_attach_floppy.go b/builder/virtualbox/common/step_attach_floppy.go index 2003d4301..82a058e17 100644 --- a/builder/virtualbox/common/step_attach_floppy.go +++ b/builder/virtualbox/common/step_attach_floppy.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) // This step attaches the ISO to the virtual machine. diff --git a/builder/virtualbox/common/step_download_guest_additions.go b/builder/virtualbox/common/step_download_guest_additions.go index fbe78b3ec..7da001d94 100644 --- a/builder/virtualbox/common/step_download_guest_additions.go +++ b/builder/virtualbox/common/step_download_guest_additions.go @@ -13,7 +13,7 @@ import ( "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/packer-plugin-sdk/tmp" ) var additionsVersionMap = map[string]string{ diff --git a/builder/vmware/iso/step_create_vmx.go b/builder/vmware/iso/step_create_vmx.go index 04c796a5e..4c67cabd6 100644 --- a/builder/vmware/iso/step_create_vmx.go +++ b/builder/vmware/iso/step_create_vmx.go @@ -13,7 +13,7 @@ import ( "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/packer-plugin-sdk/tmp" ) type vmxTemplateData struct { diff --git a/builder/vmware/vmx/step_clone_vmx.go b/builder/vmware/vmx/step_clone_vmx.go index b7e65e7d5..174a98249 100644 --- a/builder/vmware/vmx/step_clone_vmx.go +++ b/builder/vmware/vmx/step_clone_vmx.go @@ -11,7 +11,7 @@ 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/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) // StepCloneVMX takes a VMX file and clones the VM into the output directory. diff --git a/common/adapter/scp.go b/common/adapter/scp.go index 06043ff20..5fe6e45b2 100644 --- a/common/adapter/scp.go +++ b/common/adapter/scp.go @@ -13,7 +13,7 @@ import ( "time" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) const ( diff --git a/common/chroot/communicator.go b/common/chroot/communicator.go index a813baca8..7b07124af 100644 --- a/common/chroot/communicator.go +++ b/common/chroot/communicator.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) // Communicator is a special communicator that works by executing diff --git a/common/commonsteps/step_create_cdrom.go b/common/commonsteps/step_create_cdrom.go index 5cecbcbb7..26b6639e5 100644 --- a/common/commonsteps/step_create_cdrom.go +++ b/common/commonsteps/step_create_cdrom.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/packer/common/shell-local/localexec" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) // StepCreateCD will create a CD disk with the given files. diff --git a/common/commonsteps/step_create_floppy.go b/common/commonsteps/step_create_floppy.go index 418df6fbf..dd6d07218 100644 --- a/common/commonsteps/step_create_floppy.go +++ b/common/commonsteps/step_create_floppy.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" "github.com/mitchellh/go-fs" "github.com/mitchellh/go-fs/fat" ) diff --git a/common/commonsteps/step_download_test.go b/common/commonsteps/step_download_test.go index b6c7870c2..35e60ddf1 100644 --- a/common/commonsteps/step_download_test.go +++ b/common/commonsteps/step_download_test.go @@ -19,7 +19,7 @@ import ( urlhelper "github.com/hashicorp/go-getter/v2/helper/url" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) var _ multistep.Step = new(StepDownload) diff --git a/common/shell-local/run.go b/common/shell-local/run.go index cb3a47f83..5f67fd056 100644 --- a/common/shell-local/run.go +++ b/common/shell-local/run.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/packer/common/commonsteps" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) func Run(ctx context.Context, ui packer.Ui, config *Config, generatedData map[string]interface{}) (bool, error) { diff --git a/helper/communicator/testing.go b/helper/communicator/testing.go index 4f4894b6a..176412fc7 100644 --- a/helper/communicator/testing.go +++ b/helper/communicator/testing.go @@ -3,7 +3,7 @@ package communicator import ( "testing" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) func TestPEM(t *testing.T) string { diff --git a/main.go b/main.go index 5079d9a61..d8f53845f 100644 --- a/main.go +++ b/main.go @@ -19,8 +19,8 @@ import ( "github.com/hashicorp/go-uuid" "github.com/hashicorp/packer/command" "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" "github.com/hashicorp/packer/packer/plugin" - "github.com/hashicorp/packer/packer/tmp" "github.com/hashicorp/packer/version" "github.com/mitchellh/cli" "github.com/mitchellh/panicwrap" diff --git a/packer-plugin-sdk/sdk-internals/communicator/ssh/communicator.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/communicator.go index 6636f6bda..03250953d 100644 --- a/packer-plugin-sdk/sdk-internals/communicator/ssh/communicator.go +++ b/packer-plugin-sdk/sdk-internals/communicator/ssh/communicator.go @@ -17,7 +17,7 @@ import ( "time" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" "github.com/pkg/sftp" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" diff --git a/packer-plugin-sdk/template/parse.go b/packer-plugin-sdk/template/parse.go index 6bd4b8fa9..b96ec9d46 100644 --- a/packer-plugin-sdk/template/parse.go +++ b/packer-plugin-sdk/template/parse.go @@ -12,7 +12,7 @@ import ( "strings" multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" "github.com/mitchellh/mapstructure" ) diff --git a/packer/tmp/tmp.go b/packer-plugin-sdk/tmp/tmp.go similarity index 100% rename from packer/tmp/tmp.go rename to packer-plugin-sdk/tmp/tmp.go diff --git a/packer/plugin/server.go b/packer/plugin/server.go index 96e2011ce..1ed44f893 100644 --- a/packer/plugin/server.go +++ b/packer/plugin/server.go @@ -21,8 +21,8 @@ import ( "syscall" "time" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" packrpc "github.com/hashicorp/packer/packer/rpc" - "github.com/hashicorp/packer/packer/tmp" ) // This is a count of the number of interrupts the process has received. diff --git a/post-processor/vagrant/post-processor.go b/post-processor/vagrant/post-processor.go index 91a5344bb..f9a1d1f05 100644 --- a/post-processor/vagrant/post-processor.go +++ b/post-processor/vagrant/post-processor.go @@ -20,7 +20,7 @@ import ( "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/packer-plugin-sdk/tmp" "github.com/hashicorp/packer/post-processor/artifice" "github.com/mitchellh/mapstructure" ) diff --git a/post-processor/vagrant/util.go b/post-processor/vagrant/util.go index 21f3398eb..b58e9ecfe 100644 --- a/post-processor/vagrant/util.go +++ b/post-processor/vagrant/util.go @@ -12,7 +12,7 @@ import ( "runtime" "github.com/hashicorp/packer/packer" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" "github.com/klauspost/pgzip" ) diff --git a/post-processor/vagrant/virtualbox_test.go b/post-processor/vagrant/virtualbox_test.go index 3e46f59fe..cd088519c 100644 --- a/post-processor/vagrant/virtualbox_test.go +++ b/post-processor/vagrant/virtualbox_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/packer/packer/tmp" + "github.com/hashicorp/packer/packer-plugin-sdk/tmp" "github.com/stretchr/testify/assert" ) diff --git a/provisioner/ansible-local/provisioner.go b/provisioner/ansible-local/provisioner.go index 62077fd67..33f18435c 100644 --- a/provisioner/ansible-local/provisioner.go +++ b/provisioner/ansible-local/provisioner.go @@ -15,7 +15,7 @@ import ( "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/packer-plugin-sdk/tmp" ) const DefaultStagingDir = "/tmp/packer-provisioner-ansible-local" diff --git a/provisioner/ansible/provisioner.go b/provisioner/ansible/provisioner.go index 0f09d7c19..ed7a8b378 100644 --- a/provisioner/ansible/provisioner.go +++ b/provisioner/ansible/provisioner.go @@ -36,7 +36,7 @@ import ( "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/packer-plugin-sdk/tmp" ) type Config struct { diff --git a/provisioner/powershell/provisioner.go b/provisioner/powershell/provisioner.go index 714f11271..53fac0e06 100644 --- a/provisioner/powershell/provisioner.go +++ b/provisioner/powershell/provisioner.go @@ -25,7 +25,7 @@ import ( "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/packer-plugin-sdk/tmp" ) var retryableSleep = 2 * time.Second diff --git a/provisioner/shell/provisioner.go b/provisioner/shell/provisioner.go index 7b6fdd918..e8c1aa2cb 100644 --- a/provisioner/shell/provisioner.go +++ b/provisioner/shell/provisioner.go @@ -24,7 +24,7 @@ import ( "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/packer-plugin-sdk/tmp" ) type Config struct { diff --git a/provisioner/windows-shell/provisioner.go b/provisioner/windows-shell/provisioner.go index 36b6c0512..17520f77f 100644 --- a/provisioner/windows-shell/provisioner.go +++ b/provisioner/windows-shell/provisioner.go @@ -22,7 +22,7 @@ import ( "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/packer-plugin-sdk/tmp" ) //FIXME query remote host or use %SYSTEMROOT%, %TEMP% and more creative filename