From 01ac480a5866713d3b0a288cb7cecc09f451d680 Mon Sep 17 00:00:00 2001 From: James Bardin Date: Wed, 18 Nov 2020 10:07:08 -0500 Subject: [PATCH] update provisioners to use legacy types --- builtin/provisioners/file/resource_provisioner.go | 4 ++-- builtin/provisioners/file/resource_provisioner_test.go | 4 ++-- builtin/provisioners/local-exec/resource_provisioner.go | 4 ++-- builtin/provisioners/local-exec/resource_provisioner_test.go | 4 ++-- builtin/provisioners/remote-exec/resource_provisioner.go | 4 ++-- builtin/provisioners/remote-exec/resource_provisioner_test.go | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/builtin/provisioners/file/resource_provisioner.go b/builtin/provisioners/file/resource_provisioner.go index 26f2f4daf..61941e978 100644 --- a/builtin/provisioners/file/resource_provisioner.go +++ b/builtin/provisioners/file/resource_provisioner.go @@ -7,8 +7,8 @@ import ( "os" "github.com/hashicorp/terraform/communicator" - "github.com/hashicorp/terraform/helper/schema" - "github.com/hashicorp/terraform/terraform" + "github.com/hashicorp/terraform/internal/legacy/helper/schema" + "github.com/hashicorp/terraform/internal/legacy/terraform" "github.com/mitchellh/go-homedir" ) diff --git a/builtin/provisioners/file/resource_provisioner_test.go b/builtin/provisioners/file/resource_provisioner_test.go index c7e34c0ab..f56f7641c 100644 --- a/builtin/provisioners/file/resource_provisioner_test.go +++ b/builtin/provisioners/file/resource_provisioner_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/hashicorp/terraform/configs/hcl2shim" - "github.com/hashicorp/terraform/helper/schema" - "github.com/hashicorp/terraform/terraform" + "github.com/hashicorp/terraform/internal/legacy/helper/schema" + "github.com/hashicorp/terraform/internal/legacy/terraform" ) func TestResourceProvisioner_impl(t *testing.T) { diff --git a/builtin/provisioners/local-exec/resource_provisioner.go b/builtin/provisioners/local-exec/resource_provisioner.go index f0ba28f34..12c69161f 100644 --- a/builtin/provisioners/local-exec/resource_provisioner.go +++ b/builtin/provisioners/local-exec/resource_provisioner.go @@ -9,8 +9,8 @@ import ( "runtime" "github.com/armon/circbuf" - "github.com/hashicorp/terraform/helper/schema" - "github.com/hashicorp/terraform/terraform" + "github.com/hashicorp/terraform/internal/legacy/helper/schema" + "github.com/hashicorp/terraform/internal/legacy/terraform" "github.com/mitchellh/go-linereader" ) diff --git a/builtin/provisioners/local-exec/resource_provisioner_test.go b/builtin/provisioners/local-exec/resource_provisioner_test.go index 8718d4dab..32ccfa7e6 100644 --- a/builtin/provisioners/local-exec/resource_provisioner_test.go +++ b/builtin/provisioners/local-exec/resource_provisioner_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform/helper/schema" - "github.com/hashicorp/terraform/terraform" + "github.com/hashicorp/terraform/internal/legacy/helper/schema" + "github.com/hashicorp/terraform/internal/legacy/terraform" ) func TestResourceProvisioner_impl(t *testing.T) { diff --git a/builtin/provisioners/remote-exec/resource_provisioner.go b/builtin/provisioners/remote-exec/resource_provisioner.go index 50042977e..7e74d1ce9 100644 --- a/builtin/provisioners/remote-exec/resource_provisioner.go +++ b/builtin/provisioners/remote-exec/resource_provisioner.go @@ -13,8 +13,8 @@ import ( "github.com/hashicorp/terraform/communicator" "github.com/hashicorp/terraform/communicator/remote" - "github.com/hashicorp/terraform/helper/schema" - "github.com/hashicorp/terraform/terraform" + "github.com/hashicorp/terraform/internal/legacy/helper/schema" + "github.com/hashicorp/terraform/internal/legacy/terraform" "github.com/mitchellh/go-linereader" ) diff --git a/builtin/provisioners/remote-exec/resource_provisioner_test.go b/builtin/provisioners/remote-exec/resource_provisioner_test.go index cb865a8e3..014bb6410 100644 --- a/builtin/provisioners/remote-exec/resource_provisioner_test.go +++ b/builtin/provisioners/remote-exec/resource_provisioner_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform/communicator" "github.com/hashicorp/terraform/communicator/remote" - "github.com/hashicorp/terraform/helper/schema" - "github.com/hashicorp/terraform/terraform" + "github.com/hashicorp/terraform/internal/legacy/helper/schema" + "github.com/hashicorp/terraform/internal/legacy/terraform" ) func TestResourceProvisioner_impl(t *testing.T) {