From 034e944070b219240eeacde3546c4c5d3d7cb82a Mon Sep 17 00:00:00 2001 From: Martin Atkins Date: Mon, 17 May 2021 12:33:17 -0700 Subject: [PATCH] Move plans/ to internal/plans/ 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. --- internal/backend/backend.go | 4 ++-- internal/backend/local/backend_apply.go | 2 +- internal/backend/local/backend_apply_test.go | 2 +- internal/backend/local/backend_local.go | 2 +- internal/backend/local/backend_plan.go | 4 ++-- internal/backend/local/backend_plan_test.go | 4 ++-- internal/backend/remote/backend_apply.go | 2 +- internal/backend/remote/backend_apply_test.go | 4 ++-- internal/backend/remote/backend_common.go | 2 +- internal/backend/remote/backend_plan.go | 2 +- internal/backend/remote/backend_plan_test.go | 4 ++-- internal/command/apply.go | 2 +- internal/command/apply_test.go | 2 +- internal/command/arguments/apply.go | 2 +- internal/command/arguments/apply_test.go | 2 +- internal/command/arguments/extended.go | 2 +- internal/command/arguments/plan_test.go | 2 +- internal/command/command_test.go | 4 ++-- internal/command/e2etest/automation_test.go | 2 +- internal/command/e2etest/primary_test.go | 2 +- internal/command/format/diff.go | 4 ++-- internal/command/format/diff_test.go | 2 +- internal/command/format/state.go | 2 +- internal/command/graph.go | 2 +- internal/command/graph_test.go | 2 +- internal/command/jsonplan/plan.go | 2 +- internal/command/jsonplan/values.go | 2 +- internal/command/jsonplan/values_test.go | 2 +- internal/command/meta_backend.go | 2 +- internal/command/meta_backend_test.go | 2 +- internal/command/meta_new.go | 2 +- internal/command/plan_test.go | 2 +- internal/command/show.go | 4 ++-- internal/command/show_test.go | 2 +- internal/command/test.go | 2 +- internal/command/views/hook_count.go | 2 +- internal/command/views/hook_count_test.go | 2 +- internal/command/views/hook_json.go | 2 +- internal/command/views/hook_json_test.go | 2 +- internal/command/views/hook_ui.go | 2 +- internal/command/views/hook_ui_test.go | 2 +- internal/command/views/json/change.go | 2 +- internal/command/views/json/hook.go | 2 +- internal/command/views/json_view_test.go | 2 +- internal/command/views/operation.go | 2 +- internal/command/views/operation_test.go | 2 +- internal/command/views/plan.go | 2 +- internal/command/views/plan_test.go | 2 +- internal/command/views/show.go | 2 +- internal/e2e/e2e.go | 4 ++-- internal/legacy/terraform/state.go | 2 +- {plans => internal/plans}/action.go | 0 {plans => internal/plans}/action_string.go | 0 {plans => internal/plans}/changes.go | 0 {plans => internal/plans}/changes_src.go | 0 {plans => internal/plans}/changes_state.go | 0 {plans => internal/plans}/changes_sync.go | 0 {plans => internal/plans}/changes_test.go | 0 {plans => internal/plans}/doc.go | 0 {plans => internal/plans}/dynamic_value.go | 0 {plans => internal/plans}/internal/planproto/doc.go | 0 {plans => internal/plans}/internal/planproto/generate.sh | 0 {plans => internal/plans}/internal/planproto/planfile.pb.go | 0 {plans => internal/plans}/internal/planproto/planfile.proto | 2 +- {plans => internal/plans}/mode.go | 0 {plans => internal/plans}/mode_string.go | 0 {plans => internal/plans}/objchange/action.go | 2 +- {plans => internal/plans}/objchange/all_null.go | 0 {plans => internal/plans}/objchange/compatible.go | 0 {plans => internal/plans}/objchange/compatible_test.go | 0 {plans => internal/plans}/objchange/doc.go | 0 {plans => internal/plans}/objchange/lcs.go | 0 {plans => internal/plans}/objchange/lcs_test.go | 0 {plans => internal/plans}/objchange/normalize_obj.go | 0 {plans => internal/plans}/objchange/normalize_obj_test.go | 0 {plans => internal/plans}/objchange/objchange.go | 0 {plans => internal/plans}/objchange/objchange_test.go | 0 {plans => internal/plans}/objchange/plan_valid.go | 0 {plans => internal/plans}/objchange/plan_valid_test.go | 0 {plans => internal/plans}/plan.go | 0 {plans => internal/plans}/plan_test.go | 0 {plans => internal/plans}/planfile/config_snapshot.go | 0 {plans => internal/plans}/planfile/config_snapshot_test.go | 0 {plans => internal/plans}/planfile/doc.go | 0 {plans => internal/plans}/planfile/planfile_test.go | 2 +- {plans => internal/plans}/planfile/reader.go | 2 +- .../test-config/.terraform/modules/child_a/child_a.tf | 0 .../test-config/.terraform/modules/child_a/child_c/child_c.tf | 0 .../test-config/.terraform/modules/child_b.child_d/child_d.tf | 0 .../test-config/.terraform/modules/child_b/child_b.tf | 0 .../testdata/test-config/.terraform/modules/modules.json | 0 .../plans}/planfile/testdata/test-config/root.tf | 0 {plans => internal/plans}/planfile/tfplan.go | 4 ++-- {plans => internal/plans}/planfile/tfplan_test.go | 2 +- {plans => internal/plans}/planfile/writer.go | 2 +- .../plans}/resourceinstancechangeactionreason_string.go | 0 terraform/context.go | 2 +- terraform/context_apply2_test.go | 2 +- terraform/context_apply_test.go | 2 +- terraform/context_plan2_test.go | 2 +- terraform/context_plan_test.go | 2 +- terraform/context_test.go | 4 ++-- terraform/context_validate_test.go | 2 +- terraform/eval_context.go | 2 +- terraform/eval_context_builtin.go | 2 +- terraform/eval_context_mock.go | 2 +- terraform/evaluate.go | 2 +- terraform/evaluate_test.go | 2 +- terraform/graph_builder_apply.go | 2 +- terraform/graph_builder_apply_test.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_output.go | 2 +- terraform/node_resource_abstract_instance.go | 4 ++-- terraform/node_resource_apply_instance.go | 4 ++-- 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_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/reduce_plan.go | 2 +- terraform/terraform_test.go | 2 +- terraform/transform_destroy_cbd_test.go | 2 +- terraform/transform_diff.go | 2 +- terraform/transform_diff_test.go | 2 +- terraform/transform_output.go | 2 +- 131 files changed, 106 insertions(+), 106 deletions(-) rename {plans => internal/plans}/action.go (100%) rename {plans => internal/plans}/action_string.go (100%) rename {plans => internal/plans}/changes.go (100%) rename {plans => internal/plans}/changes_src.go (100%) rename {plans => internal/plans}/changes_state.go (100%) rename {plans => internal/plans}/changes_sync.go (100%) rename {plans => internal/plans}/changes_test.go (100%) rename {plans => internal/plans}/doc.go (100%) rename {plans => internal/plans}/dynamic_value.go (100%) rename {plans => internal/plans}/internal/planproto/doc.go (100%) rename {plans => internal/plans}/internal/planproto/generate.sh (100%) rename {plans => internal/plans}/internal/planproto/planfile.pb.go (100%) rename {plans => internal/plans}/internal/planproto/planfile.proto (99%) rename {plans => internal/plans}/mode.go (100%) rename {plans => internal/plans}/mode_string.go (100%) rename {plans => internal/plans}/objchange/action.go (96%) rename {plans => internal/plans}/objchange/all_null.go (100%) rename {plans => internal/plans}/objchange/compatible.go (100%) rename {plans => internal/plans}/objchange/compatible_test.go (100%) rename {plans => internal/plans}/objchange/doc.go (100%) rename {plans => internal/plans}/objchange/lcs.go (100%) rename {plans => internal/plans}/objchange/lcs_test.go (100%) rename {plans => internal/plans}/objchange/normalize_obj.go (100%) rename {plans => internal/plans}/objchange/normalize_obj_test.go (100%) rename {plans => internal/plans}/objchange/objchange.go (100%) rename {plans => internal/plans}/objchange/objchange_test.go (100%) rename {plans => internal/plans}/objchange/plan_valid.go (100%) rename {plans => internal/plans}/objchange/plan_valid_test.go (100%) rename {plans => internal/plans}/plan.go (100%) rename {plans => internal/plans}/plan_test.go (100%) rename {plans => internal/plans}/planfile/config_snapshot.go (100%) rename {plans => internal/plans}/planfile/config_snapshot_test.go (100%) rename {plans => internal/plans}/planfile/doc.go (100%) rename {plans => internal/plans}/planfile/planfile_test.go (98%) rename {plans => internal/plans}/planfile/reader.go (99%) rename {plans => internal/plans}/planfile/testdata/test-config/.terraform/modules/child_a/child_a.tf (100%) rename {plans => internal/plans}/planfile/testdata/test-config/.terraform/modules/child_a/child_c/child_c.tf (100%) rename {plans => internal/plans}/planfile/testdata/test-config/.terraform/modules/child_b.child_d/child_d.tf (100%) rename {plans => internal/plans}/planfile/testdata/test-config/.terraform/modules/child_b/child_b.tf (100%) rename {plans => internal/plans}/planfile/testdata/test-config/.terraform/modules/modules.json (100%) rename {plans => internal/plans}/planfile/testdata/test-config/root.tf (100%) rename {plans => internal/plans}/planfile/tfplan.go (99%) rename {plans => internal/plans}/planfile/tfplan_test.go (99%) rename {plans => internal/plans}/planfile/writer.go (97%) rename {plans => internal/plans}/resourceinstancechangeactionreason_string.go (100%) diff --git a/internal/backend/backend.go b/internal/backend/backend.go index 0ee73e240..c9366dcf5 100644 --- a/internal/backend/backend.go +++ b/internal/backend/backend.go @@ -17,9 +17,9 @@ import ( "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/configs/configload" "github.com/hashicorp/terraform/internal/configs/configschema" + "github.com/hashicorp/terraform/internal/plans" + "github.com/hashicorp/terraform/internal/plans/planfile" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/plans/planfile" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/terraform" diff --git a/internal/backend/local/backend_apply.go b/internal/backend/local/backend_apply.go index d20660899..c54c34920 100644 --- a/internal/backend/local/backend_apply.go +++ b/internal/backend/local/backend_apply.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/command/views" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statefile" "github.com/hashicorp/terraform/states/statemgr" diff --git a/internal/backend/local/backend_apply_test.go b/internal/backend/local/backend_apply_test.go index af3c01c11..aa3b5dea9 100644 --- a/internal/backend/local/backend_apply_test.go +++ b/internal/backend/local/backend_apply_test.go @@ -17,10 +17,10 @@ import ( "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/initwd" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/terraform" diff --git a/internal/backend/local/backend_local.go b/internal/backend/local/backend_local.go index 1c521801a..167a9dae5 100644 --- a/internal/backend/local/backend_local.go +++ b/internal/backend/local/backend_local.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/configs/configload" + "github.com/hashicorp/terraform/internal/plans/planfile" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans/planfile" "github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/terraform" "github.com/zclconf/go-cty/cty" diff --git a/internal/backend/local/backend_plan.go b/internal/backend/local/backend_plan.go index b29b7db7d..e62204147 100644 --- a/internal/backend/local/backend_plan.go +++ b/internal/backend/local/backend_plan.go @@ -6,9 +6,9 @@ import ( "log" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/plans" + "github.com/hashicorp/terraform/internal/plans/planfile" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/plans/planfile" "github.com/hashicorp/terraform/states/statefile" "github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/terraform" diff --git a/internal/backend/local/backend_plan_test.go b/internal/backend/local/backend_plan_test.go index 1b40e9833..0dd5f46f9 100644 --- a/internal/backend/local/backend_plan_test.go +++ b/internal/backend/local/backend_plan_test.go @@ -14,9 +14,9 @@ import ( "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/initwd" + "github.com/hashicorp/terraform/internal/plans" + "github.com/hashicorp/terraform/internal/plans/planfile" "github.com/hashicorp/terraform/internal/terminal" - "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/plans/planfile" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" "github.com/zclconf/go-cty/cty" diff --git a/internal/backend/remote/backend_apply.go b/internal/backend/remote/backend_apply.go index 7819ade3b..d8dcb0c78 100644 --- a/internal/backend/remote/backend_apply.go +++ b/internal/backend/remote/backend_apply.go @@ -10,8 +10,8 @@ import ( tfe "github.com/hashicorp/go-tfe" version "github.com/hashicorp/go-version" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/terraform" ) diff --git a/internal/backend/remote/backend_apply_test.go b/internal/backend/remote/backend_apply_test.go index 6797ece45..d18983447 100644 --- a/internal/backend/remote/backend_apply_test.go +++ b/internal/backend/remote/backend_apply_test.go @@ -18,9 +18,9 @@ import ( "github.com/hashicorp/terraform/internal/command/clistate" "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/initwd" + "github.com/hashicorp/terraform/internal/plans" + "github.com/hashicorp/terraform/internal/plans/planfile" "github.com/hashicorp/terraform/internal/terminal" - "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/plans/planfile" "github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/terraform" tfversion "github.com/hashicorp/terraform/version" diff --git a/internal/backend/remote/backend_common.go b/internal/backend/remote/backend_common.go index 4c9440070..a817ad224 100644 --- a/internal/backend/remote/backend_common.go +++ b/internal/backend/remote/backend_common.go @@ -13,7 +13,7 @@ import ( tfe "github.com/hashicorp/go-tfe" "github.com/hashicorp/terraform/internal/backend" - "github.com/hashicorp/terraform/plans" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/terraform" ) diff --git a/internal/backend/remote/backend_plan.go b/internal/backend/remote/backend_plan.go index 2d16aa447..da9b0064d 100644 --- a/internal/backend/remote/backend_plan.go +++ b/internal/backend/remote/backend_plan.go @@ -17,8 +17,8 @@ import ( tfe "github.com/hashicorp/go-tfe" version "github.com/hashicorp/go-version" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" ) var planConfigurationVersionsPollInterval = 500 * time.Millisecond diff --git a/internal/backend/remote/backend_plan_test.go b/internal/backend/remote/backend_plan_test.go index ac73ead3e..8a7ad05ea 100644 --- a/internal/backend/remote/backend_plan_test.go +++ b/internal/backend/remote/backend_plan_test.go @@ -17,9 +17,9 @@ import ( "github.com/hashicorp/terraform/internal/command/clistate" "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/initwd" + "github.com/hashicorp/terraform/internal/plans" + "github.com/hashicorp/terraform/internal/plans/planfile" "github.com/hashicorp/terraform/internal/terminal" - "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/plans/planfile" "github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/terraform" "github.com/mitchellh/cli" diff --git a/internal/command/apply.go b/internal/command/apply.go index 755e2eda5..d3fd56066 100644 --- a/internal/command/apply.go +++ b/internal/command/apply.go @@ -8,8 +8,8 @@ import ( remoteBackend "github.com/hashicorp/terraform/internal/backend/remote" "github.com/hashicorp/terraform/internal/command/arguments" "github.com/hashicorp/terraform/internal/command/views" + "github.com/hashicorp/terraform/internal/plans/planfile" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans/planfile" ) // ApplyCommand is a Command implementation that applies a Terraform diff --git a/internal/command/apply_test.go b/internal/command/apply_test.go index e41e8a58b..17f2f3197 100644 --- a/internal/command/apply_test.go +++ b/internal/command/apply_test.go @@ -23,9 +23,9 @@ import ( "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/configs/configschema" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/terraform" diff --git a/internal/command/arguments/apply.go b/internal/command/arguments/apply.go index f18eef225..4d2e67605 100644 --- a/internal/command/arguments/apply.go +++ b/internal/command/arguments/apply.go @@ -3,8 +3,8 @@ package arguments import ( "fmt" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" ) // Apply represents the command-line arguments for the apply command. diff --git a/internal/command/arguments/apply_test.go b/internal/command/arguments/apply_test.go index e1a827120..803883380 100644 --- a/internal/command/arguments/apply_test.go +++ b/internal/command/arguments/apply_test.go @@ -7,7 +7,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/hashicorp/terraform/internal/addrs" - "github.com/hashicorp/terraform/plans" + "github.com/hashicorp/terraform/internal/plans" ) func TestParseApply_basicValid(t *testing.T) { diff --git a/internal/command/arguments/extended.go b/internal/command/arguments/extended.go index 7684fa4a7..e698182db 100644 --- a/internal/command/arguments/extended.go +++ b/internal/command/arguments/extended.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" ) // DefaultParallelism is the limit Terraform places on total parallel diff --git a/internal/command/arguments/plan_test.go b/internal/command/arguments/plan_test.go index 5915c8ac0..b547d3f7a 100644 --- a/internal/command/arguments/plan_test.go +++ b/internal/command/arguments/plan_test.go @@ -7,7 +7,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/hashicorp/terraform/internal/addrs" - "github.com/hashicorp/terraform/plans" + "github.com/hashicorp/terraform/internal/plans" ) func TestParsePlan_basicValid(t *testing.T) { diff --git a/internal/command/command_test.go b/internal/command/command_test.go index 811406517..30732ba29 100644 --- a/internal/command/command_test.go +++ b/internal/command/command_test.go @@ -32,11 +32,11 @@ import ( "github.com/hashicorp/terraform/internal/initwd" legacy "github.com/hashicorp/terraform/internal/legacy/terraform" _ "github.com/hashicorp/terraform/internal/logging" + "github.com/hashicorp/terraform/internal/plans" + "github.com/hashicorp/terraform/internal/plans/planfile" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/registry" "github.com/hashicorp/terraform/internal/terminal" - "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/plans/planfile" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statefile" "github.com/hashicorp/terraform/states/statemgr" diff --git a/internal/command/e2etest/automation_test.go b/internal/command/e2etest/automation_test.go index 549ede754..129433299 100644 --- a/internal/command/e2etest/automation_test.go +++ b/internal/command/e2etest/automation_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/hashicorp/terraform/internal/e2e" - "github.com/hashicorp/terraform/plans" + "github.com/hashicorp/terraform/internal/plans" ) // The tests in this file run through different scenarios recommended in our diff --git a/internal/command/e2etest/primary_test.go b/internal/command/e2etest/primary_test.go index 96125d885..4081d2d4f 100644 --- a/internal/command/e2etest/primary_test.go +++ b/internal/command/e2etest/primary_test.go @@ -9,7 +9,7 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/hashicorp/terraform/internal/e2e" - "github.com/hashicorp/terraform/plans" + "github.com/hashicorp/terraform/internal/plans" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/command/format/diff.go b/internal/command/format/diff.go index a084dd70f..7e41c9df1 100644 --- a/internal/command/format/diff.go +++ b/internal/command/format/diff.go @@ -14,8 +14,8 @@ import ( "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/configs/configschema" - "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/plans/objchange" + "github.com/hashicorp/terraform/internal/plans" + "github.com/hashicorp/terraform/internal/plans/objchange" "github.com/hashicorp/terraform/states" ) diff --git a/internal/command/format/diff_test.go b/internal/command/format/diff_test.go index 3d0681152..20aedbb8a 100644 --- a/internal/command/format/diff_test.go +++ b/internal/command/format/diff_test.go @@ -7,7 +7,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/configs/configschema" - "github.com/hashicorp/terraform/plans" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/states" "github.com/mitchellh/colorstring" "github.com/zclconf/go-cty/cty" diff --git a/internal/command/format/state.go b/internal/command/format/state.go index 5974ba19f..992ee3e84 100644 --- a/internal/command/format/state.go +++ b/internal/command/format/state.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/configs/configschema" - "github.com/hashicorp/terraform/plans" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" "github.com/mitchellh/colorstring" diff --git a/internal/command/graph.go b/internal/command/graph.go index 2aff491be..7fee9926c 100644 --- a/internal/command/graph.go +++ b/internal/command/graph.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" + "github.com/hashicorp/terraform/internal/plans/planfile" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans/planfile" "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/dag" diff --git a/internal/command/graph_test.go b/internal/command/graph_test.go index f081d492a..b22815878 100644 --- a/internal/command/graph_test.go +++ b/internal/command/graph_test.go @@ -9,7 +9,7 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/internal/addrs" - "github.com/hashicorp/terraform/plans" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/states" ) diff --git a/internal/command/jsonplan/plan.go b/internal/command/jsonplan/plan.go index 988405336..8c826f618 100644 --- a/internal/command/jsonplan/plan.go +++ b/internal/command/jsonplan/plan.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/terraform/internal/command/jsonconfig" "github.com/hashicorp/terraform/internal/command/jsonstate" "github.com/hashicorp/terraform/internal/configs" - "github.com/hashicorp/terraform/plans" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statefile" "github.com/hashicorp/terraform/terraform" diff --git a/internal/command/jsonplan/values.go b/internal/command/jsonplan/values.go index 6f64451de..80baf841c 100644 --- a/internal/command/jsonplan/values.go +++ b/internal/command/jsonplan/values.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/configs/configschema" - "github.com/hashicorp/terraform/plans" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/terraform" ) diff --git a/internal/command/jsonplan/values_test.go b/internal/command/jsonplan/values_test.go index 6673f17a6..60d899ae0 100644 --- a/internal/command/jsonplan/values_test.go +++ b/internal/command/jsonplan/values_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/configs/configschema" - "github.com/hashicorp/terraform/plans" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/terraform" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/command/meta_backend.go b/internal/command/meta_backend.go index dbbe8fc5a..930d693c5 100644 --- a/internal/command/meta_backend.go +++ b/internal/command/meta_backend.go @@ -21,8 +21,8 @@ import ( "github.com/hashicorp/terraform/internal/command/clistate" "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/terraform" "github.com/zclconf/go-cty/cty" diff --git a/internal/command/meta_backend_test.go b/internal/command/meta_backend_test.go index 578adfc62..63e47a1ba 100644 --- a/internal/command/meta_backend_test.go +++ b/internal/command/meta_backend_test.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/copy" - "github.com/hashicorp/terraform/plans" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statefile" "github.com/hashicorp/terraform/states/statemgr" diff --git a/internal/command/meta_new.go b/internal/command/meta_new.go index a308a11e6..b89760a4c 100644 --- a/internal/command/meta_new.go +++ b/internal/command/meta_new.go @@ -4,7 +4,7 @@ import ( "os" "strconv" - "github.com/hashicorp/terraform/plans/planfile" + "github.com/hashicorp/terraform/internal/plans/planfile" ) // NOTE: Temporary file until this branch is cleaned up. diff --git a/internal/command/plan_test.go b/internal/command/plan_test.go index feb8ddb48..14fd36fd1 100644 --- a/internal/command/plan_test.go +++ b/internal/command/plan_test.go @@ -19,9 +19,9 @@ import ( "github.com/hashicorp/terraform/internal/addrs" backendinit "github.com/hashicorp/terraform/internal/backend/init" "github.com/hashicorp/terraform/internal/configs/configschema" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" ) diff --git a/internal/command/show.go b/internal/command/show.go index fd703b5a7..644be8abe 100644 --- a/internal/command/show.go +++ b/internal/command/show.go @@ -11,9 +11,9 @@ import ( "github.com/hashicorp/terraform/internal/command/jsonplan" "github.com/hashicorp/terraform/internal/command/jsonstate" "github.com/hashicorp/terraform/internal/command/views" + "github.com/hashicorp/terraform/internal/plans" + "github.com/hashicorp/terraform/internal/plans/planfile" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/plans/planfile" "github.com/hashicorp/terraform/states/statefile" "github.com/hashicorp/terraform/states/statemgr" ) diff --git a/internal/command/show_test.go b/internal/command/show_test.go index 376bd3fdb..47daf73a6 100644 --- a/internal/command/show_test.go +++ b/internal/command/show_test.go @@ -12,8 +12,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/configs/configschema" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/providers" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" "github.com/mitchellh/cli" diff --git a/internal/command/test.go b/internal/command/test.go index a33fa2466..6f01e39b1 100644 --- a/internal/command/test.go +++ b/internal/command/test.go @@ -20,10 +20,10 @@ import ( "github.com/hashicorp/terraform/internal/depsfile" "github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/moduletest" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/providercache" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" ) diff --git a/internal/command/views/hook_count.go b/internal/command/views/hook_count.go index 049b44119..fc2a51651 100644 --- a/internal/command/views/hook_count.go +++ b/internal/command/views/hook_count.go @@ -6,7 +6,7 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/internal/addrs" - "github.com/hashicorp/terraform/plans" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" ) diff --git a/internal/command/views/hook_count_test.go b/internal/command/views/hook_count_test.go index f708fdf92..3b195b9b4 100644 --- a/internal/command/views/hook_count_test.go +++ b/internal/command/views/hook_count_test.go @@ -7,7 +7,7 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/internal/addrs" - "github.com/hashicorp/terraform/plans" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" diff --git a/internal/command/views/hook_json.go b/internal/command/views/hook_json.go index e3013d2d4..db3bf6f8a 100644 --- a/internal/command/views/hook_json.go +++ b/internal/command/views/hook_json.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/command/format" "github.com/hashicorp/terraform/internal/command/views/json" - "github.com/hashicorp/terraform/plans" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" "github.com/zclconf/go-cty/cty" diff --git a/internal/command/views/hook_json_test.go b/internal/command/views/hook_json_test.go index 3ed7e8db7..2748dc25b 100644 --- a/internal/command/views/hook_json_test.go +++ b/internal/command/views/hook_json_test.go @@ -6,8 +6,8 @@ import ( "time" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/terminal" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" "github.com/zclconf/go-cty/cty" diff --git a/internal/command/views/hook_ui.go b/internal/command/views/hook_ui.go index 7bd9cf874..90f034e74 100644 --- a/internal/command/views/hook_ui.go +++ b/internal/command/views/hook_ui.go @@ -13,8 +13,8 @@ import ( "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/command/format" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/providers" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" ) diff --git a/internal/command/views/hook_ui_test.go b/internal/command/views/hook_ui_test.go index b12087c0b..7cbfc5529 100644 --- a/internal/command/views/hook_ui_test.go +++ b/internal/command/views/hook_ui_test.go @@ -12,9 +12,9 @@ import ( "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/terminal" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" ) diff --git a/internal/command/views/json/change.go b/internal/command/views/json/change.go index 4b5760716..bee20904e 100644 --- a/internal/command/views/json/change.go +++ b/internal/command/views/json/change.go @@ -3,7 +3,7 @@ package json import ( "fmt" - "github.com/hashicorp/terraform/plans" + "github.com/hashicorp/terraform/internal/plans" ) func NewResourceInstanceChange(change *plans.ResourceInstanceChangeSrc) *ResourceInstanceChange { diff --git a/internal/command/views/json/hook.go b/internal/command/views/json/hook.go index 792db5244..1736e10a5 100644 --- a/internal/command/views/json/hook.go +++ b/internal/command/views/json/hook.go @@ -5,7 +5,7 @@ import ( "time" "github.com/hashicorp/terraform/internal/addrs" - "github.com/hashicorp/terraform/plans" + "github.com/hashicorp/terraform/internal/plans" ) type Hook interface { diff --git a/internal/command/views/json_view_test.go b/internal/command/views/json_view_test.go index 7d92ffe9b..698f2952e 100644 --- a/internal/command/views/json_view_test.go +++ b/internal/command/views/json_view_test.go @@ -10,9 +10,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/hashicorp/terraform/internal/addrs" viewsjson "github.com/hashicorp/terraform/internal/command/views/json" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" tfversion "github.com/hashicorp/terraform/version" ) diff --git a/internal/command/views/operation.go b/internal/command/views/operation.go index 930f85402..5a030bd2e 100644 --- a/internal/command/views/operation.go +++ b/internal/command/views/operation.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform/internal/command/arguments" "github.com/hashicorp/terraform/internal/command/format" "github.com/hashicorp/terraform/internal/command/views/json" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states/statefile" "github.com/hashicorp/terraform/terraform" ) diff --git a/internal/command/views/operation_test.go b/internal/command/views/operation_test.go index 41f22eca8..07fc92840 100644 --- a/internal/command/views/operation_test.go +++ b/internal/command/views/operation_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/terminal" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statefile" "github.com/hashicorp/terraform/terraform" diff --git a/internal/command/views/plan.go b/internal/command/views/plan.go index 5e3a0ab30..c049896ff 100644 --- a/internal/command/views/plan.go +++ b/internal/command/views/plan.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/command/arguments" "github.com/hashicorp/terraform/internal/command/format" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" ) diff --git a/internal/command/views/plan_test.go b/internal/command/views/plan_test.go index 6e584f4da..99c74ca53 100644 --- a/internal/command/views/plan_test.go +++ b/internal/command/views/plan_test.go @@ -6,9 +6,9 @@ import ( "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/command/arguments" "github.com/hashicorp/terraform/internal/configs/configschema" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/terminal" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/terraform" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/command/views/show.go b/internal/command/views/show.go index 625cb22a4..47e07bc02 100644 --- a/internal/command/views/show.go +++ b/internal/command/views/show.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/hashicorp/terraform/internal/command/arguments" - "github.com/hashicorp/terraform/plans" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/terraform" ) diff --git a/internal/e2e/e2e.go b/internal/e2e/e2e.go index a1032bc2c..69f9e2e7d 100644 --- a/internal/e2e/e2e.go +++ b/internal/e2e/e2e.go @@ -9,8 +9,8 @@ import ( "os/exec" "path/filepath" - "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/plans/planfile" + "github.com/hashicorp/terraform/internal/plans" + "github.com/hashicorp/terraform/internal/plans/planfile" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statefile" ) diff --git a/internal/legacy/terraform/state.go b/internal/legacy/terraform/state.go index b9d5e7016..538240913 100644 --- a/internal/legacy/terraform/state.go +++ b/internal/legacy/terraform/state.go @@ -26,8 +26,8 @@ import ( "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" tfversion "github.com/hashicorp/terraform/version" "github.com/mitchellh/copystructure" "github.com/zclconf/go-cty/cty" diff --git a/plans/action.go b/internal/plans/action.go similarity index 100% rename from plans/action.go rename to internal/plans/action.go diff --git a/plans/action_string.go b/internal/plans/action_string.go similarity index 100% rename from plans/action_string.go rename to internal/plans/action_string.go diff --git a/plans/changes.go b/internal/plans/changes.go similarity index 100% rename from plans/changes.go rename to internal/plans/changes.go diff --git a/plans/changes_src.go b/internal/plans/changes_src.go similarity index 100% rename from plans/changes_src.go rename to internal/plans/changes_src.go diff --git a/plans/changes_state.go b/internal/plans/changes_state.go similarity index 100% rename from plans/changes_state.go rename to internal/plans/changes_state.go diff --git a/plans/changes_sync.go b/internal/plans/changes_sync.go similarity index 100% rename from plans/changes_sync.go rename to internal/plans/changes_sync.go diff --git a/plans/changes_test.go b/internal/plans/changes_test.go similarity index 100% rename from plans/changes_test.go rename to internal/plans/changes_test.go diff --git a/plans/doc.go b/internal/plans/doc.go similarity index 100% rename from plans/doc.go rename to internal/plans/doc.go diff --git a/plans/dynamic_value.go b/internal/plans/dynamic_value.go similarity index 100% rename from plans/dynamic_value.go rename to internal/plans/dynamic_value.go diff --git a/plans/internal/planproto/doc.go b/internal/plans/internal/planproto/doc.go similarity index 100% rename from plans/internal/planproto/doc.go rename to internal/plans/internal/planproto/doc.go diff --git a/plans/internal/planproto/generate.sh b/internal/plans/internal/planproto/generate.sh similarity index 100% rename from plans/internal/planproto/generate.sh rename to internal/plans/internal/planproto/generate.sh diff --git a/plans/internal/planproto/planfile.pb.go b/internal/plans/internal/planproto/planfile.pb.go similarity index 100% rename from plans/internal/planproto/planfile.pb.go rename to internal/plans/internal/planproto/planfile.pb.go diff --git a/plans/internal/planproto/planfile.proto b/internal/plans/internal/planproto/planfile.proto similarity index 99% rename from plans/internal/planproto/planfile.proto rename to internal/plans/internal/planproto/planfile.proto index e16457431..bd673e50d 100644 --- a/plans/internal/planproto/planfile.proto +++ b/internal/plans/internal/planproto/planfile.proto @@ -3,7 +3,7 @@ package tfplan; // For Terraform's own parsing, the proto stub types go into an internal Go // package. The public API is in github.com/hashicorp/terraform/plans/planfile . -option go_package = "github.com/hashicorp/terraform/plans/internal/planproto"; +option go_package = "github.com/hashicorp/terraform/internal/plans/internal/planproto"; // Plan is the root message type for the tfplan file message Plan { diff --git a/plans/mode.go b/internal/plans/mode.go similarity index 100% rename from plans/mode.go rename to internal/plans/mode.go diff --git a/plans/mode_string.go b/internal/plans/mode_string.go similarity index 100% rename from plans/mode_string.go rename to internal/plans/mode_string.go diff --git a/plans/objchange/action.go b/internal/plans/objchange/action.go similarity index 96% rename from plans/objchange/action.go rename to internal/plans/objchange/action.go index 2ca32097c..56418aaee 100644 --- a/plans/objchange/action.go +++ b/internal/plans/objchange/action.go @@ -3,7 +3,7 @@ package objchange import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/plans" + "github.com/hashicorp/terraform/internal/plans" ) // ActionForChange determines which plans.Action value best describes a diff --git a/plans/objchange/all_null.go b/internal/plans/objchange/all_null.go similarity index 100% rename from plans/objchange/all_null.go rename to internal/plans/objchange/all_null.go diff --git a/plans/objchange/compatible.go b/internal/plans/objchange/compatible.go similarity index 100% rename from plans/objchange/compatible.go rename to internal/plans/objchange/compatible.go diff --git a/plans/objchange/compatible_test.go b/internal/plans/objchange/compatible_test.go similarity index 100% rename from plans/objchange/compatible_test.go rename to internal/plans/objchange/compatible_test.go diff --git a/plans/objchange/doc.go b/internal/plans/objchange/doc.go similarity index 100% rename from plans/objchange/doc.go rename to internal/plans/objchange/doc.go diff --git a/plans/objchange/lcs.go b/internal/plans/objchange/lcs.go similarity index 100% rename from plans/objchange/lcs.go rename to internal/plans/objchange/lcs.go diff --git a/plans/objchange/lcs_test.go b/internal/plans/objchange/lcs_test.go similarity index 100% rename from plans/objchange/lcs_test.go rename to internal/plans/objchange/lcs_test.go diff --git a/plans/objchange/normalize_obj.go b/internal/plans/objchange/normalize_obj.go similarity index 100% rename from plans/objchange/normalize_obj.go rename to internal/plans/objchange/normalize_obj.go diff --git a/plans/objchange/normalize_obj_test.go b/internal/plans/objchange/normalize_obj_test.go similarity index 100% rename from plans/objchange/normalize_obj_test.go rename to internal/plans/objchange/normalize_obj_test.go diff --git a/plans/objchange/objchange.go b/internal/plans/objchange/objchange.go similarity index 100% rename from plans/objchange/objchange.go rename to internal/plans/objchange/objchange.go diff --git a/plans/objchange/objchange_test.go b/internal/plans/objchange/objchange_test.go similarity index 100% rename from plans/objchange/objchange_test.go rename to internal/plans/objchange/objchange_test.go diff --git a/plans/objchange/plan_valid.go b/internal/plans/objchange/plan_valid.go similarity index 100% rename from plans/objchange/plan_valid.go rename to internal/plans/objchange/plan_valid.go diff --git a/plans/objchange/plan_valid_test.go b/internal/plans/objchange/plan_valid_test.go similarity index 100% rename from plans/objchange/plan_valid_test.go rename to internal/plans/objchange/plan_valid_test.go diff --git a/plans/plan.go b/internal/plans/plan.go similarity index 100% rename from plans/plan.go rename to internal/plans/plan.go diff --git a/plans/plan_test.go b/internal/plans/plan_test.go similarity index 100% rename from plans/plan_test.go rename to internal/plans/plan_test.go diff --git a/plans/planfile/config_snapshot.go b/internal/plans/planfile/config_snapshot.go similarity index 100% rename from plans/planfile/config_snapshot.go rename to internal/plans/planfile/config_snapshot.go diff --git a/plans/planfile/config_snapshot_test.go b/internal/plans/planfile/config_snapshot_test.go similarity index 100% rename from plans/planfile/config_snapshot_test.go rename to internal/plans/planfile/config_snapshot_test.go diff --git a/plans/planfile/doc.go b/internal/plans/planfile/doc.go similarity index 100% rename from plans/planfile/doc.go rename to internal/plans/planfile/doc.go diff --git a/plans/planfile/planfile_test.go b/internal/plans/planfile/planfile_test.go similarity index 98% rename from plans/planfile/planfile_test.go rename to internal/plans/planfile/planfile_test.go index e487a1a28..192e16dbb 100644 --- a/plans/planfile/planfile_test.go +++ b/internal/plans/planfile/planfile_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/hashicorp/terraform/internal/configs/configload" - "github.com/hashicorp/terraform/plans" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statefile" tfversion "github.com/hashicorp/terraform/version" diff --git a/plans/planfile/reader.go b/internal/plans/planfile/reader.go similarity index 99% rename from plans/planfile/reader.go rename to internal/plans/planfile/reader.go index 41aeaf5ea..ff275d3cb 100644 --- a/plans/planfile/reader.go +++ b/internal/plans/planfile/reader.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/configs/configload" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states/statefile" ) diff --git a/plans/planfile/testdata/test-config/.terraform/modules/child_a/child_a.tf b/internal/plans/planfile/testdata/test-config/.terraform/modules/child_a/child_a.tf similarity index 100% rename from plans/planfile/testdata/test-config/.terraform/modules/child_a/child_a.tf rename to internal/plans/planfile/testdata/test-config/.terraform/modules/child_a/child_a.tf diff --git a/plans/planfile/testdata/test-config/.terraform/modules/child_a/child_c/child_c.tf b/internal/plans/planfile/testdata/test-config/.terraform/modules/child_a/child_c/child_c.tf similarity index 100% rename from plans/planfile/testdata/test-config/.terraform/modules/child_a/child_c/child_c.tf rename to internal/plans/planfile/testdata/test-config/.terraform/modules/child_a/child_c/child_c.tf diff --git a/plans/planfile/testdata/test-config/.terraform/modules/child_b.child_d/child_d.tf b/internal/plans/planfile/testdata/test-config/.terraform/modules/child_b.child_d/child_d.tf similarity index 100% rename from plans/planfile/testdata/test-config/.terraform/modules/child_b.child_d/child_d.tf rename to internal/plans/planfile/testdata/test-config/.terraform/modules/child_b.child_d/child_d.tf diff --git a/plans/planfile/testdata/test-config/.terraform/modules/child_b/child_b.tf b/internal/plans/planfile/testdata/test-config/.terraform/modules/child_b/child_b.tf similarity index 100% rename from plans/planfile/testdata/test-config/.terraform/modules/child_b/child_b.tf rename to internal/plans/planfile/testdata/test-config/.terraform/modules/child_b/child_b.tf diff --git a/plans/planfile/testdata/test-config/.terraform/modules/modules.json b/internal/plans/planfile/testdata/test-config/.terraform/modules/modules.json similarity index 100% rename from plans/planfile/testdata/test-config/.terraform/modules/modules.json rename to internal/plans/planfile/testdata/test-config/.terraform/modules/modules.json diff --git a/plans/planfile/testdata/test-config/root.tf b/internal/plans/planfile/testdata/test-config/root.tf similarity index 100% rename from plans/planfile/testdata/test-config/root.tf rename to internal/plans/planfile/testdata/test-config/root.tf diff --git a/plans/planfile/tfplan.go b/internal/plans/planfile/tfplan.go similarity index 99% rename from plans/planfile/tfplan.go rename to internal/plans/planfile/tfplan.go index 800aa5404..bf1b4c67a 100644 --- a/plans/planfile/tfplan.go +++ b/internal/plans/planfile/tfplan.go @@ -8,9 +8,9 @@ import ( "google.golang.org/protobuf/proto" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/plans" + "github.com/hashicorp/terraform/internal/plans/internal/planproto" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/plans/internal/planproto" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/version" "github.com/zclconf/go-cty/cty" diff --git a/plans/planfile/tfplan_test.go b/internal/plans/planfile/tfplan_test.go similarity index 99% rename from plans/planfile/tfplan_test.go rename to internal/plans/planfile/tfplan_test.go index 1e6cc4f91..075f920d9 100644 --- a/plans/planfile/tfplan_test.go +++ b/internal/plans/planfile/tfplan_test.go @@ -8,7 +8,7 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/internal/addrs" - "github.com/hashicorp/terraform/plans" + "github.com/hashicorp/terraform/internal/plans" ) func TestTFPlanRoundTrip(t *testing.T) { diff --git a/plans/planfile/writer.go b/internal/plans/planfile/writer.go similarity index 97% rename from plans/planfile/writer.go rename to internal/plans/planfile/writer.go index 92ee4e030..ea4d86175 100644 --- a/plans/planfile/writer.go +++ b/internal/plans/planfile/writer.go @@ -7,7 +7,7 @@ import ( "time" "github.com/hashicorp/terraform/internal/configs/configload" - "github.com/hashicorp/terraform/plans" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/states/statefile" ) diff --git a/plans/resourceinstancechangeactionreason_string.go b/internal/plans/resourceinstancechangeactionreason_string.go similarity index 100% rename from plans/resourceinstancechangeactionreason_string.go rename to internal/plans/resourceinstancechangeactionreason_string.go diff --git a/terraform/context.go b/terraform/context.go index 15e85327a..85a8188de 100644 --- a/terraform/context.go +++ b/terraform/context.go @@ -12,10 +12,10 @@ import ( "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/lang" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" diff --git a/terraform/context_apply2_test.go b/terraform/context_apply2_test.go index a2f34bec7..0a3606ab1 100644 --- a/terraform/context_apply2_test.go +++ b/terraform/context_apply2_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/configs/configschema" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/providers" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/context_apply_test.go b/terraform/context_apply_test.go index 9854fb710..8790a2c72 100644 --- a/terraform/context_apply_test.go +++ b/terraform/context_apply_test.go @@ -22,10 +22,10 @@ import ( "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/gocty" diff --git a/terraform/context_plan2_test.go b/terraform/context_plan2_test.go index a28735438..8a4852043 100644 --- a/terraform/context_plan2_test.go +++ b/terraform/context_plan2_test.go @@ -9,8 +9,8 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/configs/configschema" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/providers" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/context_plan_test.go b/terraform/context_plan_test.go index 43eda257b..55bad4574 100644 --- a/terraform/context_plan_test.go +++ b/terraform/context_plan_test.go @@ -18,10 +18,10 @@ import ( "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/context_test.go b/terraform/context_test.go index efdd1525b..080df0106 100644 --- a/terraform/context_test.go +++ b/terraform/context_test.go @@ -21,11 +21,11 @@ import ( "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/configs/hcl2shim" "github.com/hashicorp/terraform/internal/depsfile" + "github.com/hashicorp/terraform/internal/plans" + "github.com/hashicorp/terraform/internal/plans/planfile" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/plans/planfile" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statefile" tfversion "github.com/hashicorp/terraform/version" diff --git a/terraform/context_validate_test.go b/terraform/context_validate_test.go index d309ecafd..3386e9ca4 100644 --- a/terraform/context_validate_test.go +++ b/terraform/context_validate_test.go @@ -10,10 +10,10 @@ import ( "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/configs/configschema" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/eval_context.go b/terraform/eval_context.go index 2ed8d823e..8a0666dd5 100644 --- a/terraform/eval_context.go +++ b/terraform/eval_context.go @@ -6,10 +6,10 @@ import ( "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/lang" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/eval_context_builtin.go b/terraform/eval_context_builtin.go index 845c98850..8e17e7274 100644 --- a/terraform/eval_context_builtin.go +++ b/terraform/eval_context_builtin.go @@ -7,9 +7,9 @@ import ( "sync" "github.com/hashicorp/terraform/internal/instances" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/version" "github.com/hashicorp/terraform/states" diff --git a/terraform/eval_context_mock.go b/terraform/eval_context_mock.go index 435ae4277..a759cb64e 100644 --- a/terraform/eval_context_mock.go +++ b/terraform/eval_context_mock.go @@ -7,10 +7,10 @@ import ( "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/lang" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/convert" diff --git a/terraform/evaluate.go b/terraform/evaluate.go index dcf1f60fb..88b3b3563 100644 --- a/terraform/evaluate.go +++ b/terraform/evaluate.go @@ -17,8 +17,8 @@ import ( "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/lang" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/evaluate_test.go b/terraform/evaluate_test.go index f76be4212..428cc6199 100644 --- a/terraform/evaluate_test.go +++ b/terraform/evaluate_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/configs/configschema" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/graph_builder_apply.go b/terraform/graph_builder_apply.go index d87adc54f..584c8cf84 100644 --- a/terraform/graph_builder_apply.go +++ b/terraform/graph_builder_apply.go @@ -4,8 +4,8 @@ import ( "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/dag" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/graph_builder_apply_test.go b/terraform/graph_builder_apply_test.go index 7eb617359..616837aa2 100644 --- a/terraform/graph_builder_apply_test.go +++ b/terraform/graph_builder_apply_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform/internal/addrs" - "github.com/hashicorp/terraform/plans" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/graph_walk_context.go b/terraform/graph_walk_context.go index 611cce1ef..bb92cc867 100644 --- a/terraform/graph_walk_context.go +++ b/terraform/graph_walk_context.go @@ -9,10 +9,10 @@ import ( "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/instances" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/hook.go b/terraform/hook.go index 1f262a7a0..7a0da5069 100644 --- a/terraform/hook.go +++ b/terraform/hook.go @@ -4,8 +4,8 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/plans" "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 562b3dc89..00d4d7067 100644 --- a/terraform/hook_mock.go +++ b/terraform/hook_mock.go @@ -6,8 +6,8 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/plans" "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 e3da72887..45c460156 100644 --- a/terraform/hook_stop.go +++ b/terraform/hook_stop.go @@ -7,8 +7,8 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/plans" "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 b04520d72..1b09898ac 100644 --- a/terraform/hook_test.go +++ b/terraform/hook_test.go @@ -7,8 +7,8 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/providers" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/node_output.go b/terraform/node_output.go index db34808de..caf2d76f0 100644 --- a/terraform/node_output.go +++ b/terraform/node_output.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/lang" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/node_resource_abstract_instance.go b/terraform/node_resource_abstract_instance.go index 6704becaa..823858215 100644 --- a/terraform/node_resource_abstract_instance.go +++ b/terraform/node_resource_abstract_instance.go @@ -9,11 +9,11 @@ import ( "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/configs/configschema" + "github.com/hashicorp/terraform/internal/plans" + "github.com/hashicorp/terraform/internal/plans/objchange" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/plans/objchange" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/node_resource_apply_instance.go b/terraform/node_resource_apply_instance.go index 231867029..67f34fea4 100644 --- a/terraform/node_resource_apply_instance.go +++ b/terraform/node_resource_apply_instance.go @@ -6,9 +6,9 @@ import ( "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/plans" + "github.com/hashicorp/terraform/internal/plans/objchange" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/plans/objchange" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/node_resource_destroy.go b/terraform/node_resource_destroy.go index 17802c2ea..3a771bbfe 100644 --- a/terraform/node_resource_destroy.go +++ b/terraform/node_resource_destroy.go @@ -4,8 +4,8 @@ import ( "fmt" "log" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/configs" diff --git a/terraform/node_resource_destroy_deposed.go b/terraform/node_resource_destroy_deposed.go index f4433f58b..fbede7660 100644 --- a/terraform/node_resource_destroy_deposed.go +++ b/terraform/node_resource_destroy_deposed.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/dag" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/node_resource_destroy_deposed_test.go b/terraform/node_resource_destroy_deposed_test.go index c839cc827..4bb64ac0e 100644 --- a/terraform/node_resource_destroy_deposed_test.go +++ b/terraform/node_resource_destroy_deposed_test.go @@ -5,8 +5,8 @@ import ( "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/configs/configschema" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/providers" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/node_resource_plan_destroy.go b/terraform/node_resource_plan_destroy.go index 699d6d2a4..a369aa428 100644 --- a/terraform/node_resource_plan_destroy.go +++ b/terraform/node_resource_plan_destroy.go @@ -2,8 +2,8 @@ package terraform import ( "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/plans" "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 2e3727131..d3b80a86e 100644 --- a/terraform/node_resource_plan_instance.go +++ b/terraform/node_resource_plan_instance.go @@ -5,8 +5,8 @@ import ( "log" "sort" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/addrs" diff --git a/terraform/node_resource_plan_orphan.go b/terraform/node_resource_plan_orphan.go index 1e07fda7a..31a873d21 100644 --- a/terraform/node_resource_plan_orphan.go +++ b/terraform/node_resource_plan_orphan.go @@ -5,8 +5,8 @@ import ( "log" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/plans" "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 22c66f702..4e941fe1f 100644 --- a/terraform/node_resource_plan_orphan_test.go +++ b/terraform/node_resource_plan_orphan_test.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/instances" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/providers" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/reduce_plan.go b/terraform/reduce_plan.go index 94b3aba59..17a58eff5 100644 --- a/terraform/reduce_plan.go +++ b/terraform/reduce_plan.go @@ -4,7 +4,7 @@ import ( "log" "github.com/hashicorp/terraform/internal/addrs" - "github.com/hashicorp/terraform/plans" + "github.com/hashicorp/terraform/internal/plans" ) // reducePlan takes a planned resource instance change as might be produced by diff --git a/terraform/terraform_test.go b/terraform/terraform_test.go index ab0985975..4f8eed247 100644 --- a/terraform/terraform_test.go +++ b/terraform/terraform_test.go @@ -17,10 +17,10 @@ import ( "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/configs/configload" "github.com/hashicorp/terraform/internal/initwd" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/registry" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" _ "github.com/hashicorp/terraform/internal/logging" diff --git a/terraform/transform_destroy_cbd_test.go b/terraform/transform_destroy_cbd_test.go index 45133d194..5048a2512 100644 --- a/terraform/transform_destroy_cbd_test.go +++ b/terraform/transform_destroy_cbd_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform/internal/addrs" - "github.com/hashicorp/terraform/plans" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/transform_diff.go b/terraform/transform_diff.go index 351789d0b..a40a5c7a6 100644 --- a/terraform/transform_diff.go +++ b/terraform/transform_diff.go @@ -5,8 +5,8 @@ import ( "log" "github.com/hashicorp/terraform/internal/dag" + "github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/transform_diff_test.go b/terraform/transform_diff_test.go index 6d2b2e0b8..56608e500 100644 --- a/terraform/transform_diff_test.go +++ b/terraform/transform_diff_test.go @@ -7,7 +7,7 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/internal/addrs" - "github.com/hashicorp/terraform/plans" + "github.com/hashicorp/terraform/internal/plans" ) func TestDiffTransformer_nilDiff(t *testing.T) { diff --git a/terraform/transform_output.go b/terraform/transform_output.go index e82307a72..598840084 100644 --- a/terraform/transform_output.go +++ b/terraform/transform_output.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/dag" - "github.com/hashicorp/terraform/plans" + "github.com/hashicorp/terraform/internal/plans" ) // OutputTransformer is a GraphTransformer that adds all the outputs