From 590615f7c32a1ede00ff6f267d9fb51562dba40d Mon Sep 17 00:00:00 2001 From: James Bardin Date: Wed, 18 Nov 2020 10:06:28 -0500 Subject: [PATCH] update communicators to use legacy types --- communicator/communicator.go | 2 +- communicator/communicator_mock.go | 2 +- communicator/communicator_test.go | 2 +- communicator/ssh/communicator.go | 2 +- communicator/ssh/communicator_test.go | 2 +- communicator/ssh/provisioner.go | 2 +- communicator/ssh/provisioner_test.go | 2 +- communicator/winrm/communicator.go | 2 +- communicator/winrm/communicator_test.go | 2 +- communicator/winrm/provisioner.go | 2 +- communicator/winrm/provisioner_test.go | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/communicator/communicator.go b/communicator/communicator.go index 12b725b32..f3ca660f5 100644 --- a/communicator/communicator.go +++ b/communicator/communicator.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform/communicator/remote" "github.com/hashicorp/terraform/communicator/ssh" "github.com/hashicorp/terraform/communicator/winrm" - "github.com/hashicorp/terraform/terraform" + "github.com/hashicorp/terraform/internal/legacy/terraform" ) // Communicator is an interface that must be implemented by all communicators diff --git a/communicator/communicator_mock.go b/communicator/communicator_mock.go index 49304a070..9207b9438 100644 --- a/communicator/communicator_mock.go +++ b/communicator/communicator_mock.go @@ -8,7 +8,7 @@ import ( "time" "github.com/hashicorp/terraform/communicator/remote" - "github.com/hashicorp/terraform/terraform" + "github.com/hashicorp/terraform/internal/legacy/terraform" ) // MockCommunicator is an implementation of Communicator that can be used for tests. diff --git a/communicator/communicator_test.go b/communicator/communicator_test.go index e20d0368b..ba2383b8b 100644 --- a/communicator/communicator_test.go +++ b/communicator/communicator_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/hashicorp/terraform/terraform" + "github.com/hashicorp/terraform/internal/legacy/terraform" ) func TestCommunicator_new(t *testing.T) { diff --git a/communicator/ssh/communicator.go b/communicator/ssh/communicator.go index 2427194bd..3e9c931e2 100644 --- a/communicator/ssh/communicator.go +++ b/communicator/ssh/communicator.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/communicator/remote" - "github.com/hashicorp/terraform/terraform" + "github.com/hashicorp/terraform/internal/legacy/terraform" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" ) diff --git a/communicator/ssh/communicator_test.go b/communicator/ssh/communicator_test.go index 445fbebb9..99bee1439 100644 --- a/communicator/ssh/communicator_test.go +++ b/communicator/ssh/communicator_test.go @@ -20,7 +20,7 @@ import ( "time" "github.com/hashicorp/terraform/communicator/remote" - "github.com/hashicorp/terraform/terraform" + "github.com/hashicorp/terraform/internal/legacy/terraform" "golang.org/x/crypto/ssh" ) diff --git a/communicator/ssh/provisioner.go b/communicator/ssh/provisioner.go index 63a753c1a..ad16053c1 100644 --- a/communicator/ssh/provisioner.go +++ b/communicator/ssh/provisioner.go @@ -14,7 +14,7 @@ import ( "time" "github.com/hashicorp/terraform/communicator/shared" - "github.com/hashicorp/terraform/terraform" + "github.com/hashicorp/terraform/internal/legacy/terraform" "github.com/mitchellh/mapstructure" sshagent "github.com/xanzy/ssh-agent" "golang.org/x/crypto/ssh" diff --git a/communicator/ssh/provisioner_test.go b/communicator/ssh/provisioner_test.go index 959831544..99f06d920 100644 --- a/communicator/ssh/provisioner_test.go +++ b/communicator/ssh/provisioner_test.go @@ -3,7 +3,7 @@ package ssh import ( "testing" - "github.com/hashicorp/terraform/terraform" + "github.com/hashicorp/terraform/internal/legacy/terraform" ) func TestProvisioner_connInfo(t *testing.T) { diff --git a/communicator/winrm/communicator.go b/communicator/winrm/communicator.go index 827344917..1489d514c 100644 --- a/communicator/winrm/communicator.go +++ b/communicator/winrm/communicator.go @@ -10,7 +10,7 @@ import ( "time" "github.com/hashicorp/terraform/communicator/remote" - "github.com/hashicorp/terraform/terraform" + "github.com/hashicorp/terraform/internal/legacy/terraform" "github.com/masterzen/winrm" "github.com/packer-community/winrmcp/winrmcp" ) diff --git a/communicator/winrm/communicator_test.go b/communicator/winrm/communicator_test.go index f6a049932..62d4fab55 100644 --- a/communicator/winrm/communicator_test.go +++ b/communicator/winrm/communicator_test.go @@ -9,7 +9,7 @@ import ( "github.com/dylanmei/winrmtest" "github.com/hashicorp/terraform/communicator/remote" - "github.com/hashicorp/terraform/terraform" + "github.com/hashicorp/terraform/internal/legacy/terraform" ) func newMockWinRMServer(t *testing.T) *winrmtest.Remote { diff --git a/communicator/winrm/provisioner.go b/communicator/winrm/provisioner.go index 5cef1309d..df3ed89a4 100644 --- a/communicator/winrm/provisioner.go +++ b/communicator/winrm/provisioner.go @@ -8,7 +8,7 @@ import ( "time" "github.com/hashicorp/terraform/communicator/shared" - "github.com/hashicorp/terraform/terraform" + "github.com/hashicorp/terraform/internal/legacy/terraform" "github.com/mitchellh/mapstructure" ) diff --git a/communicator/winrm/provisioner_test.go b/communicator/winrm/provisioner_test.go index fbc45c34b..40f59c55f 100644 --- a/communicator/winrm/provisioner_test.go +++ b/communicator/winrm/provisioner_test.go @@ -3,7 +3,7 @@ package winrm import ( "testing" - "github.com/hashicorp/terraform/terraform" + "github.com/hashicorp/terraform/internal/legacy/terraform" ) func TestProvisioner_defaultHTTPSPort(t *testing.T) {