update communicators to use legacy types

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

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.

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) {

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"
 )

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"
 )
 

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"

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) {

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"
 )

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 {

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"
 )
 

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) {