From 90dce4dd3cf876367486bceb0c3101c2ba98b2cd Mon Sep 17 00:00:00 2001 From: RLRabinowitz Date: Sun, 27 Aug 2023 17:58:18 +0300 Subject: [PATCH] go fmt, change import order --- internal/backend/backend.go | 2 +- internal/backend/cli.go | 2 +- internal/backend/local/backend.go | 2 +- internal/backend/local/backend_apply.go | 2 +- internal/backend/local/backend_local.go | 2 +- internal/backend/local/backend_local_test.go | 2 +- internal/backend/local/backend_plan.go | 2 +- internal/backend/local/backend_plan_test.go | 2 +- internal/backend/local/backend_refresh_test.go | 2 +- internal/backend/local/hook_state.go | 2 +- internal/backend/local/hook_state_test.go | 2 +- internal/backend/local/testing.go | 2 +- internal/backend/remote/backend.go | 2 +- internal/backend/remote/backend_apply.go | 2 +- internal/backend/remote/backend_apply_test.go | 2 +- internal/backend/remote/backend_common.go | 2 +- internal/backend/remote/backend_context.go | 2 +- internal/backend/remote/backend_plan_test.go | 2 +- internal/backend/remote/testing.go | 2 +- internal/cloud/backend.go | 2 +- internal/cloud/backend_apply.go | 2 +- internal/cloud/backend_apply_test.go | 2 +- internal/cloud/backend_common.go | 2 +- internal/cloud/backend_context.go | 2 +- internal/cloud/backend_context_test.go | 2 +- internal/cloud/backend_plan_test.go | 2 +- internal/cloud/state.go | 2 +- internal/cloud/testing.go | 2 +- internal/command/apply_test.go | 2 +- internal/command/command_test.go | 2 +- internal/command/console.go | 2 +- internal/command/graph.go | 2 +- internal/command/init.go | 2 +- internal/command/jsonformat/plan_test.go | 2 +- internal/command/jsonformat/state_test.go | 2 +- internal/command/jsonplan/plan.go | 2 +- internal/command/jsonplan/values.go | 2 +- internal/command/jsonplan/values_test.go | 2 +- internal/command/jsonprovider/provider.go | 2 +- internal/command/jsonstate/state.go | 2 +- internal/command/jsonstate/state_test.go | 2 +- internal/command/meta.go | 2 +- internal/command/meta_backend.go | 2 +- internal/command/meta_backend_migrate.go | 2 +- internal/command/meta_config.go | 2 +- internal/command/plan_test.go | 2 +- internal/command/providers_schema_test.go | 2 +- internal/command/show.go | 2 +- internal/command/show_test.go | 2 +- internal/command/state_mv.go | 2 +- internal/command/state_push.go | 2 +- internal/command/state_replace_provider.go | 2 +- internal/command/taint.go | 2 +- internal/command/test.go | 2 +- internal/command/testing/test_provider.go | 2 +- internal/command/untaint.go | 2 +- internal/command/views/apply.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/operation.go | 2 +- internal/command/views/operation_test.go | 2 +- internal/command/views/plan_test.go | 2 +- internal/command/views/refresh.go | 2 +- internal/command/views/show.go | 2 +- internal/command/views/show_test.go | 2 +- internal/command/views/test.go | 2 +- internal/repl/session_test.go | 2 +- internal/states/remote/state.go | 2 +- internal/states/statemgr/filesystem.go | 2 +- internal/states/statemgr/helper.go | 2 +- internal/states/statemgr/lock.go | 2 +- internal/states/statemgr/persistent.go | 2 +- internal/states/statemgr/statemgr_fake.go | 2 +- 77 files changed, 77 insertions(+), 77 deletions(-) diff --git a/internal/backend/backend.go b/internal/backend/backend.go index 6ac4a0ff62..0e2ce336e4 100644 --- a/internal/backend/backend.go +++ b/internal/backend/backend.go @@ -23,11 +23,11 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configload" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configschema" "github.com/placeholderplaceholderplaceholder/opentf/internal/depsfile" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans/planfile" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/backend/cli.go b/internal/backend/cli.go index 7a49429d04..24e31e5cb3 100644 --- a/internal/backend/cli.go +++ b/internal/backend/cli.go @@ -7,8 +7,8 @@ import ( "github.com/mitchellh/cli" "github.com/mitchellh/colorstring" - "github.com/placeholderplaceholderplaceholder/opentf/internal/terminal" "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" + "github.com/placeholderplaceholderplaceholder/opentf/internal/terminal" ) // CLI is an optional interface that can be implemented to be initialized diff --git a/internal/backend/local/backend.go b/internal/backend/local/backend.go index 6127934745..f92d5f750d 100644 --- a/internal/backend/local/backend.go +++ b/internal/backend/local/backend.go @@ -18,8 +18,8 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/command/views" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configschema" "github.com/placeholderplaceholderplaceholder/opentf/internal/logging" - "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" + "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/backend/local/backend_apply.go b/internal/backend/local/backend_apply.go index 864155ff04..bff0c1cf20 100644 --- a/internal/backend/local/backend_apply.go +++ b/internal/backend/local/backend_apply.go @@ -14,11 +14,11 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/backend" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/views" "github.com/placeholderplaceholderplaceholder/opentf/internal/logging" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statefile" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" ) diff --git a/internal/backend/local/backend_local.go b/internal/backend/local/backend_local.go index 7bfc11596e..a9acd94f81 100644 --- a/internal/backend/local/backend_local.go +++ b/internal/backend/local/backend_local.go @@ -13,9 +13,9 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/backend" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configload" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans/planfile" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/backend/local/backend_local_test.go b/internal/backend/local/backend_local_test.go index bbda594542..33f56fcd4b 100644 --- a/internal/backend/local/backend_local_test.go +++ b/internal/backend/local/backend_local_test.go @@ -18,13 +18,13 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configload" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configschema" "github.com/placeholderplaceholderplaceholder/opentf/internal/initwd" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans/planfile" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statefile" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" "github.com/placeholderplaceholderplaceholder/opentf/internal/terminal" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" ) diff --git a/internal/backend/local/backend_plan.go b/internal/backend/local/backend_plan.go index c45523570a..fc5f4134f7 100644 --- a/internal/backend/local/backend_plan.go +++ b/internal/backend/local/backend_plan.go @@ -12,11 +12,11 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/backend" "github.com/placeholderplaceholderplaceholder/opentf/internal/genconfig" "github.com/placeholderplaceholderplaceholder/opentf/internal/logging" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans/planfile" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statefile" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" ) diff --git a/internal/backend/local/backend_plan_test.go b/internal/backend/local/backend_plan_test.go index 7a59557d0c..d51cc99ed1 100644 --- a/internal/backend/local/backend_plan_test.go +++ b/internal/backend/local/backend_plan_test.go @@ -20,12 +20,12 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configschema" "github.com/placeholderplaceholderplaceholder/opentf/internal/depsfile" "github.com/placeholderplaceholderplaceholder/opentf/internal/initwd" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans/planfile" "github.com/placeholderplaceholderplaceholder/opentf/internal/providers" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/terminal" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" ) func TestLocal_planBasic(t *testing.T) { diff --git a/internal/backend/local/backend_refresh_test.go b/internal/backend/local/backend_refresh_test.go index 51c72228e3..39e722b4fb 100644 --- a/internal/backend/local/backend_refresh_test.go +++ b/internal/backend/local/backend_refresh_test.go @@ -17,10 +17,10 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configschema" "github.com/placeholderplaceholderplaceholder/opentf/internal/depsfile" "github.com/placeholderplaceholderplaceholder/opentf/internal/initwd" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/providers" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/terminal" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/backend/local/hook_state.go b/internal/backend/local/hook_state.go index 563fa57425..1bb359101c 100644 --- a/internal/backend/local/hook_state.go +++ b/internal/backend/local/hook_state.go @@ -8,9 +8,9 @@ import ( "sync" "time" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" ) // StateHook is a hook that continuously updates the state by calling diff --git a/internal/backend/local/hook_state_test.go b/internal/backend/local/hook_state_test.go index 8c2f0461de..c40e8c167c 100644 --- a/internal/backend/local/hook_state_test.go +++ b/internal/backend/local/hook_state_test.go @@ -9,9 +9,9 @@ import ( "time" "github.com/google/go-cmp/cmp" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" ) func TestStateHook_impl(t *testing.T) { diff --git a/internal/backend/local/testing.go b/internal/backend/local/testing.go index 2b8e36d37c..0838664965 100644 --- a/internal/backend/local/testing.go +++ b/internal/backend/local/testing.go @@ -12,10 +12,10 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/addrs" "github.com/placeholderplaceholderplaceholder/opentf/internal/backend" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configschema" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/providers" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" ) // TestLocal returns a configured Local struct with temporary paths and diff --git a/internal/backend/remote/backend.go b/internal/backend/remote/backend.go index 759c1a7a55..1a9038df39 100644 --- a/internal/backend/remote/backend.go +++ b/internal/backend/remote/backend.go @@ -24,9 +24,9 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/backend" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configschema" "github.com/placeholderplaceholderplaceholder/opentf/internal/logging" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/remote" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" tfversion "github.com/placeholderplaceholderplaceholder/opentf/version" "github.com/zclconf/go-cty/cty" diff --git a/internal/backend/remote/backend_apply.go b/internal/backend/remote/backend_apply.go index 6254700305..1b16446292 100644 --- a/internal/backend/remote/backend_apply.go +++ b/internal/backend/remote/backend_apply.go @@ -13,8 +13,8 @@ import ( tfe "github.com/hashicorp/go-tfe" version "github.com/hashicorp/go-version" "github.com/placeholderplaceholderplaceholder/opentf/internal/backend" - "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" + "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" ) diff --git a/internal/backend/remote/backend_apply_test.go b/internal/backend/remote/backend_apply_test.go index 86633ae684..44bf04bb41 100644 --- a/internal/backend/remote/backend_apply_test.go +++ b/internal/backend/remote/backend_apply_test.go @@ -25,11 +25,11 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/command/views" "github.com/placeholderplaceholderplaceholder/opentf/internal/depsfile" "github.com/placeholderplaceholderplaceholder/opentf/internal/initwd" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans/planfile" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" "github.com/placeholderplaceholderplaceholder/opentf/internal/terminal" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" tfversion "github.com/placeholderplaceholderplaceholder/opentf/version" ) diff --git a/internal/backend/remote/backend_common.go b/internal/backend/remote/backend_common.go index 4c19673ca4..45919434ae 100644 --- a/internal/backend/remote/backend_common.go +++ b/internal/backend/remote/backend_common.go @@ -17,8 +17,8 @@ import ( tfe "github.com/hashicorp/go-tfe" "github.com/placeholderplaceholderplaceholder/opentf/internal/backend" "github.com/placeholderplaceholderplaceholder/opentf/internal/logging" - "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" + "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" ) var ( diff --git a/internal/backend/remote/backend_context.go b/internal/backend/remote/backend_context.go index befb7c3cd3..1a35cffe7c 100644 --- a/internal/backend/remote/backend_context.go +++ b/internal/backend/remote/backend_context.go @@ -14,8 +14,8 @@ import ( "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/placeholderplaceholderplaceholder/opentf/internal/backend" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs" - "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" + "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/backend/remote/backend_plan_test.go b/internal/backend/remote/backend_plan_test.go index 0dcfe09784..f5952359b1 100644 --- a/internal/backend/remote/backend_plan_test.go +++ b/internal/backend/remote/backend_plan_test.go @@ -24,11 +24,11 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/command/views" "github.com/placeholderplaceholderplaceholder/opentf/internal/depsfile" "github.com/placeholderplaceholderplaceholder/opentf/internal/initwd" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans/planfile" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" "github.com/placeholderplaceholderplaceholder/opentf/internal/terminal" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" ) func testOperationPlan(t *testing.T, configDir string) (*backend.Operation, func(), func(*testing.T) *terminal.TestOutput) { diff --git a/internal/backend/remote/testing.go b/internal/backend/remote/testing.go index 00bb156f42..1644d48316 100644 --- a/internal/backend/remote/testing.go +++ b/internal/backend/remote/testing.go @@ -23,9 +23,9 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/configs" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configschema" "github.com/placeholderplaceholderplaceholder/opentf/internal/httpclient" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/providers" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/remote" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" "github.com/placeholderplaceholderplaceholder/opentf/version" "github.com/zclconf/go-cty/cty" diff --git a/internal/cloud/backend.go b/internal/cloud/backend.go index 1ec27620a1..04bb7b0cb6 100644 --- a/internal/cloud/backend.go +++ b/internal/cloud/backend.go @@ -28,9 +28,9 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/backend" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/jsonformat" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configschema" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" tfversion "github.com/placeholderplaceholderplaceholder/opentf/version" diff --git a/internal/cloud/backend_apply.go b/internal/cloud/backend_apply.go index 3406dcec57..9eb84d2c4a 100644 --- a/internal/cloud/backend_apply.go +++ b/internal/cloud/backend_apply.go @@ -15,8 +15,8 @@ import ( tfe "github.com/hashicorp/go-tfe" "github.com/placeholderplaceholderplaceholder/opentf/internal/backend" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/jsonformat" - "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" + "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" ) diff --git a/internal/cloud/backend_apply_test.go b/internal/cloud/backend_apply_test.go index cbc07b844a..81a9ae8efb 100644 --- a/internal/cloud/backend_apply_test.go +++ b/internal/cloud/backend_apply_test.go @@ -29,11 +29,11 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/command/views" "github.com/placeholderplaceholderplaceholder/opentf/internal/depsfile" "github.com/placeholderplaceholderplaceholder/opentf/internal/initwd" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans/planfile" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" "github.com/placeholderplaceholderplaceholder/opentf/internal/terminal" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" tfversion "github.com/placeholderplaceholderplaceholder/opentf/version" ) diff --git a/internal/cloud/backend_common.go b/internal/cloud/backend_common.go index bf470a52e8..14731f66db 100644 --- a/internal/cloud/backend_common.go +++ b/internal/cloud/backend_common.go @@ -24,8 +24,8 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/backend" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/jsonformat" "github.com/placeholderplaceholderplaceholder/opentf/internal/logging" - "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" + "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" ) var ( diff --git a/internal/cloud/backend_context.go b/internal/cloud/backend_context.go index 57d857160d..82b71ead77 100644 --- a/internal/cloud/backend_context.go +++ b/internal/cloud/backend_context.go @@ -14,8 +14,8 @@ import ( "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/placeholderplaceholderplaceholder/opentf/internal/backend" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs" - "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" + "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/cloud/backend_context_test.go b/internal/cloud/backend_context_test.go index da7729d01f..af54b8e056 100644 --- a/internal/cloud/backend_context_test.go +++ b/internal/cloud/backend_context_test.go @@ -17,9 +17,9 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/command/views" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs" "github.com/placeholderplaceholderplaceholder/opentf/internal/initwd" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" "github.com/placeholderplaceholderplaceholder/opentf/internal/terminal" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" ) diff --git a/internal/cloud/backend_plan_test.go b/internal/cloud/backend_plan_test.go index fc6c03bad4..e459f44048 100644 --- a/internal/cloud/backend_plan_test.go +++ b/internal/cloud/backend_plan_test.go @@ -27,11 +27,11 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/command/views" "github.com/placeholderplaceholderplaceholder/opentf/internal/depsfile" "github.com/placeholderplaceholderplaceholder/opentf/internal/initwd" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans/planfile" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" "github.com/placeholderplaceholderplaceholder/opentf/internal/terminal" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" ) func testOperationPlan(t *testing.T, configDir string) (*backend.Operation, func(), func(*testing.T) *terminal.TestOutput) { diff --git a/internal/cloud/state.go b/internal/cloud/state.go index a6d34878d1..cb8ed69306 100644 --- a/internal/cloud/state.go +++ b/internal/cloud/state.go @@ -27,11 +27,11 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/backend/local" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/jsonstate" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/remote" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statefile" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" ) // State implements the State interfaces in the state package to handle diff --git a/internal/cloud/testing.go b/internal/cloud/testing.go index b0a53cc782..0fed7a1c54 100644 --- a/internal/cloud/testing.go +++ b/internal/cloud/testing.go @@ -29,10 +29,10 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/configs" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configschema" "github.com/placeholderplaceholderplaceholder/opentf/internal/httpclient" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/providers" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statefile" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" "github.com/placeholderplaceholderplaceholder/opentf/version" diff --git a/internal/command/apply_test.go b/internal/command/apply_test.go index f6478db92a..5e89523b23 100644 --- a/internal/command/apply_test.go +++ b/internal/command/apply_test.go @@ -23,11 +23,11 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/addrs" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configschema" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/providers" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" ) diff --git a/internal/command/command_test.go b/internal/command/command_test.go index 3c4a274220..e3966312bd 100644 --- a/internal/command/command_test.go +++ b/internal/command/command_test.go @@ -42,6 +42,7 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/initwd" legacy "github.com/placeholderplaceholderplaceholder/opentf/internal/legacy/opentf" _ "github.com/placeholderplaceholderplaceholder/opentf/internal/logging" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans/planfile" "github.com/placeholderplaceholderplaceholder/opentf/internal/providers" @@ -50,7 +51,6 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statefile" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" "github.com/placeholderplaceholderplaceholder/opentf/internal/terminal" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/version" ) diff --git a/internal/command/console.go b/internal/command/console.go index 19268b4679..c632dc82dd 100644 --- a/internal/command/console.go +++ b/internal/command/console.go @@ -12,8 +12,8 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/addrs" "github.com/placeholderplaceholderplaceholder/opentf/internal/backend" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/arguments" - "github.com/placeholderplaceholderplaceholder/opentf/internal/repl" "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" + "github.com/placeholderplaceholderplaceholder/opentf/internal/repl" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" "github.com/mitchellh/cli" diff --git a/internal/command/graph.go b/internal/command/graph.go index 1760153466..90c468a5a7 100644 --- a/internal/command/graph.go +++ b/internal/command/graph.go @@ -10,9 +10,9 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/backend" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/arguments" "github.com/placeholderplaceholderplaceholder/opentf/internal/dag" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans/planfile" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" ) diff --git a/internal/command/init.go b/internal/command/init.go index 8c8283c556..57661d27bb 100644 --- a/internal/command/init.go +++ b/internal/command/init.go @@ -27,9 +27,9 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/configs" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configschema" "github.com/placeholderplaceholderplaceholder/opentf/internal/getproviders" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/providercache" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" tfversion "github.com/placeholderplaceholderplaceholder/opentf/version" ) diff --git a/internal/command/jsonformat/plan_test.go b/internal/command/jsonformat/plan_test.go index d2d56457d4..7ef7a8c1b5 100644 --- a/internal/command/jsonformat/plan_test.go +++ b/internal/command/jsonformat/plan_test.go @@ -20,11 +20,11 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/command/jsonprovider" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configschema" "github.com/placeholderplaceholderplaceholder/opentf/internal/lang/marks" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/providers" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/terminal" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" ) func TestRenderHuman_EmptyPlan(t *testing.T) { diff --git a/internal/command/jsonformat/state_test.go b/internal/command/jsonformat/state_test.go index 7c23a423bf..ababbfb8b7 100644 --- a/internal/command/jsonformat/state_test.go +++ b/internal/command/jsonformat/state_test.go @@ -19,9 +19,9 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/addrs" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configschema" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/providers" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" ) func TestState(t *testing.T) { diff --git a/internal/command/jsonplan/plan.go b/internal/command/jsonplan/plan.go index 47656c2a89..3a5d8b3502 100644 --- a/internal/command/jsonplan/plan.go +++ b/internal/command/jsonplan/plan.go @@ -18,10 +18,10 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/command/jsonconfig" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/jsonstate" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statefile" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/version" ) diff --git a/internal/command/jsonplan/values.go b/internal/command/jsonplan/values.go index 18ed2e3d86..605c823e05 100644 --- a/internal/command/jsonplan/values.go +++ b/internal/command/jsonplan/values.go @@ -14,9 +14,9 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/addrs" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/jsonstate" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configschema" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" ) // StateValues is the common representation of resolved values for both the diff --git a/internal/command/jsonplan/values_test.go b/internal/command/jsonplan/values_test.go index d39c7fdfbd..f15b235cc0 100644 --- a/internal/command/jsonplan/values_test.go +++ b/internal/command/jsonplan/values_test.go @@ -12,9 +12,9 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/addrs" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configschema" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/providers" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" ) func TestMarshalAttributeValues(t *testing.T) { diff --git a/internal/command/jsonprovider/provider.go b/internal/command/jsonprovider/provider.go index 3cdee09b56..c634a4e4d9 100644 --- a/internal/command/jsonprovider/provider.go +++ b/internal/command/jsonprovider/provider.go @@ -6,8 +6,8 @@ package jsonprovider import ( "encoding/json" - "github.com/placeholderplaceholderplaceholder/opentf/internal/providers" "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" + "github.com/placeholderplaceholderplaceholder/opentf/internal/providers" ) // FormatVersion represents the version of the json format and will be diff --git a/internal/command/jsonstate/state.go b/internal/command/jsonstate/state.go index e40dee3e72..f34fddf3b5 100644 --- a/internal/command/jsonstate/state.go +++ b/internal/command/jsonstate/state.go @@ -14,9 +14,9 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/addrs" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/jsonchecks" "github.com/placeholderplaceholderplaceholder/opentf/internal/lang/marks" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statefile" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" ) const ( diff --git a/internal/command/jsonstate/state_test.go b/internal/command/jsonstate/state_test.go index 7c7899b0ad..048f4dd88c 100644 --- a/internal/command/jsonstate/state_test.go +++ b/internal/command/jsonstate/state_test.go @@ -14,9 +14,9 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/addrs" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configschema" "github.com/placeholderplaceholderplaceholder/opentf/internal/lang/marks" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/providers" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" ) func TestMarshalOutputs(t *testing.T) { diff --git a/internal/command/meta.go b/internal/command/meta.go index 5b3b82d9a1..2d22a5c86f 100644 --- a/internal/command/meta.go +++ b/internal/command/meta.go @@ -34,11 +34,11 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configload" "github.com/placeholderplaceholderplaceholder/opentf/internal/getproviders" legacy "github.com/placeholderplaceholderplaceholder/opentf/internal/legacy/opentf" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/providers" "github.com/placeholderplaceholderplaceholder/opentf/internal/provisioners" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/terminal" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" ) diff --git a/internal/command/meta_backend.go b/internal/command/meta_backend.go index 70f0a8ef8f..179db13e74 100644 --- a/internal/command/meta_backend.go +++ b/internal/command/meta_backend.go @@ -28,9 +28,9 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/command/clistate" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/views" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" backendInit "github.com/placeholderplaceholderplaceholder/opentf/internal/backend/init" diff --git a/internal/command/meta_backend_migrate.go b/internal/command/meta_backend_migrate.go index c8ae3de4e2..0c565bf821 100644 --- a/internal/command/meta_backend_migrate.go +++ b/internal/command/meta_backend_migrate.go @@ -21,9 +21,9 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/command/arguments" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/clistate" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/views" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" ) type backendMigrateOpts struct { diff --git a/internal/command/meta_config.go b/internal/command/meta_config.go index 5028b668bc..3b2894957c 100644 --- a/internal/command/meta_config.go +++ b/internal/command/meta_config.go @@ -21,8 +21,8 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configload" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configschema" "github.com/placeholderplaceholderplaceholder/opentf/internal/initwd" - "github.com/placeholderplaceholderplaceholder/opentf/internal/registry" "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" + "github.com/placeholderplaceholderplaceholder/opentf/internal/registry" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" ) diff --git a/internal/command/plan_test.go b/internal/command/plan_test.go index dcc5a8942a..9722700c57 100644 --- a/internal/command/plan_test.go +++ b/internal/command/plan_test.go @@ -23,10 +23,10 @@ import ( backendinit "github.com/placeholderplaceholderplaceholder/opentf/internal/backend/init" "github.com/placeholderplaceholderplaceholder/opentf/internal/checks" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configschema" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/providers" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" ) diff --git a/internal/command/providers_schema_test.go b/internal/command/providers_schema_test.go index 2a108b42d5..d2258699ed 100644 --- a/internal/command/providers_schema_test.go +++ b/internal/command/providers_schema_test.go @@ -14,8 +14,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/mitchellh/cli" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configschema" - "github.com/placeholderplaceholderplaceholder/opentf/internal/providers" "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" + "github.com/placeholderplaceholderplaceholder/opentf/internal/providers" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/command/show.go b/internal/command/show.go index f8bf7270a0..e45951430b 100644 --- a/internal/command/show.go +++ b/internal/command/show.go @@ -16,11 +16,11 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/command/arguments" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/views" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans/planfile" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statefile" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" ) diff --git a/internal/command/show_test.go b/internal/command/show_test.go index 4d7b8e0426..892f4df41a 100644 --- a/internal/command/show_test.go +++ b/internal/command/show_test.go @@ -17,11 +17,11 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/addrs" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configschema" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/providers" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/version" ) diff --git a/internal/command/state_mv.go b/internal/command/state_mv.go index 6b683f9518..f3da8f02b9 100644 --- a/internal/command/state_mv.go +++ b/internal/command/state_mv.go @@ -14,8 +14,8 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/command/arguments" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/clistate" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/views" - "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" + "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" ) diff --git a/internal/command/state_push.go b/internal/command/state_push.go index 8e32259561..37d8845ef6 100644 --- a/internal/command/state_push.go +++ b/internal/command/state_push.go @@ -14,9 +14,9 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/command/arguments" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/clistate" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/views" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statefile" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" ) diff --git a/internal/command/state_replace_provider.go b/internal/command/state_replace_provider.go index cb28e20dd0..08ba85a44f 100644 --- a/internal/command/state_replace_provider.go +++ b/internal/command/state_replace_provider.go @@ -13,8 +13,8 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/command/arguments" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/clistate" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/views" - "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" + "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" ) diff --git a/internal/command/taint.go b/internal/command/taint.go index 4bb09acf10..e13ee92ea9 100644 --- a/internal/command/taint.go +++ b/internal/command/taint.go @@ -11,8 +11,8 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/command/arguments" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/clistate" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/views" - "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" + "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" ) diff --git a/internal/command/test.go b/internal/command/test.go index ff2bcd9d87..e9a7e1cdf7 100644 --- a/internal/command/test.go +++ b/internal/command/test.go @@ -20,9 +20,9 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/configs" "github.com/placeholderplaceholderplaceholder/opentf/internal/logging" "github.com/placeholderplaceholderplaceholder/opentf/internal/moduletest" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" ) diff --git a/internal/command/testing/test_provider.go b/internal/command/testing/test_provider.go index 6219fc727e..abbf470539 100644 --- a/internal/command/testing/test_provider.go +++ b/internal/command/testing/test_provider.go @@ -11,8 +11,8 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configschema" - "github.com/placeholderplaceholderplaceholder/opentf/internal/providers" "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" + "github.com/placeholderplaceholderplaceholder/opentf/internal/providers" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" ) diff --git a/internal/command/untaint.go b/internal/command/untaint.go index d9a1f08c9b..a56e447021 100644 --- a/internal/command/untaint.go +++ b/internal/command/untaint.go @@ -11,8 +11,8 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/command/arguments" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/clistate" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/views" - "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" + "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" ) diff --git a/internal/command/views/apply.go b/internal/command/views/apply.go index 7cae02d066..c9d6c713db 100644 --- a/internal/command/views/apply.go +++ b/internal/command/views/apply.go @@ -9,8 +9,8 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/command/arguments" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/format" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/views/json" - "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" + "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" ) diff --git a/internal/command/views/hook_count.go b/internal/command/views/hook_count.go index d5e970519d..9f26e11179 100644 --- a/internal/command/views/hook_count.go +++ b/internal/command/views/hook_count.go @@ -9,9 +9,9 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/placeholderplaceholderplaceholder/opentf/internal/addrs" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" ) // countHook is a hook that counts the number of resources diff --git a/internal/command/views/hook_count_test.go b/internal/command/views/hook_count_test.go index b7d02fc38f..d3aee4fe13 100644 --- a/internal/command/views/hook_count_test.go +++ b/internal/command/views/hook_count_test.go @@ -10,9 +10,9 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/placeholderplaceholderplaceholder/opentf/internal/addrs" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" legacy "github.com/placeholderplaceholderplaceholder/opentf/internal/legacy/opentf" ) diff --git a/internal/command/views/hook_json.go b/internal/command/views/hook_json.go index 17f658506e..adeacba643 100644 --- a/internal/command/views/hook_json.go +++ b/internal/command/views/hook_json.go @@ -15,9 +15,9 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/addrs" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/format" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/views/json" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" ) // How long to wait between sending heartbeat/progress messages diff --git a/internal/command/views/hook_json_test.go b/internal/command/views/hook_json_test.go index 62c49059fd..c90be79338 100644 --- a/internal/command/views/hook_json_test.go +++ b/internal/command/views/hook_json_test.go @@ -10,10 +10,10 @@ import ( "time" "github.com/placeholderplaceholderplaceholder/opentf/internal/addrs" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/terminal" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/command/views/hook_ui.go b/internal/command/views/hook_ui.go index 34a12aee85..2791346715 100644 --- a/internal/command/views/hook_ui.go +++ b/internal/command/views/hook_ui.go @@ -16,10 +16,10 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/addrs" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/format" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/providers" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" ) const defaultPeriodicUiTimer = 10 * time.Second diff --git a/internal/command/views/hook_ui_test.go b/internal/command/views/hook_ui_test.go index 0cd2c7a83c..75fc6164f6 100644 --- a/internal/command/views/hook_ui_test.go +++ b/internal/command/views/hook_ui_test.go @@ -15,11 +15,11 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/addrs" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/arguments" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/providers" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/terminal" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" ) // Test the PreApply hook for creating a new resource diff --git a/internal/command/views/operation.go b/internal/command/views/operation.go index 3f5208ed20..976f750f43 100644 --- a/internal/command/views/operation.go +++ b/internal/command/views/operation.go @@ -15,9 +15,9 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/command/jsonplan" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/jsonprovider" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/views/json" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statefile" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" ) diff --git a/internal/command/views/operation_test.go b/internal/command/views/operation_test.go index c8839f9439..35860a4d49 100644 --- a/internal/command/views/operation_test.go +++ b/internal/command/views/operation_test.go @@ -12,11 +12,11 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/addrs" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/arguments" "github.com/placeholderplaceholderplaceholder/opentf/internal/lang/globalref" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statefile" "github.com/placeholderplaceholderplaceholder/opentf/internal/terminal" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/command/views/plan_test.go b/internal/command/views/plan_test.go index b200f31c46..2ee38ca26b 100644 --- a/internal/command/views/plan_test.go +++ b/internal/command/views/plan_test.go @@ -9,10 +9,10 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/addrs" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/arguments" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configschema" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/providers" "github.com/placeholderplaceholderplaceholder/opentf/internal/terminal" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/command/views/refresh.go b/internal/command/views/refresh.go index 7f9164f9cf..545e05a4b4 100644 --- a/internal/command/views/refresh.go +++ b/internal/command/views/refresh.go @@ -8,8 +8,8 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/command/arguments" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/views/json" - "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" + "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" ) diff --git a/internal/command/views/show.go b/internal/command/views/show.go index f8af4f5bab..49626c2f78 100644 --- a/internal/command/views/show.go +++ b/internal/command/views/show.go @@ -15,9 +15,9 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/command/jsonprovider" "github.com/placeholderplaceholderplaceholder/opentf/internal/command/jsonstate" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statefile" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" ) diff --git a/internal/command/views/show_test.go b/internal/command/views/show_test.go index 466be17121..6d9128def6 100644 --- a/internal/command/views/show_test.go +++ b/internal/command/views/show_test.go @@ -14,12 +14,12 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/command/arguments" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configschema" "github.com/placeholderplaceholderplaceholder/opentf/internal/initwd" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/providers" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statefile" "github.com/placeholderplaceholderplaceholder/opentf/internal/terminal" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/command/views/test.go b/internal/command/views/test.go index df06dcaed9..acc597f502 100644 --- a/internal/command/views/test.go +++ b/internal/command/views/test.go @@ -15,10 +15,10 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/command/views/json" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs" "github.com/placeholderplaceholderplaceholder/opentf/internal/moduletest" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/plans" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statefile" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/tfdiags" ) diff --git a/internal/repl/session_test.go b/internal/repl/session_test.go index 28ae902ddf..6e82b5c42c 100644 --- a/internal/repl/session_test.go +++ b/internal/repl/session_test.go @@ -15,9 +15,9 @@ import ( "github.com/placeholderplaceholderplaceholder/opentf/internal/addrs" "github.com/placeholderplaceholderplaceholder/opentf/internal/configs/configschema" "github.com/placeholderplaceholderplaceholder/opentf/internal/initwd" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/providers" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" _ "github.com/placeholderplaceholderplaceholder/opentf/internal/logging" ) diff --git a/internal/states/remote/state.go b/internal/states/remote/state.go index 116be9cc2c..4733641738 100644 --- a/internal/states/remote/state.go +++ b/internal/states/remote/state.go @@ -12,10 +12,10 @@ import ( uuid "github.com/hashicorp/go-uuid" "github.com/placeholderplaceholderplaceholder/opentf/internal/backend/local" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statefile" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statemgr" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" ) // State implements the State interfaces in the state package to handle diff --git a/internal/states/statemgr/filesystem.go b/internal/states/statemgr/filesystem.go index 2642eff612..495ab724c8 100644 --- a/internal/states/statemgr/filesystem.go +++ b/internal/states/statemgr/filesystem.go @@ -17,9 +17,9 @@ import ( multierror "github.com/hashicorp/go-multierror" + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statefile" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" ) // Filesystem is a full state manager that uses a file in the local filesystem diff --git a/internal/states/statemgr/helper.go b/internal/states/statemgr/helper.go index 0fed875b84..6c05882b42 100644 --- a/internal/states/statemgr/helper.go +++ b/internal/states/statemgr/helper.go @@ -7,9 +7,9 @@ package statemgr // operations done against full state managers. import ( + "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/states/statefile" - "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" "github.com/placeholderplaceholderplaceholder/opentf/version" ) diff --git a/internal/states/statemgr/lock.go b/internal/states/statemgr/lock.go index f97e416fc5..440162cd53 100644 --- a/internal/states/statemgr/lock.go +++ b/internal/states/statemgr/lock.go @@ -4,8 +4,8 @@ package statemgr import ( - "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" + "github.com/placeholderplaceholderplaceholder/opentf/internal/states" ) // LockDisabled implements State and Locker but disables state locking. diff --git a/internal/states/statemgr/persistent.go b/internal/states/statemgr/persistent.go index 5e91b22a0c..92555c1825 100644 --- a/internal/states/statemgr/persistent.go +++ b/internal/states/statemgr/persistent.go @@ -6,8 +6,8 @@ package statemgr import ( version "github.com/hashicorp/go-version" - "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" + "github.com/placeholderplaceholderplaceholder/opentf/internal/states" ) // Persistent is a union of the Refresher and Persistent interfaces, for types diff --git a/internal/states/statemgr/statemgr_fake.go b/internal/states/statemgr/statemgr_fake.go index b1877fb2a1..b131ec944f 100644 --- a/internal/states/statemgr/statemgr_fake.go +++ b/internal/states/statemgr/statemgr_fake.go @@ -7,8 +7,8 @@ import ( "errors" "sync" - "github.com/placeholderplaceholderplaceholder/opentf/internal/states" "github.com/placeholderplaceholderplaceholder/opentf/internal/opentf" + "github.com/placeholderplaceholderplaceholder/opentf/internal/states" ) // NewFullFake returns a full state manager that really only supports transient