diff --git a/command/meta.go b/command/meta.go index 6b9fc15174..1f3852f15f 100644 --- a/command/meta.go +++ b/command/meta.go @@ -28,9 +28,9 @@ import ( "github.com/hashicorp/terraform/internal/backend/local" "github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/internal/providers" + "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/provisioners" "github.com/hashicorp/terraform/terraform" "github.com/mitchellh/cli" "github.com/mitchellh/colorstring" diff --git a/command/plugins.go b/command/plugins.go index 80fd76b87b..c842ee63cd 100644 --- a/command/plugins.go +++ b/command/plugins.go @@ -17,9 +17,9 @@ import ( localexec "github.com/hashicorp/terraform/internal/builtin/provisioners/local-exec" remoteexec "github.com/hashicorp/terraform/internal/builtin/provisioners/remote-exec" "github.com/hashicorp/terraform/internal/logging" + "github.com/hashicorp/terraform/internal/provisioners" tfplugin "github.com/hashicorp/terraform/plugin" "github.com/hashicorp/terraform/plugin/discovery" - "github.com/hashicorp/terraform/provisioners" ) // NOTE WELL: The logic in this file is primarily about plugin types OTHER THAN diff --git a/internal/builtin/provisioners/file/resource_provisioner.go b/internal/builtin/provisioners/file/resource_provisioner.go index 7f35114ee1..638fcc8e63 100644 --- a/internal/builtin/provisioners/file/resource_provisioner.go +++ b/internal/builtin/provisioners/file/resource_provisioner.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/communicator" - "github.com/hashicorp/terraform/provisioners" + "github.com/hashicorp/terraform/internal/provisioners" "github.com/mitchellh/go-homedir" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/builtin/provisioners/file/resource_provisioner_test.go b/internal/builtin/provisioners/file/resource_provisioner_test.go index 52b99cb9da..8dc869a75a 100644 --- a/internal/builtin/provisioners/file/resource_provisioner_test.go +++ b/internal/builtin/provisioners/file/resource_provisioner_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/provisioners" + "github.com/hashicorp/terraform/internal/provisioners" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/builtin/provisioners/local-exec/resource_provisioner.go b/internal/builtin/provisioners/local-exec/resource_provisioner.go index 618df7e62c..c03617c18d 100644 --- a/internal/builtin/provisioners/local-exec/resource_provisioner.go +++ b/internal/builtin/provisioners/local-exec/resource_provisioner.go @@ -10,7 +10,7 @@ import ( "github.com/armon/circbuf" "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/provisioners" + "github.com/hashicorp/terraform/internal/provisioners" "github.com/mitchellh/go-linereader" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/builtin/provisioners/local-exec/resource_provisioner_test.go b/internal/builtin/provisioners/local-exec/resource_provisioner_test.go index f10a3ac1e7..d1560d48ee 100644 --- a/internal/builtin/provisioners/local-exec/resource_provisioner_test.go +++ b/internal/builtin/provisioners/local-exec/resource_provisioner_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/hashicorp/terraform/provisioners" + "github.com/hashicorp/terraform/internal/provisioners" "github.com/mitchellh/cli" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/builtin/provisioners/remote-exec/resource_provisioner.go b/internal/builtin/provisioners/remote-exec/resource_provisioner.go index 4ea765e0ed..3a390fcea2 100644 --- a/internal/builtin/provisioners/remote-exec/resource_provisioner.go +++ b/internal/builtin/provisioners/remote-exec/resource_provisioner.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/communicator" "github.com/hashicorp/terraform/internal/communicator/remote" - "github.com/hashicorp/terraform/provisioners" + "github.com/hashicorp/terraform/internal/provisioners" "github.com/mitchellh/go-linereader" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/builtin/provisioners/remote-exec/resource_provisioner_test.go b/internal/builtin/provisioners/remote-exec/resource_provisioner_test.go index 2bebbebf4c..fed3fe3697 100644 --- a/internal/builtin/provisioners/remote-exec/resource_provisioner_test.go +++ b/internal/builtin/provisioners/remote-exec/resource_provisioner_test.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/terraform/internal/communicator" "github.com/hashicorp/terraform/internal/communicator/remote" - "github.com/hashicorp/terraform/provisioners" + "github.com/hashicorp/terraform/internal/provisioners" "github.com/mitchellh/cli" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/communicator/communicator.go b/internal/communicator/communicator.go index 80faa25435..7e12fea4d5 100644 --- a/internal/communicator/communicator.go +++ b/internal/communicator/communicator.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/terraform/internal/communicator/shared" "github.com/hashicorp/terraform/internal/communicator/ssh" "github.com/hashicorp/terraform/internal/communicator/winrm" - "github.com/hashicorp/terraform/provisioners" + "github.com/hashicorp/terraform/internal/provisioners" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/communicator/communicator_mock.go b/internal/communicator/communicator_mock.go index 89fbaf7c93..b60edec197 100644 --- a/internal/communicator/communicator_mock.go +++ b/internal/communicator/communicator_mock.go @@ -8,7 +8,7 @@ import ( "time" "github.com/hashicorp/terraform/internal/communicator/remote" - "github.com/hashicorp/terraform/provisioners" + "github.com/hashicorp/terraform/internal/provisioners" ) // MockCommunicator is an implementation of Communicator that can be used for tests. diff --git a/internal/communicator/ssh/communicator.go b/internal/communicator/ssh/communicator.go index 2cd1b56a79..f312540214 100644 --- a/internal/communicator/ssh/communicator.go +++ b/internal/communicator/ssh/communicator.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/internal/communicator/remote" - "github.com/hashicorp/terraform/provisioners" + "github.com/hashicorp/terraform/internal/provisioners" "github.com/zclconf/go-cty/cty" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" diff --git a/internal/communicator/winrm/communicator.go b/internal/communicator/winrm/communicator.go index d9aa20160e..302ccec8eb 100644 --- a/internal/communicator/winrm/communicator.go +++ b/internal/communicator/winrm/communicator.go @@ -10,7 +10,7 @@ import ( "time" "github.com/hashicorp/terraform/internal/communicator/remote" - "github.com/hashicorp/terraform/provisioners" + "github.com/hashicorp/terraform/internal/provisioners" "github.com/masterzen/winrm" "github.com/packer-community/winrmcp/winrmcp" "github.com/zclconf/go-cty/cty" diff --git a/internal/grpcwrap/provisioner.go b/internal/grpcwrap/provisioner.go index 9e11d6f329..0282f9da4f 100644 --- a/internal/grpcwrap/provisioner.go +++ b/internal/grpcwrap/provisioner.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/communicator/shared" + "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfplugin5" "github.com/hashicorp/terraform/plugin/convert" - "github.com/hashicorp/terraform/provisioners" ) // New wraps a provisioners.Interface to implement a grpc ProviderServer. diff --git a/internal/legacy/terraform/context_components.go b/internal/legacy/terraform/context_components.go index 41ce70257e..340d691f2a 100644 --- a/internal/legacy/terraform/context_components.go +++ b/internal/legacy/terraform/context_components.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/internal/providers" - "github.com/hashicorp/terraform/provisioners" + "github.com/hashicorp/terraform/internal/provisioners" ) // contextComponentFactory is the interface that Context uses diff --git a/internal/legacy/terraform/provisioner_mock.go b/internal/legacy/terraform/provisioner_mock.go index 2a33235411..fe76157a2d 100644 --- a/internal/legacy/terraform/provisioner_mock.go +++ b/internal/legacy/terraform/provisioner_mock.go @@ -3,7 +3,7 @@ package terraform import ( "sync" - "github.com/hashicorp/terraform/provisioners" + "github.com/hashicorp/terraform/internal/provisioners" ) var _ provisioners.Interface = (*MockProvisioner)(nil) diff --git a/internal/legacy/terraform/resource_provisioner.go b/internal/legacy/terraform/resource_provisioner.go index d5f7078803..2287ece76f 100644 --- a/internal/legacy/terraform/resource_provisioner.go +++ b/internal/legacy/terraform/resource_provisioner.go @@ -2,7 +2,7 @@ package terraform import ( "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/provisioners" + "github.com/hashicorp/terraform/internal/provisioners" ) // ResourceProvisioner is an interface that must be implemented by any diff --git a/provisioners/doc.go b/internal/provisioners/doc.go similarity index 100% rename from provisioners/doc.go rename to internal/provisioners/doc.go diff --git a/provisioners/factory.go b/internal/provisioners/factory.go similarity index 100% rename from provisioners/factory.go rename to internal/provisioners/factory.go diff --git a/provisioners/provisioner.go b/internal/provisioners/provisioner.go similarity index 100% rename from provisioners/provisioner.go rename to internal/provisioners/provisioner.go diff --git a/plugin/grpc_provisioner.go b/plugin/grpc_provisioner.go index c57daa9af3..102bfec1ec 100644 --- a/plugin/grpc_provisioner.go +++ b/plugin/grpc_provisioner.go @@ -8,9 +8,9 @@ import ( plugin "github.com/hashicorp/go-plugin" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/provisioners" proto "github.com/hashicorp/terraform/internal/tfplugin5" "github.com/hashicorp/terraform/plugin/convert" - "github.com/hashicorp/terraform/provisioners" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/msgpack" "google.golang.org/grpc" diff --git a/plugin/grpc_provisioner_test.go b/plugin/grpc_provisioner_test.go index 62ab0c7d15..a563cef664 100644 --- a/plugin/grpc_provisioner_test.go +++ b/plugin/grpc_provisioner_test.go @@ -8,8 +8,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/provisioners" proto "github.com/hashicorp/terraform/internal/tfplugin5" - "github.com/hashicorp/terraform/provisioners" "github.com/zclconf/go-cty/cty" mockproto "github.com/hashicorp/terraform/plugin/mock_proto" diff --git a/terraform/context.go b/terraform/context.go index 664e9601bd..5ac667df57 100644 --- a/terraform/context.go +++ b/terraform/context.go @@ -12,10 +12,10 @@ import ( "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/providers" + "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/provisioners" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" diff --git a/terraform/context_apply_test.go b/terraform/context_apply_test.go index 9eeb6f1479..f246c3e6bd 100644 --- a/terraform/context_apply_test.go +++ b/terraform/context_apply_test.go @@ -23,9 +23,9 @@ import ( "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/internal/providers" + "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/provisioners" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/gocty" diff --git a/terraform/context_components.go b/terraform/context_components.go index 5cadffb369..9f8b8d10a9 100644 --- a/terraform/context_components.go +++ b/terraform/context_components.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/internal/providers" - "github.com/hashicorp/terraform/provisioners" + "github.com/hashicorp/terraform/internal/provisioners" ) // contextComponentFactory is the interface that Context uses diff --git a/terraform/context_components_test.go b/terraform/context_components_test.go index ffc29873d9..d0899e5970 100644 --- a/terraform/context_components_test.go +++ b/terraform/context_components_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/providers" - "github.com/hashicorp/terraform/provisioners" + "github.com/hashicorp/terraform/internal/provisioners" ) // simpleMockComponentFactory returns a component factory pre-configured with diff --git a/terraform/context_fixtures_test.go b/terraform/context_fixtures_test.go index 19712d0417..7af8267d53 100644 --- a/terraform/context_fixtures_test.go +++ b/terraform/context_fixtures_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/providers" - "github.com/hashicorp/terraform/provisioners" + "github.com/hashicorp/terraform/internal/provisioners" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/context_plan_test.go b/terraform/context_plan_test.go index 4c7f7d6c59..d7a48e44bc 100644 --- a/terraform/context_plan_test.go +++ b/terraform/context_plan_test.go @@ -19,9 +19,9 @@ import ( "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/internal/providers" + "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/provisioners" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/context_test.go b/terraform/context_test.go index fb159c4817..0ceccd17d2 100644 --- a/terraform/context_test.go +++ b/terraform/context_test.go @@ -22,10 +22,10 @@ import ( "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/internal/depsfile" "github.com/hashicorp/terraform/internal/providers" + "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/plans/planfile" - "github.com/hashicorp/terraform/provisioners" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statefile" tfversion "github.com/hashicorp/terraform/version" diff --git a/terraform/context_validate_test.go b/terraform/context_validate_test.go index da6856d13f..ecb78171b9 100644 --- a/terraform/context_validate_test.go +++ b/terraform/context_validate_test.go @@ -11,9 +11,9 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/providers" + "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/provisioners" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/eval_context.go b/terraform/eval_context.go index 14678e630e..1ac46f5b4b 100644 --- a/terraform/eval_context.go +++ b/terraform/eval_context.go @@ -6,10 +6,10 @@ import ( "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/providers" + "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/provisioners" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/eval_context_builtin.go b/terraform/eval_context_builtin.go index eff58ac64f..f70d0ea9db 100644 --- a/terraform/eval_context_builtin.go +++ b/terraform/eval_context_builtin.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/providers" + "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/provisioners" "github.com/hashicorp/terraform/version" "github.com/hashicorp/terraform/states" diff --git a/terraform/eval_context_mock.go b/terraform/eval_context_mock.go index f866636906..9c5f233299 100644 --- a/terraform/eval_context_mock.go +++ b/terraform/eval_context_mock.go @@ -7,10 +7,10 @@ import ( "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/providers" + "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/provisioners" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/convert" diff --git a/terraform/graph_walk_context.go b/terraform/graph_walk_context.go index 6612562c02..c880772c23 100644 --- a/terraform/graph_walk_context.go +++ b/terraform/graph_walk_context.go @@ -10,9 +10,9 @@ import ( "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/providers" + "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/provisioners" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/node_resource_abstract_instance.go b/terraform/node_resource_abstract_instance.go index 7856a485a2..6441fec3ae 100644 --- a/terraform/node_resource_abstract_instance.go +++ b/terraform/node_resource_abstract_instance.go @@ -10,10 +10,10 @@ import ( "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/providers" + "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/plans/objchange" - "github.com/hashicorp/terraform/provisioners" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/node_resource_validate.go b/terraform/node_resource_validate.go index 12e89ec68b..1ac0040393 100644 --- a/terraform/node_resource_validate.go +++ b/terraform/node_resource_validate.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/didyoumean" "github.com/hashicorp/terraform/internal/providers" + "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/provisioners" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/node_resource_validate_test.go b/terraform/node_resource_validate_test.go index 551978fd48..f001dfaeed 100644 --- a/terraform/node_resource_validate_test.go +++ b/terraform/node_resource_validate_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/providers" + "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/provisioners" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/provisioner_mock.go b/terraform/provisioner_mock.go index 2a33235411..fe76157a2d 100644 --- a/terraform/provisioner_mock.go +++ b/terraform/provisioner_mock.go @@ -3,7 +3,7 @@ package terraform import ( "sync" - "github.com/hashicorp/terraform/provisioners" + "github.com/hashicorp/terraform/internal/provisioners" ) var _ provisioners.Interface = (*MockProvisioner)(nil) diff --git a/terraform/provisioner_mock_test.go b/terraform/provisioner_mock_test.go index 242c09b655..a9d9d7bf3d 100644 --- a/terraform/provisioner_mock_test.go +++ b/terraform/provisioner_mock_test.go @@ -1,7 +1,7 @@ package terraform import ( - "github.com/hashicorp/terraform/provisioners" + "github.com/hashicorp/terraform/internal/provisioners" ) // simpleMockProvisioner returns a MockProvisioner that is pre-configured diff --git a/terraform/terraform_test.go b/terraform/terraform_test.go index fb97dd79cd..8dd454ffdf 100644 --- a/terraform/terraform_test.go +++ b/terraform/terraform_test.go @@ -18,9 +18,9 @@ import ( "github.com/hashicorp/terraform/configs/configload" "github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/providers" + "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/registry" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/provisioners" "github.com/hashicorp/terraform/states" _ "github.com/hashicorp/terraform/internal/logging"