From b9a93a0fe70f115bcceee802101e129aab81cd21 Mon Sep 17 00:00:00 2001 From: Martin Atkins Date: Mon, 17 May 2021 12:00:50 -0700 Subject: [PATCH] Move addrs/ to internal/addrs/ This is part of a general effort to move all of Terraform's non-library package surface under internal in order to reinforce that these are for internal use within Terraform only. If you were previously importing packages under this prefix into an external codebase, you could pin to an earlier release tag as an interim solution until you've make a plan to achieve the same functionality some other way. --- command/apply_destroy_test.go | 2 +- command/apply_test.go | 2 +- command/arguments/apply_test.go | 2 +- command/arguments/extended.go | 2 +- command/arguments/plan_test.go | 2 +- command/arguments/refresh_test.go | 2 +- command/cliconfig/provider_installation.go | 2 +- command/cliconfig/provider_installation_test.go | 2 +- command/command_test.go | 2 +- command/console.go | 2 +- command/format/diff.go | 2 +- command/format/diff_test.go | 2 +- command/format/state.go | 2 +- command/format/state_test.go | 2 +- command/graph_test.go | 2 +- command/import.go | 2 +- command/init.go | 2 +- command/init_test.go | 2 +- command/jsonconfig/config.go | 2 +- command/jsonplan/plan.go | 2 +- command/jsonplan/resource.go | 2 +- command/jsonplan/values.go | 2 +- command/jsonplan/values_test.go | 2 +- command/jsonstate/state.go | 2 +- command/jsonstate/state_test.go | 2 +- command/meta.go | 2 +- command/meta_backend_test.go | 2 +- command/meta_providers.go | 2 +- command/output_test.go | 2 +- command/plan_test.go | 2 +- command/providers_lock.go | 2 +- command/refresh_test.go | 2 +- command/show_test.go | 2 +- command/state_list.go | 2 +- command/state_meta.go | 2 +- command/state_mv.go | 2 +- command/state_mv_test.go | 2 +- command/state_replace_provider.go | 2 +- command/state_replace_provider_test.go | 2 +- command/state_rm.go | 2 +- command/state_rm_test.go | 2 +- command/state_show.go | 2 +- command/state_show_test.go | 2 +- command/taint.go | 2 +- command/taint_test.go | 2 +- command/test.go | 2 +- command/untaint.go | 2 +- command/untaint_test.go | 2 +- command/version.go | 2 +- command/version_test.go | 2 +- command/views/hook_count.go | 2 +- command/views/hook_count_test.go | 2 +- command/views/hook_json.go | 2 +- command/views/hook_json_test.go | 2 +- command/views/hook_ui.go | 2 +- command/views/hook_ui_test.go | 2 +- command/views/json/hook.go | 2 +- command/views/json/resource_addr.go | 2 +- command/views/json_view_test.go | 2 +- command/views/operation.go | 2 +- command/views/operation_test.go | 2 +- command/views/plan.go | 2 +- command/views/plan_test.go | 2 +- command/workspace_command_test.go | 2 +- commands.go | 2 +- configs/config.go | 2 +- configs/config_build.go | 2 +- configs/config_test.go | 2 +- configs/module.go | 2 +- configs/module_merge.go | 2 +- configs/module_merge_test.go | 2 +- configs/module_test.go | 2 +- configs/named_values.go | 2 +- configs/provider.go | 2 +- configs/provider_requirements.go | 2 +- configs/provider_requirements_test.go | 2 +- configs/provider_test.go | 2 +- configs/provider_validation.go | 2 +- configs/resource.go | 2 +- {addrs => internal/addrs}/count_attr.go | 0 {addrs => internal/addrs}/doc.go | 0 {addrs => internal/addrs}/for_each_attr.go | 0 {addrs => internal/addrs}/input_variable.go | 0 {addrs => internal/addrs}/instance_key.go | 0 {addrs => internal/addrs}/local_value.go | 0 {addrs => internal/addrs}/module.go | 0 {addrs => internal/addrs}/module_call.go | 0 {addrs => internal/addrs}/module_instance.go | 0 {addrs => internal/addrs}/module_instance_test.go | 0 {addrs => internal/addrs}/module_test.go | 0 {addrs => internal/addrs}/output_value.go | 0 {addrs => internal/addrs}/output_value_test.go | 0 {addrs => internal/addrs}/parse_ref.go | 0 {addrs => internal/addrs}/parse_ref_test.go | 0 {addrs => internal/addrs}/parse_target.go | 0 {addrs => internal/addrs}/parse_target_test.go | 0 {addrs => internal/addrs}/path_attr.go | 0 {addrs => internal/addrs}/provider.go | 0 {addrs => internal/addrs}/provider_config.go | 0 {addrs => internal/addrs}/provider_config_test.go | 0 {addrs => internal/addrs}/provider_test.go | 0 {addrs => internal/addrs}/referenceable.go | 0 {addrs => internal/addrs}/resource.go | 0 {addrs => internal/addrs}/resource_phase.go | 0 {addrs => internal/addrs}/resource_test.go | 0 {addrs => internal/addrs}/resourcemode_string.go | 0 {addrs => internal/addrs}/self.go | 0 {addrs => internal/addrs}/target_test.go | 0 {addrs => internal/addrs}/targetable.go | 0 {addrs => internal/addrs}/terraform_attr.go | 0 internal/backend/backend.go | 2 +- internal/backend/local/backend_plan_test.go | 2 +- internal/backend/local/backend_refresh_test.go | 2 +- internal/backend/local/testing.go | 2 +- internal/backend/remote/backend_apply_test.go | 2 +- internal/backend/remote/backend_plan_test.go | 2 +- internal/backend/testing.go | 2 +- internal/depsfile/locks.go | 2 +- internal/depsfile/locks_file.go | 2 +- internal/depsfile/locks_file_test.go | 2 +- internal/depsfile/locks_test.go | 2 +- internal/earlyconfig/config.go | 2 +- internal/earlyconfig/config_build.go | 2 +- internal/earlyconfig/config_test.go | 2 +- internal/getproviders/didyoumean.go | 2 +- internal/getproviders/didyoumean_test.go | 2 +- internal/getproviders/errors.go | 2 +- internal/getproviders/filesystem_mirror_source.go | 2 +- internal/getproviders/filesystem_mirror_source_test.go | 2 +- internal/getproviders/filesystem_search.go | 2 +- internal/getproviders/filesystem_search_test.go | 2 +- internal/getproviders/http_mirror_source.go | 2 +- internal/getproviders/http_mirror_source_test.go | 2 +- internal/getproviders/memoize_source.go | 2 +- internal/getproviders/memoize_source_test.go | 2 +- internal/getproviders/mock_source.go | 2 +- internal/getproviders/multi_source.go | 2 +- internal/getproviders/multi_source_test.go | 2 +- internal/getproviders/registry_client.go | 2 +- internal/getproviders/registry_client_test.go | 2 +- internal/getproviders/registry_source.go | 2 +- internal/getproviders/registry_source_test.go | 2 +- internal/getproviders/source.go | 2 +- internal/getproviders/types.go | 2 +- internal/initwd/module_install.go | 2 +- internal/instances/expander.go | 2 +- internal/instances/expander_test.go | 2 +- internal/instances/expansion_mode.go | 2 +- internal/legacy/terraform/context_components.go | 2 +- internal/legacy/terraform/diff.go | 2 +- internal/legacy/terraform/diff_test.go | 2 +- internal/legacy/terraform/resource.go | 2 +- internal/legacy/terraform/resource_address.go | 2 +- internal/legacy/terraform/resource_address_test.go | 2 +- internal/legacy/terraform/schemas.go | 2 +- internal/legacy/terraform/state.go | 2 +- internal/legacy/terraform/state_test.go | 2 +- internal/modsdir/manifest.go | 2 +- internal/moduledeps/dependencies.go | 2 +- internal/moduledeps/module_test.go | 2 +- internal/providercache/cached_provider.go | 2 +- internal/providercache/cached_provider_test.go | 2 +- internal/providercache/dir.go | 2 +- internal/providercache/dir_modify_test.go | 2 +- internal/providercache/dir_test.go | 2 +- internal/providercache/installer.go | 2 +- internal/providercache/installer_events.go | 2 +- internal/providercache/installer_events_test.go | 2 +- internal/providercache/installer_test.go | 2 +- internal/providers/addressed_types.go | 2 +- internal/providers/addressed_types_test.go | 2 +- internal/repl/session_test.go | 2 +- lang/data.go | 2 +- lang/data_test.go | 2 +- lang/eval.go | 2 +- lang/eval_test.go | 2 +- lang/references.go | 2 +- lang/scope.go | 2 +- main.go | 2 +- plans/changes.go | 2 +- plans/changes_src.go | 2 +- plans/changes_sync.go | 2 +- plans/plan.go | 2 +- plans/plan_test.go | 2 +- plans/planfile/tfplan.go | 2 +- plans/planfile/tfplan_test.go | 2 +- provider_source.go | 2 +- states/instance_object.go | 2 +- states/instance_object_src.go | 2 +- states/module.go | 2 +- states/output_value.go | 2 +- states/resource.go | 2 +- states/state.go | 2 +- states/state_deepcopy.go | 2 +- states/state_equal.go | 2 +- states/state_string.go | 2 +- states/state_test.go | 2 +- states/statefile/version3_upgrade.go | 2 +- states/statefile/version4.go | 2 +- states/statemgr/filesystem_test.go | 2 +- states/statemgr/migrate_test.go | 2 +- states/statemgr/testing.go | 2 +- states/sync.go | 2 +- terraform/context.go | 2 +- terraform/context_apply2_test.go | 2 +- terraform/context_apply_test.go | 2 +- terraform/context_components.go | 2 +- terraform/context_components_test.go | 2 +- terraform/context_eval_test.go | 2 +- terraform/context_fixtures_test.go | 2 +- terraform/context_import.go | 2 +- terraform/context_import_test.go | 2 +- terraform/context_input.go | 2 +- terraform/context_input_test.go | 2 +- terraform/context_plan2_test.go | 2 +- terraform/context_plan_test.go | 2 +- terraform/context_refresh_test.go | 2 +- terraform/context_test.go | 2 +- terraform/context_validate_test.go | 2 +- terraform/eval_context.go | 2 +- terraform/eval_context_builtin.go | 2 +- terraform/eval_context_builtin_test.go | 2 +- terraform/eval_context_mock.go | 2 +- terraform/eval_count.go | 2 +- terraform/eval_provider.go | 2 +- terraform/eval_provider_test.go | 2 +- terraform/eval_variable.go | 2 +- terraform/evaluate.go | 2 +- terraform/evaluate_test.go | 2 +- terraform/evaluate_valid.go | 2 +- terraform/evaluate_valid_test.go | 2 +- terraform/graph.go | 2 +- terraform/graph_builder.go | 2 +- terraform/graph_builder_apply.go | 2 +- terraform/graph_builder_apply_test.go | 2 +- terraform/graph_builder_destroy_plan.go | 2 +- terraform/graph_builder_eval.go | 2 +- terraform/graph_builder_import.go | 2 +- terraform/graph_builder_plan.go | 2 +- terraform/graph_builder_plan_test.go | 2 +- terraform/graph_builder_test.go | 2 +- terraform/graph_interface_subgraph.go | 2 +- terraform/graph_walk.go | 2 +- terraform/graph_walk_context.go | 2 +- terraform/hook.go | 2 +- terraform/hook_mock.go | 2 +- terraform/hook_stop.go | 2 +- terraform/hook_test.go | 2 +- terraform/node_count_boundary.go | 2 +- terraform/node_count_boundary_test.go | 2 +- terraform/node_data_destroy_test.go | 2 +- terraform/node_local.go | 2 +- terraform/node_local_test.go | 2 +- terraform/node_module_expand.go | 2 +- terraform/node_module_expand_test.go | 2 +- terraform/node_module_variable.go | 2 +- terraform/node_module_variable_test.go | 2 +- terraform/node_output.go | 2 +- terraform/node_output_test.go | 2 +- terraform/node_provider_abstract.go | 2 +- terraform/node_provider_test.go | 2 +- terraform/node_resource_abstract.go | 2 +- terraform/node_resource_abstract_instance.go | 2 +- terraform/node_resource_abstract_instance_test.go | 2 +- terraform/node_resource_abstract_test.go | 2 +- terraform/node_resource_apply.go | 2 +- terraform/node_resource_apply_instance.go | 2 +- terraform/node_resource_apply_test.go | 2 +- terraform/node_resource_destroy.go | 2 +- terraform/node_resource_destroy_deposed.go | 2 +- terraform/node_resource_destroy_deposed_test.go | 2 +- terraform/node_resource_plan.go | 2 +- terraform/node_resource_plan_destroy.go | 2 +- terraform/node_resource_plan_instance.go | 2 +- terraform/node_resource_plan_orphan.go | 2 +- terraform/node_resource_plan_orphan_test.go | 2 +- terraform/node_resource_plan_test.go | 2 +- terraform/node_resource_validate.go | 2 +- terraform/node_resource_validate_test.go | 2 +- terraform/node_root_variable.go | 2 +- terraform/node_root_variable_test.go | 2 +- terraform/reduce_plan.go | 2 +- terraform/schemas.go | 2 +- terraform/schemas_test.go | 2 +- terraform/terraform_test.go | 2 +- terraform/transform_attach_config_provider.go | 2 +- terraform/transform_attach_config_provider_meta.go | 2 +- terraform/transform_config.go | 2 +- terraform/transform_config_test.go | 2 +- terraform/transform_destroy_cbd_test.go | 2 +- terraform/transform_destroy_edge.go | 2 +- terraform/transform_destroy_edge_test.go | 2 +- terraform/transform_diff_test.go | 2 +- terraform/transform_import_state.go | 2 +- terraform/transform_import_state_test.go | 2 +- terraform/transform_local.go | 2 +- terraform/transform_module_expansion.go | 2 +- terraform/transform_module_variable.go | 2 +- terraform/transform_module_variable_test.go | 2 +- terraform/transform_orphan_count.go | 2 +- terraform/transform_orphan_count_test.go | 2 +- terraform/transform_orphan_output.go | 2 +- terraform/transform_orphan_resource_test.go | 2 +- terraform/transform_output.go | 2 +- terraform/transform_provider.go | 2 +- terraform/transform_provider_test.go | 2 +- terraform/transform_reference.go | 2 +- terraform/transform_reference_test.go | 2 +- terraform/transform_removed_modules.go | 2 +- terraform/transform_resource_count.go | 2 +- terraform/transform_root_test.go | 2 +- terraform/transform_targets.go | 2 +- terraform/transform_targets_test.go | 2 +- terraform/transform_transitive_reduction_test.go | 2 +- terraform/transform_variable.go | 2 +- terraform/ui_output_provisioner.go | 2 +- terraform/ui_output_provisioner_test.go | 2 +- terraform/update_state_hook_test.go | 2 +- terraform/upgrade_resource_state.go | 2 +- terraform/validate_selfref.go | 2 +- terraform/validate_selfref_test.go | 2 +- tools/terraform-bundle/config.go | 2 +- tools/terraform-bundle/package.go | 2 +- 323 files changed, 292 insertions(+), 292 deletions(-) rename {addrs => internal/addrs}/count_attr.go (100%) rename {addrs => internal/addrs}/doc.go (100%) rename {addrs => internal/addrs}/for_each_attr.go (100%) rename {addrs => internal/addrs}/input_variable.go (100%) rename {addrs => internal/addrs}/instance_key.go (100%) rename {addrs => internal/addrs}/local_value.go (100%) rename {addrs => internal/addrs}/module.go (100%) rename {addrs => internal/addrs}/module_call.go (100%) rename {addrs => internal/addrs}/module_instance.go (100%) rename {addrs => internal/addrs}/module_instance_test.go (100%) rename {addrs => internal/addrs}/module_test.go (100%) rename {addrs => internal/addrs}/output_value.go (100%) rename {addrs => internal/addrs}/output_value_test.go (100%) rename {addrs => internal/addrs}/parse_ref.go (100%) rename {addrs => internal/addrs}/parse_ref_test.go (100%) rename {addrs => internal/addrs}/parse_target.go (100%) rename {addrs => internal/addrs}/parse_target_test.go (100%) rename {addrs => internal/addrs}/path_attr.go (100%) rename {addrs => internal/addrs}/provider.go (100%) rename {addrs => internal/addrs}/provider_config.go (100%) rename {addrs => internal/addrs}/provider_config_test.go (100%) rename {addrs => internal/addrs}/provider_test.go (100%) rename {addrs => internal/addrs}/referenceable.go (100%) rename {addrs => internal/addrs}/resource.go (100%) rename {addrs => internal/addrs}/resource_phase.go (100%) rename {addrs => internal/addrs}/resource_test.go (100%) rename {addrs => internal/addrs}/resourcemode_string.go (100%) rename {addrs => internal/addrs}/self.go (100%) rename {addrs => internal/addrs}/target_test.go (100%) rename {addrs => internal/addrs}/targetable.go (100%) rename {addrs => internal/addrs}/terraform_attr.go (100%) diff --git a/command/apply_destroy_test.go b/command/apply_destroy_test.go index 1ea3a6efd3..1629b5b456 100644 --- a/command/apply_destroy_test.go +++ b/command/apply_destroy_test.go @@ -9,8 +9,8 @@ import ( "github.com/mitchellh/cli" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "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 b8b45755da..0a8c5e65b5 100644 --- a/command/apply_test.go +++ b/command/apply_test.go @@ -20,9 +20,9 @@ import ( "github.com/mitchellh/cli" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" diff --git a/command/arguments/apply_test.go b/command/arguments/apply_test.go index eb23919c6f..e1a8271205 100644 --- a/command/arguments/apply_test.go +++ b/command/arguments/apply_test.go @@ -6,7 +6,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/plans" ) diff --git a/command/arguments/extended.go b/command/arguments/extended.go index bbe487d600..7684fa4a7f 100644 --- a/command/arguments/extended.go +++ b/command/arguments/extended.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" ) diff --git a/command/arguments/plan_test.go b/command/arguments/plan_test.go index 14c72e9fb3..5915c8ac03 100644 --- a/command/arguments/plan_test.go +++ b/command/arguments/plan_test.go @@ -6,7 +6,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/plans" ) diff --git a/command/arguments/refresh_test.go b/command/arguments/refresh_test.go index 6988b77f51..3f35053f7b 100644 --- a/command/arguments/refresh_test.go +++ b/command/arguments/refresh_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) func TestParseRefresh_basicValid(t *testing.T) { diff --git a/command/cliconfig/provider_installation.go b/command/cliconfig/provider_installation.go index 8b5f5cfb19..07e37fc46f 100644 --- a/command/cliconfig/provider_installation.go +++ b/command/cliconfig/provider_installation.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/hcl" hclast "github.com/hashicorp/hcl/hcl/ast" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/command/cliconfig/provider_installation_test.go b/command/cliconfig/provider_installation_test.go index c07aab1699..cd55c0b6b6 100644 --- a/command/cliconfig/provider_installation_test.go +++ b/command/cliconfig/provider_installation_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/getproviders" ) diff --git a/command/command_test.go b/command/command_test.go index 6afdc7969e..c48db1f5ac 100644 --- a/command/command_test.go +++ b/command/command_test.go @@ -20,11 +20,11 @@ import ( svchost "github.com/hashicorp/terraform-svchost" "github.com/hashicorp/terraform-svchost/disco" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configload" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" backendInit "github.com/hashicorp/terraform/internal/backend/init" backendLocal "github.com/hashicorp/terraform/internal/backend/local" "github.com/hashicorp/terraform/internal/copy" diff --git a/command/console.go b/command/console.go index 853f136bf3..9423f0e322 100644 --- a/command/console.go +++ b/command/console.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/helper/wrappedstreams" "github.com/hashicorp/terraform/internal/repl" diff --git a/command/format/diff.go b/command/format/diff.go index a9716abfb8..6cef3fec26 100644 --- a/command/format/diff.go +++ b/command/format/diff.go @@ -12,8 +12,8 @@ import ( "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/plans/objchange" "github.com/hashicorp/terraform/states" diff --git a/command/format/diff_test.go b/command/format/diff_test.go index 2bd7dd8f5e..959ff77471 100644 --- a/command/format/diff_test.go +++ b/command/format/diff_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/mitchellh/colorstring" diff --git a/command/format/state.go b/command/format/state.go index 9fcb41f1c1..5887bf6e7e 100644 --- a/command/format/state.go +++ b/command/format/state.go @@ -8,8 +8,8 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" diff --git a/command/format/state_test.go b/command/format/state_test.go index bfde6d91a6..d5e3c1342f 100644 --- a/command/format/state_test.go +++ b/command/format/state_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" diff --git a/command/graph_test.go b/command/graph_test.go index 392db1a9c4..f081d492af 100644 --- a/command/graph_test.go +++ b/command/graph_test.go @@ -8,7 +8,7 @@ import ( "github.com/mitchellh/cli" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" ) diff --git a/command/import.go b/command/import.go index bf93261dbe..386734e73a 100644 --- a/command/import.go +++ b/command/import.go @@ -10,10 +10,10 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/arguments" "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/terraform" diff --git a/command/init.go b/command/init.go index e87c70e349..83d6547588 100644 --- a/command/init.go +++ b/command/init.go @@ -12,9 +12,9 @@ import ( "github.com/posener/complete" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/backend" backendInit "github.com/hashicorp/terraform/internal/backend/init" "github.com/hashicorp/terraform/internal/getproviders" diff --git a/command/init_test.go b/command/init_test.go index c16ea2ec57..caf1205f31 100644 --- a/command/init_test.go +++ b/command/init_test.go @@ -17,9 +17,9 @@ import ( "github.com/mitchellh/cli" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/depsfile" "github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/internal/providercache" diff --git a/command/jsonconfig/config.go b/command/jsonconfig/config.go index 8575bd25ca..00d9093b0d 100644 --- a/command/jsonconfig/config.go +++ b/command/jsonconfig/config.go @@ -8,9 +8,9 @@ import ( "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/terraform" ) diff --git a/command/jsonplan/plan.go b/command/jsonplan/plan.go index 81886ee6e5..12fee997b9 100644 --- a/command/jsonplan/plan.go +++ b/command/jsonplan/plan.go @@ -8,10 +8,10 @@ import ( "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/jsonconfig" "github.com/hashicorp/terraform/command/jsonstate" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statefile" diff --git a/command/jsonplan/resource.go b/command/jsonplan/resource.go index 3f6e9a50cd..33f064fc36 100644 --- a/command/jsonplan/resource.go +++ b/command/jsonplan/resource.go @@ -1,7 +1,7 @@ package jsonplan import ( - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) // Resource is the representation of a resource in the json plan diff --git a/command/jsonplan/values.go b/command/jsonplan/values.go index bf1ee6dc4e..393bbae07c 100644 --- a/command/jsonplan/values.go +++ b/command/jsonplan/values.go @@ -8,8 +8,8 @@ import ( "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/terraform" ) diff --git a/command/jsonplan/values_test.go b/command/jsonplan/values_test.go index f77cca3b52..8afe894e80 100644 --- a/command/jsonplan/values_test.go +++ b/command/jsonplan/values_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/terraform" "github.com/zclconf/go-cty/cty" diff --git a/command/jsonstate/state.go b/command/jsonstate/state.go index 2bb5e157cc..04a14fc63a 100644 --- a/command/jsonstate/state.go +++ b/command/jsonstate/state.go @@ -8,7 +8,7 @@ import ( "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statefile" "github.com/hashicorp/terraform/terraform" diff --git a/command/jsonstate/state_test.go b/command/jsonstate/state_test.go index c4b8681015..264765c6a0 100644 --- a/command/jsonstate/state_test.go +++ b/command/jsonstate/state_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" "github.com/zclconf/go-cty/cty" diff --git a/command/meta.go b/command/meta.go index 1f3852f15f..6054587e41 100644 --- a/command/meta.go +++ b/command/meta.go @@ -18,12 +18,12 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/hashicorp/terraform-svchost/disco" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/arguments" "github.com/hashicorp/terraform/command/format" "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/command/webbrowser" "github.com/hashicorp/terraform/configs/configload" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend/local" "github.com/hashicorp/terraform/internal/getproviders" diff --git a/command/meta_backend_test.go b/command/meta_backend_test.go index 4d84dd87e9..f5e98cc680 100644 --- a/command/meta_backend_test.go +++ b/command/meta_backend_test.go @@ -8,8 +8,8 @@ import ( "sort" "testing" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/copy" "github.com/hashicorp/terraform/plans" diff --git a/command/meta_providers.go b/command/meta_providers.go index 69694aff80..d9a75fe407 100644 --- a/command/meta_providers.go +++ b/command/meta_providers.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/go-multierror" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" terraformProvider "github.com/hashicorp/terraform/internal/builtin/providers/terraform" "github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/internal/logging" diff --git a/command/output_test.go b/command/output_test.go index 22e8afe236..00420a35c4 100644 --- a/command/output_test.go +++ b/command/output_test.go @@ -8,7 +8,7 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/states" ) diff --git a/command/plan_test.go b/command/plan_test.go index 2756d5af0e..f2ddb172f6 100644 --- a/command/plan_test.go +++ b/command/plan_test.go @@ -16,8 +16,8 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" backendinit "github.com/hashicorp/terraform/internal/backend/init" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" diff --git a/command/providers_lock.go b/command/providers_lock.go index e2e51dd58d..ba61146a48 100644 --- a/command/providers_lock.go +++ b/command/providers_lock.go @@ -6,7 +6,7 @@ import ( "net/url" "os" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/depsfile" "github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/internal/providercache" diff --git a/command/refresh_test.go b/command/refresh_test.go index 45bcd5e56d..f13c8105de 100644 --- a/command/refresh_test.go +++ b/command/refresh_test.go @@ -16,8 +16,8 @@ import ( "github.com/mitchellh/cli" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" diff --git a/command/show_test.go b/command/show_test.go index 4ffaee5b6e..7d233ab8f9 100644 --- a/command/show_test.go +++ b/command/show_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" diff --git a/command/state_list.go b/command/state_list.go index b95a2aa2fc..a8c3385adb 100644 --- a/command/state_list.go +++ b/command/state_list.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" "github.com/mitchellh/cli" diff --git a/command/state_meta.go b/command/state_meta.go index 1dfd23b747..494c10d0fa 100644 --- a/command/state_meta.go +++ b/command/state_meta.go @@ -5,7 +5,7 @@ import ( "sort" "time" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statemgr" diff --git a/command/state_mv.go b/command/state_mv.go index 8ca430e521..22119d8ecb 100644 --- a/command/state_mv.go +++ b/command/state_mv.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/arguments" "github.com/hashicorp/terraform/command/clistate" "github.com/hashicorp/terraform/command/views" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" "github.com/mitchellh/cli" diff --git a/command/state_mv_test.go b/command/state_mv_test.go index a651876bb8..44bcaa40db 100644 --- a/command/state_mv_test.go +++ b/command/state_mv_test.go @@ -11,7 +11,7 @@ import ( "github.com/mitchellh/cli" "github.com/mitchellh/colorstring" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/states" ) diff --git a/command/state_replace_provider.go b/command/state_replace_provider.go index 5c1d4a1f05..157666ce39 100644 --- a/command/state_replace_provider.go +++ b/command/state_replace_provider.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/arguments" "github.com/hashicorp/terraform/command/clistate" "github.com/hashicorp/terraform/command/views" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" "github.com/mitchellh/cli" diff --git a/command/state_replace_provider_test.go b/command/state_replace_provider_test.go index 7b471af2f7..ca2cf056dc 100644 --- a/command/state_replace_provider_test.go +++ b/command/state_replace_provider_test.go @@ -8,7 +8,7 @@ import ( "github.com/mitchellh/cli" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/states" ) diff --git a/command/state_rm.go b/command/state_rm.go index f55204291f..7fad63013e 100644 --- a/command/state_rm.go +++ b/command/state_rm.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/arguments" "github.com/hashicorp/terraform/command/clistate" "github.com/hashicorp/terraform/command/views" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/mitchellh/cli" ) diff --git a/command/state_rm_test.go b/command/state_rm_test.go index 7cac37e47f..d3a593f88f 100644 --- a/command/state_rm_test.go +++ b/command/state_rm_test.go @@ -8,7 +8,7 @@ import ( "github.com/mitchellh/cli" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/states" ) diff --git a/command/state_show.go b/command/state_show.go index 94cef8f59b..dcea93e662 100644 --- a/command/state_show.go +++ b/command/state_show.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/format" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states" "github.com/mitchellh/cli" diff --git a/command/state_show_test.go b/command/state_show_test.go index 5c775e3024..cfe6dc847e 100644 --- a/command/state_show_test.go +++ b/command/state_show_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/states" "github.com/mitchellh/cli" diff --git a/command/taint.go b/command/taint.go index be1c61382b..75f49084ff 100644 --- a/command/taint.go +++ b/command/taint.go @@ -5,10 +5,10 @@ import ( "os" "strings" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/arguments" "github.com/hashicorp/terraform/command/clistate" "github.com/hashicorp/terraform/command/views" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" diff --git a/command/taint_test.go b/command/taint_test.go index 27171aec39..93ed731c24 100644 --- a/command/taint_test.go +++ b/command/taint_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/mitchellh/cli" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/states" ) diff --git a/command/test.go b/command/test.go index 8d8273794a..9d26ea15aa 100644 --- a/command/test.go +++ b/command/test.go @@ -11,12 +11,12 @@ import ( ctyjson "github.com/zclconf/go-cty/cty/json" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/arguments" "github.com/hashicorp/terraform/command/format" "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configload" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/depsfile" "github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/moduletest" diff --git a/command/untaint.go b/command/untaint.go index 52b87a67a4..707bfe8ee9 100644 --- a/command/untaint.go +++ b/command/untaint.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/arguments" "github.com/hashicorp/terraform/command/clistate" "github.com/hashicorp/terraform/command/views" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" ) diff --git a/command/untaint_test.go b/command/untaint_test.go index 5eba15a0b9..fbcac53d1d 100644 --- a/command/untaint_test.go +++ b/command/untaint_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/states" "github.com/mitchellh/cli" ) diff --git a/command/version.go b/command/version.go index 414a42a34e..7fef59202d 100644 --- a/command/version.go +++ b/command/version.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/depsfile" "github.com/hashicorp/terraform/internal/getproviders" ) diff --git a/command/version_test.go b/command/version_test.go index 10f384c450..62be7f9e7a 100644 --- a/command/version_test.go +++ b/command/version_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/depsfile" "github.com/hashicorp/terraform/internal/getproviders" "github.com/mitchellh/cli" diff --git a/command/views/hook_count.go b/command/views/hook_count.go index 25e1a5e7dd..049b44119a 100644 --- a/command/views/hook_count.go +++ b/command/views/hook_count.go @@ -5,7 +5,7 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" diff --git a/command/views/hook_count_test.go b/command/views/hook_count_test.go index 83e75e09f1..f708fdf92b 100644 --- a/command/views/hook_count_test.go +++ b/command/views/hook_count_test.go @@ -6,7 +6,7 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" diff --git a/command/views/hook_json.go b/command/views/hook_json.go index 6dd27a64ab..45125c01ca 100644 --- a/command/views/hook_json.go +++ b/command/views/hook_json.go @@ -7,9 +7,9 @@ import ( "time" "unicode" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/format" "github.com/hashicorp/terraform/command/views/json" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" diff --git a/command/views/hook_json_test.go b/command/views/hook_json_test.go index ee20c450b3..3ed7e8db7d 100644 --- a/command/views/hook_json_test.go +++ b/command/views/hook_json_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" diff --git a/command/views/hook_ui.go b/command/views/hook_ui.go index 1a702c277f..f0b6bfafe2 100644 --- a/command/views/hook_ui.go +++ b/command/views/hook_ui.go @@ -11,8 +11,8 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/format" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" diff --git a/command/views/hook_ui_test.go b/command/views/hook_ui_test.go index 3a2c3e31fe..49591741ab 100644 --- a/command/views/hook_ui_test.go +++ b/command/views/hook_ui_test.go @@ -10,8 +10,8 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/arguments" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/plans" diff --git a/command/views/json/hook.go b/command/views/json/hook.go index 0e82420003..792db52444 100644 --- a/command/views/json/hook.go +++ b/command/views/json/hook.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/plans" ) diff --git a/command/views/json/resource_addr.go b/command/views/json/resource_addr.go index 414ce33d86..27ff502a2c 100644 --- a/command/views/json/resource_addr.go +++ b/command/views/json/resource_addr.go @@ -4,7 +4,7 @@ import ( "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) type ResourceAddr struct { diff --git a/command/views/json_view_test.go b/command/views/json_view_test.go index d206cad8b9..34cfa56737 100644 --- a/command/views/json_view_test.go +++ b/command/views/json_view_test.go @@ -8,8 +8,8 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform/addrs" viewsjson "github.com/hashicorp/terraform/command/views/json" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" diff --git a/command/views/operation.go b/command/views/operation.go index b54b4193a3..b52418965f 100644 --- a/command/views/operation.go +++ b/command/views/operation.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/arguments" "github.com/hashicorp/terraform/command/format" "github.com/hashicorp/terraform/command/views/json" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states/statefile" diff --git a/command/views/operation_test.go b/command/views/operation_test.go index 4e3c1e1590..4ec6378773 100644 --- a/command/views/operation_test.go +++ b/command/views/operation_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/arguments" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" diff --git a/command/views/plan.go b/command/views/plan.go index 2dedb33f6c..4cdc0d1459 100644 --- a/command/views/plan.go +++ b/command/views/plan.go @@ -6,9 +6,9 @@ import ( "sort" "strings" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/arguments" "github.com/hashicorp/terraform/command/format" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" diff --git a/command/views/plan_test.go b/command/views/plan_test.go index 54fc857e06..906e7b849c 100644 --- a/command/views/plan_test.go +++ b/command/views/plan_test.go @@ -3,9 +3,9 @@ package views import ( "testing" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/arguments" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/plans" diff --git a/command/workspace_command_test.go b/command/workspace_command_test.go index d60e3a13c9..3482371e5e 100644 --- a/command/workspace_command_test.go +++ b/command/workspace_command_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend/local" "github.com/hashicorp/terraform/internal/backend/remote-state/inmem" diff --git a/commands.go b/commands.go index dcb8d1c1a7..555e3e127f 100644 --- a/commands.go +++ b/commands.go @@ -10,11 +10,11 @@ import ( svchost "github.com/hashicorp/terraform-svchost" "github.com/hashicorp/terraform-svchost/auth" "github.com/hashicorp/terraform-svchost/disco" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command" "github.com/hashicorp/terraform/command/cliconfig" "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/command/webbrowser" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/internal/terminal" pluginDiscovery "github.com/hashicorp/terraform/plugin/discovery" diff --git a/configs/config.go b/configs/config.go index 6f1603bfa7..694b8999f4 100644 --- a/configs/config.go +++ b/configs/config.go @@ -6,7 +6,7 @@ import ( version "github.com/hashicorp/go-version" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/getproviders" ) diff --git a/configs/config_build.go b/configs/config_build.go index 1083a1a2d3..dada18947c 100644 --- a/configs/config_build.go +++ b/configs/config_build.go @@ -5,7 +5,7 @@ import ( version "github.com/hashicorp/go-version" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) // BuildConfig constructs a Config from a root module by loading all of its diff --git a/configs/config_test.go b/configs/config_test.go index 17b6a4d3a3..b519832081 100644 --- a/configs/config_test.go +++ b/configs/config_test.go @@ -11,7 +11,7 @@ import ( version "github.com/hashicorp/go-version" "github.com/hashicorp/hcl/v2/hclsyntax" svchost "github.com/hashicorp/terraform-svchost" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/getproviders" ) diff --git a/configs/module.go b/configs/module.go index a66ea228e3..c6177f07fc 100644 --- a/configs/module.go +++ b/configs/module.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/experiments" ) diff --git a/configs/module_merge.go b/configs/module_merge.go index b3db79c9e0..bd6ebc4576 100644 --- a/configs/module_merge.go +++ b/configs/module_merge.go @@ -3,7 +3,7 @@ package configs import ( "fmt" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" diff --git a/configs/module_merge_test.go b/configs/module_merge_test.go index 77ed2d87dc..7425b3aa06 100644 --- a/configs/module_merge_test.go +++ b/configs/module_merge_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/gohcl" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/zclconf/go-cty/cty" ) diff --git a/configs/module_test.go b/configs/module_test.go index e60cddbec9..64924ffdc8 100644 --- a/configs/module_test.go +++ b/configs/module_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) // TestNewModule_provider_fqns exercises module.gatherProviderLocalNames() diff --git a/configs/named_values.go b/configs/named_values.go index cfa7bfc8b1..40c45685f0 100644 --- a/configs/named_values.go +++ b/configs/named_values.go @@ -10,7 +10,7 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/convert" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/typeexpr" ) diff --git a/configs/provider.go b/configs/provider.go index 4005a27829..62e047d15b 100644 --- a/configs/provider.go +++ b/configs/provider.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/hcl/v2/gohcl" "github.com/hashicorp/hcl/v2/hclsyntax" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/configs/provider_requirements.go b/configs/provider_requirements.go index f870e1cc96..6774fbba40 100644 --- a/configs/provider_requirements.go +++ b/configs/provider_requirements.go @@ -5,7 +5,7 @@ import ( version "github.com/hashicorp/go-version" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/zclconf/go-cty/cty" ) diff --git a/configs/provider_requirements_test.go b/configs/provider_requirements_test.go index 69cac1b5b3..e94afd0efd 100644 --- a/configs/provider_requirements_test.go +++ b/configs/provider_requirements_test.go @@ -8,7 +8,7 @@ import ( version "github.com/hashicorp/go-version" "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hcltest" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/zclconf/go-cty/cty" ) diff --git a/configs/provider_test.go b/configs/provider_test.go index db8089f910..65924f085f 100644 --- a/configs/provider_test.go +++ b/configs/provider_test.go @@ -7,7 +7,7 @@ import ( "github.com/go-test/deep" "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) func TestProviderReservedNames(t *testing.T) { diff --git a/configs/provider_validation.go b/configs/provider_validation.go index 425d1dffb4..14fde97f78 100644 --- a/configs/provider_validation.go +++ b/configs/provider_validation.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) // validateProviderConfigs walks the full configuration tree from the root diff --git a/configs/resource.go b/configs/resource.go index 530048b435..ec38cf5ca9 100644 --- a/configs/resource.go +++ b/configs/resource.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/hcl/v2/gohcl" "github.com/hashicorp/hcl/v2/hclsyntax" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) // Resource represents a "resource" or "data" block in a module or file. diff --git a/addrs/count_attr.go b/internal/addrs/count_attr.go similarity index 100% rename from addrs/count_attr.go rename to internal/addrs/count_attr.go diff --git a/addrs/doc.go b/internal/addrs/doc.go similarity index 100% rename from addrs/doc.go rename to internal/addrs/doc.go diff --git a/addrs/for_each_attr.go b/internal/addrs/for_each_attr.go similarity index 100% rename from addrs/for_each_attr.go rename to internal/addrs/for_each_attr.go diff --git a/addrs/input_variable.go b/internal/addrs/input_variable.go similarity index 100% rename from addrs/input_variable.go rename to internal/addrs/input_variable.go diff --git a/addrs/instance_key.go b/internal/addrs/instance_key.go similarity index 100% rename from addrs/instance_key.go rename to internal/addrs/instance_key.go diff --git a/addrs/local_value.go b/internal/addrs/local_value.go similarity index 100% rename from addrs/local_value.go rename to internal/addrs/local_value.go diff --git a/addrs/module.go b/internal/addrs/module.go similarity index 100% rename from addrs/module.go rename to internal/addrs/module.go diff --git a/addrs/module_call.go b/internal/addrs/module_call.go similarity index 100% rename from addrs/module_call.go rename to internal/addrs/module_call.go diff --git a/addrs/module_instance.go b/internal/addrs/module_instance.go similarity index 100% rename from addrs/module_instance.go rename to internal/addrs/module_instance.go diff --git a/addrs/module_instance_test.go b/internal/addrs/module_instance_test.go similarity index 100% rename from addrs/module_instance_test.go rename to internal/addrs/module_instance_test.go diff --git a/addrs/module_test.go b/internal/addrs/module_test.go similarity index 100% rename from addrs/module_test.go rename to internal/addrs/module_test.go diff --git a/addrs/output_value.go b/internal/addrs/output_value.go similarity index 100% rename from addrs/output_value.go rename to internal/addrs/output_value.go diff --git a/addrs/output_value_test.go b/internal/addrs/output_value_test.go similarity index 100% rename from addrs/output_value_test.go rename to internal/addrs/output_value_test.go diff --git a/addrs/parse_ref.go b/internal/addrs/parse_ref.go similarity index 100% rename from addrs/parse_ref.go rename to internal/addrs/parse_ref.go diff --git a/addrs/parse_ref_test.go b/internal/addrs/parse_ref_test.go similarity index 100% rename from addrs/parse_ref_test.go rename to internal/addrs/parse_ref_test.go diff --git a/addrs/parse_target.go b/internal/addrs/parse_target.go similarity index 100% rename from addrs/parse_target.go rename to internal/addrs/parse_target.go diff --git a/addrs/parse_target_test.go b/internal/addrs/parse_target_test.go similarity index 100% rename from addrs/parse_target_test.go rename to internal/addrs/parse_target_test.go diff --git a/addrs/path_attr.go b/internal/addrs/path_attr.go similarity index 100% rename from addrs/path_attr.go rename to internal/addrs/path_attr.go diff --git a/addrs/provider.go b/internal/addrs/provider.go similarity index 100% rename from addrs/provider.go rename to internal/addrs/provider.go diff --git a/addrs/provider_config.go b/internal/addrs/provider_config.go similarity index 100% rename from addrs/provider_config.go rename to internal/addrs/provider_config.go diff --git a/addrs/provider_config_test.go b/internal/addrs/provider_config_test.go similarity index 100% rename from addrs/provider_config_test.go rename to internal/addrs/provider_config_test.go diff --git a/addrs/provider_test.go b/internal/addrs/provider_test.go similarity index 100% rename from addrs/provider_test.go rename to internal/addrs/provider_test.go diff --git a/addrs/referenceable.go b/internal/addrs/referenceable.go similarity index 100% rename from addrs/referenceable.go rename to internal/addrs/referenceable.go diff --git a/addrs/resource.go b/internal/addrs/resource.go similarity index 100% rename from addrs/resource.go rename to internal/addrs/resource.go diff --git a/addrs/resource_phase.go b/internal/addrs/resource_phase.go similarity index 100% rename from addrs/resource_phase.go rename to internal/addrs/resource_phase.go diff --git a/addrs/resource_test.go b/internal/addrs/resource_test.go similarity index 100% rename from addrs/resource_test.go rename to internal/addrs/resource_test.go diff --git a/addrs/resourcemode_string.go b/internal/addrs/resourcemode_string.go similarity index 100% rename from addrs/resourcemode_string.go rename to internal/addrs/resourcemode_string.go diff --git a/addrs/self.go b/internal/addrs/self.go similarity index 100% rename from addrs/self.go rename to internal/addrs/self.go diff --git a/addrs/target_test.go b/internal/addrs/target_test.go similarity index 100% rename from addrs/target_test.go rename to internal/addrs/target_test.go diff --git a/addrs/targetable.go b/internal/addrs/targetable.go similarity index 100% rename from addrs/targetable.go rename to internal/addrs/targetable.go diff --git a/addrs/terraform_attr.go b/internal/addrs/terraform_attr.go similarity index 100% rename from addrs/terraform_attr.go rename to internal/addrs/terraform_attr.go diff --git a/internal/backend/backend.go b/internal/backend/backend.go index 02a6ebf74a..2bc0636063 100644 --- a/internal/backend/backend.go +++ b/internal/backend/backend.go @@ -11,12 +11,12 @@ import ( "log" "os" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/clistate" "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configload" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/plans/planfile" diff --git a/internal/backend/local/backend_plan_test.go b/internal/backend/local/backend_plan_test.go index c46cebe74c..b599ca96ab 100644 --- a/internal/backend/local/backend_plan_test.go +++ b/internal/backend/local/backend_plan_test.go @@ -7,11 +7,11 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/arguments" "github.com/hashicorp/terraform/command/clistate" "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/terminal" diff --git a/internal/backend/local/backend_refresh_test.go b/internal/backend/local/backend_refresh_test.go index 42d9a6fa2f..5d2a931b9e 100644 --- a/internal/backend/local/backend_refresh_test.go +++ b/internal/backend/local/backend_refresh_test.go @@ -6,11 +6,11 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/arguments" "github.com/hashicorp/terraform/command/clistate" "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/providers" diff --git a/internal/backend/local/testing.go b/internal/backend/local/testing.go index 49dd299d99..fc348ed41c 100644 --- a/internal/backend/local/testing.go +++ b/internal/backend/local/testing.go @@ -8,8 +8,8 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/states" diff --git a/internal/backend/remote/backend_apply_test.go b/internal/backend/remote/backend_apply_test.go index a6389d32d2..0b3f424e0b 100644 --- a/internal/backend/remote/backend_apply_test.go +++ b/internal/backend/remote/backend_apply_test.go @@ -12,10 +12,10 @@ import ( "github.com/google/go-cmp/cmp" tfe "github.com/hashicorp/go-tfe" version "github.com/hashicorp/go-version" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/arguments" "github.com/hashicorp/terraform/command/clistate" "github.com/hashicorp/terraform/command/views" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/terminal" diff --git a/internal/backend/remote/backend_plan_test.go b/internal/backend/remote/backend_plan_test.go index 71e73d1526..8505f0dfad 100644 --- a/internal/backend/remote/backend_plan_test.go +++ b/internal/backend/remote/backend_plan_test.go @@ -11,10 +11,10 @@ import ( "github.com/google/go-cmp/cmp" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/arguments" "github.com/hashicorp/terraform/command/clistate" "github.com/hashicorp/terraform/command/views" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/terminal" diff --git a/internal/backend/testing.go b/internal/backend/testing.go index cfc26725d4..bc28c2281b 100644 --- a/internal/backend/testing.go +++ b/internal/backend/testing.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statemgr" diff --git a/internal/depsfile/locks.go b/internal/depsfile/locks.go index e636522a17..7513990703 100644 --- a/internal/depsfile/locks.go +++ b/internal/depsfile/locks.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/getproviders" ) diff --git a/internal/depsfile/locks_file.go b/internal/depsfile/locks_file.go index 10f32e11f7..add88ea8d0 100644 --- a/internal/depsfile/locks_file.go +++ b/internal/depsfile/locks_file.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/hcl/v2/hclwrite" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/internal/replacefile" "github.com/hashicorp/terraform/internal/tfdiags" diff --git a/internal/depsfile/locks_file_test.go b/internal/depsfile/locks_file_test.go index 9be6e44dfa..a2633a4eb0 100644 --- a/internal/depsfile/locks_file_test.go +++ b/internal/depsfile/locks_file_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/internal/depsfile/locks_test.go b/internal/depsfile/locks_test.go index 9e319415d6..3872705689 100644 --- a/internal/depsfile/locks_test.go +++ b/internal/depsfile/locks_test.go @@ -3,7 +3,7 @@ package depsfile import ( "testing" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/getproviders" ) diff --git a/internal/earlyconfig/config.go b/internal/earlyconfig/config.go index e3c709d321..4ca206603c 100644 --- a/internal/earlyconfig/config.go +++ b/internal/earlyconfig/config.go @@ -6,7 +6,7 @@ import ( version "github.com/hashicorp/go-version" "github.com/hashicorp/terraform-config-inspect/tfconfig" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/internal/moduledeps" "github.com/hashicorp/terraform/internal/tfdiags" diff --git a/internal/earlyconfig/config_build.go b/internal/earlyconfig/config_build.go index 18b21a177a..6e5683383d 100644 --- a/internal/earlyconfig/config_build.go +++ b/internal/earlyconfig/config_build.go @@ -7,7 +7,7 @@ import ( version "github.com/hashicorp/go-version" "github.com/hashicorp/terraform-config-inspect/tfconfig" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/internal/earlyconfig/config_test.go b/internal/earlyconfig/config_test.go index d31f07844e..db45c0c196 100644 --- a/internal/earlyconfig/config_test.go +++ b/internal/earlyconfig/config_test.go @@ -9,7 +9,7 @@ import ( version "github.com/hashicorp/go-version" "github.com/hashicorp/terraform-config-inspect/tfconfig" svchost "github.com/hashicorp/terraform-svchost" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/internal/getproviders/didyoumean.go b/internal/getproviders/didyoumean.go index b34bc995b6..d888ccc08a 100644 --- a/internal/getproviders/didyoumean.go +++ b/internal/getproviders/didyoumean.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/go-retryablehttp" svchost "github.com/hashicorp/terraform-svchost" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) // MissingProviderSuggestion takes a provider address that failed installation diff --git a/internal/getproviders/didyoumean_test.go b/internal/getproviders/didyoumean_test.go index 85bc4582cb..18804a9a6f 100644 --- a/internal/getproviders/didyoumean_test.go +++ b/internal/getproviders/didyoumean_test.go @@ -5,7 +5,7 @@ import ( "testing" svchost "github.com/hashicorp/terraform-svchost" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) func TestMissingProviderSuggestion(t *testing.T) { diff --git a/internal/getproviders/errors.go b/internal/getproviders/errors.go index f31e7e7f65..c612dedf2c 100644 --- a/internal/getproviders/errors.go +++ b/internal/getproviders/errors.go @@ -5,7 +5,7 @@ import ( "net/url" svchost "github.com/hashicorp/terraform-svchost" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) // ErrHostNoProviders is an error type used to indicate that a hostname given diff --git a/internal/getproviders/filesystem_mirror_source.go b/internal/getproviders/filesystem_mirror_source.go index b611a56661..118aff208f 100644 --- a/internal/getproviders/filesystem_mirror_source.go +++ b/internal/getproviders/filesystem_mirror_source.go @@ -3,7 +3,7 @@ package getproviders import ( "context" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) // FilesystemMirrorSource is a source that reads providers and their metadata diff --git a/internal/getproviders/filesystem_mirror_source_test.go b/internal/getproviders/filesystem_mirror_source_test.go index ea73eefe4a..f498b81cc4 100644 --- a/internal/getproviders/filesystem_mirror_source_test.go +++ b/internal/getproviders/filesystem_mirror_source_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/go-cmp/cmp" svchost "github.com/hashicorp/terraform-svchost" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) func TestFilesystemMirrorSourceAllAvailablePackages(t *testing.T) { diff --git a/internal/getproviders/filesystem_search.go b/internal/getproviders/filesystem_search.go index f4b694cd76..82387fa555 100644 --- a/internal/getproviders/filesystem_search.go +++ b/internal/getproviders/filesystem_search.go @@ -9,7 +9,7 @@ import ( svchost "github.com/hashicorp/terraform-svchost" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) // SearchLocalDirectory performs an immediate, one-off scan of the given base diff --git a/internal/getproviders/filesystem_search_test.go b/internal/getproviders/filesystem_search_test.go index 8577065569..37ced6ff59 100644 --- a/internal/getproviders/filesystem_search_test.go +++ b/internal/getproviders/filesystem_search_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) func TestSearchLocalDirectory(t *testing.T) { diff --git a/internal/getproviders/http_mirror_source.go b/internal/getproviders/http_mirror_source.go index 4f9e694ebd..82f890a763 100644 --- a/internal/getproviders/http_mirror_source.go +++ b/internal/getproviders/http_mirror_source.go @@ -17,7 +17,7 @@ import ( svcauth "github.com/hashicorp/terraform-svchost/auth" "golang.org/x/net/idna" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/httpclient" "github.com/hashicorp/terraform/internal/logging" "github.com/hashicorp/terraform/version" diff --git a/internal/getproviders/http_mirror_source_test.go b/internal/getproviders/http_mirror_source_test.go index 00aff1462c..3bf8a004aa 100644 --- a/internal/getproviders/http_mirror_source_test.go +++ b/internal/getproviders/http_mirror_source_test.go @@ -12,7 +12,7 @@ import ( svchost "github.com/hashicorp/terraform-svchost" svcauth "github.com/hashicorp/terraform-svchost/auth" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) func TestHTTPMirrorSource(t *testing.T) { diff --git a/internal/getproviders/memoize_source.go b/internal/getproviders/memoize_source.go index 942aa32d39..2930d5a18d 100644 --- a/internal/getproviders/memoize_source.go +++ b/internal/getproviders/memoize_source.go @@ -4,7 +4,7 @@ import ( "context" "sync" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) // MemoizeSource is a Source that wraps another Source and remembers its diff --git a/internal/getproviders/memoize_source_test.go b/internal/getproviders/memoize_source_test.go index ea331ea346..006602b345 100644 --- a/internal/getproviders/memoize_source_test.go +++ b/internal/getproviders/memoize_source_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) func TestMemoizeSource(t *testing.T) { diff --git a/internal/getproviders/mock_source.go b/internal/getproviders/mock_source.go index 32a99c1f19..930cbe313d 100644 --- a/internal/getproviders/mock_source.go +++ b/internal/getproviders/mock_source.go @@ -9,7 +9,7 @@ import ( "io/ioutil" "os" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) // MockSource is an in-memory-only, statically-configured source intended for diff --git a/internal/getproviders/multi_source.go b/internal/getproviders/multi_source.go index f3b08e147a..53c4116c77 100644 --- a/internal/getproviders/multi_source.go +++ b/internal/getproviders/multi_source.go @@ -7,7 +7,7 @@ import ( svchost "github.com/hashicorp/terraform-svchost" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) // MultiSource is a Source that wraps a series of other sources and combines diff --git a/internal/getproviders/multi_source_test.go b/internal/getproviders/multi_source_test.go index 027b80875e..f78fb519c5 100644 --- a/internal/getproviders/multi_source_test.go +++ b/internal/getproviders/multi_source_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) func TestMultiSourceAvailableVersions(t *testing.T) { diff --git a/internal/getproviders/registry_client.go b/internal/getproviders/registry_client.go index 93cb51e033..ac0abd4c61 100644 --- a/internal/getproviders/registry_client.go +++ b/internal/getproviders/registry_client.go @@ -20,7 +20,7 @@ import ( svchost "github.com/hashicorp/terraform-svchost" svcauth "github.com/hashicorp/terraform-svchost/auth" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/httpclient" "github.com/hashicorp/terraform/internal/logging" "github.com/hashicorp/terraform/version" diff --git a/internal/getproviders/registry_client_test.go b/internal/getproviders/registry_client_test.go index e294fb3af8..252d4dd00d 100644 --- a/internal/getproviders/registry_client_test.go +++ b/internal/getproviders/registry_client_test.go @@ -16,7 +16,7 @@ import ( "github.com/google/go-cmp/cmp" svchost "github.com/hashicorp/terraform-svchost" disco "github.com/hashicorp/terraform-svchost/disco" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) func TestConfigureDiscoveryRetry(t *testing.T) { diff --git a/internal/getproviders/registry_source.go b/internal/getproviders/registry_source.go index e227438c59..e48e043f71 100644 --- a/internal/getproviders/registry_source.go +++ b/internal/getproviders/registry_source.go @@ -7,7 +7,7 @@ import ( svchost "github.com/hashicorp/terraform-svchost" disco "github.com/hashicorp/terraform-svchost/disco" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) // RegistrySource is a Source that knows how to find and install providers from diff --git a/internal/getproviders/registry_source_test.go b/internal/getproviders/registry_source_test.go index b180c3b42c..d55d1fff1a 100644 --- a/internal/getproviders/registry_source_test.go +++ b/internal/getproviders/registry_source_test.go @@ -11,7 +11,7 @@ import ( "github.com/google/go-cmp/cmp" svchost "github.com/hashicorp/terraform-svchost" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) func TestSourceAvailableVersions(t *testing.T) { diff --git a/internal/getproviders/source.go b/internal/getproviders/source.go index 905bec6202..b8543d8efd 100644 --- a/internal/getproviders/source.go +++ b/internal/getproviders/source.go @@ -3,7 +3,7 @@ package getproviders import ( "context" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) // A Source can query a particular source for information about providers diff --git a/internal/getproviders/types.go b/internal/getproviders/types.go index c71fc5893f..a6498386b9 100644 --- a/internal/getproviders/types.go +++ b/internal/getproviders/types.go @@ -9,7 +9,7 @@ import ( "github.com/apparentlymart/go-versions/versions" "github.com/apparentlymart/go-versions/versions/constraints" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) // Version represents a particular single version of a provider. diff --git a/internal/initwd/module_install.go b/internal/initwd/module_install.go index 2b1a12e963..5b9c7110c8 100644 --- a/internal/initwd/module_install.go +++ b/internal/initwd/module_install.go @@ -9,7 +9,7 @@ import ( version "github.com/hashicorp/go-version" "github.com/hashicorp/terraform-config-inspect/tfconfig" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/earlyconfig" "github.com/hashicorp/terraform/internal/modsdir" "github.com/hashicorp/terraform/internal/registry" diff --git a/internal/instances/expander.go b/internal/instances/expander.go index 1a2f1dd2ac..0cb75c0614 100644 --- a/internal/instances/expander.go +++ b/internal/instances/expander.go @@ -5,7 +5,7 @@ import ( "sort" "sync" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/instances/expander_test.go b/internal/instances/expander_test.go index 900d716d5e..8e4d0f8f0e 100644 --- a/internal/instances/expander_test.go +++ b/internal/instances/expander_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) func TestExpander(t *testing.T) { diff --git a/internal/instances/expansion_mode.go b/internal/instances/expansion_mode.go index be33934324..1183e3c768 100644 --- a/internal/instances/expansion_mode.go +++ b/internal/instances/expansion_mode.go @@ -6,7 +6,7 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) // expansion is an internal interface used to represent the different diff --git a/internal/legacy/terraform/context_components.go b/internal/legacy/terraform/context_components.go index 340d691f2a..31494efb2f 100644 --- a/internal/legacy/terraform/context_components.go +++ b/internal/legacy/terraform/context_components.go @@ -3,7 +3,7 @@ package terraform import ( "fmt" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" ) diff --git a/internal/legacy/terraform/diff.go b/internal/legacy/terraform/diff.go index 4e834204d2..66e33e7fff 100644 --- a/internal/legacy/terraform/diff.go +++ b/internal/legacy/terraform/diff.go @@ -12,9 +12,9 @@ import ( "strings" "sync" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/addrs" "github.com/zclconf/go-cty/cty" "github.com/mitchellh/copystructure" diff --git a/internal/legacy/terraform/diff_test.go b/internal/legacy/terraform/diff_test.go index e7ee0d8185..5388eb44eb 100644 --- a/internal/legacy/terraform/diff_test.go +++ b/internal/legacy/terraform/diff_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) func TestDiffEmpty(t *testing.T) { diff --git a/internal/legacy/terraform/resource.go b/internal/legacy/terraform/resource.go index 6273c8ace0..5f9ade0cab 100644 --- a/internal/legacy/terraform/resource.go +++ b/internal/legacy/terraform/resource.go @@ -11,9 +11,9 @@ import ( "github.com/mitchellh/reflectwalk" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/addrs" ) // Resource is a legacy way to identify a particular resource instance. diff --git a/internal/legacy/terraform/resource_address.go b/internal/legacy/terraform/resource_address.go index 75854b6be6..9b10a1464d 100644 --- a/internal/legacy/terraform/resource_address.go +++ b/internal/legacy/terraform/resource_address.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" ) // ResourceAddress is a way of identifying an individual resource (or, diff --git a/internal/legacy/terraform/resource_address_test.go b/internal/legacy/terraform/resource_address_test.go index 3bb5f2082d..81e469a62b 100644 --- a/internal/legacy/terraform/resource_address_test.go +++ b/internal/legacy/terraform/resource_address_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" ) func TestParseResourceAddressInternal(t *testing.T) { diff --git a/internal/legacy/terraform/schemas.go b/internal/legacy/terraform/schemas.go index d9eb2a8851..fdab663fe7 100644 --- a/internal/legacy/terraform/schemas.go +++ b/internal/legacy/terraform/schemas.go @@ -4,9 +4,9 @@ import ( "fmt" "log" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" diff --git a/internal/legacy/terraform/state.go b/internal/legacy/terraform/state.go index 0a7fc9d70b..c322c2633c 100644 --- a/internal/legacy/terraform/state.go +++ b/internal/legacy/terraform/state.go @@ -22,10 +22,10 @@ import ( version "github.com/hashicorp/go-version" "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" tfversion "github.com/hashicorp/terraform/version" diff --git a/internal/legacy/terraform/state_test.go b/internal/legacy/terraform/state_test.go index beac797052..f4f96a3f65 100644 --- a/internal/legacy/terraform/state_test.go +++ b/internal/legacy/terraform/state_test.go @@ -11,8 +11,8 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/addrs" ) func TestStateValidate(t *testing.T) { diff --git a/internal/modsdir/manifest.go b/internal/modsdir/manifest.go index 5b0e675731..c347929d55 100644 --- a/internal/modsdir/manifest.go +++ b/internal/modsdir/manifest.go @@ -12,7 +12,7 @@ import ( version "github.com/hashicorp/go-version" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) // Record represents some metadata about an installed module, as part diff --git a/internal/moduledeps/dependencies.go b/internal/moduledeps/dependencies.go index dd21a0a255..ef11e063a2 100644 --- a/internal/moduledeps/dependencies.go +++ b/internal/moduledeps/dependencies.go @@ -1,7 +1,7 @@ package moduledeps import ( - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/plugin/discovery" ) diff --git a/internal/moduledeps/module_test.go b/internal/moduledeps/module_test.go index d835e52675..6b50ffe1b1 100644 --- a/internal/moduledeps/module_test.go +++ b/internal/moduledeps/module_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/plugin/discovery" ) diff --git a/internal/providercache/cached_provider.go b/internal/providercache/cached_provider.go index 359e225974..0adbef21ba 100644 --- a/internal/providercache/cached_provider.go +++ b/internal/providercache/cached_provider.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/getproviders" ) diff --git a/internal/providercache/cached_provider_test.go b/internal/providercache/cached_provider_test.go index a3272abbf6..7c9a857c78 100644 --- a/internal/providercache/cached_provider_test.go +++ b/internal/providercache/cached_provider_test.go @@ -3,7 +3,7 @@ package providercache import ( "testing" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/getproviders" ) diff --git a/internal/providercache/dir.go b/internal/providercache/dir.go index 803c771ce6..c33114f861 100644 --- a/internal/providercache/dir.go +++ b/internal/providercache/dir.go @@ -5,7 +5,7 @@ import ( "path/filepath" "sort" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/getproviders" ) diff --git a/internal/providercache/dir_modify_test.go b/internal/providercache/dir_modify_test.go index 0e39ffad93..b5bfa2629f 100644 --- a/internal/providercache/dir_modify_test.go +++ b/internal/providercache/dir_modify_test.go @@ -10,7 +10,7 @@ import ( "github.com/apparentlymart/go-versions/versions" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/getproviders" ) diff --git a/internal/providercache/dir_test.go b/internal/providercache/dir_test.go index ada5c83fdb..3dfb171c00 100644 --- a/internal/providercache/dir_test.go +++ b/internal/providercache/dir_test.go @@ -6,7 +6,7 @@ import ( "github.com/apparentlymart/go-versions/versions" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/getproviders" ) diff --git a/internal/providercache/installer.go b/internal/providercache/installer.go index 484d3a79ae..0a2032223e 100644 --- a/internal/providercache/installer.go +++ b/internal/providercache/installer.go @@ -8,7 +8,7 @@ import ( "github.com/apparentlymart/go-versions/versions" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" copydir "github.com/hashicorp/terraform/internal/copy" "github.com/hashicorp/terraform/internal/depsfile" "github.com/hashicorp/terraform/internal/getproviders" diff --git a/internal/providercache/installer_events.go b/internal/providercache/installer_events.go index e610cb2858..8c27cc9142 100644 --- a/internal/providercache/installer_events.go +++ b/internal/providercache/installer_events.go @@ -3,7 +3,7 @@ package providercache import ( "context" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/getproviders" ) diff --git a/internal/providercache/installer_events_test.go b/internal/providercache/installer_events_test.go index ab70326308..8879fb68a7 100644 --- a/internal/providercache/installer_events_test.go +++ b/internal/providercache/installer_events_test.go @@ -1,7 +1,7 @@ package providercache import ( - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/getproviders" ) diff --git a/internal/providercache/installer_test.go b/internal/providercache/installer_test.go index 2063fc1eac..e5a8a5e617 100644 --- a/internal/providercache/installer_test.go +++ b/internal/providercache/installer_test.go @@ -18,7 +18,7 @@ import ( "github.com/google/go-cmp/cmp" svchost "github.com/hashicorp/terraform-svchost" "github.com/hashicorp/terraform-svchost/disco" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/depsfile" "github.com/hashicorp/terraform/internal/getproviders" ) diff --git a/internal/providers/addressed_types.go b/internal/providers/addressed_types.go index 85ff4c962d..8efa82ca3e 100644 --- a/internal/providers/addressed_types.go +++ b/internal/providers/addressed_types.go @@ -3,7 +3,7 @@ package providers import ( "sort" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) // AddressedTypesAbs is a helper that extracts all of the distinct provider diff --git a/internal/providers/addressed_types_test.go b/internal/providers/addressed_types_test.go index 0d45f44b33..3bb4766705 100644 --- a/internal/providers/addressed_types_test.go +++ b/internal/providers/addressed_types_test.go @@ -5,7 +5,7 @@ import ( "github.com/go-test/deep" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) func TestAddressedTypesAbs(t *testing.T) { diff --git a/internal/repl/session_test.go b/internal/repl/session_test.go index 9512fb5be5..f2f54b85e6 100644 --- a/internal/repl/session_test.go +++ b/internal/repl/session_test.go @@ -8,8 +8,8 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/states" diff --git a/lang/data.go b/lang/data.go index fe211398dc..710fccedc8 100644 --- a/lang/data.go +++ b/lang/data.go @@ -1,7 +1,7 @@ package lang import ( - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/zclconf/go-cty/cty" ) diff --git a/lang/data_test.go b/lang/data_test.go index c41870f802..28f7bdc0c9 100644 --- a/lang/data_test.go +++ b/lang/data_test.go @@ -1,7 +1,7 @@ package lang import ( - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/zclconf/go-cty/cty" ) diff --git a/lang/eval.go b/lang/eval.go index f4c7474aa4..9621dc471c 100644 --- a/lang/eval.go +++ b/lang/eval.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/ext/dynblock" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang/blocktoattr" diff --git a/lang/eval_test.go b/lang/eval_test.go index 594b01c1e6..b437a0c1ae 100644 --- a/lang/eval_test.go +++ b/lang/eval_test.go @@ -5,8 +5,8 @@ import ( "encoding/json" "testing" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/hcl/v2" diff --git a/lang/references.go b/lang/references.go index b0b37d15f2..b56fce72e7 100644 --- a/lang/references.go +++ b/lang/references.go @@ -2,8 +2,8 @@ package lang import ( "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang/blocktoattr" ) diff --git a/lang/scope.go b/lang/scope.go index 94ec9d3bf3..6c229e25d9 100644 --- a/lang/scope.go +++ b/lang/scope.go @@ -5,7 +5,7 @@ import ( "github.com/zclconf/go-cty/cty/function" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/experiments" ) diff --git a/main.go b/main.go index bc37855117..3842680738 100644 --- a/main.go +++ b/main.go @@ -13,9 +13,9 @@ import ( "github.com/hashicorp/go-plugin" "github.com/hashicorp/terraform-svchost/disco" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/cliconfig" "github.com/hashicorp/terraform/command/format" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/didyoumean" "github.com/hashicorp/terraform/internal/httpclient" "github.com/hashicorp/terraform/internal/logging" diff --git a/plans/changes.go b/plans/changes.go index 2ababe7781..9575f2d6b8 100644 --- a/plans/changes.go +++ b/plans/changes.go @@ -1,7 +1,7 @@ package plans import ( - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" ) diff --git a/plans/changes_src.go b/plans/changes_src.go index 63026e73fc..1dcd049601 100644 --- a/plans/changes_src.go +++ b/plans/changes_src.go @@ -3,7 +3,7 @@ package plans import ( "fmt" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" ) diff --git a/plans/changes_sync.go b/plans/changes_sync.go index 0a69dc2155..b175b467e3 100644 --- a/plans/changes_sync.go +++ b/plans/changes_sync.go @@ -4,7 +4,7 @@ import ( "fmt" "sync" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/states" ) diff --git a/plans/plan.go b/plans/plan.go index a3ba4f291c..3445004757 100644 --- a/plans/plan.go +++ b/plans/plan.go @@ -3,8 +3,8 @@ package plans import ( "sort" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" ) diff --git a/plans/plan_test.go b/plans/plan_test.go index b8a0e4501b..34f9361394 100644 --- a/plans/plan_test.go +++ b/plans/plan_test.go @@ -5,7 +5,7 @@ import ( "github.com/go-test/deep" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) func TestProviderAddrs(t *testing.T) { diff --git a/plans/planfile/tfplan.go b/plans/planfile/tfplan.go index c3d5955781..800aa54044 100644 --- a/plans/planfile/tfplan.go +++ b/plans/planfile/tfplan.go @@ -7,7 +7,7 @@ import ( "google.golang.org/protobuf/proto" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/plans/internal/planproto" diff --git a/plans/planfile/tfplan_test.go b/plans/planfile/tfplan_test.go index 8e8b4d7db9..1e6cc4f913 100644 --- a/plans/planfile/tfplan_test.go +++ b/plans/planfile/tfplan_test.go @@ -7,7 +7,7 @@ import ( "github.com/go-test/deep" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/plans" ) diff --git a/provider_source.go b/provider_source.go index ccf17dc9f6..06ef6127da 100644 --- a/provider_source.go +++ b/provider_source.go @@ -10,8 +10,8 @@ import ( "github.com/apparentlymart/go-userdirs/userdirs" "github.com/hashicorp/terraform-svchost/disco" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/cliconfig" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/states/instance_object.go b/states/instance_object.go index e92ffdc146..85ca528782 100644 --- a/states/instance_object.go +++ b/states/instance_object.go @@ -4,7 +4,7 @@ import ( "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) // ResourceInstanceObject is the local representation of a specific remote diff --git a/states/instance_object_src.go b/states/instance_object_src.go index aeb612eaa8..64b41dfbb0 100644 --- a/states/instance_object_src.go +++ b/states/instance_object_src.go @@ -4,8 +4,8 @@ import ( "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/addrs" ) // ResourceInstanceObjectSrc is a not-fully-decoded version of diff --git a/states/module.go b/states/module.go index fbef01c7a9..2f6242ace5 100644 --- a/states/module.go +++ b/states/module.go @@ -3,7 +3,7 @@ package states import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) // Module is a container for the states of objects within a particular module. diff --git a/states/output_value.go b/states/output_value.go index 268420cf4a..5415951648 100644 --- a/states/output_value.go +++ b/states/output_value.go @@ -1,7 +1,7 @@ package states import ( - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/zclconf/go-cty/cty" ) diff --git a/states/resource.go b/states/resource.go index 28223671d5..1c1f65bede 100644 --- a/states/resource.go +++ b/states/resource.go @@ -5,7 +5,7 @@ import ( "math/rand" "time" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) // Resource represents the state of a resource. diff --git a/states/state.go b/states/state.go index 6d0cec148a..0b3e207eed 100644 --- a/states/state.go +++ b/states/state.go @@ -5,7 +5,7 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/getproviders" ) diff --git a/states/state_deepcopy.go b/states/state_deepcopy.go index 74f21de03c..f2cb3a0b4d 100644 --- a/states/state_deepcopy.go +++ b/states/state_deepcopy.go @@ -1,7 +1,7 @@ package states import ( - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/zclconf/go-cty/cty" ) diff --git a/states/state_equal.go b/states/state_equal.go index 9b251252ff..06658ef268 100644 --- a/states/state_equal.go +++ b/states/state_equal.go @@ -3,7 +3,7 @@ package states import ( "reflect" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) // Equal returns true if the receiver is functionally equivalent to other, diff --git a/states/state_string.go b/states/state_string.go index 0f74d59659..1851da42d8 100644 --- a/states/state_string.go +++ b/states/state_string.go @@ -10,8 +10,8 @@ import ( ctyjson "github.com/zclconf/go-cty/cty/json" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/addrs" ) // String returns a rather-odd string representation of the entire state. diff --git a/states/state_test.go b/states/state_test.go index b430ef78e2..11aa89ba60 100644 --- a/states/state_test.go +++ b/states/state_test.go @@ -7,7 +7,7 @@ import ( "github.com/go-test/deep" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) func TestState(t *testing.T) { diff --git a/states/statefile/version3_upgrade.go b/states/statefile/version3_upgrade.go index a1e3cf2299..55d067a9cc 100644 --- a/states/statefile/version3_upgrade.go +++ b/states/statefile/version3_upgrade.go @@ -10,8 +10,8 @@ import ( "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" ) diff --git a/states/statefile/version4.go b/states/statefile/version4.go index 41c45dc769..6356e3c9b9 100644 --- a/states/statefile/version4.go +++ b/states/statefile/version4.go @@ -10,7 +10,7 @@ import ( "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" ) diff --git a/states/statemgr/filesystem_test.go b/states/statemgr/filesystem_test.go index e7e65f9e0f..d20e685cd9 100644 --- a/states/statemgr/filesystem_test.go +++ b/states/statemgr/filesystem_test.go @@ -13,7 +13,7 @@ import ( version "github.com/hashicorp/go-version" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statefile" tfversion "github.com/hashicorp/terraform/version" diff --git a/states/statemgr/migrate_test.go b/states/statemgr/migrate_test.go index 0cf2113a25..6e52bf4843 100644 --- a/states/statemgr/migrate_test.go +++ b/states/statemgr/migrate_test.go @@ -5,7 +5,7 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statefile" ) diff --git a/states/statemgr/testing.go b/states/statemgr/testing.go index 525797a36f..5c0b248705 100644 --- a/states/statemgr/testing.go +++ b/states/statemgr/testing.go @@ -7,7 +7,7 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statefile" ) diff --git a/states/sync.go b/states/sync.go index 610fc07aa0..defa02cc45 100644 --- a/states/sync.go +++ b/states/sync.go @@ -4,7 +4,7 @@ import ( "log" "sync" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/context.go b/terraform/context.go index 5ac667df57..c0c00c5da4 100644 --- a/terraform/context.go +++ b/terraform/context.go @@ -8,8 +8,8 @@ import ( "sync" "github.com/apparentlymart/go-versions/versions" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" diff --git a/terraform/context_apply2_test.go b/terraform/context_apply2_test.go index 43e99ae8e1..9d64d0adcf 100644 --- a/terraform/context_apply2_test.go +++ b/terraform/context_apply2_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" diff --git a/terraform/context_apply_test.go b/terraform/context_apply_test.go index f246c3e6bd..46e7b30b87 100644 --- a/terraform/context_apply_test.go +++ b/terraform/context_apply_test.go @@ -18,10 +18,10 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/go-test/deep" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" diff --git a/terraform/context_components.go b/terraform/context_components.go index 9f8b8d10a9..8532cfd4a0 100644 --- a/terraform/context_components.go +++ b/terraform/context_components.go @@ -3,7 +3,7 @@ package terraform import ( "fmt" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" ) diff --git a/terraform/context_components_test.go b/terraform/context_components_test.go index d0899e5970..3d88110422 100644 --- a/terraform/context_components_test.go +++ b/terraform/context_components_test.go @@ -3,8 +3,8 @@ package terraform import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" ) diff --git a/terraform/context_eval_test.go b/terraform/context_eval_test.go index 6fdbce5738..0fbd20e33b 100644 --- a/terraform/context_eval_test.go +++ b/terraform/context_eval_test.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "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 7af8267d53..d4f0e3ce1d 100644 --- a/terraform/context_fixtures_test.go +++ b/terraform/context_fixtures_test.go @@ -3,9 +3,9 @@ package terraform import ( "testing" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" "github.com/zclconf/go-cty/cty" diff --git a/terraform/context_import.go b/terraform/context_import.go index 91fa8ade3e..0f37bc59be 100644 --- a/terraform/context_import.go +++ b/terraform/context_import.go @@ -1,7 +1,7 @@ package terraform import ( - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/context_import_test.go b/terraform/context_import_test.go index 4fbdd64c64..18583336b6 100644 --- a/terraform/context_import_test.go +++ b/terraform/context_import_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" diff --git a/terraform/context_input.go b/terraform/context_input.go index a875ad8a3b..fe659eda2e 100644 --- a/terraform/context_input.go +++ b/terraform/context_input.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/terraform/context_input_test.go b/terraform/context_input_test.go index 11a5b3dd30..cb4a879aea 100644 --- a/terraform/context_input_test.go +++ b/terraform/context_input_test.go @@ -8,8 +8,8 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "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 f7a3f331e5..483842a093 100644 --- a/terraform/context_plan2_test.go +++ b/terraform/context_plan2_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" diff --git a/terraform/context_plan_test.go b/terraform/context_plan_test.go index d7a48e44bc..052cc20ad3 100644 --- a/terraform/context_plan_test.go +++ b/terraform/context_plan_test.go @@ -15,9 +15,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" diff --git a/terraform/context_refresh_test.go b/terraform/context_refresh_test.go index 4c0f131696..7479eb5664 100644 --- a/terraform/context_refresh_test.go +++ b/terraform/context_refresh_test.go @@ -11,9 +11,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/context_test.go b/terraform/context_test.go index 0ceccd17d2..f19c06b3b4 100644 --- a/terraform/context_test.go +++ b/terraform/context_test.go @@ -15,11 +15,11 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/hashicorp/go-version" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configload" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/depsfile" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" diff --git a/terraform/context_validate_test.go b/terraform/context_validate_test.go index ecb78171b9..68c4bab186 100644 --- a/terraform/context_validate_test.go +++ b/terraform/context_validate_test.go @@ -8,8 +8,8 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" diff --git a/terraform/eval_context.go b/terraform/eval_context.go index 1ac46f5b4b..4db0e9712e 100644 --- a/terraform/eval_context.go +++ b/terraform/eval_context.go @@ -2,8 +2,8 @@ package terraform import ( "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" diff --git a/terraform/eval_context_builtin.go b/terraform/eval_context_builtin.go index f70d0ea9db..d39f4e6116 100644 --- a/terraform/eval_context_builtin.go +++ b/terraform/eval_context_builtin.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/eval_context_builtin_test.go b/terraform/eval_context_builtin_test.go index 0f838875e0..0521930b58 100644 --- a/terraform/eval_context_builtin_test.go +++ b/terraform/eval_context_builtin_test.go @@ -5,7 +5,7 @@ import ( "sync" "testing" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "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 9c5f233299..e8022e7a07 100644 --- a/terraform/eval_context_mock.go +++ b/terraform/eval_context_mock.go @@ -3,8 +3,8 @@ package terraform import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" diff --git a/terraform/eval_count.go b/terraform/eval_count.go index 62da234a70..a7f3c25ab3 100644 --- a/terraform/eval_count.go +++ b/terraform/eval_count.go @@ -5,7 +5,7 @@ import ( "log" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/gocty" diff --git a/terraform/eval_provider.go b/terraform/eval_provider.go index 920bfab9a9..930332efbb 100644 --- a/terraform/eval_provider.go +++ b/terraform/eval_provider.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" ) diff --git a/terraform/eval_provider_test.go b/terraform/eval_provider_test.go index ff1eb8ab37..ecf073eedc 100644 --- a/terraform/eval_provider_test.go +++ b/terraform/eval_provider_test.go @@ -6,9 +6,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" ) func TestBuildProviderConfig(t *testing.T) { diff --git a/terraform/eval_variable.go b/terraform/eval_variable.go index 70dfa6168a..5c58fa04b9 100644 --- a/terraform/eval_variable.go +++ b/terraform/eval_variable.go @@ -5,8 +5,8 @@ import ( "log" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/convert" diff --git a/terraform/evaluate.go b/terraform/evaluate.go index 7df181627f..4a3f466056 100644 --- a/terraform/evaluate.go +++ b/terraform/evaluate.go @@ -12,9 +12,9 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/convert" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang" diff --git a/terraform/evaluate_test.go b/terraform/evaluate_test.go index 6656d20913..8e7dd1b581 100644 --- a/terraform/evaluate_test.go +++ b/terraform/evaluate_test.go @@ -7,9 +7,9 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" diff --git a/terraform/evaluate_valid.go b/terraform/evaluate_valid.go index 99543728ba..a6abd7216f 100644 --- a/terraform/evaluate_valid.go +++ b/terraform/evaluate_valid.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/didyoumean" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/terraform/evaluate_valid_test.go b/terraform/evaluate_valid_test.go index 9267aee65d..cf10c9a1b1 100644 --- a/terraform/evaluate_valid_test.go +++ b/terraform/evaluate_valid_test.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/lang" ) diff --git a/terraform/graph.go b/terraform/graph.go index cab316f59a..65a3c2003e 100644 --- a/terraform/graph.go +++ b/terraform/graph.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" ) diff --git a/terraform/graph_builder.go b/terraform/graph_builder.go index 3b6ee322c2..9d0cadde41 100644 --- a/terraform/graph_builder.go +++ b/terraform/graph_builder.go @@ -3,7 +3,7 @@ package terraform import ( "log" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/logging" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/terraform/graph_builder_apply.go b/terraform/graph_builder_apply.go index 314a915c8f..ab28207f46 100644 --- a/terraform/graph_builder_apply.go +++ b/terraform/graph_builder_apply.go @@ -1,8 +1,8 @@ package terraform import ( - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" diff --git a/terraform/graph_builder_apply_test.go b/terraform/graph_builder_apply_test.go index cf7076911b..7eb6173596 100644 --- a/terraform/graph_builder_apply_test.go +++ b/terraform/graph_builder_apply_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" diff --git a/terraform/graph_builder_destroy_plan.go b/terraform/graph_builder_destroy_plan.go index f66fd61edc..6d6b45f001 100644 --- a/terraform/graph_builder_destroy_plan.go +++ b/terraform/graph_builder_destroy_plan.go @@ -1,8 +1,8 @@ package terraform import ( - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" diff --git a/terraform/graph_builder_eval.go b/terraform/graph_builder_eval.go index c0640e3054..9fa8c4c630 100644 --- a/terraform/graph_builder_eval.go +++ b/terraform/graph_builder_eval.go @@ -1,8 +1,8 @@ package terraform import ( - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" diff --git a/terraform/graph_builder_import.go b/terraform/graph_builder_import.go index 2aa2a3359c..87d2ec949f 100644 --- a/terraform/graph_builder_import.go +++ b/terraform/graph_builder_import.go @@ -1,8 +1,8 @@ package terraform import ( - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/terraform/graph_builder_plan.go b/terraform/graph_builder_plan.go index 8c8926a0ae..2960d01d59 100644 --- a/terraform/graph_builder_plan.go +++ b/terraform/graph_builder_plan.go @@ -3,8 +3,8 @@ package terraform import ( "sync" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" diff --git a/terraform/graph_builder_plan_test.go b/terraform/graph_builder_plan_test.go index 9e9646b1d7..79a9f6db20 100644 --- a/terraform/graph_builder_plan_test.go +++ b/terraform/graph_builder_plan_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/graph_builder_test.go b/terraform/graph_builder_test.go index 83d8afecdd..91d703f42c 100644 --- a/terraform/graph_builder_test.go +++ b/terraform/graph_builder_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" ) diff --git a/terraform/graph_interface_subgraph.go b/terraform/graph_interface_subgraph.go index 9ff6e763c8..6aa2206dfd 100644 --- a/terraform/graph_interface_subgraph.go +++ b/terraform/graph_interface_subgraph.go @@ -1,7 +1,7 @@ package terraform import ( - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) // GraphNodeModuleInstance says that a node is part of a graph with a diff --git a/terraform/graph_walk.go b/terraform/graph_walk.go index 3ffe471a88..5a0041cb4f 100644 --- a/terraform/graph_walk.go +++ b/terraform/graph_walk.go @@ -1,7 +1,7 @@ package terraform import ( - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/terraform/graph_walk_context.go b/terraform/graph_walk_context.go index c880772c23..d6d94ae0a8 100644 --- a/terraform/graph_walk_context.go +++ b/terraform/graph_walk_context.go @@ -6,8 +6,8 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" diff --git a/terraform/hook.go b/terraform/hook.go index 643f1d1824..1f262a7a0b 100644 --- a/terraform/hook.go +++ b/terraform/hook.go @@ -3,7 +3,7 @@ package terraform import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" diff --git a/terraform/hook_mock.go b/terraform/hook_mock.go index 5f7f695265..562b3dc89a 100644 --- a/terraform/hook_mock.go +++ b/terraform/hook_mock.go @@ -5,7 +5,7 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" diff --git a/terraform/hook_stop.go b/terraform/hook_stop.go index 33aa83cf61..e3da72887e 100644 --- a/terraform/hook_stop.go +++ b/terraform/hook_stop.go @@ -6,7 +6,7 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" diff --git a/terraform/hook_test.go b/terraform/hook_test.go index 3afd46be3e..b04520d72f 100644 --- a/terraform/hook_test.go +++ b/terraform/hook_test.go @@ -6,7 +6,7 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" diff --git a/terraform/node_count_boundary.go b/terraform/node_count_boundary.go index f191389486..0b11699dd2 100644 --- a/terraform/node_count_boundary.go +++ b/terraform/node_count_boundary.go @@ -4,8 +4,8 @@ import ( "fmt" "log" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/terraform/node_count_boundary_test.go b/terraform/node_count_boundary_test.go index 497d4fc96d..ffd52eb14a 100644 --- a/terraform/node_count_boundary_test.go +++ b/terraform/node_count_boundary_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/hashicorp/hcl/v2/hcltest" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/node_data_destroy_test.go b/terraform/node_data_destroy_test.go index 32d07b1431..790d901a3d 100644 --- a/terraform/node_data_destroy_test.go +++ b/terraform/node_data_destroy_test.go @@ -3,7 +3,7 @@ package terraform import ( "testing" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/node_local.go b/terraform/node_local.go index 4cea5c3552..58d8bc9c77 100644 --- a/terraform/node_local.go +++ b/terraform/node_local.go @@ -5,8 +5,8 @@ import ( "log" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang" diff --git a/terraform/node_local_test.go b/terraform/node_local_test.go index d53f49e3eb..15d042d4f1 100644 --- a/terraform/node_local_test.go +++ b/terraform/node_local_test.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/node_module_expand.go b/terraform/node_module_expand.go index 31f86fee76..25ca77d84c 100644 --- a/terraform/node_module_expand.go +++ b/terraform/node_module_expand.go @@ -3,8 +3,8 @@ package terraform import ( "log" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang" diff --git a/terraform/node_module_expand_test.go b/terraform/node_module_expand_test.go index 3da9658716..5b1d0c20ab 100644 --- a/terraform/node_module_expand_test.go +++ b/terraform/node_module_expand_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/hashicorp/hcl/v2/hcltest" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" diff --git a/terraform/node_module_variable.go b/terraform/node_module_variable.go index 7d8c0c6fb0..b0773f2540 100644 --- a/terraform/node_module_variable.go +++ b/terraform/node_module_variable.go @@ -5,8 +5,8 @@ import ( "log" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/tfdiags" diff --git a/terraform/node_module_variable_test.go b/terraform/node_module_variable_test.go index f0d74c11fc..c12feef971 100644 --- a/terraform/node_module_variable_test.go +++ b/terraform/node_module_variable_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" ) func TestNodeModuleVariablePath(t *testing.T) { diff --git a/terraform/node_output.go b/terraform/node_output.go index ec36a63946..36830f8f29 100644 --- a/terraform/node_output.go +++ b/terraform/node_output.go @@ -5,8 +5,8 @@ import ( "log" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang" diff --git a/terraform/node_output_test.go b/terraform/node_output_test.go index 3b518f0461..ae6725b723 100644 --- a/terraform/node_output_test.go +++ b/terraform/node_output_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/node_provider_abstract.go b/terraform/node_provider_abstract.go index 85c90a0e96..576af5117c 100644 --- a/terraform/node_provider_abstract.go +++ b/terraform/node_provider_abstract.go @@ -1,9 +1,9 @@ package terraform import ( - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" ) diff --git a/terraform/node_provider_test.go b/terraform/node_provider_test.go index 39f37d50da..2fdba6ebdf 100644 --- a/terraform/node_provider_test.go +++ b/terraform/node_provider_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/zclconf/go-cty/cty" diff --git a/terraform/node_resource_abstract.go b/terraform/node_resource_abstract.go index 76b56cb2c1..828ea7986e 100644 --- a/terraform/node_resource_abstract.go +++ b/terraform/node_resource_abstract.go @@ -4,9 +4,9 @@ import ( "fmt" "log" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang" diff --git a/terraform/node_resource_abstract_instance.go b/terraform/node_resource_abstract_instance.go index 6441fec3ae..2f4e2795ab 100644 --- a/terraform/node_resource_abstract_instance.go +++ b/terraform/node_resource_abstract_instance.go @@ -6,9 +6,9 @@ import ( "strings" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" diff --git a/terraform/node_resource_abstract_instance_test.go b/terraform/node_resource_abstract_instance_test.go index 08561c4695..8cd5cbd848 100644 --- a/terraform/node_resource_abstract_instance_test.go +++ b/terraform/node_resource_abstract_instance_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "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 bded7dedd1..c2ff9e43d0 100644 --- a/terraform/node_resource_abstract_test.go +++ b/terraform/node_resource_abstract_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" diff --git a/terraform/node_resource_apply.go b/terraform/node_resource_apply.go index 4b8e7924f8..599130342a 100644 --- a/terraform/node_resource_apply.go +++ b/terraform/node_resource_apply.go @@ -3,7 +3,7 @@ package terraform import ( "log" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang" diff --git a/terraform/node_resource_apply_instance.go b/terraform/node_resource_apply_instance.go index a4bb0fc66e..59ef8927c1 100644 --- a/terraform/node_resource_apply_instance.go +++ b/terraform/node_resource_apply_instance.go @@ -4,8 +4,8 @@ import ( "fmt" "log" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/plans/objchange" diff --git a/terraform/node_resource_apply_test.go b/terraform/node_resource_apply_test.go index 53eb70142a..26335c8ba7 100644 --- a/terraform/node_resource_apply_test.go +++ b/terraform/node_resource_apply_test.go @@ -3,8 +3,8 @@ package terraform import ( "testing" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/node_resource_destroy.go b/terraform/node_resource_destroy.go index 4abd05a42b..7984e4176f 100644 --- a/terraform/node_resource_destroy.go +++ b/terraform/node_resource_destroy.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/node_resource_destroy_deposed.go b/terraform/node_resource_destroy_deposed.go index e152f335ed..f4433f58b4 100644 --- a/terraform/node_resource_destroy_deposed.go +++ b/terraform/node_resource_destroy_deposed.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" diff --git a/terraform/node_resource_destroy_deposed_test.go b/terraform/node_resource_destroy_deposed_test.go index 30b93d1b89..9ce8d3961f 100644 --- a/terraform/node_resource_destroy_deposed_test.go +++ b/terraform/node_resource_destroy_deposed_test.go @@ -3,8 +3,8 @@ package terraform import ( "testing" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" diff --git a/terraform/node_resource_plan.go b/terraform/node_resource_plan.go index 0fab7b6b51..4cc03e6d2c 100644 --- a/terraform/node_resource_plan.go +++ b/terraform/node_resource_plan.go @@ -5,7 +5,7 @@ import ( "log" "strings" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" diff --git a/terraform/node_resource_plan_destroy.go b/terraform/node_resource_plan_destroy.go index 098ff09f17..699d6d2a4e 100644 --- a/terraform/node_resource_plan_destroy.go +++ b/terraform/node_resource_plan_destroy.go @@ -1,7 +1,7 @@ package terraform import ( - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" diff --git a/terraform/node_resource_plan_instance.go b/terraform/node_resource_plan_instance.go index aca716d5c2..2e3727131c 100644 --- a/terraform/node_resource_plan_instance.go +++ b/terraform/node_resource_plan_instance.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) // NodePlannableResourceInstance represents a _single_ resource diff --git a/terraform/node_resource_plan_orphan.go b/terraform/node_resource_plan_orphan.go index 33c3ccf206..1e07fda7a5 100644 --- a/terraform/node_resource_plan_orphan.go +++ b/terraform/node_resource_plan_orphan.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" diff --git a/terraform/node_resource_plan_orphan_test.go b/terraform/node_resource_plan_orphan_test.go index e88942974e..755b6c0843 100644 --- a/terraform/node_resource_plan_orphan_test.go +++ b/terraform/node_resource_plan_orphan_test.go @@ -3,8 +3,8 @@ package terraform import ( "testing" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/plans" diff --git a/terraform/node_resource_plan_test.go b/terraform/node_resource_plan_test.go index a961be4334..d1718a60a8 100644 --- a/terraform/node_resource_plan_test.go +++ b/terraform/node_resource_plan_test.go @@ -3,8 +3,8 @@ package terraform import ( "testing" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/node_resource_validate.go b/terraform/node_resource_validate.go index 1ac0040393..316adc3c02 100644 --- a/terraform/node_resource_validate.go +++ b/terraform/node_resource_validate.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/didyoumean" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" diff --git a/terraform/node_resource_validate_test.go b/terraform/node_resource_validate_test.go index f001dfaeed..43b41502dc 100644 --- a/terraform/node_resource_validate_test.go +++ b/terraform/node_resource_validate_test.go @@ -7,9 +7,9 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hcltest" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" diff --git a/terraform/node_root_variable.go b/terraform/node_root_variable.go index 04586043dc..8d3b87c07b 100644 --- a/terraform/node_root_variable.go +++ b/terraform/node_root_variable.go @@ -1,8 +1,8 @@ package terraform import ( - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/terraform/node_root_variable_test.go b/terraform/node_root_variable_test.go index 6546395bde..947e2459d4 100644 --- a/terraform/node_root_variable_test.go +++ b/terraform/node_root_variable_test.go @@ -3,8 +3,8 @@ package terraform import ( "testing" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" ) func TestNodeRootVariableExecute(t *testing.T) { diff --git a/terraform/reduce_plan.go b/terraform/reduce_plan.go index 097fe6aa34..94b3aba59b 100644 --- a/terraform/reduce_plan.go +++ b/terraform/reduce_plan.go @@ -3,7 +3,7 @@ package terraform import ( "log" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/plans" ) diff --git a/terraform/schemas.go b/terraform/schemas.go index 0c8fa44587..9d757487b6 100644 --- a/terraform/schemas.go +++ b/terraform/schemas.go @@ -4,9 +4,9 @@ import ( "fmt" "log" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" diff --git a/terraform/schemas_test.go b/terraform/schemas_test.go index b871884aea..c7cb33f65e 100644 --- a/terraform/schemas_test.go +++ b/terraform/schemas_test.go @@ -1,8 +1,8 @@ package terraform import ( - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" ) func simpleTestSchemas() *Schemas { diff --git a/terraform/terraform_test.go b/terraform/terraform_test.go index 8dd454ffdf..e7f8e8fd68 100644 --- a/terraform/terraform_test.go +++ b/terraform/terraform_test.go @@ -13,9 +13,9 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configload" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" diff --git a/terraform/transform_attach_config_provider.go b/terraform/transform_attach_config_provider.go index d2e3d69de5..874e5a54d7 100644 --- a/terraform/transform_attach_config_provider.go +++ b/terraform/transform_attach_config_provider.go @@ -1,8 +1,8 @@ package terraform import ( - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" ) // GraphNodeAttachProvider is an interface that must be implemented by nodes diff --git a/terraform/transform_attach_config_provider_meta.go b/terraform/transform_attach_config_provider_meta.go index 4eab86d7e6..bb591755c0 100644 --- a/terraform/transform_attach_config_provider_meta.go +++ b/terraform/transform_attach_config_provider_meta.go @@ -1,8 +1,8 @@ package terraform import ( - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" ) // GraphNodeAttachProviderMetaConfigs is an interface that must be implemented diff --git a/terraform/transform_config.go b/terraform/transform_config.go index 99264efb6f..bd915dfd14 100644 --- a/terraform/transform_config.go +++ b/terraform/transform_config.go @@ -3,8 +3,8 @@ package terraform import ( "log" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" ) diff --git a/terraform/transform_config_test.go b/terraform/transform_config_test.go index b6aada940a..ceed2bf356 100644 --- a/terraform/transform_config_test.go +++ b/terraform/transform_config_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) func TestConfigTransformer_nilModule(t *testing.T) { diff --git a/terraform/transform_destroy_cbd_test.go b/terraform/transform_destroy_cbd_test.go index 4041f65bf7..45133d1945 100644 --- a/terraform/transform_destroy_cbd_test.go +++ b/terraform/transform_destroy_cbd_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/transform_destroy_edge.go b/terraform/transform_destroy_edge.go index 8fbe25aa92..8e28312d2d 100644 --- a/terraform/transform_destroy_edge.go +++ b/terraform/transform_destroy_edge.go @@ -3,7 +3,7 @@ package terraform import ( "log" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/configs" diff --git a/terraform/transform_destroy_edge_test.go b/terraform/transform_destroy_edge_test.go index 92b2448fde..ac9848eb1a 100644 --- a/terraform/transform_destroy_edge_test.go +++ b/terraform/transform_destroy_edge_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/transform_diff_test.go b/terraform/transform_diff_test.go index 82d9632dc7..6d2b2e0b82 100644 --- a/terraform/transform_diff_test.go +++ b/terraform/transform_diff_test.go @@ -6,7 +6,7 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/plans" ) diff --git a/terraform/transform_import_state.go b/terraform/transform_import_state.go index 8d77f8abaa..a636dc8679 100644 --- a/terraform/transform_import_state.go +++ b/terraform/transform_import_state.go @@ -4,8 +4,8 @@ import ( "fmt" "log" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" diff --git a/terraform/transform_import_state_test.go b/terraform/transform_import_state_test.go index 12b11ee130..032c0cc0ac 100644 --- a/terraform/transform_import_state_test.go +++ b/terraform/transform_import_state_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" diff --git a/terraform/transform_local.go b/terraform/transform_local.go index d5b97e1487..78102ac764 100644 --- a/terraform/transform_local.go +++ b/terraform/transform_local.go @@ -1,8 +1,8 @@ package terraform import ( - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" ) // LocalTransformer is a GraphTransformer that adds all the local values diff --git a/terraform/transform_module_expansion.go b/terraform/transform_module_expansion.go index 729d9b5b40..59b13ecd93 100644 --- a/terraform/transform_module_expansion.go +++ b/terraform/transform_module_expansion.go @@ -3,8 +3,8 @@ package terraform import ( "log" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" ) diff --git a/terraform/transform_module_variable.go b/terraform/transform_module_variable.go index d9a08772d0..fa7a8ccd75 100644 --- a/terraform/transform_module_variable.go +++ b/terraform/transform_module_variable.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hclsyntax" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/zclconf/go-cty/cty" diff --git a/terraform/transform_module_variable_test.go b/terraform/transform_module_variable_test.go index 7cd8fbd584..363d141ae7 100644 --- a/terraform/transform_module_variable_test.go +++ b/terraform/transform_module_variable_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) func TestModuleVariableTransformer(t *testing.T) { diff --git a/terraform/transform_orphan_count.go b/terraform/transform_orphan_count.go index 08db1dd3e5..705daa9ef7 100644 --- a/terraform/transform_orphan_count.go +++ b/terraform/transform_orphan_count.go @@ -3,7 +3,7 @@ package terraform import ( "log" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/transform_orphan_count_test.go b/terraform/transform_orphan_count_test.go index 1ec725cd6d..995ac69fdb 100644 --- a/terraform/transform_orphan_count_test.go +++ b/terraform/transform_orphan_count_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/transform_orphan_output.go b/terraform/transform_orphan_output.go index ba1bce932d..ef719b6296 100644 --- a/terraform/transform_orphan_output.go +++ b/terraform/transform_orphan_output.go @@ -3,8 +3,8 @@ package terraform import ( "log" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/transform_orphan_resource_test.go b/terraform/transform_orphan_resource_test.go index c68e2a4fa6..af092c8fca 100644 --- a/terraform/transform_orphan_resource_test.go +++ b/terraform/transform_orphan_resource_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/transform_output.go b/terraform/transform_output.go index 04b96089d9..15dcb522c2 100644 --- a/terraform/transform_output.go +++ b/terraform/transform_output.go @@ -3,8 +3,8 @@ package terraform import ( "log" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/plans" ) diff --git a/terraform/transform_provider.go b/terraform/transform_provider.go index 8fe9628c8b..db2807874b 100644 --- a/terraform/transform_provider.go +++ b/terraform/transform_provider.go @@ -5,8 +5,8 @@ import ( "log" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/terraform/transform_provider_test.go b/terraform/transform_provider_test.go index cc06007822..fb856e19bc 100644 --- a/terraform/transform_provider_test.go +++ b/terraform/transform_provider_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" ) diff --git a/terraform/transform_reference.go b/terraform/transform_reference.go index 70d9e246ed..28afd1d599 100644 --- a/terraform/transform_reference.go +++ b/terraform/transform_reference.go @@ -6,8 +6,8 @@ import ( "sort" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/lang" ) diff --git a/terraform/transform_reference_test.go b/terraform/transform_reference_test.go index ba2c84089f..50e47e19b8 100644 --- a/terraform/transform_reference_test.go +++ b/terraform/transform_reference_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" ) diff --git a/terraform/transform_removed_modules.go b/terraform/transform_removed_modules.go index 7c354cdfeb..eabdc692f1 100644 --- a/terraform/transform_removed_modules.go +++ b/terraform/transform_removed_modules.go @@ -3,8 +3,8 @@ package terraform import ( "log" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/transform_resource_count.go b/terraform/transform_resource_count.go index 39593a5177..e438448b92 100644 --- a/terraform/transform_resource_count.go +++ b/terraform/transform_resource_count.go @@ -3,8 +3,8 @@ package terraform import ( "log" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" ) diff --git a/terraform/transform_root_test.go b/terraform/transform_root_test.go index 28bfc85819..04b8659ded 100644 --- a/terraform/transform_root_test.go +++ b/terraform/transform_root_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) func TestRootTransformer(t *testing.T) { diff --git a/terraform/transform_targets.go b/terraform/transform_targets.go index cf36dcf76d..e603bcedb4 100644 --- a/terraform/transform_targets.go +++ b/terraform/transform_targets.go @@ -3,7 +3,7 @@ package terraform import ( "log" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" ) diff --git a/terraform/transform_targets_test.go b/terraform/transform_targets_test.go index 9339b913ec..0700bf4e80 100644 --- a/terraform/transform_targets_test.go +++ b/terraform/transform_targets_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) func TestTargetsTransformer(t *testing.T) { diff --git a/terraform/transform_transitive_reduction_test.go b/terraform/transform_transitive_reduction_test.go index 72cd21dd54..f9605d3651 100644 --- a/terraform/transform_transitive_reduction_test.go +++ b/terraform/transform_transitive_reduction_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/transform_variable.go b/terraform/transform_variable.go index 05daa5135a..a94cc6311a 100644 --- a/terraform/transform_variable.go +++ b/terraform/transform_variable.go @@ -1,8 +1,8 @@ package terraform import ( - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/addrs" ) // RootVariableTransformer is a GraphTransformer that adds all the root diff --git a/terraform/ui_output_provisioner.go b/terraform/ui_output_provisioner.go index fff964f4bd..22e5670cbd 100644 --- a/terraform/ui_output_provisioner.go +++ b/terraform/ui_output_provisioner.go @@ -1,7 +1,7 @@ package terraform import ( - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) // ProvisionerUIOutput is an implementation of UIOutput that calls a hook diff --git a/terraform/ui_output_provisioner_test.go b/terraform/ui_output_provisioner_test.go index b01f0a30b9..baadd31817 100644 --- a/terraform/ui_output_provisioner_test.go +++ b/terraform/ui_output_provisioner_test.go @@ -3,7 +3,7 @@ package terraform import ( "testing" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" ) func TestProvisionerUIOutput_impl(t *testing.T) { diff --git a/terraform/update_state_hook_test.go b/terraform/update_state_hook_test.go index 71735627c6..b8e79c2270 100644 --- a/terraform/update_state_hook_test.go +++ b/terraform/update_state_hook_test.go @@ -6,7 +6,7 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/upgrade_resource_state.go b/terraform/upgrade_resource_state.go index 9e3dceb9c6..0cae201581 100644 --- a/terraform/upgrade_resource_state.go +++ b/terraform/upgrade_resource_state.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" diff --git a/terraform/validate_selfref.go b/terraform/validate_selfref.go index 1f2826331d..8b15d38c8c 100644 --- a/terraform/validate_selfref.go +++ b/terraform/validate_selfref.go @@ -5,8 +5,8 @@ import ( "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang" ) diff --git a/terraform/validate_selfref_test.go b/terraform/validate_selfref_test.go index 8359a947ba..d9c8892864 100644 --- a/terraform/validate_selfref_test.go +++ b/terraform/validate_selfref_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hcltest" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/zclconf/go-cty/cty" ) diff --git a/tools/terraform-bundle/config.go b/tools/terraform-bundle/config.go index 268df65d3e..a9aa410d8d 100644 --- a/tools/terraform-bundle/config.go +++ b/tools/terraform-bundle/config.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "github.com/hashicorp/hcl" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/plugin/discovery" ) diff --git a/tools/terraform-bundle/package.go b/tools/terraform-bundle/package.go index 45bddbbf42..78a6495fbd 100644 --- a/tools/terraform-bundle/package.go +++ b/tools/terraform-bundle/package.go @@ -15,7 +15,7 @@ import ( getter "github.com/hashicorp/go-getter" "github.com/hashicorp/terraform-svchost/disco" - "github.com/hashicorp/terraform/addrs" + "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/depsfile" "github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/internal/httpclient"