From 007337989e4894ffa9dd94c1241f3219ffaccb97 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Wed, 18 Nov 2020 10:23:22 -0800 Subject: [PATCH] move communicator helpers into communicator dir --- builder/proxmox/clone/step_ssh_key_pair.go | 2 +- builder/virtualbox/common/step_ssh_key_pair.go | 2 +- builder/vmware/common/driver_esx5.go | 2 +- builder/vsphere/common/step_ssh_key_pair.go | 2 +- helper/communicator/config.go | 2 +- helper/{ => communicator}/ssh/key_pair.go | 0 helper/{ => communicator}/ssh/key_pair_test.go | 0 helper/{ => communicator}/ssh/ssh.go | 0 helper/{ => communicator}/ssh/tunnel.go | 0 helper/{ => communicator}/ssh/tunnel_test.go | 0 helper/communicator/step_connect_ssh.go | 2 +- .../sdk-internals/communicator/ssh/connect_test.go | 2 +- 12 files changed, 7 insertions(+), 7 deletions(-) rename helper/{ => communicator}/ssh/key_pair.go (100%) rename helper/{ => communicator}/ssh/key_pair_test.go (100%) rename helper/{ => communicator}/ssh/ssh.go (100%) rename helper/{ => communicator}/ssh/tunnel.go (100%) rename helper/{ => communicator}/ssh/tunnel_test.go (100%) diff --git a/builder/proxmox/clone/step_ssh_key_pair.go b/builder/proxmox/clone/step_ssh_key_pair.go index c963986a4..3626f80c8 100644 --- a/builder/proxmox/clone/step_ssh_key_pair.go +++ b/builder/proxmox/clone/step_ssh_key_pair.go @@ -6,7 +6,7 @@ import ( "os" common "github.com/hashicorp/packer/builder/proxmox/common" - "github.com/hashicorp/packer/helper/ssh" + "github.com/hashicorp/packer/helper/communicator/ssh" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" diff --git a/builder/virtualbox/common/step_ssh_key_pair.go b/builder/virtualbox/common/step_ssh_key_pair.go index e0e851756..7383ed93c 100644 --- a/builder/virtualbox/common/step_ssh_key_pair.go +++ b/builder/virtualbox/common/step_ssh_key_pair.go @@ -6,7 +6,7 @@ import ( "os" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/ssh" + "github.com/hashicorp/packer/helper/communicator/ssh" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" diff --git a/builder/vmware/common/driver_esx5.go b/builder/vmware/common/driver_esx5.go index 710752258..73ca6b7e3 100644 --- a/builder/vmware/common/driver_esx5.go +++ b/builder/vmware/common/driver_esx5.go @@ -29,7 +29,7 @@ import ( "github.com/hashicorp/go-getter/v2" "github.com/hashicorp/packer/helper/communicator" - helperssh "github.com/hashicorp/packer/helper/ssh" + helperssh "github.com/hashicorp/packer/helper/communicator/ssh" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh" diff --git a/builder/vsphere/common/step_ssh_key_pair.go b/builder/vsphere/common/step_ssh_key_pair.go index 3b2769461..80fecaabc 100644 --- a/builder/vsphere/common/step_ssh_key_pair.go +++ b/builder/vsphere/common/step_ssh_key_pair.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/packer/builder/vsphere/driver" "github.com/hashicorp/packer/helper/communicator" - "github.com/hashicorp/packer/helper/ssh" + "github.com/hashicorp/packer/helper/communicator/ssh" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/uuid" diff --git a/helper/communicator/config.go b/helper/communicator/config.go index 25b1e074f..dc1e9b23a 100644 --- a/helper/communicator/config.go +++ b/helper/communicator/config.go @@ -12,8 +12,8 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" + helperssh "github.com/hashicorp/packer/helper/communicator/ssh" "github.com/hashicorp/packer/helper/config" - helperssh "github.com/hashicorp/packer/helper/ssh" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" packerssh "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh" diff --git a/helper/ssh/key_pair.go b/helper/communicator/ssh/key_pair.go similarity index 100% rename from helper/ssh/key_pair.go rename to helper/communicator/ssh/key_pair.go diff --git a/helper/ssh/key_pair_test.go b/helper/communicator/ssh/key_pair_test.go similarity index 100% rename from helper/ssh/key_pair_test.go rename to helper/communicator/ssh/key_pair_test.go diff --git a/helper/ssh/ssh.go b/helper/communicator/ssh/ssh.go similarity index 100% rename from helper/ssh/ssh.go rename to helper/communicator/ssh/ssh.go diff --git a/helper/ssh/tunnel.go b/helper/communicator/ssh/tunnel.go similarity index 100% rename from helper/ssh/tunnel.go rename to helper/communicator/ssh/tunnel.go diff --git a/helper/ssh/tunnel_test.go b/helper/communicator/ssh/tunnel_test.go similarity index 100% rename from helper/ssh/tunnel_test.go rename to helper/communicator/ssh/tunnel_test.go diff --git a/helper/communicator/step_connect_ssh.go b/helper/communicator/step_connect_ssh.go index 7e6edb05c..93ba8a3a6 100644 --- a/helper/communicator/step_connect_ssh.go +++ b/helper/communicator/step_connect_ssh.go @@ -13,7 +13,7 @@ import ( "golang.org/x/crypto/ssh/terminal" - helperssh "github.com/hashicorp/packer/helper/ssh" + helperssh "github.com/hashicorp/packer/helper/communicator/ssh" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh" diff --git a/packer-plugin-sdk/sdk-internals/communicator/ssh/connect_test.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/connect_test.go index 3e8ba0e6e..9e4c0cc8b 100644 --- a/packer-plugin-sdk/sdk-internals/communicator/ssh/connect_test.go +++ b/packer-plugin-sdk/sdk-internals/communicator/ssh/connect_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - helperssh "github.com/hashicorp/packer/helper/ssh" + helperssh "github.com/hashicorp/packer/helper/communicator/ssh" "golang.org/x/crypto/ssh" )