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 1ea3a6efd..1629b5b45 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 b8b45755d..0a8c5e65b 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 eb23919c6..e1a827120 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 bbe487d60..7684fa4a7 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 14c72e9fb..5915c8ac0 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 6988b77f5..3f35053f7 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 8b5f5cfb1..07e37fc46 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 c07aab169..cd55c0b6b 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 6afdc7969..c48db1f5a 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 853f136bf..9423f0e32 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 a9716abfb..6cef3fec2 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 2bd7dd8f5..959ff7747 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 9fcb41f1c..5887bf6e7 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 bfde6d91a..d5e3c1342 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 392db1a9c..f081d492a 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 bf93261db..386734e73 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 e87c70e34..83d654758 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 c16ea2ec5..caf1205f3 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 8575bd25c..00d9093b0 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 81886ee6e..12fee997b 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 3f6e9a50c..33f064fc3 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 bf1ee6dc4..393bbae07 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 f77cca3b5..8afe894e8 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 2bb5e157c..04a14fc63 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 c4b868101..264765c6a 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 1f3852f15..6054587e4 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 4d84dd87e..f5e98cc68 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 69694aff8..d9a75fe40 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 22e8afe23..00420a35c 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 2756d5af0..f2ddb172f 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 e2e51dd58..ba61146a4 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 45bcd5e56..f13c8105d 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 4ffaee5b6..7d233ab8f 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 b95a2aa2f..a8c3385ad 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 1dfd23b74..494c10d0f 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 8ca430e52..22119d8ec 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 a651876bb..44bcaa40d 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 5c1d4a1f0..157666ce3 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 7b471af2f..ca2cf056d 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 f55204291..7fad63013 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 7cac37e47..d3a593f88 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 94cef8f59..dcea93e66 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 5c775e302..cfe6dc847 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 be1c61382..75f49084f 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 27171aec3..93ed731c2 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 8d8273794..9d26ea15a 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 52b87a67a..707bfe8ee 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 5eba15a0b..fbcac53d1 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 414a42a34..7fef59202 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 10f384c45..62be7f9e7 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 25e1a5e7d..049b44119 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 83e75e09f..f708fdf92 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 6dd27a64a..45125c01c 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 ee20c450b..3ed7e8db7 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 1a702c277..f0b6bfafe 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 3a2c3e31f..49591741a 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 0e8242000..792db5244 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 414ce33d8..27ff502a2 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 d206cad8b..34cfa5673 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 b54b4193a..b52418965 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 4e3c1e159..4ec637877 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 2dedb33f6..4cdc0d145 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 54fc857e0..906e7b849 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 d60e3a13c..3482371e5 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 dcb8d1c1a..555e3e127 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 6f1603bfa..694b8999f 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 1083a1a2d..dada18947 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 17b6a4d3a..b51983208 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 a66ea228e..c6177f07f 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 b3db79c9e..bd6ebc457 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 77ed2d87d..7425b3aa0 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 e60cddbec..64924ffdc 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 cfa7bfc8b..40c45685f 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 4005a2782..62e047d15 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 f870e1cc9..6774fbba4 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 69cac1b5b..e94afd0ef 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 db8089f91..65924f085 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 425d1dffb..14fde97f7 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 530048b43..ec38cf5ca 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 02a6ebf74..2bc063606 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 c46cebe74..b599ca96a 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 42d9a6fa2..5d2a931b9 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 49dd299d9..fc348ed41 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 a6389d32d..0b3f424e0 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 71e73d152..8505f0dfa 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 cfc26725d..bc28c2281 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 e636522a1..751399070 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 10f32e11f..add88ea8d 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 9be6e44df..a2633a4eb 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 9e319415d..387270568 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 e3c709d32..4ca206603 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 18b21a177..6e5683383 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 d31f07844..db45c0c19 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 b34bc995b..d888ccc08 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 85bc4582c..18804a9a6 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 f31e7e7f6..c612dedf2 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 b611a5666..118aff208 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 ea73eefe4..f498b81cc 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 f4b694cd7..82387fa55 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 857706556..37ced6ff5 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 4f9e694eb..82f890a76 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 00aff1462..3bf8a004a 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 942aa32d3..2930d5a18 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 ea331ea34..006602b34 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 32a99c1f1..930cbe313 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 f3b08e147..53c4116c7 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 027b80875..f78fb519c 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 93cb51e03..ac0abd4c6 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 e294fb3af..252d4dd00 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 e227438c5..e48e043f7 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 b180c3b42..d55d1fff1 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 905bec620..b8543d8ef 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 c71fc5893..a6498386b 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 2b1a12e96..5b9c7110c 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 1a2f1dd2a..0cb75c061 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 900d716d5..8e4d0f8f0 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 be3393432..1183e3c76 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 340d691f2..31494efb2 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 4e834204d..66e33e7ff 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 e7ee0d818..5388eb44e 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 6273c8ace..5f9ade0ca 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 75854b6be..9b10a1464 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 3bb5f2082..81e469a62 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 d9eb2a885..fdab663fe 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 0a7fc9d70..c322c2633 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 beac79705..f4f96a3f6 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 5b0e67573..c347929d5 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 dd21a0a25..ef11e063a 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 d835e5267..6b50ffe1b 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 359e22597..0adbef21b 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 a3272abbf..7c9a857c7 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 803c771ce..c33114f86 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 0e39ffad9..b5bfa2629 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 ada5c83fd..3dfb171c0 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 484d3a79a..0a2032223 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 e610cb285..8c27cc914 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 ab7032630..8879fb68a 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 2063fc1ea..e5a8a5e61 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 85ff4c962..8efa82ca3 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 0d45f44b3..3bb476670 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 9512fb5be..f2f54b85e 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 fe211398d..710fccedc 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 c41870f80..28f7bdc0c 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 f4c7474aa..9621dc471 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 594b01c1e..b437a0c1a 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 b0b37d15f..b56fce72e 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 94ec9d3bf..6c229e25d 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 bc3785511..384268073 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 2ababe778..9575f2d6b 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 63026e73f..1dcd04960 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 0a69dc215..b175b467e 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 a3ba4f291..344500475 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 b8a0e4501..34f936139 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 c3d595578..800aa5404 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 8e8b4d7db..1e6cc4f91 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 ccf17dc9f..06ef6127d 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 e92ffdc14..85ca52878 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 aeb612eaa..64b41dfbb 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 fbef01c7a..2f6242ace 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 268420cf4..541595164 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 28223671d..1c1f65bed 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 6d0cec148..0b3e207ee 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 74f21de03..f2cb3a0b4 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 9b251252f..06658ef26 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 0f74d5965..1851da42d 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 b430ef78e..11aa89ba6 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 a1e3cf229..55d067a9c 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 41c45dc76..6356e3c9b 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 e7e65f9e0..d20e685cd 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 0cf2113a2..6e52bf484 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 525797a36..5c0b24870 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 610fc07aa..defa02cc4 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 5ac667df5..c0c00c5da 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 43e99ae8e..9d64d0adc 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 f246c3e6b..46e7b30b8 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 9f8b8d10a..8532cfd4a 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 d0899e597..3d8811042 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 6fdbce573..0fbd20e33 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 7af8267d5..d4f0e3ce1 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 91fa8ade3..0f37bc59b 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 4fbdd64c6..18583336b 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 a875ad8a3..fe659eda2 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 11a5b3dd3..cb4a879ae 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 f7a3f331e..483842a09 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 d7a48e44b..052cc20ad 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 4c0f13169..7479eb566 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 0ceccd17d..f19c06b3b 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 ecb78171b..68c4bab18 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 1ac46f5b4..4db0e9712 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 f70d0ea9d..d39f4e611 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 0f838875e..0521930b5 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 9c5f23329..e8022e7a0 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 62da234a7..a7f3c25ab 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 920bfab9a..930332efb 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 ff1eb8ab3..ecf073eed 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 70dfa6168..5c58fa04b 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 7df181627..4a3f46605 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 6656d2091..8e7dd1b58 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 99543728b..a6abd7216 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 9267aee65..cf10c9a1b 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 cab316f59..65a3c2003 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 3b6ee322c..9d0cadde4 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 314a915c8..ab28207f4 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 cf7076911..7eb617359 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 f66fd61ed..6d6b45f00 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 c0640e305..9fa8c4c63 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 2aa2a3359..87d2ec949 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 8c8926a0a..2960d01d5 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 9e9646b1d..79a9f6db2 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 83d8afecd..91d703f42 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 9ff6e763c..6aa2206df 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 3ffe471a8..5a0041cb4 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 c880772c2..d6d94ae0a 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 643f1d182..1f262a7a0 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 5f7f69526..562b3dc89 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 33aa83cf6..e3da72887 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 3afd46be3..b04520d72 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 f19138948..0b11699dd 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 497d4fc96..ffd52eb14 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 32d07b143..790d901a3 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 4cea5c355..58d8bc9c7 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 d53f49e3e..15d042d4f 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 31f86fee7..25ca77d84 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 3da965871..5b1d0c20a 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 7d8c0c6fb..b0773f254 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 f0d74c11f..c12feef97 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 ec36a6394..36830f8f2 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 3b518f046..ae6725b72 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 85c90a0e9..576af5117 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 39f37d50d..2fdba6ebd 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 76b56cb2c..828ea7986 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 6441fec3a..2f4e2795a 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 08561c469..8cd5cbd84 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 bded7dedd..c2ff9e43d 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 4b8e7924f..599130342 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 a4bb0fc66..59ef8927c 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 53eb70142..26335c8ba 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 4abd05a42..7984e4176 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 e152f335e..f4433f58b 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 30b93d1b8..9ce8d3961 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 0fab7b6b5..4cc03e6d2 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 098ff09f1..699d6d2a4 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 aca716d5c..2e3727131 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 33c3ccf20..1e07fda7a 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 e88942974..755b6c084 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 a961be433..d1718a60a 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 1ac004039..316adc3c0 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 f001dfaee..43b41502d 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 04586043d..8d3b87c07 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 6546395bd..947e2459d 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 097fe6aa3..94b3aba59 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 0c8fa4458..9d757487b 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 b871884ae..c7cb33f65 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 8dd454ffd..e7f8e8fd6 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 d2e3d69de..874e5a54d 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 4eab86d7e..bb591755c 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 99264efb6..bd915dfd1 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 b6aada940..ceed2bf35 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 4041f65bf..45133d194 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 8fbe25aa9..8e28312d2 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 92b2448fd..ac9848eb1 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 82d9632dc..6d2b2e0b8 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 8d77f8aba..a636dc867 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 12b11ee13..032c0cc0a 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 d5b97e148..78102ac76 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 729d9b5b4..59b13ecd9 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 d9a08772d..fa7a8ccd7 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 7cd8fbd58..363d141ae 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 08db1dd3e..705daa9ef 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 1ec725cd6..995ac69fd 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 ba1bce932..ef719b629 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 c68e2a4fa..af092c8fc 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 04b96089d..15dcb522c 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 8fe9628c8..db2807874 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 cc0600782..fb856e19b 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 70d9e246e..28afd1d59 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 ba2c84089..50e47e19b 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 7c354cdfe..eabdc692f 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 39593a517..e438448b9 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 28bfc8581..04b8659de 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 cf36dcf76..e603bcedb 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 9339b913e..0700bf4e8 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 72cd21dd5..f9605d365 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 05daa5135..a94cc6311 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 fff964f4b..22e5670cb 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 b01f0a30b..baadd3181 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 71735627c..b8e79c227 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 9e3dceb9c..0cae20158 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 1f2826331..8b15d38c8 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 8359a947b..d9c889286 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 268df65d3..a9aa410d8 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 45bddbbf4..78a6495fb 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"