diff --git a/command/apply_destroy_test.go b/command/apply_destroy_test.go index 545b2138a..1ea3a6efd 100644 --- a/command/apply_destroy_test.go +++ b/command/apply_destroy_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/providers" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statefile" ) diff --git a/command/apply_test.go b/command/apply_test.go index a6a8bbb6e..b8b45755d 100644 --- a/command/apply_test.go +++ b/command/apply_test.go @@ -23,9 +23,9 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/terraform" diff --git a/command/command_test.go b/command/command_test.go index 1301ed4f4..6afdc7969 100644 --- a/command/command_test.go +++ b/command/command_test.go @@ -32,11 +32,11 @@ import ( "github.com/hashicorp/terraform/internal/initwd" legacy "github.com/hashicorp/terraform/internal/legacy/terraform" _ "github.com/hashicorp/terraform/internal/logging" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/registry" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/plans/planfile" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statefile" "github.com/hashicorp/terraform/states/statemgr" diff --git a/command/console_test.go b/command/console_test.go index 1352a6ad8..4accbc6ce 100644 --- a/command/console_test.go +++ b/command/console_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/providers" + "github.com/hashicorp/terraform/internal/providers" "github.com/mitchellh/cli" "github.com/zclconf/go-cty/cty" ) diff --git a/command/format/state_test.go b/command/format/state_test.go index fb9da80fb..bfde6d91a 100644 --- a/command/format/state_test.go +++ b/command/format/state_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/providers" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" "github.com/zclconf/go-cty/cty" diff --git a/command/import_test.go b/command/import_test.go index 1e37b7685..962b5f2d0 100644 --- a/command/import_test.go +++ b/command/import_test.go @@ -13,8 +13,8 @@ import ( "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/copy" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/providers" ) func TestImport(t *testing.T) { diff --git a/command/meta.go b/command/meta.go index 6605fb066..6b9fc1517 100644 --- a/command/meta.go +++ b/command/meta.go @@ -27,9 +27,9 @@ import ( "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend/local" "github.com/hashicorp/terraform/internal/getproviders" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/provisioners" "github.com/hashicorp/terraform/terraform" "github.com/mitchellh/cli" diff --git a/command/meta_providers.go b/command/meta_providers.go index 1b242fb8f..69694aff8 100644 --- a/command/meta_providers.go +++ b/command/meta_providers.go @@ -17,10 +17,10 @@ import ( "github.com/hashicorp/terraform/internal/logging" "github.com/hashicorp/terraform/internal/moduletest" "github.com/hashicorp/terraform/internal/providercache" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" tfplugin "github.com/hashicorp/terraform/plugin" tfplugin6 "github.com/hashicorp/terraform/plugin6" - "github.com/hashicorp/terraform/providers" ) // The TF_DISABLE_PLUGIN_TLS environment variable is intended only for use by diff --git a/command/plan_test.go b/command/plan_test.go index 9023ad7f3..2756d5af0 100644 --- a/command/plan_test.go +++ b/command/plan_test.go @@ -19,9 +19,9 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" backendinit "github.com/hashicorp/terraform/internal/backend/init" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" ) diff --git a/command/providers_schema_test.go b/command/providers_schema_test.go index 3cf0de1f5..aadf61353 100644 --- a/command/providers_schema_test.go +++ b/command/providers_schema_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/providers" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/terraform" "github.com/mitchellh/cli" "github.com/zclconf/go-cty/cty" diff --git a/command/refresh_test.go b/command/refresh_test.go index 9d56eaaab..45bcd5e56 100644 --- a/command/refresh_test.go +++ b/command/refresh_test.go @@ -18,8 +18,8 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statefile" "github.com/hashicorp/terraform/states/statemgr" diff --git a/command/show_test.go b/command/show_test.go index 68abc13fe..4ffaee5b6 100644 --- a/command/show_test.go +++ b/command/show_test.go @@ -12,8 +12,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" "github.com/mitchellh/cli" diff --git a/command/state_show_test.go b/command/state_show_test.go index 3231a5d7a..5c775e302 100644 --- a/command/state_show_test.go +++ b/command/state_show_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/providers" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/states" "github.com/mitchellh/cli" "github.com/zclconf/go-cty/cty" diff --git a/command/test.go b/command/test.go index fb90293ba..8d8273794 100644 --- a/command/test.go +++ b/command/test.go @@ -21,9 +21,9 @@ import ( "github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/moduletest" "github.com/hashicorp/terraform/internal/providercache" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" ) diff --git a/command/validate_test.go b/command/validate_test.go index c6278da42..6d65368ac 100644 --- a/command/validate_test.go +++ b/command/validate_test.go @@ -12,8 +12,8 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/terminal" - "github.com/hashicorp/terraform/providers" ) func setupTest(t *testing.T, fixturepath string, args ...string) (*terminal.TestOutput, int) { diff --git a/command/views/hook_ui.go b/command/views/hook_ui.go index a6f4f65d9..1a702c277 100644 --- a/command/views/hook_ui.go +++ b/command/views/hook_ui.go @@ -13,8 +13,8 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/format" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" ) diff --git a/command/views/hook_ui_test.go b/command/views/hook_ui_test.go index a959a537d..3a2c3e31f 100644 --- a/command/views/hook_ui_test.go +++ b/command/views/hook_ui_test.go @@ -12,9 +12,9 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/arguments" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" ) diff --git a/command/views/plan_test.go b/command/views/plan_test.go index f3c33abba..54fc857e0 100644 --- a/command/views/plan_test.go +++ b/command/views/plan_test.go @@ -6,9 +6,9 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/arguments" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/terraform" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/backend/local/backend_apply_test.go b/internal/backend/local/backend_apply_test.go index bc74b9eb6..e321a0311 100644 --- a/internal/backend/local/backend_apply_test.go +++ b/internal/backend/local/backend_apply_test.go @@ -17,10 +17,10 @@ import ( "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/initwd" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/terraform" diff --git a/internal/backend/local/backend_refresh_test.go b/internal/backend/local/backend_refresh_test.go index db6be4228..42d9a6fa2 100644 --- a/internal/backend/local/backend_refresh_test.go +++ b/internal/backend/local/backend_refresh_test.go @@ -13,8 +13,8 @@ import ( "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/initwd" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/terminal" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" diff --git a/internal/backend/local/testing.go b/internal/backend/local/testing.go index 32d928901..49dd299d9 100644 --- a/internal/backend/local/testing.go +++ b/internal/backend/local/testing.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/backend" - "github.com/hashicorp/terraform/providers" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/terraform" diff --git a/internal/backend/remote/testing.go b/internal/backend/remote/testing.go index 211a5e30d..cff58e885 100644 --- a/internal/backend/remote/testing.go +++ b/internal/backend/remote/testing.go @@ -17,8 +17,8 @@ import ( "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/httpclient" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/version" diff --git a/internal/builtin/providers/terraform/data_source_state.go b/internal/builtin/providers/terraform/data_source_state.go index ff4b8b66e..24f3d6f47 100644 --- a/internal/builtin/providers/terraform/data_source_state.go +++ b/internal/builtin/providers/terraform/data_source_state.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend/remote" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/providers" "github.com/zclconf/go-cty/cty" backendInit "github.com/hashicorp/terraform/internal/backend/init" diff --git a/internal/builtin/providers/terraform/provider.go b/internal/builtin/providers/terraform/provider.go index 9e10507ce..10292f4ab 100644 --- a/internal/builtin/providers/terraform/provider.go +++ b/internal/builtin/providers/terraform/provider.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "github.com/hashicorp/terraform/providers" + "github.com/hashicorp/terraform/internal/providers" ) // Provider is an implementation of providers.Interface diff --git a/internal/grpcwrap/provider.go b/internal/grpcwrap/provider.go index 3a054a25b..7e8675f9e 100644 --- a/internal/grpcwrap/provider.go +++ b/internal/grpcwrap/provider.go @@ -3,9 +3,9 @@ package grpcwrap import ( "context" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfplugin5" "github.com/hashicorp/terraform/plugin/convert" - "github.com/hashicorp/terraform/providers" "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" "github.com/zclconf/go-cty/cty/msgpack" diff --git a/internal/grpcwrap/provider6.go b/internal/grpcwrap/provider6.go index 49a91c193..28d463e56 100644 --- a/internal/grpcwrap/provider6.go +++ b/internal/grpcwrap/provider6.go @@ -3,9 +3,9 @@ package grpcwrap import ( "context" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfplugin6" "github.com/hashicorp/terraform/plugin6/convert" - "github.com/hashicorp/terraform/providers" "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" "github.com/zclconf/go-cty/cty/msgpack" diff --git a/internal/legacy/helper/schema/shims_test.go b/internal/legacy/helper/schema/shims_test.go index 579602033..495dda261 100644 --- a/internal/legacy/helper/schema/shims_test.go +++ b/internal/legacy/helper/schema/shims_test.go @@ -15,8 +15,8 @@ import ( "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/internal/legacy/helper/hashcode" "github.com/hashicorp/terraform/internal/legacy/terraform" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/providers" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/legacy/terraform/context_components.go b/internal/legacy/terraform/context_components.go index c893a16b4..41ce70257 100644 --- a/internal/legacy/terraform/context_components.go +++ b/internal/legacy/terraform/context_components.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/providers" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/provisioners" ) diff --git a/internal/legacy/terraform/provider_mock.go b/internal/legacy/terraform/provider_mock.go index 9603e4377..9536d5e49 100644 --- a/internal/legacy/terraform/provider_mock.go +++ b/internal/legacy/terraform/provider_mock.go @@ -8,7 +8,7 @@ import ( ctyjson "github.com/zclconf/go-cty/cty/json" "github.com/hashicorp/terraform/configs/hcl2shim" - "github.com/hashicorp/terraform/providers" + "github.com/hashicorp/terraform/internal/providers" ) var _ providers.Interface = (*MockProvider)(nil) diff --git a/internal/legacy/terraform/schemas.go b/internal/legacy/terraform/schemas.go index e4302fb67..d9eb2a885 100644 --- a/internal/legacy/terraform/schemas.go +++ b/internal/legacy/terraform/schemas.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/states" ) diff --git a/internal/moduletest/provider.go b/internal/moduletest/provider.go index ea39b0ac8..65a6ca4b4 100644 --- a/internal/moduletest/provider.go +++ b/internal/moduletest/provider.go @@ -11,9 +11,9 @@ import ( "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/repl" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/providers" ) // Provider is an implementation of providers.Interface which we're diff --git a/internal/moduletest/provider_test.go b/internal/moduletest/provider_test.go index 33891c534..30ca0359a 100644 --- a/internal/moduletest/provider_test.go +++ b/internal/moduletest/provider_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform/providers" + "github.com/hashicorp/terraform/internal/providers" "github.com/zclconf/go-cty-debug/ctydebug" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/provider-simple-v6/provider.go b/internal/provider-simple-v6/provider.go index 4db15e5f4..1e86aa668 100644 --- a/internal/provider-simple-v6/provider.go +++ b/internal/provider-simple-v6/provider.go @@ -6,7 +6,7 @@ import ( "time" "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/providers" + "github.com/hashicorp/terraform/internal/providers" "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" ) diff --git a/internal/provider-simple/provider.go b/internal/provider-simple/provider.go index 4db15e5f4..1e86aa668 100644 --- a/internal/provider-simple/provider.go +++ b/internal/provider-simple/provider.go @@ -6,7 +6,7 @@ import ( "time" "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/providers" + "github.com/hashicorp/terraform/internal/providers" "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" ) diff --git a/providers/addressed_types.go b/internal/providers/addressed_types.go similarity index 100% rename from providers/addressed_types.go rename to internal/providers/addressed_types.go diff --git a/providers/addressed_types_test.go b/internal/providers/addressed_types_test.go similarity index 100% rename from providers/addressed_types_test.go rename to internal/providers/addressed_types_test.go diff --git a/providers/doc.go b/internal/providers/doc.go similarity index 100% rename from providers/doc.go rename to internal/providers/doc.go diff --git a/providers/factory.go b/internal/providers/factory.go similarity index 100% rename from providers/factory.go rename to internal/providers/factory.go diff --git a/providers/provider.go b/internal/providers/provider.go similarity index 100% rename from providers/provider.go rename to internal/providers/provider.go diff --git a/internal/repl/session_test.go b/internal/repl/session_test.go index b37911652..9512fb5be 100644 --- a/internal/repl/session_test.go +++ b/internal/repl/session_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/initwd" - "github.com/hashicorp/terraform/providers" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" diff --git a/plugin/convert/schema.go b/plugin/convert/schema.go index a206ef9af..119d3b1d7 100644 --- a/plugin/convert/schema.go +++ b/plugin/convert/schema.go @@ -6,8 +6,8 @@ import ( "sort" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/providers" proto "github.com/hashicorp/terraform/internal/tfplugin5" - "github.com/hashicorp/terraform/providers" ) // ConfigSchemaToProto takes a *configschema.Block and converts it to a diff --git a/plugin/grpc_provider.go b/plugin/grpc_provider.go index 76eb87e8e..7f1e89bfa 100644 --- a/plugin/grpc_provider.go +++ b/plugin/grpc_provider.go @@ -9,9 +9,9 @@ import ( plugin "github.com/hashicorp/go-plugin" "github.com/hashicorp/terraform/internal/logging" + "github.com/hashicorp/terraform/internal/providers" proto "github.com/hashicorp/terraform/internal/tfplugin5" "github.com/hashicorp/terraform/plugin/convert" - "github.com/hashicorp/terraform/providers" ctyjson "github.com/zclconf/go-cty/cty/json" "github.com/zclconf/go-cty/cty/msgpack" "google.golang.org/grpc" diff --git a/plugin/grpc_provider_test.go b/plugin/grpc_provider_test.go index 9ab713728..0e5524386 100644 --- a/plugin/grpc_provider_test.go +++ b/plugin/grpc_provider_test.go @@ -8,8 +8,8 @@ import ( "github.com/golang/mock/gomock" "github.com/google/go-cmp/cmp" "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/providers" "github.com/zclconf/go-cty/cty" proto "github.com/hashicorp/terraform/internal/tfplugin5" diff --git a/plugin6/convert/schema.go b/plugin6/convert/schema.go index eaaace378..bb355a483 100644 --- a/plugin6/convert/schema.go +++ b/plugin6/convert/schema.go @@ -6,8 +6,8 @@ import ( "sort" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/providers" proto "github.com/hashicorp/terraform/internal/tfplugin6" - "github.com/hashicorp/terraform/providers" "github.com/zclconf/go-cty/cty" ) diff --git a/plugin6/grpc_provider.go b/plugin6/grpc_provider.go index 23e99a791..fa08034d9 100644 --- a/plugin6/grpc_provider.go +++ b/plugin6/grpc_provider.go @@ -9,9 +9,9 @@ import ( plugin "github.com/hashicorp/go-plugin" "github.com/hashicorp/terraform/internal/logging" + "github.com/hashicorp/terraform/internal/providers" proto6 "github.com/hashicorp/terraform/internal/tfplugin6" "github.com/hashicorp/terraform/plugin6/convert" - "github.com/hashicorp/terraform/providers" ctyjson "github.com/zclconf/go-cty/cty/json" "github.com/zclconf/go-cty/cty/msgpack" "google.golang.org/grpc" diff --git a/plugin6/grpc_provider_test.go b/plugin6/grpc_provider_test.go index ce4e9c54a..061c4355e 100644 --- a/plugin6/grpc_provider_test.go +++ b/plugin6/grpc_provider_test.go @@ -9,8 +9,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/providers" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/providers" "github.com/zclconf/go-cty/cty" proto "github.com/hashicorp/terraform/internal/tfplugin6" diff --git a/terraform/context.go b/terraform/context.go index a6d538c47..664e9601b 100644 --- a/terraform/context.go +++ b/terraform/context.go @@ -11,10 +11,10 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/instances" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/provisioners" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" diff --git a/terraform/context_apply2_test.go b/terraform/context_apply2_test.go index e593c4e76..43e99ae8e 100644 --- a/terraform/context_apply2_test.go +++ b/terraform/context_apply2_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/providers" "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 0982fbd43..9eeb6f147 100644 --- a/terraform/context_apply_test.go +++ b/terraform/context_apply_test.go @@ -22,9 +22,9 @@ import ( "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/provisioners" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" diff --git a/terraform/context_components.go b/terraform/context_components.go index 354337dd3..5cadffb36 100644 --- a/terraform/context_components.go +++ b/terraform/context_components.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/providers" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/provisioners" ) diff --git a/terraform/context_components_test.go b/terraform/context_components_test.go index 646b75509..ffc29873d 100644 --- a/terraform/context_components_test.go +++ b/terraform/context_components_test.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/providers" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/provisioners" ) diff --git a/terraform/context_eval_test.go b/terraform/context_eval_test.go index 8f7035d01..6fdbce573 100644 --- a/terraform/context_eval_test.go +++ b/terraform/context_eval_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/providers" + "github.com/hashicorp/terraform/internal/providers" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/context_fixtures_test.go b/terraform/context_fixtures_test.go index 3b4ab0103..19712d041 100644 --- a/terraform/context_fixtures_test.go +++ b/terraform/context_fixtures_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/providers" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/provisioners" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/context_import_test.go b/terraform/context_import_test.go index 377d29d22..4fbdd64c6 100644 --- a/terraform/context_import_test.go +++ b/terraform/context_import_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/providers" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/context_input_test.go b/terraform/context_input_test.go index dc33e00df..11a5b3dd3 100644 --- a/terraform/context_input_test.go +++ b/terraform/context_input_test.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/providers" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/context_plan2_test.go b/terraform/context_plan2_test.go index 92322c3b9..f7a3f331e 100644 --- a/terraform/context_plan2_test.go +++ b/terraform/context_plan2_test.go @@ -9,8 +9,8 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/context_plan_test.go b/terraform/context_plan_test.go index 8e772b6a8..4c7f7d6c5 100644 --- a/terraform/context_plan_test.go +++ b/terraform/context_plan_test.go @@ -18,9 +18,9 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/provisioners" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/context_refresh_test.go b/terraform/context_refresh_test.go index c578bfcb0..4c0f13169 100644 --- a/terraform/context_refresh_test.go +++ b/terraform/context_refresh_test.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs/hcl2shim" - "github.com/hashicorp/terraform/providers" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/context_test.go b/terraform/context_test.go index 1153ab017..fb159c481 100644 --- a/terraform/context_test.go +++ b/terraform/context_test.go @@ -21,10 +21,10 @@ import ( "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/internal/depsfile" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/plans/planfile" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/provisioners" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statefile" diff --git a/terraform/context_validate_test.go b/terraform/context_validate_test.go index 8cc833fa7..da6856d13 100644 --- a/terraform/context_validate_test.go +++ b/terraform/context_validate_test.go @@ -10,9 +10,9 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/provisioners" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/eval_context.go b/terraform/eval_context.go index 8d69ddb77..14678e630 100644 --- a/terraform/eval_context.go +++ b/terraform/eval_context.go @@ -5,10 +5,10 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/instances" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/providers" "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 55cc520ca..eff58ac64 100644 --- a/terraform/eval_context_builtin.go +++ b/terraform/eval_context_builtin.go @@ -7,8 +7,8 @@ import ( "sync" "github.com/hashicorp/terraform/internal/instances" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/provisioners" "github.com/hashicorp/terraform/version" diff --git a/terraform/eval_context_builtin_test.go b/terraform/eval_context_builtin_test.go index 3d00956f7..0f838875e 100644 --- a/terraform/eval_context_builtin_test.go +++ b/terraform/eval_context_builtin_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/providers" + "github.com/hashicorp/terraform/internal/providers" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/eval_context_mock.go b/terraform/eval_context_mock.go index 67a9f954f..f86663690 100644 --- a/terraform/eval_context_mock.go +++ b/terraform/eval_context_mock.go @@ -6,10 +6,10 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/instances" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/provisioners" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" diff --git a/terraform/eval_provider.go b/terraform/eval_provider.go index 9b730377f..920bfab9a 100644 --- a/terraform/eval_provider.go +++ b/terraform/eval_provider.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/providers" + "github.com/hashicorp/terraform/internal/providers" ) func buildProviderConfig(ctx EvalContext, addr addrs.AbsProviderConfig, config *configs.Provider) hcl.Body { diff --git a/terraform/graph_builder_plan_test.go b/terraform/graph_builder_plan_test.go index 62cd69784..9e9646b1d 100644 --- a/terraform/graph_builder_plan_test.go +++ b/terraform/graph_builder_plan_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/providers" + "github.com/hashicorp/terraform/internal/providers" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/graph_walk_context.go b/terraform/graph_walk_context.go index 13da0d04b..6612562c0 100644 --- a/terraform/graph_walk_context.go +++ b/terraform/graph_walk_context.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/instances" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/provisioners" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/hook.go b/terraform/hook.go index 1887c236a..643f1d182 100644 --- a/terraform/hook.go +++ b/terraform/hook.go @@ -4,8 +4,8 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/hook_mock.go b/terraform/hook_mock.go index 6efa31963..5f7f69526 100644 --- a/terraform/hook_mock.go +++ b/terraform/hook_mock.go @@ -6,8 +6,8 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/hook_stop.go b/terraform/hook_stop.go index 86f221142..33aa83cf6 100644 --- a/terraform/hook_stop.go +++ b/terraform/hook_stop.go @@ -7,8 +7,8 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/hook_test.go b/terraform/hook_test.go index 6b486f1f4..3afd46be3 100644 --- a/terraform/hook_test.go +++ b/terraform/hook_test.go @@ -7,8 +7,8 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/node_provider.go b/terraform/node_provider.go index 6f2f74033..022ca442f 100644 --- a/terraform/node_provider.go +++ b/terraform/node_provider.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/providers" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/node_provider_test.go b/terraform/node_provider_test.go index 71ec17781..39f37d50d 100644 --- a/terraform/node_provider_test.go +++ b/terraform/node_provider_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/providers" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/node_resource_abstract_instance.go b/terraform/node_resource_abstract_instance.go index dcb085e7a..7856a485a 100644 --- a/terraform/node_resource_abstract_instance.go +++ b/terraform/node_resource_abstract_instance.go @@ -9,10 +9,10 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/plans/objchange" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/provisioners" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" diff --git a/terraform/node_resource_abstract_test.go b/terraform/node_resource_abstract_test.go index 5c921f9cb..bded7dedd 100644 --- a/terraform/node_resource_abstract_test.go +++ b/terraform/node_resource_abstract_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/providers" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/node_resource_destroy_deposed_test.go b/terraform/node_resource_destroy_deposed_test.go index cd027eedb..30b93d1b8 100644 --- a/terraform/node_resource_destroy_deposed_test.go +++ b/terraform/node_resource_destroy_deposed_test.go @@ -5,8 +5,8 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/node_resource_plan_orphan_test.go b/terraform/node_resource_plan_orphan_test.go index 299011156..e88942974 100644 --- a/terraform/node_resource_plan_orphan_test.go +++ b/terraform/node_resource_plan_orphan_test.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/instances" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/providers" "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 1c9d85046..12e89ec68 100644 --- a/terraform/node_resource_validate.go +++ b/terraform/node_resource_validate.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/didyoumean" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/providers" "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 cbd5fdd58..551978fd4 100644 --- a/terraform/node_resource_validate_test.go +++ b/terraform/node_resource_validate_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/provisioners" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/provider_mock.go b/terraform/provider_mock.go index d8f9afcd4..e76c30ce7 100644 --- a/terraform/provider_mock.go +++ b/terraform/provider_mock.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs/hcl2shim" - "github.com/hashicorp/terraform/providers" + "github.com/hashicorp/terraform/internal/providers" ) var _ providers.Interface = (*MockProvider)(nil) diff --git a/terraform/resource_provider_mock_test.go b/terraform/resource_provider_mock_test.go index 191d9df8c..4fe916534 100644 --- a/terraform/resource_provider_mock_test.go +++ b/terraform/resource_provider_mock_test.go @@ -2,7 +2,7 @@ package terraform import ( "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/providers" + "github.com/hashicorp/terraform/internal/providers" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/schemas.go b/terraform/schemas.go index c0bfd4de3..0c8fa4458 100644 --- a/terraform/schemas.go +++ b/terraform/schemas.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/terraform_test.go b/terraform/terraform_test.go index 8b05fc186..fb97dd79c 100644 --- a/terraform/terraform_test.go +++ b/terraform/terraform_test.go @@ -17,9 +17,9 @@ import ( "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configload" "github.com/hashicorp/terraform/internal/initwd" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/registry" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/provisioners" "github.com/hashicorp/terraform/states" diff --git a/terraform/transform_import_state.go b/terraform/transform_import_state.go index db3a7d592..8d77f8aba 100644 --- a/terraform/transform_import_state.go +++ b/terraform/transform_import_state.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/transform_import_state_test.go b/terraform/transform_import_state_test.go index 84eb47f1b..12b11ee13 100644 --- a/terraform/transform_import_state_test.go +++ b/terraform/transform_import_state_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/providers" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/upgrade_resource_state.go b/terraform/upgrade_resource_state.go index eab2081c4..9e3dceb9c 100644 --- a/terraform/upgrade_resource_state.go +++ b/terraform/upgrade_resource_state.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" )