Merge pull request #10281 from hashicorp/communicator_helper_move

move communicator helpers into communicator dir
6 years ago · 5323e3f83c
parent bf47d12cf2 007337989e
commit 5323e3f83c
12 changed files with 7 additions and 7 deletions
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- a/helper/communicator/ssh/key_pair.go
+++ b/helper/communicator/ssh/key_pair.go
--- a/helper/communicator/ssh/key_pair_test.go
+++ b/helper/communicator/ssh/key_pair_test.go
--- a/helper/communicator/ssh/ssh.go
+++ b/helper/communicator/ssh/ssh.go
--- a/helper/communicator/ssh/tunnel.go
+++ b/helper/communicator/ssh/tunnel.go
--- a/helper/communicator/ssh/tunnel_test.go
+++ b/helper/communicator/ssh/tunnel_test.go
--- 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"
--- 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"
 )