From 794e3413bb618ac079adb397a93d6d6dee20ea41 Mon Sep 17 00:00:00 2001 From: Yaron Yarimi Date: Wed, 20 Sep 2023 15:16:53 +0300 Subject: [PATCH] Rename opentf package to tofu (#466) --- .github/workflows/checks.yml | 2 +- internal/backend/backend.go | 14 ++--- internal/backend/cli.go | 4 +- internal/backend/local/backend.go | 8 +-- internal/backend/local/backend_apply.go | 4 +- internal/backend/local/backend_local.go | 32 ++++++------ internal/backend/local/backend_local_test.go | 4 +- internal/backend/local/backend_plan.go | 4 +- internal/backend/local/backend_plan_test.go | 4 +- .../backend/local/backend_refresh_test.go | 4 +- internal/backend/local/hook_state.go | 16 +++--- internal/backend/local/hook_state_test.go | 20 +++---- internal/backend/local/testing.go | 10 ++-- internal/backend/remote/backend.go | 6 +-- internal/backend/remote/backend_apply.go | 4 +- internal/backend/remote/backend_apply_test.go | 6 +-- internal/backend/remote/backend_common.go | 8 +-- internal/backend/remote/backend_context.go | 26 +++++----- .../backend/remote/backend_context_test.go | 52 +++++++++---------- internal/backend/remote/backend_plan_test.go | 6 +-- internal/backend/remote/testing.go | 12 ++--- internal/backend/unparsed_value.go | 34 ++++++------ internal/backend/unparsed_value_test.go | 32 ++++++------ internal/cloud/backend.go | 6 +-- internal/cloud/backend_apply.go | 4 +- internal/cloud/backend_apply_test.go | 6 +-- internal/cloud/backend_common.go | 6 +-- internal/cloud/backend_context.go | 26 +++++----- internal/cloud/backend_context_test.go | 50 +++++++++--------- internal/cloud/backend_plan_test.go | 6 +-- internal/cloud/backend_taskStages.go | 4 +- internal/cloud/cloud_variables.go | 6 +-- internal/cloud/cloud_variables_test.go | 28 +++++----- internal/cloud/state.go | 4 +- internal/cloud/testing.go | 12 ++--- internal/command/apply_test.go | 6 +-- internal/command/command_test.go | 6 +-- internal/command/console.go | 4 +- internal/command/graph.go | 6 +-- internal/command/import.go | 10 ++-- internal/command/init.go | 4 +- internal/command/jsonconfig/config.go | 14 ++--- internal/command/jsonformat/plan_test.go | 4 +- internal/command/jsonformat/state_test.go | 14 ++--- internal/command/jsonplan/plan.go | 12 ++--- internal/command/jsonplan/values.go | 8 +-- internal/command/jsonplan/values_test.go | 6 +-- internal/command/jsonprovider/provider.go | 6 +-- internal/command/jsonstate/state.go | 16 +++--- internal/command/jsonstate/state_test.go | 8 +-- internal/command/login.go | 10 ++-- internal/command/meta.go | 26 +++++----- internal/command/meta_backend.go | 6 +-- internal/command/meta_backend_migrate.go | 30 +++++------ internal/command/meta_config.go | 4 +- internal/command/meta_test.go | 10 ++-- internal/command/meta_vars.go | 28 +++++----- internal/command/plan_test.go | 10 ++-- internal/command/providers_schema_test.go | 4 +- internal/command/show.go | 6 +-- internal/command/show_test.go | 6 +-- internal/command/state_mv.go | 4 +- internal/command/state_push.go | 4 +- internal/command/state_replace_provider.go | 4 +- internal/command/state_rm.go | 4 +- internal/command/taint.go | 4 +- internal/command/test.go | 44 ++++++++-------- internal/command/test_test.go | 4 +- internal/command/testing/test_provider.go | 6 +-- internal/command/ui_input.go | 4 +- internal/command/ui_input_test.go | 14 ++--- internal/command/unlock.go | 4 +- internal/command/untaint.go | 4 +- internal/command/validate.go | 4 +- internal/command/views/apply.go | 12 ++--- internal/command/views/hook_count.go | 24 ++++----- internal/command/views/hook_count_test.go | 4 +- internal/command/views/hook_json.go | 32 ++++++------ internal/command/views/hook_json_test.go | 6 +-- internal/command/views/hook_ui.go | 50 +++++++++--------- internal/command/views/hook_ui_test.go | 22 ++++---- internal/command/views/operation.go | 8 +-- internal/command/views/operation_test.go | 20 +++---- internal/command/views/plan.go | 12 ++--- internal/command/views/plan_test.go | 10 ++-- internal/command/views/refresh.go | 12 ++--- internal/command/views/show.go | 8 +-- internal/command/views/show_test.go | 6 +-- internal/command/views/test.go | 6 +-- internal/plugin/ui_input.go | 8 +-- internal/plugin/ui_input_test.go | 8 +-- internal/plugin/ui_output.go | 4 +- internal/plugin/ui_output_test.go | 6 +-- internal/repl/session_test.go | 8 +-- internal/states/remote/state.go | 4 +- internal/states/statemgr/filesystem.go | 4 +- internal/states/statemgr/helper.go | 4 +- internal/states/statemgr/lock.go | 4 +- internal/states/statemgr/persistent.go | 4 +- internal/states/statemgr/statemgr_fake.go | 6 +-- internal/{opentf => tofu}/context.go | 14 ++--- internal/{opentf => tofu}/context_apply.go | 4 +- .../{opentf => tofu}/context_apply2_test.go | 2 +- .../context_apply_checks_test.go | 2 +- .../{opentf => tofu}/context_apply_test.go | 6 +-- internal/{opentf => tofu}/context_eval.go | 2 +- .../{opentf => tofu}/context_eval_test.go | 2 +- .../{opentf => tofu}/context_fixtures_test.go | 2 +- internal/{opentf => tofu}/context_import.go | 2 +- .../{opentf => tofu}/context_import_test.go | 2 +- internal/{opentf => tofu}/context_input.go | 2 +- .../{opentf => tofu}/context_input_test.go | 2 +- internal/{opentf => tofu}/context_plan.go | 6 +-- .../{opentf => tofu}/context_plan2_test.go | 8 +-- .../{opentf => tofu}/context_plan_test.go | 2 +- internal/{opentf => tofu}/context_plugins.go | 4 +- .../{opentf => tofu}/context_plugins_test.go | 2 +- internal/{opentf => tofu}/context_refresh.go | 2 +- .../{opentf => tofu}/context_refresh_test.go | 2 +- internal/{opentf => tofu}/context_test.go | 8 +-- internal/{opentf => tofu}/context_validate.go | 2 +- .../{opentf => tofu}/context_validate_test.go | 2 +- internal/{opentf => tofu}/context_walk.go | 2 +- internal/{opentf => tofu}/diagnostics.go | 2 +- internal/{opentf => tofu}/eval_conditions.go | 2 +- internal/{opentf => tofu}/eval_context.go | 2 +- .../{opentf => tofu}/eval_context_builtin.go | 2 +- .../eval_context_builtin_test.go | 2 +- .../{opentf => tofu}/eval_context_mock.go | 2 +- internal/{opentf => tofu}/eval_count.go | 2 +- internal/{opentf => tofu}/eval_count_test.go | 2 +- internal/{opentf => tofu}/eval_for_each.go | 2 +- .../{opentf => tofu}/eval_for_each_test.go | 2 +- internal/{opentf => tofu}/eval_import.go | 2 +- internal/{opentf => tofu}/eval_provider.go | 2 +- .../{opentf => tofu}/eval_provider_test.go | 2 +- internal/{opentf => tofu}/eval_variable.go | 2 +- .../{opentf => tofu}/eval_variable_test.go | 2 +- internal/{opentf => tofu}/evaluate.go | 2 +- internal/{opentf => tofu}/evaluate_test.go | 2 +- .../{opentf => tofu}/evaluate_triggers.go | 2 +- .../evaluate_triggers_test.go | 2 +- internal/{opentf => tofu}/evaluate_valid.go | 2 +- .../{opentf => tofu}/evaluate_valid_test.go | 2 +- internal/{opentf => tofu}/execute.go | 2 +- internal/{opentf => tofu}/features.go | 2 +- internal/{opentf => tofu}/graph.go | 2 +- internal/{opentf => tofu}/graph_builder.go | 2 +- .../{opentf => tofu}/graph_builder_apply.go | 2 +- .../graph_builder_apply_test.go | 2 +- .../{opentf => tofu}/graph_builder_eval.go | 2 +- .../{opentf => tofu}/graph_builder_plan.go | 2 +- .../graph_builder_plan_test.go | 2 +- .../{opentf => tofu}/graph_builder_test.go | 2 +- internal/{opentf => tofu}/graph_dot.go | 2 +- internal/{opentf => tofu}/graph_dot_test.go | 2 +- .../graph_interface_subgraph.go | 2 +- internal/{opentf => tofu}/graph_test.go | 2 +- internal/{opentf => tofu}/graph_walk.go | 2 +- .../{opentf => tofu}/graph_walk_context.go | 2 +- .../{opentf => tofu}/graph_walk_operation.go | 2 +- internal/{opentf => tofu}/graph_walk_test.go | 2 +- internal/{opentf => tofu}/hook.go | 2 +- internal/{opentf => tofu}/hook_mock.go | 2 +- internal/{opentf => tofu}/hook_stop.go | 2 +- internal/{opentf => tofu}/hook_stop_test.go | 2 +- internal/{opentf => tofu}/hook_test.go | 2 +- .../{opentf => tofu}/instance_expanders.go | 2 +- internal/{opentf => tofu}/marks.go | 2 +- internal/{opentf => tofu}/marks_test.go | 2 +- internal/{opentf => tofu}/node_check.go | 2 +- .../{opentf => tofu}/node_data_destroy.go | 2 +- .../node_data_destroy_test.go | 2 +- .../node_external_reference.go | 2 +- internal/{opentf => tofu}/node_local.go | 2 +- internal/{opentf => tofu}/node_local_test.go | 2 +- .../{opentf => tofu}/node_module_expand.go | 2 +- .../node_module_expand_test.go | 2 +- .../{opentf => tofu}/node_module_variable.go | 2 +- .../node_module_variable_test.go | 2 +- internal/{opentf => tofu}/node_output.go | 2 +- internal/{opentf => tofu}/node_output_test.go | 2 +- internal/{opentf => tofu}/node_provider.go | 2 +- .../node_provider_abstract.go | 2 +- .../{opentf => tofu}/node_provider_eval.go | 2 +- .../{opentf => tofu}/node_provider_test.go | 2 +- .../node_resource_abstract.go | 2 +- .../node_resource_abstract_instance.go | 2 +- .../node_resource_abstract_instance_test.go | 2 +- .../node_resource_abstract_test.go | 2 +- .../{opentf => tofu}/node_resource_apply.go | 2 +- .../node_resource_apply_instance.go | 2 +- .../node_resource_apply_test.go | 2 +- .../{opentf => tofu}/node_resource_destroy.go | 2 +- .../node_resource_destroy_deposed.go | 2 +- .../node_resource_destroy_deposed_test.go | 2 +- .../{opentf => tofu}/node_resource_import.go | 4 +- .../{opentf => tofu}/node_resource_plan.go | 2 +- .../node_resource_plan_destroy.go | 2 +- .../node_resource_plan_instance.go | 4 +- .../node_resource_plan_orphan.go | 2 +- .../node_resource_plan_orphan_test.go | 2 +- .../node_resource_validate.go | 2 +- .../node_resource_validate_test.go | 2 +- .../{opentf => tofu}/node_root_variable.go | 2 +- .../node_root_variable_test.go | 2 +- internal/{opentf => tofu}/node_value.go | 2 +- internal/{opentf => tofu}/opentf_test.go | 2 +- .../{opentf => tofu}/phasestate_string.go | 2 +- internal/{opentf => tofu}/provider_mock.go | 2 +- internal/{opentf => tofu}/provisioner_mock.go | 2 +- .../{opentf => tofu}/provisioner_mock_test.go | 2 +- internal/{opentf => tofu}/reduce_plan.go | 2 +- internal/{opentf => tofu}/reduce_plan_test.go | 2 +- .../resource_provider_mock_test.go | 2 +- internal/{opentf => tofu}/schemas.go | 2 +- internal/{opentf => tofu}/schemas_test.go | 2 +- internal/{opentf => tofu}/test_context.go | 2 +- .../{opentf => tofu}/test_context_test.go | 2 +- .../testdata/apply-blank/main.tf | 0 .../testdata/apply-cancel-block/main.tf | 0 .../testdata/apply-cancel-provisioner/main.tf | 0 .../testdata/apply-cancel/main.tf | 0 .../testdata/apply-cbd-count/main.tf | 0 .../testdata/apply-cbd-cycle/main.tf | 0 .../apply-cbd-depends-non-cbd/main.tf | 0 .../testdata/apply-cbd-deposed-only/main.tf | 0 .../testdata/apply-compute/main.tf | 0 .../testdata/apply-count-dec-one/main.tf | 0 .../testdata/apply-count-dec/main.tf | 0 .../testdata/apply-count-tainted/main.tf | 0 .../testdata/apply-count-variable-ref/main.tf | 0 .../testdata/apply-count-variable/main.tf | 0 .../testdata/apply-data-basic/main.tf | 0 .../testdata/apply-data-sensitive/main.tf | 0 .../apply-depends-create-before/main.tf | 0 .../testdata/apply-destroy-cbd/main.tf | 0 .../apply-destroy-computed/child/main.tf | 0 .../testdata/apply-destroy-computed/main.tf | 0 .../child/main.tf | 0 .../apply-destroy-cross-providers/main.tf | 0 .../testdata/apply-destroy-data-cycle/main.tf | 0 .../apply-destroy-data-resource/main.tf | 0 .../child/main.tf | 0 .../child/subchild/main.tf | 0 .../child/subchild/subsubchild/main.tf | 0 .../main.tf | 0 .../testdata/apply-destroy-depends-on/main.tf | 0 .../child/child2/main.tf | 0 .../child/main.tf | 0 .../main.tf | 0 .../child/main.tf | 0 .../apply-destroy-mod-var-and-count/main.tf | 0 .../child/child.tf | 0 .../main.tf | 0 .../child/main.tf | 0 .../main.tf | 0 .../child/main.tf | 0 .../apply-destroy-module-with-attrs/main.tf | 0 .../middle/bottom/bottom.tf | 0 .../middle/middle.tf | 0 .../top.tf | 0 .../apply-destroy-nested-module/child/main.tf | 0 .../child/subchild/main.tf | 0 .../apply-destroy-nested-module/main.tf | 0 .../testdata/apply-destroy-outputs/main.tf | 0 .../apply-destroy-provisider-refs/main.tf | 0 .../apply-destroy-provisider-refs/mod/main.tf | 0 .../apply-destroy-provisioner/main.tf | 0 .../testdata/apply-destroy-tainted/main.tf | 0 .../apply-destroy-targeted-count/main.tf | 0 .../apply-destroy-with-locals/main.tf | 0 .../testdata/apply-destroy/main.tf | 0 .../testdata/apply-empty-module/child/main.tf | 0 .../testdata/apply-empty-module/main.tf | 0 .../apply-error-create-before/main.tf | 0 .../testdata/apply-error/main.tf | 0 .../testdata/apply-escape/main.tf | 0 .../apply-good-create-before-update/main.tf | 0 .../testdata/apply-good-create-before/main.tf | 0 .../testdata/apply-good/main.tf | 0 .../testdata/apply-idattr/main.tf | 0 .../testdata/apply-ignore-changes-all/main.tf | 0 .../apply-ignore-changes-create/main.tf | 0 .../testdata/apply-ignore-changes-dep/main.tf | 0 .../apply-inconsistent-with-plan/main.tf | 0 .../testdata/apply-interpolated-count/main.tf | 0 .../testdata/apply-invalid-index/main.tf | 0 .../testdata/apply-issue19908/issue19908.tf | 0 .../testdata/apply-local-val/child/child.tf | 0 .../testdata/apply-local-val/main.tf | 0 .../testdata/apply-local-val/outputs.tf | 0 .../amodule/main.tf | 0 .../apply-map-var-through-module/main.tf | 0 .../testdata/apply-minimal/main.tf | 0 .../testdata/apply-module-bool/child/main.tf | 0 .../testdata/apply-module-bool/main.tf | 0 .../testdata/apply-module-depends-on/main.tf | 0 .../apply-module-depends-on/moda/main.tf | 0 .../apply-module-depends-on/modb/main.tf | 0 .../apply-module-destroy-order/child/main.tf | 0 .../apply-module-destroy-order/main.tf | 0 .../child/grandchild/main.tf | 0 .../child/main.tf | 0 .../main.tf | 0 .../apply-module-only-provider/child/main.tf | 0 .../apply-module-only-provider/main.tf | 0 .../main.tf | 0 .../apply-module-provider-alias/child/main.tf | 0 .../apply-module-provider-alias/main.tf | 0 .../child/main.tf | 0 .../child/subchild/main.tf | 0 .../main.tf | 0 .../main.tf | 0 .../child/main.tf | 0 .../main.tf | 0 .../apply-module-replace-cycle-cbd/main.tf | 0 .../mod1/main.tf | 0 .../mod2/main.tf | 0 .../apply-module-replace-cycle/main.tf | 0 .../apply-module-replace-cycle/mod1/main.tf | 0 .../apply-module-replace-cycle/mod2/main.tf | 0 .../child/main.tf | 0 .../apply-module-var-resource-count/main.tf | 0 .../testdata/apply-module/child/main.tf | 0 .../testdata/apply-module/main.tf | 0 .../main.tf | 0 .../child/main.tf | 0 .../main.tf | 0 .../apply-multi-provider-destroy/main.tf | 0 .../testdata/apply-multi-provider/main.tf | 0 .../testdata/apply-multi-ref/main.tf | 0 .../child/child.tf | 0 .../apply-multi-var-comprehensive/root.tf | 0 .../apply-multi-var-count-dec/main.tf | 0 .../child/child.tf | 0 .../apply-multi-var-missing-state/root.tf | 0 .../apply-multi-var-order-interp/main.tf | 0 .../testdata/apply-multi-var-order/main.tf | 0 .../testdata/apply-multi-var/main.tf | 0 .../testdata/apply-nullable-variables/main.tf | 0 .../apply-nullable-variables/mod/main.tf | 0 .../testdata/apply-orphan-resource/main.tf | 0 .../testdata/apply-output-add-after/main.tf | 0 .../apply-output-add-after/outputs.tf.json | 0 .../testdata/apply-output-add-before/main.tf | 0 .../apply-output-add-before/outputs.tf.json | 0 .../testdata/apply-output-list/main.tf | 0 .../testdata/apply-output-multi-index/main.tf | 0 .../testdata/apply-output-multi/main.tf | 0 .../apply-output-orphan-module/child/main.tf | 0 .../apply-output-orphan-module/main.tf | 0 .../testdata/apply-output-orphan/main.tf | 0 .../testdata/apply-output/main.tf | 0 .../apply-plan-connection-refs/main.tf | 0 .../apply-provider-alias-configure/main.tf | 0 .../testdata/apply-provider-alias/main.tf | 0 .../testdata/apply-provider-computed/main.tf | 0 .../child/main.tf | 0 .../apply-provider-configure-disabled/main.tf | 0 .../testdata/apply-provider-warning/main.tf | 0 .../apply-provisioner-compute/main.tf | 0 .../main.tf | 0 .../apply-provisioner-destroy-fail/main.tf | 0 .../apply-provisioner-destroy/main.tf | 0 .../testdata/apply-provisioner-diff/main.tf | 0 .../main.tf | 0 .../apply-provisioner-fail-continue/main.tf | 0 .../main.tf | 0 .../apply-provisioner-fail-create/main.tf | 0 .../testdata/apply-provisioner-fail/main.tf | 0 .../apply-provisioner-for-each-self/main.tf | 0 .../provisioner-interp-count.tf | 0 .../apply-provisioner-module/child/main.tf | 0 .../testdata/apply-provisioner-module/main.tf | 0 .../main.tf | 0 .../apply-provisioner-multi-self-ref/main.tf | 0 .../apply-provisioner-resource-ref/main.tf | 0 .../apply-provisioner-self-ref/main.tf | 0 .../apply-provisioner-sensitive/main.tf | 0 .../testdata/apply-ref-count/main.tf | 0 .../testdata/apply-ref-existing/child/main.tf | 0 .../testdata/apply-ref-existing/main.tf | 0 .../apply-resource-count-one-list/main.tf | 0 .../apply-resource-count-zero-list/main.tf | 0 .../child/child/main.tf | 0 .../child/main.tf | 0 .../main.tf | 0 .../main.tf | 0 .../child/child/main.tf | 0 .../child/main.tf | 0 .../main.tf | 0 .../child/main.tf | 0 .../apply-resource-depends-on-module/main.tf | 0 .../testdata/apply-resource-scale-in/main.tf | 0 .../testdata/apply-stop/apply-stop.tf | 0 .../apply-taint-dep-requires-new/main.tf | 0 .../testdata/apply-taint-dep/main.tf | 0 .../testdata/apply-taint/main.tf | 0 .../testdata/apply-tainted-targets/main.tf | 0 .../testdata/apply-targeted-count/main.tf | 0 .../apply-targeted-module-dep/child/main.tf | 0 .../apply-targeted-module-dep/main.tf | 0 .../child/main.tf | 0 .../child/subchild/main.tf | 0 .../apply-targeted-module-recursive/main.tf | 0 .../child/main.tf | 0 .../apply-targeted-module-resource/main.tf | 0 .../child1/main.tf | 0 .../child2/main.tf | 0 .../main.tf | 0 .../apply-targeted-module/child/main.tf | 0 .../testdata/apply-targeted-module/main.tf | 0 .../child/main.tf | 0 .../main.tf | 0 .../testdata/apply-targeted/main.tf | 0 .../testdata/apply-tofu-workspace}/main.tf | 0 .../apply-unknown-interpolate/child/main.tf | 0 .../apply-unknown-interpolate/main.tf | 0 .../testdata/apply-unknown/main.tf | 0 .../testdata/apply-unstable/main.tf | 0 .../testdata/apply-vars-env/main.tf | 0 .../testdata/apply-vars/main.tf | 0 .../testdata/apply-with-checks/main.tf | 0 .../testdata/context-required-version/main.tf | 0 .../data-source-read-with-plan-error/main.tf | 0 .../destroy-module-with-provider/main.tf | 0 .../destroy-module-with-provider/mod/main.tf | 0 .../testdata/destroy-targeted/child/main.tf | 0 .../testdata/destroy-targeted/main.tf | 0 .../{opentf => tofu}/testdata/empty/main.tf | 0 .../testdata/eval-context-basic/child/main.tf | 0 .../testdata/eval-context-basic/main.tf | 0 .../testdata/graph-basic/main.tf | 0 .../graph-builder-apply-basic/child/main.tf | 0 .../graph-builder-apply-basic/main.tf | 0 .../graph-builder-apply-count/main.tf | 0 .../graph-builder-apply-dep-cbd/main.tf | 0 .../graph-builder-apply-double-cbd/main.tf | 0 .../A/main.tf | 0 .../main.tf | 0 .../graph-builder-apply-orphan-update/main.tf | 0 .../graph-builder-apply-provisioner/main.tf | 0 .../child1/main.tf | 0 .../child2/main.tf | 0 .../graph-builder-apply-target-module/main.tf | 0 .../graph-builder-orphan-alias/main.tf | 0 .../attr-as-blocks.tf | 0 .../testdata/graph-builder-plan-basic/main.tf | 0 .../graph-builder-plan-dynblock/dynblock.tf | 0 .../child1/main.tf | 0 .../child2/main.tf | 0 .../main.tf | 0 .../testdata/import-id-data-source/main.tf | 0 .../testdata/import-id-func/main.tf | 0 .../testdata/import-id-invalid-null/main.tf | 0 .../import-id-invalid-unknown/main.tf | 0 .../testdata/import-id-module/child/main.tf | 0 .../testdata/import-id-module/main.tf | 0 .../testdata/import-id-variable/main.tf | 0 .../testdata/import-module/child/main.tf | 0 .../import-module/child/submodule/main.tf | 0 .../testdata/import-module/main.tf | 0 .../testdata/import-provider-locals/main.tf | 0 .../import-provider-resources/main.tf | 0 .../testdata/import-provider-vars/main.tf | 0 .../testdata/import-provider/main.tf | 0 .../input-interpolate-var/child/main.tf | 0 .../testdata/input-interpolate-var/main.tf | 0 .../input-interpolate-var/source/main.tf | 0 .../input-module-data-vars/child/main.tf | 0 .../testdata/input-module-data-vars/main.tf | 0 .../testdata/input-provider-multi/main.tf | 0 .../input-provider-once/child/main.tf | 0 .../testdata/input-provider-once/main.tf | 0 .../testdata/input-provider-vars/main.tf | 0 .../child/main.tf | 0 .../main.tf | 0 .../testdata/input-provider-with-vars/main.tf | 0 .../testdata/input-provider/main.tf | 0 .../testdata/input-submodule-count/main.tf | 0 .../input-submodule-count/mod/main.tf | 0 .../input-submodule-count/mod/submod/main.tf | 0 .../testdata/input-variables/main.tf | 0 .../testdata/issue-33572/main.tf | 0 .../testdata/issue-5254/step-0/main.tf | 0 .../testdata/issue-5254/step-1/main.tf | 0 .../testdata/issue-7824/main.tf | 0 .../testdata/issue-9549/main.tf | 0 .../testdata/issue-9549/mod/main.tf | 0 .../nested-resource-count-plan/main.tf | 0 .../block-nesting-group.tf | 0 .../plan-cbd-depends-datasource/main.tf | 0 .../testdata/plan-cbd-maintain-root/main.tf | 0 .../testdata/plan-cbd/main.tf | 0 .../plan-close-module-provider/main.tf | 0 .../plan-close-module-provider/mod/main.tf | 0 .../main.tf | 0 .../testdata/plan-computed-data-count/main.tf | 0 .../plan-computed-data-resource/main.tf | 0 .../plan-computed-in-function/main.tf | 0 .../testdata/plan-computed-list/main.tf | 0 .../plan-computed-multi-index/main.tf | 0 .../plan-computed-value-in-map/main.tf | 0 .../plan-computed-value-in-map/mod/main.tf | 0 .../testdata/plan-computed/main.tf | 0 .../plan-count-computed-module/child/main.tf | 0 .../plan-count-computed-module/main.tf | 0 .../testdata/plan-count-computed/main.tf | 0 .../testdata/plan-count-dec/main.tf | 0 .../testdata/plan-count-inc/main.tf | 0 .../testdata/plan-count-index/main.tf | 0 .../child/child/main.tf | 0 .../child/main.tf | 0 .../main.tf | 0 .../plan-count-module-static/child/main.tf | 0 .../testdata/plan-count-module-static/main.tf | 0 .../testdata/plan-count-one-index/main.tf | 0 .../plan-count-splat-reference/main.tf | 0 .../testdata/plan-count-var/main.tf | 0 .../testdata/plan-count-zero/main.tf | 0 .../testdata/plan-count/main.tf | 0 .../testdata/plan-data-depends-on/main.tf | 0 .../main.tf | 0 .../plan-destroy-interpolated-count/main.tf | 0 .../mod/main.tf | 0 .../testdata/plan-destroy/main.tf | 0 .../testdata/plan-diffvar/main.tf | 0 .../testdata/plan-empty/main.tf | 0 .../testdata/plan-escaped-var/main.tf | 0 .../plan-for-each-unknown-value/main.tf | 0 .../testdata/plan-for-each/main.tf | 0 .../testdata/plan-good/main.tf | 0 .../ignore-changes-in-map.tf | 0 .../ignore-changes-sensitive.tf | 0 .../plan-ignore-changes-wildcard/main.tf | 0 .../plan-ignore-changes-with-flatmaps/main.tf | 0 .../testdata/plan-ignore-changes/main.tf | 0 .../testdata/plan-list-order/main.tf | 0 .../testdata/plan-local-value-count/main.tf | 0 .../testdata/plan-module-cycle/child/main.tf | 0 .../testdata/plan-module-cycle/main.tf | 0 .../plan-module-deadlock/child/main.tf | 0 .../testdata/plan-module-deadlock/main.tf | 0 .../plan-module-destroy-gh-1835/a/main.tf | 0 .../plan-module-destroy-gh-1835/b/main.tf | 0 .../plan-module-destroy-gh-1835/main.tf | 0 .../child/main.tf | 0 .../plan-module-destroy-multivar/main.tf | 0 .../plan-module-destroy/child/main.tf | 0 .../testdata/plan-module-destroy/main.tf | 0 .../plan-module-input-computed/child/main.tf | 0 .../plan-module-input-computed/main.tf | 0 .../plan-module-input-var/child/main.tf | 0 .../testdata/plan-module-input-var/main.tf | 0 .../testdata/plan-module-input/child/main.tf | 0 .../testdata/plan-module-input/main.tf | 0 .../plan-module-map-literal/child/main.tf | 0 .../testdata/plan-module-map-literal/main.tf | 0 .../plan-module-multi-var/child/main.tf | 0 .../testdata/plan-module-multi-var/main.tf | 0 .../child/main.tf | 0 .../plan-module-provider-defaults-var/main.tf | 0 .../child/main.tf | 0 .../plan-module-provider-defaults/main.tf | 0 .../A/main.tf | 0 .../B/main.tf | 0 .../C/main.tf | 0 .../plan-module-provider-inherit-deep/main.tf | 0 .../child/main.tf | 0 .../plan-module-provider-inherit/main.tf | 0 .../plan-module-provider-var/child/main.tf | 0 .../testdata/plan-module-provider-var/main.tf | 0 .../plan-module-var-computed/child/main.tf | 0 .../testdata/plan-module-var-computed/main.tf | 0 .../inner/main.tf | 0 .../main.tf | 0 .../testdata/plan-module-var/child/main.tf | 0 .../testdata/plan-module-var/main.tf | 0 .../plan-module-variable-from-splat/main.tf | 0 .../mod/main.tf | 0 .../inner/main.tf | 0 .../plan-module-wrong-var-type-nested/main.tf | 0 .../middle/main.tf | 0 .../plan-module-wrong-var-type/inner/main.tf | 0 .../plan-module-wrong-var-type/main.tf | 0 .../plan-modules-expand/child/main.tf | 0 .../testdata/plan-modules-expand/main.tf | 0 .../plan-modules-remove-provisioners/main.tf | 0 .../parent/child/main.tf | 0 .../parent/main.tf | 0 .../testdata/plan-modules-remove/main.tf | 0 .../testdata/plan-modules/child/main.tf | 0 .../testdata/plan-modules/main.tf | 0 .../testdata/plan-orphan/main.tf | 0 .../testdata/plan-path-var/main.tf | 0 .../testdata/plan-prevent-destroy-bad/main.tf | 0 .../plan-prevent-destroy-count-bad/main.tf | 0 .../plan-prevent-destroy-count-good/main.tf | 0 .../plan-prevent-destroy-good/main.tf | 0 .../testdata/plan-provider/main.tf | 0 .../testdata/plan-provisioner-cycle/main.tf | 0 .../testdata/plan-required-output/main.tf | 0 .../testdata/plan-required-output/mod/main.tf | 0 .../testdata/plan-required-whole-mod/main.tf | 0 .../plan-required-whole-mod/mod/main.tf | 0 .../testdata/plan-requires-replace/main.tf | 0 .../testdata/plan-self-ref-multi-all/main.tf | 0 .../testdata/plan-self-ref-multi/main.tf | 0 .../testdata/plan-self-ref/main.tf | 0 .../testdata/plan-shadow-uuid/main.tf | 0 .../plan-taint-ignore-changes/main.tf | 0 .../plan-taint-interpolated-count/main.tf | 0 .../testdata/plan-taint/main.tf | 0 .../plan-targeted-cross-module/A/main.tf | 0 .../plan-targeted-cross-module/B/main.tf | 0 .../plan-targeted-cross-module/main.tf | 0 .../plan-targeted-module-orphan/main.tf | 0 .../child/main.tf | 0 .../main.tf | 0 .../child1/main.tf | 0 .../child2/main.tf | 0 .../main.tf | 0 .../testdata/plan-targeted-orphan/main.tf | 0 .../testdata/plan-targeted-over-ten/main.tf | 0 .../testdata/plan-targeted/main.tf | 0 .../testdata/plan-targeted/mod/main.tf | 0 .../plan-untargeted-resource-output/main.tf | 0 .../mod/main.tf | 0 .../testdata/plan-var-list-err/main.tf | 0 .../child/main.tf | 0 .../plan-variable-sensitivity-module/main.tf | 0 .../plan-variable-sensitivity/main.tf | 0 .../testdata/provider-meta-data-set/main.tf | 0 .../provider-meta-data-set/my-module/main.tf | 0 .../testdata/provider-meta-data-unset/main.tf | 0 .../my-module/main.tf | 0 .../testdata/provider-meta-set/main.tf | 0 .../provider-meta-set/my-module/main.tf | 0 .../testdata/provider-meta-unset/main.tf | 0 .../provider-meta-unset/my-module/main.tf | 0 .../testdata/provider-with-locals/main.tf | 0 .../testdata/refresh-basic/main.tf | 0 .../refresh-data-count/refresh-data-count.tf | 0 .../refresh-data-module-var/child/main.tf | 0 .../testdata/refresh-data-module-var/main.tf | 0 .../testdata/refresh-data-ref-data/main.tf | 0 .../refresh-data-resource-basic/main.tf | 0 .../testdata/refresh-dynamic/main.tf | 0 .../refresh-module-computed-var/child/main.tf | 0 .../refresh-module-computed-var/main.tf | 0 .../child/main.tf | 0 .../main.tf | 0 .../child/grandchild/main.tf | 0 .../refresh-module-orphan/child/main.tf | 0 .../testdata/refresh-module-orphan/main.tf | 0 .../refresh-module-var-module/bar/main.tf | 0 .../refresh-module-var-module/foo/main.tf | 0 .../refresh-module-var-module/main.tf | 0 .../testdata/refresh-modules/child/main.tf | 0 .../testdata/refresh-modules/main.tf | 0 .../testdata/refresh-no-state/main.tf | 0 .../testdata/refresh-output-partial/main.tf | 0 .../testdata/refresh-output/main.tf | 0 .../testdata/refresh-schema-upgrade/main.tf | 0 .../testdata/refresh-targeted-count/main.tf | 0 .../testdata/refresh-targeted/main.tf | 0 .../testdata/refresh-unknown-provider/main.tf | 0 .../testdata/refresh-vars/main.tf | 0 .../static-validate-refs.tf | 0 .../main.tf | 0 .../transform-cbd-destroy-edge-count/main.tf | 0 .../transform-config-mode-data/main.tf | 0 .../transform-destroy-cbd-edge-basic/main.tf | 0 .../transform-destroy-cbd-edge-multi/main.tf | 0 .../transform-destroy-edge-basic/main.tf | 0 .../child/main.tf | 0 .../main.tf | 0 .../child/main.tf | 0 .../transform-destroy-edge-module/main.tf | 0 .../transform-destroy-edge-multi/main.tf | 0 .../transform-destroy-edge-self-ref/main.tf | 0 .../transform-module-var-basic/child/main.tf | 0 .../transform-module-var-basic/main.tf | 0 .../child/child/main.tf | 0 .../transform-module-var-nested/child/main.tf | 0 .../transform-module-var-nested/main.tf | 0 .../testdata/transform-orphan-basic/main.tf | 0 .../transform-orphan-count-empty/main.tf | 0 .../testdata/transform-orphan-count/main.tf | 0 .../testdata/transform-orphan-modules/main.tf | 0 .../testdata/transform-provider-basic/main.tf | 0 .../child/main.tf | 0 .../transform-provider-fqns-module/main.tf | 0 .../testdata/transform-provider-fqns/main.tf | 0 .../child/grandchild/main.tf | 0 .../child/main.tf | 0 .../main.tf | 0 .../transform-provider-inherit/child/main.tf | 0 .../transform-provider-inherit/main.tf | 0 .../main.tf | 0 .../sub/main.tf | 0 .../sub/subsub/main.tf | 0 .../transform-provider-missing/main.tf | 0 .../testdata/transform-provider-prune/main.tf | 0 .../transform-provisioner-basic/main.tf | 0 .../child/main.tf | 0 .../transform-provisioner-module/main.tf | 0 .../testdata/transform-root-basic/main.tf | 0 .../testdata/transform-targets-basic/main.tf | 0 .../child/child.tf | 0 .../child/grandchild/grandchild.tf | 0 .../transform-targets-downstream/main.tf | 0 .../transform-trans-reduce-basic/main.tf | 0 .../testdata/update-resource-provider/main.tf | 0 .../testdata/validate-bad-count/main.tf | 0 .../validate-bad-module-output/child/main.tf | 0 .../validate-bad-module-output/main.tf | 0 .../testdata/validate-bad-pc/main.tf | 0 .../testdata/validate-bad-prov-conf/main.tf | 0 .../validate-bad-prov-connection/main.tf | 0 .../testdata/validate-bad-rc/main.tf | 0 .../validate-bad-resource-connection/main.tf | 0 .../validate-bad-resource-count/main.tf | 0 .../testdata/validate-bad-var/main.tf | 0 .../validate-computed-in-function/main.tf | 0 .../dest/main.tf | 0 .../validate-computed-module-var-ref/main.tf | 0 .../source/main.tf | 0 .../testdata/validate-computed-var/main.tf | 0 .../testdata/validate-count-computed/main.tf | 0 .../testdata/validate-count-negative/main.tf | 0 .../testdata/validate-count-variable/main.tf | 0 .../validate-good-module/child/main.tf | 0 .../testdata/validate-good-module/main.tf | 0 .../testdata/validate-good/main.tf | 0 .../validate-module-bad-rc/child/main.tf | 0 .../testdata/validate-module-bad-rc/main.tf | 0 .../validate-module-deps-cycle/a/main.tf | 0 .../validate-module-deps-cycle/b/main.tf | 0 .../validate-module-deps-cycle/main.tf | 0 .../child/main.tf | 0 .../validate-module-pc-inherit-unused/main.tf | 0 .../validate-module-pc-inherit/child/main.tf | 0 .../validate-module-pc-inherit/main.tf | 0 .../validate-module-pc-vars/child/main.tf | 0 .../testdata/validate-module-pc-vars/main.tf | 0 .../validate-required-provider-config/main.tf | 0 .../testdata/validate-required-var/main.tf | 0 .../main.tf | 0 .../validate-skipped-pc-empty/main.tf | 0 .../testdata/validate-targeted/main.tf | 0 .../main.tf | 0 .../child/child.tf | 0 .../validate-variable-custom-validations.tf | 0 .../child/child.tf | 0 .../validate-variable-custom-validations.tf | 0 .../testdata/validate-variable-ref/main.tf | 0 .../testdata/vars-basic-bool/main.tf | 0 .../testdata/vars-basic/main.tf | 0 internal/{opentf => tofu}/transform.go | 2 +- .../transform_attach_config_provider.go | 2 +- .../transform_attach_config_provider_meta.go | 2 +- .../transform_attach_config_resource.go | 2 +- .../transform_attach_schema.go | 2 +- .../transform_attach_state.go | 2 +- internal/{opentf => tofu}/transform_check.go | 2 +- .../transform_check_starter.go | 2 +- internal/{opentf => tofu}/transform_config.go | 2 +- .../{opentf => tofu}/transform_config_test.go | 2 +- .../{opentf => tofu}/transform_destroy_cbd.go | 2 +- .../transform_destroy_cbd_test.go | 2 +- .../transform_destroy_edge.go | 2 +- .../transform_destroy_edge_test.go | 2 +- internal/{opentf => tofu}/transform_diff.go | 2 +- .../{opentf => tofu}/transform_diff_test.go | 2 +- internal/{opentf => tofu}/transform_expand.go | 2 +- .../transform_external_reference.go | 2 +- .../transform_import_state_test.go | 2 +- internal/{opentf => tofu}/transform_local.go | 2 +- .../transform_module_expansion.go | 2 +- .../transform_module_variable.go | 2 +- .../transform_module_variable_test.go | 2 +- .../transform_orphan_count.go | 2 +- .../transform_orphan_count_test.go | 2 +- .../transform_orphan_output.go | 2 +- .../transform_orphan_resource.go | 2 +- .../transform_orphan_resource_test.go | 2 +- internal/{opentf => tofu}/transform_output.go | 2 +- .../{opentf => tofu}/transform_provider.go | 2 +- .../transform_provider_test.go | 2 +- .../{opentf => tofu}/transform_provisioner.go | 2 +- .../{opentf => tofu}/transform_reference.go | 2 +- .../transform_reference_test.go | 2 +- .../transform_removed_modules.go | 2 +- .../transform_resource_count.go | 2 +- internal/{opentf => tofu}/transform_root.go | 2 +- .../{opentf => tofu}/transform_root_test.go | 2 +- internal/{opentf => tofu}/transform_state.go | 2 +- .../{opentf => tofu}/transform_targets.go | 2 +- .../transform_targets_test.go | 2 +- .../transform_transitive_reduction.go | 2 +- .../transform_transitive_reduction_test.go | 2 +- .../{opentf => tofu}/transform_variable.go | 2 +- internal/{opentf => tofu}/transform_vertex.go | 2 +- .../{opentf => tofu}/transform_vertex_test.go | 2 +- internal/{opentf => tofu}/ui_input.go | 2 +- internal/{opentf => tofu}/ui_input_mock.go | 2 +- internal/{opentf => tofu}/ui_input_prefix.go | 2 +- .../{opentf => tofu}/ui_input_prefix_test.go | 2 +- internal/{opentf => tofu}/ui_output.go | 2 +- .../{opentf => tofu}/ui_output_callback.go | 2 +- .../ui_output_callback_test.go | 2 +- internal/{opentf => tofu}/ui_output_mock.go | 2 +- .../{opentf => tofu}/ui_output_mock_test.go | 2 +- .../{opentf => tofu}/ui_output_provisioner.go | 2 +- .../ui_output_provisioner_test.go | 2 +- .../{opentf => tofu}/update_state_hook.go | 2 +- .../update_state_hook_test.go | 2 +- .../upgrade_resource_state.go | 2 +- .../upgrade_resource_state_test.go | 2 +- internal/{opentf => tofu}/util.go | 2 +- internal/{opentf => tofu}/util_test.go | 2 +- internal/{opentf => tofu}/validate_selfref.go | 2 +- .../{opentf => tofu}/validate_selfref_test.go | 2 +- .../valuesourcetype_string.go | 2 +- internal/{opentf => tofu}/variables.go | 2 +- internal/{opentf => tofu}/variables_test.go | 2 +- internal/{opentf => tofu}/version_required.go | 2 +- .../{opentf => tofu}/walkoperation_string.go | 2 +- 830 files changed, 774 insertions(+), 774 deletions(-) rename internal/{opentf => tofu}/context.go (97%) rename internal/{opentf => tofu}/context_apply.go (99%) rename internal/{opentf => tofu}/context_apply2_test.go (99%) rename internal/{opentf => tofu}/context_apply_checks_test.go (99%) rename internal/{opentf => tofu}/context_apply_test.go (99%) rename internal/{opentf => tofu}/context_eval.go (99%) rename internal/{opentf => tofu}/context_eval_test.go (99%) rename internal/{opentf => tofu}/context_fixtures_test.go (99%) rename internal/{opentf => tofu}/context_import.go (99%) rename internal/{opentf => tofu}/context_import_test.go (99%) rename internal/{opentf => tofu}/context_input.go (99%) rename internal/{opentf => tofu}/context_input_test.go (99%) rename internal/{opentf => tofu}/context_plan.go (99%) rename internal/{opentf => tofu}/context_plan2_test.go (99%) rename internal/{opentf => tofu}/context_plan_test.go (99%) rename internal/{opentf => tofu}/context_plugins.go (98%) rename internal/{opentf => tofu}/context_plugins_test.go (99%) rename internal/{opentf => tofu}/context_refresh.go (98%) rename internal/{opentf => tofu}/context_refresh_test.go (99%) rename internal/{opentf => tofu}/context_test.go (99%) rename internal/{opentf => tofu}/context_validate.go (99%) rename internal/{opentf => tofu}/context_validate_test.go (99%) rename internal/{opentf => tofu}/context_walk.go (99%) rename internal/{opentf => tofu}/diagnostics.go (99%) rename internal/{opentf => tofu}/eval_conditions.go (99%) rename internal/{opentf => tofu}/eval_context.go (99%) rename internal/{opentf => tofu}/eval_context_builtin.go (99%) rename internal/{opentf => tofu}/eval_context_builtin_test.go (99%) rename internal/{opentf => tofu}/eval_context_mock.go (99%) rename internal/{opentf => tofu}/eval_count.go (99%) rename internal/{opentf => tofu}/eval_count_test.go (98%) rename internal/{opentf => tofu}/eval_for_each.go (99%) rename internal/{opentf => tofu}/eval_for_each_test.go (99%) rename internal/{opentf => tofu}/eval_import.go (99%) rename internal/{opentf => tofu}/eval_provider.go (99%) rename internal/{opentf => tofu}/eval_provider_test.go (99%) rename internal/{opentf => tofu}/eval_variable.go (99%) rename internal/{opentf => tofu}/eval_variable_test.go (99%) rename internal/{opentf => tofu}/evaluate.go (99%) rename internal/{opentf => tofu}/evaluate_test.go (99%) rename internal/{opentf => tofu}/evaluate_triggers.go (99%) rename internal/{opentf => tofu}/evaluate_triggers_test.go (99%) rename internal/{opentf => tofu}/evaluate_valid.go (99%) rename internal/{opentf => tofu}/evaluate_valid_test.go (99%) rename internal/{opentf => tofu}/execute.go (95%) rename internal/{opentf => tofu}/features.go (93%) rename internal/{opentf => tofu}/graph.go (99%) rename internal/{opentf => tofu}/graph_builder.go (99%) rename internal/{opentf => tofu}/graph_builder_apply.go (99%) rename internal/{opentf => tofu}/graph_builder_apply_test.go (99%) rename internal/{opentf => tofu}/graph_builder_eval.go (99%) rename internal/{opentf => tofu}/graph_builder_plan.go (99%) rename internal/{opentf => tofu}/graph_builder_plan_test.go (99%) rename internal/{opentf => tofu}/graph_builder_test.go (98%) rename internal/{opentf => tofu}/graph_dot.go (95%) rename internal/{opentf => tofu}/graph_dot_test.go (99%) rename internal/{opentf => tofu}/graph_interface_subgraph.go (97%) rename internal/{opentf => tofu}/graph_test.go (98%) rename internal/{opentf => tofu}/graph_walk.go (98%) rename internal/{opentf => tofu}/graph_walk_context.go (99%) rename internal/{opentf => tofu}/graph_walk_operation.go (96%) rename internal/{opentf => tofu}/graph_walk_test.go (92%) rename internal/{opentf => tofu}/hook.go (99%) rename internal/{opentf => tofu}/hook_mock.go (99%) rename internal/{opentf => tofu}/hook_stop.go (99%) rename internal/{opentf => tofu}/hook_stop_test.go (91%) rename internal/{opentf => tofu}/hook_test.go (99%) rename internal/{opentf => tofu}/instance_expanders.go (94%) rename internal/{opentf => tofu}/marks.go (98%) rename internal/{opentf => tofu}/marks_test.go (99%) rename internal/{opentf => tofu}/node_check.go (99%) rename internal/{opentf => tofu}/node_data_destroy.go (98%) rename internal/{opentf => tofu}/node_data_destroy_test.go (98%) rename internal/{opentf => tofu}/node_external_reference.go (98%) rename internal/{opentf => tofu}/node_local.go (99%) rename internal/{opentf => tofu}/node_local_test.go (99%) rename internal/{opentf => tofu}/node_module_expand.go (99%) rename internal/{opentf => tofu}/node_module_expand_test.go (99%) rename internal/{opentf => tofu}/node_module_variable.go (99%) rename internal/{opentf => tofu}/node_module_variable_test.go (99%) rename internal/{opentf => tofu}/node_output.go (99%) rename internal/{opentf => tofu}/node_output_test.go (99%) rename internal/{opentf => tofu}/node_provider.go (99%) rename internal/{opentf => tofu}/node_provider_abstract.go (99%) rename internal/{opentf => tofu}/node_provider_eval.go (97%) rename internal/{opentf => tofu}/node_provider_test.go (99%) rename internal/{opentf => tofu}/node_resource_abstract.go (99%) rename internal/{opentf => tofu}/node_resource_abstract_instance.go (99%) rename internal/{opentf => tofu}/node_resource_abstract_instance_test.go (99%) rename internal/{opentf => tofu}/node_resource_abstract_test.go (99%) rename internal/{opentf => tofu}/node_resource_apply.go (99%) rename internal/{opentf => tofu}/node_resource_apply_instance.go (99%) rename internal/{opentf => tofu}/node_resource_apply_test.go (99%) rename internal/{opentf => tofu}/node_resource_destroy.go (99%) rename internal/{opentf => tofu}/node_resource_destroy_deposed.go (99%) rename internal/{opentf => tofu}/node_resource_destroy_deposed_test.go (99%) rename internal/{opentf => tofu}/node_resource_import.go (98%) rename internal/{opentf => tofu}/node_resource_plan.go (99%) rename internal/{opentf => tofu}/node_resource_plan_destroy.go (99%) rename internal/{opentf => tofu}/node_resource_plan_instance.go (99%) rename internal/{opentf => tofu}/node_resource_plan_orphan.go (99%) rename internal/{opentf => tofu}/node_resource_plan_orphan_test.go (99%) rename internal/{opentf => tofu}/node_resource_validate.go (99%) rename internal/{opentf => tofu}/node_resource_validate_test.go (99%) rename internal/{opentf => tofu}/node_root_variable.go (99%) rename internal/{opentf => tofu}/node_root_variable_test.go (99%) rename internal/{opentf => tofu}/node_value.go (96%) rename internal/{opentf => tofu}/opentf_test.go (99%) rename internal/{opentf => tofu}/phasestate_string.go (97%) rename internal/{opentf => tofu}/provider_mock.go (99%) rename internal/{opentf => tofu}/provisioner_mock.go (99%) rename internal/{opentf => tofu}/provisioner_mock_test.go (98%) rename internal/{opentf => tofu}/reduce_plan.go (98%) rename internal/{opentf => tofu}/reduce_plan_test.go (99%) rename internal/{opentf => tofu}/resource_provider_mock_test.go (99%) rename internal/{opentf => tofu}/schemas.go (99%) rename internal/{opentf => tofu}/schemas_test.go (99%) rename internal/{opentf => tofu}/test_context.go (99%) rename internal/{opentf => tofu}/test_context_test.go (99%) rename internal/{opentf => tofu}/testdata/apply-blank/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-cancel-block/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-cancel-provisioner/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-cancel/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-cbd-count/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-cbd-cycle/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-cbd-depends-non-cbd/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-cbd-deposed-only/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-compute/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-count-dec-one/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-count-dec/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-count-tainted/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-count-variable-ref/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-count-variable/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-data-basic/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-data-sensitive/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-depends-create-before/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-cbd/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-computed/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-computed/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-cross-providers/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-cross-providers/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-data-cycle/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-data-resource/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-deeply-nested-module/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-deeply-nested-module/child/subchild/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-deeply-nested-module/child/subchild/subsubchild/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-deeply-nested-module/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-depends-on/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-mod-var-and-count-nested/child/child2/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-mod-var-and-count-nested/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-mod-var-and-count-nested/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-mod-var-and-count/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-mod-var-and-count/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-mod-var-provider-config/child/child.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-mod-var-provider-config/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-module-resource-prefix/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-module-resource-prefix/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-module-with-attrs/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-module-with-attrs/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-nested-module-with-attrs/middle/bottom/bottom.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-nested-module-with-attrs/middle/middle.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-nested-module-with-attrs/top.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-nested-module/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-nested-module/child/subchild/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-nested-module/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-outputs/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-provisider-refs/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-provisider-refs/mod/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-provisioner/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-tainted/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-targeted-count/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy-with-locals/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-destroy/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-empty-module/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-empty-module/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-error-create-before/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-error/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-escape/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-good-create-before-update/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-good-create-before/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-good/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-idattr/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-ignore-changes-all/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-ignore-changes-create/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-ignore-changes-dep/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-inconsistent-with-plan/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-interpolated-count/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-invalid-index/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-issue19908/issue19908.tf (100%) rename internal/{opentf => tofu}/testdata/apply-local-val/child/child.tf (100%) rename internal/{opentf => tofu}/testdata/apply-local-val/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-local-val/outputs.tf (100%) rename internal/{opentf => tofu}/testdata/apply-map-var-through-module/amodule/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-map-var-through-module/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-minimal/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-bool/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-bool/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-depends-on/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-depends-on/moda/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-depends-on/modb/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-destroy-order/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-destroy-order/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-grandchild-provider-inherit/child/grandchild/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-grandchild-provider-inherit/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-grandchild-provider-inherit/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-only-provider/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-only-provider/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-orphan-provider-inherit/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-provider-alias/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-provider-alias/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-provider-close-nested/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-provider-close-nested/child/subchild/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-provider-close-nested/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-provider-inherit-alias-orphan/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-provider-inherit-alias/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-provider-inherit-alias/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-replace-cycle-cbd/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-replace-cycle-cbd/mod1/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-replace-cycle-cbd/mod2/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-replace-cycle/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-replace-cycle/mod1/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-replace-cycle/mod2/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-var-resource-count/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module-var-resource-count/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-module/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-multi-depose-create-before-destroy/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-multi-provider-destroy-child/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-multi-provider-destroy-child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-multi-provider-destroy/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-multi-provider/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-multi-ref/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-multi-var-comprehensive/child/child.tf (100%) rename internal/{opentf => tofu}/testdata/apply-multi-var-comprehensive/root.tf (100%) rename internal/{opentf => tofu}/testdata/apply-multi-var-count-dec/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-multi-var-missing-state/child/child.tf (100%) rename internal/{opentf => tofu}/testdata/apply-multi-var-missing-state/root.tf (100%) rename internal/{opentf => tofu}/testdata/apply-multi-var-order-interp/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-multi-var-order/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-multi-var/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-nullable-variables/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-nullable-variables/mod/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-orphan-resource/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-output-add-after/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-output-add-after/outputs.tf.json (100%) rename internal/{opentf => tofu}/testdata/apply-output-add-before/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-output-add-before/outputs.tf.json (100%) rename internal/{opentf => tofu}/testdata/apply-output-list/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-output-multi-index/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-output-multi/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-output-orphan-module/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-output-orphan-module/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-output-orphan/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-output/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-plan-connection-refs/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-provider-alias-configure/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-provider-alias/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-provider-computed/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-provider-configure-disabled/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-provider-configure-disabled/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-provider-warning/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-provisioner-compute/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-provisioner-destroy-continue/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-provisioner-destroy-fail/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-provisioner-destroy/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-provisioner-diff/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-provisioner-explicit-self-ref/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-provisioner-fail-continue/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-provisioner-fail-create-before/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-provisioner-fail-create/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-provisioner-fail/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-provisioner-for-each-self/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-provisioner-interp-count/provisioner-interp-count.tf (100%) rename internal/{opentf => tofu}/testdata/apply-provisioner-module/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-provisioner-module/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-provisioner-multi-self-ref-single/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-provisioner-multi-self-ref/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-provisioner-resource-ref/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-provisioner-self-ref/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-provisioner-sensitive/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-ref-count/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-ref-existing/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-ref-existing/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-resource-count-one-list/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-resource-count-zero-list/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-resource-depends-on-module-deep/child/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-resource-depends-on-module-deep/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-resource-depends-on-module-deep/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-resource-depends-on-module-empty/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-resource-depends-on-module-in-module/child/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-resource-depends-on-module-in-module/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-resource-depends-on-module-in-module/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-resource-depends-on-module/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-resource-depends-on-module/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-resource-scale-in/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-stop/apply-stop.tf (100%) rename internal/{opentf => tofu}/testdata/apply-taint-dep-requires-new/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-taint-dep/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-taint/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-tainted-targets/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-targeted-count/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-targeted-module-dep/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-targeted-module-dep/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-targeted-module-recursive/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-targeted-module-recursive/child/subchild/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-targeted-module-recursive/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-targeted-module-resource/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-targeted-module-resource/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-targeted-module-unrelated-outputs/child1/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-targeted-module-unrelated-outputs/child2/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-targeted-module-unrelated-outputs/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-targeted-module/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-targeted-module/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-targeted-resource-orphan-module/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-targeted-resource-orphan-module/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-targeted/main.tf (100%) rename internal/{opentf/testdata/apply-opentf-workspace => tofu/testdata/apply-tofu-workspace}/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-unknown-interpolate/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-unknown-interpolate/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-unknown/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-unstable/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-vars-env/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-vars/main.tf (100%) rename internal/{opentf => tofu}/testdata/apply-with-checks/main.tf (100%) rename internal/{opentf => tofu}/testdata/context-required-version/main.tf (100%) rename internal/{opentf => tofu}/testdata/data-source-read-with-plan-error/main.tf (100%) rename internal/{opentf => tofu}/testdata/destroy-module-with-provider/main.tf (100%) rename internal/{opentf => tofu}/testdata/destroy-module-with-provider/mod/main.tf (100%) rename internal/{opentf => tofu}/testdata/destroy-targeted/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/destroy-targeted/main.tf (100%) rename internal/{opentf => tofu}/testdata/empty/main.tf (100%) rename internal/{opentf => tofu}/testdata/eval-context-basic/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/eval-context-basic/main.tf (100%) rename internal/{opentf => tofu}/testdata/graph-basic/main.tf (100%) rename internal/{opentf => tofu}/testdata/graph-builder-apply-basic/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/graph-builder-apply-basic/main.tf (100%) rename internal/{opentf => tofu}/testdata/graph-builder-apply-count/main.tf (100%) rename internal/{opentf => tofu}/testdata/graph-builder-apply-dep-cbd/main.tf (100%) rename internal/{opentf => tofu}/testdata/graph-builder-apply-double-cbd/main.tf (100%) rename internal/{opentf => tofu}/testdata/graph-builder-apply-module-destroy/A/main.tf (100%) rename internal/{opentf => tofu}/testdata/graph-builder-apply-module-destroy/main.tf (100%) rename internal/{opentf => tofu}/testdata/graph-builder-apply-orphan-update/main.tf (100%) rename internal/{opentf => tofu}/testdata/graph-builder-apply-provisioner/main.tf (100%) rename internal/{opentf => tofu}/testdata/graph-builder-apply-target-module/child1/main.tf (100%) rename internal/{opentf => tofu}/testdata/graph-builder-apply-target-module/child2/main.tf (100%) rename internal/{opentf => tofu}/testdata/graph-builder-apply-target-module/main.tf (100%) rename internal/{opentf => tofu}/testdata/graph-builder-orphan-alias/main.tf (100%) rename internal/{opentf => tofu}/testdata/graph-builder-plan-attr-as-blocks/attr-as-blocks.tf (100%) rename internal/{opentf => tofu}/testdata/graph-builder-plan-basic/main.tf (100%) rename internal/{opentf => tofu}/testdata/graph-builder-plan-dynblock/dynblock.tf (100%) rename internal/{opentf => tofu}/testdata/graph-builder-plan-target-module-provider/child1/main.tf (100%) rename internal/{opentf => tofu}/testdata/graph-builder-plan-target-module-provider/child2/main.tf (100%) rename internal/{opentf => tofu}/testdata/graph-builder-plan-target-module-provider/main.tf (100%) rename internal/{opentf => tofu}/testdata/import-id-data-source/main.tf (100%) rename internal/{opentf => tofu}/testdata/import-id-func/main.tf (100%) rename internal/{opentf => tofu}/testdata/import-id-invalid-null/main.tf (100%) rename internal/{opentf => tofu}/testdata/import-id-invalid-unknown/main.tf (100%) rename internal/{opentf => tofu}/testdata/import-id-module/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/import-id-module/main.tf (100%) rename internal/{opentf => tofu}/testdata/import-id-variable/main.tf (100%) rename internal/{opentf => tofu}/testdata/import-module/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/import-module/child/submodule/main.tf (100%) rename internal/{opentf => tofu}/testdata/import-module/main.tf (100%) rename internal/{opentf => tofu}/testdata/import-provider-locals/main.tf (100%) rename internal/{opentf => tofu}/testdata/import-provider-resources/main.tf (100%) rename internal/{opentf => tofu}/testdata/import-provider-vars/main.tf (100%) rename internal/{opentf => tofu}/testdata/import-provider/main.tf (100%) rename internal/{opentf => tofu}/testdata/input-interpolate-var/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/input-interpolate-var/main.tf (100%) rename internal/{opentf => tofu}/testdata/input-interpolate-var/source/main.tf (100%) rename internal/{opentf => tofu}/testdata/input-module-data-vars/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/input-module-data-vars/main.tf (100%) rename internal/{opentf => tofu}/testdata/input-provider-multi/main.tf (100%) rename internal/{opentf => tofu}/testdata/input-provider-once/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/input-provider-once/main.tf (100%) rename internal/{opentf => tofu}/testdata/input-provider-vars/main.tf (100%) rename internal/{opentf => tofu}/testdata/input-provider-with-vars-and-module/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/input-provider-with-vars-and-module/main.tf (100%) rename internal/{opentf => tofu}/testdata/input-provider-with-vars/main.tf (100%) rename internal/{opentf => tofu}/testdata/input-provider/main.tf (100%) rename internal/{opentf => tofu}/testdata/input-submodule-count/main.tf (100%) rename internal/{opentf => tofu}/testdata/input-submodule-count/mod/main.tf (100%) rename internal/{opentf => tofu}/testdata/input-submodule-count/mod/submod/main.tf (100%) rename internal/{opentf => tofu}/testdata/input-variables/main.tf (100%) rename internal/{opentf => tofu}/testdata/issue-33572/main.tf (100%) rename internal/{opentf => tofu}/testdata/issue-5254/step-0/main.tf (100%) rename internal/{opentf => tofu}/testdata/issue-5254/step-1/main.tf (100%) rename internal/{opentf => tofu}/testdata/issue-7824/main.tf (100%) rename internal/{opentf => tofu}/testdata/issue-9549/main.tf (100%) rename internal/{opentf => tofu}/testdata/issue-9549/mod/main.tf (100%) rename internal/{opentf => tofu}/testdata/nested-resource-count-plan/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-block-nesting-group/block-nesting-group.tf (100%) rename internal/{opentf => tofu}/testdata/plan-cbd-depends-datasource/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-cbd-maintain-root/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-cbd/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-close-module-provider/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-close-module-provider/mod/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-computed-attr-ref-type-mismatch/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-computed-data-count/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-computed-data-resource/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-computed-in-function/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-computed-list/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-computed-multi-index/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-computed-value-in-map/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-computed-value-in-map/mod/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-computed/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-count-computed-module/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-count-computed-module/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-count-computed/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-count-dec/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-count-inc/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-count-index/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-count-module-static-grandchild/child/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-count-module-static-grandchild/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-count-module-static-grandchild/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-count-module-static/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-count-module-static/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-count-one-index/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-count-splat-reference/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-count-var/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-count-zero/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-count/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-data-depends-on/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-data-resource-becomes-computed/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-destroy-interpolated-count/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-destroy-interpolated-count/mod/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-destroy/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-diffvar/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-empty/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-escaped-var/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-for-each-unknown-value/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-for-each/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-good/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-ignore-changes-in-map/ignore-changes-in-map.tf (100%) rename internal/{opentf => tofu}/testdata/plan-ignore-changes-sensitive/ignore-changes-sensitive.tf (100%) rename internal/{opentf => tofu}/testdata/plan-ignore-changes-wildcard/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-ignore-changes-with-flatmaps/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-ignore-changes/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-list-order/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-local-value-count/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-cycle/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-cycle/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-deadlock/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-deadlock/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-destroy-gh-1835/a/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-destroy-gh-1835/b/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-destroy-gh-1835/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-destroy-multivar/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-destroy-multivar/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-destroy/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-destroy/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-input-computed/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-input-computed/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-input-var/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-input-var/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-input/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-input/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-map-literal/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-map-literal/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-multi-var/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-multi-var/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-provider-defaults-var/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-provider-defaults-var/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-provider-defaults/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-provider-defaults/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-provider-inherit-deep/A/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-provider-inherit-deep/B/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-provider-inherit-deep/C/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-provider-inherit-deep/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-provider-inherit/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-provider-inherit/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-provider-var/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-provider-var/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-var-computed/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-var-computed/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-var-with-default-value/inner/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-var-with-default-value/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-var/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-var/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-variable-from-splat/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-variable-from-splat/mod/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-wrong-var-type-nested/inner/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-wrong-var-type-nested/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-wrong-var-type-nested/middle/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-wrong-var-type/inner/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-module-wrong-var-type/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-modules-expand/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-modules-expand/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-modules-remove-provisioners/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-modules-remove-provisioners/parent/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-modules-remove-provisioners/parent/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-modules-remove/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-modules/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-modules/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-orphan/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-path-var/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-prevent-destroy-bad/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-prevent-destroy-count-bad/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-prevent-destroy-count-good/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-prevent-destroy-good/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-provider/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-provisioner-cycle/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-required-output/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-required-output/mod/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-required-whole-mod/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-required-whole-mod/mod/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-requires-replace/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-self-ref-multi-all/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-self-ref-multi/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-self-ref/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-shadow-uuid/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-taint-ignore-changes/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-taint-interpolated-count/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-taint/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-targeted-cross-module/A/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-targeted-cross-module/B/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-targeted-cross-module/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-targeted-module-orphan/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-targeted-module-untargeted-variable/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-targeted-module-untargeted-variable/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-targeted-module-with-provider/child1/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-targeted-module-with-provider/child2/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-targeted-module-with-provider/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-targeted-orphan/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-targeted-over-ten/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-targeted/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-targeted/mod/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-untargeted-resource-output/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-untargeted-resource-output/mod/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-var-list-err/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-variable-sensitivity-module/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-variable-sensitivity-module/main.tf (100%) rename internal/{opentf => tofu}/testdata/plan-variable-sensitivity/main.tf (100%) rename internal/{opentf => tofu}/testdata/provider-meta-data-set/main.tf (100%) rename internal/{opentf => tofu}/testdata/provider-meta-data-set/my-module/main.tf (100%) rename internal/{opentf => tofu}/testdata/provider-meta-data-unset/main.tf (100%) rename internal/{opentf => tofu}/testdata/provider-meta-data-unset/my-module/main.tf (100%) rename internal/{opentf => tofu}/testdata/provider-meta-set/main.tf (100%) rename internal/{opentf => tofu}/testdata/provider-meta-set/my-module/main.tf (100%) rename internal/{opentf => tofu}/testdata/provider-meta-unset/main.tf (100%) rename internal/{opentf => tofu}/testdata/provider-meta-unset/my-module/main.tf (100%) rename internal/{opentf => tofu}/testdata/provider-with-locals/main.tf (100%) rename internal/{opentf => tofu}/testdata/refresh-basic/main.tf (100%) rename internal/{opentf => tofu}/testdata/refresh-data-count/refresh-data-count.tf (100%) rename internal/{opentf => tofu}/testdata/refresh-data-module-var/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/refresh-data-module-var/main.tf (100%) rename internal/{opentf => tofu}/testdata/refresh-data-ref-data/main.tf (100%) rename internal/{opentf => tofu}/testdata/refresh-data-resource-basic/main.tf (100%) rename internal/{opentf => tofu}/testdata/refresh-dynamic/main.tf (100%) rename internal/{opentf => tofu}/testdata/refresh-module-computed-var/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/refresh-module-computed-var/main.tf (100%) rename internal/{opentf => tofu}/testdata/refresh-module-input-computed-output/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/refresh-module-input-computed-output/main.tf (100%) rename internal/{opentf => tofu}/testdata/refresh-module-orphan/child/grandchild/main.tf (100%) rename internal/{opentf => tofu}/testdata/refresh-module-orphan/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/refresh-module-orphan/main.tf (100%) rename internal/{opentf => tofu}/testdata/refresh-module-var-module/bar/main.tf (100%) rename internal/{opentf => tofu}/testdata/refresh-module-var-module/foo/main.tf (100%) rename internal/{opentf => tofu}/testdata/refresh-module-var-module/main.tf (100%) rename internal/{opentf => tofu}/testdata/refresh-modules/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/refresh-modules/main.tf (100%) rename internal/{opentf => tofu}/testdata/refresh-no-state/main.tf (100%) rename internal/{opentf => tofu}/testdata/refresh-output-partial/main.tf (100%) rename internal/{opentf => tofu}/testdata/refresh-output/main.tf (100%) rename internal/{opentf => tofu}/testdata/refresh-schema-upgrade/main.tf (100%) rename internal/{opentf => tofu}/testdata/refresh-targeted-count/main.tf (100%) rename internal/{opentf => tofu}/testdata/refresh-targeted/main.tf (100%) rename internal/{opentf => tofu}/testdata/refresh-unknown-provider/main.tf (100%) rename internal/{opentf => tofu}/testdata/refresh-vars/main.tf (100%) rename internal/{opentf => tofu}/testdata/static-validate-refs/static-validate-refs.tf (100%) rename internal/{opentf => tofu}/testdata/transform-cbd-destroy-edge-both-count/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-cbd-destroy-edge-count/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-config-mode-data/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-destroy-cbd-edge-basic/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-destroy-cbd-edge-multi/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-destroy-edge-basic/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-destroy-edge-module-only/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-destroy-edge-module-only/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-destroy-edge-module/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-destroy-edge-module/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-destroy-edge-multi/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-destroy-edge-self-ref/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-module-var-basic/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-module-var-basic/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-module-var-nested/child/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-module-var-nested/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-module-var-nested/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-orphan-basic/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-orphan-count-empty/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-orphan-count/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-orphan-modules/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-provider-basic/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-provider-fqns-module/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-provider-fqns-module/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-provider-fqns/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-provider-grandchild-inherit/child/grandchild/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-provider-grandchild-inherit/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-provider-grandchild-inherit/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-provider-inherit/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-provider-inherit/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-provider-missing-grandchild/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-provider-missing-grandchild/sub/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-provider-missing-grandchild/sub/subsub/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-provider-missing/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-provider-prune/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-provisioner-basic/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-provisioner-module/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-provisioner-module/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-root-basic/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-targets-basic/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-targets-downstream/child/child.tf (100%) rename internal/{opentf => tofu}/testdata/transform-targets-downstream/child/grandchild/grandchild.tf (100%) rename internal/{opentf => tofu}/testdata/transform-targets-downstream/main.tf (100%) rename internal/{opentf => tofu}/testdata/transform-trans-reduce-basic/main.tf (100%) rename internal/{opentf => tofu}/testdata/update-resource-provider/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-bad-count/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-bad-module-output/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-bad-module-output/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-bad-pc/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-bad-prov-conf/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-bad-prov-connection/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-bad-rc/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-bad-resource-connection/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-bad-resource-count/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-bad-var/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-computed-in-function/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-computed-module-var-ref/dest/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-computed-module-var-ref/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-computed-module-var-ref/source/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-computed-var/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-count-computed/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-count-negative/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-count-variable/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-good-module/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-good-module/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-good/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-module-bad-rc/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-module-bad-rc/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-module-deps-cycle/a/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-module-deps-cycle/b/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-module-deps-cycle/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-module-pc-inherit-unused/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-module-pc-inherit-unused/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-module-pc-inherit/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-module-pc-inherit/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-module-pc-vars/child/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-module-pc-vars/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-required-provider-config/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-required-var/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-sensitive-provisioner-config/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-skipped-pc-empty/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-targeted/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-var-no-default-explicit-type/main.tf (100%) rename internal/{opentf => tofu}/testdata/validate-variable-custom-validations-child-sensitive/child/child.tf (100%) rename internal/{opentf => tofu}/testdata/validate-variable-custom-validations-child-sensitive/validate-variable-custom-validations.tf (100%) rename internal/{opentf => tofu}/testdata/validate-variable-custom-validations-child/child/child.tf (100%) rename internal/{opentf => tofu}/testdata/validate-variable-custom-validations-child/validate-variable-custom-validations.tf (100%) rename internal/{opentf => tofu}/testdata/validate-variable-ref/main.tf (100%) rename internal/{opentf => tofu}/testdata/vars-basic-bool/main.tf (100%) rename internal/{opentf => tofu}/testdata/vars-basic/main.tf (100%) rename internal/{opentf => tofu}/transform.go (99%) rename internal/{opentf => tofu}/transform_attach_config_provider.go (97%) rename internal/{opentf => tofu}/transform_attach_config_provider_meta.go (97%) rename internal/{opentf => tofu}/transform_attach_config_resource.go (99%) rename internal/{opentf => tofu}/transform_attach_schema.go (99%) rename internal/{opentf => tofu}/transform_attach_state.go (99%) rename internal/{opentf => tofu}/transform_check.go (99%) rename internal/{opentf => tofu}/transform_check_starter.go (99%) rename internal/{opentf => tofu}/transform_config.go (99%) rename internal/{opentf => tofu}/transform_config_test.go (99%) rename internal/{opentf => tofu}/transform_destroy_cbd.go (99%) rename internal/{opentf => tofu}/transform_destroy_cbd_test.go (99%) rename internal/{opentf => tofu}/transform_destroy_edge.go (99%) rename internal/{opentf => tofu}/transform_destroy_edge_test.go (99%) rename internal/{opentf => tofu}/transform_diff.go (99%) rename internal/{opentf => tofu}/transform_diff_test.go (99%) rename internal/{opentf => tofu}/transform_expand.go (98%) rename internal/{opentf => tofu}/transform_external_reference.go (97%) rename internal/{opentf => tofu}/transform_import_state_test.go (99%) rename internal/{opentf => tofu}/transform_local.go (98%) rename internal/{opentf => tofu}/transform_module_expansion.go (99%) rename internal/{opentf => tofu}/transform_module_variable.go (99%) rename internal/{opentf => tofu}/transform_module_variable_test.go (99%) rename internal/{opentf => tofu}/transform_orphan_count.go (99%) rename internal/{opentf => tofu}/transform_orphan_count_test.go (99%) rename internal/{opentf => tofu}/transform_orphan_output.go (99%) rename internal/{opentf => tofu}/transform_orphan_resource.go (99%) rename internal/{opentf => tofu}/transform_orphan_resource_test.go (99%) rename internal/{opentf => tofu}/transform_output.go (99%) rename internal/{opentf => tofu}/transform_provider.go (99%) rename internal/{opentf => tofu}/transform_provider_test.go (99%) rename internal/{opentf => tofu}/transform_provisioner.go (95%) rename internal/{opentf => tofu}/transform_reference.go (99%) rename internal/{opentf => tofu}/transform_reference_test.go (99%) rename internal/{opentf => tofu}/transform_removed_modules.go (98%) rename internal/{opentf => tofu}/transform_resource_count.go (98%) rename internal/{opentf => tofu}/transform_root.go (99%) rename internal/{opentf => tofu}/transform_root_test.go (99%) rename internal/{opentf => tofu}/transform_state.go (99%) rename internal/{opentf => tofu}/transform_targets.go (99%) rename internal/{opentf => tofu}/transform_targets_test.go (99%) rename internal/{opentf => tofu}/transform_transitive_reduction.go (97%) rename internal/{opentf => tofu}/transform_transitive_reduction_test.go (99%) rename internal/{opentf => tofu}/transform_variable.go (98%) rename internal/{opentf => tofu}/transform_vertex.go (98%) rename internal/{opentf => tofu}/transform_vertex_test.go (98%) rename internal/{opentf => tofu}/ui_input.go (98%) rename internal/{opentf => tofu}/ui_input_mock.go (97%) rename internal/{opentf => tofu}/ui_input_prefix.go (97%) rename internal/{opentf => tofu}/ui_input_prefix_test.go (97%) rename internal/{opentf => tofu}/ui_output.go (93%) rename internal/{opentf => tofu}/ui_output_callback.go (92%) rename internal/{opentf => tofu}/ui_output_callback_test.go (92%) rename internal/{opentf => tofu}/ui_output_mock.go (96%) rename internal/{opentf => tofu}/ui_output_mock_test.go (91%) rename internal/{opentf => tofu}/ui_output_provisioner.go (97%) rename internal/{opentf => tofu}/ui_output_provisioner_test.go (98%) rename internal/{opentf => tofu}/update_state_hook.go (97%) rename internal/{opentf => tofu}/update_state_hook_test.go (98%) rename internal/{opentf => tofu}/upgrade_resource_state.go (99%) rename internal/{opentf => tofu}/upgrade_resource_state_test.go (99%) rename internal/{opentf => tofu}/util.go (99%) rename internal/{opentf => tofu}/util_test.go (99%) rename internal/{opentf => tofu}/validate_selfref.go (99%) rename internal/{opentf => tofu}/validate_selfref_test.go (99%) rename internal/{opentf => tofu}/valuesourcetype_string.go (99%) rename internal/{opentf => tofu}/variables.go (99%) rename internal/{opentf => tofu}/variables_test.go (99%) rename internal/{opentf => tofu}/version_required.go (98%) rename internal/{opentf => tofu}/walkoperation_string.go (98%) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 8ec85d2f4d..5789c54498 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -96,7 +96,7 @@ jobs: # it for select packages. - name: "Race detector" run: | - go test -race ./internal/opentf ./internal/command ./internal/states + go test -race ./internal/tofu ./internal/command ./internal/states e2e-tests: # This is an intentionally-limited form of our E2E test run which only diff --git a/internal/backend/backend.go b/internal/backend/backend.go index 94ca716995..3e2b9d92d3 100644 --- a/internal/backend/backend.go +++ b/internal/backend/backend.go @@ -22,12 +22,12 @@ import ( "github.com/opentofu/opentofu/internal/configs/configload" "github.com/opentofu/opentofu/internal/configs/configschema" "github.com/opentofu/opentofu/internal/depsfile" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/plans/planfile" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/states/statemgr" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" "github.com/zclconf/go-cty/cty" ) @@ -173,7 +173,7 @@ type Local interface { // calculate from an Operation object, which we can then use for local // operations. // -// The operation methods on opentf.Context (Plan, Apply, Import, etc) each +// The operation methods on tofu.Context (Plan, Apply, Import, etc) each // generate new artifacts which supersede parts of the LocalRun object that // started the operation, so callers should be careful to use those subsequent // artifacts instead of the fields of LocalRun where appropriate. The LocalRun @@ -189,7 +189,7 @@ type Local interface { type LocalRun struct { // Core is an already-initialized OpenTF Core context, ready to be // used to run operations such as Plan and Apply. - Core *opentf.Context + Core *tofu.Context // Config is the configuration we're working with, which typically comes // from either config files directly on local disk (when we're creating @@ -207,7 +207,7 @@ type LocalRun struct { // // This is nil when we're applying a saved plan, because the plan itself // contains enough information about its options to apply it. - PlanOpts *opentf.PlanOpts + PlanOpts *tofu.PlanOpts // Plan is a plan loaded from a saved plan file, if our operation is to // apply that saved plan. @@ -265,7 +265,7 @@ type Operation struct { // Hooks can be used to perform actions triggered by various events during // the operation's lifecycle. - Hooks []opentf.Hook + Hooks []tofu.Hook // Plan is a plan that was passed as an argument. This is valid for // plan and apply arguments but may not work for all backends. @@ -293,8 +293,8 @@ type Operation struct { View views.Operation // Input/output/control options. - UIIn opentf.UIInput - UIOut opentf.UIOutput + UIIn tofu.UIInput + UIOut tofu.UIOutput // StateLocker is used to lock the state while providing UI feedback to the // user. This will be replaced by the Backend to update the context. diff --git a/internal/backend/cli.go b/internal/backend/cli.go index 7c808297aa..1bb4be76c9 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/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/terminal" + "github.com/opentofu/opentofu/internal/tofu" ) // CLI is an optional interface that can be implemented to be initialized @@ -73,7 +73,7 @@ type CLIOpts struct { // ContextOpts are the base context options to set when initializing a // OpenTF context. Many of these will be overridden or merged by // Operation. See Operation for more details. - ContextOpts *opentf.ContextOpts + ContextOpts *tofu.ContextOpts // Input will ask for necessary input prior to performing any operations. // diff --git a/internal/backend/local/backend.go b/internal/backend/local/backend.go index 8620a1174e..479df7e0ca 100644 --- a/internal/backend/local/backend.go +++ b/internal/backend/local/backend.go @@ -17,9 +17,9 @@ import ( "github.com/opentofu/opentofu/internal/command/views" "github.com/opentofu/opentofu/internal/configs/configschema" "github.com/opentofu/opentofu/internal/logging" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/states/statemgr" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" "github.com/zclconf/go-cty/cty" ) @@ -67,7 +67,7 @@ type Local struct { // OpenTF context. Many of these will be overridden or merged by // Operation. See Operation for more details. - ContextOpts *opentf.ContextOpts + ContextOpts *tofu.ContextOpts // OpInput will ask for necessary input prior to performing any operations. // @@ -269,7 +269,7 @@ func (b *Local) StateMgr(name string) (statemgr.Full, error) { // Operation implements backend.Enhanced // -// This will initialize an in-memory opentf.Context to perform the +// This will initialize an in-memory tofu.Context to perform the // operation within this process. // // The given operation parameter will be merged with the ContextOpts on @@ -339,7 +339,7 @@ func (b *Local) opWait( doneCh <-chan struct{}, stopCtx context.Context, cancelCtx context.Context, - tfCtx *opentf.Context, + tfCtx *tofu.Context, opStateMgr statemgr.Persister, view views.Operation) (canceled bool) { // Wait for the operation to finish or for us to be interrupted so diff --git a/internal/backend/local/backend_apply.go b/internal/backend/local/backend_apply.go index 9ca860e9ee..d5a0062ac2 100644 --- a/internal/backend/local/backend_apply.go +++ b/internal/backend/local/backend_apply.go @@ -14,12 +14,12 @@ import ( "github.com/opentofu/opentofu/internal/backend" "github.com/opentofu/opentofu/internal/command/views" "github.com/opentofu/opentofu/internal/logging" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/states/statefile" "github.com/opentofu/opentofu/internal/states/statemgr" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) // test hook called between plan+apply during opApply @@ -163,7 +163,7 @@ func (b *Local) opApply( diags = nil // reset so we won't show the same diagnostics again later } - v, err := op.UIIn.Input(stopCtx, &opentf.InputOpts{ + v, err := op.UIIn.Input(stopCtx, &tofu.InputOpts{ Id: "approve", Query: "\n" + query, Description: desc, diff --git a/internal/backend/local/backend_local.go b/internal/backend/local/backend_local.go index 86f20bfea4..8f29046485 100644 --- a/internal/backend/local/backend_local.go +++ b/internal/backend/local/backend_local.go @@ -13,10 +13,10 @@ import ( "github.com/opentofu/opentofu/internal/backend" "github.com/opentofu/opentofu/internal/configs" "github.com/opentofu/opentofu/internal/configs/configload" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans/planfile" "github.com/opentofu/opentofu/internal/states/statemgr" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" "github.com/zclconf/go-cty/cty" ) @@ -68,7 +68,7 @@ func (b *Local) localRun(op *backend.Operation) (*backend.LocalRun, *configload. ret := &backend.LocalRun{} // Initialize our context options - var coreOpts opentf.ContextOpts + var coreOpts tofu.ContextOpts if v := b.ContextOpts; v != nil { coreOpts = *v } @@ -115,7 +115,7 @@ func (b *Local) localRun(op *backend.Operation) (*backend.LocalRun, *configload. if op.Type != backend.OperationTypeInvalid { // If input asking is enabled, then do that if op.PlanFile == nil && b.OpInput { - mode := opentf.InputModeProvider + mode := tofu.InputModeProvider log.Printf("[TRACE] backend/local: requesting interactive input, if necessary") inputDiags := ret.Core.Input(ret.Config, mode) @@ -136,7 +136,7 @@ func (b *Local) localRun(op *backend.Operation) (*backend.LocalRun, *configload. return ret, configSnap, s, diags } -func (b *Local) localRunDirect(op *backend.Operation, run *backend.LocalRun, coreOpts *opentf.ContextOpts, s statemgr.Full) (*backend.LocalRun, *configload.Snapshot, tfdiags.Diagnostics) { +func (b *Local) localRunDirect(op *backend.Operation, run *backend.LocalRun, coreOpts *tofu.ContextOpts, s statemgr.Full) (*backend.LocalRun, *configload.Snapshot, tfdiags.Diagnostics) { var diags tfdiags.Diagnostics // Load the configuration using the caller-provided configuration loader. @@ -194,7 +194,7 @@ func (b *Local) localRunDirect(op *backend.Operation, run *backend.LocalRun, cor return nil, nil, diags } - planOpts := &opentf.PlanOpts{ + planOpts := &tofu.PlanOpts{ Mode: op.PlanMode, Targets: op.Targets, ForceReplace: op.ForceReplace, @@ -208,7 +208,7 @@ func (b *Local) localRunDirect(op *backend.Operation, run *backend.LocalRun, cor // snapshot, from the previous run. run.InputState = s.State() - tfCtx, moreDiags := opentf.NewContext(coreOpts) + tfCtx, moreDiags := tofu.NewContext(coreOpts) diags = diags.Append(moreDiags) if moreDiags.HasErrors() { return nil, nil, diags @@ -217,7 +217,7 @@ func (b *Local) localRunDirect(op *backend.Operation, run *backend.LocalRun, cor return run, configSnap, diags } -func (b *Local) localRunForPlanFile(op *backend.Operation, pf *planfile.Reader, run *backend.LocalRun, coreOpts *opentf.ContextOpts, currentStateMeta *statemgr.SnapshotMeta) (*backend.LocalRun, *configload.Snapshot, tfdiags.Diagnostics) { +func (b *Local) localRunForPlanFile(op *backend.Operation, pf *planfile.Reader, run *backend.LocalRun, coreOpts *tofu.ContextOpts, currentStateMeta *statemgr.SnapshotMeta) (*backend.LocalRun, *configload.Snapshot, tfdiags.Diagnostics) { var diags tfdiags.Diagnostics const errSummary = "Invalid plan file" @@ -342,7 +342,7 @@ func (b *Local) localRunForPlanFile(op *backend.Operation, pf *planfile.Reader, // we need to apply the plan. run.Plan = plan - tfCtx, moreDiags := opentf.NewContext(coreOpts) + tfCtx, moreDiags := tofu.NewContext(coreOpts) diags = diags.Append(moreDiags) if moreDiags.HasErrors() { return nil, nil, diags @@ -371,7 +371,7 @@ func (b *Local) localRunForPlanFile(op *backend.Operation, pf *planfile.Reader, // messages that variables are not set rather than reporting that input failed: // the primary resolution to missing variables is to provide them by some other // means. -func (b *Local) interactiveCollectVariables(ctx context.Context, existing map[string]backend.UnparsedVariableValue, vcs map[string]*configs.Variable, uiInput opentf.UIInput) map[string]backend.UnparsedVariableValue { +func (b *Local) interactiveCollectVariables(ctx context.Context, existing map[string]backend.UnparsedVariableValue, vcs map[string]*configs.Variable, uiInput tofu.UIInput) map[string]backend.UnparsedVariableValue { var needed []string if b.OpInput && uiInput != nil { for name, vc := range vcs { @@ -400,7 +400,7 @@ func (b *Local) interactiveCollectVariables(ctx context.Context, existing map[st } for _, name := range needed { vc := vcs[name] - rawValue, err := uiInput.Input(ctx, &opentf.InputOpts{ + rawValue, err := uiInput.Input(ctx, &tofu.InputOpts{ Id: fmt.Sprintf("var.%s", name), Query: fmt.Sprintf("var.%s", name), Description: vc.Description, @@ -478,16 +478,16 @@ type unparsedInteractiveVariableValue struct { var _ backend.UnparsedVariableValue = unparsedInteractiveVariableValue{} -func (v unparsedInteractiveVariableValue) ParseVariableValue(mode configs.VariableParsingMode) (*opentf.InputValue, tfdiags.Diagnostics) { +func (v unparsedInteractiveVariableValue) ParseVariableValue(mode configs.VariableParsingMode) (*tofu.InputValue, tfdiags.Diagnostics) { var diags tfdiags.Diagnostics val, valDiags := mode.Parse(v.Name, v.RawValue) diags = diags.Append(valDiags) if diags.HasErrors() { return nil, diags } - return &opentf.InputValue{ + return &tofu.InputValue{ Value: val, - SourceType: opentf.ValueFromInput, + SourceType: tofu.ValueFromInput, }, diags } @@ -498,9 +498,9 @@ type unparsedUnknownVariableValue struct { var _ backend.UnparsedVariableValue = unparsedUnknownVariableValue{} -func (v unparsedUnknownVariableValue) ParseVariableValue(mode configs.VariableParsingMode) (*opentf.InputValue, tfdiags.Diagnostics) { - return &opentf.InputValue{ +func (v unparsedUnknownVariableValue) ParseVariableValue(mode configs.VariableParsingMode) (*tofu.InputValue, tfdiags.Diagnostics) { + return &tofu.InputValue{ Value: cty.UnknownVal(v.WantType), - SourceType: opentf.ValueFromInput, + SourceType: tofu.ValueFromInput, }, nil } diff --git a/internal/backend/local/backend_local_test.go b/internal/backend/local/backend_local_test.go index 0f16d38447..fa19afd003 100644 --- a/internal/backend/local/backend_local_test.go +++ b/internal/backend/local/backend_local_test.go @@ -18,7 +18,6 @@ import ( "github.com/opentofu/opentofu/internal/configs/configload" "github.com/opentofu/opentofu/internal/configs/configschema" "github.com/opentofu/opentofu/internal/initwd" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/plans/planfile" "github.com/opentofu/opentofu/internal/states" @@ -26,6 +25,7 @@ import ( "github.com/opentofu/opentofu/internal/states/statemgr" "github.com/opentofu/opentofu/internal/terminal" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) func TestLocalRun(t *testing.T) { @@ -272,6 +272,6 @@ func (s *stateStorageThatFailsRefresh) RefreshState() error { return fmt.Errorf("intentionally failing for testing purposes") } -func (s *stateStorageThatFailsRefresh) PersistState(schemas *opentf.Schemas) error { +func (s *stateStorageThatFailsRefresh) PersistState(schemas *tofu.Schemas) error { return fmt.Errorf("unimplemented") } diff --git a/internal/backend/local/backend_plan.go b/internal/backend/local/backend_plan.go index 4911f76620..c6e78e2d9a 100644 --- a/internal/backend/local/backend_plan.go +++ b/internal/backend/local/backend_plan.go @@ -12,12 +12,12 @@ import ( "github.com/opentofu/opentofu/internal/backend" "github.com/opentofu/opentofu/internal/genconfig" "github.com/opentofu/opentofu/internal/logging" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/plans/planfile" "github.com/opentofu/opentofu/internal/states/statefile" "github.com/opentofu/opentofu/internal/states/statemgr" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) func (b *Local) opPlan( @@ -73,7 +73,7 @@ func (b *Local) opPlan( } if b.ContextOpts == nil { - b.ContextOpts = new(opentf.ContextOpts) + b.ContextOpts = new(tofu.ContextOpts) } // Get our context diff --git a/internal/backend/local/backend_plan_test.go b/internal/backend/local/backend_plan_test.go index 713d20f6f7..8a4c525ab9 100644 --- a/internal/backend/local/backend_plan_test.go +++ b/internal/backend/local/backend_plan_test.go @@ -20,12 +20,12 @@ import ( "github.com/opentofu/opentofu/internal/configs/configschema" "github.com/opentofu/opentofu/internal/depsfile" "github.com/opentofu/opentofu/internal/initwd" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/plans/planfile" "github.com/opentofu/opentofu/internal/providers" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/terminal" + "github.com/opentofu/opentofu/internal/tofu" ) func TestLocal_planBasic(t *testing.T) { @@ -133,7 +133,7 @@ func TestLocal_plan_context_error(t *testing.T) { // to test that we properly unlock the state if terraform.NewContext // returns an error. if b.ContextOpts == nil { - b.ContextOpts = &opentf.ContextOpts{} + b.ContextOpts = &tofu.ContextOpts{} } b.ContextOpts.Parallelism = -1 diff --git a/internal/backend/local/backend_refresh_test.go b/internal/backend/local/backend_refresh_test.go index 3c1ebeb5c6..d48129c9fd 100644 --- a/internal/backend/local/backend_refresh_test.go +++ b/internal/backend/local/backend_refresh_test.go @@ -17,10 +17,10 @@ import ( "github.com/opentofu/opentofu/internal/configs/configschema" "github.com/opentofu/opentofu/internal/depsfile" "github.com/opentofu/opentofu/internal/initwd" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/providers" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/terminal" + "github.com/opentofu/opentofu/internal/tofu" "github.com/zclconf/go-cty/cty" ) @@ -102,7 +102,7 @@ func TestLocal_refreshInput(t *testing.T) { // Enable input asking since it is normally disabled by default b.OpInput = true - b.ContextOpts.UIInput = &opentf.MockUIInput{InputReturnString: "bar"} + b.ContextOpts.UIInput = &tofu.MockUIInput{InputReturnString: "bar"} op, configCleanup, done := testOperationRefresh(t, "./testdata/refresh-var-unset") defer configCleanup() diff --git a/internal/backend/local/hook_state.go b/internal/backend/local/hook_state.go index fef5564479..3e43f2d718 100644 --- a/internal/backend/local/hook_state.go +++ b/internal/backend/local/hook_state.go @@ -8,15 +8,15 @@ import ( "sync" "time" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/states/statemgr" + "github.com/opentofu/opentofu/internal/tofu" ) // StateHook is a hook that continuously updates the state by calling // WriteState on a statemgr.Full. type StateHook struct { - opentf.NilHook + tofu.NilHook sync.Mutex StateMgr statemgr.Writer @@ -31,7 +31,7 @@ type StateHook struct { // Schemas are the schemas to use when persisting state due to // PersistInterval. This is ignored if PersistInterval is zero, // and PersistInterval is ignored if this is nil. - Schemas *opentf.Schemas + Schemas *tofu.Schemas intermediatePersist IntermediateStatePersistInfo } @@ -59,9 +59,9 @@ type IntermediateStatePersistInfo struct { ForcePersist bool } -var _ opentf.Hook = (*StateHook)(nil) +var _ tofu.Hook = (*StateHook)(nil) -func (h *StateHook) PostStateUpdate(new *states.State) (opentf.HookAction, error) { +func (h *StateHook) PostStateUpdate(new *states.State) (tofu.HookAction, error) { h.Lock() defer h.Unlock() @@ -75,13 +75,13 @@ func (h *StateHook) PostStateUpdate(new *states.State) (opentf.HookAction, error if h.StateMgr != nil { if err := h.StateMgr.WriteState(new); err != nil { - return opentf.HookActionHalt, err + return tofu.HookActionHalt, err } if mgrPersist, ok := h.StateMgr.(statemgr.Persister); ok && h.PersistInterval != 0 && h.Schemas != nil { if h.shouldPersist() { err := mgrPersist.PersistState(h.Schemas) if err != nil { - return opentf.HookActionHalt, err + return tofu.HookActionHalt, err } h.intermediatePersist.LastPersist = time.Now() } else { @@ -90,7 +90,7 @@ func (h *StateHook) PostStateUpdate(new *states.State) (opentf.HookAction, error } } - return opentf.HookActionContinue, nil + return tofu.HookActionContinue, nil } func (h *StateHook) Stopping() { diff --git a/internal/backend/local/hook_state_test.go b/internal/backend/local/hook_state_test.go index 67b3b03fca..c12944833b 100644 --- a/internal/backend/local/hook_state_test.go +++ b/internal/backend/local/hook_state_test.go @@ -9,25 +9,25 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/states/statemgr" + "github.com/opentofu/opentofu/internal/tofu" ) func TestStateHook_impl(t *testing.T) { - var _ opentf.Hook = new(StateHook) + var _ tofu.Hook = new(StateHook) } func TestStateHook(t *testing.T) { is := statemgr.NewTransientInMemory(nil) - var hook opentf.Hook = &StateHook{StateMgr: is} + var hook tofu.Hook = &StateHook{StateMgr: is} s := statemgr.TestFullInitialState() action, err := hook.PostStateUpdate(s) if err != nil { t.Fatalf("err: %s", err) } - if action != opentf.HookActionContinue { + if action != tofu.HookActionContinue { t.Fatalf("bad: %v", action) } if !is.State().Equal(s) { @@ -39,7 +39,7 @@ func TestStateHookStopping(t *testing.T) { is := &testPersistentState{} hook := &StateHook{ StateMgr: is, - Schemas: &opentf.Schemas{}, + Schemas: &tofu.Schemas{}, PersistInterval: 4 * time.Hour, intermediatePersist: IntermediateStatePersistInfo{ LastPersist: time.Now(), @@ -51,7 +51,7 @@ func TestStateHookStopping(t *testing.T) { if err != nil { t.Fatalf("unexpected error from PostStateUpdate: %s", err) } - if got, want := action, opentf.HookActionContinue; got != want { + if got, want := action, tofu.HookActionContinue; got != want { t.Fatalf("wrong hookaction %#v; want %#v", got, want) } if is.Written == nil || !is.Written.Equal(s) { @@ -138,7 +138,7 @@ func TestStateHookCustomPersistRule(t *testing.T) { is := &testPersistentStateThatRefusesToPersist{} hook := &StateHook{ StateMgr: is, - Schemas: &opentf.Schemas{}, + Schemas: &tofu.Schemas{}, PersistInterval: 4 * time.Hour, intermediatePersist: IntermediateStatePersistInfo{ LastPersist: time.Now(), @@ -150,7 +150,7 @@ func TestStateHookCustomPersistRule(t *testing.T) { if err != nil { t.Fatalf("unexpected error from PostStateUpdate: %s", err) } - if got, want := action, opentf.HookActionContinue; got != want { + if got, want := action, tofu.HookActionContinue; got != want { t.Fatalf("wrong hookaction %#v; want %#v", got, want) } if is.Written == nil || !is.Written.Equal(s) { @@ -255,7 +255,7 @@ func (sm *testPersistentState) WriteState(state *states.State) error { return nil } -func (sm *testPersistentState) PersistState(schemas *opentf.Schemas) error { +func (sm *testPersistentState) PersistState(schemas *tofu.Schemas) error { if schemas == nil { return fmt.Errorf("no schemas") } @@ -281,7 +281,7 @@ func (sm *testPersistentStateThatRefusesToPersist) WriteState(state *states.Stat return nil } -func (sm *testPersistentStateThatRefusesToPersist) PersistState(schemas *opentf.Schemas) error { +func (sm *testPersistentStateThatRefusesToPersist) PersistState(schemas *tofu.Schemas) error { if schemas == nil { return fmt.Errorf("no schemas") } diff --git a/internal/backend/local/testing.go b/internal/backend/local/testing.go index c2c5a53288..f697f8d969 100644 --- a/internal/backend/local/testing.go +++ b/internal/backend/local/testing.go @@ -12,10 +12,10 @@ import ( "github.com/opentofu/opentofu/internal/addrs" "github.com/opentofu/opentofu/internal/backend" "github.com/opentofu/opentofu/internal/configs/configschema" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/providers" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/states/statemgr" + "github.com/opentofu/opentofu/internal/tofu" ) // TestLocal returns a configured Local struct with temporary paths and @@ -35,16 +35,16 @@ func TestLocal(t *testing.T) *Local { local.StateOutPath = filepath.Join(tempDir, "state.tfstate") local.StateBackupPath = filepath.Join(tempDir, "state.tfstate.bak") local.StateWorkspaceDir = filepath.Join(tempDir, "state.tfstate.d") - local.ContextOpts = &opentf.ContextOpts{} + local.ContextOpts = &tofu.ContextOpts{} return local } // TestLocalProvider modifies the ContextOpts of the *Local parameter to // have a provider with the given name. -func TestLocalProvider(t *testing.T, b *Local, name string, schema providers.ProviderSchema) *opentf.MockProvider { +func TestLocalProvider(t *testing.T, b *Local, name string, schema providers.ProviderSchema) *tofu.MockProvider { // Build a mock resource provider for in-memory operations - p := new(opentf.MockProvider) + p := new(tofu.MockProvider) p.GetProviderSchemaResponse = &schema @@ -89,7 +89,7 @@ func TestLocalProvider(t *testing.T, b *Local, name string, schema providers.Pro // Initialize the opts if b.ContextOpts == nil { - b.ContextOpts = &opentf.ContextOpts{} + b.ContextOpts = &tofu.ContextOpts{} } // Set up our provider diff --git a/internal/backend/remote/backend.go b/internal/backend/remote/backend.go index 14f6c7c8cb..a7aa3a00c9 100644 --- a/internal/backend/remote/backend.go +++ b/internal/backend/remote/backend.go @@ -24,10 +24,10 @@ import ( "github.com/opentofu/opentofu/internal/backend" "github.com/opentofu/opentofu/internal/configs/configschema" "github.com/opentofu/opentofu/internal/logging" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/states/remote" "github.com/opentofu/opentofu/internal/states/statemgr" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" tfversion "github.com/opentofu/opentofu/version" "github.com/zclconf/go-cty/cty" @@ -52,7 +52,7 @@ type Remote struct { // ContextOpts are the base context options to set when initializing a // new OpenTF context. Many of these will be overridden or merged by // Operation. See Operation for more details. - ContextOpts *opentf.ContextOpts + ContextOpts *tofu.ContextOpts // client is the remote backend API client. client *tfe.Client @@ -870,7 +870,7 @@ func (b *Remote) cancel(cancelCtx context.Context, op *backend.Operation, r *tfe // Only ask if the remote operation should be canceled // if the auto approve flag is not set. if !op.AutoApprove { - v, err := op.UIIn.Input(cancelCtx, &opentf.InputOpts{ + v, err := op.UIIn.Input(cancelCtx, &tofu.InputOpts{ Id: "cancel", Query: "\nDo you want to cancel the remote operation?", Description: "Only 'yes' will be accepted to cancel.", diff --git a/internal/backend/remote/backend_apply.go b/internal/backend/remote/backend_apply.go index 1777ca111a..7ca6600865 100644 --- a/internal/backend/remote/backend_apply.go +++ b/internal/backend/remote/backend_apply.go @@ -13,9 +13,9 @@ import ( tfe "github.com/hashicorp/go-tfe" version "github.com/hashicorp/go-version" "github.com/opentofu/opentofu/internal/backend" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) func (b *Remote) opApply(stopCtx, cancelCtx context.Context, op *backend.Operation, w *tfe.Workspace) (*tfe.Run, error) { @@ -220,7 +220,7 @@ func (b *Remote) opApply(stopCtx, cancelCtx context.Context, op *backend.Operati if !w.AutoApply { if mustConfirm { - opts := &opentf.InputOpts{Id: "approve"} + opts := &tofu.InputOpts{Id: "approve"} if op.PlanMode == plans.DestroyMode { opts.Query = "\nDo you really want to destroy all resources in workspace \"" + op.Workspace + "\"?" diff --git a/internal/backend/remote/backend_apply_test.go b/internal/backend/remote/backend_apply_test.go index e1aaea443d..6f396543c2 100644 --- a/internal/backend/remote/backend_apply_test.go +++ b/internal/backend/remote/backend_apply_test.go @@ -25,11 +25,11 @@ import ( "github.com/opentofu/opentofu/internal/command/views" "github.com/opentofu/opentofu/internal/depsfile" "github.com/opentofu/opentofu/internal/initwd" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/plans/planfile" "github.com/opentofu/opentofu/internal/states/statemgr" "github.com/opentofu/opentofu/internal/terminal" + "github.com/opentofu/opentofu/internal/tofu" tfversion "github.com/opentofu/opentofu/version" ) @@ -235,7 +235,7 @@ func TestRemote_applyWithParallelism(t *testing.T) { defer configCleanup() if b.ContextOpts == nil { - b.ContextOpts = &opentf.ContextOpts{} + b.ContextOpts = &tofu.ContextOpts{} } b.ContextOpts.Parallelism = 3 op.Workspace = backend.DefaultStateName @@ -580,7 +580,7 @@ func TestRemote_applyWithVariables(t *testing.T) { op, configCleanup, done := testOperationApply(t, "./testdata/apply-variables") defer configCleanup() - op.Variables = testVariables(opentf.ValueFromNamedFile, "foo", "bar") + op.Variables = testVariables(tofu.ValueFromNamedFile, "foo", "bar") op.Workspace = backend.DefaultStateName run, err := b.Operation(context.Background(), op) diff --git a/internal/backend/remote/backend_common.go b/internal/backend/remote/backend_common.go index 630980cd1a..2bd01af765 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/opentofu/opentofu/internal/backend" "github.com/opentofu/opentofu/internal/logging" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" + "github.com/opentofu/opentofu/internal/tofu" ) var ( @@ -242,7 +242,7 @@ func (b *Remote) hasExplicitVariableValues(op *backend.Operation) bool { // their final values will come from the _remote_ execution context. for _, v := range variables { switch v.SourceType { - case opentf.ValueFromCLIArg, opentf.ValueFromNamedFile: + case tofu.ValueFromCLIArg, tofu.ValueFromNamedFile: return true } } @@ -431,7 +431,7 @@ func (b *Remote) checkPolicy(stopCtx, cancelCtx context.Context, op *backend.Ope return generalError(fmt.Sprintf("Failed to override policy check.\n%s", runUrl), err) } } else { - opts := &opentf.InputOpts{ + opts := &tofu.InputOpts{ Id: "override", Query: "\nDo you want to override the soft failed policy check?", Description: "Only 'override' will be accepted to override.", @@ -461,7 +461,7 @@ func (b *Remote) checkPolicy(stopCtx, cancelCtx context.Context, op *backend.Ope return nil } -func (b *Remote) confirm(stopCtx context.Context, op *backend.Operation, opts *opentf.InputOpts, r *tfe.Run, keyword string) error { +func (b *Remote) confirm(stopCtx context.Context, op *backend.Operation, opts *tofu.InputOpts, r *tfe.Run, keyword string) error { doneCtx, cancel := context.WithCancel(stopCtx) result := make(chan error, 2) diff --git a/internal/backend/remote/backend_context.go b/internal/backend/remote/backend_context.go index 550e83a860..f67e8c0054 100644 --- a/internal/backend/remote/backend_context.go +++ b/internal/backend/remote/backend_context.go @@ -14,9 +14,9 @@ import ( "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/opentofu/opentofu/internal/backend" "github.com/opentofu/opentofu/internal/configs" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/states/statemgr" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" "github.com/zclconf/go-cty/cty" ) @@ -24,7 +24,7 @@ import ( func (b *Remote) LocalRun(op *backend.Operation) (*backend.LocalRun, statemgr.Full, tfdiags.Diagnostics) { var diags tfdiags.Diagnostics ret := &backend.LocalRun{ - PlanOpts: &opentf.PlanOpts{ + PlanOpts: &tofu.PlanOpts{ Mode: op.PlanMode, Targets: op.Targets, }, @@ -63,7 +63,7 @@ func (b *Remote) LocalRun(op *backend.Operation) (*backend.LocalRun, statemgr.Fu } // Initialize our context options - var opts opentf.ContextOpts + var opts tofu.ContextOpts if v := b.ContextOpts; v != nil { opts = *v } @@ -142,7 +142,7 @@ func (b *Remote) LocalRun(op *backend.Operation) (*backend.LocalRun, statemgr.Fu } } - tfCtx, ctxDiags := opentf.NewContext(&opts) + tfCtx, ctxDiags := tofu.NewContext(&opts) diags = diags.Append(ctxDiags) ret.Core = tfCtx @@ -186,24 +186,24 @@ func (b *Remote) getRemoteWorkspaceID(ctx context.Context, localWorkspaceName st return remoteWorkspace.ID, nil } -func stubAllVariables(vv map[string]backend.UnparsedVariableValue, decls map[string]*configs.Variable) opentf.InputValues { - ret := make(opentf.InputValues, len(decls)) +func stubAllVariables(vv map[string]backend.UnparsedVariableValue, decls map[string]*configs.Variable) tofu.InputValues { + ret := make(tofu.InputValues, len(decls)) for name, cfg := range decls { raw, exists := vv[name] if !exists { - ret[name] = &opentf.InputValue{ + ret[name] = &tofu.InputValue{ Value: cty.UnknownVal(cfg.Type), - SourceType: opentf.ValueFromConfig, + SourceType: tofu.ValueFromConfig, } continue } val, diags := raw.ParseVariableValue(cfg.ParsingMode) if diags.HasErrors() { - ret[name] = &opentf.InputValue{ + ret[name] = &tofu.InputValue{ Value: cty.UnknownVal(cfg.Type), - SourceType: opentf.ValueFromConfig, + SourceType: tofu.ValueFromConfig, } continue } @@ -222,7 +222,7 @@ type remoteStoredVariableValue struct { var _ backend.UnparsedVariableValue = (*remoteStoredVariableValue)(nil) -func (v *remoteStoredVariableValue) ParseVariableValue(mode configs.VariableParsingMode) (*opentf.InputValue, tfdiags.Diagnostics) { +func (v *remoteStoredVariableValue) ParseVariableValue(mode configs.VariableParsingMode) (*tofu.InputValue, tfdiags.Diagnostics) { var diags tfdiags.Diagnostics var val cty.Value @@ -285,7 +285,7 @@ func (v *remoteStoredVariableValue) ParseVariableValue(mode configs.VariablePars val = cty.StringVal(v.definition.Value) } - return &opentf.InputValue{ + return &tofu.InputValue{ Value: val, // We mark these as "from input" with the rationale that entering @@ -293,6 +293,6 @@ func (v *remoteStoredVariableValue) ParseVariableValue(mode configs.VariablePars // roughly speaking, a similar idea to entering variable values at // the interactive CLI prompts. It's not a perfect correspondance, // but it's closer than the other options. - SourceType: opentf.ValueFromInput, + SourceType: tofu.ValueFromInput, }, diags } diff --git a/internal/backend/remote/backend_context_test.go b/internal/backend/remote/backend_context_test.go index 9a1d9d5c30..c276beef8d 100644 --- a/internal/backend/remote/backend_context_test.go +++ b/internal/backend/remote/backend_context_test.go @@ -8,8 +8,8 @@ import ( "reflect" "testing" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" tfe "github.com/hashicorp/go-tfe" "github.com/zclconf/go-cty/cty" @@ -256,7 +256,7 @@ func TestRemoteVariablesDoNotOverride(t *testing.T) { tests := map[string]struct { localVariables map[string]backend.UnparsedVariableValue remoteVariables []*tfe.VariableCreateOptions - expectedVariables opentf.InputValues + expectedVariables tofu.InputValues }{ "no local variables": { map[string]backend.UnparsedVariableValue{}, @@ -277,28 +277,28 @@ func TestRemoteVariablesDoNotOverride(t *testing.T) { Category: &catTerraform, }, }, - opentf.InputValues{ - varName1: &opentf.InputValue{ + tofu.InputValues{ + varName1: &tofu.InputValue{ Value: cty.StringVal(varValue1), - SourceType: opentf.ValueFromInput, + SourceType: tofu.ValueFromInput, SourceRange: tfdiags.SourceRange{ Filename: "", Start: tfdiags.SourcePos{Line: 0, Column: 0, Byte: 0}, End: tfdiags.SourcePos{Line: 0, Column: 0, Byte: 0}, }, }, - varName2: &opentf.InputValue{ + varName2: &tofu.InputValue{ Value: cty.StringVal(varValue2), - SourceType: opentf.ValueFromInput, + SourceType: tofu.ValueFromInput, SourceRange: tfdiags.SourceRange{ Filename: "", Start: tfdiags.SourcePos{Line: 0, Column: 0, Byte: 0}, End: tfdiags.SourcePos{Line: 0, Column: 0, Byte: 0}, }, }, - varName3: &opentf.InputValue{ + varName3: &tofu.InputValue{ Value: cty.StringVal(varValue3), - SourceType: opentf.ValueFromInput, + SourceType: tofu.ValueFromInput, SourceRange: tfdiags.SourceRange{ Filename: "", Start: tfdiags.SourcePos{Line: 0, Column: 0, Byte: 0}, @@ -326,28 +326,28 @@ func TestRemoteVariablesDoNotOverride(t *testing.T) { Category: &catTerraform, }, }, - opentf.InputValues{ - varName1: &opentf.InputValue{ + tofu.InputValues{ + varName1: &tofu.InputValue{ Value: cty.StringVal(varValue1), - SourceType: opentf.ValueFromInput, + SourceType: tofu.ValueFromInput, SourceRange: tfdiags.SourceRange{ Filename: "", Start: tfdiags.SourcePos{Line: 0, Column: 0, Byte: 0}, End: tfdiags.SourcePos{Line: 0, Column: 0, Byte: 0}, }, }, - varName2: &opentf.InputValue{ + varName2: &tofu.InputValue{ Value: cty.StringVal(varValue2), - SourceType: opentf.ValueFromInput, + SourceType: tofu.ValueFromInput, SourceRange: tfdiags.SourceRange{ Filename: "", Start: tfdiags.SourcePos{Line: 0, Column: 0, Byte: 0}, End: tfdiags.SourcePos{Line: 0, Column: 0, Byte: 0}, }, }, - varName3: &opentf.InputValue{ + varName3: &tofu.InputValue{ Value: cty.StringVal(varValue3), - SourceType: opentf.ValueFromNamedFile, + SourceType: tofu.ValueFromNamedFile, SourceRange: tfdiags.SourceRange{ Filename: "fake.tfvars", Start: tfdiags.SourcePos{Line: 1, Column: 1, Byte: 0}, @@ -371,28 +371,28 @@ func TestRemoteVariablesDoNotOverride(t *testing.T) { Category: &catTerraform, }, }, - opentf.InputValues{ - varName1: &opentf.InputValue{ + tofu.InputValues{ + varName1: &tofu.InputValue{ Value: cty.StringVal(varValue1), - SourceType: opentf.ValueFromInput, + SourceType: tofu.ValueFromInput, SourceRange: tfdiags.SourceRange{ Filename: "", Start: tfdiags.SourcePos{Line: 0, Column: 0, Byte: 0}, End: tfdiags.SourcePos{Line: 0, Column: 0, Byte: 0}, }, }, - varName2: &opentf.InputValue{ + varName2: &tofu.InputValue{ Value: cty.StringVal(varValue2), - SourceType: opentf.ValueFromInput, + SourceType: tofu.ValueFromInput, SourceRange: tfdiags.SourceRange{ Filename: "", Start: tfdiags.SourcePos{Line: 0, Column: 0, Byte: 0}, End: tfdiags.SourcePos{Line: 0, Column: 0, Byte: 0}, }, }, - varName3: &opentf.InputValue{ + varName3: &tofu.InputValue{ Value: cty.StringVal(varValue3), - SourceType: opentf.ValueFromNamedFile, + SourceType: tofu.ValueFromNamedFile, SourceRange: tfdiags.SourceRange{ Filename: "fake.tfvars", Start: tfdiags.SourcePos{Line: 1, Column: 1, Byte: 0}, @@ -461,10 +461,10 @@ func TestRemoteVariablesDoNotOverride(t *testing.T) { type testUnparsedVariableValue string -func (v testUnparsedVariableValue) ParseVariableValue(mode configs.VariableParsingMode) (*opentf.InputValue, tfdiags.Diagnostics) { - return &opentf.InputValue{ +func (v testUnparsedVariableValue) ParseVariableValue(mode configs.VariableParsingMode) (*tofu.InputValue, tfdiags.Diagnostics) { + return &tofu.InputValue{ Value: cty.StringVal(string(v)), - SourceType: opentf.ValueFromNamedFile, + SourceType: tofu.ValueFromNamedFile, SourceRange: tfdiags.SourceRange{ Filename: "fake.tfvars", Start: tfdiags.SourcePos{Line: 1, Column: 1, Byte: 0}, diff --git a/internal/backend/remote/backend_plan_test.go b/internal/backend/remote/backend_plan_test.go index 984c1ce0e2..97db1a1e36 100644 --- a/internal/backend/remote/backend_plan_test.go +++ b/internal/backend/remote/backend_plan_test.go @@ -24,11 +24,11 @@ import ( "github.com/opentofu/opentofu/internal/command/views" "github.com/opentofu/opentofu/internal/depsfile" "github.com/opentofu/opentofu/internal/initwd" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/plans/planfile" "github.com/opentofu/opentofu/internal/states/statemgr" "github.com/opentofu/opentofu/internal/terminal" + "github.com/opentofu/opentofu/internal/tofu" ) func testOperationPlan(t *testing.T, configDir string) (*backend.Operation, func(), func(*testing.T) *terminal.TestOutput) { @@ -210,7 +210,7 @@ func TestRemote_planWithParallelism(t *testing.T) { defer configCleanup() if b.ContextOpts == nil { - b.ContextOpts = &opentf.ContextOpts{} + b.ContextOpts = &tofu.ContextOpts{} } b.ContextOpts.Parallelism = 3 op.Workspace = backend.DefaultStateName @@ -615,7 +615,7 @@ func TestRemote_planWithVariables(t *testing.T) { op, configCleanup, done := testOperationPlan(t, "./testdata/plan-variables") defer configCleanup() - op.Variables = testVariables(opentf.ValueFromCLIArg, "foo", "bar") + op.Variables = testVariables(tofu.ValueFromCLIArg, "foo", "bar") op.Workspace = backend.DefaultStateName run, err := b.Operation(context.Background(), op) diff --git a/internal/backend/remote/testing.go b/internal/backend/remote/testing.go index 608154f920..249ceb7505 100644 --- a/internal/backend/remote/testing.go +++ b/internal/backend/remote/testing.go @@ -23,10 +23,10 @@ import ( "github.com/opentofu/opentofu/internal/configs" "github.com/opentofu/opentofu/internal/configs/configschema" "github.com/opentofu/opentofu/internal/httpclient" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/providers" "github.com/opentofu/opentofu/internal/states/remote" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" "github.com/opentofu/opentofu/version" "github.com/zclconf/go-cty/cty" @@ -49,7 +49,7 @@ type mockInput struct { answers map[string]string } -func (m *mockInput) Input(ctx context.Context, opts *opentf.InputOpts) (string, error) { +func (m *mockInput) Input(ctx context.Context, opts *tofu.InputOpts) (string, error) { v, ok := m.answers[opts.Id] if !ok { return "", fmt.Errorf("unexpected input request in test: %s", opts.Id) @@ -304,18 +304,18 @@ func testDisco(s *httptest.Server) *disco.Disco { type unparsedVariableValue struct { value string - source opentf.ValueSourceType + source tofu.ValueSourceType } -func (v *unparsedVariableValue) ParseVariableValue(mode configs.VariableParsingMode) (*opentf.InputValue, tfdiags.Diagnostics) { - return &opentf.InputValue{ +func (v *unparsedVariableValue) ParseVariableValue(mode configs.VariableParsingMode) (*tofu.InputValue, tfdiags.Diagnostics) { + return &tofu.InputValue{ Value: cty.StringVal(v.value), SourceType: v.source, }, tfdiags.Diagnostics{} } // testVariable returns a backend.UnparsedVariableValue used for testing. -func testVariables(s opentf.ValueSourceType, vs ...string) map[string]backend.UnparsedVariableValue { +func testVariables(s tofu.ValueSourceType, vs ...string) map[string]backend.UnparsedVariableValue { vars := make(map[string]backend.UnparsedVariableValue, len(vs)) for _, v := range vs { vars[v] = &unparsedVariableValue{ diff --git a/internal/backend/unparsed_value.go b/internal/backend/unparsed_value.go index 8ab8686052..7952a74772 100644 --- a/internal/backend/unparsed_value.go +++ b/internal/backend/unparsed_value.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/opentofu/opentofu/internal/configs" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" "github.com/zclconf/go-cty/cty" ) @@ -25,7 +25,7 @@ type UnparsedVariableValue interface { // // If error diagnostics are returned, the resulting value may be invalid // or incomplete. - ParseVariableValue(mode configs.VariableParsingMode) (*opentf.InputValue, tfdiags.Diagnostics) + ParseVariableValue(mode configs.VariableParsingMode) (*tofu.InputValue, tfdiags.Diagnostics) } // ParseUndeclaredVariableValues processes a map of unparsed variable values @@ -34,9 +34,9 @@ type UnparsedVariableValue interface { // variables being present, depending on the source of these values. If more // than two undeclared values are present in file form (config, auto, -var-file) // the remaining errors are summarized to avoid a massive list of errors. -func ParseUndeclaredVariableValues(vv map[string]UnparsedVariableValue, decls map[string]*configs.Variable) (opentf.InputValues, tfdiags.Diagnostics) { +func ParseUndeclaredVariableValues(vv map[string]UnparsedVariableValue, decls map[string]*configs.Variable) (tofu.InputValues, tfdiags.Diagnostics) { var diags tfdiags.Diagnostics - ret := make(opentf.InputValues, len(vv)) + ret := make(tofu.InputValues, len(vv)) seenUndeclaredInFile := 0 for name, rv := range vv { @@ -53,7 +53,7 @@ func ParseUndeclaredVariableValues(vv map[string]UnparsedVariableValue, decls ma ret[name] = val switch val.SourceType { - case opentf.ValueFromConfig, opentf.ValueFromAutoFile, opentf.ValueFromNamedFile: + case tofu.ValueFromConfig, tofu.ValueFromAutoFile, tofu.ValueFromNamedFile: // We allow undeclared names for variable values from files and warn in case // users have forgotten a variable {} declaration or have a typo in their var name. // Some users will actively ignore this warning because they use a .tfvars file @@ -67,12 +67,12 @@ func ParseUndeclaredVariableValues(vv map[string]UnparsedVariableValue, decls ma } seenUndeclaredInFile++ - case opentf.ValueFromEnvVar: + case tofu.ValueFromEnvVar: // We allow and ignore undeclared names for environment // variables, because users will often set these globally // when they are used across many (but not necessarily all) // configurations. - case opentf.ValueFromCLIArg: + case tofu.ValueFromCLIArg: diags = diags.Append(tfdiags.Sourceless( tfdiags.Error, "Value for undeclared variable", @@ -105,9 +105,9 @@ func ParseUndeclaredVariableValues(vv map[string]UnparsedVariableValue, decls ma // and returns an input values map of the ones declared in the specified // variable declaration mapping. Diagnostics will be populating with // any variable parsing errors encountered within this collection. -func ParseDeclaredVariableValues(vv map[string]UnparsedVariableValue, decls map[string]*configs.Variable) (opentf.InputValues, tfdiags.Diagnostics) { +func ParseDeclaredVariableValues(vv map[string]UnparsedVariableValue, decls map[string]*configs.Variable) (tofu.InputValues, tfdiags.Diagnostics) { var diags tfdiags.Diagnostics - ret := make(opentf.InputValues, len(vv)) + ret := make(tofu.InputValues, len(vv)) for name, rv := range vv { var mode configs.VariableParsingMode @@ -132,9 +132,9 @@ func ParseDeclaredVariableValues(vv map[string]UnparsedVariableValue, decls map[ return ret, diags } -// Checks all given opentf.InputValues variable maps for the existance of +// Checks all given tofu.InputValues variable maps for the existance of // a named variable -func isDefinedAny(name string, maps ...opentf.InputValues) bool { +func isDefinedAny(name string, maps ...tofu.InputValues) bool { for _, m := range maps { if _, defined := m[name]; defined { return true @@ -155,11 +155,11 @@ func isDefinedAny(name string, maps ...opentf.InputValues) bool { // // If this function returns without any errors in the diagnostics, the // resulting input values map is guaranteed to be valid and ready to pass -// to opentf.NewContext. If the diagnostics contains errors, the returned +// to tofu.NewContext. If the diagnostics contains errors, the returned // InputValues may be incomplete but will include the subset of variables // that were successfully processed, allowing for careful analysis of the // partial result. -func ParseVariableValues(vv map[string]UnparsedVariableValue, decls map[string]*configs.Variable) (opentf.InputValues, tfdiags.Diagnostics) { +func ParseVariableValues(vv map[string]UnparsedVariableValue, decls map[string]*configs.Variable) (tofu.InputValues, tfdiags.Diagnostics) { ret, diags := ParseDeclaredVariableValues(vv, decls) undeclared, diagsUndeclared := ParseUndeclaredVariableValues(vv, decls) @@ -191,9 +191,9 @@ func ParseVariableValues(vv map[string]UnparsedVariableValue, decls map[string]* // result is complete for any calling code that wants to cautiously // analyze it for diagnostic purposes. Since our diagnostics now // includes an error, normal processing will ignore this result. - ret[name] = &opentf.InputValue{ + ret[name] = &tofu.InputValue{ Value: cty.DynamicVal, - SourceType: opentf.ValueFromConfig, + SourceType: tofu.ValueFromConfig, SourceRange: tfdiags.SourceRangeFromHCL(vc.DeclRange), } } else { @@ -203,9 +203,9 @@ func ParseVariableValues(vv map[string]UnparsedVariableValue, decls map[string]* // that it wasn't set at all at this layer, and so OpenTF Core // should substitute a default if available, or generate an error // if not. - ret[name] = &opentf.InputValue{ + ret[name] = &tofu.InputValue{ Value: cty.NilVal, - SourceType: opentf.ValueFromConfig, + SourceType: tofu.ValueFromConfig, SourceRange: tfdiags.SourceRangeFromHCL(vc.DeclRange), } } diff --git a/internal/backend/unparsed_value_test.go b/internal/backend/unparsed_value_test.go index ec63f428e9..4d15726cdb 100644 --- a/internal/backend/unparsed_value_test.go +++ b/internal/backend/unparsed_value_test.go @@ -12,8 +12,8 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/opentofu/opentofu/internal/configs" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) func TestUnparsedValue(t *testing.T) { @@ -72,10 +72,10 @@ func TestUnparsedValue(t *testing.T) { t.Fatalf("wrong number of diagnostics %d; want %d", got, want) } - wantVals := opentf.InputValues{ + wantVals := tofu.InputValues{ "declared1": { Value: cty.StringVal("5"), - SourceType: opentf.ValueFromNamedFile, + SourceType: tofu.ValueFromNamedFile, SourceRange: tfdiags.SourceRange{ Filename: "fake.tfvars", Start: tfdiags.SourcePos{Line: 1, Column: 1, Byte: 0}, @@ -108,10 +108,10 @@ func TestUnparsedValue(t *testing.T) { t.Errorf("wrong summary for diagnostic 2\ngot: %s\nwant: %s", got, want) } - wantVals := opentf.InputValues{ + wantVals := tofu.InputValues{ "undeclared0": { Value: cty.StringVal("0"), - SourceType: opentf.ValueFromNamedFile, + SourceType: tofu.ValueFromNamedFile, SourceRange: tfdiags.SourceRange{ Filename: "fake.tfvars", Start: tfdiags.SourcePos{Line: 1, Column: 1}, @@ -120,7 +120,7 @@ func TestUnparsedValue(t *testing.T) { }, "undeclared1": { Value: cty.StringVal("1"), - SourceType: opentf.ValueFromNamedFile, + SourceType: tofu.ValueFromNamedFile, SourceRange: tfdiags.SourceRange{ Filename: "fake.tfvars", Start: tfdiags.SourcePos{Line: 1, Column: 1}, @@ -129,7 +129,7 @@ func TestUnparsedValue(t *testing.T) { }, "undeclared2": { Value: cty.StringVal("2"), - SourceType: opentf.ValueFromNamedFile, + SourceType: tofu.ValueFromNamedFile, SourceRange: tfdiags.SourceRange{ Filename: "fake.tfvars", Start: tfdiags.SourcePos{Line: 1, Column: 1}, @@ -138,7 +138,7 @@ func TestUnparsedValue(t *testing.T) { }, "undeclared3": { Value: cty.StringVal("3"), - SourceType: opentf.ValueFromNamedFile, + SourceType: tofu.ValueFromNamedFile, SourceRange: tfdiags.SourceRange{ Filename: "fake.tfvars", Start: tfdiags.SourcePos{Line: 1, Column: 1}, @@ -147,7 +147,7 @@ func TestUnparsedValue(t *testing.T) { }, "undeclared4": { Value: cty.StringVal("4"), - SourceType: opentf.ValueFromNamedFile, + SourceType: tofu.ValueFromNamedFile, SourceRange: tfdiags.SourceRange{ Filename: "fake.tfvars", Start: tfdiags.SourcePos{Line: 1, Column: 1}, @@ -187,10 +187,10 @@ func TestUnparsedValue(t *testing.T) { t.Errorf("wrong summary for diagnostic 3\ngot: %s\nwant: %s", got, want) } - wantVals := opentf.InputValues{ + wantVals := tofu.InputValues{ "declared1": { Value: cty.StringVal("5"), - SourceType: opentf.ValueFromNamedFile, + SourceType: tofu.ValueFromNamedFile, SourceRange: tfdiags.SourceRange{ Filename: "fake.tfvars", Start: tfdiags.SourcePos{Line: 1, Column: 1, Byte: 0}, @@ -199,7 +199,7 @@ func TestUnparsedValue(t *testing.T) { }, "missing1": { Value: cty.DynamicVal, - SourceType: opentf.ValueFromConfig, + SourceType: tofu.ValueFromConfig, SourceRange: tfdiags.SourceRange{ Filename: "fake.tf", Start: tfdiags.SourcePos{Line: 3, Column: 1, Byte: 0}, @@ -208,7 +208,7 @@ func TestUnparsedValue(t *testing.T) { }, "missing2": { Value: cty.NilVal, // OpenTF Core handles substituting the default - SourceType: opentf.ValueFromConfig, + SourceType: tofu.ValueFromConfig, SourceRange: tfdiags.SourceRange{ Filename: "fake.tf", Start: tfdiags.SourcePos{Line: 4, Column: 1, Byte: 0}, @@ -224,10 +224,10 @@ func TestUnparsedValue(t *testing.T) { type testUnparsedVariableValue string -func (v testUnparsedVariableValue) ParseVariableValue(mode configs.VariableParsingMode) (*opentf.InputValue, tfdiags.Diagnostics) { - return &opentf.InputValue{ +func (v testUnparsedVariableValue) ParseVariableValue(mode configs.VariableParsingMode) (*tofu.InputValue, tfdiags.Diagnostics) { + return &tofu.InputValue{ Value: cty.StringVal(string(v)), - SourceType: opentf.ValueFromNamedFile, + SourceType: tofu.ValueFromNamedFile, SourceRange: tfdiags.SourceRange{ Filename: "fake.tfvars", Start: tfdiags.SourcePos{Line: 1, Column: 1, Byte: 0}, diff --git a/internal/cloud/backend.go b/internal/cloud/backend.go index e6155ce70c..37d6459cff 100644 --- a/internal/cloud/backend.go +++ b/internal/cloud/backend.go @@ -28,10 +28,10 @@ import ( "github.com/opentofu/opentofu/internal/backend" "github.com/opentofu/opentofu/internal/command/jsonformat" "github.com/opentofu/opentofu/internal/configs/configschema" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/states/statemgr" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" tfversion "github.com/opentofu/opentofu/version" backendLocal "github.com/opentofu/opentofu/internal/backend/local" @@ -57,7 +57,7 @@ type Cloud struct { // ContextOpts are the base context options to set when initializing a // new Terraform context. Many of these will be overridden or merged by // Operation. See Operation for more details. - ContextOpts *opentf.ContextOpts + ContextOpts *tofu.ContextOpts // client is the cloud backend API client. client *tfe.Client @@ -879,7 +879,7 @@ func (b *Cloud) cancel(cancelCtx context.Context, op *backend.Operation, r *tfe. // Only ask if the remote operation should be canceled // if the auto approve flag is not set. if !op.AutoApprove { - v, err := op.UIIn.Input(cancelCtx, &opentf.InputOpts{ + v, err := op.UIIn.Input(cancelCtx, &tofu.InputOpts{ Id: "cancel", Query: "\nDo you want to cancel the remote operation?", Description: "Only 'yes' will be accepted to cancel.", diff --git a/internal/cloud/backend_apply.go b/internal/cloud/backend_apply.go index fff8ea7b8f..5859ef0ca6 100644 --- a/internal/cloud/backend_apply.go +++ b/internal/cloud/backend_apply.go @@ -15,9 +15,9 @@ import ( tfe "github.com/hashicorp/go-tfe" "github.com/opentofu/opentofu/internal/backend" "github.com/opentofu/opentofu/internal/command/jsonformat" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) func (b *Cloud) opApply(stopCtx, cancelCtx context.Context, op *backend.Operation, w *tfe.Workspace) (*tfe.Run, error) { @@ -154,7 +154,7 @@ func (b *Cloud) opApply(stopCtx, cancelCtx context.Context, op *backend.Operatio mustConfirm := (op.UIIn != nil && op.UIOut != nil) && !op.AutoApprove if mustConfirm && b.input { - opts := &opentf.InputOpts{Id: "approve"} + opts := &tofu.InputOpts{Id: "approve"} if op.PlanMode == plans.DestroyMode { opts.Query = "\nDo you really want to destroy all resources in workspace \"" + op.Workspace + "\"?" diff --git a/internal/cloud/backend_apply_test.go b/internal/cloud/backend_apply_test.go index 51f4e2eebb..a0a524460c 100644 --- a/internal/cloud/backend_apply_test.go +++ b/internal/cloud/backend_apply_test.go @@ -29,11 +29,11 @@ import ( "github.com/opentofu/opentofu/internal/command/views" "github.com/opentofu/opentofu/internal/depsfile" "github.com/opentofu/opentofu/internal/initwd" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/plans/planfile" "github.com/opentofu/opentofu/internal/states/statemgr" "github.com/opentofu/opentofu/internal/terminal" + "github.com/opentofu/opentofu/internal/tofu" tfversion "github.com/opentofu/opentofu/version" ) @@ -386,7 +386,7 @@ func TestCloud_applyWithParallelism(t *testing.T) { defer configCleanup() if b.ContextOpts == nil { - b.ContextOpts = &opentf.ContextOpts{} + b.ContextOpts = &tofu.ContextOpts{} } b.ContextOpts.Parallelism = 3 op.Workspace = testBackendSingleWorkspaceName @@ -668,7 +668,7 @@ func TestCloud_applyWithRequiredVariables(t *testing.T) { defer configCleanup() defer done(t) - op.Variables = testVariables(opentf.ValueFromNamedFile, "foo") // "bar" variable value missing + op.Variables = testVariables(tofu.ValueFromNamedFile, "foo") // "bar" variable value missing op.Workspace = testBackendSingleWorkspaceName run, err := b.Operation(context.Background(), op) diff --git a/internal/cloud/backend_common.go b/internal/cloud/backend_common.go index c7be40f172..76ef819867 100644 --- a/internal/cloud/backend_common.go +++ b/internal/cloud/backend_common.go @@ -24,8 +24,8 @@ import ( "github.com/opentofu/opentofu/internal/backend" "github.com/opentofu/opentofu/internal/command/jsonformat" "github.com/opentofu/opentofu/internal/logging" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" + "github.com/opentofu/opentofu/internal/tofu" ) var ( @@ -405,7 +405,7 @@ func (b *Cloud) checkPolicy(stopCtx, cancelCtx context.Context, op *backend.Oper } else if !b.input { return errPolicyOverrideNeedsUIConfirmation } else { - opts := &opentf.InputOpts{ + opts := &tofu.InputOpts{ Id: "override", Query: "\nDo you want to override the soft failed policy check?", Description: "Only 'override' will be accepted to override.", @@ -437,7 +437,7 @@ func (b *Cloud) checkPolicy(stopCtx, cancelCtx context.Context, op *backend.Oper return nil } -func (b *Cloud) confirm(stopCtx context.Context, op *backend.Operation, opts *opentf.InputOpts, r *tfe.Run, keyword string) error { +func (b *Cloud) confirm(stopCtx context.Context, op *backend.Operation, opts *tofu.InputOpts, r *tfe.Run, keyword string) error { doneCtx, cancel := context.WithCancel(stopCtx) result := make(chan error, 2) diff --git a/internal/cloud/backend_context.go b/internal/cloud/backend_context.go index 6f364cb9aa..645aa798b2 100644 --- a/internal/cloud/backend_context.go +++ b/internal/cloud/backend_context.go @@ -14,9 +14,9 @@ import ( "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/opentofu/opentofu/internal/backend" "github.com/opentofu/opentofu/internal/configs" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/states/statemgr" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" "github.com/zclconf/go-cty/cty" ) @@ -24,7 +24,7 @@ import ( func (b *Cloud) LocalRun(op *backend.Operation) (*backend.LocalRun, statemgr.Full, tfdiags.Diagnostics) { var diags tfdiags.Diagnostics ret := &backend.LocalRun{ - PlanOpts: &opentf.PlanOpts{ + PlanOpts: &tofu.PlanOpts{ Mode: op.PlanMode, Targets: op.Targets, }, @@ -63,7 +63,7 @@ func (b *Cloud) LocalRun(op *backend.Operation) (*backend.LocalRun, statemgr.Ful } // Initialize our context options - var opts opentf.ContextOpts + var opts tofu.ContextOpts if v := b.ContextOpts; v != nil { opts = *v } @@ -143,7 +143,7 @@ func (b *Cloud) LocalRun(op *backend.Operation) (*backend.LocalRun, statemgr.Ful } } - tfCtx, ctxDiags := opentf.NewContext(&opts) + tfCtx, ctxDiags := tofu.NewContext(&opts) diags = diags.Append(ctxDiags) ret.Core = tfCtx @@ -183,24 +183,24 @@ func (b *Cloud) getRemoteWorkspaceID(ctx context.Context, localWorkspaceName str return remoteWorkspace.ID, nil } -func stubAllVariables(vv map[string]backend.UnparsedVariableValue, decls map[string]*configs.Variable) opentf.InputValues { - ret := make(opentf.InputValues, len(decls)) +func stubAllVariables(vv map[string]backend.UnparsedVariableValue, decls map[string]*configs.Variable) tofu.InputValues { + ret := make(tofu.InputValues, len(decls)) for name, cfg := range decls { raw, exists := vv[name] if !exists { - ret[name] = &opentf.InputValue{ + ret[name] = &tofu.InputValue{ Value: cty.UnknownVal(cfg.Type), - SourceType: opentf.ValueFromConfig, + SourceType: tofu.ValueFromConfig, } continue } val, diags := raw.ParseVariableValue(cfg.ParsingMode) if diags.HasErrors() { - ret[name] = &opentf.InputValue{ + ret[name] = &tofu.InputValue{ Value: cty.UnknownVal(cfg.Type), - SourceType: opentf.ValueFromConfig, + SourceType: tofu.ValueFromConfig, } continue } @@ -219,7 +219,7 @@ type remoteStoredVariableValue struct { var _ backend.UnparsedVariableValue = (*remoteStoredVariableValue)(nil) -func (v *remoteStoredVariableValue) ParseVariableValue(mode configs.VariableParsingMode) (*opentf.InputValue, tfdiags.Diagnostics) { +func (v *remoteStoredVariableValue) ParseVariableValue(mode configs.VariableParsingMode) (*tofu.InputValue, tfdiags.Diagnostics) { var diags tfdiags.Diagnostics var val cty.Value @@ -282,7 +282,7 @@ func (v *remoteStoredVariableValue) ParseVariableValue(mode configs.VariablePars val = cty.StringVal(v.definition.Value) } - return &opentf.InputValue{ + return &tofu.InputValue{ Value: val, // We mark these as "from input" with the rationale that entering @@ -290,6 +290,6 @@ func (v *remoteStoredVariableValue) ParseVariableValue(mode configs.VariablePars // roughly speaking, a similar idea to entering variable values at // the interactive CLI prompts. It's not a perfect correspondance, // but it's closer than the other options. - SourceType: opentf.ValueFromInput, + SourceType: tofu.ValueFromInput, }, diags } diff --git a/internal/cloud/backend_context_test.go b/internal/cloud/backend_context_test.go index bf5df16271..615397f0d1 100644 --- a/internal/cloud/backend_context_test.go +++ b/internal/cloud/backend_context_test.go @@ -17,10 +17,10 @@ import ( "github.com/opentofu/opentofu/internal/command/views" "github.com/opentofu/opentofu/internal/configs" "github.com/opentofu/opentofu/internal/initwd" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/states/statemgr" "github.com/opentofu/opentofu/internal/terminal" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) func TestRemoteStoredVariableValue(t *testing.T) { @@ -255,7 +255,7 @@ func TestRemoteVariablesDoNotOverride(t *testing.T) { tests := map[string]struct { localVariables map[string]backend.UnparsedVariableValue remoteVariables []*tfe.VariableCreateOptions - expectedVariables opentf.InputValues + expectedVariables tofu.InputValues }{ "no local variables": { map[string]backend.UnparsedVariableValue{}, @@ -276,28 +276,28 @@ func TestRemoteVariablesDoNotOverride(t *testing.T) { Category: &catTerraform, }, }, - opentf.InputValues{ - varName1: &opentf.InputValue{ + tofu.InputValues{ + varName1: &tofu.InputValue{ Value: cty.StringVal(varValue1), - SourceType: opentf.ValueFromInput, + SourceType: tofu.ValueFromInput, SourceRange: tfdiags.SourceRange{ Filename: "", Start: tfdiags.SourcePos{Line: 0, Column: 0, Byte: 0}, End: tfdiags.SourcePos{Line: 0, Column: 0, Byte: 0}, }, }, - varName2: &opentf.InputValue{ + varName2: &tofu.InputValue{ Value: cty.StringVal(varValue2), - SourceType: opentf.ValueFromInput, + SourceType: tofu.ValueFromInput, SourceRange: tfdiags.SourceRange{ Filename: "", Start: tfdiags.SourcePos{Line: 0, Column: 0, Byte: 0}, End: tfdiags.SourcePos{Line: 0, Column: 0, Byte: 0}, }, }, - varName3: &opentf.InputValue{ + varName3: &tofu.InputValue{ Value: cty.StringVal(varValue3), - SourceType: opentf.ValueFromInput, + SourceType: tofu.ValueFromInput, SourceRange: tfdiags.SourceRange{ Filename: "", Start: tfdiags.SourcePos{Line: 0, Column: 0, Byte: 0}, @@ -308,7 +308,7 @@ func TestRemoteVariablesDoNotOverride(t *testing.T) { }, "single conflicting local variable": { map[string]backend.UnparsedVariableValue{ - varName3: testUnparsedVariableValue{source: opentf.ValueFromNamedFile, value: cty.StringVal(varValue3)}, + varName3: testUnparsedVariableValue{source: tofu.ValueFromNamedFile, value: cty.StringVal(varValue3)}, }, []*tfe.VariableCreateOptions{ { @@ -325,28 +325,28 @@ func TestRemoteVariablesDoNotOverride(t *testing.T) { Category: &catTerraform, }, }, - opentf.InputValues{ - varName1: &opentf.InputValue{ + tofu.InputValues{ + varName1: &tofu.InputValue{ Value: cty.StringVal(varValue1), - SourceType: opentf.ValueFromInput, + SourceType: tofu.ValueFromInput, SourceRange: tfdiags.SourceRange{ Filename: "", Start: tfdiags.SourcePos{Line: 0, Column: 0, Byte: 0}, End: tfdiags.SourcePos{Line: 0, Column: 0, Byte: 0}, }, }, - varName2: &opentf.InputValue{ + varName2: &tofu.InputValue{ Value: cty.StringVal(varValue2), - SourceType: opentf.ValueFromInput, + SourceType: tofu.ValueFromInput, SourceRange: tfdiags.SourceRange{ Filename: "", Start: tfdiags.SourcePos{Line: 0, Column: 0, Byte: 0}, End: tfdiags.SourcePos{Line: 0, Column: 0, Byte: 0}, }, }, - varName3: &opentf.InputValue{ + varName3: &tofu.InputValue{ Value: cty.StringVal(varValue3), - SourceType: opentf.ValueFromNamedFile, + SourceType: tofu.ValueFromNamedFile, SourceRange: tfdiags.SourceRange{ Filename: "fake.tfvars", Start: tfdiags.SourcePos{Line: 1, Column: 1, Byte: 0}, @@ -357,7 +357,7 @@ func TestRemoteVariablesDoNotOverride(t *testing.T) { }, "no conflicting local variable": { map[string]backend.UnparsedVariableValue{ - varName3: testUnparsedVariableValue{source: opentf.ValueFromNamedFile, value: cty.StringVal(varValue3)}, + varName3: testUnparsedVariableValue{source: tofu.ValueFromNamedFile, value: cty.StringVal(varValue3)}, }, []*tfe.VariableCreateOptions{ { @@ -370,28 +370,28 @@ func TestRemoteVariablesDoNotOverride(t *testing.T) { Category: &catTerraform, }, }, - opentf.InputValues{ - varName1: &opentf.InputValue{ + tofu.InputValues{ + varName1: &tofu.InputValue{ Value: cty.StringVal(varValue1), - SourceType: opentf.ValueFromInput, + SourceType: tofu.ValueFromInput, SourceRange: tfdiags.SourceRange{ Filename: "", Start: tfdiags.SourcePos{Line: 0, Column: 0, Byte: 0}, End: tfdiags.SourcePos{Line: 0, Column: 0, Byte: 0}, }, }, - varName2: &opentf.InputValue{ + varName2: &tofu.InputValue{ Value: cty.StringVal(varValue2), - SourceType: opentf.ValueFromInput, + SourceType: tofu.ValueFromInput, SourceRange: tfdiags.SourceRange{ Filename: "", Start: tfdiags.SourcePos{Line: 0, Column: 0, Byte: 0}, End: tfdiags.SourcePos{Line: 0, Column: 0, Byte: 0}, }, }, - varName3: &opentf.InputValue{ + varName3: &tofu.InputValue{ Value: cty.StringVal(varValue3), - SourceType: opentf.ValueFromNamedFile, + SourceType: tofu.ValueFromNamedFile, SourceRange: tfdiags.SourceRange{ Filename: "fake.tfvars", Start: tfdiags.SourcePos{Line: 1, Column: 1, Byte: 0}, diff --git a/internal/cloud/backend_plan_test.go b/internal/cloud/backend_plan_test.go index 0684425b9b..3319eac5b4 100644 --- a/internal/cloud/backend_plan_test.go +++ b/internal/cloud/backend_plan_test.go @@ -27,11 +27,11 @@ import ( "github.com/opentofu/opentofu/internal/command/views" "github.com/opentofu/opentofu/internal/depsfile" "github.com/opentofu/opentofu/internal/initwd" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/plans/planfile" "github.com/opentofu/opentofu/internal/states/statemgr" "github.com/opentofu/opentofu/internal/terminal" + "github.com/opentofu/opentofu/internal/tofu" ) func testOperationPlan(t *testing.T, configDir string) (*backend.Operation, func(), func(*testing.T) *terminal.TestOutput) { @@ -309,7 +309,7 @@ func TestCloud_planWithParallelism(t *testing.T) { defer configCleanup() if b.ContextOpts == nil { - b.ContextOpts = &opentf.ContextOpts{} + b.ContextOpts = &tofu.ContextOpts{} } b.ContextOpts.Parallelism = 3 op.Workspace = testBackendSingleWorkspaceName @@ -610,7 +610,7 @@ func TestCloud_planWithRequiredVariables(t *testing.T) { defer configCleanup() defer done(t) - op.Variables = testVariables(opentf.ValueFromCLIArg, "foo") // "bar" variable defined in config is missing + op.Variables = testVariables(tofu.ValueFromCLIArg, "foo") // "bar" variable defined in config is missing op.Workspace = testBackendSingleWorkspaceName run, err := b.Operation(context.Background(), op) diff --git a/internal/cloud/backend_taskStages.go b/internal/cloud/backend_taskStages.go index affad957f7..cd59eb247b 100644 --- a/internal/cloud/backend_taskStages.go +++ b/internal/cloud/backend_taskStages.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/go-multierror" tfe "github.com/hashicorp/go-tfe" - "github.com/opentofu/opentofu/internal/opentf" + "github.com/opentofu/opentofu/internal/tofu" ) type taskStages map[tfe.Stage]*tfe.TaskStage @@ -169,7 +169,7 @@ func processSummarizers(ctx *IntegrationContext, output IntegrationOutputWriter, } func (b *Cloud) processStageOverrides(context *IntegrationContext, output IntegrationOutputWriter, taskStageID string) (bool, error) { - opts := &opentf.InputOpts{ + opts := &tofu.InputOpts{ Id: fmt.Sprintf("%c%c [bold]Override", Arrow, Arrow), Query: "\nDo you want to override the failed policy check?", Description: "Only 'override' will be accepted to override.", diff --git a/internal/cloud/cloud_variables.go b/internal/cloud/cloud_variables.go index 5697dead52..6bad39f7f5 100644 --- a/internal/cloud/cloud_variables.go +++ b/internal/cloud/cloud_variables.go @@ -7,12 +7,12 @@ import ( "github.com/hashicorp/hcl/v2/hclwrite" "github.com/opentofu/opentofu/internal/backend" "github.com/opentofu/opentofu/internal/configs" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) -func allowedSourceType(source opentf.ValueSourceType) bool { - return source == opentf.ValueFromNamedFile || source == opentf.ValueFromCLIArg || source == opentf.ValueFromEnvVar +func allowedSourceType(source tofu.ValueSourceType) bool { + return source == tofu.ValueFromNamedFile || source == tofu.ValueFromCLIArg || source == tofu.ValueFromEnvVar } // ParseCloudRunVariables accepts a mapping of unparsed values and a mapping of variable diff --git a/internal/cloud/cloud_variables_test.go b/internal/cloud/cloud_variables_test.go index 4753f42280..fda39bb899 100644 --- a/internal/cloud/cloud_variables_test.go +++ b/internal/cloud/cloud_variables_test.go @@ -10,24 +10,24 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/opentofu/opentofu/internal/backend" "github.com/opentofu/opentofu/internal/configs" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" "github.com/zclconf/go-cty/cty" ) func TestParseCloudRunVariables(t *testing.T) { t.Run("populates variables from allowed sources", func(t *testing.T) { vv := map[string]backend.UnparsedVariableValue{ - "undeclared": testUnparsedVariableValue{source: opentf.ValueFromCLIArg, value: cty.StringVal("0")}, - "declaredFromConfig": testUnparsedVariableValue{source: opentf.ValueFromConfig, value: cty.StringVal("1")}, - "declaredFromNamedFileMapString": testUnparsedVariableValue{source: opentf.ValueFromNamedFile, value: cty.MapVal(map[string]cty.Value{"foo": cty.StringVal("bar")})}, - "declaredFromNamedFileBool": testUnparsedVariableValue{source: opentf.ValueFromNamedFile, value: cty.BoolVal(true)}, - "declaredFromNamedFileNumber": testUnparsedVariableValue{source: opentf.ValueFromNamedFile, value: cty.NumberIntVal(2)}, - "declaredFromNamedFileListString": testUnparsedVariableValue{source: opentf.ValueFromNamedFile, value: cty.ListVal([]cty.Value{cty.StringVal("2a"), cty.StringVal("2b")})}, - "declaredFromNamedFileNull": testUnparsedVariableValue{source: opentf.ValueFromNamedFile, value: cty.NullVal(cty.String)}, - "declaredFromNamedMapComplex": testUnparsedVariableValue{source: opentf.ValueFromNamedFile, value: cty.MapVal(map[string]cty.Value{"foo": cty.ObjectVal(map[string]cty.Value{"qux": cty.ListVal([]cty.Value{cty.BoolVal(true), cty.BoolVal(false)})})})}, - "declaredFromCLIArg": testUnparsedVariableValue{source: opentf.ValueFromCLIArg, value: cty.StringVal("3")}, - "declaredFromEnvVar": testUnparsedVariableValue{source: opentf.ValueFromEnvVar, value: cty.StringVal("4")}, + "undeclared": testUnparsedVariableValue{source: tofu.ValueFromCLIArg, value: cty.StringVal("0")}, + "declaredFromConfig": testUnparsedVariableValue{source: tofu.ValueFromConfig, value: cty.StringVal("1")}, + "declaredFromNamedFileMapString": testUnparsedVariableValue{source: tofu.ValueFromNamedFile, value: cty.MapVal(map[string]cty.Value{"foo": cty.StringVal("bar")})}, + "declaredFromNamedFileBool": testUnparsedVariableValue{source: tofu.ValueFromNamedFile, value: cty.BoolVal(true)}, + "declaredFromNamedFileNumber": testUnparsedVariableValue{source: tofu.ValueFromNamedFile, value: cty.NumberIntVal(2)}, + "declaredFromNamedFileListString": testUnparsedVariableValue{source: tofu.ValueFromNamedFile, value: cty.ListVal([]cty.Value{cty.StringVal("2a"), cty.StringVal("2b")})}, + "declaredFromNamedFileNull": testUnparsedVariableValue{source: tofu.ValueFromNamedFile, value: cty.NullVal(cty.String)}, + "declaredFromNamedMapComplex": testUnparsedVariableValue{source: tofu.ValueFromNamedFile, value: cty.MapVal(map[string]cty.Value{"foo": cty.ObjectVal(map[string]cty.Value{"qux": cty.ListVal([]cty.Value{cty.BoolVal(true), cty.BoolVal(false)})})})}, + "declaredFromCLIArg": testUnparsedVariableValue{source: tofu.ValueFromCLIArg, value: cty.StringVal("3")}, + "declaredFromEnvVar": testUnparsedVariableValue{source: tofu.ValueFromEnvVar, value: cty.StringVal("4")}, } decls := map[string]*configs.Variable{ @@ -169,12 +169,12 @@ func TestParseCloudRunVariables(t *testing.T) { } type testUnparsedVariableValue struct { - source opentf.ValueSourceType + source tofu.ValueSourceType value cty.Value } -func (v testUnparsedVariableValue) ParseVariableValue(mode configs.VariableParsingMode) (*opentf.InputValue, tfdiags.Diagnostics) { - return &opentf.InputValue{ +func (v testUnparsedVariableValue) ParseVariableValue(mode configs.VariableParsingMode) (*tofu.InputValue, tfdiags.Diagnostics) { + return &tofu.InputValue{ Value: v.value, SourceType: v.source, SourceRange: tfdiags.SourceRange{ diff --git a/internal/cloud/state.go b/internal/cloud/state.go index e7b298c89e..07756ca571 100644 --- a/internal/cloud/state.go +++ b/internal/cloud/state.go @@ -27,11 +27,11 @@ import ( "github.com/opentofu/opentofu/internal/backend/local" "github.com/opentofu/opentofu/internal/command/jsonstate" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/states/remote" "github.com/opentofu/opentofu/internal/states/statefile" "github.com/opentofu/opentofu/internal/states/statemgr" + "github.com/opentofu/opentofu/internal/tofu" ) // State implements the State interfaces in the state package to handle @@ -157,7 +157,7 @@ func (s *State) WriteState(state *states.State) error { } // PersistState uploads a snapshot of the latest state as a StateVersion to Terraform Cloud -func (s *State) PersistState(schemas *opentf.Schemas) error { +func (s *State) PersistState(schemas *tofu.Schemas) error { s.mu.Lock() defer s.mu.Unlock() diff --git a/internal/cloud/testing.go b/internal/cloud/testing.go index 65737e004b..e396248077 100644 --- a/internal/cloud/testing.go +++ b/internal/cloud/testing.go @@ -29,11 +29,11 @@ import ( "github.com/opentofu/opentofu/internal/configs" "github.com/opentofu/opentofu/internal/configs/configschema" "github.com/opentofu/opentofu/internal/httpclient" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/providers" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/states/statefile" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" "github.com/opentofu/opentofu/version" backendLocal "github.com/opentofu/opentofu/internal/backend/local" @@ -63,7 +63,7 @@ type mockInput struct { answers map[string]string } -func (m *mockInput) Input(ctx context.Context, opts *opentf.InputOpts) (string, error) { +func (m *mockInput) Input(ctx context.Context, opts *tofu.InputOpts) (string, error) { v, ok := m.answers[opts.Id] if !ok { return "", fmt.Errorf("unexpected input request in test: %s", opts.Id) @@ -589,18 +589,18 @@ func testDisco(s *httptest.Server) *disco.Disco { type unparsedVariableValue struct { value string - source opentf.ValueSourceType + source tofu.ValueSourceType } -func (v *unparsedVariableValue) ParseVariableValue(mode configs.VariableParsingMode) (*opentf.InputValue, tfdiags.Diagnostics) { - return &opentf.InputValue{ +func (v *unparsedVariableValue) ParseVariableValue(mode configs.VariableParsingMode) (*tofu.InputValue, tfdiags.Diagnostics) { + return &tofu.InputValue{ Value: cty.StringVal(v.value), SourceType: v.source, }, tfdiags.Diagnostics{} } // testVariable returns a backend.UnparsedVariableValue used for testing. -func testVariables(s opentf.ValueSourceType, vs ...string) map[string]backend.UnparsedVariableValue { +func testVariables(s tofu.ValueSourceType, vs ...string) map[string]backend.UnparsedVariableValue { vars := make(map[string]backend.UnparsedVariableValue, len(vs)) for _, v := range vs { vars[v] = &unparsedVariableValue{ diff --git a/internal/command/apply_test.go b/internal/command/apply_test.go index c9cb839fb9..462db65657 100644 --- a/internal/command/apply_test.go +++ b/internal/command/apply_test.go @@ -22,12 +22,12 @@ import ( "github.com/opentofu/opentofu/internal/addrs" "github.com/opentofu/opentofu/internal/configs/configschema" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/providers" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/states/statemgr" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) func TestApply(t *testing.T) { @@ -298,7 +298,7 @@ func TestApply_parallelism(t *testing.T) { providerFactories := map[addrs.Provider]providers.Factory{} for i := 0; i < 10; i++ { name := fmt.Sprintf("test%d", i) - provider := &opentf.MockProvider{} + provider := &tofu.MockProvider{} provider.GetProviderSchemaResponse = &providers.GetProviderSchemaResponse{ ResourceTypes: map[string]providers.Schema{ name + "_instance": {Block: &configschema.Block{}}, @@ -2159,7 +2159,7 @@ func applyFixtureSchema() *providers.GetProviderSchemaResponse { // GetSchemaResponse, PlanResourceChangeFn, and ApplyResourceChangeFn populated, // with the plan/apply steps just passing through the data determined by // Terraform Core. -func applyFixtureProvider() *opentf.MockProvider { +func applyFixtureProvider() *tofu.MockProvider { p := testProvider() p.GetProviderSchemaResponse = applyFixtureSchema() p.PlanResourceChangeFn = func(req providers.PlanResourceChangeRequest) providers.PlanResourceChangeResponse { diff --git a/internal/command/command_test.go b/internal/command/command_test.go index 0f9b156832..67b4328659 100644 --- a/internal/command/command_test.go +++ b/internal/command/command_test.go @@ -42,7 +42,6 @@ import ( "github.com/opentofu/opentofu/internal/initwd" legacy "github.com/opentofu/opentofu/internal/legacy/opentf" _ "github.com/opentofu/opentofu/internal/logging" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/plans/planfile" "github.com/opentofu/opentofu/internal/providers" @@ -51,6 +50,7 @@ import ( "github.com/opentofu/opentofu/internal/states/statefile" "github.com/opentofu/opentofu/internal/states/statemgr" "github.com/opentofu/opentofu/internal/terminal" + "github.com/opentofu/opentofu/internal/tofu" "github.com/opentofu/opentofu/version" ) @@ -523,8 +523,8 @@ func testStateOutput(t *testing.T, path string, expected string) { } } -func testProvider() *opentf.MockProvider { - p := new(opentf.MockProvider) +func testProvider() *tofu.MockProvider { + p := new(tofu.MockProvider) p.PlanResourceChangeFn = func(req providers.PlanResourceChangeRequest) (resp providers.PlanResourceChangeResponse) { resp.PlannedState = req.ProposedNewState return resp diff --git a/internal/command/console.go b/internal/command/console.go index 044553bc18..550cd47845 100644 --- a/internal/command/console.go +++ b/internal/command/console.go @@ -12,9 +12,9 @@ import ( "github.com/opentofu/opentofu/internal/addrs" "github.com/opentofu/opentofu/internal/backend" "github.com/opentofu/opentofu/internal/command/arguments" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/repl" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" "github.com/mitchellh/cli" ) @@ -121,7 +121,7 @@ func (c *ConsoleCommand) Run(args []string) int { ErrorWriter: os.Stderr, } - evalOpts := &opentf.EvalOpts{} + evalOpts := &tofu.EvalOpts{} if lr.PlanOpts != nil { // the LocalRun type is built primarily to support the main operations, // so the variable values end up in the "PlanOpts" even though we're diff --git a/internal/command/graph.go b/internal/command/graph.go index 978bd22a14..3796204630 100644 --- a/internal/command/graph.go +++ b/internal/command/graph.go @@ -10,10 +10,10 @@ import ( "github.com/opentofu/opentofu/internal/backend" "github.com/opentofu/opentofu/internal/command/arguments" "github.com/opentofu/opentofu/internal/dag" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/plans/planfile" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) // GraphCommand is a Command implementation that takes a Terraform @@ -123,7 +123,7 @@ func (c *GraphCommand) Run(args []string) int { } } - var g *opentf.Graph + var g *tofu.Graph var graphDiags tfdiags.Diagnostics switch graphTypeStr { case "plan": @@ -171,7 +171,7 @@ func (c *GraphCommand) Run(args []string) int { return 1 } - graphStr, err := opentf.GraphDot(g, &dag.DotOpts{ + graphStr, err := tofu.GraphDot(g, &dag.DotOpts{ DrawCycles: drawCycles, MaxDepth: moduleDepth, Verbose: verbose, diff --git a/internal/command/import.go b/internal/command/import.go index 20e5ab54e8..c7dde30c00 100644 --- a/internal/command/import.go +++ b/internal/command/import.go @@ -19,8 +19,8 @@ import ( "github.com/opentofu/opentofu/internal/command/arguments" "github.com/opentofu/opentofu/internal/command/views" "github.com/opentofu/opentofu/internal/configs" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) // ImportCommand is a cli.Command implementation that imports resources @@ -194,7 +194,7 @@ func (c *ImportCommand) Run(args []string) int { c.showDiagnostics(diags) return 1 } - opReq.Hooks = []opentf.Hook{c.uiHook()} + opReq.Hooks = []tofu.Hook{c.uiHook()} { var moreDiags tfdiags.Diagnostics opReq.Variables, moreDiags = c.collectVariableValues() @@ -233,8 +233,8 @@ func (c *ImportCommand) Run(args []string) int { // Perform the import. Note that as you can see it is possible for this // API to import more than one resource at once. For now, we only allow // one while we stabilize this feature. - newState, importDiags := lr.Core.Import(lr.Config, lr.InputState, &opentf.ImportOpts{ - Targets: []*opentf.ImportTarget{ + newState, importDiags := lr.Core.Import(lr.Config, lr.InputState, &tofu.ImportOpts{ + Targets: []*tofu.ImportTarget{ { Addr: addr, @@ -256,7 +256,7 @@ func (c *ImportCommand) Run(args []string) int { } // Get schemas, if possible, before writing state - var schemas *opentf.Schemas + var schemas *tofu.Schemas if isCloudMode(b) { var schemaDiags tfdiags.Diagnostics schemas, schemaDiags = c.MaybeGetSchemas(newState, nil) diff --git a/internal/command/init.go b/internal/command/init.go index 3ed01a261b..027ceefd5e 100644 --- a/internal/command/init.go +++ b/internal/command/init.go @@ -27,10 +27,10 @@ import ( "github.com/opentofu/opentofu/internal/configs" "github.com/opentofu/opentofu/internal/configs/configschema" "github.com/opentofu/opentofu/internal/getproviders" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/providercache" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" tfversion "github.com/opentofu/opentofu/version" ) @@ -256,7 +256,7 @@ func (c *InitCommand) Run(args []string) int { // the configuration declare that they don't support this Terraform // version, so we can produce a version-related error message rather than // potentially-confusing downstream errors. - versionDiags := opentf.CheckCoreVersionRequirements(config) + versionDiags := tofu.CheckCoreVersionRequirements(config) if versionDiags.HasErrors() { c.showDiagnostics(versionDiags) return 1 diff --git a/internal/command/jsonconfig/config.go b/internal/command/jsonconfig/config.go index d2eb9f8f9d..8a91d15ef4 100644 --- a/internal/command/jsonconfig/config.go +++ b/internal/command/jsonconfig/config.go @@ -15,7 +15,7 @@ import ( "github.com/opentofu/opentofu/internal/configs" "github.com/opentofu/opentofu/internal/configs/configschema" "github.com/opentofu/opentofu/internal/getproviders" - "github.com/opentofu/opentofu/internal/opentf" + "github.com/opentofu/opentofu/internal/tofu" ) // Config represents the complete configuration source @@ -120,7 +120,7 @@ type provisioner struct { } // Marshal returns the json encoding of terraform configuration. -func Marshal(c *configs.Config, schemas *opentf.Schemas) ([]byte, error) { +func Marshal(c *configs.Config, schemas *tofu.Schemas) ([]byte, error) { var output config pcs := make(map[string]providerConfig) @@ -147,7 +147,7 @@ func Marshal(c *configs.Config, schemas *opentf.Schemas) ([]byte, error) { func marshalProviderConfigs( c *configs.Config, - schemas *opentf.Schemas, + schemas *tofu.Schemas, m map[string]providerConfig, ) { if c == nil { @@ -304,7 +304,7 @@ func marshalProviderConfigs( } } -func marshalModule(c *configs.Config, schemas *opentf.Schemas, addr string) (module, error) { +func marshalModule(c *configs.Config, schemas *tofu.Schemas, addr string) (module, error) { var module module var rs []resource @@ -373,7 +373,7 @@ func marshalModule(c *configs.Config, schemas *opentf.Schemas, addr string) (mod return module, nil } -func marshalModuleCalls(c *configs.Config, schemas *opentf.Schemas) map[string]moduleCall { +func marshalModuleCalls(c *configs.Config, schemas *tofu.Schemas) map[string]moduleCall { ret := make(map[string]moduleCall) for name, mc := range c.Module.ModuleCalls { @@ -384,7 +384,7 @@ func marshalModuleCalls(c *configs.Config, schemas *opentf.Schemas) map[string]m return ret } -func marshalModuleCall(c *configs.Config, mc *configs.ModuleCall, schemas *opentf.Schemas) moduleCall { +func marshalModuleCall(c *configs.Config, mc *configs.ModuleCall, schemas *tofu.Schemas) moduleCall { // It is possible to have a module call with a nil config. if c == nil { return moduleCall{} @@ -441,7 +441,7 @@ func marshalModuleCall(c *configs.Config, mc *configs.ModuleCall, schemas *opent return ret } -func marshalResources(resources map[string]*configs.Resource, schemas *opentf.Schemas, moduleAddr string) ([]resource, error) { +func marshalResources(resources map[string]*configs.Resource, schemas *tofu.Schemas, moduleAddr string) ([]resource, error) { var rs []resource for _, v := range resources { providerConfigKey := opaqueProviderKey(v.ProviderConfigAddr().StringCompact(), moduleAddr) diff --git a/internal/command/jsonformat/plan_test.go b/internal/command/jsonformat/plan_test.go index 158a17dadf..fa921e9d36 100644 --- a/internal/command/jsonformat/plan_test.go +++ b/internal/command/jsonformat/plan_test.go @@ -20,11 +20,11 @@ import ( "github.com/opentofu/opentofu/internal/command/jsonprovider" "github.com/opentofu/opentofu/internal/configs/configschema" "github.com/opentofu/opentofu/internal/lang/marks" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/providers" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/terminal" + "github.com/opentofu/opentofu/internal/tofu" ) func TestRenderHuman_EmptyPlan(t *testing.T) { @@ -6986,7 +6986,7 @@ func runTestCases(t *testing.T, testCases map[string]testCase) { RequiredReplace: tc.RequiredReplace, } - tfschemas := &opentf.Schemas{ + tfschemas := &tofu.Schemas{ Providers: map[addrs.Provider]providers.ProviderSchema{ src.ProviderAddr.Provider: { ResourceTypes: map[string]providers.Schema{ diff --git a/internal/command/jsonformat/state_test.go b/internal/command/jsonformat/state_test.go index f8d943e4e1..aafba89085 100644 --- a/internal/command/jsonformat/state_test.go +++ b/internal/command/jsonformat/state_test.go @@ -19,9 +19,9 @@ import ( "github.com/opentofu/opentofu/internal/addrs" "github.com/opentofu/opentofu/internal/configs/configschema" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/providers" "github.com/opentofu/opentofu/internal/states" + "github.com/opentofu/opentofu/internal/tofu" ) func TestState(t *testing.T) { @@ -29,12 +29,12 @@ func TestState(t *testing.T) { tests := []struct { State *states.State - Schemas *opentf.Schemas + Schemas *tofu.Schemas Want string }{ { State: &states.State{}, - Schemas: &opentf.Schemas{}, + Schemas: &tofu.Schemas{}, Want: "The state file is empty. No resources are represented.\n", }, { @@ -98,8 +98,8 @@ func TestState(t *testing.T) { } } -func testProvider() *opentf.MockProvider { - p := new(opentf.MockProvider) +func testProvider() *tofu.MockProvider { + p := new(tofu.MockProvider) p.ReadResourceFn = func(req providers.ReadResourceRequest) providers.ReadResourceResponse { return providers.ReadResourceResponse{NewState: req.PriorState} } @@ -153,9 +153,9 @@ func testProviderSchema() *providers.GetProviderSchemaResponse { } } -func testSchemas() *opentf.Schemas { +func testSchemas() *tofu.Schemas { provider := testProvider() - return &opentf.Schemas{ + return &tofu.Schemas{ Providers: map[addrs.Provider]providers.ProviderSchema{ addrs.NewDefaultProvider("test"): provider.GetProviderSchema(), }, diff --git a/internal/command/jsonplan/plan.go b/internal/command/jsonplan/plan.go index 30bfbc0ab3..c5d7964e71 100644 --- a/internal/command/jsonplan/plan.go +++ b/internal/command/jsonplan/plan.go @@ -18,10 +18,10 @@ import ( "github.com/opentofu/opentofu/internal/command/jsonconfig" "github.com/opentofu/opentofu/internal/command/jsonstate" "github.com/opentofu/opentofu/internal/configs" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/states/statefile" + "github.com/opentofu/opentofu/internal/tofu" "github.com/opentofu/opentofu/version" ) @@ -171,7 +171,7 @@ type Variable struct { // the part of the plan required by the jsonformat.Plan renderer. func MarshalForRenderer( p *plans.Plan, - schemas *opentf.Schemas, + schemas *tofu.Schemas, ) (map[string]Change, []ResourceChange, []ResourceChange, []ResourceAttr, error) { output := newPlan() @@ -218,7 +218,7 @@ func MarshalForLog( config *configs.Config, p *plans.Plan, sf *statefile.File, - schemas *opentf.Schemas, + schemas *tofu.Schemas, ) (*Plan, error) { output := newPlan() output.TerraformVersion = version.String() @@ -302,7 +302,7 @@ func Marshal( config *configs.Config, p *plans.Plan, sf *statefile.File, - schemas *opentf.Schemas, + schemas *tofu.Schemas, ) ([]byte, error) { output, err := MarshalForLog(config, p, sf, schemas) if err != nil { @@ -372,7 +372,7 @@ func (p *Plan) marshalPlanVariables(vars map[string]plans.DynamicValue, decls ma // This function is referenced directly from the structured renderer tests, to // ensure parity between the renderers. It probably shouldn't be used anywhere // else. -func MarshalResourceChanges(resources []*plans.ResourceInstanceChangeSrc, schemas *opentf.Schemas) ([]ResourceChange, error) { +func MarshalResourceChanges(resources []*plans.ResourceInstanceChangeSrc, schemas *tofu.Schemas) ([]ResourceChange, error) { var ret []ResourceChange var sortedResources []*plans.ResourceInstanceChangeSrc @@ -654,7 +654,7 @@ func MarshalOutputChanges(changes *plans.Changes) (map[string]Change, error) { return outputChanges, nil } -func (p *Plan) marshalPlannedValues(changes *plans.Changes, schemas *opentf.Schemas) error { +func (p *Plan) marshalPlannedValues(changes *plans.Changes, schemas *tofu.Schemas) error { // marshal the planned changes into a module plan, err := marshalPlannedValues(changes, schemas) if err != nil { diff --git a/internal/command/jsonplan/values.go b/internal/command/jsonplan/values.go index 6aa02b3923..a41f22ab14 100644 --- a/internal/command/jsonplan/values.go +++ b/internal/command/jsonplan/values.go @@ -14,9 +14,9 @@ import ( "github.com/opentofu/opentofu/internal/addrs" "github.com/opentofu/opentofu/internal/command/jsonstate" "github.com/opentofu/opentofu/internal/configs/configschema" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/states" + "github.com/opentofu/opentofu/internal/tofu" ) // StateValues is the common representation of resolved values for both the @@ -93,7 +93,7 @@ func marshalPlannedOutputs(changes *plans.Changes) (map[string]Output, error) { } -func marshalPlannedValues(changes *plans.Changes, schemas *opentf.Schemas) (Module, error) { +func marshalPlannedValues(changes *plans.Changes, schemas *tofu.Schemas) (Module, error) { var ret Module // build two maps: @@ -166,7 +166,7 @@ func marshalPlannedValues(changes *plans.Changes, schemas *opentf.Schemas) (Modu } // marshalPlanResources -func marshalPlanResources(changes *plans.Changes, ris []addrs.AbsResourceInstance, schemas *opentf.Schemas) ([]Resource, error) { +func marshalPlanResources(changes *plans.Changes, ris []addrs.AbsResourceInstance, schemas *tofu.Schemas) ([]Resource, error) { var ret []Resource for _, ri := range ris { @@ -248,7 +248,7 @@ func marshalPlanResources(changes *plans.Changes, ris []addrs.AbsResourceInstanc // the full module tree. func marshalPlanModules( changes *plans.Changes, - schemas *opentf.Schemas, + schemas *tofu.Schemas, childModules []addrs.ModuleInstance, moduleMap map[string][]addrs.ModuleInstance, moduleResourceMap map[string][]addrs.AbsResourceInstance, diff --git a/internal/command/jsonplan/values_test.go b/internal/command/jsonplan/values_test.go index 709405c9a4..70c8be4600 100644 --- a/internal/command/jsonplan/values_test.go +++ b/internal/command/jsonplan/values_test.go @@ -12,9 +12,9 @@ import ( "github.com/opentofu/opentofu/internal/addrs" "github.com/opentofu/opentofu/internal/configs/configschema" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/providers" + "github.com/opentofu/opentofu/internal/tofu" ) func TestMarshalAttributeValues(t *testing.T) { @@ -344,8 +344,8 @@ func TestMarshalPlanValuesNoopDeposed(t *testing.T) { } } -func testSchemas() *opentf.Schemas { - return &opentf.Schemas{ +func testSchemas() *tofu.Schemas { + return &tofu.Schemas{ Providers: map[addrs.Provider]providers.ProviderSchema{ addrs.NewDefaultProvider("test"): providers.ProviderSchema{ ResourceTypes: map[string]providers.Schema{ diff --git a/internal/command/jsonprovider/provider.go b/internal/command/jsonprovider/provider.go index f8817df71a..6036359a87 100644 --- a/internal/command/jsonprovider/provider.go +++ b/internal/command/jsonprovider/provider.go @@ -6,8 +6,8 @@ package jsonprovider import ( "encoding/json" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/providers" + "github.com/opentofu/opentofu/internal/tofu" ) // FormatVersion represents the version of the json format and will be @@ -39,7 +39,7 @@ func newProviders() *Providers { // schema into the public structured JSON versions. // // This is a format that can be read by the structured plan renderer. -func MarshalForRenderer(s *opentf.Schemas) map[string]*Provider { +func MarshalForRenderer(s *tofu.Schemas) map[string]*Provider { schemas := make(map[string]*Provider, len(s.Providers)) for k, v := range s.Providers { schemas[k.String()] = marshalProvider(v) @@ -47,7 +47,7 @@ func MarshalForRenderer(s *opentf.Schemas) map[string]*Provider { return schemas } -func Marshal(s *opentf.Schemas) ([]byte, error) { +func Marshal(s *tofu.Schemas) ([]byte, error) { providers := newProviders() providers.Schemas = MarshalForRenderer(s) ret, err := json.Marshal(providers) diff --git a/internal/command/jsonstate/state.go b/internal/command/jsonstate/state.go index 2873690651..1e1fe50627 100644 --- a/internal/command/jsonstate/state.go +++ b/internal/command/jsonstate/state.go @@ -14,9 +14,9 @@ import ( "github.com/opentofu/opentofu/internal/addrs" "github.com/opentofu/opentofu/internal/command/jsonchecks" "github.com/opentofu/opentofu/internal/lang/marks" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/states/statefile" + "github.com/opentofu/opentofu/internal/tofu" ) const ( @@ -143,7 +143,7 @@ func newState() *State { // MarshalForRenderer returns the pre-json encoding changes of the state, in a // format available to the structured renderer. -func MarshalForRenderer(sf *statefile.File, schemas *opentf.Schemas) (Module, map[string]Output, error) { +func MarshalForRenderer(sf *statefile.File, schemas *tofu.Schemas) (Module, map[string]Output, error) { if sf.State.Modules == nil { // Empty state case. return Module{}, nil, nil @@ -164,7 +164,7 @@ func MarshalForRenderer(sf *statefile.File, schemas *opentf.Schemas) (Module, ma // MarshalForLog returns the origin JSON compatible state, read for a logging // package to marshal further. -func MarshalForLog(sf *statefile.File, schemas *opentf.Schemas) (*State, error) { +func MarshalForLog(sf *statefile.File, schemas *tofu.Schemas) (*State, error) { output := newState() if sf == nil || sf.State.Empty() { @@ -190,7 +190,7 @@ func MarshalForLog(sf *statefile.File, schemas *opentf.Schemas) (*State, error) } // Marshal returns the json encoding of a terraform state. -func Marshal(sf *statefile.File, schemas *opentf.Schemas) ([]byte, error) { +func Marshal(sf *statefile.File, schemas *tofu.Schemas) ([]byte, error) { output, err := MarshalForLog(sf, schemas) if err != nil { return nil, err @@ -200,7 +200,7 @@ func Marshal(sf *statefile.File, schemas *opentf.Schemas) ([]byte, error) { return ret, err } -func (jsonstate *State) marshalStateValues(s *states.State, schemas *opentf.Schemas) error { +func (jsonstate *State) marshalStateValues(s *states.State, schemas *tofu.Schemas) error { var sv StateValues var err error @@ -248,7 +248,7 @@ func MarshalOutputs(outputs map[string]*states.OutputValue) (map[string]Output, return ret, nil } -func marshalRootModule(s *states.State, schemas *opentf.Schemas) (Module, error) { +func marshalRootModule(s *states.State, schemas *tofu.Schemas) (Module, error) { var ret Module var err error @@ -295,7 +295,7 @@ func marshalRootModule(s *states.State, schemas *opentf.Schemas) (Module, error) // out of terraform state. func marshalModules( s *states.State, - schemas *opentf.Schemas, + schemas *tofu.Schemas, modules []addrs.ModuleInstance, moduleMap map[string][]addrs.ModuleInstance, ) ([]Module, error) { @@ -333,7 +333,7 @@ func marshalModules( return ret, nil } -func marshalResources(resources map[string]*states.Resource, module addrs.ModuleInstance, schemas *opentf.Schemas) ([]Resource, error) { +func marshalResources(resources map[string]*states.Resource, module addrs.ModuleInstance, schemas *tofu.Schemas) ([]Resource, error) { var ret []Resource var sortedResources []*states.Resource diff --git a/internal/command/jsonstate/state_test.go b/internal/command/jsonstate/state_test.go index 1599e0457d..06a49a4f1b 100644 --- a/internal/command/jsonstate/state_test.go +++ b/internal/command/jsonstate/state_test.go @@ -14,9 +14,9 @@ import ( "github.com/opentofu/opentofu/internal/addrs" "github.com/opentofu/opentofu/internal/configs/configschema" "github.com/opentofu/opentofu/internal/lang/marks" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/providers" "github.com/opentofu/opentofu/internal/states" + "github.com/opentofu/opentofu/internal/tofu" ) func TestMarshalOutputs(t *testing.T) { @@ -183,7 +183,7 @@ func TestMarshalResources(t *testing.T) { deposedKey := states.NewDeposedKey() tests := map[string]struct { Resources map[string]*states.Resource - Schemas *opentf.Schemas + Schemas *tofu.Schemas Want []Resource Err bool }{ @@ -806,8 +806,8 @@ func TestMarshalModules_parent_no_resources(t *testing.T) { } } -func testSchemas() *opentf.Schemas { - return &opentf.Schemas{ +func testSchemas() *tofu.Schemas { + return &tofu.Schemas{ Providers: map[addrs.Provider]providers.ProviderSchema{ addrs.NewDefaultProvider("test"): { ResourceTypes: map[string]providers.Schema{ diff --git a/internal/command/login.go b/internal/command/login.go index ea044f0d66..f2fb0bde4e 100644 --- a/internal/command/login.go +++ b/internal/command/login.go @@ -27,8 +27,8 @@ import ( "github.com/opentofu/opentofu/internal/command/cliconfig" "github.com/opentofu/opentofu/internal/httpclient" "github.com/opentofu/opentofu/internal/logging" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" uuid "github.com/hashicorp/go-uuid" "golang.org/x/oauth2" @@ -540,7 +540,7 @@ func (c *LoginCommand) interactiveGetTokenByPassword(hostname svchost.Hostname, c.Ui.Output("\n---------------------------------------------------------------------------------\n") c.Ui.Output("OpenTF must temporarily use your password to request an API token.\nThis password will NOT be saved locally.\n") - username, err := c.UIInput().Input(context.Background(), &opentf.InputOpts{ + username, err := c.UIInput().Input(context.Background(), &tofu.InputOpts{ Id: "username", Query: fmt.Sprintf("Username for %s:", hostname.ForDisplay()), }) @@ -548,7 +548,7 @@ func (c *LoginCommand) interactiveGetTokenByPassword(hostname svchost.Hostname, diags = diags.Append(fmt.Errorf("Failed to request username: %w", err)) return nil, diags } - password, err := c.UIInput().Input(context.Background(), &opentf.InputOpts{ + password, err := c.UIInput().Input(context.Background(), &tofu.InputOpts{ Id: "password", Query: fmt.Sprintf("Password for %s:", hostname.ForDisplay()), Secret: true, @@ -631,7 +631,7 @@ func (c *LoginCommand) interactiveGetTokenByUI(hostname svchost.Hostname, credsC } } - token, err := c.UIInput().Input(context.Background(), &opentf.InputOpts{ + token, err := c.UIInput().Input(context.Background(), &tofu.InputOpts{ Id: "token", Query: fmt.Sprintf("Token for %s:", hostname.ForDisplay()), Secret: true, @@ -692,7 +692,7 @@ func (c *LoginCommand) interactiveContextConsent(hostname svchost.Hostname, gran } } - v, err := c.UIInput().Input(context.Background(), &opentf.InputOpts{ + v, err := c.UIInput().Input(context.Background(), &tofu.InputOpts{ Id: "approve", Query: "Do you want to proceed?", Description: `Only 'yes' will be accepted to confirm.`, diff --git a/internal/command/meta.go b/internal/command/meta.go index 9f41a2717a..ad98f387cd 100644 --- a/internal/command/meta.go +++ b/internal/command/meta.go @@ -34,12 +34,12 @@ import ( "github.com/opentofu/opentofu/internal/configs/configload" "github.com/opentofu/opentofu/internal/getproviders" legacy "github.com/opentofu/opentofu/internal/legacy/opentf" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/providers" "github.com/opentofu/opentofu/internal/provisioners" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/terminal" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) // Meta are the meta-options that are available on all or most commands. @@ -334,8 +334,8 @@ const ( ) // InputMode returns the type of input we should ask for in the form of -// opentf.InputMode which is passed directly to Context.Input. -func (m *Meta) InputMode() opentf.InputMode { +// tofu.InputMode which is passed directly to Context.Input. +func (m *Meta) InputMode() tofu.InputMode { if test || !m.input { return 0 } @@ -348,14 +348,14 @@ func (m *Meta) InputMode() opentf.InputMode { } } - var mode opentf.InputMode - mode |= opentf.InputModeProvider + var mode tofu.InputMode + mode |= tofu.InputModeProvider return mode } // UIInput returns a UIInput object to be used for asking for input. -func (m *Meta) UIInput() opentf.UIInput { +func (m *Meta) UIInput() tofu.UIInput { return &UIInput{ Colorize: m.Colorize(), } @@ -518,13 +518,13 @@ func (m *Meta) RunOperation(b backend.Enhanced, opReq *backend.Operation) (*back // contextOpts returns the options to use to initialize a Terraform // context with the settings from this Meta. -func (m *Meta) contextOpts() (*opentf.ContextOpts, error) { +func (m *Meta) contextOpts() (*tofu.ContextOpts, error) { workspace, err := m.Workspace() if err != nil { return nil, err } - var opts opentf.ContextOpts + var opts tofu.ContextOpts opts.UIInput = m.UIInput() opts.Parallelism = m.parallelism @@ -542,7 +542,7 @@ func (m *Meta) contextOpts() (*opentf.ContextOpts, error) { opts.Provisioners = m.provisionerFactories() } - opts.Meta = &opentf.ContextMeta{ + opts.Meta = &tofu.ContextMeta{ Env: workspace, OriginalWorkingDir: m.WorkingDir.OriginalWorkingDir(), } @@ -651,7 +651,7 @@ func (m *Meta) uiHook() *views.UiHook { } // confirm asks a yes/no confirmation. -func (m *Meta) confirm(opts *opentf.InputOpts) (bool, error) { +func (m *Meta) confirm(opts *tofu.InputOpts) (bool, error) { if !m.Input() { return false, errors.New("input is disabled") } @@ -833,7 +833,7 @@ func (m *Meta) checkRequiredVersion() tfdiags.Diagnostics { return diags } - versionDiags := opentf.CheckCoreVersionRequirements(config) + versionDiags := tofu.CheckCoreVersionRequirements(config) if versionDiags.HasErrors() { diags = diags.Append(versionDiags) return diags @@ -847,7 +847,7 @@ func (m *Meta) checkRequiredVersion() tfdiags.Diagnostics { // it could potentially return nil without errors. It is the // responsibility of the caller to handle the lack of schema // information accordingly -func (c *Meta) MaybeGetSchemas(state *states.State, config *configs.Config) (*opentf.Schemas, tfdiags.Diagnostics) { +func (c *Meta) MaybeGetSchemas(state *states.State, config *configs.Config) (*tofu.Schemas, tfdiags.Diagnostics) { var diags tfdiags.Diagnostics path, err := os.Getwd() @@ -870,7 +870,7 @@ func (c *Meta) MaybeGetSchemas(state *states.State, config *configs.Config) (*op diags = diags.Append(err) return nil, diags } - tfCtx, ctxDiags := opentf.NewContext(opts) + tfCtx, ctxDiags := tofu.NewContext(opts) diags = diags.Append(ctxDiags) if ctxDiags.HasErrors() { return nil, diags diff --git a/internal/command/meta_backend.go b/internal/command/meta_backend.go index 78154c398b..699dfb4723 100644 --- a/internal/command/meta_backend.go +++ b/internal/command/meta_backend.go @@ -28,10 +28,10 @@ import ( "github.com/opentofu/opentofu/internal/command/clistate" "github.com/opentofu/opentofu/internal/command/views" "github.com/opentofu/opentofu/internal/configs" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/states/statemgr" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" backendInit "github.com/opentofu/opentofu/internal/backend/init" backendLocal "github.com/opentofu/opentofu/internal/backend/local" @@ -227,7 +227,7 @@ func (m *Meta) selectWorkspace(b backend.Backend) error { // len is always 1 if using Name; 0 means we're using Tags and there // aren't any matching workspaces. Which might be normal and fine, so // let's just ask: - name, err := m.UIInput().Input(context.Background(), &opentf.InputOpts{ + name, err := m.UIInput().Input(context.Background(), &tofu.InputOpts{ Id: "create-workspace", Query: "\n[reset][bold][yellow]No workspaces found.[reset]", Description: fmt.Sprintf(inputCloudInitCreateWorkspace, strings.Join(c.WorkspaceMapping.Tags, ", ")), @@ -274,7 +274,7 @@ func (m *Meta) selectWorkspace(b backend.Backend) error { } // Otherwise, ask the user to select a workspace from the list of existing workspaces. - v, err := m.UIInput().Input(context.Background(), &opentf.InputOpts{ + v, err := m.UIInput().Input(context.Background(), &tofu.InputOpts{ Id: "select-workspace", Query: fmt.Sprintf( "\n[reset][bold][yellow]The currently selected workspace (%s) does not exist.[reset]", diff --git a/internal/command/meta_backend_migrate.go b/internal/command/meta_backend_migrate.go index 890f324ddb..bfe2434242 100644 --- a/internal/command/meta_backend_migrate.go +++ b/internal/command/meta_backend_migrate.go @@ -20,9 +20,9 @@ import ( "github.com/opentofu/opentofu/internal/command/arguments" "github.com/opentofu/opentofu/internal/command/clistate" "github.com/opentofu/opentofu/internal/command/views" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/states/statemgr" + "github.com/opentofu/opentofu/internal/tofu" ) type backendMigrateOpts struct { @@ -167,7 +167,7 @@ func (m *Meta) backendMigrateState_S_S(opts *backendMigrateOpts) error { if !migrate { var err error // Ask the user if they want to migrate their existing remote state - migrate, err = m.confirm(&opentf.InputOpts{ + migrate, err = m.confirm(&tofu.InputOpts{ Id: "backend-migrate-multistate-to-multistate", Query: fmt.Sprintf( "Do you want to migrate all workspaces to %q?", @@ -227,7 +227,7 @@ func (m *Meta) backendMigrateState_S_s(opts *backendMigrateOpts) error { if !migrate { var err error // Ask the user if they want to migrate their existing remote state - migrate, err = m.confirm(&opentf.InputOpts{ + migrate, err = m.confirm(&tofu.InputOpts{ Id: "backend-migrate-multistate-to-single", Query: fmt.Sprintf( "Destination state %q doesn't support workspaces.\n"+ @@ -460,15 +460,15 @@ func (m *Meta) backendMigrateState_s_s(opts *backendMigrateOpts) error { } func (m *Meta) backendMigrateEmptyConfirm(source, destination statemgr.Full, opts *backendMigrateOpts) (bool, error) { - var inputOpts *opentf.InputOpts + var inputOpts *tofu.InputOpts if opts.DestinationType == "cloud" { - inputOpts = &opentf.InputOpts{ + inputOpts = &tofu.InputOpts{ Id: "backend-migrate-copy-to-empty-cloud", Query: "Do you want to copy existing state to Terraform Cloud?", Description: fmt.Sprintf(strings.TrimSpace(inputBackendMigrateEmptyCloud), opts.SourceType), } } else { - inputOpts = &opentf.InputOpts{ + inputOpts = &tofu.InputOpts{ Id: "backend-migrate-copy-to-empty", Query: "Do you want to copy existing state to the new backend?", Description: fmt.Sprintf( @@ -510,9 +510,9 @@ func (m *Meta) backendMigrateNonEmptyConfirm( } // Ask for confirmation - var inputOpts *opentf.InputOpts + var inputOpts *tofu.InputOpts if opts.DestinationType == "cloud" { - inputOpts = &opentf.InputOpts{ + inputOpts = &tofu.InputOpts{ Id: "backend-migrate-to-tfc", Query: "Do you want to copy existing state to Terraform Cloud?", Description: fmt.Sprintf( @@ -520,7 +520,7 @@ func (m *Meta) backendMigrateNonEmptyConfirm( opts.SourceType, sourcePath, destinationPath), } } else { - inputOpts = &opentf.InputOpts{ + inputOpts = &tofu.InputOpts{ Id: "backend-migrate-to-backend", Query: "Do you want to copy existing state to the new backend?", Description: fmt.Sprintf( @@ -807,7 +807,7 @@ func (m *Meta) promptSingleToCloudSingleStateMigration(opts *backendMigrateOpts) migrate := opts.force if !migrate { var err error - migrate, err = m.confirm(&opentf.InputOpts{ + migrate, err = m.confirm(&tofu.InputOpts{ Id: "backend-migrate-state-single-to-cloud-single", Query: "Do you wish to proceed?", Description: strings.TrimSpace(tfcInputBackendMigrateStateSingleToCloudSingle), @@ -828,7 +828,7 @@ func (m *Meta) promptRemotePrefixToCloudTagsMigration(opts *backendMigrateOpts) migrate := opts.force if !migrate { var err error - migrate, err = m.confirm(&opentf.InputOpts{ + migrate, err = m.confirm(&tofu.InputOpts{ Id: "backend-migrate-remote-multistate-to-cloud", Query: "Do you wish to proceed?", Description: strings.TrimSpace(tfcInputBackendMigrateRemoteMultiToCloud), @@ -855,7 +855,7 @@ func (m *Meta) promptMultiToSingleCloudMigration(opts *backendMigrateOpts) error if !migrate { var err error // Ask the user if they want to migrate their existing remote state - migrate, err = m.confirm(&opentf.InputOpts{ + migrate, err = m.confirm(&tofu.InputOpts{ Id: "backend-migrate-multistate-to-single", Query: "Do you want to copy only your current workspace?", Description: fmt.Sprintf( @@ -884,7 +884,7 @@ func (m *Meta) promptNewWorkspaceName(destinationType string) (string, error) { } message = `[reset][bold][yellow]Terraform Cloud requires all workspaces to be given an explicit name.[reset]` } - name, err := m.UIInput().Input(context.Background(), &opentf.InputOpts{ + name, err := m.UIInput().Input(context.Background(), &tofu.InputOpts{ Id: "new-state-name", Query: message, Description: strings.TrimSpace(inputBackendNewWorkspaceName), @@ -899,7 +899,7 @@ func (m *Meta) promptNewWorkspaceName(destinationType string) (string, error) { func (m *Meta) promptMultiStateMigrationPattern(sourceType string) (string, error) { // This is not the first prompt a user would be presented with in the migration to TFC, so no // guard on m.input is needed here. - renameWorkspaces, err := m.UIInput().Input(context.Background(), &opentf.InputOpts{ + renameWorkspaces, err := m.UIInput().Input(context.Background(), &tofu.InputOpts{ Id: "backend-migrate-multistate-to-tfc", Query: fmt.Sprintf("[reset][bold][yellow]%s[reset]", "Would you like to rename your workspaces?"), Description: fmt.Sprintf(strings.TrimSpace(tfcInputBackendMigrateMultiToMulti), sourceType), @@ -917,7 +917,7 @@ func (m *Meta) promptMultiStateMigrationPattern(sourceType string) (string, erro return "*", nil } - pattern, err := m.UIInput().Input(context.Background(), &opentf.InputOpts{ + pattern, err := m.UIInput().Input(context.Background(), &tofu.InputOpts{ Id: "backend-migrate-multistate-to-tfc-pattern", Query: fmt.Sprintf("[reset][bold][yellow]%s[reset]", "How would you like to rename your workspaces?"), Description: strings.TrimSpace(tfcInputBackendMigrateMultiToMultiPattern), diff --git a/internal/command/meta_config.go b/internal/command/meta_config.go index a51156c7ba..2e102a7b59 100644 --- a/internal/command/meta_config.go +++ b/internal/command/meta_config.go @@ -21,9 +21,9 @@ import ( "github.com/opentofu/opentofu/internal/configs/configload" "github.com/opentofu/opentofu/internal/configs/configschema" "github.com/opentofu/opentofu/internal/initwd" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/registry" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) // normalizePath normalizes a given path so that it is, if possible, relative @@ -282,7 +282,7 @@ func (m *Meta) inputForSchema(given cty.Value, schema *configschema.Block) (cty. attrS := schema.Attributes[name] for { - strVal, err := input.Input(context.Background(), &opentf.InputOpts{ + strVal, err := input.Input(context.Background(), &tofu.InputOpts{ Id: name, Query: name, Description: attrS.Description, diff --git a/internal/command/meta_test.go b/internal/command/meta_test.go index bdf4a9fa5b..450a14d335 100644 --- a/internal/command/meta_test.go +++ b/internal/command/meta_test.go @@ -16,7 +16,7 @@ import ( "github.com/mitchellh/cli" "github.com/opentofu/opentofu/internal/backend" "github.com/opentofu/opentofu/internal/backend/local" - "github.com/opentofu/opentofu/internal/opentf" + "github.com/opentofu/opentofu/internal/tofu" ) func TestMetaColorize(t *testing.T) { @@ -89,7 +89,7 @@ func TestMetaInputMode(t *testing.T) { t.Fatalf("err: %s", err) } - if m.InputMode() != opentf.InputModeStd { + if m.InputMode() != tofu.InputModeStd { t.Fatalf("bad: %#v", m.InputMode()) } } @@ -108,11 +108,11 @@ func TestMetaInputMode_envVar(t *testing.T) { t.Fatalf("err: %s", err) } - off := opentf.InputMode(0) - on := opentf.InputModeStd + off := tofu.InputMode(0) + on := tofu.InputModeStd cases := []struct { EnvVar string - Expected opentf.InputMode + Expected tofu.InputMode }{ {"false", off}, {"0", off}, diff --git a/internal/command/meta_vars.go b/internal/command/meta_vars.go index 02c3ba05eb..edf51c1c19 100644 --- a/internal/command/meta_vars.go +++ b/internal/command/meta_vars.go @@ -14,8 +14,8 @@ import ( "github.com/opentofu/opentofu/internal/backend" "github.com/opentofu/opentofu/internal/configs" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) // VarEnvPrefix is the prefix for environment variables that represent values @@ -55,7 +55,7 @@ func (m *Meta) collectVariableValues() (map[string]backend.UnparsedVariableValue ret[name] = unparsedVariableValueString{ str: rawVal, name: name, - sourceType: opentf.ValueFromEnvVar, + sourceType: tofu.ValueFromEnvVar, } } } @@ -65,12 +65,12 @@ func (m *Meta) collectVariableValues() (map[string]backend.UnparsedVariableValue // (DefaultVarsFilename) along with the later-added search for all files // ending in .auto.tfvars. if _, err := os.Stat(DefaultVarsFilename); err == nil { - moreDiags := m.addVarsFromFile(DefaultVarsFilename, opentf.ValueFromAutoFile, ret) + moreDiags := m.addVarsFromFile(DefaultVarsFilename, tofu.ValueFromAutoFile, ret) diags = diags.Append(moreDiags) } const defaultVarsFilenameJSON = DefaultVarsFilename + ".json" if _, err := os.Stat(defaultVarsFilenameJSON); err == nil { - moreDiags := m.addVarsFromFile(defaultVarsFilenameJSON, opentf.ValueFromAutoFile, ret) + moreDiags := m.addVarsFromFile(defaultVarsFilenameJSON, tofu.ValueFromAutoFile, ret) diags = diags.Append(moreDiags) } if infos, err := os.ReadDir("."); err == nil { @@ -80,7 +80,7 @@ func (m *Meta) collectVariableValues() (map[string]backend.UnparsedVariableValue if !isAutoVarFile(name) { continue } - moreDiags := m.addVarsFromFile(name, opentf.ValueFromAutoFile, ret) + moreDiags := m.addVarsFromFile(name, tofu.ValueFromAutoFile, ret) diags = diags.Append(moreDiags) } } @@ -116,11 +116,11 @@ func (m *Meta) collectVariableValues() (map[string]backend.UnparsedVariableValue ret[name] = unparsedVariableValueString{ str: rawVal, name: name, - sourceType: opentf.ValueFromCLIArg, + sourceType: tofu.ValueFromCLIArg, } case "-var-file": - moreDiags := m.addVarsFromFile(rawFlag.Value, opentf.ValueFromNamedFile, ret) + moreDiags := m.addVarsFromFile(rawFlag.Value, tofu.ValueFromNamedFile, ret) diags = diags.Append(moreDiags) default: @@ -133,7 +133,7 @@ func (m *Meta) collectVariableValues() (map[string]backend.UnparsedVariableValue return ret, diags } -func (m *Meta) addVarsFromFile(filename string, sourceType opentf.ValueSourceType, to map[string]backend.UnparsedVariableValue) tfdiags.Diagnostics { +func (m *Meta) addVarsFromFile(filename string, sourceType tofu.ValueSourceType, to map[string]backend.UnparsedVariableValue) tfdiags.Diagnostics { var diags tfdiags.Diagnostics src, err := os.ReadFile(filename) @@ -228,17 +228,17 @@ func (m *Meta) addVarsFromFile(filename string, sourceType opentf.ValueSourceTyp // intended to deal with expressions inside "tfvars" files. type unparsedVariableValueExpression struct { expr hcl.Expression - sourceType opentf.ValueSourceType + sourceType tofu.ValueSourceType } -func (v unparsedVariableValueExpression) ParseVariableValue(mode configs.VariableParsingMode) (*opentf.InputValue, tfdiags.Diagnostics) { +func (v unparsedVariableValueExpression) ParseVariableValue(mode configs.VariableParsingMode) (*tofu.InputValue, tfdiags.Diagnostics) { var diags tfdiags.Diagnostics val, hclDiags := v.expr.Value(nil) // nil because no function calls or variable references are allowed here diags = diags.Append(hclDiags) rng := tfdiags.SourceRangeFromHCL(v.expr.Range()) - return &opentf.InputValue{ + return &tofu.InputValue{ Value: val, SourceType: v.sourceType, SourceRange: rng, @@ -252,16 +252,16 @@ func (v unparsedVariableValueExpression) ParseVariableValue(mode configs.Variabl type unparsedVariableValueString struct { str string name string - sourceType opentf.ValueSourceType + sourceType tofu.ValueSourceType } -func (v unparsedVariableValueString) ParseVariableValue(mode configs.VariableParsingMode) (*opentf.InputValue, tfdiags.Diagnostics) { +func (v unparsedVariableValueString) ParseVariableValue(mode configs.VariableParsingMode) (*tofu.InputValue, tfdiags.Diagnostics) { var diags tfdiags.Diagnostics val, hclDiags := mode.Parse(v.name, v.str) diags = diags.Append(hclDiags) - return &opentf.InputValue{ + return &tofu.InputValue{ Value: val, SourceType: v.sourceType, }, diags diff --git a/internal/command/plan_test.go b/internal/command/plan_test.go index bffe6de74f..fe6d824478 100644 --- a/internal/command/plan_test.go +++ b/internal/command/plan_test.go @@ -22,11 +22,11 @@ import ( backendinit "github.com/opentofu/opentofu/internal/backend/init" "github.com/opentofu/opentofu/internal/checks" "github.com/opentofu/opentofu/internal/configs/configschema" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/providers" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) func TestPlan(t *testing.T) { @@ -1435,7 +1435,7 @@ func TestPlan_parallelism(t *testing.T) { providerFactories := map[addrs.Provider]providers.Factory{} for i := 0; i < 10; i++ { name := fmt.Sprintf("test%d", i) - provider := &opentf.MockProvider{} + provider := &tofu.MockProvider{} provider.GetProviderSchemaResponse = &providers.GetProviderSchemaResponse{ ResourceTypes: map[string]providers.Schema{ name + "_instance": {Block: &configschema.Block{}}, @@ -1631,7 +1631,7 @@ func planFixtureSchema() *providers.GetProviderSchemaResponse { // operation with the configuration in testdata/plan. This mock has // GetSchemaResponse and PlanResourceChangeFn populated, with the plan // step just passing through the new object proposed by Terraform Core. -func planFixtureProvider() *opentf.MockProvider { +func planFixtureProvider() *tofu.MockProvider { p := testProvider() p.GetProviderSchemaResponse = planFixtureSchema() p.PlanResourceChangeFn = func(req providers.PlanResourceChangeRequest) providers.PlanResourceChangeResponse { @@ -1672,7 +1672,7 @@ func planVarsFixtureSchema() *providers.GetProviderSchemaResponse { // operation with the configuration in testdata/plan-vars. This mock has // GetSchemaResponse and PlanResourceChangeFn populated, with the plan // step just passing through the new object proposed by Terraform Core. -func planVarsFixtureProvider() *opentf.MockProvider { +func planVarsFixtureProvider() *tofu.MockProvider { p := testProvider() p.GetProviderSchemaResponse = planVarsFixtureSchema() p.PlanResourceChangeFn = func(req providers.PlanResourceChangeRequest) providers.PlanResourceChangeResponse { @@ -1694,7 +1694,7 @@ func planVarsFixtureProvider() *opentf.MockProvider { // planFixtureProvider returns a mock provider that is configured for basic // operation with the configuration in testdata/plan. This mock has // GetSchemaResponse and PlanResourceChangeFn populated, returning 3 warnings. -func planWarningsFixtureProvider() *opentf.MockProvider { +func planWarningsFixtureProvider() *tofu.MockProvider { p := testProvider() p.GetProviderSchemaResponse = planFixtureSchema() p.PlanResourceChangeFn = func(req providers.PlanResourceChangeRequest) providers.PlanResourceChangeResponse { diff --git a/internal/command/providers_schema_test.go b/internal/command/providers_schema_test.go index 1a8524ba31..988c2b02d6 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/opentofu/opentofu/internal/configs/configschema" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/providers" + "github.com/opentofu/opentofu/internal/tofu" "github.com/zclconf/go-cty/cty" ) @@ -116,7 +116,7 @@ type providerSchema struct { // testProvider returns a mock provider that is configured for basic // operation with the configuration in testdata/providers-schema. -func providersSchemaFixtureProvider() *opentf.MockProvider { +func providersSchemaFixtureProvider() *tofu.MockProvider { p := testProvider() p.GetProviderSchemaResponse = providersSchemaFixtureSchema() return p diff --git a/internal/command/show.go b/internal/command/show.go index eb2d743d0e..41a45da719 100644 --- a/internal/command/show.go +++ b/internal/command/show.go @@ -16,12 +16,12 @@ import ( "github.com/opentofu/opentofu/internal/command/arguments" "github.com/opentofu/opentofu/internal/command/views" "github.com/opentofu/opentofu/internal/configs" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/plans/planfile" "github.com/opentofu/opentofu/internal/states/statefile" "github.com/opentofu/opentofu/internal/states/statemgr" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) // Many of the methods we get data from can emit special error types if they're @@ -107,13 +107,13 @@ func (c *ShowCommand) Synopsis() string { return "Show the current state or a saved plan" } -func (c *ShowCommand) show(path string) (*plans.Plan, *cloudplan.RemotePlanJSON, *statefile.File, *configs.Config, *opentf.Schemas, tfdiags.Diagnostics) { +func (c *ShowCommand) show(path string) (*plans.Plan, *cloudplan.RemotePlanJSON, *statefile.File, *configs.Config, *tofu.Schemas, tfdiags.Diagnostics) { var diags, showDiags tfdiags.Diagnostics var plan *plans.Plan var jsonPlan *cloudplan.RemotePlanJSON var stateFile *statefile.File var config *configs.Config - var schemas *opentf.Schemas + var schemas *tofu.Schemas // No plan file or state file argument provided, // so get the latest state snapshot diff --git a/internal/command/show_test.go b/internal/command/show_test.go index b2a07bdb62..8b6cef8468 100644 --- a/internal/command/show_test.go +++ b/internal/command/show_test.go @@ -17,11 +17,11 @@ import ( "github.com/opentofu/opentofu/internal/addrs" "github.com/opentofu/opentofu/internal/configs/configschema" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/providers" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/states/statemgr" + "github.com/opentofu/opentofu/internal/tofu" "github.com/opentofu/opentofu/version" ) @@ -1054,7 +1054,7 @@ func showFixtureSensitiveSchema() *providers.GetProviderSchemaResponse { // GetSchemaResponse, PlanResourceChangeFn, and ApplyResourceChangeFn populated, // with the plan/apply steps just passing through the data determined by // Terraform Core. -func showFixtureProvider() *opentf.MockProvider { +func showFixtureProvider() *tofu.MockProvider { p := testProvider() p.GetProviderSchemaResponse = showFixtureSchema() p.ReadResourceFn = func(req providers.ReadResourceRequest) providers.ReadResourceResponse { @@ -1117,7 +1117,7 @@ func showFixtureProvider() *opentf.MockProvider { // GetSchemaResponse, PlanResourceChangeFn, and ApplyResourceChangeFn populated, // with the plan/apply steps just passing through the data determined by // Terraform Core. It also has a sensitive attribute in the provider schema. -func showFixtureSensitiveProvider() *opentf.MockProvider { +func showFixtureSensitiveProvider() *tofu.MockProvider { p := testProvider() p.GetProviderSchemaResponse = showFixtureSensitiveSchema() p.PlanResourceChangeFn = func(req providers.PlanResourceChangeRequest) providers.PlanResourceChangeResponse { diff --git a/internal/command/state_mv.go b/internal/command/state_mv.go index 1b04281258..ce6834c71c 100644 --- a/internal/command/state_mv.go +++ b/internal/command/state_mv.go @@ -14,9 +14,9 @@ import ( "github.com/opentofu/opentofu/internal/command/arguments" "github.com/opentofu/opentofu/internal/command/clistate" "github.com/opentofu/opentofu/internal/command/views" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) // StateMvCommand is a Command implementation that shows a single resource. @@ -398,7 +398,7 @@ func (c *StateMvCommand) Run(args []string) int { } // Get schemas, if possible, before writing state - var schemas *opentf.Schemas + var schemas *tofu.Schemas if isCloudMode(b) { var schemaDiags tfdiags.Diagnostics schemas, schemaDiags = c.MaybeGetSchemas(stateTo, nil) diff --git a/internal/command/state_push.go b/internal/command/state_push.go index 36efcff242..1d277cbf56 100644 --- a/internal/command/state_push.go +++ b/internal/command/state_push.go @@ -14,10 +14,10 @@ import ( "github.com/opentofu/opentofu/internal/command/arguments" "github.com/opentofu/opentofu/internal/command/clistate" "github.com/opentofu/opentofu/internal/command/views" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/states/statefile" "github.com/opentofu/opentofu/internal/states/statemgr" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) // StatePushCommand is a Command implementation that shows a single resource. @@ -134,7 +134,7 @@ func (c *StatePushCommand) Run(args []string) int { } // Get schemas, if possible, before writing state - var schemas *opentf.Schemas + var schemas *tofu.Schemas var diags tfdiags.Diagnostics if isCloudMode(b) { schemas, diags = c.MaybeGetSchemas(srcStateFile.State, nil) diff --git a/internal/command/state_replace_provider.go b/internal/command/state_replace_provider.go index 617d3b3e54..e6f06c3543 100644 --- a/internal/command/state_replace_provider.go +++ b/internal/command/state_replace_provider.go @@ -13,9 +13,9 @@ import ( "github.com/opentofu/opentofu/internal/command/arguments" "github.com/opentofu/opentofu/internal/command/clistate" "github.com/opentofu/opentofu/internal/command/views" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) // StateReplaceProviderCommand is a Command implementation that allows users @@ -173,7 +173,7 @@ func (c *StateReplaceProviderCommand) Run(args []string) int { } // Get schemas, if possible, before writing state - var schemas *opentf.Schemas + var schemas *tofu.Schemas if isCloudMode(b) { var schemaDiags tfdiags.Diagnostics schemas, schemaDiags = c.MaybeGetSchemas(state, nil) diff --git a/internal/command/state_rm.go b/internal/command/state_rm.go index e162f20813..3b6eced18e 100644 --- a/internal/command/state_rm.go +++ b/internal/command/state_rm.go @@ -13,8 +13,8 @@ import ( "github.com/opentofu/opentofu/internal/command/arguments" "github.com/opentofu/opentofu/internal/command/clistate" "github.com/opentofu/opentofu/internal/command/views" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) // StateRmCommand is a Command implementation that shows a single resource. @@ -123,7 +123,7 @@ func (c *StateRmCommand) Run(args []string) int { } // Get schemas, if possible, before writing state - var schemas *opentf.Schemas + var schemas *tofu.Schemas if isCloudMode(b) { var schemaDiags tfdiags.Diagnostics schemas, schemaDiags = c.MaybeGetSchemas(state, nil) diff --git a/internal/command/taint.go b/internal/command/taint.go index 115b4a5ae1..7ca30b4905 100644 --- a/internal/command/taint.go +++ b/internal/command/taint.go @@ -11,9 +11,9 @@ import ( "github.com/opentofu/opentofu/internal/command/arguments" "github.com/opentofu/opentofu/internal/command/clistate" "github.com/opentofu/opentofu/internal/command/views" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) // TaintCommand is a cli.Command implementation that manually taints @@ -130,7 +130,7 @@ func (c *TaintCommand) Run(args []string) int { } // Get schemas, if possible, before writing state - var schemas *opentf.Schemas + var schemas *tofu.Schemas if isCloudMode(b) { var schemaDiags tfdiags.Diagnostics schemas, schemaDiags = c.MaybeGetSchemas(state, nil) diff --git a/internal/command/test.go b/internal/command/test.go index 743212ab11..b7a2826349 100644 --- a/internal/command/test.go +++ b/internal/command/test.go @@ -20,10 +20,10 @@ import ( "github.com/opentofu/opentofu/internal/configs" "github.com/opentofu/opentofu/internal/logging" "github.com/opentofu/opentofu/internal/moduletest" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) const ( @@ -308,7 +308,7 @@ type TestSuiteRunner struct { Config *configs.Config GlobalVariables map[string]backend.UnparsedVariableValue - Opts *opentf.ContextOpts + Opts *tofu.ContextOpts View views.Test @@ -615,7 +615,7 @@ func (runner *TestFileRunner) validate(config *configs.Config, run *moduletest.R var diags tfdiags.Diagnostics - tfCtx, ctxDiags := opentf.NewContext(runner.Suite.Opts) + tfCtx, ctxDiags := tofu.NewContext(runner.Suite.Opts) diags = diags.Append(ctxDiags) if ctxDiags.HasErrors() { return diags @@ -662,12 +662,12 @@ func (runner *TestFileRunner) destroy(config *configs.Config, state *states.Stat return state, diags } - planOpts := &opentf.PlanOpts{ + planOpts := &tofu.PlanOpts{ Mode: plans.DestroyMode, SetVariables: variables, } - tfCtx, ctxDiags := opentf.NewContext(runner.Suite.Opts) + tfCtx, ctxDiags := tofu.NewContext(runner.Suite.Opts) diags = diags.Append(ctxDiags) if ctxDiags.HasErrors() { return state, diags @@ -703,7 +703,7 @@ func (runner *TestFileRunner) destroy(config *configs.Config, state *states.Stat return updated, diags } -func (runner *TestFileRunner) plan(config *configs.Config, state *states.State, run *moduletest.Run, file *moduletest.File) (*opentf.Context, *plans.Plan, tfdiags.Diagnostics) { +func (runner *TestFileRunner) plan(config *configs.Config, state *states.State, run *moduletest.Run, file *moduletest.File) (*tofu.Context, *plans.Plan, tfdiags.Diagnostics) { log.Printf("[TRACE] TestFileRunner: called plan for %s/%s", file.Name, run.Name) var diags tfdiags.Diagnostics @@ -724,7 +724,7 @@ func (runner *TestFileRunner) plan(config *configs.Config, state *states.State, return nil, nil, diags } - planOpts := &opentf.PlanOpts{ + planOpts := &tofu.PlanOpts{ Mode: func() plans.Mode { switch run.Config.Options.Mode { case configs.RefreshOnlyTestMode: @@ -740,7 +740,7 @@ func (runner *TestFileRunner) plan(config *configs.Config, state *states.State, ExternalReferences: references, } - tfCtx, ctxDiags := opentf.NewContext(runner.Suite.Opts) + tfCtx, ctxDiags := tofu.NewContext(runner.Suite.Opts) diags = diags.Append(ctxDiags) if ctxDiags.HasErrors() { return nil, nil, diags @@ -770,7 +770,7 @@ func (runner *TestFileRunner) plan(config *configs.Config, state *states.State, return tfCtx, plan, diags } -func (runner *TestFileRunner) apply(plan *plans.Plan, state *states.State, config *configs.Config, run *moduletest.Run, file *moduletest.File) (*opentf.Context, *states.State, tfdiags.Diagnostics) { +func (runner *TestFileRunner) apply(plan *plans.Plan, state *states.State, config *configs.Config, run *moduletest.Run, file *moduletest.File) (*tofu.Context, *states.State, tfdiags.Diagnostics) { log.Printf("[TRACE] TestFileRunner: called apply for %s/%s", file.Name, run.Name) var diags tfdiags.Diagnostics @@ -794,7 +794,7 @@ func (runner *TestFileRunner) apply(plan *plans.Plan, state *states.State, confi created = append(created, change) } - tfCtx, ctxDiags := opentf.NewContext(runner.Suite.Opts) + tfCtx, ctxDiags := tofu.NewContext(runner.Suite.Opts) diags = diags.Append(ctxDiags) if ctxDiags.HasErrors() { return nil, state, diags @@ -824,7 +824,7 @@ func (runner *TestFileRunner) apply(plan *plans.Plan, state *states.State, confi return tfCtx, updated, diags } -func (runner *TestFileRunner) wait(ctx *opentf.Context, runningCtx context.Context, run *moduletest.Run, file *moduletest.File, created []*plans.ResourceInstanceChangeSrc) (diags tfdiags.Diagnostics, cancelled bool) { +func (runner *TestFileRunner) wait(ctx *tofu.Context, runningCtx context.Context, run *moduletest.Run, file *moduletest.File, created []*plans.ResourceInstanceChangeSrc) (diags tfdiags.Diagnostics, cancelled bool) { var identifier string if file == nil { identifier = "validate" @@ -997,13 +997,13 @@ func (runner *TestFileRunner) Cleanup(file *moduletest.File) { // helper functions -// buildInputVariablesForTest creates a opentf.InputValues mapping for +// buildInputVariablesForTest creates a tofu.InputValues mapping for // variable values that are relevant to the config being tested. // // Crucially, it differs from prepareInputVariablesForAssertions in that it only // includes variables that are reference by the config and not everything that // is defined within the test run block and test file. -func buildInputVariablesForTest(run *moduletest.Run, file *moduletest.File, config *configs.Config, globals map[string]backend.UnparsedVariableValue) (opentf.InputValues, tfdiags.Diagnostics) { +func buildInputVariablesForTest(run *moduletest.Run, file *moduletest.File, config *configs.Config, globals map[string]backend.UnparsedVariableValue) (tofu.InputValues, tfdiags.Diagnostics) { variables := make(map[string]backend.UnparsedVariableValue) for name := range config.Module.Variables { if run != nil { @@ -1011,7 +1011,7 @@ func buildInputVariablesForTest(run *moduletest.Run, file *moduletest.File, conf // Local variables take precedence. variables[name] = unparsedVariableValueExpression{ expr: expr, - sourceType: opentf.ValueFromConfig, + sourceType: tofu.ValueFromConfig, } continue } @@ -1022,7 +1022,7 @@ func buildInputVariablesForTest(run *moduletest.Run, file *moduletest.File, conf // If it's not set locally, it maybe set for the entire file. variables[name] = unparsedVariableValueExpression{ expr: expr, - sourceType: opentf.ValueFromConfig, + sourceType: tofu.ValueFromConfig, } continue } @@ -1043,7 +1043,7 @@ func buildInputVariablesForTest(run *moduletest.Run, file *moduletest.File, conf return backend.ParseVariableValues(variables, config.Module.Variables) } -// prepareInputVariablesForAssertions creates a opentf.InputValues mapping +// prepareInputVariablesForAssertions creates a tofu.InputValues mapping // that contains all the variables defined for a given run and file, alongside // any unset variables that have defaults within the provided config. // @@ -1055,14 +1055,14 @@ func buildInputVariablesForTest(run *moduletest.Run, file *moduletest.File, conf // In addition, it modifies the provided config so that any variables that are // available are also defined in the config. It returns a function that resets // the config which must be called so the config can be reused going forward. -func prepareInputVariablesForAssertions(config *configs.Config, run *moduletest.Run, file *moduletest.File, globals map[string]backend.UnparsedVariableValue) (opentf.InputValues, func(), tfdiags.Diagnostics) { +func prepareInputVariablesForAssertions(config *configs.Config, run *moduletest.Run, file *moduletest.File, globals map[string]backend.UnparsedVariableValue) (tofu.InputValues, func(), tfdiags.Diagnostics) { variables := make(map[string]backend.UnparsedVariableValue) if run != nil { for name, expr := range run.Config.Variables { variables[name] = unparsedVariableValueExpression{ expr: expr, - sourceType: opentf.ValueFromConfig, + sourceType: tofu.ValueFromConfig, } } } @@ -1076,7 +1076,7 @@ func prepareInputVariablesForAssertions(config *configs.Config, run *moduletest. } variables[name] = unparsedVariableValueExpression{ expr: expr, - sourceType: opentf.ValueFromConfig, + sourceType: tofu.ValueFromConfig, } } } @@ -1094,7 +1094,7 @@ func prepareInputVariablesForAssertions(config *configs.Config, run *moduletest. // We've gathered all the values we have, let's convert them into // terraform.InputValues so they can be passed into the Terraform graph. - inputs := make(opentf.InputValues, len(variables)) + inputs := make(tofu.InputValues, len(variables)) var diags tfdiags.Diagnostics for name, variable := range variables { value, valueDiags := variable.ParseVariableValue(configs.VariableParseLiteral) @@ -1114,9 +1114,9 @@ func prepareInputVariablesForAssertions(config *configs.Config, run *moduletest. } if variable.Default != cty.NilVal { - inputs[name] = &opentf.InputValue{ + inputs[name] = &tofu.InputValue{ Value: variable.Default, - SourceType: opentf.ValueFromConfig, + SourceType: tofu.ValueFromConfig, SourceRange: tfdiags.SourceRangeFromHCL(variable.DeclRange), } } diff --git a/internal/command/test_test.go b/internal/command/test_test.go index 5efb68b929..01e74c81af 100644 --- a/internal/command/test_test.go +++ b/internal/command/test_test.go @@ -1038,7 +1038,7 @@ The plan was created with the -target option in effect, so some changes requested in the configuration may have been ignored and the output values may not be fully updated. Run the following command to verify that no other changes are pending: - opentf plan + tofu plan Note that the -target option is not suitable for routine use, and is provided only for exceptional situations such as recovering from errors or mistakes, @@ -1069,7 +1069,7 @@ The plan was created with the -target option in effect, so some changes requested in the configuration may have been ignored and the output values may not be fully updated. Run the following command to verify that no other changes are pending: - opentf plan + tofu plan Note that the -target option is not suitable for routine use, and is provided only for exceptional situations such as recovering from errors or mistakes, diff --git a/internal/command/testing/test_provider.go b/internal/command/testing/test_provider.go index b77557b032..360b2686ac 100644 --- a/internal/command/testing/test_provider.go +++ b/internal/command/testing/test_provider.go @@ -11,9 +11,9 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/opentofu/opentofu/internal/configs/configschema" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/providers" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) var ( @@ -54,7 +54,7 @@ var ( // TestProvider is a wrapper around terraform.MockProvider that defines dynamic // schemas, and keeps track of the resources and data sources that it contains. type TestProvider struct { - Provider *opentf.MockProvider + Provider *tofu.MockProvider data, resource cty.Value @@ -71,7 +71,7 @@ func NewProvider(store *ResourceStore) *TestProvider { } provider := &TestProvider{ - Provider: new(opentf.MockProvider), + Provider: new(tofu.MockProvider), Store: store, } diff --git a/internal/command/ui_input.go b/internal/command/ui_input.go index 947ce78a82..4116db203d 100644 --- a/internal/command/ui_input.go +++ b/internal/command/ui_input.go @@ -21,7 +21,7 @@ import ( "github.com/bgentry/speakeasy" "github.com/mattn/go-isatty" "github.com/mitchellh/colorstring" - "github.com/opentofu/opentofu/internal/opentf" + "github.com/opentofu/opentofu/internal/tofu" ) var defaultInputReader io.Reader @@ -49,7 +49,7 @@ type UIInput struct { once sync.Once } -func (i *UIInput) Input(ctx context.Context, opts *opentf.InputOpts) (string, error) { +func (i *UIInput) Input(ctx context.Context, opts *tofu.InputOpts) (string, error) { i.once.Do(i.init) r := i.Reader diff --git a/internal/command/ui_input_test.go b/internal/command/ui_input_test.go index 1d5d9ad629..38e7fb677e 100644 --- a/internal/command/ui_input_test.go +++ b/internal/command/ui_input_test.go @@ -12,11 +12,11 @@ import ( "testing" "time" - "github.com/opentofu/opentofu/internal/opentf" + "github.com/opentofu/opentofu/internal/tofu" ) func TestUIInput_impl(t *testing.T) { - var _ opentf.UIInput = new(UIInput) + var _ tofu.UIInput = new(UIInput) } func TestUIInputInput(t *testing.T) { @@ -25,7 +25,7 @@ func TestUIInputInput(t *testing.T) { Writer: bytes.NewBuffer(nil), } - v, err := i.Input(context.Background(), &opentf.InputOpts{}) + v, err := i.Input(context.Background(), &tofu.InputOpts{}) if err != nil { t.Fatalf("unexpected error: %v", err) } @@ -52,7 +52,7 @@ func TestUIInputInput_canceled(t *testing.T) { }() // Get input until the context is canceled. - v, err := i.Input(ctx, &opentf.InputOpts{}) + v, err := i.Input(ctx, &tofu.InputOpts{}) if err != context.Canceled { t.Fatalf("expected a context.Canceled error, got: %v", err) } @@ -75,7 +75,7 @@ func TestUIInputInput_canceled(t *testing.T) { w.Close() }() - v, err = i.Input(context.Background(), &opentf.InputOpts{}) + v, err = i.Input(context.Background(), &tofu.InputOpts{}) if err != nil { t.Fatalf("unexpected error: %v", err) } @@ -91,7 +91,7 @@ func TestUIInputInput_spaces(t *testing.T) { Writer: bytes.NewBuffer(nil), } - v, err := i.Input(context.Background(), &opentf.InputOpts{}) + v, err := i.Input(context.Background(), &tofu.InputOpts{}) if err != nil { t.Fatalf("unexpected error: %v", err) } @@ -107,7 +107,7 @@ func TestUIInputInput_Error(t *testing.T) { Writer: bytes.NewBuffer(nil), } - v, err := i.Input(context.Background(), &opentf.InputOpts{}) + v, err := i.Input(context.Background(), &tofu.InputOpts{}) if err == nil { t.Fatalf("Error is not 'nil'") } diff --git a/internal/command/unlock.go b/internal/command/unlock.go index 101fb68973..2af37ccc7e 100644 --- a/internal/command/unlock.go +++ b/internal/command/unlock.go @@ -12,8 +12,8 @@ import ( "github.com/mitchellh/cli" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) // UnlockCommand is a cli.Command implementation that manually unlocks @@ -94,7 +94,7 @@ func (c *UnlockCommand) Run(args []string) int { "This will allow local OpenTF commands to modify this state, even though it\n" + "may still be in use. Only 'yes' will be accepted to confirm." - v, err := c.UIInput().Input(context.Background(), &opentf.InputOpts{ + v, err := c.UIInput().Input(context.Background(), &tofu.InputOpts{ Id: "force-unlock", Query: "Do you really want to force-unlock?", Description: desc, diff --git a/internal/command/untaint.go b/internal/command/untaint.go index 564472e46b..5d73684eaa 100644 --- a/internal/command/untaint.go +++ b/internal/command/untaint.go @@ -11,9 +11,9 @@ import ( "github.com/opentofu/opentofu/internal/command/arguments" "github.com/opentofu/opentofu/internal/command/clistate" "github.com/opentofu/opentofu/internal/command/views" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) // UntaintCommand is a cli.Command implementation that manually untaints @@ -169,7 +169,7 @@ func (c *UntaintCommand) Run(args []string) int { } // Get schemas, if possible, before writing state - var schemas *opentf.Schemas + var schemas *tofu.Schemas if isCloudMode(b) { var schemaDiags tfdiags.Diagnostics schemas, schemaDiags = c.MaybeGetSchemas(state, nil) diff --git a/internal/command/validate.go b/internal/command/validate.go index 52022c7003..14333c3d52 100644 --- a/internal/command/validate.go +++ b/internal/command/validate.go @@ -12,8 +12,8 @@ import ( "github.com/opentofu/opentofu/internal/command/arguments" "github.com/opentofu/opentofu/internal/command/views" "github.com/opentofu/opentofu/internal/configs" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) // ValidateCommand is a Command implementation that validates the terraform files @@ -88,7 +88,7 @@ func (c *ValidateCommand) validate(dir, testDir string, noTests bool) tfdiags.Di return diags } - tfCtx, ctxDiags := opentf.NewContext(opts) + tfCtx, ctxDiags := tofu.NewContext(opts) diags = diags.Append(ctxDiags) if ctxDiags.HasErrors() { return diags diff --git a/internal/command/views/apply.go b/internal/command/views/apply.go index f41d825b70..a44ec4b4da 100644 --- a/internal/command/views/apply.go +++ b/internal/command/views/apply.go @@ -9,9 +9,9 @@ import ( "github.com/opentofu/opentofu/internal/command/arguments" "github.com/opentofu/opentofu/internal/command/format" "github.com/opentofu/opentofu/internal/command/views/json" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) // The Apply view is used for the apply command. @@ -20,7 +20,7 @@ type Apply interface { Outputs(outputValues map[string]*states.OutputValue) Operation() Operation - Hooks() []opentf.Hook + Hooks() []tofu.Hook Diagnostics(diags tfdiags.Diagnostics) HelpPrompt() @@ -99,8 +99,8 @@ func (v *ApplyHuman) Operation() Operation { return NewOperation(arguments.ViewHuman, v.inAutomation, v.view) } -func (v *ApplyHuman) Hooks() []opentf.Hook { - return []opentf.Hook{ +func (v *ApplyHuman) Hooks() []tofu.Hook { + return []tofu.Hook{ v.countHook, NewUiHook(v.view), } @@ -159,8 +159,8 @@ func (v *ApplyJSON) Operation() Operation { return &OperationJSON{view: v.view} } -func (v *ApplyJSON) Hooks() []opentf.Hook { - return []opentf.Hook{ +func (v *ApplyJSON) Hooks() []tofu.Hook { + return []tofu.Hook{ v.countHook, newJSONHook(v.view), } diff --git a/internal/command/views/hook_count.go b/internal/command/views/hook_count.go index 153097dc9b..3b2fd29f1e 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/opentofu/opentofu/internal/addrs" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/states" + "github.com/opentofu/opentofu/internal/tofu" ) // countHook is a hook that counts the number of resources @@ -30,10 +30,10 @@ type countHook struct { pending map[string]plans.Action sync.Mutex - opentf.NilHook + tofu.NilHook } -var _ opentf.Hook = (*countHook)(nil) +var _ tofu.Hook = (*countHook)(nil) func (h *countHook) Reset() { h.Lock() @@ -46,7 +46,7 @@ func (h *countHook) Reset() { h.Imported = 0 } -func (h *countHook) PreApply(addr addrs.AbsResourceInstance, gen states.Generation, action plans.Action, priorState, plannedNewState cty.Value) (opentf.HookAction, error) { +func (h *countHook) PreApply(addr addrs.AbsResourceInstance, gen states.Generation, action plans.Action, priorState, plannedNewState cty.Value) (tofu.HookAction, error) { h.Lock() defer h.Unlock() @@ -56,10 +56,10 @@ func (h *countHook) PreApply(addr addrs.AbsResourceInstance, gen states.Generati h.pending[addr.String()] = action - return opentf.HookActionContinue, nil + return tofu.HookActionContinue, nil } -func (h *countHook) PostApply(addr addrs.AbsResourceInstance, gen states.Generation, newState cty.Value, err error) (opentf.HookAction, error) { +func (h *countHook) PostApply(addr addrs.AbsResourceInstance, gen states.Generation, newState cty.Value, err error) (tofu.HookAction, error) { h.Lock() defer h.Unlock() @@ -84,16 +84,16 @@ func (h *countHook) PostApply(addr addrs.AbsResourceInstance, gen states.Generat } } - return opentf.HookActionContinue, nil + return tofu.HookActionContinue, nil } -func (h *countHook) PostDiff(addr addrs.AbsResourceInstance, gen states.Generation, action plans.Action, priorState, plannedNewState cty.Value) (opentf.HookAction, error) { +func (h *countHook) PostDiff(addr addrs.AbsResourceInstance, gen states.Generation, action plans.Action, priorState, plannedNewState cty.Value) (tofu.HookAction, error) { h.Lock() defer h.Unlock() // We don't count anything for data resources if addr.Resource.Resource.Mode == addrs.DataResourceMode { - return opentf.HookActionContinue, nil + return tofu.HookActionContinue, nil } switch action { @@ -107,13 +107,13 @@ func (h *countHook) PostDiff(addr addrs.AbsResourceInstance, gen states.Generati h.ToChange += 1 } - return opentf.HookActionContinue, nil + return tofu.HookActionContinue, nil } -func (h *countHook) PostApplyImport(addr addrs.AbsResourceInstance, importing plans.ImportingSrc) (opentf.HookAction, error) { +func (h *countHook) PostApplyImport(addr addrs.AbsResourceInstance, importing plans.ImportingSrc) (tofu.HookAction, error) { h.Lock() defer h.Unlock() h.Imported++ - return opentf.HookActionContinue, nil + return tofu.HookActionContinue, nil } diff --git a/internal/command/views/hook_count_test.go b/internal/command/views/hook_count_test.go index 12e11c6d20..f5a1a275d5 100644 --- a/internal/command/views/hook_count_test.go +++ b/internal/command/views/hook_count_test.go @@ -10,15 +10,15 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/opentofu/opentofu/internal/addrs" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/states" + "github.com/opentofu/opentofu/internal/tofu" legacy "github.com/opentofu/opentofu/internal/legacy/opentf" ) func TestCountHook_impl(t *testing.T) { - var _ opentf.Hook = new(countHook) + var _ tofu.Hook = new(countHook) } func TestCountHookPostDiff_DestroyDeposed(t *testing.T) { diff --git a/internal/command/views/hook_json.go b/internal/command/views/hook_json.go index f2b09fdf8d..9cfdbcee14 100644 --- a/internal/command/views/hook_json.go +++ b/internal/command/views/hook_json.go @@ -15,9 +15,9 @@ import ( "github.com/opentofu/opentofu/internal/addrs" "github.com/opentofu/opentofu/internal/command/format" "github.com/opentofu/opentofu/internal/command/views/json" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/states" + "github.com/opentofu/opentofu/internal/tofu" ) // How long to wait between sending heartbeat/progress messages @@ -33,7 +33,7 @@ func newJSONHook(view *JSONView) *jsonHook { } type jsonHook struct { - opentf.NilHook + tofu.NilHook view *JSONView @@ -47,7 +47,7 @@ type jsonHook struct { timeAfter func(time.Duration) <-chan time.Time } -var _ opentf.Hook = (*jsonHook)(nil) +var _ tofu.Hook = (*jsonHook)(nil) type applyProgress struct { addr addrs.AbsResourceInstance @@ -62,7 +62,7 @@ type applyProgress struct { heartbeatDone chan struct{} } -func (h *jsonHook) PreApply(addr addrs.AbsResourceInstance, gen states.Generation, action plans.Action, priorState, plannedNewState cty.Value) (opentf.HookAction, error) { +func (h *jsonHook) PreApply(addr addrs.AbsResourceInstance, gen states.Generation, action plans.Action, priorState, plannedNewState cty.Value) (tofu.HookAction, error) { if action != plans.NoOp { idKey, idValue := format.ObjectValueIDOrName(priorState) h.view.Hook(json.NewApplyStart(addr, action, idKey, idValue)) @@ -82,7 +82,7 @@ func (h *jsonHook) PreApply(addr addrs.AbsResourceInstance, gen states.Generatio if action != plans.NoOp { go h.applyingHeartbeat(progress) } - return opentf.HookActionContinue, nil + return tofu.HookActionContinue, nil } func (h *jsonHook) applyingHeartbeat(progress applyProgress) { @@ -99,7 +99,7 @@ func (h *jsonHook) applyingHeartbeat(progress applyProgress) { } } -func (h *jsonHook) PostApply(addr addrs.AbsResourceInstance, gen states.Generation, newState cty.Value, err error) (opentf.HookAction, error) { +func (h *jsonHook) PostApply(addr addrs.AbsResourceInstance, gen states.Generation, newState cty.Value, err error) (tofu.HookAction, error) { key := addr.String() h.applyingLock.Lock() progress := h.applying[key] @@ -110,7 +110,7 @@ func (h *jsonHook) PostApply(addr addrs.AbsResourceInstance, gen states.Generati h.applyingLock.Unlock() if progress.action == plans.NoOp { - return opentf.HookActionContinue, nil + return tofu.HookActionContinue, nil } elapsed := h.timeNow().Round(time.Second).Sub(progress.start) @@ -124,15 +124,15 @@ func (h *jsonHook) PostApply(addr addrs.AbsResourceInstance, gen states.Generati idKey, idValue := format.ObjectValueID(newState) h.view.Hook(json.NewApplyComplete(addr, progress.action, idKey, idValue, elapsed)) } - return opentf.HookActionContinue, nil + return tofu.HookActionContinue, nil } -func (h *jsonHook) PreProvisionInstanceStep(addr addrs.AbsResourceInstance, typeName string) (opentf.HookAction, error) { +func (h *jsonHook) PreProvisionInstanceStep(addr addrs.AbsResourceInstance, typeName string) (tofu.HookAction, error) { h.view.Hook(json.NewProvisionStart(addr, typeName)) - return opentf.HookActionContinue, nil + return tofu.HookActionContinue, nil } -func (h *jsonHook) PostProvisionInstanceStep(addr addrs.AbsResourceInstance, typeName string, err error) (opentf.HookAction, error) { +func (h *jsonHook) PostProvisionInstanceStep(addr addrs.AbsResourceInstance, typeName string, err error) (tofu.HookAction, error) { if err != nil { // Errors are collected and displayed post-apply, so no need to // re-render them here. Instead just signal that this provisioner step @@ -141,7 +141,7 @@ func (h *jsonHook) PostProvisionInstanceStep(addr addrs.AbsResourceInstance, typ } else { h.view.Hook(json.NewProvisionComplete(addr, typeName)) } - return opentf.HookActionContinue, nil + return tofu.HookActionContinue, nil } func (h *jsonHook) ProvisionOutput(addr addrs.AbsResourceInstance, typeName string, msg string) { @@ -155,14 +155,14 @@ func (h *jsonHook) ProvisionOutput(addr addrs.AbsResourceInstance, typeName stri } } -func (h *jsonHook) PreRefresh(addr addrs.AbsResourceInstance, gen states.Generation, priorState cty.Value) (opentf.HookAction, error) { +func (h *jsonHook) PreRefresh(addr addrs.AbsResourceInstance, gen states.Generation, priorState cty.Value) (tofu.HookAction, error) { idKey, idValue := format.ObjectValueID(priorState) h.view.Hook(json.NewRefreshStart(addr, idKey, idValue)) - return opentf.HookActionContinue, nil + return tofu.HookActionContinue, nil } -func (h *jsonHook) PostRefresh(addr addrs.AbsResourceInstance, gen states.Generation, priorState cty.Value, newState cty.Value) (opentf.HookAction, error) { +func (h *jsonHook) PostRefresh(addr addrs.AbsResourceInstance, gen states.Generation, priorState cty.Value, newState cty.Value) (tofu.HookAction, error) { idKey, idValue := format.ObjectValueID(newState) h.view.Hook(json.NewRefreshComplete(addr, idKey, idValue)) - return opentf.HookActionContinue, nil + return tofu.HookActionContinue, nil } diff --git a/internal/command/views/hook_json_test.go b/internal/command/views/hook_json_test.go index 045b30f38f..d00b3505b4 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/opentofu/opentofu/internal/addrs" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/terminal" + "github.com/opentofu/opentofu/internal/tofu" "github.com/zclconf/go-cty/cty" ) @@ -329,13 +329,13 @@ func TestJSONHook_refresh(t *testing.T) { testJSONViewOutputEquals(t, done(t).Stdout(), want) } -func testHookReturnValues(t *testing.T, action opentf.HookAction, err error) { +func testHookReturnValues(t *testing.T, action tofu.HookAction, err error) { t.Helper() if err != nil { t.Fatal(err) } - if action != opentf.HookActionContinue { + if action != tofu.HookActionContinue { t.Fatalf("Expected hook to continue, given: %#v", action) } } diff --git a/internal/command/views/hook_ui.go b/internal/command/views/hook_ui.go index f7ce5a35d2..605ec705cd 100644 --- a/internal/command/views/hook_ui.go +++ b/internal/command/views/hook_ui.go @@ -16,10 +16,10 @@ import ( "github.com/opentofu/opentofu/internal/addrs" "github.com/opentofu/opentofu/internal/command/format" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/providers" "github.com/opentofu/opentofu/internal/states" + "github.com/opentofu/opentofu/internal/tofu" ) const defaultPeriodicUiTimer = 10 * time.Second @@ -34,7 +34,7 @@ func NewUiHook(view *View) *UiHook { } type UiHook struct { - opentf.NilHook + tofu.NilHook view *View viewLock sync.Mutex @@ -45,7 +45,7 @@ type UiHook struct { resourcesLock sync.Mutex } -var _ opentf.Hook = (*UiHook)(nil) +var _ tofu.Hook = (*UiHook)(nil) // uiResourceState tracks the state of a single resource type uiResourceState struct { @@ -71,7 +71,7 @@ const ( uiResourceNoOp ) -func (h *UiHook) PreApply(addr addrs.AbsResourceInstance, gen states.Generation, action plans.Action, priorState, plannedNewState cty.Value) (opentf.HookAction, error) { +func (h *UiHook) PreApply(addr addrs.AbsResourceInstance, gen states.Generation, action plans.Action, priorState, plannedNewState cty.Value) (tofu.HookAction, error) { dispAddr := addr.String() if gen != states.CurrentGen { dispAddr = fmt.Sprintf("%s (deposed object %s)", dispAddr, gen) @@ -99,7 +99,7 @@ func (h *UiHook) PreApply(addr addrs.AbsResourceInstance, gen states.Generation, // We don't expect any other actions in here, so anything else is a // bug in the caller but we'll ignore it in order to be robust. h.println(fmt.Sprintf("(Unknown action %s for %s)", action, dispAddr)) - return opentf.HookActionContinue, nil + return tofu.HookActionContinue, nil } var stateIdSuffix string @@ -141,7 +141,7 @@ func (h *UiHook) PreApply(addr addrs.AbsResourceInstance, gen states.Generation, go h.stillApplying(uiState) } - return opentf.HookActionContinue, nil + return tofu.HookActionContinue, nil } func (h *UiHook) stillApplying(state uiResourceState) { @@ -184,7 +184,7 @@ func (h *UiHook) stillApplying(state uiResourceState) { } } -func (h *UiHook) PostApply(addr addrs.AbsResourceInstance, gen states.Generation, newState cty.Value, applyerr error) (opentf.HookAction, error) { +func (h *UiHook) PostApply(addr addrs.AbsResourceInstance, gen states.Generation, newState cty.Value, applyerr error) (tofu.HookAction, error) { id := addr.String() h.resourcesLock.Lock() @@ -213,14 +213,14 @@ func (h *UiHook) PostApply(addr addrs.AbsResourceInstance, gen states.Generation msg = "Read complete" case uiResourceNoOp: // We don't make any announcements about no-op changes - return opentf.HookActionContinue, nil + return tofu.HookActionContinue, nil case uiResourceUnknown: - return opentf.HookActionContinue, nil + return tofu.HookActionContinue, nil } if applyerr != nil { // Errors are collected and printed in ApplyCommand, no need to duplicate - return opentf.HookActionContinue, nil + return tofu.HookActionContinue, nil } addrStr := addr.String() @@ -234,15 +234,15 @@ func (h *UiHook) PostApply(addr addrs.AbsResourceInstance, gen states.Generation h.println(colorized) - return opentf.HookActionContinue, nil + return tofu.HookActionContinue, nil } -func (h *UiHook) PreProvisionInstanceStep(addr addrs.AbsResourceInstance, typeName string) (opentf.HookAction, error) { +func (h *UiHook) PreProvisionInstanceStep(addr addrs.AbsResourceInstance, typeName string) (tofu.HookAction, error) { h.println(fmt.Sprintf( h.view.colorize.Color("[reset][bold]%s: Provisioning with '%s'...[reset]"), addr, typeName, )) - return opentf.HookActionContinue, nil + return tofu.HookActionContinue, nil } func (h *UiHook) ProvisionOutput(addr addrs.AbsResourceInstance, typeName string, msg string) { @@ -264,7 +264,7 @@ func (h *UiHook) ProvisionOutput(addr addrs.AbsResourceInstance, typeName string h.println(strings.TrimSpace(buf.String())) } -func (h *UiHook) PreRefresh(addr addrs.AbsResourceInstance, gen states.Generation, priorState cty.Value) (opentf.HookAction, error) { +func (h *UiHook) PreRefresh(addr addrs.AbsResourceInstance, gen states.Generation, priorState cty.Value) (tofu.HookAction, error) { var stateIdSuffix string if k, v := format.ObjectValueID(priorState); k != "" && v != "" { stateIdSuffix = fmt.Sprintf(" [%s=%s]", k, v) @@ -278,18 +278,18 @@ func (h *UiHook) PreRefresh(addr addrs.AbsResourceInstance, gen states.Generatio h.println(fmt.Sprintf( h.view.colorize.Color("[reset][bold]%s: Refreshing state...%s"), addrStr, stateIdSuffix)) - return opentf.HookActionContinue, nil + return tofu.HookActionContinue, nil } -func (h *UiHook) PreImportState(addr addrs.AbsResourceInstance, importID string) (opentf.HookAction, error) { +func (h *UiHook) PreImportState(addr addrs.AbsResourceInstance, importID string) (tofu.HookAction, error) { h.println(fmt.Sprintf( h.view.colorize.Color("[reset][bold]%s: Importing from ID %q..."), addr, importID, )) - return opentf.HookActionContinue, nil + return tofu.HookActionContinue, nil } -func (h *UiHook) PostImportState(addr addrs.AbsResourceInstance, imported []providers.ImportedResource) (opentf.HookAction, error) { +func (h *UiHook) PostImportState(addr addrs.AbsResourceInstance, imported []providers.ImportedResource) (tofu.HookAction, error) { h.println(fmt.Sprintf( h.view.colorize.Color("[reset][bold][green]%s: Import prepared!"), addr, @@ -301,34 +301,34 @@ func (h *UiHook) PostImportState(addr addrs.AbsResourceInstance, imported []prov )) } - return opentf.HookActionContinue, nil + return tofu.HookActionContinue, nil } -func (h *UiHook) PrePlanImport(addr addrs.AbsResourceInstance, importID string) (opentf.HookAction, error) { +func (h *UiHook) PrePlanImport(addr addrs.AbsResourceInstance, importID string) (tofu.HookAction, error) { h.println(fmt.Sprintf( h.view.colorize.Color("[reset][bold]%s: Preparing import... [id=%s]"), addr, importID, )) - return opentf.HookActionContinue, nil + return tofu.HookActionContinue, nil } -func (h *UiHook) PreApplyImport(addr addrs.AbsResourceInstance, importing plans.ImportingSrc) (opentf.HookAction, error) { +func (h *UiHook) PreApplyImport(addr addrs.AbsResourceInstance, importing plans.ImportingSrc) (tofu.HookAction, error) { h.println(fmt.Sprintf( h.view.colorize.Color("[reset][bold]%s: Importing... [id=%s]"), addr, importing.ID, )) - return opentf.HookActionContinue, nil + return tofu.HookActionContinue, nil } -func (h *UiHook) PostApplyImport(addr addrs.AbsResourceInstance, importing plans.ImportingSrc) (opentf.HookAction, error) { +func (h *UiHook) PostApplyImport(addr addrs.AbsResourceInstance, importing plans.ImportingSrc) (tofu.HookAction, error) { h.println(fmt.Sprintf( h.view.colorize.Color("[reset][bold]%s: Import complete [id=%s]"), addr, importing.ID, )) - return opentf.HookActionContinue, nil + return tofu.HookActionContinue, nil } // Wrap calls to the view so that concurrent calls do not interleave println. diff --git a/internal/command/views/hook_ui_test.go b/internal/command/views/hook_ui_test.go index 7b6d36f3a6..7fde73422e 100644 --- a/internal/command/views/hook_ui_test.go +++ b/internal/command/views/hook_ui_test.go @@ -15,11 +15,11 @@ import ( "github.com/opentofu/opentofu/internal/addrs" "github.com/opentofu/opentofu/internal/command/arguments" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/providers" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/terminal" + "github.com/opentofu/opentofu/internal/tofu" ) // Test the PreApply hook for creating a new resource @@ -55,7 +55,7 @@ func TestUiHookPreApply_create(t *testing.T) { if err != nil { t.Fatal(err) } - if action != opentf.HookActionContinue { + if action != tofu.HookActionContinue { t.Fatalf("Expected hook to continue, given: %#v", action) } @@ -113,7 +113,7 @@ func TestUiHookPreApply_periodicTimer(t *testing.T) { if err != nil { t.Fatal(err) } - if action != opentf.HookActionContinue { + if action != tofu.HookActionContinue { t.Fatalf("Expected hook to continue, given: %#v", action) } @@ -177,7 +177,7 @@ func TestUiHookPreApply_destroy(t *testing.T) { if err != nil { t.Fatal(err) } - if action != opentf.HookActionContinue { + if action != tofu.HookActionContinue { t.Fatalf("Expected hook to continue, given: %#v", action) } @@ -228,7 +228,7 @@ func TestUiHookPostApply_colorInterpolation(t *testing.T) { if err != nil { t.Fatal(err) } - if action != opentf.HookActionContinue { + if action != tofu.HookActionContinue { t.Fatalf("Expected hook to continue, given: %#v", action) } result := done(t) @@ -281,7 +281,7 @@ func TestUiHookPostApply_emptyState(t *testing.T) { if err != nil { t.Fatal(err) } - if action != opentf.HookActionContinue { + if action != tofu.HookActionContinue { t.Fatalf("Expected hook to continue, given: %#v", action) } result := done(t) @@ -314,7 +314,7 @@ func TestPreProvisionInstanceStep(t *testing.T) { if err != nil { t.Fatal(err) } - if action != opentf.HookActionContinue { + if action != tofu.HookActionContinue { t.Fatalf("Expected hook to continue, given: %#v", action) } result := done(t) @@ -430,7 +430,7 @@ func TestPreRefresh(t *testing.T) { if err != nil { t.Fatal(err) } - if action != opentf.HookActionContinue { + if action != tofu.HookActionContinue { t.Fatalf("Expected hook to continue, given: %#v", action) } result := done(t) @@ -462,7 +462,7 @@ func TestPreRefresh_noID(t *testing.T) { if err != nil { t.Fatal(err) } - if action != opentf.HookActionContinue { + if action != tofu.HookActionContinue { t.Fatalf("Expected hook to continue, given: %#v", action) } result := done(t) @@ -489,7 +489,7 @@ func TestPreImportState(t *testing.T) { if err != nil { t.Fatal(err) } - if action != opentf.HookActionContinue { + if action != tofu.HookActionContinue { t.Fatalf("Expected hook to continue, given: %#v", action) } result := done(t) @@ -537,7 +537,7 @@ func TestPostImportState(t *testing.T) { if err != nil { t.Fatal(err) } - if action != opentf.HookActionContinue { + if action != tofu.HookActionContinue { t.Fatalf("Expected hook to continue, given: %#v", action) } result := done(t) diff --git a/internal/command/views/operation.go b/internal/command/views/operation.go index 5fa8bdcf64..408dab236b 100644 --- a/internal/command/views/operation.go +++ b/internal/command/views/operation.go @@ -15,10 +15,10 @@ import ( "github.com/opentofu/opentofu/internal/command/jsonplan" "github.com/opentofu/opentofu/internal/command/jsonprovider" "github.com/opentofu/opentofu/internal/command/views/json" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/states/statefile" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) type Operation interface { @@ -30,7 +30,7 @@ type Operation interface { EmergencyDumpState(stateFile *statefile.File) error PlannedChange(change *plans.ResourceInstanceChangeSrc) - Plan(plan *plans.Plan, schemas *opentf.Schemas) + Plan(plan *plans.Plan, schemas *tofu.Schemas) PlanNextStep(planPath string, genConfigPath string) Diagnostics(diags tfdiags.Diagnostics) @@ -91,7 +91,7 @@ func (v *OperationHuman) EmergencyDumpState(stateFile *statefile.File) error { return nil } -func (v *OperationHuman) Plan(plan *plans.Plan, schemas *opentf.Schemas) { +func (v *OperationHuman) Plan(plan *plans.Plan, schemas *tofu.Schemas) { outputs, changed, drift, attrs, err := jsonplan.MarshalForRenderer(plan, schemas) if err != nil { v.view.streams.Eprintf("Failed to marshal plan to json: %s", err) @@ -209,7 +209,7 @@ func (v *OperationJSON) EmergencyDumpState(stateFile *statefile.File) error { // Log a change summary and a series of "planned" messages for the changes in // the plan. -func (v *OperationJSON) Plan(plan *plans.Plan, schemas *opentf.Schemas) { +func (v *OperationJSON) Plan(plan *plans.Plan, schemas *tofu.Schemas) { for _, dr := range plan.DriftedResources { // In refresh-only mode, we output all resources marked as drifted, // including those which have moved without other changes. In other plan diff --git a/internal/command/views/operation_test.go b/internal/command/views/operation_test.go index 1b16490963..6cace0783a 100644 --- a/internal/command/views/operation_test.go +++ b/internal/command/views/operation_test.go @@ -12,11 +12,11 @@ import ( "github.com/opentofu/opentofu/internal/addrs" "github.com/opentofu/opentofu/internal/command/arguments" "github.com/opentofu/opentofu/internal/lang/globalref" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/states/statefile" "github.com/opentofu/opentofu/internal/terminal" + "github.com/opentofu/opentofu/internal/tofu" "github.com/zclconf/go-cty/cty" ) @@ -81,11 +81,11 @@ func TestOperation_emergencyDumpState(t *testing.T) { func TestOperation_planNoChanges(t *testing.T) { tests := map[string]struct { - plan func(schemas *opentf.Schemas) *plans.Plan + plan func(schemas *tofu.Schemas) *plans.Plan wantText string }{ "nothing at all in normal mode": { - func(schemas *opentf.Schemas) *plans.Plan { + func(schemas *tofu.Schemas) *plans.Plan { return &plans.Plan{ UIMode: plans.NormalMode, Changes: plans.NewChanges(), @@ -94,7 +94,7 @@ func TestOperation_planNoChanges(t *testing.T) { "no differences, so no changes are needed.", }, "nothing at all in refresh-only mode": { - func(schemas *opentf.Schemas) *plans.Plan { + func(schemas *tofu.Schemas) *plans.Plan { return &plans.Plan{ UIMode: plans.RefreshOnlyMode, Changes: plans.NewChanges(), @@ -103,7 +103,7 @@ func TestOperation_planNoChanges(t *testing.T) { "OpenTF has checked that the real remote objects still match", }, "nothing at all in destroy mode": { - func(schemas *opentf.Schemas) *plans.Plan { + func(schemas *tofu.Schemas) *plans.Plan { return &plans.Plan{ UIMode: plans.DestroyMode, Changes: plans.NewChanges(), @@ -112,7 +112,7 @@ func TestOperation_planNoChanges(t *testing.T) { "No objects need to be destroyed.", }, "no drift detected in normal noop": { - func(schemas *opentf.Schemas) *plans.Plan { + func(schemas *tofu.Schemas) *plans.Plan { addr := addrs.Resource{ Mode: addrs.ManagedResourceMode, Type: "test_resource", @@ -153,7 +153,7 @@ func TestOperation_planNoChanges(t *testing.T) { "No changes", }, "drift detected in normal mode": { - func(schemas *opentf.Schemas) *plans.Plan { + func(schemas *tofu.Schemas) *plans.Plan { addr := addrs.Resource{ Mode: addrs.ManagedResourceMode, Type: "test_resource", @@ -200,7 +200,7 @@ func TestOperation_planNoChanges(t *testing.T) { "Objects have changed outside of OpenTF", }, "drift detected in refresh-only mode": { - func(schemas *opentf.Schemas) *plans.Plan { + func(schemas *tofu.Schemas) *plans.Plan { addr := addrs.Resource{ Mode: addrs.ManagedResourceMode, Type: "test_resource", @@ -241,7 +241,7 @@ func TestOperation_planNoChanges(t *testing.T) { "If you were expecting these changes then you can apply this plan", }, "move-only changes in refresh-only mode": { - func(schemas *opentf.Schemas) *plans.Plan { + func(schemas *tofu.Schemas) *plans.Plan { addr := addrs.Resource{ Mode: addrs.ManagedResourceMode, Type: "test_resource", @@ -290,7 +290,7 @@ func TestOperation_planNoChanges(t *testing.T) { "test_resource.anywhere has moved to test_resource.somewhere", }, "drift detected in destroy mode": { - func(schemas *opentf.Schemas) *plans.Plan { + func(schemas *tofu.Schemas) *plans.Plan { return &plans.Plan{ UIMode: plans.DestroyMode, Changes: plans.NewChanges(), diff --git a/internal/command/views/plan.go b/internal/command/views/plan.go index 362df3fe07..961401ef26 100644 --- a/internal/command/views/plan.go +++ b/internal/command/views/plan.go @@ -7,14 +7,14 @@ import ( "fmt" "github.com/opentofu/opentofu/internal/command/arguments" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) // The Plan view is used for the plan command. type Plan interface { Operation() Operation - Hooks() []opentf.Hook + Hooks() []tofu.Hook Diagnostics(diags tfdiags.Diagnostics) HelpPrompt() @@ -51,8 +51,8 @@ func (v *PlanHuman) Operation() Operation { return NewOperation(arguments.ViewHuman, v.inAutomation, v.view) } -func (v *PlanHuman) Hooks() []opentf.Hook { - return []opentf.Hook{ +func (v *PlanHuman) Hooks() []tofu.Hook { + return []tofu.Hook{ NewUiHook(v.view), } } @@ -77,8 +77,8 @@ func (v *PlanJSON) Operation() Operation { return &OperationJSON{view: v.view} } -func (v *PlanJSON) Hooks() []opentf.Hook { - return []opentf.Hook{ +func (v *PlanJSON) Hooks() []tofu.Hook { + return []tofu.Hook{ newJSONHook(v.view), } } diff --git a/internal/command/views/plan_test.go b/internal/command/views/plan_test.go index 7354c13639..b81919ed95 100644 --- a/internal/command/views/plan_test.go +++ b/internal/command/views/plan_test.go @@ -9,10 +9,10 @@ import ( "github.com/opentofu/opentofu/internal/addrs" "github.com/opentofu/opentofu/internal/command/arguments" "github.com/opentofu/opentofu/internal/configs/configschema" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/providers" "github.com/opentofu/opentofu/internal/terminal" + "github.com/opentofu/opentofu/internal/tofu" "github.com/zclconf/go-cty/cty" ) @@ -130,17 +130,17 @@ func testPlanWithDatasource(t *testing.T) *plans.Plan { return plan } -func testSchemas() *opentf.Schemas { +func testSchemas() *tofu.Schemas { provider := testProvider() - return &opentf.Schemas{ + return &tofu.Schemas{ Providers: map[addrs.Provider]providers.ProviderSchema{ addrs.NewDefaultProvider("test"): provider.GetProviderSchema(), }, } } -func testProvider() *opentf.MockProvider { - p := new(opentf.MockProvider) +func testProvider() *tofu.MockProvider { + p := new(tofu.MockProvider) p.ReadResourceFn = func(req providers.ReadResourceRequest) providers.ReadResourceResponse { return providers.ReadResourceResponse{NewState: req.PriorState} } diff --git a/internal/command/views/refresh.go b/internal/command/views/refresh.go index 422ef7dbf8..cca38cb7d2 100644 --- a/internal/command/views/refresh.go +++ b/internal/command/views/refresh.go @@ -8,9 +8,9 @@ import ( "github.com/opentofu/opentofu/internal/command/arguments" "github.com/opentofu/opentofu/internal/command/views/json" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) // The Refresh view is used for the refresh command. @@ -18,7 +18,7 @@ type Refresh interface { Outputs(outputValues map[string]*states.OutputValue) Operation() Operation - Hooks() []opentf.Hook + Hooks() []tofu.Hook Diagnostics(diags tfdiags.Diagnostics) HelpPrompt() @@ -65,8 +65,8 @@ func (v *RefreshHuman) Operation() Operation { return NewOperation(arguments.ViewHuman, v.inAutomation, v.view) } -func (v *RefreshHuman) Hooks() []opentf.Hook { - return []opentf.Hook{ +func (v *RefreshHuman) Hooks() []tofu.Hook { + return []tofu.Hook{ v.countHook, NewUiHook(v.view), } @@ -101,8 +101,8 @@ func (v *RefreshJSON) Operation() Operation { return &OperationJSON{view: v.view} } -func (v *RefreshJSON) Hooks() []opentf.Hook { - return []opentf.Hook{ +func (v *RefreshJSON) Hooks() []tofu.Hook { + return []tofu.Hook{ newJSONHook(v.view), } } diff --git a/internal/command/views/show.go b/internal/command/views/show.go index 7d625e7f84..a05503071d 100644 --- a/internal/command/views/show.go +++ b/internal/command/views/show.go @@ -15,15 +15,15 @@ import ( "github.com/opentofu/opentofu/internal/command/jsonprovider" "github.com/opentofu/opentofu/internal/command/jsonstate" "github.com/opentofu/opentofu/internal/configs" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/states/statefile" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) type Show interface { // Display renders the plan, if it is available. If plan is nil, it renders the statefile. - Display(config *configs.Config, plan *plans.Plan, planJSON *cloudplan.RemotePlanJSON, stateFile *statefile.File, schemas *opentf.Schemas) int + Display(config *configs.Config, plan *plans.Plan, planJSON *cloudplan.RemotePlanJSON, stateFile *statefile.File, schemas *tofu.Schemas) int // Diagnostics renders early diagnostics, resulting from argument parsing. Diagnostics(diags tfdiags.Diagnostics) @@ -46,7 +46,7 @@ type ShowHuman struct { var _ Show = (*ShowHuman)(nil) -func (v *ShowHuman) Display(config *configs.Config, plan *plans.Plan, planJSON *cloudplan.RemotePlanJSON, stateFile *statefile.File, schemas *opentf.Schemas) int { +func (v *ShowHuman) Display(config *configs.Config, plan *plans.Plan, planJSON *cloudplan.RemotePlanJSON, stateFile *statefile.File, schemas *tofu.Schemas) int { renderer := jsonformat.Renderer{ Colorize: v.view.colorize, Streams: v.view.streams, @@ -131,7 +131,7 @@ type ShowJSON struct { var _ Show = (*ShowJSON)(nil) -func (v *ShowJSON) Display(config *configs.Config, plan *plans.Plan, planJSON *cloudplan.RemotePlanJSON, stateFile *statefile.File, schemas *opentf.Schemas) int { +func (v *ShowJSON) Display(config *configs.Config, plan *plans.Plan, planJSON *cloudplan.RemotePlanJSON, stateFile *statefile.File, schemas *tofu.Schemas) int { // Prefer to display a pre-built JSON plan, if we got one; then, fall back // to building one ourselves. if planJSON != nil { diff --git a/internal/command/views/show_test.go b/internal/command/views/show_test.go index 617fbb1eb5..31e4ca9e30 100644 --- a/internal/command/views/show_test.go +++ b/internal/command/views/show_test.go @@ -14,12 +14,12 @@ import ( "github.com/opentofu/opentofu/internal/command/arguments" "github.com/opentofu/opentofu/internal/configs/configschema" "github.com/opentofu/opentofu/internal/initwd" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/providers" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/states/statefile" "github.com/opentofu/opentofu/internal/terminal" + "github.com/opentofu/opentofu/internal/tofu" "github.com/zclconf/go-cty/cty" ) @@ -34,7 +34,7 @@ func TestShowHuman(t *testing.T) { plan *plans.Plan jsonPlan *cloudplan.RemotePlanJSON stateFile *statefile.File - schemas *opentf.Schemas + schemas *tofu.Schemas wantExact bool wantString string }{ @@ -179,7 +179,7 @@ func TestShowJSON(t *testing.T) { view.Configure(&arguments.View{NoColor: true}) v := NewShow(arguments.ViewJSON, view) - schemas := &opentf.Schemas{ + schemas := &tofu.Schemas{ Providers: map[addrs.Provider]providers.ProviderSchema{ addrs.NewDefaultProvider("test"): { ResourceTypes: map[string]providers.Schema{ diff --git a/internal/command/views/test.go b/internal/command/views/test.go index 14b4731fdb..eb3b6c34f7 100644 --- a/internal/command/views/test.go +++ b/internal/command/views/test.go @@ -15,11 +15,11 @@ import ( "github.com/opentofu/opentofu/internal/command/views/json" "github.com/opentofu/opentofu/internal/configs" "github.com/opentofu/opentofu/internal/moduletest" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/plans" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/states/statefile" "github.com/opentofu/opentofu/internal/tfdiags" + "github.com/opentofu/opentofu/internal/tofu" ) // Test renders outputs for test executions. @@ -140,7 +140,7 @@ func (t *TestHuman) Run(run *moduletest.Run, file *moduletest.File) { // We're going to be more verbose about what we print, here's the plan // or the state depending on the type of run we did. - schemas := &opentf.Schemas{ + schemas := &tofu.Schemas{ Providers: run.Verbose.Providers, Provisioners: run.Verbose.Provisioners, } @@ -402,7 +402,7 @@ func (t *TestJSON) Run(run *moduletest.Run, file *moduletest.File) { if run.Verbose != nil { - schemas := &opentf.Schemas{ + schemas := &tofu.Schemas{ Providers: run.Verbose.Providers, Provisioners: run.Verbose.Provisioners, } diff --git a/internal/plugin/ui_input.go b/internal/plugin/ui_input.go index 176f492742..499fd82345 100644 --- a/internal/plugin/ui_input.go +++ b/internal/plugin/ui_input.go @@ -8,7 +8,7 @@ import ( "net/rpc" "github.com/hashicorp/go-plugin" - "github.com/opentofu/opentofu/internal/opentf" + "github.com/opentofu/opentofu/internal/tofu" ) // UIInput is an implementation of terraform.UIInput that communicates @@ -17,7 +17,7 @@ type UIInput struct { Client *rpc.Client } -func (i *UIInput) Input(ctx context.Context, opts *opentf.InputOpts) (string, error) { +func (i *UIInput) Input(ctx context.Context, opts *tofu.InputOpts) (string, error) { var resp UIInputInputResponse err := i.Client.Call("Plugin.Input", opts, &resp) if err != nil { @@ -39,11 +39,11 @@ type UIInputInputResponse struct { // UIInputServer is a net/rpc compatible structure for serving // a UIInputServer. This should not be used directly. type UIInputServer struct { - UIInput opentf.UIInput + UIInput tofu.UIInput } func (s *UIInputServer) Input( - opts *opentf.InputOpts, + opts *tofu.InputOpts, reply *UIInputInputResponse) error { value, err := s.UIInput.Input(context.Background(), opts) *reply = UIInputInputResponse{ diff --git a/internal/plugin/ui_input_test.go b/internal/plugin/ui_input_test.go index f84bda575e..a2bbc179ec 100644 --- a/internal/plugin/ui_input_test.go +++ b/internal/plugin/ui_input_test.go @@ -9,18 +9,18 @@ import ( "testing" "github.com/hashicorp/go-plugin" - "github.com/opentofu/opentofu/internal/opentf" + "github.com/opentofu/opentofu/internal/tofu" ) func TestUIInput_impl(t *testing.T) { - var _ opentf.UIInput = new(UIInput) + var _ tofu.UIInput = new(UIInput) } func TestUIInput_input(t *testing.T) { client, server := plugin.TestRPCConn(t) defer client.Close() - i := new(opentf.MockUIInput) + i := new(tofu.MockUIInput) i.InputReturnString = "foo" err := server.RegisterName("Plugin", &UIInputServer{ @@ -32,7 +32,7 @@ func TestUIInput_input(t *testing.T) { input := &UIInput{Client: client} - opts := &opentf.InputOpts{ + opts := &tofu.InputOpts{ Id: "foo", } diff --git a/internal/plugin/ui_output.go b/internal/plugin/ui_output.go index 2ac62cd323..ef7b1463df 100644 --- a/internal/plugin/ui_output.go +++ b/internal/plugin/ui_output.go @@ -6,7 +6,7 @@ package plugin import ( "net/rpc" - "github.com/opentofu/opentofu/internal/opentf" + "github.com/opentofu/opentofu/internal/tofu" ) // UIOutput is an implementatin of terraform.UIOutput that communicates @@ -21,7 +21,7 @@ func (o *UIOutput) Output(v string) { // UIOutputServer is the RPC server for serving UIOutput. type UIOutputServer struct { - UIOutput opentf.UIOutput + UIOutput tofu.UIOutput } func (s *UIOutputServer) Output( diff --git a/internal/plugin/ui_output_test.go b/internal/plugin/ui_output_test.go index d5c610beda..a04f3092d4 100644 --- a/internal/plugin/ui_output_test.go +++ b/internal/plugin/ui_output_test.go @@ -7,18 +7,18 @@ import ( "testing" "github.com/hashicorp/go-plugin" - "github.com/opentofu/opentofu/internal/opentf" + "github.com/opentofu/opentofu/internal/tofu" ) func TestUIOutput_impl(t *testing.T) { - var _ opentf.UIOutput = new(UIOutput) + var _ tofu.UIOutput = new(UIOutput) } func TestUIOutput_input(t *testing.T) { client, server := plugin.TestRPCConn(t) defer client.Close() - o := new(opentf.MockUIOutput) + o := new(tofu.MockUIOutput) err := server.RegisterName("Plugin", &UIOutputServer{ UIOutput: o, diff --git a/internal/repl/session_test.go b/internal/repl/session_test.go index f8503018e3..8ccba09d00 100644 --- a/internal/repl/session_test.go +++ b/internal/repl/session_test.go @@ -15,9 +15,9 @@ import ( "github.com/opentofu/opentofu/internal/addrs" "github.com/opentofu/opentofu/internal/configs/configschema" "github.com/opentofu/opentofu/internal/initwd" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/providers" "github.com/opentofu/opentofu/internal/states" + "github.com/opentofu/opentofu/internal/tofu" _ "github.com/opentofu/opentofu/internal/logging" ) @@ -261,7 +261,7 @@ func TestSession_stateless(t *testing.T) { func testSession(t *testing.T, test testSessionTest) { t.Helper() - p := &opentf.MockProvider{} + p := &tofu.MockProvider{} p.GetProviderSchemaResponse = &providers.GetProviderSchemaResponse{ ResourceTypes: map[string]providers.Schema{ "test_instance": { @@ -281,7 +281,7 @@ func testSession(t *testing.T, test testSessionTest) { } // Build the TF context - ctx, diags := opentf.NewContext(&opentf.ContextOpts{ + ctx, diags := tofu.NewContext(&tofu.ContextOpts{ Providers: map[addrs.Provider]providers.Factory{ addrs.NewDefaultProvider("test"): providers.FactoryFixed(p), }, @@ -294,7 +294,7 @@ func testSession(t *testing.T, test testSessionTest) { if state == nil { state = states.NewState() } - scope, diags := ctx.Eval(config, state, addrs.RootModuleInstance, &opentf.EvalOpts{}) + scope, diags := ctx.Eval(config, state, addrs.RootModuleInstance, &tofu.EvalOpts{}) if diags.HasErrors() { t.Fatalf("failed to create scope: %s", diags.Err()) } diff --git a/internal/states/remote/state.go b/internal/states/remote/state.go index cdae115f5d..57b4ff6749 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/opentofu/opentofu/internal/backend/local" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/states/statefile" "github.com/opentofu/opentofu/internal/states/statemgr" + "github.com/opentofu/opentofu/internal/tofu" ) // State implements the State interfaces in the state package to handle @@ -166,7 +166,7 @@ func (s *State) refreshState() error { } // statemgr.Persister impl. -func (s *State) PersistState(schemas *opentf.Schemas) error { +func (s *State) PersistState(schemas *tofu.Schemas) error { s.mu.Lock() defer s.mu.Unlock() diff --git a/internal/states/statemgr/filesystem.go b/internal/states/statemgr/filesystem.go index 2e052b1112..467b4861e5 100644 --- a/internal/states/statemgr/filesystem.go +++ b/internal/states/statemgr/filesystem.go @@ -16,9 +16,9 @@ import ( multierror "github.com/hashicorp/go-multierror" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/states/statefile" + "github.com/opentofu/opentofu/internal/tofu" ) // Filesystem is a full state manager that uses a file in the local filesystem @@ -226,7 +226,7 @@ func (s *Filesystem) writeState(state *states.State, meta *SnapshotMeta) error { // PersistState is an implementation of Persister that does nothing because // this type's Writer implementation does its own persistence. -func (s *Filesystem) PersistState(schemas *opentf.Schemas) error { +func (s *Filesystem) PersistState(schemas *tofu.Schemas) error { return nil } diff --git a/internal/states/statemgr/helper.go b/internal/states/statemgr/helper.go index 6922ee31da..cfad878a98 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/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/states" "github.com/opentofu/opentofu/internal/states/statefile" + "github.com/opentofu/opentofu/internal/tofu" "github.com/opentofu/opentofu/version" ) @@ -48,7 +48,7 @@ func RefreshAndRead(mgr Storage) (*states.State, error) { // out quickly with a user-facing error. In situations where more control // is required, call WriteState and PersistState on the state manager directly // and handle their errors. -func WriteAndPersist(mgr Storage, state *states.State, schemas *opentf.Schemas) error { +func WriteAndPersist(mgr Storage, state *states.State, schemas *tofu.Schemas) error { err := mgr.WriteState(state) if err != nil { return err diff --git a/internal/states/statemgr/lock.go b/internal/states/statemgr/lock.go index a36686b2b9..9eca1f04c5 100644 --- a/internal/states/statemgr/lock.go +++ b/internal/states/statemgr/lock.go @@ -4,8 +4,8 @@ package statemgr import ( - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/states" + "github.com/opentofu/opentofu/internal/tofu" ) // LockDisabled implements State and Locker but disables state locking. @@ -33,7 +33,7 @@ func (s *LockDisabled) RefreshState() error { return s.Inner.RefreshState() } -func (s *LockDisabled) PersistState(schemas *opentf.Schemas) error { +func (s *LockDisabled) PersistState(schemas *tofu.Schemas) error { return s.Inner.PersistState(schemas) } diff --git a/internal/states/statemgr/persistent.go b/internal/states/statemgr/persistent.go index 32487db3f0..f2ffe8f736 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/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/states" + "github.com/opentofu/opentofu/internal/tofu" ) // Persistent is a union of the Refresher and Persistent interfaces, for types @@ -81,7 +81,7 @@ type Refresher interface { // state. For example, when representing state in an external JSON // representation. type Persister interface { - PersistState(*opentf.Schemas) error + PersistState(*tofu.Schemas) error } // PersistentMeta is an optional extension to Persistent that allows inspecting diff --git a/internal/states/statemgr/statemgr_fake.go b/internal/states/statemgr/statemgr_fake.go index be8981c1ee..11f23c837c 100644 --- a/internal/states/statemgr/statemgr_fake.go +++ b/internal/states/statemgr/statemgr_fake.go @@ -7,8 +7,8 @@ import ( "errors" "sync" - "github.com/opentofu/opentofu/internal/opentf" "github.com/opentofu/opentofu/internal/states" + "github.com/opentofu/opentofu/internal/tofu" ) // NewFullFake returns a full state manager that really only supports transient @@ -65,7 +65,7 @@ func (m *fakeFull) RefreshState() error { return m.t.WriteState(m.fakeP.State()) } -func (m *fakeFull) PersistState(schemas *opentf.Schemas) error { +func (m *fakeFull) PersistState(schemas *tofu.Schemas) error { return m.fakeP.WriteState(m.t.State()) } @@ -131,7 +131,7 @@ func (m *fakeErrorFull) RefreshState() error { return errors.New("fake state manager error") } -func (m *fakeErrorFull) PersistState(schemas *opentf.Schemas) error { +func (m *fakeErrorFull) PersistState(schemas *tofu.Schemas) error { return errors.New("fake state manager error") } diff --git a/internal/opentf/context.go b/internal/tofu/context.go similarity index 97% rename from internal/opentf/context.go rename to internal/tofu/context.go index bb8d34311f..5db4804bae 100644 --- a/internal/opentf/context.go +++ b/internal/tofu/context.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "context" @@ -172,14 +172,14 @@ type ContextGraphOpts struct { // // Stop will block until the task completes. func (c *Context) Stop() { - log.Printf("[WARN] opentf: Stop called, initiating interrupt sequence") + log.Printf("[WARN] tofu: Stop called, initiating interrupt sequence") c.l.Lock() defer c.l.Unlock() // If we're running, then stop if c.runContextCancel != nil { - log.Printf("[WARN] opentf: run context exists, stopping") + log.Printf("[WARN] tofu: run context exists, stopping") // Tell the hook we want to stop c.sh.Stop() @@ -197,11 +197,11 @@ func (c *Context) Stop() { // Grab the condition var before we exit if cond := c.runCond; cond != nil { - log.Printf("[INFO] opentf: waiting for graceful stop to complete") + log.Printf("[INFO] tofu: waiting for graceful stop to complete") cond.Wait() } - log.Printf("[WARN] opentf: stop complete") + log.Printf("[WARN] tofu: stop complete") } func (c *Context) acquireRun(phase string) func() { @@ -359,12 +359,12 @@ func (c *Context) checkConfigDependencies(config *configs.Config) tfdiags.Diagno tfdiags.Error, "Missing required provider", fmt.Sprintf( - "This configuration requires provider %s, but that provider isn't available. You may be able to install it automatically by running:\n opentf init", + "This configuration requires provider %s, but that provider isn't available. You may be able to install it automatically by running:\n tofu init", providerAddr, ), )) } else { - // Built-in providers can never be installed by "opentf init", + // Built-in providers can never be installed by "tofu init", // so no point in confusing the user by suggesting that. diags = diags.Append(tfdiags.Sourceless( tfdiags.Error, diff --git a/internal/opentf/context_apply.go b/internal/tofu/context_apply.go similarity index 99% rename from internal/opentf/context_apply.go rename to internal/tofu/context_apply.go index e0797ec399..83ffc3272f 100644 --- a/internal/opentf/context_apply.go +++ b/internal/tofu/context_apply.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" @@ -93,7 +93,7 @@ func (c *Context) Apply(plan *plans.Plan, config *configs.Config) (*states.State tfdiags.Warning, "Applied changes may be incomplete", `The plan was created with the -target option in effect, so some changes requested in the configuration may have been ignored and the output values may not be fully updated. Run the following command to verify that no other changes are pending: - opentf plan + tofu plan Note that the -target option is not suitable for routine use, and is provided only for exceptional situations such as recovering from errors or mistakes, or when OpenTF specifically suggests to use it as part of an error message.`, )) diff --git a/internal/opentf/context_apply2_test.go b/internal/tofu/context_apply2_test.go similarity index 99% rename from internal/opentf/context_apply2_test.go rename to internal/tofu/context_apply2_test.go index af9a140d56..21e7ed8d8a 100644 --- a/internal/opentf/context_apply2_test.go +++ b/internal/tofu/context_apply2_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "bytes" diff --git a/internal/opentf/context_apply_checks_test.go b/internal/tofu/context_apply_checks_test.go similarity index 99% rename from internal/opentf/context_apply_checks_test.go rename to internal/tofu/context_apply_checks_test.go index ca7247adfc..7c25e50f67 100644 --- a/internal/opentf/context_apply_checks_test.go +++ b/internal/tofu/context_apply_checks_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "testing" diff --git a/internal/opentf/context_apply_test.go b/internal/tofu/context_apply_test.go similarity index 99% rename from internal/opentf/context_apply_test.go rename to internal/tofu/context_apply_test.go index f8aeb6286e..1af21c512e 100644 --- a/internal/opentf/context_apply_test.go +++ b/internal/tofu/context_apply_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "bytes" @@ -1707,7 +1707,7 @@ func TestContext2Apply_destroyData(t *testing.T) { func TestContext2Apply_destroySkipsCBD(t *testing.T) { // Config contains CBD resource depending on non-CBD resource, which triggers // a cycle if they are both replaced, but should _not_ trigger a cycle when - // just doing a `opentf destroy`. + // just doing a `tofu destroy`. m := testModule(t, "apply-destroy-cbd") p := testProvider("aws") p.PlanResourceChangeFn = testDiffFn @@ -8648,7 +8648,7 @@ resource "null_instance" "depends" { } func TestContext2Apply_terraformWorkspace(t *testing.T) { - m := testModule(t, "apply-opentf-workspace") + m := testModule(t, "apply-tofu-workspace") p := testProvider("aws") p.PlanResourceChangeFn = testDiffFn diff --git a/internal/opentf/context_eval.go b/internal/tofu/context_eval.go similarity index 99% rename from internal/opentf/context_eval.go rename to internal/tofu/context_eval.go index da34b37255..90f02fdb09 100644 --- a/internal/opentf/context_eval.go +++ b/internal/tofu/context_eval.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "log" diff --git a/internal/opentf/context_eval_test.go b/internal/tofu/context_eval_test.go similarity index 99% rename from internal/opentf/context_eval_test.go rename to internal/tofu/context_eval_test.go index e3b8c6e0ea..f47d262fcc 100644 --- a/internal/opentf/context_eval_test.go +++ b/internal/tofu/context_eval_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "testing" diff --git a/internal/opentf/context_fixtures_test.go b/internal/tofu/context_fixtures_test.go similarity index 99% rename from internal/opentf/context_fixtures_test.go rename to internal/tofu/context_fixtures_test.go index 33d3d8675f..9c9ce81644 100644 --- a/internal/opentf/context_fixtures_test.go +++ b/internal/tofu/context_fixtures_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "testing" diff --git a/internal/opentf/context_import.go b/internal/tofu/context_import.go similarity index 99% rename from internal/opentf/context_import.go rename to internal/tofu/context_import.go index 421f02207d..7563d7d967 100644 --- a/internal/opentf/context_import.go +++ b/internal/tofu/context_import.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "log" diff --git a/internal/opentf/context_import_test.go b/internal/tofu/context_import_test.go similarity index 99% rename from internal/opentf/context_import_test.go rename to internal/tofu/context_import_test.go index d04eba4ce4..b8a2a81e6c 100644 --- a/internal/opentf/context_import_test.go +++ b/internal/tofu/context_import_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "errors" diff --git a/internal/opentf/context_input.go b/internal/tofu/context_input.go similarity index 99% rename from internal/opentf/context_input.go rename to internal/tofu/context_input.go index 713c6da995..8fb881ad03 100644 --- a/internal/opentf/context_input.go +++ b/internal/tofu/context_input.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "context" diff --git a/internal/opentf/context_input_test.go b/internal/tofu/context_input_test.go similarity index 99% rename from internal/opentf/context_input_test.go rename to internal/tofu/context_input_test.go index 7dbb7ca1ae..93dcb950be 100644 --- a/internal/opentf/context_input_test.go +++ b/internal/tofu/context_input_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "reflect" diff --git a/internal/opentf/context_plan.go b/internal/tofu/context_plan.go similarity index 99% rename from internal/opentf/context_plan.go rename to internal/tofu/context_plan.go index a60dadaf47..c8b0ebc0b9 100644 --- a/internal/opentf/context_plan.go +++ b/internal/tofu/context_plan.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "bytes" @@ -95,7 +95,7 @@ type PlanOpts struct { // // The given planning options allow control of various other details of the // planning process that are not represented directly in the configuration. -// You can use opentf.DefaultPlanOpts to generate a normal plan with no +// You can use tofu.DefaultPlanOpts to generate a normal plan with no // special options. // // If the returned diagnostics contains no errors then the returned plan is @@ -892,7 +892,7 @@ func blockedMovesWarningDiag(results refactoring.MoveResults) tfdiags.Diagnostic tfdiags.Warning, "Unresolved resource instance address changes", fmt.Sprintf( - "OpenTF tried to adjust resource instance addresses in the prior state based on change information recorded in the configuration, but some adjustments did not succeed due to existing objects already at the intended addresses:%s\n\nOpenTF has planned to destroy these objects. If OpenTF's proposed changes aren't appropriate, you must first resolve the conflicts using the \"opentf state\" subcommands and then create a new plan.", + "OpenTF tried to adjust resource instance addresses in the prior state based on change information recorded in the configuration, but some adjustments did not succeed due to existing objects already at the intended addresses:%s\n\nOpenTF has planned to destroy these objects. If OpenTF's proposed changes aren't appropriate, you must first resolve the conflicts using the \"tofu state\" subcommands and then create a new plan.", itemsBuf.String(), ), ) diff --git a/internal/opentf/context_plan2_test.go b/internal/tofu/context_plan2_test.go similarity index 99% rename from internal/opentf/context_plan2_test.go rename to internal/tofu/context_plan2_test.go index 305247b53a..e7010de580 100644 --- a/internal/opentf/context_plan2_test.go +++ b/internal/tofu/context_plan2_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "bytes" @@ -1355,7 +1355,7 @@ func TestContext2Plan_movedResourceCollision(t *testing.T) { `OpenTF tried to adjust resource instance addresses in the prior state based on change information recorded in the configuration, but some adjustments did not succeed due to existing objects already at the intended addresses: - test_object.a[0] could not move to test_object.a -OpenTF has planned to destroy these objects. If OpenTF's proposed changes aren't appropriate, you must first resolve the conflicts using the "opentf state" subcommands and then create a new plan.`, +OpenTF has planned to destroy these objects. If OpenTF's proposed changes aren't appropriate, you must first resolve the conflicts using the "tofu state" subcommands and then create a new plan.`, ), }.ForRPC() if diff := cmp.Diff(wantDiags, gotDiags); diff != "" { @@ -1462,13 +1462,13 @@ func TestContext2Plan_movedResourceCollisionDestroy(t *testing.T) { // because it says "OpenTF has planned to destroy these objects" // but this is a plan to destroy all objects, anyway. We expect the // conflict situation to be pretty rare though, and even rarer in - // a "opentf destroy", so we'll just live with that for now + // a "tofu destroy", so we'll just live with that for now // unless we see evidence that lots of folks are being confused by // it in practice. `OpenTF tried to adjust resource instance addresses in the prior state based on change information recorded in the configuration, but some adjustments did not succeed due to existing objects already at the intended addresses: - test_object.a[0] could not move to test_object.a -OpenTF has planned to destroy these objects. If OpenTF's proposed changes aren't appropriate, you must first resolve the conflicts using the "opentf state" subcommands and then create a new plan.`, +OpenTF has planned to destroy these objects. If OpenTF's proposed changes aren't appropriate, you must first resolve the conflicts using the "tofu state" subcommands and then create a new plan.`, ), }.ForRPC() if diff := cmp.Diff(wantDiags, gotDiags); diff != "" { diff --git a/internal/opentf/context_plan_test.go b/internal/tofu/context_plan_test.go similarity index 99% rename from internal/opentf/context_plan_test.go rename to internal/tofu/context_plan_test.go index f2534ade40..bd1d707e80 100644 --- a/internal/opentf/context_plan_test.go +++ b/internal/tofu/context_plan_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "bytes" diff --git a/internal/opentf/context_plugins.go b/internal/tofu/context_plugins.go similarity index 98% rename from internal/opentf/context_plugins.go rename to internal/tofu/context_plugins.go index afb45c2f2c..616eb370cc 100644 --- a/internal/opentf/context_plugins.go +++ b/internal/tofu/context_plugins.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" @@ -15,7 +15,7 @@ import ( // contextPlugins represents a library of available plugins (providers and // provisioners) which we assume will all be used with the same -// opentf.Context, and thus it'll be safe to cache certain information +// tofu.Context, and thus it'll be safe to cache certain information // about the providers for performance reasons. type contextPlugins struct { providerFactories map[addrs.Provider]providers.Factory diff --git a/internal/opentf/context_plugins_test.go b/internal/tofu/context_plugins_test.go similarity index 99% rename from internal/opentf/context_plugins_test.go rename to internal/tofu/context_plugins_test.go index f429b02505..83563eef24 100644 --- a/internal/opentf/context_plugins_test.go +++ b/internal/tofu/context_plugins_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "github.com/zclconf/go-cty/cty" diff --git a/internal/opentf/context_refresh.go b/internal/tofu/context_refresh.go similarity index 98% rename from internal/opentf/context_refresh.go rename to internal/tofu/context_refresh.go index b51c81e5e1..84d8774470 100644 --- a/internal/opentf/context_refresh.go +++ b/internal/tofu/context_refresh.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "log" diff --git a/internal/opentf/context_refresh_test.go b/internal/tofu/context_refresh_test.go similarity index 99% rename from internal/opentf/context_refresh_test.go rename to internal/tofu/context_refresh_test.go index 0b0a2069d7..a682cfd2f4 100644 --- a/internal/opentf/context_refresh_test.go +++ b/internal/tofu/context_refresh_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "reflect" diff --git a/internal/opentf/context_test.go b/internal/tofu/context_test.go similarity index 99% rename from internal/opentf/context_test.go rename to internal/tofu/context_test.go index a54383069c..2bbfd95d29 100644 --- a/internal/opentf/context_test.go +++ b/internal/tofu/context_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "bufio" @@ -227,17 +227,17 @@ resource "implicit_thing" "b" { tfdiags.Sourceless( tfdiags.Error, "Missing required provider", - "This configuration requires provider example.com/foo/beep, but that provider isn't available. You may be able to install it automatically by running:\n opentf init", + "This configuration requires provider example.com/foo/beep, but that provider isn't available. You may be able to install it automatically by running:\n tofu init", ), tfdiags.Sourceless( tfdiags.Error, "Missing required provider", - "This configuration requires provider registry.terraform.io/hashicorp/implicit, but that provider isn't available. You may be able to install it automatically by running:\n opentf init", + "This configuration requires provider registry.terraform.io/hashicorp/implicit, but that provider isn't available. You may be able to install it automatically by running:\n tofu init", ), tfdiags.Sourceless( tfdiags.Error, "Missing required provider", - "This configuration requires provider registry.terraform.io/hashicorp/implicit2, but that provider isn't available. You may be able to install it automatically by running:\n opentf init", + "This configuration requires provider registry.terraform.io/hashicorp/implicit2, but that provider isn't available. You may be able to install it automatically by running:\n tofu init", ), tfdiags.Sourceless( tfdiags.Error, diff --git a/internal/opentf/context_validate.go b/internal/tofu/context_validate.go similarity index 99% rename from internal/opentf/context_validate.go rename to internal/tofu/context_validate.go index 9c5f873155..9b9d685915 100644 --- a/internal/opentf/context_validate.go +++ b/internal/tofu/context_validate.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "log" diff --git a/internal/opentf/context_validate_test.go b/internal/tofu/context_validate_test.go similarity index 99% rename from internal/opentf/context_validate_test.go rename to internal/tofu/context_validate_test.go index 5f3d252a02..525a586466 100644 --- a/internal/opentf/context_validate_test.go +++ b/internal/tofu/context_validate_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "errors" diff --git a/internal/opentf/context_walk.go b/internal/tofu/context_walk.go similarity index 99% rename from internal/opentf/context_walk.go rename to internal/tofu/context_walk.go index ec8b9d6b98..77722062d7 100644 --- a/internal/opentf/context_walk.go +++ b/internal/tofu/context_walk.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "log" diff --git a/internal/opentf/diagnostics.go b/internal/tofu/diagnostics.go similarity index 99% rename from internal/opentf/diagnostics.go rename to internal/tofu/diagnostics.go index 3da7996842..c02719264f 100644 --- a/internal/opentf/diagnostics.go +++ b/internal/tofu/diagnostics.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "github.com/opentofu/opentofu/internal/tfdiags" diff --git a/internal/opentf/eval_conditions.go b/internal/tofu/eval_conditions.go similarity index 99% rename from internal/opentf/eval_conditions.go rename to internal/tofu/eval_conditions.go index 845cbfcce0..b00ffe9463 100644 --- a/internal/opentf/eval_conditions.go +++ b/internal/tofu/eval_conditions.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/eval_context.go b/internal/tofu/eval_context.go similarity index 99% rename from internal/opentf/eval_context.go rename to internal/tofu/eval_context.go index 0df03470fa..d3b682abb4 100644 --- a/internal/opentf/eval_context.go +++ b/internal/tofu/eval_context.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "github.com/hashicorp/hcl/v2" diff --git a/internal/opentf/eval_context_builtin.go b/internal/tofu/eval_context_builtin.go similarity index 99% rename from internal/opentf/eval_context_builtin.go rename to internal/tofu/eval_context_builtin.go index 8e1a871ad0..63a194659c 100644 --- a/internal/opentf/eval_context_builtin.go +++ b/internal/tofu/eval_context_builtin.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "context" diff --git a/internal/opentf/eval_context_builtin_test.go b/internal/tofu/eval_context_builtin_test.go similarity index 99% rename from internal/opentf/eval_context_builtin_test.go rename to internal/tofu/eval_context_builtin_test.go index bcc77ea938..a12ff8219d 100644 --- a/internal/opentf/eval_context_builtin_test.go +++ b/internal/tofu/eval_context_builtin_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "reflect" diff --git a/internal/opentf/eval_context_mock.go b/internal/tofu/eval_context_mock.go similarity index 99% rename from internal/opentf/eval_context_mock.go rename to internal/tofu/eval_context_mock.go index cc352990d3..e633d328d8 100644 --- a/internal/opentf/eval_context_mock.go +++ b/internal/tofu/eval_context_mock.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "github.com/hashicorp/hcl/v2" diff --git a/internal/opentf/eval_count.go b/internal/tofu/eval_count.go similarity index 99% rename from internal/opentf/eval_count.go rename to internal/tofu/eval_count.go index 3d25ac5297..944824b810 100644 --- a/internal/opentf/eval_count.go +++ b/internal/tofu/eval_count.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/eval_count_test.go b/internal/tofu/eval_count_test.go similarity index 98% rename from internal/opentf/eval_count_test.go rename to internal/tofu/eval_count_test.go index 9a2d0decba..f9387e7faf 100644 --- a/internal/opentf/eval_count_test.go +++ b/internal/tofu/eval_count_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "reflect" diff --git a/internal/opentf/eval_for_each.go b/internal/tofu/eval_for_each.go similarity index 99% rename from internal/opentf/eval_for_each.go rename to internal/tofu/eval_for_each.go index 75f941df33..59e1c0ef71 100644 --- a/internal/opentf/eval_for_each.go +++ b/internal/tofu/eval_for_each.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/eval_for_each_test.go b/internal/tofu/eval_for_each_test.go similarity index 99% rename from internal/opentf/eval_for_each_test.go rename to internal/tofu/eval_for_each_test.go index b34cfd4e49..d7bca404d2 100644 --- a/internal/opentf/eval_for_each_test.go +++ b/internal/tofu/eval_for_each_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "reflect" diff --git a/internal/opentf/eval_import.go b/internal/tofu/eval_import.go similarity index 99% rename from internal/opentf/eval_import.go rename to internal/tofu/eval_import.go index 295255bb16..d5ebb3afc1 100644 --- a/internal/opentf/eval_import.go +++ b/internal/tofu/eval_import.go @@ -1,4 +1,4 @@ -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/eval_provider.go b/internal/tofu/eval_provider.go similarity index 99% rename from internal/opentf/eval_provider.go rename to internal/tofu/eval_provider.go index ed43eb4e1e..6582514976 100644 --- a/internal/opentf/eval_provider.go +++ b/internal/tofu/eval_provider.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/eval_provider_test.go b/internal/tofu/eval_provider_test.go similarity index 99% rename from internal/opentf/eval_provider_test.go rename to internal/tofu/eval_provider_test.go index c8551eebe5..92e29894d7 100644 --- a/internal/opentf/eval_provider_test.go +++ b/internal/tofu/eval_provider_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "testing" diff --git a/internal/opentf/eval_variable.go b/internal/tofu/eval_variable.go similarity index 99% rename from internal/opentf/eval_variable.go rename to internal/tofu/eval_variable.go index 6751bde779..0c83d3e324 100644 --- a/internal/opentf/eval_variable.go +++ b/internal/tofu/eval_variable.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/eval_variable_test.go b/internal/tofu/eval_variable_test.go similarity index 99% rename from internal/opentf/eval_variable_test.go rename to internal/tofu/eval_variable_test.go index bf1da0b6a2..62cf1b6f52 100644 --- a/internal/opentf/eval_variable_test.go +++ b/internal/tofu/eval_variable_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/evaluate.go b/internal/tofu/evaluate.go similarity index 99% rename from internal/opentf/evaluate.go rename to internal/tofu/evaluate.go index 8906191fde..7211aea803 100644 --- a/internal/opentf/evaluate.go +++ b/internal/tofu/evaluate.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/evaluate_test.go b/internal/tofu/evaluate_test.go similarity index 99% rename from internal/opentf/evaluate_test.go rename to internal/tofu/evaluate_test.go index 621d8182db..47336e0491 100644 --- a/internal/opentf/evaluate_test.go +++ b/internal/tofu/evaluate_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "sync" diff --git a/internal/opentf/evaluate_triggers.go b/internal/tofu/evaluate_triggers.go similarity index 99% rename from internal/opentf/evaluate_triggers.go rename to internal/tofu/evaluate_triggers.go index f99596f6d8..b59447061e 100644 --- a/internal/opentf/evaluate_triggers.go +++ b/internal/tofu/evaluate_triggers.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "strings" diff --git a/internal/opentf/evaluate_triggers_test.go b/internal/tofu/evaluate_triggers_test.go similarity index 99% rename from internal/opentf/evaluate_triggers_test.go rename to internal/tofu/evaluate_triggers_test.go index 4a3fd2b3a9..779132c445 100644 --- a/internal/opentf/evaluate_triggers_test.go +++ b/internal/tofu/evaluate_triggers_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "testing" diff --git a/internal/opentf/evaluate_valid.go b/internal/tofu/evaluate_valid.go similarity index 99% rename from internal/opentf/evaluate_valid.go rename to internal/tofu/evaluate_valid.go index 3ce90ba033..10b84845c2 100644 --- a/internal/opentf/evaluate_valid.go +++ b/internal/tofu/evaluate_valid.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/evaluate_valid_test.go b/internal/tofu/evaluate_valid_test.go similarity index 99% rename from internal/opentf/evaluate_valid_test.go rename to internal/tofu/evaluate_valid_test.go index b3e143d228..244158a1d2 100644 --- a/internal/opentf/evaluate_valid_test.go +++ b/internal/tofu/evaluate_valid_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "testing" diff --git a/internal/opentf/execute.go b/internal/tofu/execute.go similarity index 95% rename from internal/opentf/execute.go rename to internal/tofu/execute.go index 6e3d5fdb91..3b5ace64a2 100644 --- a/internal/opentf/execute.go +++ b/internal/tofu/execute.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import "github.com/opentofu/opentofu/internal/tfdiags" diff --git a/internal/opentf/features.go b/internal/tofu/features.go similarity index 93% rename from internal/opentf/features.go rename to internal/tofu/features.go index be09590698..34599ad9c3 100644 --- a/internal/opentf/features.go +++ b/internal/tofu/features.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import "os" diff --git a/internal/opentf/graph.go b/internal/tofu/graph.go similarity index 99% rename from internal/opentf/graph.go rename to internal/tofu/graph.go index 18af5b5b82..fa5236a3a0 100644 --- a/internal/opentf/graph.go +++ b/internal/tofu/graph.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/graph_builder.go b/internal/tofu/graph_builder.go similarity index 99% rename from internal/opentf/graph_builder.go rename to internal/tofu/graph_builder.go index 4382950cf5..2f72eece0c 100644 --- a/internal/opentf/graph_builder.go +++ b/internal/tofu/graph_builder.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "log" diff --git a/internal/opentf/graph_builder_apply.go b/internal/tofu/graph_builder_apply.go similarity index 99% rename from internal/opentf/graph_builder_apply.go rename to internal/tofu/graph_builder_apply.go index 7e13e44c7a..ec696615f7 100644 --- a/internal/opentf/graph_builder_apply.go +++ b/internal/tofu/graph_builder_apply.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "github.com/opentofu/opentofu/internal/addrs" diff --git a/internal/opentf/graph_builder_apply_test.go b/internal/tofu/graph_builder_apply_test.go similarity index 99% rename from internal/opentf/graph_builder_apply_test.go rename to internal/tofu/graph_builder_apply_test.go index 3ad6a75044..f6d8c5fb54 100644 --- a/internal/opentf/graph_builder_apply_test.go +++ b/internal/tofu/graph_builder_apply_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/graph_builder_eval.go b/internal/tofu/graph_builder_eval.go similarity index 99% rename from internal/opentf/graph_builder_eval.go rename to internal/tofu/graph_builder_eval.go index 66267487c8..1b9739591e 100644 --- a/internal/opentf/graph_builder_eval.go +++ b/internal/tofu/graph_builder_eval.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "github.com/opentofu/opentofu/internal/addrs" diff --git a/internal/opentf/graph_builder_plan.go b/internal/tofu/graph_builder_plan.go similarity index 99% rename from internal/opentf/graph_builder_plan.go rename to internal/tofu/graph_builder_plan.go index 5f5c0e76ba..998deea5ca 100644 --- a/internal/opentf/graph_builder_plan.go +++ b/internal/tofu/graph_builder_plan.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "log" diff --git a/internal/opentf/graph_builder_plan_test.go b/internal/tofu/graph_builder_plan_test.go similarity index 99% rename from internal/opentf/graph_builder_plan_test.go rename to internal/tofu/graph_builder_plan_test.go index 456de2bbc7..df4a4df178 100644 --- a/internal/opentf/graph_builder_plan_test.go +++ b/internal/tofu/graph_builder_plan_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "strings" diff --git a/internal/opentf/graph_builder_test.go b/internal/tofu/graph_builder_test.go similarity index 98% rename from internal/opentf/graph_builder_test.go rename to internal/tofu/graph_builder_test.go index 81a30a32b2..b2b0c8b739 100644 --- a/internal/opentf/graph_builder_test.go +++ b/internal/tofu/graph_builder_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "strings" diff --git a/internal/opentf/graph_dot.go b/internal/tofu/graph_dot.go similarity index 95% rename from internal/opentf/graph_dot.go rename to internal/tofu/graph_dot.go index 36517b46dc..1fefdd918a 100644 --- a/internal/opentf/graph_dot.go +++ b/internal/tofu/graph_dot.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import "github.com/opentofu/opentofu/internal/dag" diff --git a/internal/opentf/graph_dot_test.go b/internal/tofu/graph_dot_test.go similarity index 99% rename from internal/opentf/graph_dot_test.go rename to internal/tofu/graph_dot_test.go index fff86c61fa..1def457741 100644 --- a/internal/opentf/graph_dot_test.go +++ b/internal/tofu/graph_dot_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "strings" diff --git a/internal/opentf/graph_interface_subgraph.go b/internal/tofu/graph_interface_subgraph.go similarity index 97% rename from internal/opentf/graph_interface_subgraph.go rename to internal/tofu/graph_interface_subgraph.go index b2189ea347..13aa8ffdd2 100644 --- a/internal/opentf/graph_interface_subgraph.go +++ b/internal/tofu/graph_interface_subgraph.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "github.com/opentofu/opentofu/internal/addrs" diff --git a/internal/opentf/graph_test.go b/internal/tofu/graph_test.go similarity index 98% rename from internal/opentf/graph_test.go rename to internal/tofu/graph_test.go index 19ba0b23d3..768125184a 100644 --- a/internal/opentf/graph_test.go +++ b/internal/tofu/graph_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "testing" diff --git a/internal/opentf/graph_walk.go b/internal/tofu/graph_walk.go similarity index 98% rename from internal/opentf/graph_walk.go rename to internal/tofu/graph_walk.go index 4a274c159b..f7ca6caf4b 100644 --- a/internal/opentf/graph_walk.go +++ b/internal/tofu/graph_walk.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "github.com/opentofu/opentofu/internal/addrs" diff --git a/internal/opentf/graph_walk_context.go b/internal/tofu/graph_walk_context.go similarity index 99% rename from internal/opentf/graph_walk_context.go rename to internal/tofu/graph_walk_context.go index f847e2e9b4..32ebd1de30 100644 --- a/internal/opentf/graph_walk_context.go +++ b/internal/tofu/graph_walk_context.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "context" diff --git a/internal/opentf/graph_walk_operation.go b/internal/tofu/graph_walk_operation.go similarity index 96% rename from internal/opentf/graph_walk_operation.go rename to internal/tofu/graph_walk_operation.go index a4d5ee2ab1..4de596553e 100644 --- a/internal/opentf/graph_walk_operation.go +++ b/internal/tofu/graph_walk_operation.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu //go:generate go run golang.org/x/tools/cmd/stringer -type=walkOperation graph_walk_operation.go diff --git a/internal/opentf/graph_walk_test.go b/internal/tofu/graph_walk_test.go similarity index 92% rename from internal/opentf/graph_walk_test.go rename to internal/tofu/graph_walk_test.go index 06e10885fa..10827b60cb 100644 --- a/internal/opentf/graph_walk_test.go +++ b/internal/tofu/graph_walk_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "testing" diff --git a/internal/opentf/hook.go b/internal/tofu/hook.go similarity index 99% rename from internal/opentf/hook.go rename to internal/tofu/hook.go index 8d2b9561cc..19497acda3 100644 --- a/internal/opentf/hook.go +++ b/internal/tofu/hook.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "github.com/zclconf/go-cty/cty" diff --git a/internal/opentf/hook_mock.go b/internal/tofu/hook_mock.go similarity index 99% rename from internal/opentf/hook_mock.go rename to internal/tofu/hook_mock.go index 427b0d158c..9fb136261c 100644 --- a/internal/opentf/hook_mock.go +++ b/internal/tofu/hook_mock.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "sync" diff --git a/internal/opentf/hook_stop.go b/internal/tofu/hook_stop.go similarity index 99% rename from internal/opentf/hook_stop.go rename to internal/tofu/hook_stop.go index 50c23e96c4..e3a70c5644 100644 --- a/internal/opentf/hook_stop.go +++ b/internal/tofu/hook_stop.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "errors" diff --git a/internal/opentf/hook_stop_test.go b/internal/tofu/hook_stop_test.go similarity index 91% rename from internal/opentf/hook_stop_test.go rename to internal/tofu/hook_stop_test.go index 105776d416..26d2ab2dc4 100644 --- a/internal/opentf/hook_stop_test.go +++ b/internal/tofu/hook_stop_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "testing" diff --git a/internal/opentf/hook_test.go b/internal/tofu/hook_test.go similarity index 99% rename from internal/opentf/hook_test.go rename to internal/tofu/hook_test.go index 6ef4923f1a..c27107e59b 100644 --- a/internal/opentf/hook_test.go +++ b/internal/tofu/hook_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "sync" diff --git a/internal/opentf/instance_expanders.go b/internal/tofu/instance_expanders.go similarity index 94% rename from internal/opentf/instance_expanders.go rename to internal/tofu/instance_expanders.go index 59096bca42..99af81391c 100644 --- a/internal/opentf/instance_expanders.go +++ b/internal/tofu/instance_expanders.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu // graphNodeExpandsInstances is implemented by nodes that causes instances to // be registered in the instances.Expander. diff --git a/internal/opentf/marks.go b/internal/tofu/marks.go similarity index 98% rename from internal/opentf/marks.go rename to internal/tofu/marks.go index 48dadbec80..3b54bd72ab 100644 --- a/internal/opentf/marks.go +++ b/internal/tofu/marks.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/marks_test.go b/internal/tofu/marks_test.go similarity index 99% rename from internal/opentf/marks_test.go rename to internal/tofu/marks_test.go index ab69e378ed..15d00898c5 100644 --- a/internal/opentf/marks_test.go +++ b/internal/tofu/marks_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/node_check.go b/internal/tofu/node_check.go similarity index 99% rename from internal/opentf/node_check.go rename to internal/tofu/node_check.go index 717b15278b..d8c6e76a1f 100644 --- a/internal/opentf/node_check.go +++ b/internal/tofu/node_check.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "log" diff --git a/internal/opentf/node_data_destroy.go b/internal/tofu/node_data_destroy.go similarity index 98% rename from internal/opentf/node_data_destroy.go rename to internal/tofu/node_data_destroy.go index 01c63dfa45..62fbac7ddf 100644 --- a/internal/opentf/node_data_destroy.go +++ b/internal/tofu/node_data_destroy.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "log" diff --git a/internal/opentf/node_data_destroy_test.go b/internal/tofu/node_data_destroy_test.go similarity index 98% rename from internal/opentf/node_data_destroy_test.go rename to internal/tofu/node_data_destroy_test.go index 07611b669d..fc7252c367 100644 --- a/internal/opentf/node_data_destroy_test.go +++ b/internal/tofu/node_data_destroy_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "testing" diff --git a/internal/opentf/node_external_reference.go b/internal/tofu/node_external_reference.go similarity index 98% rename from internal/opentf/node_external_reference.go rename to internal/tofu/node_external_reference.go index 1f78ed1369..a73a5cb3e0 100644 --- a/internal/opentf/node_external_reference.go +++ b/internal/tofu/node_external_reference.go @@ -1,4 +1,4 @@ -package opentf +package tofu import "github.com/opentofu/opentofu/internal/addrs" diff --git a/internal/opentf/node_local.go b/internal/tofu/node_local.go similarity index 99% rename from internal/opentf/node_local.go rename to internal/tofu/node_local.go index 42f8690016..56b2698b36 100644 --- a/internal/opentf/node_local.go +++ b/internal/tofu/node_local.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/node_local_test.go b/internal/tofu/node_local_test.go similarity index 99% rename from internal/opentf/node_local_test.go rename to internal/tofu/node_local_test.go index c1b885dc48..ab248dc082 100644 --- a/internal/opentf/node_local_test.go +++ b/internal/tofu/node_local_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "reflect" diff --git a/internal/opentf/node_module_expand.go b/internal/tofu/node_module_expand.go similarity index 99% rename from internal/opentf/node_module_expand.go rename to internal/tofu/node_module_expand.go index d5a65b8535..43c5f73311 100644 --- a/internal/opentf/node_module_expand.go +++ b/internal/tofu/node_module_expand.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "log" diff --git a/internal/opentf/node_module_expand_test.go b/internal/tofu/node_module_expand_test.go similarity index 99% rename from internal/opentf/node_module_expand_test.go rename to internal/tofu/node_module_expand_test.go index b4c07f74a6..f68c4ca840 100644 --- a/internal/opentf/node_module_expand_test.go +++ b/internal/tofu/node_module_expand_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "testing" diff --git a/internal/opentf/node_module_variable.go b/internal/tofu/node_module_variable.go similarity index 99% rename from internal/opentf/node_module_variable.go rename to internal/tofu/node_module_variable.go index 0caa1ff77e..f80d6f9adf 100644 --- a/internal/opentf/node_module_variable.go +++ b/internal/tofu/node_module_variable.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/node_module_variable_test.go b/internal/tofu/node_module_variable_test.go similarity index 99% rename from internal/opentf/node_module_variable_test.go rename to internal/tofu/node_module_variable_test.go index 08d7564214..d654e75c1b 100644 --- a/internal/opentf/node_module_variable_test.go +++ b/internal/tofu/node_module_variable_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "reflect" diff --git a/internal/opentf/node_output.go b/internal/tofu/node_output.go similarity index 99% rename from internal/opentf/node_output.go rename to internal/tofu/node_output.go index 596b6d8a52..f4e5573541 100644 --- a/internal/opentf/node_output.go +++ b/internal/tofu/node_output.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/node_output_test.go b/internal/tofu/node_output_test.go similarity index 99% rename from internal/opentf/node_output_test.go rename to internal/tofu/node_output_test.go index f95cf06f29..b6152056b5 100644 --- a/internal/opentf/node_output_test.go +++ b/internal/tofu/node_output_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "strings" diff --git a/internal/opentf/node_provider.go b/internal/tofu/node_provider.go similarity index 99% rename from internal/opentf/node_provider.go rename to internal/tofu/node_provider.go index a715453039..441a6954b6 100644 --- a/internal/opentf/node_provider.go +++ b/internal/tofu/node_provider.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/node_provider_abstract.go b/internal/tofu/node_provider_abstract.go similarity index 99% rename from internal/opentf/node_provider_abstract.go rename to internal/tofu/node_provider_abstract.go index f0f9e151e0..31dfcd0a8f 100644 --- a/internal/opentf/node_provider_abstract.go +++ b/internal/tofu/node_provider_abstract.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "github.com/opentofu/opentofu/internal/addrs" diff --git a/internal/opentf/node_provider_eval.go b/internal/tofu/node_provider_eval.go similarity index 97% rename from internal/opentf/node_provider_eval.go rename to internal/tofu/node_provider_eval.go index 6ab205f39f..798e22a1bc 100644 --- a/internal/opentf/node_provider_eval.go +++ b/internal/tofu/node_provider_eval.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import "github.com/opentofu/opentofu/internal/tfdiags" diff --git a/internal/opentf/node_provider_test.go b/internal/tofu/node_provider_test.go similarity index 99% rename from internal/opentf/node_provider_test.go rename to internal/tofu/node_provider_test.go index 2f562eb0ce..009934e863 100644 --- a/internal/opentf/node_provider_test.go +++ b/internal/tofu/node_provider_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/node_resource_abstract.go b/internal/tofu/node_resource_abstract.go similarity index 99% rename from internal/opentf/node_resource_abstract.go rename to internal/tofu/node_resource_abstract.go index 43159145b6..19b4d896eb 100644 --- a/internal/opentf/node_resource_abstract.go +++ b/internal/tofu/node_resource_abstract.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/node_resource_abstract_instance.go b/internal/tofu/node_resource_abstract_instance.go similarity index 99% rename from internal/opentf/node_resource_abstract_instance.go rename to internal/tofu/node_resource_abstract_instance.go index 03c9573f4b..ab5bb32fdc 100644 --- a/internal/opentf/node_resource_abstract_instance.go +++ b/internal/tofu/node_resource_abstract_instance.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/node_resource_abstract_instance_test.go b/internal/tofu/node_resource_abstract_instance_test.go similarity index 99% rename from internal/opentf/node_resource_abstract_instance_test.go rename to internal/tofu/node_resource_abstract_instance_test.go index fd09dab517..f50333c09d 100644 --- a/internal/opentf/node_resource_abstract_instance_test.go +++ b/internal/tofu/node_resource_abstract_instance_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/node_resource_abstract_test.go b/internal/tofu/node_resource_abstract_test.go similarity index 99% rename from internal/opentf/node_resource_abstract_test.go rename to internal/tofu/node_resource_abstract_test.go index b353f99c25..73d5f345bc 100644 --- a/internal/opentf/node_resource_abstract_test.go +++ b/internal/tofu/node_resource_abstract_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/node_resource_apply.go b/internal/tofu/node_resource_apply.go similarity index 99% rename from internal/opentf/node_resource_apply.go rename to internal/tofu/node_resource_apply.go index 9bdd0b26ee..9fb2248941 100644 --- a/internal/opentf/node_resource_apply.go +++ b/internal/tofu/node_resource_apply.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "github.com/opentofu/opentofu/internal/addrs" diff --git a/internal/opentf/node_resource_apply_instance.go b/internal/tofu/node_resource_apply_instance.go similarity index 99% rename from internal/opentf/node_resource_apply_instance.go rename to internal/tofu/node_resource_apply_instance.go index a0f331e4e3..5c9966f518 100644 --- a/internal/opentf/node_resource_apply_instance.go +++ b/internal/tofu/node_resource_apply_instance.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/node_resource_apply_test.go b/internal/tofu/node_resource_apply_test.go similarity index 99% rename from internal/opentf/node_resource_apply_test.go rename to internal/tofu/node_resource_apply_test.go index d8ca7364b4..3d8e164d0b 100644 --- a/internal/opentf/node_resource_apply_test.go +++ b/internal/tofu/node_resource_apply_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "testing" diff --git a/internal/opentf/node_resource_destroy.go b/internal/tofu/node_resource_destroy.go similarity index 99% rename from internal/opentf/node_resource_destroy.go rename to internal/tofu/node_resource_destroy.go index 327ddf52c2..3b43186f56 100644 --- a/internal/opentf/node_resource_destroy.go +++ b/internal/tofu/node_resource_destroy.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/node_resource_destroy_deposed.go b/internal/tofu/node_resource_destroy_deposed.go similarity index 99% rename from internal/opentf/node_resource_destroy_deposed.go rename to internal/tofu/node_resource_destroy_deposed.go index d1c8415db2..53bfa14196 100644 --- a/internal/opentf/node_resource_destroy_deposed.go +++ b/internal/tofu/node_resource_destroy_deposed.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/node_resource_destroy_deposed_test.go b/internal/tofu/node_resource_destroy_deposed_test.go similarity index 99% rename from internal/opentf/node_resource_destroy_deposed_test.go rename to internal/tofu/node_resource_destroy_deposed_test.go index 51ed50efb8..9fce16df84 100644 --- a/internal/opentf/node_resource_destroy_deposed_test.go +++ b/internal/tofu/node_resource_destroy_deposed_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "testing" diff --git a/internal/opentf/node_resource_import.go b/internal/tofu/node_resource_import.go similarity index 98% rename from internal/opentf/node_resource_import.go rename to internal/tofu/node_resource_import.go index 8c748ba4d2..065e0b6749 100644 --- a/internal/opentf/node_resource_import.go +++ b/internal/tofu/node_resource_import.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" @@ -241,7 +241,7 @@ func (n *graphNodeImportStateSub) Execute(ctx EvalContext, op walkOperation) (di "the provider detected that no object exists with the given id. "+ "Only pre-existing objects can be imported; check that the id "+ "is correct and that it is associated with the provider's "+ - "configured region or endpoint, or use \"opentf apply\" to "+ + "configured region or endpoint, or use \"tofu apply\" to "+ "create a new remote object for this resource.", n.TargetAddr, ), diff --git a/internal/opentf/node_resource_plan.go b/internal/tofu/node_resource_plan.go similarity index 99% rename from internal/opentf/node_resource_plan.go rename to internal/tofu/node_resource_plan.go index 040c79018d..50375a2c8a 100644 --- a/internal/opentf/node_resource_plan.go +++ b/internal/tofu/node_resource_plan.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/node_resource_plan_destroy.go b/internal/tofu/node_resource_plan_destroy.go similarity index 99% rename from internal/opentf/node_resource_plan_destroy.go rename to internal/tofu/node_resource_plan_destroy.go index 6aea9de5a3..f1a053325b 100644 --- a/internal/opentf/node_resource_plan_destroy.go +++ b/internal/tofu/node_resource_plan_destroy.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/node_resource_plan_instance.go b/internal/tofu/node_resource_plan_instance.go similarity index 99% rename from internal/opentf/node_resource_plan_instance.go rename to internal/tofu/node_resource_plan_instance.go index e0b49d0efd..23d623b69e 100644 --- a/internal/opentf/node_resource_plan_instance.go +++ b/internal/tofu/node_resource_plan_instance.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" @@ -546,7 +546,7 @@ func (n *NodePlannableResourceInstance) importState(ctx EvalContext, addr addrs. "the provider detected that no object exists with the given id. "+ "Only pre-existing objects can be imported; check that the id "+ "is correct and that it is associated with the provider's "+ - "configured region or endpoint, or use \"opentf apply\" to "+ + "configured region or endpoint, or use \"tofu apply\" to "+ "create a new remote object for this resource.", n.importTarget.Addr, ), diff --git a/internal/opentf/node_resource_plan_orphan.go b/internal/tofu/node_resource_plan_orphan.go similarity index 99% rename from internal/opentf/node_resource_plan_orphan.go rename to internal/tofu/node_resource_plan_orphan.go index 5bb7e75296..f29a3cd739 100644 --- a/internal/opentf/node_resource_plan_orphan.go +++ b/internal/tofu/node_resource_plan_orphan.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/node_resource_plan_orphan_test.go b/internal/tofu/node_resource_plan_orphan_test.go similarity index 99% rename from internal/opentf/node_resource_plan_orphan_test.go rename to internal/tofu/node_resource_plan_orphan_test.go index 4b88476985..4d63b907cd 100644 --- a/internal/opentf/node_resource_plan_orphan_test.go +++ b/internal/tofu/node_resource_plan_orphan_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "testing" diff --git a/internal/opentf/node_resource_validate.go b/internal/tofu/node_resource_validate.go similarity index 99% rename from internal/opentf/node_resource_validate.go rename to internal/tofu/node_resource_validate.go index cd35a1ed1d..21dc70b3c4 100644 --- a/internal/opentf/node_resource_validate.go +++ b/internal/tofu/node_resource_validate.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/node_resource_validate_test.go b/internal/tofu/node_resource_validate_test.go similarity index 99% rename from internal/opentf/node_resource_validate_test.go rename to internal/tofu/node_resource_validate_test.go index 711a7b8cae..e3964498c0 100644 --- a/internal/opentf/node_resource_validate_test.go +++ b/internal/tofu/node_resource_validate_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "errors" diff --git a/internal/opentf/node_root_variable.go b/internal/tofu/node_root_variable.go similarity index 99% rename from internal/opentf/node_root_variable.go rename to internal/tofu/node_root_variable.go index 1281838c72..febaf831c4 100644 --- a/internal/opentf/node_root_variable.go +++ b/internal/tofu/node_root_variable.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "log" diff --git a/internal/opentf/node_root_variable_test.go b/internal/tofu/node_root_variable_test.go similarity index 99% rename from internal/opentf/node_root_variable_test.go rename to internal/tofu/node_root_variable_test.go index c1f0c731e9..09b40a5fe7 100644 --- a/internal/opentf/node_root_variable_test.go +++ b/internal/tofu/node_root_variable_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "testing" diff --git a/internal/opentf/node_value.go b/internal/tofu/node_value.go similarity index 96% rename from internal/opentf/node_value.go rename to internal/tofu/node_value.go index 4aae3c8e9e..d873e2cf37 100644 --- a/internal/opentf/node_value.go +++ b/internal/tofu/node_value.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu // graphNodeTemporaryValue is implemented by nodes that may represent temporary // values, which are those not saved to the state file. This includes locals, diff --git a/internal/opentf/opentf_test.go b/internal/tofu/opentf_test.go similarity index 99% rename from internal/opentf/opentf_test.go rename to internal/tofu/opentf_test.go index 36ccc935f5..1c20e56615 100644 --- a/internal/opentf/opentf_test.go +++ b/internal/tofu/opentf_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "context" diff --git a/internal/opentf/phasestate_string.go b/internal/tofu/phasestate_string.go similarity index 97% rename from internal/opentf/phasestate_string.go rename to internal/tofu/phasestate_string.go index 6ab28a9c7e..0ba4633fc6 100644 --- a/internal/opentf/phasestate_string.go +++ b/internal/tofu/phasestate_string.go @@ -1,6 +1,6 @@ // Code generated by "stringer -type phaseState"; DO NOT EDIT. -package opentf +package tofu import "strconv" diff --git a/internal/opentf/provider_mock.go b/internal/tofu/provider_mock.go similarity index 99% rename from internal/opentf/provider_mock.go rename to internal/tofu/provider_mock.go index e91c39d839..8bc807dc21 100644 --- a/internal/opentf/provider_mock.go +++ b/internal/tofu/provider_mock.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/provisioner_mock.go b/internal/tofu/provisioner_mock.go similarity index 99% rename from internal/opentf/provisioner_mock.go rename to internal/tofu/provisioner_mock.go index 81f20c3e33..c6d7a9ad04 100644 --- a/internal/opentf/provisioner_mock.go +++ b/internal/tofu/provisioner_mock.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "sync" diff --git a/internal/opentf/provisioner_mock_test.go b/internal/tofu/provisioner_mock_test.go similarity index 98% rename from internal/opentf/provisioner_mock_test.go rename to internal/tofu/provisioner_mock_test.go index c4e2dca047..66b024f012 100644 --- a/internal/opentf/provisioner_mock_test.go +++ b/internal/tofu/provisioner_mock_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "github.com/opentofu/opentofu/internal/provisioners" diff --git a/internal/opentf/reduce_plan.go b/internal/tofu/reduce_plan.go similarity index 98% rename from internal/opentf/reduce_plan.go rename to internal/tofu/reduce_plan.go index bc7af41476..27581ef782 100644 --- a/internal/opentf/reduce_plan.go +++ b/internal/tofu/reduce_plan.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "log" diff --git a/internal/opentf/reduce_plan_test.go b/internal/tofu/reduce_plan_test.go similarity index 99% rename from internal/opentf/reduce_plan_test.go rename to internal/tofu/reduce_plan_test.go index 32504c73d2..0a26a89e2f 100644 --- a/internal/opentf/reduce_plan_test.go +++ b/internal/tofu/reduce_plan_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "testing" diff --git a/internal/opentf/resource_provider_mock_test.go b/internal/tofu/resource_provider_mock_test.go similarity index 99% rename from internal/opentf/resource_provider_mock_test.go rename to internal/tofu/resource_provider_mock_test.go index 8bea464d5e..faeacfbd97 100644 --- a/internal/opentf/resource_provider_mock_test.go +++ b/internal/tofu/resource_provider_mock_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "github.com/opentofu/opentofu/internal/configs/configschema" diff --git a/internal/opentf/schemas.go b/internal/tofu/schemas.go similarity index 99% rename from internal/opentf/schemas.go rename to internal/tofu/schemas.go index ebd7a9230b..7f909b0d72 100644 --- a/internal/opentf/schemas.go +++ b/internal/tofu/schemas.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/schemas_test.go b/internal/tofu/schemas_test.go similarity index 99% rename from internal/opentf/schemas_test.go rename to internal/tofu/schemas_test.go index 64aa1e8957..a735e06a15 100644 --- a/internal/opentf/schemas_test.go +++ b/internal/tofu/schemas_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "github.com/opentofu/opentofu/internal/addrs" diff --git a/internal/opentf/test_context.go b/internal/tofu/test_context.go similarity index 99% rename from internal/opentf/test_context.go rename to internal/tofu/test_context.go index fd003257d7..9fb0c1d90a 100644 --- a/internal/opentf/test_context.go +++ b/internal/tofu/test_context.go @@ -1,4 +1,4 @@ -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/test_context_test.go b/internal/tofu/test_context_test.go similarity index 99% rename from internal/opentf/test_context_test.go rename to internal/tofu/test_context_test.go index 99628c19ef..3c43994c21 100644 --- a/internal/opentf/test_context_test.go +++ b/internal/tofu/test_context_test.go @@ -1,4 +1,4 @@ -package opentf +package tofu import ( "testing" diff --git a/internal/opentf/testdata/apply-blank/main.tf b/internal/tofu/testdata/apply-blank/main.tf similarity index 100% rename from internal/opentf/testdata/apply-blank/main.tf rename to internal/tofu/testdata/apply-blank/main.tf diff --git a/internal/opentf/testdata/apply-cancel-block/main.tf b/internal/tofu/testdata/apply-cancel-block/main.tf similarity index 100% rename from internal/opentf/testdata/apply-cancel-block/main.tf rename to internal/tofu/testdata/apply-cancel-block/main.tf diff --git a/internal/opentf/testdata/apply-cancel-provisioner/main.tf b/internal/tofu/testdata/apply-cancel-provisioner/main.tf similarity index 100% rename from internal/opentf/testdata/apply-cancel-provisioner/main.tf rename to internal/tofu/testdata/apply-cancel-provisioner/main.tf diff --git a/internal/opentf/testdata/apply-cancel/main.tf b/internal/tofu/testdata/apply-cancel/main.tf similarity index 100% rename from internal/opentf/testdata/apply-cancel/main.tf rename to internal/tofu/testdata/apply-cancel/main.tf diff --git a/internal/opentf/testdata/apply-cbd-count/main.tf b/internal/tofu/testdata/apply-cbd-count/main.tf similarity index 100% rename from internal/opentf/testdata/apply-cbd-count/main.tf rename to internal/tofu/testdata/apply-cbd-count/main.tf diff --git a/internal/opentf/testdata/apply-cbd-cycle/main.tf b/internal/tofu/testdata/apply-cbd-cycle/main.tf similarity index 100% rename from internal/opentf/testdata/apply-cbd-cycle/main.tf rename to internal/tofu/testdata/apply-cbd-cycle/main.tf diff --git a/internal/opentf/testdata/apply-cbd-depends-non-cbd/main.tf b/internal/tofu/testdata/apply-cbd-depends-non-cbd/main.tf similarity index 100% rename from internal/opentf/testdata/apply-cbd-depends-non-cbd/main.tf rename to internal/tofu/testdata/apply-cbd-depends-non-cbd/main.tf diff --git a/internal/opentf/testdata/apply-cbd-deposed-only/main.tf b/internal/tofu/testdata/apply-cbd-deposed-only/main.tf similarity index 100% rename from internal/opentf/testdata/apply-cbd-deposed-only/main.tf rename to internal/tofu/testdata/apply-cbd-deposed-only/main.tf diff --git a/internal/opentf/testdata/apply-compute/main.tf b/internal/tofu/testdata/apply-compute/main.tf similarity index 100% rename from internal/opentf/testdata/apply-compute/main.tf rename to internal/tofu/testdata/apply-compute/main.tf diff --git a/internal/opentf/testdata/apply-count-dec-one/main.tf b/internal/tofu/testdata/apply-count-dec-one/main.tf similarity index 100% rename from internal/opentf/testdata/apply-count-dec-one/main.tf rename to internal/tofu/testdata/apply-count-dec-one/main.tf diff --git a/internal/opentf/testdata/apply-count-dec/main.tf b/internal/tofu/testdata/apply-count-dec/main.tf similarity index 100% rename from internal/opentf/testdata/apply-count-dec/main.tf rename to internal/tofu/testdata/apply-count-dec/main.tf diff --git a/internal/opentf/testdata/apply-count-tainted/main.tf b/internal/tofu/testdata/apply-count-tainted/main.tf similarity index 100% rename from internal/opentf/testdata/apply-count-tainted/main.tf rename to internal/tofu/testdata/apply-count-tainted/main.tf diff --git a/internal/opentf/testdata/apply-count-variable-ref/main.tf b/internal/tofu/testdata/apply-count-variable-ref/main.tf similarity index 100% rename from internal/opentf/testdata/apply-count-variable-ref/main.tf rename to internal/tofu/testdata/apply-count-variable-ref/main.tf diff --git a/internal/opentf/testdata/apply-count-variable/main.tf b/internal/tofu/testdata/apply-count-variable/main.tf similarity index 100% rename from internal/opentf/testdata/apply-count-variable/main.tf rename to internal/tofu/testdata/apply-count-variable/main.tf diff --git a/internal/opentf/testdata/apply-data-basic/main.tf b/internal/tofu/testdata/apply-data-basic/main.tf similarity index 100% rename from internal/opentf/testdata/apply-data-basic/main.tf rename to internal/tofu/testdata/apply-data-basic/main.tf diff --git a/internal/opentf/testdata/apply-data-sensitive/main.tf b/internal/tofu/testdata/apply-data-sensitive/main.tf similarity index 100% rename from internal/opentf/testdata/apply-data-sensitive/main.tf rename to internal/tofu/testdata/apply-data-sensitive/main.tf diff --git a/internal/opentf/testdata/apply-depends-create-before/main.tf b/internal/tofu/testdata/apply-depends-create-before/main.tf similarity index 100% rename from internal/opentf/testdata/apply-depends-create-before/main.tf rename to internal/tofu/testdata/apply-depends-create-before/main.tf diff --git a/internal/opentf/testdata/apply-destroy-cbd/main.tf b/internal/tofu/testdata/apply-destroy-cbd/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-cbd/main.tf rename to internal/tofu/testdata/apply-destroy-cbd/main.tf diff --git a/internal/opentf/testdata/apply-destroy-computed/child/main.tf b/internal/tofu/testdata/apply-destroy-computed/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-computed/child/main.tf rename to internal/tofu/testdata/apply-destroy-computed/child/main.tf diff --git a/internal/opentf/testdata/apply-destroy-computed/main.tf b/internal/tofu/testdata/apply-destroy-computed/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-computed/main.tf rename to internal/tofu/testdata/apply-destroy-computed/main.tf diff --git a/internal/opentf/testdata/apply-destroy-cross-providers/child/main.tf b/internal/tofu/testdata/apply-destroy-cross-providers/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-cross-providers/child/main.tf rename to internal/tofu/testdata/apply-destroy-cross-providers/child/main.tf diff --git a/internal/opentf/testdata/apply-destroy-cross-providers/main.tf b/internal/tofu/testdata/apply-destroy-cross-providers/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-cross-providers/main.tf rename to internal/tofu/testdata/apply-destroy-cross-providers/main.tf diff --git a/internal/opentf/testdata/apply-destroy-data-cycle/main.tf b/internal/tofu/testdata/apply-destroy-data-cycle/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-data-cycle/main.tf rename to internal/tofu/testdata/apply-destroy-data-cycle/main.tf diff --git a/internal/opentf/testdata/apply-destroy-data-resource/main.tf b/internal/tofu/testdata/apply-destroy-data-resource/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-data-resource/main.tf rename to internal/tofu/testdata/apply-destroy-data-resource/main.tf diff --git a/internal/opentf/testdata/apply-destroy-deeply-nested-module/child/main.tf b/internal/tofu/testdata/apply-destroy-deeply-nested-module/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-deeply-nested-module/child/main.tf rename to internal/tofu/testdata/apply-destroy-deeply-nested-module/child/main.tf diff --git a/internal/opentf/testdata/apply-destroy-deeply-nested-module/child/subchild/main.tf b/internal/tofu/testdata/apply-destroy-deeply-nested-module/child/subchild/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-deeply-nested-module/child/subchild/main.tf rename to internal/tofu/testdata/apply-destroy-deeply-nested-module/child/subchild/main.tf diff --git a/internal/opentf/testdata/apply-destroy-deeply-nested-module/child/subchild/subsubchild/main.tf b/internal/tofu/testdata/apply-destroy-deeply-nested-module/child/subchild/subsubchild/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-deeply-nested-module/child/subchild/subsubchild/main.tf rename to internal/tofu/testdata/apply-destroy-deeply-nested-module/child/subchild/subsubchild/main.tf diff --git a/internal/opentf/testdata/apply-destroy-deeply-nested-module/main.tf b/internal/tofu/testdata/apply-destroy-deeply-nested-module/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-deeply-nested-module/main.tf rename to internal/tofu/testdata/apply-destroy-deeply-nested-module/main.tf diff --git a/internal/opentf/testdata/apply-destroy-depends-on/main.tf b/internal/tofu/testdata/apply-destroy-depends-on/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-depends-on/main.tf rename to internal/tofu/testdata/apply-destroy-depends-on/main.tf diff --git a/internal/opentf/testdata/apply-destroy-mod-var-and-count-nested/child/child2/main.tf b/internal/tofu/testdata/apply-destroy-mod-var-and-count-nested/child/child2/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-mod-var-and-count-nested/child/child2/main.tf rename to internal/tofu/testdata/apply-destroy-mod-var-and-count-nested/child/child2/main.tf diff --git a/internal/opentf/testdata/apply-destroy-mod-var-and-count-nested/child/main.tf b/internal/tofu/testdata/apply-destroy-mod-var-and-count-nested/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-mod-var-and-count-nested/child/main.tf rename to internal/tofu/testdata/apply-destroy-mod-var-and-count-nested/child/main.tf diff --git a/internal/opentf/testdata/apply-destroy-mod-var-and-count-nested/main.tf b/internal/tofu/testdata/apply-destroy-mod-var-and-count-nested/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-mod-var-and-count-nested/main.tf rename to internal/tofu/testdata/apply-destroy-mod-var-and-count-nested/main.tf diff --git a/internal/opentf/testdata/apply-destroy-mod-var-and-count/child/main.tf b/internal/tofu/testdata/apply-destroy-mod-var-and-count/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-mod-var-and-count/child/main.tf rename to internal/tofu/testdata/apply-destroy-mod-var-and-count/child/main.tf diff --git a/internal/opentf/testdata/apply-destroy-mod-var-and-count/main.tf b/internal/tofu/testdata/apply-destroy-mod-var-and-count/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-mod-var-and-count/main.tf rename to internal/tofu/testdata/apply-destroy-mod-var-and-count/main.tf diff --git a/internal/opentf/testdata/apply-destroy-mod-var-provider-config/child/child.tf b/internal/tofu/testdata/apply-destroy-mod-var-provider-config/child/child.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-mod-var-provider-config/child/child.tf rename to internal/tofu/testdata/apply-destroy-mod-var-provider-config/child/child.tf diff --git a/internal/opentf/testdata/apply-destroy-mod-var-provider-config/main.tf b/internal/tofu/testdata/apply-destroy-mod-var-provider-config/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-mod-var-provider-config/main.tf rename to internal/tofu/testdata/apply-destroy-mod-var-provider-config/main.tf diff --git a/internal/opentf/testdata/apply-destroy-module-resource-prefix/child/main.tf b/internal/tofu/testdata/apply-destroy-module-resource-prefix/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-module-resource-prefix/child/main.tf rename to internal/tofu/testdata/apply-destroy-module-resource-prefix/child/main.tf diff --git a/internal/opentf/testdata/apply-destroy-module-resource-prefix/main.tf b/internal/tofu/testdata/apply-destroy-module-resource-prefix/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-module-resource-prefix/main.tf rename to internal/tofu/testdata/apply-destroy-module-resource-prefix/main.tf diff --git a/internal/opentf/testdata/apply-destroy-module-with-attrs/child/main.tf b/internal/tofu/testdata/apply-destroy-module-with-attrs/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-module-with-attrs/child/main.tf rename to internal/tofu/testdata/apply-destroy-module-with-attrs/child/main.tf diff --git a/internal/opentf/testdata/apply-destroy-module-with-attrs/main.tf b/internal/tofu/testdata/apply-destroy-module-with-attrs/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-module-with-attrs/main.tf rename to internal/tofu/testdata/apply-destroy-module-with-attrs/main.tf diff --git a/internal/opentf/testdata/apply-destroy-nested-module-with-attrs/middle/bottom/bottom.tf b/internal/tofu/testdata/apply-destroy-nested-module-with-attrs/middle/bottom/bottom.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-nested-module-with-attrs/middle/bottom/bottom.tf rename to internal/tofu/testdata/apply-destroy-nested-module-with-attrs/middle/bottom/bottom.tf diff --git a/internal/opentf/testdata/apply-destroy-nested-module-with-attrs/middle/middle.tf b/internal/tofu/testdata/apply-destroy-nested-module-with-attrs/middle/middle.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-nested-module-with-attrs/middle/middle.tf rename to internal/tofu/testdata/apply-destroy-nested-module-with-attrs/middle/middle.tf diff --git a/internal/opentf/testdata/apply-destroy-nested-module-with-attrs/top.tf b/internal/tofu/testdata/apply-destroy-nested-module-with-attrs/top.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-nested-module-with-attrs/top.tf rename to internal/tofu/testdata/apply-destroy-nested-module-with-attrs/top.tf diff --git a/internal/opentf/testdata/apply-destroy-nested-module/child/main.tf b/internal/tofu/testdata/apply-destroy-nested-module/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-nested-module/child/main.tf rename to internal/tofu/testdata/apply-destroy-nested-module/child/main.tf diff --git a/internal/opentf/testdata/apply-destroy-nested-module/child/subchild/main.tf b/internal/tofu/testdata/apply-destroy-nested-module/child/subchild/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-nested-module/child/subchild/main.tf rename to internal/tofu/testdata/apply-destroy-nested-module/child/subchild/main.tf diff --git a/internal/opentf/testdata/apply-destroy-nested-module/main.tf b/internal/tofu/testdata/apply-destroy-nested-module/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-nested-module/main.tf rename to internal/tofu/testdata/apply-destroy-nested-module/main.tf diff --git a/internal/opentf/testdata/apply-destroy-outputs/main.tf b/internal/tofu/testdata/apply-destroy-outputs/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-outputs/main.tf rename to internal/tofu/testdata/apply-destroy-outputs/main.tf diff --git a/internal/opentf/testdata/apply-destroy-provisider-refs/main.tf b/internal/tofu/testdata/apply-destroy-provisider-refs/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-provisider-refs/main.tf rename to internal/tofu/testdata/apply-destroy-provisider-refs/main.tf diff --git a/internal/opentf/testdata/apply-destroy-provisider-refs/mod/main.tf b/internal/tofu/testdata/apply-destroy-provisider-refs/mod/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-provisider-refs/mod/main.tf rename to internal/tofu/testdata/apply-destroy-provisider-refs/mod/main.tf diff --git a/internal/opentf/testdata/apply-destroy-provisioner/main.tf b/internal/tofu/testdata/apply-destroy-provisioner/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-provisioner/main.tf rename to internal/tofu/testdata/apply-destroy-provisioner/main.tf diff --git a/internal/opentf/testdata/apply-destroy-tainted/main.tf b/internal/tofu/testdata/apply-destroy-tainted/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-tainted/main.tf rename to internal/tofu/testdata/apply-destroy-tainted/main.tf diff --git a/internal/opentf/testdata/apply-destroy-targeted-count/main.tf b/internal/tofu/testdata/apply-destroy-targeted-count/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-targeted-count/main.tf rename to internal/tofu/testdata/apply-destroy-targeted-count/main.tf diff --git a/internal/opentf/testdata/apply-destroy-with-locals/main.tf b/internal/tofu/testdata/apply-destroy-with-locals/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy-with-locals/main.tf rename to internal/tofu/testdata/apply-destroy-with-locals/main.tf diff --git a/internal/opentf/testdata/apply-destroy/main.tf b/internal/tofu/testdata/apply-destroy/main.tf similarity index 100% rename from internal/opentf/testdata/apply-destroy/main.tf rename to internal/tofu/testdata/apply-destroy/main.tf diff --git a/internal/opentf/testdata/apply-empty-module/child/main.tf b/internal/tofu/testdata/apply-empty-module/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-empty-module/child/main.tf rename to internal/tofu/testdata/apply-empty-module/child/main.tf diff --git a/internal/opentf/testdata/apply-empty-module/main.tf b/internal/tofu/testdata/apply-empty-module/main.tf similarity index 100% rename from internal/opentf/testdata/apply-empty-module/main.tf rename to internal/tofu/testdata/apply-empty-module/main.tf diff --git a/internal/opentf/testdata/apply-error-create-before/main.tf b/internal/tofu/testdata/apply-error-create-before/main.tf similarity index 100% rename from internal/opentf/testdata/apply-error-create-before/main.tf rename to internal/tofu/testdata/apply-error-create-before/main.tf diff --git a/internal/opentf/testdata/apply-error/main.tf b/internal/tofu/testdata/apply-error/main.tf similarity index 100% rename from internal/opentf/testdata/apply-error/main.tf rename to internal/tofu/testdata/apply-error/main.tf diff --git a/internal/opentf/testdata/apply-escape/main.tf b/internal/tofu/testdata/apply-escape/main.tf similarity index 100% rename from internal/opentf/testdata/apply-escape/main.tf rename to internal/tofu/testdata/apply-escape/main.tf diff --git a/internal/opentf/testdata/apply-good-create-before-update/main.tf b/internal/tofu/testdata/apply-good-create-before-update/main.tf similarity index 100% rename from internal/opentf/testdata/apply-good-create-before-update/main.tf rename to internal/tofu/testdata/apply-good-create-before-update/main.tf diff --git a/internal/opentf/testdata/apply-good-create-before/main.tf b/internal/tofu/testdata/apply-good-create-before/main.tf similarity index 100% rename from internal/opentf/testdata/apply-good-create-before/main.tf rename to internal/tofu/testdata/apply-good-create-before/main.tf diff --git a/internal/opentf/testdata/apply-good/main.tf b/internal/tofu/testdata/apply-good/main.tf similarity index 100% rename from internal/opentf/testdata/apply-good/main.tf rename to internal/tofu/testdata/apply-good/main.tf diff --git a/internal/opentf/testdata/apply-idattr/main.tf b/internal/tofu/testdata/apply-idattr/main.tf similarity index 100% rename from internal/opentf/testdata/apply-idattr/main.tf rename to internal/tofu/testdata/apply-idattr/main.tf diff --git a/internal/opentf/testdata/apply-ignore-changes-all/main.tf b/internal/tofu/testdata/apply-ignore-changes-all/main.tf similarity index 100% rename from internal/opentf/testdata/apply-ignore-changes-all/main.tf rename to internal/tofu/testdata/apply-ignore-changes-all/main.tf diff --git a/internal/opentf/testdata/apply-ignore-changes-create/main.tf b/internal/tofu/testdata/apply-ignore-changes-create/main.tf similarity index 100% rename from internal/opentf/testdata/apply-ignore-changes-create/main.tf rename to internal/tofu/testdata/apply-ignore-changes-create/main.tf diff --git a/internal/opentf/testdata/apply-ignore-changes-dep/main.tf b/internal/tofu/testdata/apply-ignore-changes-dep/main.tf similarity index 100% rename from internal/opentf/testdata/apply-ignore-changes-dep/main.tf rename to internal/tofu/testdata/apply-ignore-changes-dep/main.tf diff --git a/internal/opentf/testdata/apply-inconsistent-with-plan/main.tf b/internal/tofu/testdata/apply-inconsistent-with-plan/main.tf similarity index 100% rename from internal/opentf/testdata/apply-inconsistent-with-plan/main.tf rename to internal/tofu/testdata/apply-inconsistent-with-plan/main.tf diff --git a/internal/opentf/testdata/apply-interpolated-count/main.tf b/internal/tofu/testdata/apply-interpolated-count/main.tf similarity index 100% rename from internal/opentf/testdata/apply-interpolated-count/main.tf rename to internal/tofu/testdata/apply-interpolated-count/main.tf diff --git a/internal/opentf/testdata/apply-invalid-index/main.tf b/internal/tofu/testdata/apply-invalid-index/main.tf similarity index 100% rename from internal/opentf/testdata/apply-invalid-index/main.tf rename to internal/tofu/testdata/apply-invalid-index/main.tf diff --git a/internal/opentf/testdata/apply-issue19908/issue19908.tf b/internal/tofu/testdata/apply-issue19908/issue19908.tf similarity index 100% rename from internal/opentf/testdata/apply-issue19908/issue19908.tf rename to internal/tofu/testdata/apply-issue19908/issue19908.tf diff --git a/internal/opentf/testdata/apply-local-val/child/child.tf b/internal/tofu/testdata/apply-local-val/child/child.tf similarity index 100% rename from internal/opentf/testdata/apply-local-val/child/child.tf rename to internal/tofu/testdata/apply-local-val/child/child.tf diff --git a/internal/opentf/testdata/apply-local-val/main.tf b/internal/tofu/testdata/apply-local-val/main.tf similarity index 100% rename from internal/opentf/testdata/apply-local-val/main.tf rename to internal/tofu/testdata/apply-local-val/main.tf diff --git a/internal/opentf/testdata/apply-local-val/outputs.tf b/internal/tofu/testdata/apply-local-val/outputs.tf similarity index 100% rename from internal/opentf/testdata/apply-local-val/outputs.tf rename to internal/tofu/testdata/apply-local-val/outputs.tf diff --git a/internal/opentf/testdata/apply-map-var-through-module/amodule/main.tf b/internal/tofu/testdata/apply-map-var-through-module/amodule/main.tf similarity index 100% rename from internal/opentf/testdata/apply-map-var-through-module/amodule/main.tf rename to internal/tofu/testdata/apply-map-var-through-module/amodule/main.tf diff --git a/internal/opentf/testdata/apply-map-var-through-module/main.tf b/internal/tofu/testdata/apply-map-var-through-module/main.tf similarity index 100% rename from internal/opentf/testdata/apply-map-var-through-module/main.tf rename to internal/tofu/testdata/apply-map-var-through-module/main.tf diff --git a/internal/opentf/testdata/apply-minimal/main.tf b/internal/tofu/testdata/apply-minimal/main.tf similarity index 100% rename from internal/opentf/testdata/apply-minimal/main.tf rename to internal/tofu/testdata/apply-minimal/main.tf diff --git a/internal/opentf/testdata/apply-module-bool/child/main.tf b/internal/tofu/testdata/apply-module-bool/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-bool/child/main.tf rename to internal/tofu/testdata/apply-module-bool/child/main.tf diff --git a/internal/opentf/testdata/apply-module-bool/main.tf b/internal/tofu/testdata/apply-module-bool/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-bool/main.tf rename to internal/tofu/testdata/apply-module-bool/main.tf diff --git a/internal/opentf/testdata/apply-module-depends-on/main.tf b/internal/tofu/testdata/apply-module-depends-on/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-depends-on/main.tf rename to internal/tofu/testdata/apply-module-depends-on/main.tf diff --git a/internal/opentf/testdata/apply-module-depends-on/moda/main.tf b/internal/tofu/testdata/apply-module-depends-on/moda/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-depends-on/moda/main.tf rename to internal/tofu/testdata/apply-module-depends-on/moda/main.tf diff --git a/internal/opentf/testdata/apply-module-depends-on/modb/main.tf b/internal/tofu/testdata/apply-module-depends-on/modb/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-depends-on/modb/main.tf rename to internal/tofu/testdata/apply-module-depends-on/modb/main.tf diff --git a/internal/opentf/testdata/apply-module-destroy-order/child/main.tf b/internal/tofu/testdata/apply-module-destroy-order/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-destroy-order/child/main.tf rename to internal/tofu/testdata/apply-module-destroy-order/child/main.tf diff --git a/internal/opentf/testdata/apply-module-destroy-order/main.tf b/internal/tofu/testdata/apply-module-destroy-order/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-destroy-order/main.tf rename to internal/tofu/testdata/apply-module-destroy-order/main.tf diff --git a/internal/opentf/testdata/apply-module-grandchild-provider-inherit/child/grandchild/main.tf b/internal/tofu/testdata/apply-module-grandchild-provider-inherit/child/grandchild/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-grandchild-provider-inherit/child/grandchild/main.tf rename to internal/tofu/testdata/apply-module-grandchild-provider-inherit/child/grandchild/main.tf diff --git a/internal/opentf/testdata/apply-module-grandchild-provider-inherit/child/main.tf b/internal/tofu/testdata/apply-module-grandchild-provider-inherit/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-grandchild-provider-inherit/child/main.tf rename to internal/tofu/testdata/apply-module-grandchild-provider-inherit/child/main.tf diff --git a/internal/opentf/testdata/apply-module-grandchild-provider-inherit/main.tf b/internal/tofu/testdata/apply-module-grandchild-provider-inherit/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-grandchild-provider-inherit/main.tf rename to internal/tofu/testdata/apply-module-grandchild-provider-inherit/main.tf diff --git a/internal/opentf/testdata/apply-module-only-provider/child/main.tf b/internal/tofu/testdata/apply-module-only-provider/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-only-provider/child/main.tf rename to internal/tofu/testdata/apply-module-only-provider/child/main.tf diff --git a/internal/opentf/testdata/apply-module-only-provider/main.tf b/internal/tofu/testdata/apply-module-only-provider/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-only-provider/main.tf rename to internal/tofu/testdata/apply-module-only-provider/main.tf diff --git a/internal/opentf/testdata/apply-module-orphan-provider-inherit/main.tf b/internal/tofu/testdata/apply-module-orphan-provider-inherit/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-orphan-provider-inherit/main.tf rename to internal/tofu/testdata/apply-module-orphan-provider-inherit/main.tf diff --git a/internal/opentf/testdata/apply-module-provider-alias/child/main.tf b/internal/tofu/testdata/apply-module-provider-alias/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-provider-alias/child/main.tf rename to internal/tofu/testdata/apply-module-provider-alias/child/main.tf diff --git a/internal/opentf/testdata/apply-module-provider-alias/main.tf b/internal/tofu/testdata/apply-module-provider-alias/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-provider-alias/main.tf rename to internal/tofu/testdata/apply-module-provider-alias/main.tf diff --git a/internal/opentf/testdata/apply-module-provider-close-nested/child/main.tf b/internal/tofu/testdata/apply-module-provider-close-nested/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-provider-close-nested/child/main.tf rename to internal/tofu/testdata/apply-module-provider-close-nested/child/main.tf diff --git a/internal/opentf/testdata/apply-module-provider-close-nested/child/subchild/main.tf b/internal/tofu/testdata/apply-module-provider-close-nested/child/subchild/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-provider-close-nested/child/subchild/main.tf rename to internal/tofu/testdata/apply-module-provider-close-nested/child/subchild/main.tf diff --git a/internal/opentf/testdata/apply-module-provider-close-nested/main.tf b/internal/tofu/testdata/apply-module-provider-close-nested/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-provider-close-nested/main.tf rename to internal/tofu/testdata/apply-module-provider-close-nested/main.tf diff --git a/internal/opentf/testdata/apply-module-provider-inherit-alias-orphan/main.tf b/internal/tofu/testdata/apply-module-provider-inherit-alias-orphan/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-provider-inherit-alias-orphan/main.tf rename to internal/tofu/testdata/apply-module-provider-inherit-alias-orphan/main.tf diff --git a/internal/opentf/testdata/apply-module-provider-inherit-alias/child/main.tf b/internal/tofu/testdata/apply-module-provider-inherit-alias/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-provider-inherit-alias/child/main.tf rename to internal/tofu/testdata/apply-module-provider-inherit-alias/child/main.tf diff --git a/internal/opentf/testdata/apply-module-provider-inherit-alias/main.tf b/internal/tofu/testdata/apply-module-provider-inherit-alias/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-provider-inherit-alias/main.tf rename to internal/tofu/testdata/apply-module-provider-inherit-alias/main.tf diff --git a/internal/opentf/testdata/apply-module-replace-cycle-cbd/main.tf b/internal/tofu/testdata/apply-module-replace-cycle-cbd/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-replace-cycle-cbd/main.tf rename to internal/tofu/testdata/apply-module-replace-cycle-cbd/main.tf diff --git a/internal/opentf/testdata/apply-module-replace-cycle-cbd/mod1/main.tf b/internal/tofu/testdata/apply-module-replace-cycle-cbd/mod1/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-replace-cycle-cbd/mod1/main.tf rename to internal/tofu/testdata/apply-module-replace-cycle-cbd/mod1/main.tf diff --git a/internal/opentf/testdata/apply-module-replace-cycle-cbd/mod2/main.tf b/internal/tofu/testdata/apply-module-replace-cycle-cbd/mod2/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-replace-cycle-cbd/mod2/main.tf rename to internal/tofu/testdata/apply-module-replace-cycle-cbd/mod2/main.tf diff --git a/internal/opentf/testdata/apply-module-replace-cycle/main.tf b/internal/tofu/testdata/apply-module-replace-cycle/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-replace-cycle/main.tf rename to internal/tofu/testdata/apply-module-replace-cycle/main.tf diff --git a/internal/opentf/testdata/apply-module-replace-cycle/mod1/main.tf b/internal/tofu/testdata/apply-module-replace-cycle/mod1/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-replace-cycle/mod1/main.tf rename to internal/tofu/testdata/apply-module-replace-cycle/mod1/main.tf diff --git a/internal/opentf/testdata/apply-module-replace-cycle/mod2/main.tf b/internal/tofu/testdata/apply-module-replace-cycle/mod2/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-replace-cycle/mod2/main.tf rename to internal/tofu/testdata/apply-module-replace-cycle/mod2/main.tf diff --git a/internal/opentf/testdata/apply-module-var-resource-count/child/main.tf b/internal/tofu/testdata/apply-module-var-resource-count/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-var-resource-count/child/main.tf rename to internal/tofu/testdata/apply-module-var-resource-count/child/main.tf diff --git a/internal/opentf/testdata/apply-module-var-resource-count/main.tf b/internal/tofu/testdata/apply-module-var-resource-count/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module-var-resource-count/main.tf rename to internal/tofu/testdata/apply-module-var-resource-count/main.tf diff --git a/internal/opentf/testdata/apply-module/child/main.tf b/internal/tofu/testdata/apply-module/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module/child/main.tf rename to internal/tofu/testdata/apply-module/child/main.tf diff --git a/internal/opentf/testdata/apply-module/main.tf b/internal/tofu/testdata/apply-module/main.tf similarity index 100% rename from internal/opentf/testdata/apply-module/main.tf rename to internal/tofu/testdata/apply-module/main.tf diff --git a/internal/opentf/testdata/apply-multi-depose-create-before-destroy/main.tf b/internal/tofu/testdata/apply-multi-depose-create-before-destroy/main.tf similarity index 100% rename from internal/opentf/testdata/apply-multi-depose-create-before-destroy/main.tf rename to internal/tofu/testdata/apply-multi-depose-create-before-destroy/main.tf diff --git a/internal/opentf/testdata/apply-multi-provider-destroy-child/child/main.tf b/internal/tofu/testdata/apply-multi-provider-destroy-child/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-multi-provider-destroy-child/child/main.tf rename to internal/tofu/testdata/apply-multi-provider-destroy-child/child/main.tf diff --git a/internal/opentf/testdata/apply-multi-provider-destroy-child/main.tf b/internal/tofu/testdata/apply-multi-provider-destroy-child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-multi-provider-destroy-child/main.tf rename to internal/tofu/testdata/apply-multi-provider-destroy-child/main.tf diff --git a/internal/opentf/testdata/apply-multi-provider-destroy/main.tf b/internal/tofu/testdata/apply-multi-provider-destroy/main.tf similarity index 100% rename from internal/opentf/testdata/apply-multi-provider-destroy/main.tf rename to internal/tofu/testdata/apply-multi-provider-destroy/main.tf diff --git a/internal/opentf/testdata/apply-multi-provider/main.tf b/internal/tofu/testdata/apply-multi-provider/main.tf similarity index 100% rename from internal/opentf/testdata/apply-multi-provider/main.tf rename to internal/tofu/testdata/apply-multi-provider/main.tf diff --git a/internal/opentf/testdata/apply-multi-ref/main.tf b/internal/tofu/testdata/apply-multi-ref/main.tf similarity index 100% rename from internal/opentf/testdata/apply-multi-ref/main.tf rename to internal/tofu/testdata/apply-multi-ref/main.tf diff --git a/internal/opentf/testdata/apply-multi-var-comprehensive/child/child.tf b/internal/tofu/testdata/apply-multi-var-comprehensive/child/child.tf similarity index 100% rename from internal/opentf/testdata/apply-multi-var-comprehensive/child/child.tf rename to internal/tofu/testdata/apply-multi-var-comprehensive/child/child.tf diff --git a/internal/opentf/testdata/apply-multi-var-comprehensive/root.tf b/internal/tofu/testdata/apply-multi-var-comprehensive/root.tf similarity index 100% rename from internal/opentf/testdata/apply-multi-var-comprehensive/root.tf rename to internal/tofu/testdata/apply-multi-var-comprehensive/root.tf diff --git a/internal/opentf/testdata/apply-multi-var-count-dec/main.tf b/internal/tofu/testdata/apply-multi-var-count-dec/main.tf similarity index 100% rename from internal/opentf/testdata/apply-multi-var-count-dec/main.tf rename to internal/tofu/testdata/apply-multi-var-count-dec/main.tf diff --git a/internal/opentf/testdata/apply-multi-var-missing-state/child/child.tf b/internal/tofu/testdata/apply-multi-var-missing-state/child/child.tf similarity index 100% rename from internal/opentf/testdata/apply-multi-var-missing-state/child/child.tf rename to internal/tofu/testdata/apply-multi-var-missing-state/child/child.tf diff --git a/internal/opentf/testdata/apply-multi-var-missing-state/root.tf b/internal/tofu/testdata/apply-multi-var-missing-state/root.tf similarity index 100% rename from internal/opentf/testdata/apply-multi-var-missing-state/root.tf rename to internal/tofu/testdata/apply-multi-var-missing-state/root.tf diff --git a/internal/opentf/testdata/apply-multi-var-order-interp/main.tf b/internal/tofu/testdata/apply-multi-var-order-interp/main.tf similarity index 100% rename from internal/opentf/testdata/apply-multi-var-order-interp/main.tf rename to internal/tofu/testdata/apply-multi-var-order-interp/main.tf diff --git a/internal/opentf/testdata/apply-multi-var-order/main.tf b/internal/tofu/testdata/apply-multi-var-order/main.tf similarity index 100% rename from internal/opentf/testdata/apply-multi-var-order/main.tf rename to internal/tofu/testdata/apply-multi-var-order/main.tf diff --git a/internal/opentf/testdata/apply-multi-var/main.tf b/internal/tofu/testdata/apply-multi-var/main.tf similarity index 100% rename from internal/opentf/testdata/apply-multi-var/main.tf rename to internal/tofu/testdata/apply-multi-var/main.tf diff --git a/internal/opentf/testdata/apply-nullable-variables/main.tf b/internal/tofu/testdata/apply-nullable-variables/main.tf similarity index 100% rename from internal/opentf/testdata/apply-nullable-variables/main.tf rename to internal/tofu/testdata/apply-nullable-variables/main.tf diff --git a/internal/opentf/testdata/apply-nullable-variables/mod/main.tf b/internal/tofu/testdata/apply-nullable-variables/mod/main.tf similarity index 100% rename from internal/opentf/testdata/apply-nullable-variables/mod/main.tf rename to internal/tofu/testdata/apply-nullable-variables/mod/main.tf diff --git a/internal/opentf/testdata/apply-orphan-resource/main.tf b/internal/tofu/testdata/apply-orphan-resource/main.tf similarity index 100% rename from internal/opentf/testdata/apply-orphan-resource/main.tf rename to internal/tofu/testdata/apply-orphan-resource/main.tf diff --git a/internal/opentf/testdata/apply-output-add-after/main.tf b/internal/tofu/testdata/apply-output-add-after/main.tf similarity index 100% rename from internal/opentf/testdata/apply-output-add-after/main.tf rename to internal/tofu/testdata/apply-output-add-after/main.tf diff --git a/internal/opentf/testdata/apply-output-add-after/outputs.tf.json b/internal/tofu/testdata/apply-output-add-after/outputs.tf.json similarity index 100% rename from internal/opentf/testdata/apply-output-add-after/outputs.tf.json rename to internal/tofu/testdata/apply-output-add-after/outputs.tf.json diff --git a/internal/opentf/testdata/apply-output-add-before/main.tf b/internal/tofu/testdata/apply-output-add-before/main.tf similarity index 100% rename from internal/opentf/testdata/apply-output-add-before/main.tf rename to internal/tofu/testdata/apply-output-add-before/main.tf diff --git a/internal/opentf/testdata/apply-output-add-before/outputs.tf.json b/internal/tofu/testdata/apply-output-add-before/outputs.tf.json similarity index 100% rename from internal/opentf/testdata/apply-output-add-before/outputs.tf.json rename to internal/tofu/testdata/apply-output-add-before/outputs.tf.json diff --git a/internal/opentf/testdata/apply-output-list/main.tf b/internal/tofu/testdata/apply-output-list/main.tf similarity index 100% rename from internal/opentf/testdata/apply-output-list/main.tf rename to internal/tofu/testdata/apply-output-list/main.tf diff --git a/internal/opentf/testdata/apply-output-multi-index/main.tf b/internal/tofu/testdata/apply-output-multi-index/main.tf similarity index 100% rename from internal/opentf/testdata/apply-output-multi-index/main.tf rename to internal/tofu/testdata/apply-output-multi-index/main.tf diff --git a/internal/opentf/testdata/apply-output-multi/main.tf b/internal/tofu/testdata/apply-output-multi/main.tf similarity index 100% rename from internal/opentf/testdata/apply-output-multi/main.tf rename to internal/tofu/testdata/apply-output-multi/main.tf diff --git a/internal/opentf/testdata/apply-output-orphan-module/child/main.tf b/internal/tofu/testdata/apply-output-orphan-module/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-output-orphan-module/child/main.tf rename to internal/tofu/testdata/apply-output-orphan-module/child/main.tf diff --git a/internal/opentf/testdata/apply-output-orphan-module/main.tf b/internal/tofu/testdata/apply-output-orphan-module/main.tf similarity index 100% rename from internal/opentf/testdata/apply-output-orphan-module/main.tf rename to internal/tofu/testdata/apply-output-orphan-module/main.tf diff --git a/internal/opentf/testdata/apply-output-orphan/main.tf b/internal/tofu/testdata/apply-output-orphan/main.tf similarity index 100% rename from internal/opentf/testdata/apply-output-orphan/main.tf rename to internal/tofu/testdata/apply-output-orphan/main.tf diff --git a/internal/opentf/testdata/apply-output/main.tf b/internal/tofu/testdata/apply-output/main.tf similarity index 100% rename from internal/opentf/testdata/apply-output/main.tf rename to internal/tofu/testdata/apply-output/main.tf diff --git a/internal/opentf/testdata/apply-plan-connection-refs/main.tf b/internal/tofu/testdata/apply-plan-connection-refs/main.tf similarity index 100% rename from internal/opentf/testdata/apply-plan-connection-refs/main.tf rename to internal/tofu/testdata/apply-plan-connection-refs/main.tf diff --git a/internal/opentf/testdata/apply-provider-alias-configure/main.tf b/internal/tofu/testdata/apply-provider-alias-configure/main.tf similarity index 100% rename from internal/opentf/testdata/apply-provider-alias-configure/main.tf rename to internal/tofu/testdata/apply-provider-alias-configure/main.tf diff --git a/internal/opentf/testdata/apply-provider-alias/main.tf b/internal/tofu/testdata/apply-provider-alias/main.tf similarity index 100% rename from internal/opentf/testdata/apply-provider-alias/main.tf rename to internal/tofu/testdata/apply-provider-alias/main.tf diff --git a/internal/opentf/testdata/apply-provider-computed/main.tf b/internal/tofu/testdata/apply-provider-computed/main.tf similarity index 100% rename from internal/opentf/testdata/apply-provider-computed/main.tf rename to internal/tofu/testdata/apply-provider-computed/main.tf diff --git a/internal/opentf/testdata/apply-provider-configure-disabled/child/main.tf b/internal/tofu/testdata/apply-provider-configure-disabled/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-provider-configure-disabled/child/main.tf rename to internal/tofu/testdata/apply-provider-configure-disabled/child/main.tf diff --git a/internal/opentf/testdata/apply-provider-configure-disabled/main.tf b/internal/tofu/testdata/apply-provider-configure-disabled/main.tf similarity index 100% rename from internal/opentf/testdata/apply-provider-configure-disabled/main.tf rename to internal/tofu/testdata/apply-provider-configure-disabled/main.tf diff --git a/internal/opentf/testdata/apply-provider-warning/main.tf b/internal/tofu/testdata/apply-provider-warning/main.tf similarity index 100% rename from internal/opentf/testdata/apply-provider-warning/main.tf rename to internal/tofu/testdata/apply-provider-warning/main.tf diff --git a/internal/opentf/testdata/apply-provisioner-compute/main.tf b/internal/tofu/testdata/apply-provisioner-compute/main.tf similarity index 100% rename from internal/opentf/testdata/apply-provisioner-compute/main.tf rename to internal/tofu/testdata/apply-provisioner-compute/main.tf diff --git a/internal/opentf/testdata/apply-provisioner-destroy-continue/main.tf b/internal/tofu/testdata/apply-provisioner-destroy-continue/main.tf similarity index 100% rename from internal/opentf/testdata/apply-provisioner-destroy-continue/main.tf rename to internal/tofu/testdata/apply-provisioner-destroy-continue/main.tf diff --git a/internal/opentf/testdata/apply-provisioner-destroy-fail/main.tf b/internal/tofu/testdata/apply-provisioner-destroy-fail/main.tf similarity index 100% rename from internal/opentf/testdata/apply-provisioner-destroy-fail/main.tf rename to internal/tofu/testdata/apply-provisioner-destroy-fail/main.tf diff --git a/internal/opentf/testdata/apply-provisioner-destroy/main.tf b/internal/tofu/testdata/apply-provisioner-destroy/main.tf similarity index 100% rename from internal/opentf/testdata/apply-provisioner-destroy/main.tf rename to internal/tofu/testdata/apply-provisioner-destroy/main.tf diff --git a/internal/opentf/testdata/apply-provisioner-diff/main.tf b/internal/tofu/testdata/apply-provisioner-diff/main.tf similarity index 100% rename from internal/opentf/testdata/apply-provisioner-diff/main.tf rename to internal/tofu/testdata/apply-provisioner-diff/main.tf diff --git a/internal/opentf/testdata/apply-provisioner-explicit-self-ref/main.tf b/internal/tofu/testdata/apply-provisioner-explicit-self-ref/main.tf similarity index 100% rename from internal/opentf/testdata/apply-provisioner-explicit-self-ref/main.tf rename to internal/tofu/testdata/apply-provisioner-explicit-self-ref/main.tf diff --git a/internal/opentf/testdata/apply-provisioner-fail-continue/main.tf b/internal/tofu/testdata/apply-provisioner-fail-continue/main.tf similarity index 100% rename from internal/opentf/testdata/apply-provisioner-fail-continue/main.tf rename to internal/tofu/testdata/apply-provisioner-fail-continue/main.tf diff --git a/internal/opentf/testdata/apply-provisioner-fail-create-before/main.tf b/internal/tofu/testdata/apply-provisioner-fail-create-before/main.tf similarity index 100% rename from internal/opentf/testdata/apply-provisioner-fail-create-before/main.tf rename to internal/tofu/testdata/apply-provisioner-fail-create-before/main.tf diff --git a/internal/opentf/testdata/apply-provisioner-fail-create/main.tf b/internal/tofu/testdata/apply-provisioner-fail-create/main.tf similarity index 100% rename from internal/opentf/testdata/apply-provisioner-fail-create/main.tf rename to internal/tofu/testdata/apply-provisioner-fail-create/main.tf diff --git a/internal/opentf/testdata/apply-provisioner-fail/main.tf b/internal/tofu/testdata/apply-provisioner-fail/main.tf similarity index 100% rename from internal/opentf/testdata/apply-provisioner-fail/main.tf rename to internal/tofu/testdata/apply-provisioner-fail/main.tf diff --git a/internal/opentf/testdata/apply-provisioner-for-each-self/main.tf b/internal/tofu/testdata/apply-provisioner-for-each-self/main.tf similarity index 100% rename from internal/opentf/testdata/apply-provisioner-for-each-self/main.tf rename to internal/tofu/testdata/apply-provisioner-for-each-self/main.tf diff --git a/internal/opentf/testdata/apply-provisioner-interp-count/provisioner-interp-count.tf b/internal/tofu/testdata/apply-provisioner-interp-count/provisioner-interp-count.tf similarity index 100% rename from internal/opentf/testdata/apply-provisioner-interp-count/provisioner-interp-count.tf rename to internal/tofu/testdata/apply-provisioner-interp-count/provisioner-interp-count.tf diff --git a/internal/opentf/testdata/apply-provisioner-module/child/main.tf b/internal/tofu/testdata/apply-provisioner-module/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-provisioner-module/child/main.tf rename to internal/tofu/testdata/apply-provisioner-module/child/main.tf diff --git a/internal/opentf/testdata/apply-provisioner-module/main.tf b/internal/tofu/testdata/apply-provisioner-module/main.tf similarity index 100% rename from internal/opentf/testdata/apply-provisioner-module/main.tf rename to internal/tofu/testdata/apply-provisioner-module/main.tf diff --git a/internal/opentf/testdata/apply-provisioner-multi-self-ref-single/main.tf b/internal/tofu/testdata/apply-provisioner-multi-self-ref-single/main.tf similarity index 100% rename from internal/opentf/testdata/apply-provisioner-multi-self-ref-single/main.tf rename to internal/tofu/testdata/apply-provisioner-multi-self-ref-single/main.tf diff --git a/internal/opentf/testdata/apply-provisioner-multi-self-ref/main.tf b/internal/tofu/testdata/apply-provisioner-multi-self-ref/main.tf similarity index 100% rename from internal/opentf/testdata/apply-provisioner-multi-self-ref/main.tf rename to internal/tofu/testdata/apply-provisioner-multi-self-ref/main.tf diff --git a/internal/opentf/testdata/apply-provisioner-resource-ref/main.tf b/internal/tofu/testdata/apply-provisioner-resource-ref/main.tf similarity index 100% rename from internal/opentf/testdata/apply-provisioner-resource-ref/main.tf rename to internal/tofu/testdata/apply-provisioner-resource-ref/main.tf diff --git a/internal/opentf/testdata/apply-provisioner-self-ref/main.tf b/internal/tofu/testdata/apply-provisioner-self-ref/main.tf similarity index 100% rename from internal/opentf/testdata/apply-provisioner-self-ref/main.tf rename to internal/tofu/testdata/apply-provisioner-self-ref/main.tf diff --git a/internal/opentf/testdata/apply-provisioner-sensitive/main.tf b/internal/tofu/testdata/apply-provisioner-sensitive/main.tf similarity index 100% rename from internal/opentf/testdata/apply-provisioner-sensitive/main.tf rename to internal/tofu/testdata/apply-provisioner-sensitive/main.tf diff --git a/internal/opentf/testdata/apply-ref-count/main.tf b/internal/tofu/testdata/apply-ref-count/main.tf similarity index 100% rename from internal/opentf/testdata/apply-ref-count/main.tf rename to internal/tofu/testdata/apply-ref-count/main.tf diff --git a/internal/opentf/testdata/apply-ref-existing/child/main.tf b/internal/tofu/testdata/apply-ref-existing/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-ref-existing/child/main.tf rename to internal/tofu/testdata/apply-ref-existing/child/main.tf diff --git a/internal/opentf/testdata/apply-ref-existing/main.tf b/internal/tofu/testdata/apply-ref-existing/main.tf similarity index 100% rename from internal/opentf/testdata/apply-ref-existing/main.tf rename to internal/tofu/testdata/apply-ref-existing/main.tf diff --git a/internal/opentf/testdata/apply-resource-count-one-list/main.tf b/internal/tofu/testdata/apply-resource-count-one-list/main.tf similarity index 100% rename from internal/opentf/testdata/apply-resource-count-one-list/main.tf rename to internal/tofu/testdata/apply-resource-count-one-list/main.tf diff --git a/internal/opentf/testdata/apply-resource-count-zero-list/main.tf b/internal/tofu/testdata/apply-resource-count-zero-list/main.tf similarity index 100% rename from internal/opentf/testdata/apply-resource-count-zero-list/main.tf rename to internal/tofu/testdata/apply-resource-count-zero-list/main.tf diff --git a/internal/opentf/testdata/apply-resource-depends-on-module-deep/child/child/main.tf b/internal/tofu/testdata/apply-resource-depends-on-module-deep/child/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-resource-depends-on-module-deep/child/child/main.tf rename to internal/tofu/testdata/apply-resource-depends-on-module-deep/child/child/main.tf diff --git a/internal/opentf/testdata/apply-resource-depends-on-module-deep/child/main.tf b/internal/tofu/testdata/apply-resource-depends-on-module-deep/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-resource-depends-on-module-deep/child/main.tf rename to internal/tofu/testdata/apply-resource-depends-on-module-deep/child/main.tf diff --git a/internal/opentf/testdata/apply-resource-depends-on-module-deep/main.tf b/internal/tofu/testdata/apply-resource-depends-on-module-deep/main.tf similarity index 100% rename from internal/opentf/testdata/apply-resource-depends-on-module-deep/main.tf rename to internal/tofu/testdata/apply-resource-depends-on-module-deep/main.tf diff --git a/internal/opentf/testdata/apply-resource-depends-on-module-empty/main.tf b/internal/tofu/testdata/apply-resource-depends-on-module-empty/main.tf similarity index 100% rename from internal/opentf/testdata/apply-resource-depends-on-module-empty/main.tf rename to internal/tofu/testdata/apply-resource-depends-on-module-empty/main.tf diff --git a/internal/opentf/testdata/apply-resource-depends-on-module-in-module/child/child/main.tf b/internal/tofu/testdata/apply-resource-depends-on-module-in-module/child/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-resource-depends-on-module-in-module/child/child/main.tf rename to internal/tofu/testdata/apply-resource-depends-on-module-in-module/child/child/main.tf diff --git a/internal/opentf/testdata/apply-resource-depends-on-module-in-module/child/main.tf b/internal/tofu/testdata/apply-resource-depends-on-module-in-module/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-resource-depends-on-module-in-module/child/main.tf rename to internal/tofu/testdata/apply-resource-depends-on-module-in-module/child/main.tf diff --git a/internal/opentf/testdata/apply-resource-depends-on-module-in-module/main.tf b/internal/tofu/testdata/apply-resource-depends-on-module-in-module/main.tf similarity index 100% rename from internal/opentf/testdata/apply-resource-depends-on-module-in-module/main.tf rename to internal/tofu/testdata/apply-resource-depends-on-module-in-module/main.tf diff --git a/internal/opentf/testdata/apply-resource-depends-on-module/child/main.tf b/internal/tofu/testdata/apply-resource-depends-on-module/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-resource-depends-on-module/child/main.tf rename to internal/tofu/testdata/apply-resource-depends-on-module/child/main.tf diff --git a/internal/opentf/testdata/apply-resource-depends-on-module/main.tf b/internal/tofu/testdata/apply-resource-depends-on-module/main.tf similarity index 100% rename from internal/opentf/testdata/apply-resource-depends-on-module/main.tf rename to internal/tofu/testdata/apply-resource-depends-on-module/main.tf diff --git a/internal/opentf/testdata/apply-resource-scale-in/main.tf b/internal/tofu/testdata/apply-resource-scale-in/main.tf similarity index 100% rename from internal/opentf/testdata/apply-resource-scale-in/main.tf rename to internal/tofu/testdata/apply-resource-scale-in/main.tf diff --git a/internal/opentf/testdata/apply-stop/apply-stop.tf b/internal/tofu/testdata/apply-stop/apply-stop.tf similarity index 100% rename from internal/opentf/testdata/apply-stop/apply-stop.tf rename to internal/tofu/testdata/apply-stop/apply-stop.tf diff --git a/internal/opentf/testdata/apply-taint-dep-requires-new/main.tf b/internal/tofu/testdata/apply-taint-dep-requires-new/main.tf similarity index 100% rename from internal/opentf/testdata/apply-taint-dep-requires-new/main.tf rename to internal/tofu/testdata/apply-taint-dep-requires-new/main.tf diff --git a/internal/opentf/testdata/apply-taint-dep/main.tf b/internal/tofu/testdata/apply-taint-dep/main.tf similarity index 100% rename from internal/opentf/testdata/apply-taint-dep/main.tf rename to internal/tofu/testdata/apply-taint-dep/main.tf diff --git a/internal/opentf/testdata/apply-taint/main.tf b/internal/tofu/testdata/apply-taint/main.tf similarity index 100% rename from internal/opentf/testdata/apply-taint/main.tf rename to internal/tofu/testdata/apply-taint/main.tf diff --git a/internal/opentf/testdata/apply-tainted-targets/main.tf b/internal/tofu/testdata/apply-tainted-targets/main.tf similarity index 100% rename from internal/opentf/testdata/apply-tainted-targets/main.tf rename to internal/tofu/testdata/apply-tainted-targets/main.tf diff --git a/internal/opentf/testdata/apply-targeted-count/main.tf b/internal/tofu/testdata/apply-targeted-count/main.tf similarity index 100% rename from internal/opentf/testdata/apply-targeted-count/main.tf rename to internal/tofu/testdata/apply-targeted-count/main.tf diff --git a/internal/opentf/testdata/apply-targeted-module-dep/child/main.tf b/internal/tofu/testdata/apply-targeted-module-dep/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-targeted-module-dep/child/main.tf rename to internal/tofu/testdata/apply-targeted-module-dep/child/main.tf diff --git a/internal/opentf/testdata/apply-targeted-module-dep/main.tf b/internal/tofu/testdata/apply-targeted-module-dep/main.tf similarity index 100% rename from internal/opentf/testdata/apply-targeted-module-dep/main.tf rename to internal/tofu/testdata/apply-targeted-module-dep/main.tf diff --git a/internal/opentf/testdata/apply-targeted-module-recursive/child/main.tf b/internal/tofu/testdata/apply-targeted-module-recursive/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-targeted-module-recursive/child/main.tf rename to internal/tofu/testdata/apply-targeted-module-recursive/child/main.tf diff --git a/internal/opentf/testdata/apply-targeted-module-recursive/child/subchild/main.tf b/internal/tofu/testdata/apply-targeted-module-recursive/child/subchild/main.tf similarity index 100% rename from internal/opentf/testdata/apply-targeted-module-recursive/child/subchild/main.tf rename to internal/tofu/testdata/apply-targeted-module-recursive/child/subchild/main.tf diff --git a/internal/opentf/testdata/apply-targeted-module-recursive/main.tf b/internal/tofu/testdata/apply-targeted-module-recursive/main.tf similarity index 100% rename from internal/opentf/testdata/apply-targeted-module-recursive/main.tf rename to internal/tofu/testdata/apply-targeted-module-recursive/main.tf diff --git a/internal/opentf/testdata/apply-targeted-module-resource/child/main.tf b/internal/tofu/testdata/apply-targeted-module-resource/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-targeted-module-resource/child/main.tf rename to internal/tofu/testdata/apply-targeted-module-resource/child/main.tf diff --git a/internal/opentf/testdata/apply-targeted-module-resource/main.tf b/internal/tofu/testdata/apply-targeted-module-resource/main.tf similarity index 100% rename from internal/opentf/testdata/apply-targeted-module-resource/main.tf rename to internal/tofu/testdata/apply-targeted-module-resource/main.tf diff --git a/internal/opentf/testdata/apply-targeted-module-unrelated-outputs/child1/main.tf b/internal/tofu/testdata/apply-targeted-module-unrelated-outputs/child1/main.tf similarity index 100% rename from internal/opentf/testdata/apply-targeted-module-unrelated-outputs/child1/main.tf rename to internal/tofu/testdata/apply-targeted-module-unrelated-outputs/child1/main.tf diff --git a/internal/opentf/testdata/apply-targeted-module-unrelated-outputs/child2/main.tf b/internal/tofu/testdata/apply-targeted-module-unrelated-outputs/child2/main.tf similarity index 100% rename from internal/opentf/testdata/apply-targeted-module-unrelated-outputs/child2/main.tf rename to internal/tofu/testdata/apply-targeted-module-unrelated-outputs/child2/main.tf diff --git a/internal/opentf/testdata/apply-targeted-module-unrelated-outputs/main.tf b/internal/tofu/testdata/apply-targeted-module-unrelated-outputs/main.tf similarity index 100% rename from internal/opentf/testdata/apply-targeted-module-unrelated-outputs/main.tf rename to internal/tofu/testdata/apply-targeted-module-unrelated-outputs/main.tf diff --git a/internal/opentf/testdata/apply-targeted-module/child/main.tf b/internal/tofu/testdata/apply-targeted-module/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-targeted-module/child/main.tf rename to internal/tofu/testdata/apply-targeted-module/child/main.tf diff --git a/internal/opentf/testdata/apply-targeted-module/main.tf b/internal/tofu/testdata/apply-targeted-module/main.tf similarity index 100% rename from internal/opentf/testdata/apply-targeted-module/main.tf rename to internal/tofu/testdata/apply-targeted-module/main.tf diff --git a/internal/opentf/testdata/apply-targeted-resource-orphan-module/child/main.tf b/internal/tofu/testdata/apply-targeted-resource-orphan-module/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-targeted-resource-orphan-module/child/main.tf rename to internal/tofu/testdata/apply-targeted-resource-orphan-module/child/main.tf diff --git a/internal/opentf/testdata/apply-targeted-resource-orphan-module/main.tf b/internal/tofu/testdata/apply-targeted-resource-orphan-module/main.tf similarity index 100% rename from internal/opentf/testdata/apply-targeted-resource-orphan-module/main.tf rename to internal/tofu/testdata/apply-targeted-resource-orphan-module/main.tf diff --git a/internal/opentf/testdata/apply-targeted/main.tf b/internal/tofu/testdata/apply-targeted/main.tf similarity index 100% rename from internal/opentf/testdata/apply-targeted/main.tf rename to internal/tofu/testdata/apply-targeted/main.tf diff --git a/internal/opentf/testdata/apply-opentf-workspace/main.tf b/internal/tofu/testdata/apply-tofu-workspace/main.tf similarity index 100% rename from internal/opentf/testdata/apply-opentf-workspace/main.tf rename to internal/tofu/testdata/apply-tofu-workspace/main.tf diff --git a/internal/opentf/testdata/apply-unknown-interpolate/child/main.tf b/internal/tofu/testdata/apply-unknown-interpolate/child/main.tf similarity index 100% rename from internal/opentf/testdata/apply-unknown-interpolate/child/main.tf rename to internal/tofu/testdata/apply-unknown-interpolate/child/main.tf diff --git a/internal/opentf/testdata/apply-unknown-interpolate/main.tf b/internal/tofu/testdata/apply-unknown-interpolate/main.tf similarity index 100% rename from internal/opentf/testdata/apply-unknown-interpolate/main.tf rename to internal/tofu/testdata/apply-unknown-interpolate/main.tf diff --git a/internal/opentf/testdata/apply-unknown/main.tf b/internal/tofu/testdata/apply-unknown/main.tf similarity index 100% rename from internal/opentf/testdata/apply-unknown/main.tf rename to internal/tofu/testdata/apply-unknown/main.tf diff --git a/internal/opentf/testdata/apply-unstable/main.tf b/internal/tofu/testdata/apply-unstable/main.tf similarity index 100% rename from internal/opentf/testdata/apply-unstable/main.tf rename to internal/tofu/testdata/apply-unstable/main.tf diff --git a/internal/opentf/testdata/apply-vars-env/main.tf b/internal/tofu/testdata/apply-vars-env/main.tf similarity index 100% rename from internal/opentf/testdata/apply-vars-env/main.tf rename to internal/tofu/testdata/apply-vars-env/main.tf diff --git a/internal/opentf/testdata/apply-vars/main.tf b/internal/tofu/testdata/apply-vars/main.tf similarity index 100% rename from internal/opentf/testdata/apply-vars/main.tf rename to internal/tofu/testdata/apply-vars/main.tf diff --git a/internal/opentf/testdata/apply-with-checks/main.tf b/internal/tofu/testdata/apply-with-checks/main.tf similarity index 100% rename from internal/opentf/testdata/apply-with-checks/main.tf rename to internal/tofu/testdata/apply-with-checks/main.tf diff --git a/internal/opentf/testdata/context-required-version/main.tf b/internal/tofu/testdata/context-required-version/main.tf similarity index 100% rename from internal/opentf/testdata/context-required-version/main.tf rename to internal/tofu/testdata/context-required-version/main.tf diff --git a/internal/opentf/testdata/data-source-read-with-plan-error/main.tf b/internal/tofu/testdata/data-source-read-with-plan-error/main.tf similarity index 100% rename from internal/opentf/testdata/data-source-read-with-plan-error/main.tf rename to internal/tofu/testdata/data-source-read-with-plan-error/main.tf diff --git a/internal/opentf/testdata/destroy-module-with-provider/main.tf b/internal/tofu/testdata/destroy-module-with-provider/main.tf similarity index 100% rename from internal/opentf/testdata/destroy-module-with-provider/main.tf rename to internal/tofu/testdata/destroy-module-with-provider/main.tf diff --git a/internal/opentf/testdata/destroy-module-with-provider/mod/main.tf b/internal/tofu/testdata/destroy-module-with-provider/mod/main.tf similarity index 100% rename from internal/opentf/testdata/destroy-module-with-provider/mod/main.tf rename to internal/tofu/testdata/destroy-module-with-provider/mod/main.tf diff --git a/internal/opentf/testdata/destroy-targeted/child/main.tf b/internal/tofu/testdata/destroy-targeted/child/main.tf similarity index 100% rename from internal/opentf/testdata/destroy-targeted/child/main.tf rename to internal/tofu/testdata/destroy-targeted/child/main.tf diff --git a/internal/opentf/testdata/destroy-targeted/main.tf b/internal/tofu/testdata/destroy-targeted/main.tf similarity index 100% rename from internal/opentf/testdata/destroy-targeted/main.tf rename to internal/tofu/testdata/destroy-targeted/main.tf diff --git a/internal/opentf/testdata/empty/main.tf b/internal/tofu/testdata/empty/main.tf similarity index 100% rename from internal/opentf/testdata/empty/main.tf rename to internal/tofu/testdata/empty/main.tf diff --git a/internal/opentf/testdata/eval-context-basic/child/main.tf b/internal/tofu/testdata/eval-context-basic/child/main.tf similarity index 100% rename from internal/opentf/testdata/eval-context-basic/child/main.tf rename to internal/tofu/testdata/eval-context-basic/child/main.tf diff --git a/internal/opentf/testdata/eval-context-basic/main.tf b/internal/tofu/testdata/eval-context-basic/main.tf similarity index 100% rename from internal/opentf/testdata/eval-context-basic/main.tf rename to internal/tofu/testdata/eval-context-basic/main.tf diff --git a/internal/opentf/testdata/graph-basic/main.tf b/internal/tofu/testdata/graph-basic/main.tf similarity index 100% rename from internal/opentf/testdata/graph-basic/main.tf rename to internal/tofu/testdata/graph-basic/main.tf diff --git a/internal/opentf/testdata/graph-builder-apply-basic/child/main.tf b/internal/tofu/testdata/graph-builder-apply-basic/child/main.tf similarity index 100% rename from internal/opentf/testdata/graph-builder-apply-basic/child/main.tf rename to internal/tofu/testdata/graph-builder-apply-basic/child/main.tf diff --git a/internal/opentf/testdata/graph-builder-apply-basic/main.tf b/internal/tofu/testdata/graph-builder-apply-basic/main.tf similarity index 100% rename from internal/opentf/testdata/graph-builder-apply-basic/main.tf rename to internal/tofu/testdata/graph-builder-apply-basic/main.tf diff --git a/internal/opentf/testdata/graph-builder-apply-count/main.tf b/internal/tofu/testdata/graph-builder-apply-count/main.tf similarity index 100% rename from internal/opentf/testdata/graph-builder-apply-count/main.tf rename to internal/tofu/testdata/graph-builder-apply-count/main.tf diff --git a/internal/opentf/testdata/graph-builder-apply-dep-cbd/main.tf b/internal/tofu/testdata/graph-builder-apply-dep-cbd/main.tf similarity index 100% rename from internal/opentf/testdata/graph-builder-apply-dep-cbd/main.tf rename to internal/tofu/testdata/graph-builder-apply-dep-cbd/main.tf diff --git a/internal/opentf/testdata/graph-builder-apply-double-cbd/main.tf b/internal/tofu/testdata/graph-builder-apply-double-cbd/main.tf similarity index 100% rename from internal/opentf/testdata/graph-builder-apply-double-cbd/main.tf rename to internal/tofu/testdata/graph-builder-apply-double-cbd/main.tf diff --git a/internal/opentf/testdata/graph-builder-apply-module-destroy/A/main.tf b/internal/tofu/testdata/graph-builder-apply-module-destroy/A/main.tf similarity index 100% rename from internal/opentf/testdata/graph-builder-apply-module-destroy/A/main.tf rename to internal/tofu/testdata/graph-builder-apply-module-destroy/A/main.tf diff --git a/internal/opentf/testdata/graph-builder-apply-module-destroy/main.tf b/internal/tofu/testdata/graph-builder-apply-module-destroy/main.tf similarity index 100% rename from internal/opentf/testdata/graph-builder-apply-module-destroy/main.tf rename to internal/tofu/testdata/graph-builder-apply-module-destroy/main.tf diff --git a/internal/opentf/testdata/graph-builder-apply-orphan-update/main.tf b/internal/tofu/testdata/graph-builder-apply-orphan-update/main.tf similarity index 100% rename from internal/opentf/testdata/graph-builder-apply-orphan-update/main.tf rename to internal/tofu/testdata/graph-builder-apply-orphan-update/main.tf diff --git a/internal/opentf/testdata/graph-builder-apply-provisioner/main.tf b/internal/tofu/testdata/graph-builder-apply-provisioner/main.tf similarity index 100% rename from internal/opentf/testdata/graph-builder-apply-provisioner/main.tf rename to internal/tofu/testdata/graph-builder-apply-provisioner/main.tf diff --git a/internal/opentf/testdata/graph-builder-apply-target-module/child1/main.tf b/internal/tofu/testdata/graph-builder-apply-target-module/child1/main.tf similarity index 100% rename from internal/opentf/testdata/graph-builder-apply-target-module/child1/main.tf rename to internal/tofu/testdata/graph-builder-apply-target-module/child1/main.tf diff --git a/internal/opentf/testdata/graph-builder-apply-target-module/child2/main.tf b/internal/tofu/testdata/graph-builder-apply-target-module/child2/main.tf similarity index 100% rename from internal/opentf/testdata/graph-builder-apply-target-module/child2/main.tf rename to internal/tofu/testdata/graph-builder-apply-target-module/child2/main.tf diff --git a/internal/opentf/testdata/graph-builder-apply-target-module/main.tf b/internal/tofu/testdata/graph-builder-apply-target-module/main.tf similarity index 100% rename from internal/opentf/testdata/graph-builder-apply-target-module/main.tf rename to internal/tofu/testdata/graph-builder-apply-target-module/main.tf diff --git a/internal/opentf/testdata/graph-builder-orphan-alias/main.tf b/internal/tofu/testdata/graph-builder-orphan-alias/main.tf similarity index 100% rename from internal/opentf/testdata/graph-builder-orphan-alias/main.tf rename to internal/tofu/testdata/graph-builder-orphan-alias/main.tf diff --git a/internal/opentf/testdata/graph-builder-plan-attr-as-blocks/attr-as-blocks.tf b/internal/tofu/testdata/graph-builder-plan-attr-as-blocks/attr-as-blocks.tf similarity index 100% rename from internal/opentf/testdata/graph-builder-plan-attr-as-blocks/attr-as-blocks.tf rename to internal/tofu/testdata/graph-builder-plan-attr-as-blocks/attr-as-blocks.tf diff --git a/internal/opentf/testdata/graph-builder-plan-basic/main.tf b/internal/tofu/testdata/graph-builder-plan-basic/main.tf similarity index 100% rename from internal/opentf/testdata/graph-builder-plan-basic/main.tf rename to internal/tofu/testdata/graph-builder-plan-basic/main.tf diff --git a/internal/opentf/testdata/graph-builder-plan-dynblock/dynblock.tf b/internal/tofu/testdata/graph-builder-plan-dynblock/dynblock.tf similarity index 100% rename from internal/opentf/testdata/graph-builder-plan-dynblock/dynblock.tf rename to internal/tofu/testdata/graph-builder-plan-dynblock/dynblock.tf diff --git a/internal/opentf/testdata/graph-builder-plan-target-module-provider/child1/main.tf b/internal/tofu/testdata/graph-builder-plan-target-module-provider/child1/main.tf similarity index 100% rename from internal/opentf/testdata/graph-builder-plan-target-module-provider/child1/main.tf rename to internal/tofu/testdata/graph-builder-plan-target-module-provider/child1/main.tf diff --git a/internal/opentf/testdata/graph-builder-plan-target-module-provider/child2/main.tf b/internal/tofu/testdata/graph-builder-plan-target-module-provider/child2/main.tf similarity index 100% rename from internal/opentf/testdata/graph-builder-plan-target-module-provider/child2/main.tf rename to internal/tofu/testdata/graph-builder-plan-target-module-provider/child2/main.tf diff --git a/internal/opentf/testdata/graph-builder-plan-target-module-provider/main.tf b/internal/tofu/testdata/graph-builder-plan-target-module-provider/main.tf similarity index 100% rename from internal/opentf/testdata/graph-builder-plan-target-module-provider/main.tf rename to internal/tofu/testdata/graph-builder-plan-target-module-provider/main.tf diff --git a/internal/opentf/testdata/import-id-data-source/main.tf b/internal/tofu/testdata/import-id-data-source/main.tf similarity index 100% rename from internal/opentf/testdata/import-id-data-source/main.tf rename to internal/tofu/testdata/import-id-data-source/main.tf diff --git a/internal/opentf/testdata/import-id-func/main.tf b/internal/tofu/testdata/import-id-func/main.tf similarity index 100% rename from internal/opentf/testdata/import-id-func/main.tf rename to internal/tofu/testdata/import-id-func/main.tf diff --git a/internal/opentf/testdata/import-id-invalid-null/main.tf b/internal/tofu/testdata/import-id-invalid-null/main.tf similarity index 100% rename from internal/opentf/testdata/import-id-invalid-null/main.tf rename to internal/tofu/testdata/import-id-invalid-null/main.tf diff --git a/internal/opentf/testdata/import-id-invalid-unknown/main.tf b/internal/tofu/testdata/import-id-invalid-unknown/main.tf similarity index 100% rename from internal/opentf/testdata/import-id-invalid-unknown/main.tf rename to internal/tofu/testdata/import-id-invalid-unknown/main.tf diff --git a/internal/opentf/testdata/import-id-module/child/main.tf b/internal/tofu/testdata/import-id-module/child/main.tf similarity index 100% rename from internal/opentf/testdata/import-id-module/child/main.tf rename to internal/tofu/testdata/import-id-module/child/main.tf diff --git a/internal/opentf/testdata/import-id-module/main.tf b/internal/tofu/testdata/import-id-module/main.tf similarity index 100% rename from internal/opentf/testdata/import-id-module/main.tf rename to internal/tofu/testdata/import-id-module/main.tf diff --git a/internal/opentf/testdata/import-id-variable/main.tf b/internal/tofu/testdata/import-id-variable/main.tf similarity index 100% rename from internal/opentf/testdata/import-id-variable/main.tf rename to internal/tofu/testdata/import-id-variable/main.tf diff --git a/internal/opentf/testdata/import-module/child/main.tf b/internal/tofu/testdata/import-module/child/main.tf similarity index 100% rename from internal/opentf/testdata/import-module/child/main.tf rename to internal/tofu/testdata/import-module/child/main.tf diff --git a/internal/opentf/testdata/import-module/child/submodule/main.tf b/internal/tofu/testdata/import-module/child/submodule/main.tf similarity index 100% rename from internal/opentf/testdata/import-module/child/submodule/main.tf rename to internal/tofu/testdata/import-module/child/submodule/main.tf diff --git a/internal/opentf/testdata/import-module/main.tf b/internal/tofu/testdata/import-module/main.tf similarity index 100% rename from internal/opentf/testdata/import-module/main.tf rename to internal/tofu/testdata/import-module/main.tf diff --git a/internal/opentf/testdata/import-provider-locals/main.tf b/internal/tofu/testdata/import-provider-locals/main.tf similarity index 100% rename from internal/opentf/testdata/import-provider-locals/main.tf rename to internal/tofu/testdata/import-provider-locals/main.tf diff --git a/internal/opentf/testdata/import-provider-resources/main.tf b/internal/tofu/testdata/import-provider-resources/main.tf similarity index 100% rename from internal/opentf/testdata/import-provider-resources/main.tf rename to internal/tofu/testdata/import-provider-resources/main.tf diff --git a/internal/opentf/testdata/import-provider-vars/main.tf b/internal/tofu/testdata/import-provider-vars/main.tf similarity index 100% rename from internal/opentf/testdata/import-provider-vars/main.tf rename to internal/tofu/testdata/import-provider-vars/main.tf diff --git a/internal/opentf/testdata/import-provider/main.tf b/internal/tofu/testdata/import-provider/main.tf similarity index 100% rename from internal/opentf/testdata/import-provider/main.tf rename to internal/tofu/testdata/import-provider/main.tf diff --git a/internal/opentf/testdata/input-interpolate-var/child/main.tf b/internal/tofu/testdata/input-interpolate-var/child/main.tf similarity index 100% rename from internal/opentf/testdata/input-interpolate-var/child/main.tf rename to internal/tofu/testdata/input-interpolate-var/child/main.tf diff --git a/internal/opentf/testdata/input-interpolate-var/main.tf b/internal/tofu/testdata/input-interpolate-var/main.tf similarity index 100% rename from internal/opentf/testdata/input-interpolate-var/main.tf rename to internal/tofu/testdata/input-interpolate-var/main.tf diff --git a/internal/opentf/testdata/input-interpolate-var/source/main.tf b/internal/tofu/testdata/input-interpolate-var/source/main.tf similarity index 100% rename from internal/opentf/testdata/input-interpolate-var/source/main.tf rename to internal/tofu/testdata/input-interpolate-var/source/main.tf diff --git a/internal/opentf/testdata/input-module-data-vars/child/main.tf b/internal/tofu/testdata/input-module-data-vars/child/main.tf similarity index 100% rename from internal/opentf/testdata/input-module-data-vars/child/main.tf rename to internal/tofu/testdata/input-module-data-vars/child/main.tf diff --git a/internal/opentf/testdata/input-module-data-vars/main.tf b/internal/tofu/testdata/input-module-data-vars/main.tf similarity index 100% rename from internal/opentf/testdata/input-module-data-vars/main.tf rename to internal/tofu/testdata/input-module-data-vars/main.tf diff --git a/internal/opentf/testdata/input-provider-multi/main.tf b/internal/tofu/testdata/input-provider-multi/main.tf similarity index 100% rename from internal/opentf/testdata/input-provider-multi/main.tf rename to internal/tofu/testdata/input-provider-multi/main.tf diff --git a/internal/opentf/testdata/input-provider-once/child/main.tf b/internal/tofu/testdata/input-provider-once/child/main.tf similarity index 100% rename from internal/opentf/testdata/input-provider-once/child/main.tf rename to internal/tofu/testdata/input-provider-once/child/main.tf diff --git a/internal/opentf/testdata/input-provider-once/main.tf b/internal/tofu/testdata/input-provider-once/main.tf similarity index 100% rename from internal/opentf/testdata/input-provider-once/main.tf rename to internal/tofu/testdata/input-provider-once/main.tf diff --git a/internal/opentf/testdata/input-provider-vars/main.tf b/internal/tofu/testdata/input-provider-vars/main.tf similarity index 100% rename from internal/opentf/testdata/input-provider-vars/main.tf rename to internal/tofu/testdata/input-provider-vars/main.tf diff --git a/internal/opentf/testdata/input-provider-with-vars-and-module/child/main.tf b/internal/tofu/testdata/input-provider-with-vars-and-module/child/main.tf similarity index 100% rename from internal/opentf/testdata/input-provider-with-vars-and-module/child/main.tf rename to internal/tofu/testdata/input-provider-with-vars-and-module/child/main.tf diff --git a/internal/opentf/testdata/input-provider-with-vars-and-module/main.tf b/internal/tofu/testdata/input-provider-with-vars-and-module/main.tf similarity index 100% rename from internal/opentf/testdata/input-provider-with-vars-and-module/main.tf rename to internal/tofu/testdata/input-provider-with-vars-and-module/main.tf diff --git a/internal/opentf/testdata/input-provider-with-vars/main.tf b/internal/tofu/testdata/input-provider-with-vars/main.tf similarity index 100% rename from internal/opentf/testdata/input-provider-with-vars/main.tf rename to internal/tofu/testdata/input-provider-with-vars/main.tf diff --git a/internal/opentf/testdata/input-provider/main.tf b/internal/tofu/testdata/input-provider/main.tf similarity index 100% rename from internal/opentf/testdata/input-provider/main.tf rename to internal/tofu/testdata/input-provider/main.tf diff --git a/internal/opentf/testdata/input-submodule-count/main.tf b/internal/tofu/testdata/input-submodule-count/main.tf similarity index 100% rename from internal/opentf/testdata/input-submodule-count/main.tf rename to internal/tofu/testdata/input-submodule-count/main.tf diff --git a/internal/opentf/testdata/input-submodule-count/mod/main.tf b/internal/tofu/testdata/input-submodule-count/mod/main.tf similarity index 100% rename from internal/opentf/testdata/input-submodule-count/mod/main.tf rename to internal/tofu/testdata/input-submodule-count/mod/main.tf diff --git a/internal/opentf/testdata/input-submodule-count/mod/submod/main.tf b/internal/tofu/testdata/input-submodule-count/mod/submod/main.tf similarity index 100% rename from internal/opentf/testdata/input-submodule-count/mod/submod/main.tf rename to internal/tofu/testdata/input-submodule-count/mod/submod/main.tf diff --git a/internal/opentf/testdata/input-variables/main.tf b/internal/tofu/testdata/input-variables/main.tf similarity index 100% rename from internal/opentf/testdata/input-variables/main.tf rename to internal/tofu/testdata/input-variables/main.tf diff --git a/internal/opentf/testdata/issue-33572/main.tf b/internal/tofu/testdata/issue-33572/main.tf similarity index 100% rename from internal/opentf/testdata/issue-33572/main.tf rename to internal/tofu/testdata/issue-33572/main.tf diff --git a/internal/opentf/testdata/issue-5254/step-0/main.tf b/internal/tofu/testdata/issue-5254/step-0/main.tf similarity index 100% rename from internal/opentf/testdata/issue-5254/step-0/main.tf rename to internal/tofu/testdata/issue-5254/step-0/main.tf diff --git a/internal/opentf/testdata/issue-5254/step-1/main.tf b/internal/tofu/testdata/issue-5254/step-1/main.tf similarity index 100% rename from internal/opentf/testdata/issue-5254/step-1/main.tf rename to internal/tofu/testdata/issue-5254/step-1/main.tf diff --git a/internal/opentf/testdata/issue-7824/main.tf b/internal/tofu/testdata/issue-7824/main.tf similarity index 100% rename from internal/opentf/testdata/issue-7824/main.tf rename to internal/tofu/testdata/issue-7824/main.tf diff --git a/internal/opentf/testdata/issue-9549/main.tf b/internal/tofu/testdata/issue-9549/main.tf similarity index 100% rename from internal/opentf/testdata/issue-9549/main.tf rename to internal/tofu/testdata/issue-9549/main.tf diff --git a/internal/opentf/testdata/issue-9549/mod/main.tf b/internal/tofu/testdata/issue-9549/mod/main.tf similarity index 100% rename from internal/opentf/testdata/issue-9549/mod/main.tf rename to internal/tofu/testdata/issue-9549/mod/main.tf diff --git a/internal/opentf/testdata/nested-resource-count-plan/main.tf b/internal/tofu/testdata/nested-resource-count-plan/main.tf similarity index 100% rename from internal/opentf/testdata/nested-resource-count-plan/main.tf rename to internal/tofu/testdata/nested-resource-count-plan/main.tf diff --git a/internal/opentf/testdata/plan-block-nesting-group/block-nesting-group.tf b/internal/tofu/testdata/plan-block-nesting-group/block-nesting-group.tf similarity index 100% rename from internal/opentf/testdata/plan-block-nesting-group/block-nesting-group.tf rename to internal/tofu/testdata/plan-block-nesting-group/block-nesting-group.tf diff --git a/internal/opentf/testdata/plan-cbd-depends-datasource/main.tf b/internal/tofu/testdata/plan-cbd-depends-datasource/main.tf similarity index 100% rename from internal/opentf/testdata/plan-cbd-depends-datasource/main.tf rename to internal/tofu/testdata/plan-cbd-depends-datasource/main.tf diff --git a/internal/opentf/testdata/plan-cbd-maintain-root/main.tf b/internal/tofu/testdata/plan-cbd-maintain-root/main.tf similarity index 100% rename from internal/opentf/testdata/plan-cbd-maintain-root/main.tf rename to internal/tofu/testdata/plan-cbd-maintain-root/main.tf diff --git a/internal/opentf/testdata/plan-cbd/main.tf b/internal/tofu/testdata/plan-cbd/main.tf similarity index 100% rename from internal/opentf/testdata/plan-cbd/main.tf rename to internal/tofu/testdata/plan-cbd/main.tf diff --git a/internal/opentf/testdata/plan-close-module-provider/main.tf b/internal/tofu/testdata/plan-close-module-provider/main.tf similarity index 100% rename from internal/opentf/testdata/plan-close-module-provider/main.tf rename to internal/tofu/testdata/plan-close-module-provider/main.tf diff --git a/internal/opentf/testdata/plan-close-module-provider/mod/main.tf b/internal/tofu/testdata/plan-close-module-provider/mod/main.tf similarity index 100% rename from internal/opentf/testdata/plan-close-module-provider/mod/main.tf rename to internal/tofu/testdata/plan-close-module-provider/mod/main.tf diff --git a/internal/opentf/testdata/plan-computed-attr-ref-type-mismatch/main.tf b/internal/tofu/testdata/plan-computed-attr-ref-type-mismatch/main.tf similarity index 100% rename from internal/opentf/testdata/plan-computed-attr-ref-type-mismatch/main.tf rename to internal/tofu/testdata/plan-computed-attr-ref-type-mismatch/main.tf diff --git a/internal/opentf/testdata/plan-computed-data-count/main.tf b/internal/tofu/testdata/plan-computed-data-count/main.tf similarity index 100% rename from internal/opentf/testdata/plan-computed-data-count/main.tf rename to internal/tofu/testdata/plan-computed-data-count/main.tf diff --git a/internal/opentf/testdata/plan-computed-data-resource/main.tf b/internal/tofu/testdata/plan-computed-data-resource/main.tf similarity index 100% rename from internal/opentf/testdata/plan-computed-data-resource/main.tf rename to internal/tofu/testdata/plan-computed-data-resource/main.tf diff --git a/internal/opentf/testdata/plan-computed-in-function/main.tf b/internal/tofu/testdata/plan-computed-in-function/main.tf similarity index 100% rename from internal/opentf/testdata/plan-computed-in-function/main.tf rename to internal/tofu/testdata/plan-computed-in-function/main.tf diff --git a/internal/opentf/testdata/plan-computed-list/main.tf b/internal/tofu/testdata/plan-computed-list/main.tf similarity index 100% rename from internal/opentf/testdata/plan-computed-list/main.tf rename to internal/tofu/testdata/plan-computed-list/main.tf diff --git a/internal/opentf/testdata/plan-computed-multi-index/main.tf b/internal/tofu/testdata/plan-computed-multi-index/main.tf similarity index 100% rename from internal/opentf/testdata/plan-computed-multi-index/main.tf rename to internal/tofu/testdata/plan-computed-multi-index/main.tf diff --git a/internal/opentf/testdata/plan-computed-value-in-map/main.tf b/internal/tofu/testdata/plan-computed-value-in-map/main.tf similarity index 100% rename from internal/opentf/testdata/plan-computed-value-in-map/main.tf rename to internal/tofu/testdata/plan-computed-value-in-map/main.tf diff --git a/internal/opentf/testdata/plan-computed-value-in-map/mod/main.tf b/internal/tofu/testdata/plan-computed-value-in-map/mod/main.tf similarity index 100% rename from internal/opentf/testdata/plan-computed-value-in-map/mod/main.tf rename to internal/tofu/testdata/plan-computed-value-in-map/mod/main.tf diff --git a/internal/opentf/testdata/plan-computed/main.tf b/internal/tofu/testdata/plan-computed/main.tf similarity index 100% rename from internal/opentf/testdata/plan-computed/main.tf rename to internal/tofu/testdata/plan-computed/main.tf diff --git a/internal/opentf/testdata/plan-count-computed-module/child/main.tf b/internal/tofu/testdata/plan-count-computed-module/child/main.tf similarity index 100% rename from internal/opentf/testdata/plan-count-computed-module/child/main.tf rename to internal/tofu/testdata/plan-count-computed-module/child/main.tf diff --git a/internal/opentf/testdata/plan-count-computed-module/main.tf b/internal/tofu/testdata/plan-count-computed-module/main.tf similarity index 100% rename from internal/opentf/testdata/plan-count-computed-module/main.tf rename to internal/tofu/testdata/plan-count-computed-module/main.tf diff --git a/internal/opentf/testdata/plan-count-computed/main.tf b/internal/tofu/testdata/plan-count-computed/main.tf similarity index 100% rename from internal/opentf/testdata/plan-count-computed/main.tf rename to internal/tofu/testdata/plan-count-computed/main.tf diff --git a/internal/opentf/testdata/plan-count-dec/main.tf b/internal/tofu/testdata/plan-count-dec/main.tf similarity index 100% rename from internal/opentf/testdata/plan-count-dec/main.tf rename to internal/tofu/testdata/plan-count-dec/main.tf diff --git a/internal/opentf/testdata/plan-count-inc/main.tf b/internal/tofu/testdata/plan-count-inc/main.tf similarity index 100% rename from internal/opentf/testdata/plan-count-inc/main.tf rename to internal/tofu/testdata/plan-count-inc/main.tf diff --git a/internal/opentf/testdata/plan-count-index/main.tf b/internal/tofu/testdata/plan-count-index/main.tf similarity index 100% rename from internal/opentf/testdata/plan-count-index/main.tf rename to internal/tofu/testdata/plan-count-index/main.tf diff --git a/internal/opentf/testdata/plan-count-module-static-grandchild/child/child/main.tf b/internal/tofu/testdata/plan-count-module-static-grandchild/child/child/main.tf similarity index 100% rename from internal/opentf/testdata/plan-count-module-static-grandchild/child/child/main.tf rename to internal/tofu/testdata/plan-count-module-static-grandchild/child/child/main.tf diff --git a/internal/opentf/testdata/plan-count-module-static-grandchild/child/main.tf b/internal/tofu/testdata/plan-count-module-static-grandchild/child/main.tf similarity index 100% rename from internal/opentf/testdata/plan-count-module-static-grandchild/child/main.tf rename to internal/tofu/testdata/plan-count-module-static-grandchild/child/main.tf diff --git a/internal/opentf/testdata/plan-count-module-static-grandchild/main.tf b/internal/tofu/testdata/plan-count-module-static-grandchild/main.tf similarity index 100% rename from internal/opentf/testdata/plan-count-module-static-grandchild/main.tf rename to internal/tofu/testdata/plan-count-module-static-grandchild/main.tf diff --git a/internal/opentf/testdata/plan-count-module-static/child/main.tf b/internal/tofu/testdata/plan-count-module-static/child/main.tf similarity index 100% rename from internal/opentf/testdata/plan-count-module-static/child/main.tf rename to internal/tofu/testdata/plan-count-module-static/child/main.tf diff --git a/internal/opentf/testdata/plan-count-module-static/main.tf b/internal/tofu/testdata/plan-count-module-static/main.tf similarity index 100% rename from internal/opentf/testdata/plan-count-module-static/main.tf rename to internal/tofu/testdata/plan-count-module-static/main.tf diff --git a/internal/opentf/testdata/plan-count-one-index/main.tf b/internal/tofu/testdata/plan-count-one-index/main.tf similarity index 100% rename from internal/opentf/testdata/plan-count-one-index/main.tf rename to internal/tofu/testdata/plan-count-one-index/main.tf diff --git a/internal/opentf/testdata/plan-count-splat-reference/main.tf b/internal/tofu/testdata/plan-count-splat-reference/main.tf similarity index 100% rename from internal/opentf/testdata/plan-count-splat-reference/main.tf rename to internal/tofu/testdata/plan-count-splat-reference/main.tf diff --git a/internal/opentf/testdata/plan-count-var/main.tf b/internal/tofu/testdata/plan-count-var/main.tf similarity index 100% rename from internal/opentf/testdata/plan-count-var/main.tf rename to internal/tofu/testdata/plan-count-var/main.tf diff --git a/internal/opentf/testdata/plan-count-zero/main.tf b/internal/tofu/testdata/plan-count-zero/main.tf similarity index 100% rename from internal/opentf/testdata/plan-count-zero/main.tf rename to internal/tofu/testdata/plan-count-zero/main.tf diff --git a/internal/opentf/testdata/plan-count/main.tf b/internal/tofu/testdata/plan-count/main.tf similarity index 100% rename from internal/opentf/testdata/plan-count/main.tf rename to internal/tofu/testdata/plan-count/main.tf diff --git a/internal/opentf/testdata/plan-data-depends-on/main.tf b/internal/tofu/testdata/plan-data-depends-on/main.tf similarity index 100% rename from internal/opentf/testdata/plan-data-depends-on/main.tf rename to internal/tofu/testdata/plan-data-depends-on/main.tf diff --git a/internal/opentf/testdata/plan-data-resource-becomes-computed/main.tf b/internal/tofu/testdata/plan-data-resource-becomes-computed/main.tf similarity index 100% rename from internal/opentf/testdata/plan-data-resource-becomes-computed/main.tf rename to internal/tofu/testdata/plan-data-resource-becomes-computed/main.tf diff --git a/internal/opentf/testdata/plan-destroy-interpolated-count/main.tf b/internal/tofu/testdata/plan-destroy-interpolated-count/main.tf similarity index 100% rename from internal/opentf/testdata/plan-destroy-interpolated-count/main.tf rename to internal/tofu/testdata/plan-destroy-interpolated-count/main.tf diff --git a/internal/opentf/testdata/plan-destroy-interpolated-count/mod/main.tf b/internal/tofu/testdata/plan-destroy-interpolated-count/mod/main.tf similarity index 100% rename from internal/opentf/testdata/plan-destroy-interpolated-count/mod/main.tf rename to internal/tofu/testdata/plan-destroy-interpolated-count/mod/main.tf diff --git a/internal/opentf/testdata/plan-destroy/main.tf b/internal/tofu/testdata/plan-destroy/main.tf similarity index 100% rename from internal/opentf/testdata/plan-destroy/main.tf rename to internal/tofu/testdata/plan-destroy/main.tf diff --git a/internal/opentf/testdata/plan-diffvar/main.tf b/internal/tofu/testdata/plan-diffvar/main.tf similarity index 100% rename from internal/opentf/testdata/plan-diffvar/main.tf rename to internal/tofu/testdata/plan-diffvar/main.tf diff --git a/internal/opentf/testdata/plan-empty/main.tf b/internal/tofu/testdata/plan-empty/main.tf similarity index 100% rename from internal/opentf/testdata/plan-empty/main.tf rename to internal/tofu/testdata/plan-empty/main.tf diff --git a/internal/opentf/testdata/plan-escaped-var/main.tf b/internal/tofu/testdata/plan-escaped-var/main.tf similarity index 100% rename from internal/opentf/testdata/plan-escaped-var/main.tf rename to internal/tofu/testdata/plan-escaped-var/main.tf diff --git a/internal/opentf/testdata/plan-for-each-unknown-value/main.tf b/internal/tofu/testdata/plan-for-each-unknown-value/main.tf similarity index 100% rename from internal/opentf/testdata/plan-for-each-unknown-value/main.tf rename to internal/tofu/testdata/plan-for-each-unknown-value/main.tf diff --git a/internal/opentf/testdata/plan-for-each/main.tf b/internal/tofu/testdata/plan-for-each/main.tf similarity index 100% rename from internal/opentf/testdata/plan-for-each/main.tf rename to internal/tofu/testdata/plan-for-each/main.tf diff --git a/internal/opentf/testdata/plan-good/main.tf b/internal/tofu/testdata/plan-good/main.tf similarity index 100% rename from internal/opentf/testdata/plan-good/main.tf rename to internal/tofu/testdata/plan-good/main.tf diff --git a/internal/opentf/testdata/plan-ignore-changes-in-map/ignore-changes-in-map.tf b/internal/tofu/testdata/plan-ignore-changes-in-map/ignore-changes-in-map.tf similarity index 100% rename from internal/opentf/testdata/plan-ignore-changes-in-map/ignore-changes-in-map.tf rename to internal/tofu/testdata/plan-ignore-changes-in-map/ignore-changes-in-map.tf diff --git a/internal/opentf/testdata/plan-ignore-changes-sensitive/ignore-changes-sensitive.tf b/internal/tofu/testdata/plan-ignore-changes-sensitive/ignore-changes-sensitive.tf similarity index 100% rename from internal/opentf/testdata/plan-ignore-changes-sensitive/ignore-changes-sensitive.tf rename to internal/tofu/testdata/plan-ignore-changes-sensitive/ignore-changes-sensitive.tf diff --git a/internal/opentf/testdata/plan-ignore-changes-wildcard/main.tf b/internal/tofu/testdata/plan-ignore-changes-wildcard/main.tf similarity index 100% rename from internal/opentf/testdata/plan-ignore-changes-wildcard/main.tf rename to internal/tofu/testdata/plan-ignore-changes-wildcard/main.tf diff --git a/internal/opentf/testdata/plan-ignore-changes-with-flatmaps/main.tf b/internal/tofu/testdata/plan-ignore-changes-with-flatmaps/main.tf similarity index 100% rename from internal/opentf/testdata/plan-ignore-changes-with-flatmaps/main.tf rename to internal/tofu/testdata/plan-ignore-changes-with-flatmaps/main.tf diff --git a/internal/opentf/testdata/plan-ignore-changes/main.tf b/internal/tofu/testdata/plan-ignore-changes/main.tf similarity index 100% rename from internal/opentf/testdata/plan-ignore-changes/main.tf rename to internal/tofu/testdata/plan-ignore-changes/main.tf diff --git a/internal/opentf/testdata/plan-list-order/main.tf b/internal/tofu/testdata/plan-list-order/main.tf similarity index 100% rename from internal/opentf/testdata/plan-list-order/main.tf rename to internal/tofu/testdata/plan-list-order/main.tf diff --git a/internal/opentf/testdata/plan-local-value-count/main.tf b/internal/tofu/testdata/plan-local-value-count/main.tf similarity index 100% rename from internal/opentf/testdata/plan-local-value-count/main.tf rename to internal/tofu/testdata/plan-local-value-count/main.tf diff --git a/internal/opentf/testdata/plan-module-cycle/child/main.tf b/internal/tofu/testdata/plan-module-cycle/child/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-cycle/child/main.tf rename to internal/tofu/testdata/plan-module-cycle/child/main.tf diff --git a/internal/opentf/testdata/plan-module-cycle/main.tf b/internal/tofu/testdata/plan-module-cycle/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-cycle/main.tf rename to internal/tofu/testdata/plan-module-cycle/main.tf diff --git a/internal/opentf/testdata/plan-module-deadlock/child/main.tf b/internal/tofu/testdata/plan-module-deadlock/child/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-deadlock/child/main.tf rename to internal/tofu/testdata/plan-module-deadlock/child/main.tf diff --git a/internal/opentf/testdata/plan-module-deadlock/main.tf b/internal/tofu/testdata/plan-module-deadlock/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-deadlock/main.tf rename to internal/tofu/testdata/plan-module-deadlock/main.tf diff --git a/internal/opentf/testdata/plan-module-destroy-gh-1835/a/main.tf b/internal/tofu/testdata/plan-module-destroy-gh-1835/a/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-destroy-gh-1835/a/main.tf rename to internal/tofu/testdata/plan-module-destroy-gh-1835/a/main.tf diff --git a/internal/opentf/testdata/plan-module-destroy-gh-1835/b/main.tf b/internal/tofu/testdata/plan-module-destroy-gh-1835/b/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-destroy-gh-1835/b/main.tf rename to internal/tofu/testdata/plan-module-destroy-gh-1835/b/main.tf diff --git a/internal/opentf/testdata/plan-module-destroy-gh-1835/main.tf b/internal/tofu/testdata/plan-module-destroy-gh-1835/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-destroy-gh-1835/main.tf rename to internal/tofu/testdata/plan-module-destroy-gh-1835/main.tf diff --git a/internal/opentf/testdata/plan-module-destroy-multivar/child/main.tf b/internal/tofu/testdata/plan-module-destroy-multivar/child/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-destroy-multivar/child/main.tf rename to internal/tofu/testdata/plan-module-destroy-multivar/child/main.tf diff --git a/internal/opentf/testdata/plan-module-destroy-multivar/main.tf b/internal/tofu/testdata/plan-module-destroy-multivar/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-destroy-multivar/main.tf rename to internal/tofu/testdata/plan-module-destroy-multivar/main.tf diff --git a/internal/opentf/testdata/plan-module-destroy/child/main.tf b/internal/tofu/testdata/plan-module-destroy/child/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-destroy/child/main.tf rename to internal/tofu/testdata/plan-module-destroy/child/main.tf diff --git a/internal/opentf/testdata/plan-module-destroy/main.tf b/internal/tofu/testdata/plan-module-destroy/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-destroy/main.tf rename to internal/tofu/testdata/plan-module-destroy/main.tf diff --git a/internal/opentf/testdata/plan-module-input-computed/child/main.tf b/internal/tofu/testdata/plan-module-input-computed/child/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-input-computed/child/main.tf rename to internal/tofu/testdata/plan-module-input-computed/child/main.tf diff --git a/internal/opentf/testdata/plan-module-input-computed/main.tf b/internal/tofu/testdata/plan-module-input-computed/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-input-computed/main.tf rename to internal/tofu/testdata/plan-module-input-computed/main.tf diff --git a/internal/opentf/testdata/plan-module-input-var/child/main.tf b/internal/tofu/testdata/plan-module-input-var/child/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-input-var/child/main.tf rename to internal/tofu/testdata/plan-module-input-var/child/main.tf diff --git a/internal/opentf/testdata/plan-module-input-var/main.tf b/internal/tofu/testdata/plan-module-input-var/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-input-var/main.tf rename to internal/tofu/testdata/plan-module-input-var/main.tf diff --git a/internal/opentf/testdata/plan-module-input/child/main.tf b/internal/tofu/testdata/plan-module-input/child/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-input/child/main.tf rename to internal/tofu/testdata/plan-module-input/child/main.tf diff --git a/internal/opentf/testdata/plan-module-input/main.tf b/internal/tofu/testdata/plan-module-input/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-input/main.tf rename to internal/tofu/testdata/plan-module-input/main.tf diff --git a/internal/opentf/testdata/plan-module-map-literal/child/main.tf b/internal/tofu/testdata/plan-module-map-literal/child/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-map-literal/child/main.tf rename to internal/tofu/testdata/plan-module-map-literal/child/main.tf diff --git a/internal/opentf/testdata/plan-module-map-literal/main.tf b/internal/tofu/testdata/plan-module-map-literal/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-map-literal/main.tf rename to internal/tofu/testdata/plan-module-map-literal/main.tf diff --git a/internal/opentf/testdata/plan-module-multi-var/child/main.tf b/internal/tofu/testdata/plan-module-multi-var/child/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-multi-var/child/main.tf rename to internal/tofu/testdata/plan-module-multi-var/child/main.tf diff --git a/internal/opentf/testdata/plan-module-multi-var/main.tf b/internal/tofu/testdata/plan-module-multi-var/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-multi-var/main.tf rename to internal/tofu/testdata/plan-module-multi-var/main.tf diff --git a/internal/opentf/testdata/plan-module-provider-defaults-var/child/main.tf b/internal/tofu/testdata/plan-module-provider-defaults-var/child/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-provider-defaults-var/child/main.tf rename to internal/tofu/testdata/plan-module-provider-defaults-var/child/main.tf diff --git a/internal/opentf/testdata/plan-module-provider-defaults-var/main.tf b/internal/tofu/testdata/plan-module-provider-defaults-var/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-provider-defaults-var/main.tf rename to internal/tofu/testdata/plan-module-provider-defaults-var/main.tf diff --git a/internal/opentf/testdata/plan-module-provider-defaults/child/main.tf b/internal/tofu/testdata/plan-module-provider-defaults/child/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-provider-defaults/child/main.tf rename to internal/tofu/testdata/plan-module-provider-defaults/child/main.tf diff --git a/internal/opentf/testdata/plan-module-provider-defaults/main.tf b/internal/tofu/testdata/plan-module-provider-defaults/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-provider-defaults/main.tf rename to internal/tofu/testdata/plan-module-provider-defaults/main.tf diff --git a/internal/opentf/testdata/plan-module-provider-inherit-deep/A/main.tf b/internal/tofu/testdata/plan-module-provider-inherit-deep/A/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-provider-inherit-deep/A/main.tf rename to internal/tofu/testdata/plan-module-provider-inherit-deep/A/main.tf diff --git a/internal/opentf/testdata/plan-module-provider-inherit-deep/B/main.tf b/internal/tofu/testdata/plan-module-provider-inherit-deep/B/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-provider-inherit-deep/B/main.tf rename to internal/tofu/testdata/plan-module-provider-inherit-deep/B/main.tf diff --git a/internal/opentf/testdata/plan-module-provider-inherit-deep/C/main.tf b/internal/tofu/testdata/plan-module-provider-inherit-deep/C/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-provider-inherit-deep/C/main.tf rename to internal/tofu/testdata/plan-module-provider-inherit-deep/C/main.tf diff --git a/internal/opentf/testdata/plan-module-provider-inherit-deep/main.tf b/internal/tofu/testdata/plan-module-provider-inherit-deep/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-provider-inherit-deep/main.tf rename to internal/tofu/testdata/plan-module-provider-inherit-deep/main.tf diff --git a/internal/opentf/testdata/plan-module-provider-inherit/child/main.tf b/internal/tofu/testdata/plan-module-provider-inherit/child/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-provider-inherit/child/main.tf rename to internal/tofu/testdata/plan-module-provider-inherit/child/main.tf diff --git a/internal/opentf/testdata/plan-module-provider-inherit/main.tf b/internal/tofu/testdata/plan-module-provider-inherit/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-provider-inherit/main.tf rename to internal/tofu/testdata/plan-module-provider-inherit/main.tf diff --git a/internal/opentf/testdata/plan-module-provider-var/child/main.tf b/internal/tofu/testdata/plan-module-provider-var/child/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-provider-var/child/main.tf rename to internal/tofu/testdata/plan-module-provider-var/child/main.tf diff --git a/internal/opentf/testdata/plan-module-provider-var/main.tf b/internal/tofu/testdata/plan-module-provider-var/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-provider-var/main.tf rename to internal/tofu/testdata/plan-module-provider-var/main.tf diff --git a/internal/opentf/testdata/plan-module-var-computed/child/main.tf b/internal/tofu/testdata/plan-module-var-computed/child/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-var-computed/child/main.tf rename to internal/tofu/testdata/plan-module-var-computed/child/main.tf diff --git a/internal/opentf/testdata/plan-module-var-computed/main.tf b/internal/tofu/testdata/plan-module-var-computed/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-var-computed/main.tf rename to internal/tofu/testdata/plan-module-var-computed/main.tf diff --git a/internal/opentf/testdata/plan-module-var-with-default-value/inner/main.tf b/internal/tofu/testdata/plan-module-var-with-default-value/inner/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-var-with-default-value/inner/main.tf rename to internal/tofu/testdata/plan-module-var-with-default-value/inner/main.tf diff --git a/internal/opentf/testdata/plan-module-var-with-default-value/main.tf b/internal/tofu/testdata/plan-module-var-with-default-value/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-var-with-default-value/main.tf rename to internal/tofu/testdata/plan-module-var-with-default-value/main.tf diff --git a/internal/opentf/testdata/plan-module-var/child/main.tf b/internal/tofu/testdata/plan-module-var/child/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-var/child/main.tf rename to internal/tofu/testdata/plan-module-var/child/main.tf diff --git a/internal/opentf/testdata/plan-module-var/main.tf b/internal/tofu/testdata/plan-module-var/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-var/main.tf rename to internal/tofu/testdata/plan-module-var/main.tf diff --git a/internal/opentf/testdata/plan-module-variable-from-splat/main.tf b/internal/tofu/testdata/plan-module-variable-from-splat/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-variable-from-splat/main.tf rename to internal/tofu/testdata/plan-module-variable-from-splat/main.tf diff --git a/internal/opentf/testdata/plan-module-variable-from-splat/mod/main.tf b/internal/tofu/testdata/plan-module-variable-from-splat/mod/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-variable-from-splat/mod/main.tf rename to internal/tofu/testdata/plan-module-variable-from-splat/mod/main.tf diff --git a/internal/opentf/testdata/plan-module-wrong-var-type-nested/inner/main.tf b/internal/tofu/testdata/plan-module-wrong-var-type-nested/inner/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-wrong-var-type-nested/inner/main.tf rename to internal/tofu/testdata/plan-module-wrong-var-type-nested/inner/main.tf diff --git a/internal/opentf/testdata/plan-module-wrong-var-type-nested/main.tf b/internal/tofu/testdata/plan-module-wrong-var-type-nested/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-wrong-var-type-nested/main.tf rename to internal/tofu/testdata/plan-module-wrong-var-type-nested/main.tf diff --git a/internal/opentf/testdata/plan-module-wrong-var-type-nested/middle/main.tf b/internal/tofu/testdata/plan-module-wrong-var-type-nested/middle/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-wrong-var-type-nested/middle/main.tf rename to internal/tofu/testdata/plan-module-wrong-var-type-nested/middle/main.tf diff --git a/internal/opentf/testdata/plan-module-wrong-var-type/inner/main.tf b/internal/tofu/testdata/plan-module-wrong-var-type/inner/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-wrong-var-type/inner/main.tf rename to internal/tofu/testdata/plan-module-wrong-var-type/inner/main.tf diff --git a/internal/opentf/testdata/plan-module-wrong-var-type/main.tf b/internal/tofu/testdata/plan-module-wrong-var-type/main.tf similarity index 100% rename from internal/opentf/testdata/plan-module-wrong-var-type/main.tf rename to internal/tofu/testdata/plan-module-wrong-var-type/main.tf diff --git a/internal/opentf/testdata/plan-modules-expand/child/main.tf b/internal/tofu/testdata/plan-modules-expand/child/main.tf similarity index 100% rename from internal/opentf/testdata/plan-modules-expand/child/main.tf rename to internal/tofu/testdata/plan-modules-expand/child/main.tf diff --git a/internal/opentf/testdata/plan-modules-expand/main.tf b/internal/tofu/testdata/plan-modules-expand/main.tf similarity index 100% rename from internal/opentf/testdata/plan-modules-expand/main.tf rename to internal/tofu/testdata/plan-modules-expand/main.tf diff --git a/internal/opentf/testdata/plan-modules-remove-provisioners/main.tf b/internal/tofu/testdata/plan-modules-remove-provisioners/main.tf similarity index 100% rename from internal/opentf/testdata/plan-modules-remove-provisioners/main.tf rename to internal/tofu/testdata/plan-modules-remove-provisioners/main.tf diff --git a/internal/opentf/testdata/plan-modules-remove-provisioners/parent/child/main.tf b/internal/tofu/testdata/plan-modules-remove-provisioners/parent/child/main.tf similarity index 100% rename from internal/opentf/testdata/plan-modules-remove-provisioners/parent/child/main.tf rename to internal/tofu/testdata/plan-modules-remove-provisioners/parent/child/main.tf diff --git a/internal/opentf/testdata/plan-modules-remove-provisioners/parent/main.tf b/internal/tofu/testdata/plan-modules-remove-provisioners/parent/main.tf similarity index 100% rename from internal/opentf/testdata/plan-modules-remove-provisioners/parent/main.tf rename to internal/tofu/testdata/plan-modules-remove-provisioners/parent/main.tf diff --git a/internal/opentf/testdata/plan-modules-remove/main.tf b/internal/tofu/testdata/plan-modules-remove/main.tf similarity index 100% rename from internal/opentf/testdata/plan-modules-remove/main.tf rename to internal/tofu/testdata/plan-modules-remove/main.tf diff --git a/internal/opentf/testdata/plan-modules/child/main.tf b/internal/tofu/testdata/plan-modules/child/main.tf similarity index 100% rename from internal/opentf/testdata/plan-modules/child/main.tf rename to internal/tofu/testdata/plan-modules/child/main.tf diff --git a/internal/opentf/testdata/plan-modules/main.tf b/internal/tofu/testdata/plan-modules/main.tf similarity index 100% rename from internal/opentf/testdata/plan-modules/main.tf rename to internal/tofu/testdata/plan-modules/main.tf diff --git a/internal/opentf/testdata/plan-orphan/main.tf b/internal/tofu/testdata/plan-orphan/main.tf similarity index 100% rename from internal/opentf/testdata/plan-orphan/main.tf rename to internal/tofu/testdata/plan-orphan/main.tf diff --git a/internal/opentf/testdata/plan-path-var/main.tf b/internal/tofu/testdata/plan-path-var/main.tf similarity index 100% rename from internal/opentf/testdata/plan-path-var/main.tf rename to internal/tofu/testdata/plan-path-var/main.tf diff --git a/internal/opentf/testdata/plan-prevent-destroy-bad/main.tf b/internal/tofu/testdata/plan-prevent-destroy-bad/main.tf similarity index 100% rename from internal/opentf/testdata/plan-prevent-destroy-bad/main.tf rename to internal/tofu/testdata/plan-prevent-destroy-bad/main.tf diff --git a/internal/opentf/testdata/plan-prevent-destroy-count-bad/main.tf b/internal/tofu/testdata/plan-prevent-destroy-count-bad/main.tf similarity index 100% rename from internal/opentf/testdata/plan-prevent-destroy-count-bad/main.tf rename to internal/tofu/testdata/plan-prevent-destroy-count-bad/main.tf diff --git a/internal/opentf/testdata/plan-prevent-destroy-count-good/main.tf b/internal/tofu/testdata/plan-prevent-destroy-count-good/main.tf similarity index 100% rename from internal/opentf/testdata/plan-prevent-destroy-count-good/main.tf rename to internal/tofu/testdata/plan-prevent-destroy-count-good/main.tf diff --git a/internal/opentf/testdata/plan-prevent-destroy-good/main.tf b/internal/tofu/testdata/plan-prevent-destroy-good/main.tf similarity index 100% rename from internal/opentf/testdata/plan-prevent-destroy-good/main.tf rename to internal/tofu/testdata/plan-prevent-destroy-good/main.tf diff --git a/internal/opentf/testdata/plan-provider/main.tf b/internal/tofu/testdata/plan-provider/main.tf similarity index 100% rename from internal/opentf/testdata/plan-provider/main.tf rename to internal/tofu/testdata/plan-provider/main.tf diff --git a/internal/opentf/testdata/plan-provisioner-cycle/main.tf b/internal/tofu/testdata/plan-provisioner-cycle/main.tf similarity index 100% rename from internal/opentf/testdata/plan-provisioner-cycle/main.tf rename to internal/tofu/testdata/plan-provisioner-cycle/main.tf diff --git a/internal/opentf/testdata/plan-required-output/main.tf b/internal/tofu/testdata/plan-required-output/main.tf similarity index 100% rename from internal/opentf/testdata/plan-required-output/main.tf rename to internal/tofu/testdata/plan-required-output/main.tf diff --git a/internal/opentf/testdata/plan-required-output/mod/main.tf b/internal/tofu/testdata/plan-required-output/mod/main.tf similarity index 100% rename from internal/opentf/testdata/plan-required-output/mod/main.tf rename to internal/tofu/testdata/plan-required-output/mod/main.tf diff --git a/internal/opentf/testdata/plan-required-whole-mod/main.tf b/internal/tofu/testdata/plan-required-whole-mod/main.tf similarity index 100% rename from internal/opentf/testdata/plan-required-whole-mod/main.tf rename to internal/tofu/testdata/plan-required-whole-mod/main.tf diff --git a/internal/opentf/testdata/plan-required-whole-mod/mod/main.tf b/internal/tofu/testdata/plan-required-whole-mod/mod/main.tf similarity index 100% rename from internal/opentf/testdata/plan-required-whole-mod/mod/main.tf rename to internal/tofu/testdata/plan-required-whole-mod/mod/main.tf diff --git a/internal/opentf/testdata/plan-requires-replace/main.tf b/internal/tofu/testdata/plan-requires-replace/main.tf similarity index 100% rename from internal/opentf/testdata/plan-requires-replace/main.tf rename to internal/tofu/testdata/plan-requires-replace/main.tf diff --git a/internal/opentf/testdata/plan-self-ref-multi-all/main.tf b/internal/tofu/testdata/plan-self-ref-multi-all/main.tf similarity index 100% rename from internal/opentf/testdata/plan-self-ref-multi-all/main.tf rename to internal/tofu/testdata/plan-self-ref-multi-all/main.tf diff --git a/internal/opentf/testdata/plan-self-ref-multi/main.tf b/internal/tofu/testdata/plan-self-ref-multi/main.tf similarity index 100% rename from internal/opentf/testdata/plan-self-ref-multi/main.tf rename to internal/tofu/testdata/plan-self-ref-multi/main.tf diff --git a/internal/opentf/testdata/plan-self-ref/main.tf b/internal/tofu/testdata/plan-self-ref/main.tf similarity index 100% rename from internal/opentf/testdata/plan-self-ref/main.tf rename to internal/tofu/testdata/plan-self-ref/main.tf diff --git a/internal/opentf/testdata/plan-shadow-uuid/main.tf b/internal/tofu/testdata/plan-shadow-uuid/main.tf similarity index 100% rename from internal/opentf/testdata/plan-shadow-uuid/main.tf rename to internal/tofu/testdata/plan-shadow-uuid/main.tf diff --git a/internal/opentf/testdata/plan-taint-ignore-changes/main.tf b/internal/tofu/testdata/plan-taint-ignore-changes/main.tf similarity index 100% rename from internal/opentf/testdata/plan-taint-ignore-changes/main.tf rename to internal/tofu/testdata/plan-taint-ignore-changes/main.tf diff --git a/internal/opentf/testdata/plan-taint-interpolated-count/main.tf b/internal/tofu/testdata/plan-taint-interpolated-count/main.tf similarity index 100% rename from internal/opentf/testdata/plan-taint-interpolated-count/main.tf rename to internal/tofu/testdata/plan-taint-interpolated-count/main.tf diff --git a/internal/opentf/testdata/plan-taint/main.tf b/internal/tofu/testdata/plan-taint/main.tf similarity index 100% rename from internal/opentf/testdata/plan-taint/main.tf rename to internal/tofu/testdata/plan-taint/main.tf diff --git a/internal/opentf/testdata/plan-targeted-cross-module/A/main.tf b/internal/tofu/testdata/plan-targeted-cross-module/A/main.tf similarity index 100% rename from internal/opentf/testdata/plan-targeted-cross-module/A/main.tf rename to internal/tofu/testdata/plan-targeted-cross-module/A/main.tf diff --git a/internal/opentf/testdata/plan-targeted-cross-module/B/main.tf b/internal/tofu/testdata/plan-targeted-cross-module/B/main.tf similarity index 100% rename from internal/opentf/testdata/plan-targeted-cross-module/B/main.tf rename to internal/tofu/testdata/plan-targeted-cross-module/B/main.tf diff --git a/internal/opentf/testdata/plan-targeted-cross-module/main.tf b/internal/tofu/testdata/plan-targeted-cross-module/main.tf similarity index 100% rename from internal/opentf/testdata/plan-targeted-cross-module/main.tf rename to internal/tofu/testdata/plan-targeted-cross-module/main.tf diff --git a/internal/opentf/testdata/plan-targeted-module-orphan/main.tf b/internal/tofu/testdata/plan-targeted-module-orphan/main.tf similarity index 100% rename from internal/opentf/testdata/plan-targeted-module-orphan/main.tf rename to internal/tofu/testdata/plan-targeted-module-orphan/main.tf diff --git a/internal/opentf/testdata/plan-targeted-module-untargeted-variable/child/main.tf b/internal/tofu/testdata/plan-targeted-module-untargeted-variable/child/main.tf similarity index 100% rename from internal/opentf/testdata/plan-targeted-module-untargeted-variable/child/main.tf rename to internal/tofu/testdata/plan-targeted-module-untargeted-variable/child/main.tf diff --git a/internal/opentf/testdata/plan-targeted-module-untargeted-variable/main.tf b/internal/tofu/testdata/plan-targeted-module-untargeted-variable/main.tf similarity index 100% rename from internal/opentf/testdata/plan-targeted-module-untargeted-variable/main.tf rename to internal/tofu/testdata/plan-targeted-module-untargeted-variable/main.tf diff --git a/internal/opentf/testdata/plan-targeted-module-with-provider/child1/main.tf b/internal/tofu/testdata/plan-targeted-module-with-provider/child1/main.tf similarity index 100% rename from internal/opentf/testdata/plan-targeted-module-with-provider/child1/main.tf rename to internal/tofu/testdata/plan-targeted-module-with-provider/child1/main.tf diff --git a/internal/opentf/testdata/plan-targeted-module-with-provider/child2/main.tf b/internal/tofu/testdata/plan-targeted-module-with-provider/child2/main.tf similarity index 100% rename from internal/opentf/testdata/plan-targeted-module-with-provider/child2/main.tf rename to internal/tofu/testdata/plan-targeted-module-with-provider/child2/main.tf diff --git a/internal/opentf/testdata/plan-targeted-module-with-provider/main.tf b/internal/tofu/testdata/plan-targeted-module-with-provider/main.tf similarity index 100% rename from internal/opentf/testdata/plan-targeted-module-with-provider/main.tf rename to internal/tofu/testdata/plan-targeted-module-with-provider/main.tf diff --git a/internal/opentf/testdata/plan-targeted-orphan/main.tf b/internal/tofu/testdata/plan-targeted-orphan/main.tf similarity index 100% rename from internal/opentf/testdata/plan-targeted-orphan/main.tf rename to internal/tofu/testdata/plan-targeted-orphan/main.tf diff --git a/internal/opentf/testdata/plan-targeted-over-ten/main.tf b/internal/tofu/testdata/plan-targeted-over-ten/main.tf similarity index 100% rename from internal/opentf/testdata/plan-targeted-over-ten/main.tf rename to internal/tofu/testdata/plan-targeted-over-ten/main.tf diff --git a/internal/opentf/testdata/plan-targeted/main.tf b/internal/tofu/testdata/plan-targeted/main.tf similarity index 100% rename from internal/opentf/testdata/plan-targeted/main.tf rename to internal/tofu/testdata/plan-targeted/main.tf diff --git a/internal/opentf/testdata/plan-targeted/mod/main.tf b/internal/tofu/testdata/plan-targeted/mod/main.tf similarity index 100% rename from internal/opentf/testdata/plan-targeted/mod/main.tf rename to internal/tofu/testdata/plan-targeted/mod/main.tf diff --git a/internal/opentf/testdata/plan-untargeted-resource-output/main.tf b/internal/tofu/testdata/plan-untargeted-resource-output/main.tf similarity index 100% rename from internal/opentf/testdata/plan-untargeted-resource-output/main.tf rename to internal/tofu/testdata/plan-untargeted-resource-output/main.tf diff --git a/internal/opentf/testdata/plan-untargeted-resource-output/mod/main.tf b/internal/tofu/testdata/plan-untargeted-resource-output/mod/main.tf similarity index 100% rename from internal/opentf/testdata/plan-untargeted-resource-output/mod/main.tf rename to internal/tofu/testdata/plan-untargeted-resource-output/mod/main.tf diff --git a/internal/opentf/testdata/plan-var-list-err/main.tf b/internal/tofu/testdata/plan-var-list-err/main.tf similarity index 100% rename from internal/opentf/testdata/plan-var-list-err/main.tf rename to internal/tofu/testdata/plan-var-list-err/main.tf diff --git a/internal/opentf/testdata/plan-variable-sensitivity-module/child/main.tf b/internal/tofu/testdata/plan-variable-sensitivity-module/child/main.tf similarity index 100% rename from internal/opentf/testdata/plan-variable-sensitivity-module/child/main.tf rename to internal/tofu/testdata/plan-variable-sensitivity-module/child/main.tf diff --git a/internal/opentf/testdata/plan-variable-sensitivity-module/main.tf b/internal/tofu/testdata/plan-variable-sensitivity-module/main.tf similarity index 100% rename from internal/opentf/testdata/plan-variable-sensitivity-module/main.tf rename to internal/tofu/testdata/plan-variable-sensitivity-module/main.tf diff --git a/internal/opentf/testdata/plan-variable-sensitivity/main.tf b/internal/tofu/testdata/plan-variable-sensitivity/main.tf similarity index 100% rename from internal/opentf/testdata/plan-variable-sensitivity/main.tf rename to internal/tofu/testdata/plan-variable-sensitivity/main.tf diff --git a/internal/opentf/testdata/provider-meta-data-set/main.tf b/internal/tofu/testdata/provider-meta-data-set/main.tf similarity index 100% rename from internal/opentf/testdata/provider-meta-data-set/main.tf rename to internal/tofu/testdata/provider-meta-data-set/main.tf diff --git a/internal/opentf/testdata/provider-meta-data-set/my-module/main.tf b/internal/tofu/testdata/provider-meta-data-set/my-module/main.tf similarity index 100% rename from internal/opentf/testdata/provider-meta-data-set/my-module/main.tf rename to internal/tofu/testdata/provider-meta-data-set/my-module/main.tf diff --git a/internal/opentf/testdata/provider-meta-data-unset/main.tf b/internal/tofu/testdata/provider-meta-data-unset/main.tf similarity index 100% rename from internal/opentf/testdata/provider-meta-data-unset/main.tf rename to internal/tofu/testdata/provider-meta-data-unset/main.tf diff --git a/internal/opentf/testdata/provider-meta-data-unset/my-module/main.tf b/internal/tofu/testdata/provider-meta-data-unset/my-module/main.tf similarity index 100% rename from internal/opentf/testdata/provider-meta-data-unset/my-module/main.tf rename to internal/tofu/testdata/provider-meta-data-unset/my-module/main.tf diff --git a/internal/opentf/testdata/provider-meta-set/main.tf b/internal/tofu/testdata/provider-meta-set/main.tf similarity index 100% rename from internal/opentf/testdata/provider-meta-set/main.tf rename to internal/tofu/testdata/provider-meta-set/main.tf diff --git a/internal/opentf/testdata/provider-meta-set/my-module/main.tf b/internal/tofu/testdata/provider-meta-set/my-module/main.tf similarity index 100% rename from internal/opentf/testdata/provider-meta-set/my-module/main.tf rename to internal/tofu/testdata/provider-meta-set/my-module/main.tf diff --git a/internal/opentf/testdata/provider-meta-unset/main.tf b/internal/tofu/testdata/provider-meta-unset/main.tf similarity index 100% rename from internal/opentf/testdata/provider-meta-unset/main.tf rename to internal/tofu/testdata/provider-meta-unset/main.tf diff --git a/internal/opentf/testdata/provider-meta-unset/my-module/main.tf b/internal/tofu/testdata/provider-meta-unset/my-module/main.tf similarity index 100% rename from internal/opentf/testdata/provider-meta-unset/my-module/main.tf rename to internal/tofu/testdata/provider-meta-unset/my-module/main.tf diff --git a/internal/opentf/testdata/provider-with-locals/main.tf b/internal/tofu/testdata/provider-with-locals/main.tf similarity index 100% rename from internal/opentf/testdata/provider-with-locals/main.tf rename to internal/tofu/testdata/provider-with-locals/main.tf diff --git a/internal/opentf/testdata/refresh-basic/main.tf b/internal/tofu/testdata/refresh-basic/main.tf similarity index 100% rename from internal/opentf/testdata/refresh-basic/main.tf rename to internal/tofu/testdata/refresh-basic/main.tf diff --git a/internal/opentf/testdata/refresh-data-count/refresh-data-count.tf b/internal/tofu/testdata/refresh-data-count/refresh-data-count.tf similarity index 100% rename from internal/opentf/testdata/refresh-data-count/refresh-data-count.tf rename to internal/tofu/testdata/refresh-data-count/refresh-data-count.tf diff --git a/internal/opentf/testdata/refresh-data-module-var/child/main.tf b/internal/tofu/testdata/refresh-data-module-var/child/main.tf similarity index 100% rename from internal/opentf/testdata/refresh-data-module-var/child/main.tf rename to internal/tofu/testdata/refresh-data-module-var/child/main.tf diff --git a/internal/opentf/testdata/refresh-data-module-var/main.tf b/internal/tofu/testdata/refresh-data-module-var/main.tf similarity index 100% rename from internal/opentf/testdata/refresh-data-module-var/main.tf rename to internal/tofu/testdata/refresh-data-module-var/main.tf diff --git a/internal/opentf/testdata/refresh-data-ref-data/main.tf b/internal/tofu/testdata/refresh-data-ref-data/main.tf similarity index 100% rename from internal/opentf/testdata/refresh-data-ref-data/main.tf rename to internal/tofu/testdata/refresh-data-ref-data/main.tf diff --git a/internal/opentf/testdata/refresh-data-resource-basic/main.tf b/internal/tofu/testdata/refresh-data-resource-basic/main.tf similarity index 100% rename from internal/opentf/testdata/refresh-data-resource-basic/main.tf rename to internal/tofu/testdata/refresh-data-resource-basic/main.tf diff --git a/internal/opentf/testdata/refresh-dynamic/main.tf b/internal/tofu/testdata/refresh-dynamic/main.tf similarity index 100% rename from internal/opentf/testdata/refresh-dynamic/main.tf rename to internal/tofu/testdata/refresh-dynamic/main.tf diff --git a/internal/opentf/testdata/refresh-module-computed-var/child/main.tf b/internal/tofu/testdata/refresh-module-computed-var/child/main.tf similarity index 100% rename from internal/opentf/testdata/refresh-module-computed-var/child/main.tf rename to internal/tofu/testdata/refresh-module-computed-var/child/main.tf diff --git a/internal/opentf/testdata/refresh-module-computed-var/main.tf b/internal/tofu/testdata/refresh-module-computed-var/main.tf similarity index 100% rename from internal/opentf/testdata/refresh-module-computed-var/main.tf rename to internal/tofu/testdata/refresh-module-computed-var/main.tf diff --git a/internal/opentf/testdata/refresh-module-input-computed-output/child/main.tf b/internal/tofu/testdata/refresh-module-input-computed-output/child/main.tf similarity index 100% rename from internal/opentf/testdata/refresh-module-input-computed-output/child/main.tf rename to internal/tofu/testdata/refresh-module-input-computed-output/child/main.tf diff --git a/internal/opentf/testdata/refresh-module-input-computed-output/main.tf b/internal/tofu/testdata/refresh-module-input-computed-output/main.tf similarity index 100% rename from internal/opentf/testdata/refresh-module-input-computed-output/main.tf rename to internal/tofu/testdata/refresh-module-input-computed-output/main.tf diff --git a/internal/opentf/testdata/refresh-module-orphan/child/grandchild/main.tf b/internal/tofu/testdata/refresh-module-orphan/child/grandchild/main.tf similarity index 100% rename from internal/opentf/testdata/refresh-module-orphan/child/grandchild/main.tf rename to internal/tofu/testdata/refresh-module-orphan/child/grandchild/main.tf diff --git a/internal/opentf/testdata/refresh-module-orphan/child/main.tf b/internal/tofu/testdata/refresh-module-orphan/child/main.tf similarity index 100% rename from internal/opentf/testdata/refresh-module-orphan/child/main.tf rename to internal/tofu/testdata/refresh-module-orphan/child/main.tf diff --git a/internal/opentf/testdata/refresh-module-orphan/main.tf b/internal/tofu/testdata/refresh-module-orphan/main.tf similarity index 100% rename from internal/opentf/testdata/refresh-module-orphan/main.tf rename to internal/tofu/testdata/refresh-module-orphan/main.tf diff --git a/internal/opentf/testdata/refresh-module-var-module/bar/main.tf b/internal/tofu/testdata/refresh-module-var-module/bar/main.tf similarity index 100% rename from internal/opentf/testdata/refresh-module-var-module/bar/main.tf rename to internal/tofu/testdata/refresh-module-var-module/bar/main.tf diff --git a/internal/opentf/testdata/refresh-module-var-module/foo/main.tf b/internal/tofu/testdata/refresh-module-var-module/foo/main.tf similarity index 100% rename from internal/opentf/testdata/refresh-module-var-module/foo/main.tf rename to internal/tofu/testdata/refresh-module-var-module/foo/main.tf diff --git a/internal/opentf/testdata/refresh-module-var-module/main.tf b/internal/tofu/testdata/refresh-module-var-module/main.tf similarity index 100% rename from internal/opentf/testdata/refresh-module-var-module/main.tf rename to internal/tofu/testdata/refresh-module-var-module/main.tf diff --git a/internal/opentf/testdata/refresh-modules/child/main.tf b/internal/tofu/testdata/refresh-modules/child/main.tf similarity index 100% rename from internal/opentf/testdata/refresh-modules/child/main.tf rename to internal/tofu/testdata/refresh-modules/child/main.tf diff --git a/internal/opentf/testdata/refresh-modules/main.tf b/internal/tofu/testdata/refresh-modules/main.tf similarity index 100% rename from internal/opentf/testdata/refresh-modules/main.tf rename to internal/tofu/testdata/refresh-modules/main.tf diff --git a/internal/opentf/testdata/refresh-no-state/main.tf b/internal/tofu/testdata/refresh-no-state/main.tf similarity index 100% rename from internal/opentf/testdata/refresh-no-state/main.tf rename to internal/tofu/testdata/refresh-no-state/main.tf diff --git a/internal/opentf/testdata/refresh-output-partial/main.tf b/internal/tofu/testdata/refresh-output-partial/main.tf similarity index 100% rename from internal/opentf/testdata/refresh-output-partial/main.tf rename to internal/tofu/testdata/refresh-output-partial/main.tf diff --git a/internal/opentf/testdata/refresh-output/main.tf b/internal/tofu/testdata/refresh-output/main.tf similarity index 100% rename from internal/opentf/testdata/refresh-output/main.tf rename to internal/tofu/testdata/refresh-output/main.tf diff --git a/internal/opentf/testdata/refresh-schema-upgrade/main.tf b/internal/tofu/testdata/refresh-schema-upgrade/main.tf similarity index 100% rename from internal/opentf/testdata/refresh-schema-upgrade/main.tf rename to internal/tofu/testdata/refresh-schema-upgrade/main.tf diff --git a/internal/opentf/testdata/refresh-targeted-count/main.tf b/internal/tofu/testdata/refresh-targeted-count/main.tf similarity index 100% rename from internal/opentf/testdata/refresh-targeted-count/main.tf rename to internal/tofu/testdata/refresh-targeted-count/main.tf diff --git a/internal/opentf/testdata/refresh-targeted/main.tf b/internal/tofu/testdata/refresh-targeted/main.tf similarity index 100% rename from internal/opentf/testdata/refresh-targeted/main.tf rename to internal/tofu/testdata/refresh-targeted/main.tf diff --git a/internal/opentf/testdata/refresh-unknown-provider/main.tf b/internal/tofu/testdata/refresh-unknown-provider/main.tf similarity index 100% rename from internal/opentf/testdata/refresh-unknown-provider/main.tf rename to internal/tofu/testdata/refresh-unknown-provider/main.tf diff --git a/internal/opentf/testdata/refresh-vars/main.tf b/internal/tofu/testdata/refresh-vars/main.tf similarity index 100% rename from internal/opentf/testdata/refresh-vars/main.tf rename to internal/tofu/testdata/refresh-vars/main.tf diff --git a/internal/opentf/testdata/static-validate-refs/static-validate-refs.tf b/internal/tofu/testdata/static-validate-refs/static-validate-refs.tf similarity index 100% rename from internal/opentf/testdata/static-validate-refs/static-validate-refs.tf rename to internal/tofu/testdata/static-validate-refs/static-validate-refs.tf diff --git a/internal/opentf/testdata/transform-cbd-destroy-edge-both-count/main.tf b/internal/tofu/testdata/transform-cbd-destroy-edge-both-count/main.tf similarity index 100% rename from internal/opentf/testdata/transform-cbd-destroy-edge-both-count/main.tf rename to internal/tofu/testdata/transform-cbd-destroy-edge-both-count/main.tf diff --git a/internal/opentf/testdata/transform-cbd-destroy-edge-count/main.tf b/internal/tofu/testdata/transform-cbd-destroy-edge-count/main.tf similarity index 100% rename from internal/opentf/testdata/transform-cbd-destroy-edge-count/main.tf rename to internal/tofu/testdata/transform-cbd-destroy-edge-count/main.tf diff --git a/internal/opentf/testdata/transform-config-mode-data/main.tf b/internal/tofu/testdata/transform-config-mode-data/main.tf similarity index 100% rename from internal/opentf/testdata/transform-config-mode-data/main.tf rename to internal/tofu/testdata/transform-config-mode-data/main.tf diff --git a/internal/opentf/testdata/transform-destroy-cbd-edge-basic/main.tf b/internal/tofu/testdata/transform-destroy-cbd-edge-basic/main.tf similarity index 100% rename from internal/opentf/testdata/transform-destroy-cbd-edge-basic/main.tf rename to internal/tofu/testdata/transform-destroy-cbd-edge-basic/main.tf diff --git a/internal/opentf/testdata/transform-destroy-cbd-edge-multi/main.tf b/internal/tofu/testdata/transform-destroy-cbd-edge-multi/main.tf similarity index 100% rename from internal/opentf/testdata/transform-destroy-cbd-edge-multi/main.tf rename to internal/tofu/testdata/transform-destroy-cbd-edge-multi/main.tf diff --git a/internal/opentf/testdata/transform-destroy-edge-basic/main.tf b/internal/tofu/testdata/transform-destroy-edge-basic/main.tf similarity index 100% rename from internal/opentf/testdata/transform-destroy-edge-basic/main.tf rename to internal/tofu/testdata/transform-destroy-edge-basic/main.tf diff --git a/internal/opentf/testdata/transform-destroy-edge-module-only/child/main.tf b/internal/tofu/testdata/transform-destroy-edge-module-only/child/main.tf similarity index 100% rename from internal/opentf/testdata/transform-destroy-edge-module-only/child/main.tf rename to internal/tofu/testdata/transform-destroy-edge-module-only/child/main.tf diff --git a/internal/opentf/testdata/transform-destroy-edge-module-only/main.tf b/internal/tofu/testdata/transform-destroy-edge-module-only/main.tf similarity index 100% rename from internal/opentf/testdata/transform-destroy-edge-module-only/main.tf rename to internal/tofu/testdata/transform-destroy-edge-module-only/main.tf diff --git a/internal/opentf/testdata/transform-destroy-edge-module/child/main.tf b/internal/tofu/testdata/transform-destroy-edge-module/child/main.tf similarity index 100% rename from internal/opentf/testdata/transform-destroy-edge-module/child/main.tf rename to internal/tofu/testdata/transform-destroy-edge-module/child/main.tf diff --git a/internal/opentf/testdata/transform-destroy-edge-module/main.tf b/internal/tofu/testdata/transform-destroy-edge-module/main.tf similarity index 100% rename from internal/opentf/testdata/transform-destroy-edge-module/main.tf rename to internal/tofu/testdata/transform-destroy-edge-module/main.tf diff --git a/internal/opentf/testdata/transform-destroy-edge-multi/main.tf b/internal/tofu/testdata/transform-destroy-edge-multi/main.tf similarity index 100% rename from internal/opentf/testdata/transform-destroy-edge-multi/main.tf rename to internal/tofu/testdata/transform-destroy-edge-multi/main.tf diff --git a/internal/opentf/testdata/transform-destroy-edge-self-ref/main.tf b/internal/tofu/testdata/transform-destroy-edge-self-ref/main.tf similarity index 100% rename from internal/opentf/testdata/transform-destroy-edge-self-ref/main.tf rename to internal/tofu/testdata/transform-destroy-edge-self-ref/main.tf diff --git a/internal/opentf/testdata/transform-module-var-basic/child/main.tf b/internal/tofu/testdata/transform-module-var-basic/child/main.tf similarity index 100% rename from internal/opentf/testdata/transform-module-var-basic/child/main.tf rename to internal/tofu/testdata/transform-module-var-basic/child/main.tf diff --git a/internal/opentf/testdata/transform-module-var-basic/main.tf b/internal/tofu/testdata/transform-module-var-basic/main.tf similarity index 100% rename from internal/opentf/testdata/transform-module-var-basic/main.tf rename to internal/tofu/testdata/transform-module-var-basic/main.tf diff --git a/internal/opentf/testdata/transform-module-var-nested/child/child/main.tf b/internal/tofu/testdata/transform-module-var-nested/child/child/main.tf similarity index 100% rename from internal/opentf/testdata/transform-module-var-nested/child/child/main.tf rename to internal/tofu/testdata/transform-module-var-nested/child/child/main.tf diff --git a/internal/opentf/testdata/transform-module-var-nested/child/main.tf b/internal/tofu/testdata/transform-module-var-nested/child/main.tf similarity index 100% rename from internal/opentf/testdata/transform-module-var-nested/child/main.tf rename to internal/tofu/testdata/transform-module-var-nested/child/main.tf diff --git a/internal/opentf/testdata/transform-module-var-nested/main.tf b/internal/tofu/testdata/transform-module-var-nested/main.tf similarity index 100% rename from internal/opentf/testdata/transform-module-var-nested/main.tf rename to internal/tofu/testdata/transform-module-var-nested/main.tf diff --git a/internal/opentf/testdata/transform-orphan-basic/main.tf b/internal/tofu/testdata/transform-orphan-basic/main.tf similarity index 100% rename from internal/opentf/testdata/transform-orphan-basic/main.tf rename to internal/tofu/testdata/transform-orphan-basic/main.tf diff --git a/internal/opentf/testdata/transform-orphan-count-empty/main.tf b/internal/tofu/testdata/transform-orphan-count-empty/main.tf similarity index 100% rename from internal/opentf/testdata/transform-orphan-count-empty/main.tf rename to internal/tofu/testdata/transform-orphan-count-empty/main.tf diff --git a/internal/opentf/testdata/transform-orphan-count/main.tf b/internal/tofu/testdata/transform-orphan-count/main.tf similarity index 100% rename from internal/opentf/testdata/transform-orphan-count/main.tf rename to internal/tofu/testdata/transform-orphan-count/main.tf diff --git a/internal/opentf/testdata/transform-orphan-modules/main.tf b/internal/tofu/testdata/transform-orphan-modules/main.tf similarity index 100% rename from internal/opentf/testdata/transform-orphan-modules/main.tf rename to internal/tofu/testdata/transform-orphan-modules/main.tf diff --git a/internal/opentf/testdata/transform-provider-basic/main.tf b/internal/tofu/testdata/transform-provider-basic/main.tf similarity index 100% rename from internal/opentf/testdata/transform-provider-basic/main.tf rename to internal/tofu/testdata/transform-provider-basic/main.tf diff --git a/internal/opentf/testdata/transform-provider-fqns-module/child/main.tf b/internal/tofu/testdata/transform-provider-fqns-module/child/main.tf similarity index 100% rename from internal/opentf/testdata/transform-provider-fqns-module/child/main.tf rename to internal/tofu/testdata/transform-provider-fqns-module/child/main.tf diff --git a/internal/opentf/testdata/transform-provider-fqns-module/main.tf b/internal/tofu/testdata/transform-provider-fqns-module/main.tf similarity index 100% rename from internal/opentf/testdata/transform-provider-fqns-module/main.tf rename to internal/tofu/testdata/transform-provider-fqns-module/main.tf diff --git a/internal/opentf/testdata/transform-provider-fqns/main.tf b/internal/tofu/testdata/transform-provider-fqns/main.tf similarity index 100% rename from internal/opentf/testdata/transform-provider-fqns/main.tf rename to internal/tofu/testdata/transform-provider-fqns/main.tf diff --git a/internal/opentf/testdata/transform-provider-grandchild-inherit/child/grandchild/main.tf b/internal/tofu/testdata/transform-provider-grandchild-inherit/child/grandchild/main.tf similarity index 100% rename from internal/opentf/testdata/transform-provider-grandchild-inherit/child/grandchild/main.tf rename to internal/tofu/testdata/transform-provider-grandchild-inherit/child/grandchild/main.tf diff --git a/internal/opentf/testdata/transform-provider-grandchild-inherit/child/main.tf b/internal/tofu/testdata/transform-provider-grandchild-inherit/child/main.tf similarity index 100% rename from internal/opentf/testdata/transform-provider-grandchild-inherit/child/main.tf rename to internal/tofu/testdata/transform-provider-grandchild-inherit/child/main.tf diff --git a/internal/opentf/testdata/transform-provider-grandchild-inherit/main.tf b/internal/tofu/testdata/transform-provider-grandchild-inherit/main.tf similarity index 100% rename from internal/opentf/testdata/transform-provider-grandchild-inherit/main.tf rename to internal/tofu/testdata/transform-provider-grandchild-inherit/main.tf diff --git a/internal/opentf/testdata/transform-provider-inherit/child/main.tf b/internal/tofu/testdata/transform-provider-inherit/child/main.tf similarity index 100% rename from internal/opentf/testdata/transform-provider-inherit/child/main.tf rename to internal/tofu/testdata/transform-provider-inherit/child/main.tf diff --git a/internal/opentf/testdata/transform-provider-inherit/main.tf b/internal/tofu/testdata/transform-provider-inherit/main.tf similarity index 100% rename from internal/opentf/testdata/transform-provider-inherit/main.tf rename to internal/tofu/testdata/transform-provider-inherit/main.tf diff --git a/internal/opentf/testdata/transform-provider-missing-grandchild/main.tf b/internal/tofu/testdata/transform-provider-missing-grandchild/main.tf similarity index 100% rename from internal/opentf/testdata/transform-provider-missing-grandchild/main.tf rename to internal/tofu/testdata/transform-provider-missing-grandchild/main.tf diff --git a/internal/opentf/testdata/transform-provider-missing-grandchild/sub/main.tf b/internal/tofu/testdata/transform-provider-missing-grandchild/sub/main.tf similarity index 100% rename from internal/opentf/testdata/transform-provider-missing-grandchild/sub/main.tf rename to internal/tofu/testdata/transform-provider-missing-grandchild/sub/main.tf diff --git a/internal/opentf/testdata/transform-provider-missing-grandchild/sub/subsub/main.tf b/internal/tofu/testdata/transform-provider-missing-grandchild/sub/subsub/main.tf similarity index 100% rename from internal/opentf/testdata/transform-provider-missing-grandchild/sub/subsub/main.tf rename to internal/tofu/testdata/transform-provider-missing-grandchild/sub/subsub/main.tf diff --git a/internal/opentf/testdata/transform-provider-missing/main.tf b/internal/tofu/testdata/transform-provider-missing/main.tf similarity index 100% rename from internal/opentf/testdata/transform-provider-missing/main.tf rename to internal/tofu/testdata/transform-provider-missing/main.tf diff --git a/internal/opentf/testdata/transform-provider-prune/main.tf b/internal/tofu/testdata/transform-provider-prune/main.tf similarity index 100% rename from internal/opentf/testdata/transform-provider-prune/main.tf rename to internal/tofu/testdata/transform-provider-prune/main.tf diff --git a/internal/opentf/testdata/transform-provisioner-basic/main.tf b/internal/tofu/testdata/transform-provisioner-basic/main.tf similarity index 100% rename from internal/opentf/testdata/transform-provisioner-basic/main.tf rename to internal/tofu/testdata/transform-provisioner-basic/main.tf diff --git a/internal/opentf/testdata/transform-provisioner-module/child/main.tf b/internal/tofu/testdata/transform-provisioner-module/child/main.tf similarity index 100% rename from internal/opentf/testdata/transform-provisioner-module/child/main.tf rename to internal/tofu/testdata/transform-provisioner-module/child/main.tf diff --git a/internal/opentf/testdata/transform-provisioner-module/main.tf b/internal/tofu/testdata/transform-provisioner-module/main.tf similarity index 100% rename from internal/opentf/testdata/transform-provisioner-module/main.tf rename to internal/tofu/testdata/transform-provisioner-module/main.tf diff --git a/internal/opentf/testdata/transform-root-basic/main.tf b/internal/tofu/testdata/transform-root-basic/main.tf similarity index 100% rename from internal/opentf/testdata/transform-root-basic/main.tf rename to internal/tofu/testdata/transform-root-basic/main.tf diff --git a/internal/opentf/testdata/transform-targets-basic/main.tf b/internal/tofu/testdata/transform-targets-basic/main.tf similarity index 100% rename from internal/opentf/testdata/transform-targets-basic/main.tf rename to internal/tofu/testdata/transform-targets-basic/main.tf diff --git a/internal/opentf/testdata/transform-targets-downstream/child/child.tf b/internal/tofu/testdata/transform-targets-downstream/child/child.tf similarity index 100% rename from internal/opentf/testdata/transform-targets-downstream/child/child.tf rename to internal/tofu/testdata/transform-targets-downstream/child/child.tf diff --git a/internal/opentf/testdata/transform-targets-downstream/child/grandchild/grandchild.tf b/internal/tofu/testdata/transform-targets-downstream/child/grandchild/grandchild.tf similarity index 100% rename from internal/opentf/testdata/transform-targets-downstream/child/grandchild/grandchild.tf rename to internal/tofu/testdata/transform-targets-downstream/child/grandchild/grandchild.tf diff --git a/internal/opentf/testdata/transform-targets-downstream/main.tf b/internal/tofu/testdata/transform-targets-downstream/main.tf similarity index 100% rename from internal/opentf/testdata/transform-targets-downstream/main.tf rename to internal/tofu/testdata/transform-targets-downstream/main.tf diff --git a/internal/opentf/testdata/transform-trans-reduce-basic/main.tf b/internal/tofu/testdata/transform-trans-reduce-basic/main.tf similarity index 100% rename from internal/opentf/testdata/transform-trans-reduce-basic/main.tf rename to internal/tofu/testdata/transform-trans-reduce-basic/main.tf diff --git a/internal/opentf/testdata/update-resource-provider/main.tf b/internal/tofu/testdata/update-resource-provider/main.tf similarity index 100% rename from internal/opentf/testdata/update-resource-provider/main.tf rename to internal/tofu/testdata/update-resource-provider/main.tf diff --git a/internal/opentf/testdata/validate-bad-count/main.tf b/internal/tofu/testdata/validate-bad-count/main.tf similarity index 100% rename from internal/opentf/testdata/validate-bad-count/main.tf rename to internal/tofu/testdata/validate-bad-count/main.tf diff --git a/internal/opentf/testdata/validate-bad-module-output/child/main.tf b/internal/tofu/testdata/validate-bad-module-output/child/main.tf similarity index 100% rename from internal/opentf/testdata/validate-bad-module-output/child/main.tf rename to internal/tofu/testdata/validate-bad-module-output/child/main.tf diff --git a/internal/opentf/testdata/validate-bad-module-output/main.tf b/internal/tofu/testdata/validate-bad-module-output/main.tf similarity index 100% rename from internal/opentf/testdata/validate-bad-module-output/main.tf rename to internal/tofu/testdata/validate-bad-module-output/main.tf diff --git a/internal/opentf/testdata/validate-bad-pc/main.tf b/internal/tofu/testdata/validate-bad-pc/main.tf similarity index 100% rename from internal/opentf/testdata/validate-bad-pc/main.tf rename to internal/tofu/testdata/validate-bad-pc/main.tf diff --git a/internal/opentf/testdata/validate-bad-prov-conf/main.tf b/internal/tofu/testdata/validate-bad-prov-conf/main.tf similarity index 100% rename from internal/opentf/testdata/validate-bad-prov-conf/main.tf rename to internal/tofu/testdata/validate-bad-prov-conf/main.tf diff --git a/internal/opentf/testdata/validate-bad-prov-connection/main.tf b/internal/tofu/testdata/validate-bad-prov-connection/main.tf similarity index 100% rename from internal/opentf/testdata/validate-bad-prov-connection/main.tf rename to internal/tofu/testdata/validate-bad-prov-connection/main.tf diff --git a/internal/opentf/testdata/validate-bad-rc/main.tf b/internal/tofu/testdata/validate-bad-rc/main.tf similarity index 100% rename from internal/opentf/testdata/validate-bad-rc/main.tf rename to internal/tofu/testdata/validate-bad-rc/main.tf diff --git a/internal/opentf/testdata/validate-bad-resource-connection/main.tf b/internal/tofu/testdata/validate-bad-resource-connection/main.tf similarity index 100% rename from internal/opentf/testdata/validate-bad-resource-connection/main.tf rename to internal/tofu/testdata/validate-bad-resource-connection/main.tf diff --git a/internal/opentf/testdata/validate-bad-resource-count/main.tf b/internal/tofu/testdata/validate-bad-resource-count/main.tf similarity index 100% rename from internal/opentf/testdata/validate-bad-resource-count/main.tf rename to internal/tofu/testdata/validate-bad-resource-count/main.tf diff --git a/internal/opentf/testdata/validate-bad-var/main.tf b/internal/tofu/testdata/validate-bad-var/main.tf similarity index 100% rename from internal/opentf/testdata/validate-bad-var/main.tf rename to internal/tofu/testdata/validate-bad-var/main.tf diff --git a/internal/opentf/testdata/validate-computed-in-function/main.tf b/internal/tofu/testdata/validate-computed-in-function/main.tf similarity index 100% rename from internal/opentf/testdata/validate-computed-in-function/main.tf rename to internal/tofu/testdata/validate-computed-in-function/main.tf diff --git a/internal/opentf/testdata/validate-computed-module-var-ref/dest/main.tf b/internal/tofu/testdata/validate-computed-module-var-ref/dest/main.tf similarity index 100% rename from internal/opentf/testdata/validate-computed-module-var-ref/dest/main.tf rename to internal/tofu/testdata/validate-computed-module-var-ref/dest/main.tf diff --git a/internal/opentf/testdata/validate-computed-module-var-ref/main.tf b/internal/tofu/testdata/validate-computed-module-var-ref/main.tf similarity index 100% rename from internal/opentf/testdata/validate-computed-module-var-ref/main.tf rename to internal/tofu/testdata/validate-computed-module-var-ref/main.tf diff --git a/internal/opentf/testdata/validate-computed-module-var-ref/source/main.tf b/internal/tofu/testdata/validate-computed-module-var-ref/source/main.tf similarity index 100% rename from internal/opentf/testdata/validate-computed-module-var-ref/source/main.tf rename to internal/tofu/testdata/validate-computed-module-var-ref/source/main.tf diff --git a/internal/opentf/testdata/validate-computed-var/main.tf b/internal/tofu/testdata/validate-computed-var/main.tf similarity index 100% rename from internal/opentf/testdata/validate-computed-var/main.tf rename to internal/tofu/testdata/validate-computed-var/main.tf diff --git a/internal/opentf/testdata/validate-count-computed/main.tf b/internal/tofu/testdata/validate-count-computed/main.tf similarity index 100% rename from internal/opentf/testdata/validate-count-computed/main.tf rename to internal/tofu/testdata/validate-count-computed/main.tf diff --git a/internal/opentf/testdata/validate-count-negative/main.tf b/internal/tofu/testdata/validate-count-negative/main.tf similarity index 100% rename from internal/opentf/testdata/validate-count-negative/main.tf rename to internal/tofu/testdata/validate-count-negative/main.tf diff --git a/internal/opentf/testdata/validate-count-variable/main.tf b/internal/tofu/testdata/validate-count-variable/main.tf similarity index 100% rename from internal/opentf/testdata/validate-count-variable/main.tf rename to internal/tofu/testdata/validate-count-variable/main.tf diff --git a/internal/opentf/testdata/validate-good-module/child/main.tf b/internal/tofu/testdata/validate-good-module/child/main.tf similarity index 100% rename from internal/opentf/testdata/validate-good-module/child/main.tf rename to internal/tofu/testdata/validate-good-module/child/main.tf diff --git a/internal/opentf/testdata/validate-good-module/main.tf b/internal/tofu/testdata/validate-good-module/main.tf similarity index 100% rename from internal/opentf/testdata/validate-good-module/main.tf rename to internal/tofu/testdata/validate-good-module/main.tf diff --git a/internal/opentf/testdata/validate-good/main.tf b/internal/tofu/testdata/validate-good/main.tf similarity index 100% rename from internal/opentf/testdata/validate-good/main.tf rename to internal/tofu/testdata/validate-good/main.tf diff --git a/internal/opentf/testdata/validate-module-bad-rc/child/main.tf b/internal/tofu/testdata/validate-module-bad-rc/child/main.tf similarity index 100% rename from internal/opentf/testdata/validate-module-bad-rc/child/main.tf rename to internal/tofu/testdata/validate-module-bad-rc/child/main.tf diff --git a/internal/opentf/testdata/validate-module-bad-rc/main.tf b/internal/tofu/testdata/validate-module-bad-rc/main.tf similarity index 100% rename from internal/opentf/testdata/validate-module-bad-rc/main.tf rename to internal/tofu/testdata/validate-module-bad-rc/main.tf diff --git a/internal/opentf/testdata/validate-module-deps-cycle/a/main.tf b/internal/tofu/testdata/validate-module-deps-cycle/a/main.tf similarity index 100% rename from internal/opentf/testdata/validate-module-deps-cycle/a/main.tf rename to internal/tofu/testdata/validate-module-deps-cycle/a/main.tf diff --git a/internal/opentf/testdata/validate-module-deps-cycle/b/main.tf b/internal/tofu/testdata/validate-module-deps-cycle/b/main.tf similarity index 100% rename from internal/opentf/testdata/validate-module-deps-cycle/b/main.tf rename to internal/tofu/testdata/validate-module-deps-cycle/b/main.tf diff --git a/internal/opentf/testdata/validate-module-deps-cycle/main.tf b/internal/tofu/testdata/validate-module-deps-cycle/main.tf similarity index 100% rename from internal/opentf/testdata/validate-module-deps-cycle/main.tf rename to internal/tofu/testdata/validate-module-deps-cycle/main.tf diff --git a/internal/opentf/testdata/validate-module-pc-inherit-unused/child/main.tf b/internal/tofu/testdata/validate-module-pc-inherit-unused/child/main.tf similarity index 100% rename from internal/opentf/testdata/validate-module-pc-inherit-unused/child/main.tf rename to internal/tofu/testdata/validate-module-pc-inherit-unused/child/main.tf diff --git a/internal/opentf/testdata/validate-module-pc-inherit-unused/main.tf b/internal/tofu/testdata/validate-module-pc-inherit-unused/main.tf similarity index 100% rename from internal/opentf/testdata/validate-module-pc-inherit-unused/main.tf rename to internal/tofu/testdata/validate-module-pc-inherit-unused/main.tf diff --git a/internal/opentf/testdata/validate-module-pc-inherit/child/main.tf b/internal/tofu/testdata/validate-module-pc-inherit/child/main.tf similarity index 100% rename from internal/opentf/testdata/validate-module-pc-inherit/child/main.tf rename to internal/tofu/testdata/validate-module-pc-inherit/child/main.tf diff --git a/internal/opentf/testdata/validate-module-pc-inherit/main.tf b/internal/tofu/testdata/validate-module-pc-inherit/main.tf similarity index 100% rename from internal/opentf/testdata/validate-module-pc-inherit/main.tf rename to internal/tofu/testdata/validate-module-pc-inherit/main.tf diff --git a/internal/opentf/testdata/validate-module-pc-vars/child/main.tf b/internal/tofu/testdata/validate-module-pc-vars/child/main.tf similarity index 100% rename from internal/opentf/testdata/validate-module-pc-vars/child/main.tf rename to internal/tofu/testdata/validate-module-pc-vars/child/main.tf diff --git a/internal/opentf/testdata/validate-module-pc-vars/main.tf b/internal/tofu/testdata/validate-module-pc-vars/main.tf similarity index 100% rename from internal/opentf/testdata/validate-module-pc-vars/main.tf rename to internal/tofu/testdata/validate-module-pc-vars/main.tf diff --git a/internal/opentf/testdata/validate-required-provider-config/main.tf b/internal/tofu/testdata/validate-required-provider-config/main.tf similarity index 100% rename from internal/opentf/testdata/validate-required-provider-config/main.tf rename to internal/tofu/testdata/validate-required-provider-config/main.tf diff --git a/internal/opentf/testdata/validate-required-var/main.tf b/internal/tofu/testdata/validate-required-var/main.tf similarity index 100% rename from internal/opentf/testdata/validate-required-var/main.tf rename to internal/tofu/testdata/validate-required-var/main.tf diff --git a/internal/opentf/testdata/validate-sensitive-provisioner-config/main.tf b/internal/tofu/testdata/validate-sensitive-provisioner-config/main.tf similarity index 100% rename from internal/opentf/testdata/validate-sensitive-provisioner-config/main.tf rename to internal/tofu/testdata/validate-sensitive-provisioner-config/main.tf diff --git a/internal/opentf/testdata/validate-skipped-pc-empty/main.tf b/internal/tofu/testdata/validate-skipped-pc-empty/main.tf similarity index 100% rename from internal/opentf/testdata/validate-skipped-pc-empty/main.tf rename to internal/tofu/testdata/validate-skipped-pc-empty/main.tf diff --git a/internal/opentf/testdata/validate-targeted/main.tf b/internal/tofu/testdata/validate-targeted/main.tf similarity index 100% rename from internal/opentf/testdata/validate-targeted/main.tf rename to internal/tofu/testdata/validate-targeted/main.tf diff --git a/internal/opentf/testdata/validate-var-no-default-explicit-type/main.tf b/internal/tofu/testdata/validate-var-no-default-explicit-type/main.tf similarity index 100% rename from internal/opentf/testdata/validate-var-no-default-explicit-type/main.tf rename to internal/tofu/testdata/validate-var-no-default-explicit-type/main.tf diff --git a/internal/opentf/testdata/validate-variable-custom-validations-child-sensitive/child/child.tf b/internal/tofu/testdata/validate-variable-custom-validations-child-sensitive/child/child.tf similarity index 100% rename from internal/opentf/testdata/validate-variable-custom-validations-child-sensitive/child/child.tf rename to internal/tofu/testdata/validate-variable-custom-validations-child-sensitive/child/child.tf diff --git a/internal/opentf/testdata/validate-variable-custom-validations-child-sensitive/validate-variable-custom-validations.tf b/internal/tofu/testdata/validate-variable-custom-validations-child-sensitive/validate-variable-custom-validations.tf similarity index 100% rename from internal/opentf/testdata/validate-variable-custom-validations-child-sensitive/validate-variable-custom-validations.tf rename to internal/tofu/testdata/validate-variable-custom-validations-child-sensitive/validate-variable-custom-validations.tf diff --git a/internal/opentf/testdata/validate-variable-custom-validations-child/child/child.tf b/internal/tofu/testdata/validate-variable-custom-validations-child/child/child.tf similarity index 100% rename from internal/opentf/testdata/validate-variable-custom-validations-child/child/child.tf rename to internal/tofu/testdata/validate-variable-custom-validations-child/child/child.tf diff --git a/internal/opentf/testdata/validate-variable-custom-validations-child/validate-variable-custom-validations.tf b/internal/tofu/testdata/validate-variable-custom-validations-child/validate-variable-custom-validations.tf similarity index 100% rename from internal/opentf/testdata/validate-variable-custom-validations-child/validate-variable-custom-validations.tf rename to internal/tofu/testdata/validate-variable-custom-validations-child/validate-variable-custom-validations.tf diff --git a/internal/opentf/testdata/validate-variable-ref/main.tf b/internal/tofu/testdata/validate-variable-ref/main.tf similarity index 100% rename from internal/opentf/testdata/validate-variable-ref/main.tf rename to internal/tofu/testdata/validate-variable-ref/main.tf diff --git a/internal/opentf/testdata/vars-basic-bool/main.tf b/internal/tofu/testdata/vars-basic-bool/main.tf similarity index 100% rename from internal/opentf/testdata/vars-basic-bool/main.tf rename to internal/tofu/testdata/vars-basic-bool/main.tf diff --git a/internal/opentf/testdata/vars-basic/main.tf b/internal/tofu/testdata/vars-basic/main.tf similarity index 100% rename from internal/opentf/testdata/vars-basic/main.tf rename to internal/tofu/testdata/vars-basic/main.tf diff --git a/internal/opentf/transform.go b/internal/tofu/transform.go similarity index 99% rename from internal/opentf/transform.go rename to internal/tofu/transform.go index 6b78eb87fe..8d7763c224 100644 --- a/internal/opentf/transform.go +++ b/internal/tofu/transform.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "log" diff --git a/internal/opentf/transform_attach_config_provider.go b/internal/tofu/transform_attach_config_provider.go similarity index 97% rename from internal/opentf/transform_attach_config_provider.go rename to internal/tofu/transform_attach_config_provider.go index 0322b13ae7..31abed20a1 100644 --- a/internal/opentf/transform_attach_config_provider.go +++ b/internal/tofu/transform_attach_config_provider.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "github.com/opentofu/opentofu/internal/addrs" diff --git a/internal/opentf/transform_attach_config_provider_meta.go b/internal/tofu/transform_attach_config_provider_meta.go similarity index 97% rename from internal/opentf/transform_attach_config_provider_meta.go rename to internal/tofu/transform_attach_config_provider_meta.go index 2c64183b6d..4a8ddfda2a 100644 --- a/internal/opentf/transform_attach_config_provider_meta.go +++ b/internal/tofu/transform_attach_config_provider_meta.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "github.com/opentofu/opentofu/internal/addrs" diff --git a/internal/opentf/transform_attach_config_resource.go b/internal/tofu/transform_attach_config_resource.go similarity index 99% rename from internal/opentf/transform_attach_config_resource.go rename to internal/tofu/transform_attach_config_resource.go index ff3323f009..b93c65117f 100644 --- a/internal/opentf/transform_attach_config_resource.go +++ b/internal/tofu/transform_attach_config_resource.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "log" diff --git a/internal/opentf/transform_attach_schema.go b/internal/tofu/transform_attach_schema.go similarity index 99% rename from internal/opentf/transform_attach_schema.go rename to internal/tofu/transform_attach_schema.go index 7d41008ffc..2a684faee9 100644 --- a/internal/opentf/transform_attach_schema.go +++ b/internal/tofu/transform_attach_schema.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/transform_attach_state.go b/internal/tofu/transform_attach_state.go similarity index 99% rename from internal/opentf/transform_attach_state.go rename to internal/tofu/transform_attach_state.go index 91c8ae0b40..e8c435a984 100644 --- a/internal/opentf/transform_attach_state.go +++ b/internal/tofu/transform_attach_state.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "log" diff --git a/internal/opentf/transform_check.go b/internal/tofu/transform_check.go similarity index 99% rename from internal/opentf/transform_check.go rename to internal/tofu/transform_check.go index 85ccbb494e..228d2e8e1b 100644 --- a/internal/opentf/transform_check.go +++ b/internal/tofu/transform_check.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "log" diff --git a/internal/opentf/transform_check_starter.go b/internal/tofu/transform_check_starter.go similarity index 99% rename from internal/opentf/transform_check_starter.go rename to internal/tofu/transform_check_starter.go index 8268b1096e..11b8ada74b 100644 --- a/internal/opentf/transform_check_starter.go +++ b/internal/tofu/transform_check_starter.go @@ -1,4 +1,4 @@ -package opentf +package tofu import ( "github.com/opentofu/opentofu/internal/addrs" diff --git a/internal/opentf/transform_config.go b/internal/tofu/transform_config.go similarity index 99% rename from internal/opentf/transform_config.go rename to internal/tofu/transform_config.go index 86b7f85928..2f681a3477 100644 --- a/internal/opentf/transform_config.go +++ b/internal/tofu/transform_config.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/transform_config_test.go b/internal/tofu/transform_config_test.go similarity index 99% rename from internal/opentf/transform_config_test.go rename to internal/tofu/transform_config_test.go index f8d777018d..9848b21cda 100644 --- a/internal/opentf/transform_config_test.go +++ b/internal/tofu/transform_config_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "strings" diff --git a/internal/opentf/transform_destroy_cbd.go b/internal/tofu/transform_destroy_cbd.go similarity index 99% rename from internal/opentf/transform_destroy_cbd.go rename to internal/tofu/transform_destroy_cbd.go index f98a90147a..e1b14fab11 100644 --- a/internal/opentf/transform_destroy_cbd.go +++ b/internal/tofu/transform_destroy_cbd.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/transform_destroy_cbd_test.go b/internal/tofu/transform_destroy_cbd_test.go similarity index 99% rename from internal/opentf/transform_destroy_cbd_test.go rename to internal/tofu/transform_destroy_cbd_test.go index f2b2d51dba..734f868387 100644 --- a/internal/opentf/transform_destroy_cbd_test.go +++ b/internal/tofu/transform_destroy_cbd_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "regexp" diff --git a/internal/opentf/transform_destroy_edge.go b/internal/tofu/transform_destroy_edge.go similarity index 99% rename from internal/opentf/transform_destroy_edge.go rename to internal/tofu/transform_destroy_edge.go index a6563b01fd..a65f6ecd8a 100644 --- a/internal/opentf/transform_destroy_edge.go +++ b/internal/tofu/transform_destroy_edge.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "log" diff --git a/internal/opentf/transform_destroy_edge_test.go b/internal/tofu/transform_destroy_edge_test.go similarity index 99% rename from internal/opentf/transform_destroy_edge_test.go rename to internal/tofu/transform_destroy_edge_test.go index 59685801c4..4f970a1e4b 100644 --- a/internal/opentf/transform_destroy_edge_test.go +++ b/internal/tofu/transform_destroy_edge_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/transform_diff.go b/internal/tofu/transform_diff.go similarity index 99% rename from internal/opentf/transform_diff.go rename to internal/tofu/transform_diff.go index 469b1177c0..afbfef2a50 100644 --- a/internal/opentf/transform_diff.go +++ b/internal/tofu/transform_diff.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/transform_diff_test.go b/internal/tofu/transform_diff_test.go similarity index 99% rename from internal/opentf/transform_diff_test.go rename to internal/tofu/transform_diff_test.go index 04c6b3ca5d..15634a2c92 100644 --- a/internal/opentf/transform_diff_test.go +++ b/internal/tofu/transform_diff_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "strings" diff --git a/internal/opentf/transform_expand.go b/internal/tofu/transform_expand.go similarity index 98% rename from internal/opentf/transform_expand.go rename to internal/tofu/transform_expand.go index 19aa1d6885..d8ac6388e0 100644 --- a/internal/opentf/transform_expand.go +++ b/internal/tofu/transform_expand.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu // GraphNodeDynamicExpandable is an interface that nodes can implement // to signal that they can be expanded at eval-time (hence dynamic). diff --git a/internal/opentf/transform_external_reference.go b/internal/tofu/transform_external_reference.go similarity index 97% rename from internal/opentf/transform_external_reference.go rename to internal/tofu/transform_external_reference.go index 25095f2a7d..c185bd801a 100644 --- a/internal/opentf/transform_external_reference.go +++ b/internal/tofu/transform_external_reference.go @@ -1,4 +1,4 @@ -package opentf +package tofu import "github.com/opentofu/opentofu/internal/addrs" diff --git a/internal/opentf/transform_import_state_test.go b/internal/tofu/transform_import_state_test.go similarity index 99% rename from internal/opentf/transform_import_state_test.go rename to internal/tofu/transform_import_state_test.go index e676daf017..bbe4e711ba 100644 --- a/internal/opentf/transform_import_state_test.go +++ b/internal/tofu/transform_import_state_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "strings" diff --git a/internal/opentf/transform_local.go b/internal/tofu/transform_local.go similarity index 98% rename from internal/opentf/transform_local.go rename to internal/tofu/transform_local.go index a1cfc9bd11..35b1271127 100644 --- a/internal/opentf/transform_local.go +++ b/internal/tofu/transform_local.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "github.com/opentofu/opentofu/internal/addrs" diff --git a/internal/opentf/transform_module_expansion.go b/internal/tofu/transform_module_expansion.go similarity index 99% rename from internal/opentf/transform_module_expansion.go rename to internal/tofu/transform_module_expansion.go index 24da320c76..42a83cb25c 100644 --- a/internal/opentf/transform_module_expansion.go +++ b/internal/tofu/transform_module_expansion.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "log" diff --git a/internal/opentf/transform_module_variable.go b/internal/tofu/transform_module_variable.go similarity index 99% rename from internal/opentf/transform_module_variable.go rename to internal/tofu/transform_module_variable.go index 7f0803f696..eab462939d 100644 --- a/internal/opentf/transform_module_variable.go +++ b/internal/tofu/transform_module_variable.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/transform_module_variable_test.go b/internal/tofu/transform_module_variable_test.go similarity index 99% rename from internal/opentf/transform_module_variable_test.go rename to internal/tofu/transform_module_variable_test.go index f07b3e6a0b..76badf9228 100644 --- a/internal/opentf/transform_module_variable_test.go +++ b/internal/tofu/transform_module_variable_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "strings" diff --git a/internal/opentf/transform_orphan_count.go b/internal/tofu/transform_orphan_count.go similarity index 99% rename from internal/opentf/transform_orphan_count.go rename to internal/tofu/transform_orphan_count.go index 29d8058274..be181a3713 100644 --- a/internal/opentf/transform_orphan_count.go +++ b/internal/tofu/transform_orphan_count.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "log" diff --git a/internal/opentf/transform_orphan_count_test.go b/internal/tofu/transform_orphan_count_test.go similarity index 99% rename from internal/opentf/transform_orphan_count_test.go rename to internal/tofu/transform_orphan_count_test.go index 40332a92b2..5da66ebffc 100644 --- a/internal/opentf/transform_orphan_count_test.go +++ b/internal/tofu/transform_orphan_count_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "strings" diff --git a/internal/opentf/transform_orphan_output.go b/internal/tofu/transform_orphan_output.go similarity index 99% rename from internal/opentf/transform_orphan_output.go rename to internal/tofu/transform_orphan_output.go index ee164e715a..5edeaf7395 100644 --- a/internal/opentf/transform_orphan_output.go +++ b/internal/tofu/transform_orphan_output.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "log" diff --git a/internal/opentf/transform_orphan_resource.go b/internal/tofu/transform_orphan_resource.go similarity index 99% rename from internal/opentf/transform_orphan_resource.go rename to internal/tofu/transform_orphan_resource.go index db1a23708a..e3ed4ec8fb 100644 --- a/internal/opentf/transform_orphan_resource.go +++ b/internal/tofu/transform_orphan_resource.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "log" diff --git a/internal/opentf/transform_orphan_resource_test.go b/internal/tofu/transform_orphan_resource_test.go similarity index 99% rename from internal/opentf/transform_orphan_resource_test.go rename to internal/tofu/transform_orphan_resource_test.go index 38db13abd4..4d0ed3f90f 100644 --- a/internal/opentf/transform_orphan_resource_test.go +++ b/internal/tofu/transform_orphan_resource_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/transform_output.go b/internal/tofu/transform_output.go similarity index 99% rename from internal/opentf/transform_output.go rename to internal/tofu/transform_output.go index 54fd56ed4d..e0b5ffd8fa 100644 --- a/internal/opentf/transform_output.go +++ b/internal/tofu/transform_output.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "log" diff --git a/internal/opentf/transform_provider.go b/internal/tofu/transform_provider.go similarity index 99% rename from internal/opentf/transform_provider.go rename to internal/tofu/transform_provider.go index 56b7882657..c2ecc38bab 100644 --- a/internal/opentf/transform_provider.go +++ b/internal/tofu/transform_provider.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/transform_provider_test.go b/internal/tofu/transform_provider_test.go similarity index 99% rename from internal/opentf/transform_provider_test.go rename to internal/tofu/transform_provider_test.go index bfd174f66c..3185ee03e4 100644 --- a/internal/opentf/transform_provider_test.go +++ b/internal/tofu/transform_provider_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/transform_provisioner.go b/internal/tofu/transform_provisioner.go similarity index 95% rename from internal/opentf/transform_provisioner.go rename to internal/tofu/transform_provisioner.go index 4d4671cfa4..566816a451 100644 --- a/internal/opentf/transform_provisioner.go +++ b/internal/tofu/transform_provisioner.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu // GraphNodeProvisionerConsumer is an interface that nodes that require // a provisioner must implement. ProvisionedBy must return the names of the diff --git a/internal/opentf/transform_reference.go b/internal/tofu/transform_reference.go similarity index 99% rename from internal/opentf/transform_reference.go rename to internal/tofu/transform_reference.go index 8ec9786a10..4a5bfa5792 100644 --- a/internal/opentf/transform_reference.go +++ b/internal/tofu/transform_reference.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/transform_reference_test.go b/internal/tofu/transform_reference_test.go similarity index 99% rename from internal/opentf/transform_reference_test.go rename to internal/tofu/transform_reference_test.go index 829aa3e95d..d61e4f7282 100644 --- a/internal/opentf/transform_reference_test.go +++ b/internal/tofu/transform_reference_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "reflect" diff --git a/internal/opentf/transform_removed_modules.go b/internal/tofu/transform_removed_modules.go similarity index 98% rename from internal/opentf/transform_removed_modules.go rename to internal/tofu/transform_removed_modules.go index 4f828ef4ce..0ea0112af4 100644 --- a/internal/opentf/transform_removed_modules.go +++ b/internal/tofu/transform_removed_modules.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "log" diff --git a/internal/opentf/transform_resource_count.go b/internal/tofu/transform_resource_count.go similarity index 98% rename from internal/opentf/transform_resource_count.go rename to internal/tofu/transform_resource_count.go index a27ed30ea0..ce7d165e0a 100644 --- a/internal/opentf/transform_resource_count.go +++ b/internal/tofu/transform_resource_count.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "log" diff --git a/internal/opentf/transform_root.go b/internal/tofu/transform_root.go similarity index 99% rename from internal/opentf/transform_root.go rename to internal/tofu/transform_root.go index 4813d6c77d..f420254e98 100644 --- a/internal/opentf/transform_root.go +++ b/internal/tofu/transform_root.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "github.com/opentofu/opentofu/internal/dag" diff --git a/internal/opentf/transform_root_test.go b/internal/tofu/transform_root_test.go similarity index 99% rename from internal/opentf/transform_root_test.go rename to internal/tofu/transform_root_test.go index 06f79ad793..a1fdd264a3 100644 --- a/internal/opentf/transform_root_test.go +++ b/internal/tofu/transform_root_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "strings" diff --git a/internal/opentf/transform_state.go b/internal/tofu/transform_state.go similarity index 99% rename from internal/opentf/transform_state.go rename to internal/tofu/transform_state.go index d8dd55017d..446ac43b31 100644 --- a/internal/opentf/transform_state.go +++ b/internal/tofu/transform_state.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "log" diff --git a/internal/opentf/transform_targets.go b/internal/tofu/transform_targets.go similarity index 99% rename from internal/opentf/transform_targets.go rename to internal/tofu/transform_targets.go index d942b5a54a..16bf8b1e84 100644 --- a/internal/opentf/transform_targets.go +++ b/internal/tofu/transform_targets.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "log" diff --git a/internal/opentf/transform_targets_test.go b/internal/tofu/transform_targets_test.go similarity index 99% rename from internal/opentf/transform_targets_test.go rename to internal/tofu/transform_targets_test.go index 66b5dcd9f8..75d7f655d7 100644 --- a/internal/opentf/transform_targets_test.go +++ b/internal/tofu/transform_targets_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "strings" diff --git a/internal/opentf/transform_transitive_reduction.go b/internal/tofu/transform_transitive_reduction.go similarity index 97% rename from internal/opentf/transform_transitive_reduction.go rename to internal/tofu/transform_transitive_reduction.go index ca559eb7f4..22cc4c72a2 100644 --- a/internal/opentf/transform_transitive_reduction.go +++ b/internal/tofu/transform_transitive_reduction.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu // TransitiveReductionTransformer is a GraphTransformer that // finds the transitive reduction of the graph. For a definition of diff --git a/internal/opentf/transform_transitive_reduction_test.go b/internal/tofu/transform_transitive_reduction_test.go similarity index 99% rename from internal/opentf/transform_transitive_reduction_test.go rename to internal/tofu/transform_transitive_reduction_test.go index 9858d6eae2..297f1d3a1d 100644 --- a/internal/opentf/transform_transitive_reduction_test.go +++ b/internal/tofu/transform_transitive_reduction_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "strings" diff --git a/internal/opentf/transform_variable.go b/internal/tofu/transform_variable.go similarity index 98% rename from internal/opentf/transform_variable.go rename to internal/tofu/transform_variable.go index fcede0aafd..ba012ac426 100644 --- a/internal/opentf/transform_variable.go +++ b/internal/tofu/transform_variable.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "github.com/opentofu/opentofu/internal/addrs" diff --git a/internal/opentf/transform_vertex.go b/internal/tofu/transform_vertex.go similarity index 98% rename from internal/opentf/transform_vertex.go rename to internal/tofu/transform_vertex.go index 8a6bae1ba4..7ee3862317 100644 --- a/internal/opentf/transform_vertex.go +++ b/internal/tofu/transform_vertex.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/transform_vertex_test.go b/internal/tofu/transform_vertex_test.go similarity index 98% rename from internal/opentf/transform_vertex_test.go rename to internal/tofu/transform_vertex_test.go index d1ca2f368d..fd0266bad0 100644 --- a/internal/opentf/transform_vertex_test.go +++ b/internal/tofu/transform_vertex_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "strings" diff --git a/internal/opentf/ui_input.go b/internal/tofu/ui_input.go similarity index 98% rename from internal/opentf/ui_input.go rename to internal/tofu/ui_input.go index a1a033248b..996bec18c6 100644 --- a/internal/opentf/ui_input.go +++ b/internal/tofu/ui_input.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import "context" diff --git a/internal/opentf/ui_input_mock.go b/internal/tofu/ui_input_mock.go similarity index 97% rename from internal/opentf/ui_input_mock.go rename to internal/tofu/ui_input_mock.go index 3c25109246..7952379ac4 100644 --- a/internal/opentf/ui_input_mock.go +++ b/internal/tofu/ui_input_mock.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import "context" diff --git a/internal/opentf/ui_input_prefix.go b/internal/tofu/ui_input_prefix.go similarity index 97% rename from internal/opentf/ui_input_prefix.go rename to internal/tofu/ui_input_prefix.go index 368a98d2bc..634a926d76 100644 --- a/internal/opentf/ui_input_prefix.go +++ b/internal/tofu/ui_input_prefix.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "context" diff --git a/internal/opentf/ui_input_prefix_test.go b/internal/tofu/ui_input_prefix_test.go similarity index 97% rename from internal/opentf/ui_input_prefix_test.go rename to internal/tofu/ui_input_prefix_test.go index 200522fffc..11bdc98d1e 100644 --- a/internal/opentf/ui_input_prefix_test.go +++ b/internal/tofu/ui_input_prefix_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "context" diff --git a/internal/opentf/ui_output.go b/internal/tofu/ui_output.go similarity index 93% rename from internal/opentf/ui_output.go rename to internal/tofu/ui_output.go index 796de2fa0d..1ae3a92c0e 100644 --- a/internal/opentf/ui_output.go +++ b/internal/tofu/ui_output.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu // UIOutput is the interface that must be implemented to output // data to the end user. diff --git a/internal/opentf/ui_output_callback.go b/internal/tofu/ui_output_callback.go similarity index 92% rename from internal/opentf/ui_output_callback.go rename to internal/tofu/ui_output_callback.go index ed55a539c3..82a0bd9c12 100644 --- a/internal/opentf/ui_output_callback.go +++ b/internal/tofu/ui_output_callback.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu type CallbackUIOutput struct { OutputFn func(string) diff --git a/internal/opentf/ui_output_callback_test.go b/internal/tofu/ui_output_callback_test.go similarity index 92% rename from internal/opentf/ui_output_callback_test.go rename to internal/tofu/ui_output_callback_test.go index de46218a72..8e170ef515 100644 --- a/internal/opentf/ui_output_callback_test.go +++ b/internal/tofu/ui_output_callback_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "testing" diff --git a/internal/opentf/ui_output_mock.go b/internal/tofu/ui_output_mock.go similarity index 96% rename from internal/opentf/ui_output_mock.go rename to internal/tofu/ui_output_mock.go index ea43300a87..4ecc6c9bc1 100644 --- a/internal/opentf/ui_output_mock.go +++ b/internal/tofu/ui_output_mock.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import "sync" diff --git a/internal/opentf/ui_output_mock_test.go b/internal/tofu/ui_output_mock_test.go similarity index 91% rename from internal/opentf/ui_output_mock_test.go rename to internal/tofu/ui_output_mock_test.go index 76eec4bb3c..b15372c1a1 100644 --- a/internal/opentf/ui_output_mock_test.go +++ b/internal/tofu/ui_output_mock_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "testing" diff --git a/internal/opentf/ui_output_provisioner.go b/internal/tofu/ui_output_provisioner.go similarity index 97% rename from internal/opentf/ui_output_provisioner.go rename to internal/tofu/ui_output_provisioner.go index 9a72041b6e..764b500f22 100644 --- a/internal/opentf/ui_output_provisioner.go +++ b/internal/tofu/ui_output_provisioner.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "github.com/opentofu/opentofu/internal/addrs" diff --git a/internal/opentf/ui_output_provisioner_test.go b/internal/tofu/ui_output_provisioner_test.go similarity index 98% rename from internal/opentf/ui_output_provisioner_test.go rename to internal/tofu/ui_output_provisioner_test.go index d1e4791c11..80dd501109 100644 --- a/internal/opentf/ui_output_provisioner_test.go +++ b/internal/tofu/ui_output_provisioner_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "testing" diff --git a/internal/opentf/update_state_hook.go b/internal/tofu/update_state_hook.go similarity index 97% rename from internal/opentf/update_state_hook.go rename to internal/tofu/update_state_hook.go index 94d9504b38..182d32e66d 100644 --- a/internal/opentf/update_state_hook.go +++ b/internal/tofu/update_state_hook.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu // updateStateHook calls the PostStateUpdate hook with the current state. func updateStateHook(ctx EvalContext) error { diff --git a/internal/opentf/update_state_hook_test.go b/internal/tofu/update_state_hook_test.go similarity index 98% rename from internal/opentf/update_state_hook_test.go rename to internal/tofu/update_state_hook_test.go index 3f4eee95a3..42502fe207 100644 --- a/internal/opentf/update_state_hook_test.go +++ b/internal/tofu/update_state_hook_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "testing" diff --git a/internal/opentf/upgrade_resource_state.go b/internal/tofu/upgrade_resource_state.go similarity index 99% rename from internal/opentf/upgrade_resource_state.go rename to internal/tofu/upgrade_resource_state.go index b49bb1d910..dfb721e213 100644 --- a/internal/opentf/upgrade_resource_state.go +++ b/internal/tofu/upgrade_resource_state.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "encoding/json" diff --git a/internal/opentf/upgrade_resource_state_test.go b/internal/tofu/upgrade_resource_state_test.go similarity index 99% rename from internal/opentf/upgrade_resource_state_test.go rename to internal/tofu/upgrade_resource_state_test.go index 29f1506553..462b3ab279 100644 --- a/internal/opentf/upgrade_resource_state_test.go +++ b/internal/tofu/upgrade_resource_state_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "reflect" diff --git a/internal/opentf/util.go b/internal/tofu/util.go similarity index 99% rename from internal/opentf/util.go rename to internal/tofu/util.go index 019ccc9019..3c84442858 100644 --- a/internal/opentf/util.go +++ b/internal/tofu/util.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "sort" diff --git a/internal/opentf/util_test.go b/internal/tofu/util_test.go similarity index 99% rename from internal/opentf/util_test.go rename to internal/tofu/util_test.go index 75fab9c43f..d2cd455935 100644 --- a/internal/opentf/util_test.go +++ b/internal/tofu/util_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/validate_selfref.go b/internal/tofu/validate_selfref.go similarity index 99% rename from internal/opentf/validate_selfref.go rename to internal/tofu/validate_selfref.go index 27eda1de5a..83085fa9e7 100644 --- a/internal/opentf/validate_selfref.go +++ b/internal/tofu/validate_selfref.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/validate_selfref_test.go b/internal/tofu/validate_selfref_test.go similarity index 99% rename from internal/opentf/validate_selfref_test.go rename to internal/tofu/validate_selfref_test.go index a0fbe5b254..034fb61653 100644 --- a/internal/opentf/validate_selfref_test.go +++ b/internal/tofu/validate_selfref_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/valuesourcetype_string.go b/internal/tofu/valuesourcetype_string.go similarity index 99% rename from internal/opentf/valuesourcetype_string.go rename to internal/tofu/valuesourcetype_string.go index 026d364d46..45b4c9caad 100644 --- a/internal/opentf/valuesourcetype_string.go +++ b/internal/tofu/valuesourcetype_string.go @@ -1,6 +1,6 @@ // Code generated by "stringer -type ValueSourceType"; DO NOT EDIT. -package opentf +package tofu import "strconv" diff --git a/internal/opentf/variables.go b/internal/tofu/variables.go similarity index 99% rename from internal/opentf/variables.go rename to internal/tofu/variables.go index 6ee97ec19c..5869c5407c 100644 --- a/internal/opentf/variables.go +++ b/internal/tofu/variables.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "fmt" diff --git a/internal/opentf/variables_test.go b/internal/tofu/variables_test.go similarity index 99% rename from internal/opentf/variables_test.go rename to internal/tofu/variables_test.go index 4a57fd2906..e1cadd42b8 100644 --- a/internal/opentf/variables_test.go +++ b/internal/tofu/variables_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "testing" diff --git a/internal/opentf/version_required.go b/internal/tofu/version_required.go similarity index 98% rename from internal/opentf/version_required.go rename to internal/tofu/version_required.go index b7a0e09db7..99f1092a21 100644 --- a/internal/opentf/version_required.go +++ b/internal/tofu/version_required.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package opentf +package tofu import ( "github.com/opentofu/opentofu/internal/tfdiags" diff --git a/internal/opentf/walkoperation_string.go b/internal/tofu/walkoperation_string.go similarity index 98% rename from internal/opentf/walkoperation_string.go rename to internal/tofu/walkoperation_string.go index a47fc9a8bc..e5d49ffe55 100644 --- a/internal/opentf/walkoperation_string.go +++ b/internal/tofu/walkoperation_string.go @@ -1,6 +1,6 @@ // Code generated by "stringer -type=walkOperation graph_walk_operation.go"; DO NOT EDIT. -package opentf +package tofu import "strconv"