From ffe056bacb9f2cf403fa3b6b894c5fbe1fa850a7 Mon Sep 17 00:00:00 2001 From: Martin Atkins Date: Mon, 17 May 2021 12:07:38 -0700 Subject: [PATCH] Move command/ to internal/command/ This is part of a general effort to move all of Terraform's non-library package surface under internal in order to reinforce that these are for internal use within Terraform only. If you were previously importing packages under this prefix into an external codebase, you could pin to an earlier release tag as an interim solution until you've make a plan to achieve the same functionality some other way. --- checkpoint.go | 4 ++-- commands.go | 8 ++++---- internal/backend/backend.go | 4 ++-- internal/backend/local/backend.go | 2 +- internal/backend/local/backend_apply.go | 2 +- internal/backend/local/backend_apply_test.go | 6 +++--- internal/backend/local/backend_local_test.go | 6 +++--- internal/backend/local/backend_plan_test.go | 6 +++--- internal/backend/local/backend_refresh_test.go | 6 +++--- internal/backend/remote/backend_apply_test.go | 6 +++--- internal/backend/remote/backend_context_test.go | 6 +++--- internal/backend/remote/backend_plan_test.go | 6 +++--- {command => internal/command}/apply.go | 4 ++-- {command => internal/command}/apply_destroy_test.go | 0 {command => internal/command}/apply_test.go | 2 +- {command => internal/command}/arguments/apply.go | 0 {command => internal/command}/arguments/apply_test.go | 0 {command => internal/command}/arguments/default.go | 0 {command => internal/command}/arguments/extended.go | 0 {command => internal/command}/arguments/flags.go | 0 {command => internal/command}/arguments/output.go | 0 {command => internal/command}/arguments/output_test.go | 0 {command => internal/command}/arguments/plan.go | 0 {command => internal/command}/arguments/plan_test.go | 0 {command => internal/command}/arguments/refresh.go | 0 .../command}/arguments/refresh_test.go | 0 {command => internal/command}/arguments/test.go | 0 {command => internal/command}/arguments/test_test.go | 0 {command => internal/command}/arguments/types.go | 0 {command => internal/command}/arguments/validate.go | 0 .../command}/arguments/validate_test.go | 0 {command => internal/command}/arguments/view.go | 0 {command => internal/command}/arguments/view_test.go | 0 {command => internal/command}/autocomplete.go | 0 {command => internal/command}/autocomplete_test.go | 0 {command => internal/command}/cli_ui.go | 0 {command => internal/command}/cli_ui_test.go | 0 {command => internal/command}/cliconfig/cliconfig.go | 0 .../command}/cliconfig/cliconfig_test.go | 0 {command => internal/command}/cliconfig/config_unix.go | 0 .../command}/cliconfig/config_windows.go | 0 {command => internal/command}/cliconfig/credentials.go | 0 .../command}/cliconfig/credentials_test.go | 0 .../command}/cliconfig/provider_installation.go | 0 .../command}/cliconfig/provider_installation_test.go | 0 .../command}/cliconfig/testdata/config | 0 .../command}/cliconfig/testdata/config-env | 0 .../command}/cliconfig/testdata/credentials | 0 {command => internal/command}/cliconfig/testdata/hosts | 0 .../command}/cliconfig/testdata/provider-installation | 0 .../cliconfig/testdata/provider-installation-errors | 0 .../cliconfig/testdata/provider-installation.json | 0 {command => internal/command}/clistate/local_state.go | 0 .../command}/clistate/local_state_lock_unix.go | 0 .../command}/clistate/local_state_lock_windows.go | 0 {command => internal/command}/clistate/state.go | 2 +- {command => internal/command}/clistate/state_test.go | 4 ++-- {command => internal/command}/command.go | 0 {command => internal/command}/command_test.go | 2 +- {command => internal/command}/console.go | 0 {command => internal/command}/console_interactive.go | 0 .../command}/console_interactive_solaris.go | 0 {command => internal/command}/console_test.go | 0 {command => internal/command}/e2etest/.gitignore | 0 .../command}/e2etest/automation_test.go | 0 {command => internal/command}/e2etest/doc.go | 0 {command => internal/command}/e2etest/init_test.go | 0 {command => internal/command}/e2etest/main_test.go | 0 {command => internal/command}/e2etest/make-archive.sh | 0 {command => internal/command}/e2etest/primary_test.go | 0 .../command}/e2etest/provider_dev_test.go | 0 .../command}/e2etest/provider_plugin_test.go | 0 .../command}/e2etest/providers_mirror_test.go | 0 .../command}/e2etest/provisioner_plugin_test.go | 0 .../command}/e2etest/provisioner_test.go | 0 .../command}/e2etest/remote_state_test.go | 0 {command => internal/command}/e2etest/strip_ansi.go | 0 .../e2etest/testdata/chdir-option/subdir/main.tf | 0 .../custom-provider-install-method/cliconfig.tfrc | 0 .../custom-provider-install-method/cliconfig.tfrc.json | 0 .../1.2.0/os_arch/terraform-provider-happycloud_v1.2.0 | 0 .../testdata/custom-provider-install-method/main.tf | 0 .../command}/e2etest/testdata/empty/.exists | 0 .../e2etest/testdata/full-workflow-null/main.tf | 0 .../e2etest/testdata/local-only-provider/main.tf | 0 .../1.2.0/os_arch/terraform-provider-happycloud_v1.2.0 | 0 .../os_arch/terraform-provider-template_v2.1.0_x4 | 0 .../command}/e2etest/testdata/plugin-cache/main.tf | 0 .../testdata/provider-dev-override/pkgdir/.exists | 0 .../provider-dev-override/provider-dev-override.tf | 0 .../testdata/provider-not-found-non-default/main.tf | 0 .../e2etest/testdata/provider-not-found/main.tf | 0 .../command}/e2etest/testdata/provider-plugin/main.tf | 0 .../e2etest/testdata/provider-warnings/main.tf | 0 .../e2etest/testdata/provisioner-plugin/main.tf | 0 .../command}/e2etest/testdata/provisioner/main.tf | 0 .../e2etest/testdata/template-provider/main.tf | 0 .../e2etest/testdata/terraform-provider/main.tf | 0 .../e2etest/testdata/terraform-provider/test.tfstate | 0 .../terraform-providers-mirror.tf | 0 .../command}/e2etest/testdata/test-provider/main.tf | 0 .../e2etest/testdata/vendored-provider/main.tf | 0 .../1.0.0+local/os_arch/terraform-provider-null_v1.0.0 | 0 .../command}/e2etest/unmanaged_test.go | 0 {command => internal/command}/e2etest/version_test.go | 0 {command => internal/command}/flag_kv.go | 0 {command => internal/command}/flag_kv_test.go | 0 {command => internal/command}/fmt.go | 0 {command => internal/command}/fmt_test.go | 0 {command => internal/command}/format/diagnostic.go | 2 +- .../command}/format/diagnostic_test.go | 2 +- {command => internal/command}/format/diff.go | 0 {command => internal/command}/format/diff_test.go | 0 {command => internal/command}/format/format.go | 0 {command => internal/command}/format/object_id.go | 0 {command => internal/command}/format/object_id_test.go | 0 {command => internal/command}/format/state.go | 0 {command => internal/command}/format/state_test.go | 0 {command => internal/command}/format/trivia.go | 0 {command => internal/command}/get.go | 0 {command => internal/command}/get_test.go | 0 {command => internal/command}/graph.go | 0 {command => internal/command}/graph_test.go | 0 {command => internal/command}/hook_module_install.go | 0 {command => internal/command}/import.go | 4 ++-- {command => internal/command}/import_test.go | 0 {command => internal/command}/init.go | 0 {command => internal/command}/init_test.go | 0 {command => internal/command}/jsonconfig/config.go | 0 {command => internal/command}/jsonconfig/doc.go | 0 {command => internal/command}/jsonconfig/expression.go | 0 .../command}/jsonconfig/expression_test.go | 0 {command => internal/command}/jsonplan/doc.go | 0 {command => internal/command}/jsonplan/module.go | 0 {command => internal/command}/jsonplan/plan.go | 4 ++-- {command => internal/command}/jsonplan/plan_test.go | 0 {command => internal/command}/jsonplan/resource.go | 0 {command => internal/command}/jsonplan/values.go | 0 {command => internal/command}/jsonplan/values_test.go | 0 .../command}/jsonprovider/attribute.go | 0 .../command}/jsonprovider/attribute_test.go | 0 {command => internal/command}/jsonprovider/block.go | 0 .../command}/jsonprovider/block_test.go | 0 {command => internal/command}/jsonprovider/doc.go | 0 {command => internal/command}/jsonprovider/provider.go | 0 .../command}/jsonprovider/provider_test.go | 0 {command => internal/command}/jsonprovider/schema.go | 0 .../command}/jsonprovider/schema_test.go | 0 {command => internal/command}/jsonstate/doc.go | 0 {command => internal/command}/jsonstate/state.go | 0 {command => internal/command}/jsonstate/state_test.go | 0 {command => internal/command}/login.go | 2 +- {command => internal/command}/login_test.go | 8 ++++---- {command => internal/command}/logout.go | 2 +- {command => internal/command}/logout_test.go | 2 +- {command => internal/command}/meta.go | 8 ++++---- {command => internal/command}/meta_backend.go | 6 +++--- {command => internal/command}/meta_backend_migrate.go | 6 +++--- {command => internal/command}/meta_backend_test.go | 0 {command => internal/command}/meta_config.go | 0 {command => internal/command}/meta_dependencies.go | 0 {command => internal/command}/meta_new.go | 0 {command => internal/command}/meta_providers.go | 0 {command => internal/command}/meta_test.go | 0 {command => internal/command}/meta_vars.go | 0 {command => internal/command}/output.go | 4 ++-- {command => internal/command}/output_test.go | 0 {command => internal/command}/plan.go | 4 ++-- {command => internal/command}/plan_test.go | 0 {command => internal/command}/plugins.go | 0 {command => internal/command}/plugins_lock.go | 0 {command => internal/command}/plugins_lock_test.go | 0 {command => internal/command}/plugins_test.go | 0 {command => internal/command}/providers.go | 0 {command => internal/command}/providers_lock.go | 0 {command => internal/command}/providers_mirror.go | 0 {command => internal/command}/providers_schema.go | 2 +- {command => internal/command}/providers_schema_test.go | 0 {command => internal/command}/providers_test.go | 0 {command => internal/command}/push.go | 0 {command => internal/command}/refresh.go | 4 ++-- {command => internal/command}/refresh_test.go | 0 {command => internal/command}/show.go | 10 +++++----- {command => internal/command}/show_test.go | 0 {command => internal/command}/state_command.go | 0 {command => internal/command}/state_list.go | 0 {command => internal/command}/state_list_test.go | 0 {command => internal/command}/state_meta.go | 0 {command => internal/command}/state_mv.go | 6 +++--- {command => internal/command}/state_mv_test.go | 0 {command => internal/command}/state_pull.go | 0 {command => internal/command}/state_pull_test.go | 0 {command => internal/command}/state_push.go | 6 +++--- {command => internal/command}/state_push_test.go | 0 .../command}/state_replace_provider.go | 6 +++--- .../command}/state_replace_provider_test.go | 0 {command => internal/command}/state_rm.go | 6 +++--- {command => internal/command}/state_rm_test.go | 0 {command => internal/command}/state_show.go | 2 +- {command => internal/command}/state_show_test.go | 0 {command => internal/command}/state_test.go | 0 {command => internal/command}/taint.go | 6 +++--- {command => internal/command}/taint_test.go | 0 {command => internal/command}/test.go | 6 +++--- {command => internal/command}/test_test.go | 2 +- .../command}/testdata/apply-config-invalid/main.tf | 0 .../command}/testdata/apply-destroy-targeted/main.tf | 0 .../command}/testdata/apply-error/main.tf | 0 .../command}/testdata/apply-input-partial/main.tf | 0 .../command}/testdata/apply-input/main.tf | 0 .../command}/testdata/apply-plan-no-module/main.tf | 0 .../command}/testdata/apply-replace/main.tf | 0 .../command}/testdata/apply-sensitive-output/main.tf | 0 .../command}/testdata/apply-shutdown/main.tf | 0 .../command}/testdata/apply-targeted/main.tf | 0 .../command}/testdata/apply-terraform-env/main.tf | 0 .../command}/testdata/apply-vars/main.tf | 0 {command => internal/command}/testdata/apply/main.tf | 0 .../command}/testdata/apply/output.jsonlog | 0 .../.terraform/terraform.tfstate | 0 .../local-state.tfstate | 0 .../backend-change-multi-default-to-single/main.tf | 0 .../.terraform/terraform.tfstate | 0 .../backend-change-multi-to-multi/local-state.tfstate | 0 .../testdata/backend-change-multi-to-multi/main.tf | 0 .../terraform.tfstate.d/env2/terraform.tfstate | 0 .../.terraform/terraform.tfstate | 0 .../local-state.tfstate | 0 .../main.tf | 0 .../terraform.tfstate.d/env2/terraform.tfstate | 0 .../.terraform/terraform.tfstate | 0 .../main.tf | 0 .../terraform.tfstate.d/env2/terraform.tfstate | 0 .../.terraform/environment | 0 .../.terraform/terraform.tfstate | 0 .../testdata/backend-change-multi-to-single/main.tf | 0 .../terraform.tfstate.d/env1/terraform.tfstate | 0 .../terraform.tfstate.d/env2/terraform.tfstate | 0 .../.terraform/terraform.tfstate | 0 .../local-state.tfstate | 0 .../testdata/backend-change-single-to-single/main.tf | 0 .../backend-change/.terraform/terraform.tfstate | 0 .../testdata/backend-change/local-state.tfstate | 0 .../command}/testdata/backend-change/main.tf | 0 .../.terraform/terraform.tfstate | 0 .../local-state-old.tfstate | 0 .../backend-changed-with-legacy/local-state.tfstate | 0 .../testdata/backend-changed-with-legacy/main.tf | 0 .../testdata/backend-from-state/terraform.tfstate | 0 .../command}/testdata/backend-inmem-locked/main.tf | 0 .../command}/testdata/backend-new-interp/main.tf | 0 .../backend-new-legacy/.terraform/terraform.tfstate | 0 .../backend-new-legacy/local-state-old.tfstate | 0 .../command}/testdata/backend-new-legacy/main.tf | 0 .../backend-new-migrate-existing/local-state.tfstate | 0 .../testdata/backend-new-migrate-existing/main.tf | 0 .../backend-new-migrate-existing/terraform.tfstate | 0 .../command}/testdata/backend-new-migrate/main.tf | 0 .../testdata/backend-new-migrate/terraform.tfstate | 0 .../command}/testdata/backend-new/main.tf | 0 .../.terraform/terraform.tfstate | 0 .../local-state.tfstate | 0 .../testdata/backend-plan-backend-empty-config/main.tf | 0 .../testdata/backend-plan-backend-empty/readme.txt | 0 .../backend-plan-backend-match/local-state.tfstate | 0 .../testdata/backend-plan-backend-match/readme.txt | 0 .../backend-plan-backend-mismatch/local-state.tfstate | 0 .../backend-plan-legacy-data/local-state.tfstate | 0 .../command}/testdata/backend-plan-legacy-data/main.tf | 0 .../testdata/backend-plan-legacy-data/state.tfstate | 0 .../command}/testdata/backend-plan-legacy/readme.txt | 0 .../command}/testdata/backend-plan-local-match/main.tf | 0 .../backend-plan-local-match/terraform.tfstate | 0 .../backend-plan-local-mismatch-lineage/main.tf | 0 .../terraform.tfstate | 0 .../command}/testdata/backend-plan-local-newer/main.tf | 0 .../backend-plan-local-newer/terraform.tfstate | 0 .../command}/testdata/backend-plan-local/main.tf | 0 .../.terraform/terraform.tfstate | 0 .../local-state-old.tfstate | 0 .../backend-unchanged-with-legacy/local-state.tfstate | 0 .../testdata/backend-unchanged-with-legacy/main.tf | 0 .../backend-unchanged/.terraform/terraform.tfstate | 0 .../testdata/backend-unchanged/local-state.tfstate | 0 .../command}/testdata/backend-unchanged/main.tf | 0 .../.terraform/terraform.tfstate | 0 .../backend-unset-with-legacy/local-state-old.tfstate | 0 .../backend-unset-with-legacy/local-state.tfstate | 0 .../testdata/backend-unset-with-legacy/main.tf | 0 .../backend-unset/.terraform/terraform.tfstate | 0 .../testdata/backend-unset/local-state.tfstate | 0 .../command}/testdata/backend-unset/main.tf | 0 {command => internal/command}/testdata/empty-file | 0 {command => internal/command}/testdata/empty/README | 0 .../command}/testdata/fmt/general_in.tf | 0 .../command}/testdata/fmt/general_out.tf | 0 .../command}/testdata/fmt/variable_type_in.tf | 0 .../command}/testdata/fmt/variable_type_out.tf | 0 {command => internal/command}/testdata/get/foo/main.tf | 0 {command => internal/command}/testdata/get/main.tf | 0 {command => internal/command}/testdata/graph/main.tf | 0 .../testdata/import-missing-resource-config/main.tf | 0 .../import-module-input-variable/child/main.tf | 0 .../testdata/import-module-input-variable/main.tf | 0 .../import-module-input-variable/terraform.tfvars | 0 .../testdata/import-module-var-file/child/main.tf | 0 .../command}/testdata/import-module-var-file/main.tf | 0 .../testdata/import-module-var-file/terraform.tfvars | 0 .../command}/testdata/import-provider-aliased/main.tf | 0 .../testdata/import-provider-datasource/main.tf | 0 .../command}/testdata/import-provider-implicit/main.tf | 0 .../command}/testdata/import-provider-invalid/main.tf | 0 .../testdata/import-provider-remote-state/main.tf | 0 .../testdata/import-provider-var-default/main.tf | 0 .../import-provider-var-default/terraform.tfvars | 0 .../testdata/import-provider-var-file/blah.tfvars | 0 .../command}/testdata/import-provider-var-file/main.tf | 0 .../command}/testdata/import-provider-var/main.tf | 0 .../command}/testdata/import-provider/main.tf | 0 .../.terraform/terraform.tfstate | 0 .../init-backend-config-file-change/input.config | 0 .../testdata/init-backend-config-file-change/main.tf | 0 .../testdata/init-backend-config-file/backend.config | 0 .../testdata/init-backend-config-file/input.config | 0 .../testdata/init-backend-config-file/invalid.config | 0 .../command}/testdata/init-backend-config-file/main.tf | 0 .../command}/testdata/init-backend-config-kv/main.tf | 0 .../command}/testdata/init-backend-empty/main.tf | 0 .../command}/testdata/init-backend/main.tf | 0 .../testdata/init-check-required-version/main.tf | 0 .../dicerolls/terraform-random-bar-1.0.0/main.tf | 0 .../.terraform/modules/modules.json | 0 .../init-get-provider-detected-legacy/child/main.tf | 0 .../testdata/init-get-provider-detected-legacy/main.tf | 0 .../testdata/init-get-provider-invalid-package/main.tf | 0 .../init-get-provider-legacy-from-state/main.tf | 0 .../terraform.tfstate | 0 .../command}/testdata/init-get-provider-source/main.tf | 0 .../command}/testdata/init-get-providers/main.tf | 0 .../command}/testdata/init-get/foo/main.tf | 0 .../command}/testdata/init-get/main.tf | 0 .../command}/testdata/init-internal-invalid/main.tf | 0 .../command}/testdata/init-internal/main.tf | 0 .../test/b/1.1.0/os_arch/terraform-provider-b | 0 .../hashicorp/c/2.0.0/os_arch/terraform-provider-c | 0 .../testdata/init-legacy-provider-cache/versions.tf | 0 .../command}/testdata/init-legacy-rc/main.tf | 0 .../init-provider-lock-file-readonly-add/main.tf | 0 .../command}/testdata/init-provider-lock-file/main.tf | 0 .../command}/testdata/init-providers-lock/main.tf | 0 .../command}/testdata/init-required-providers/main.tf | 0 {command => internal/command}/testdata/init/hello.tf | 0 .../command}/testdata/inmem-backend/main.tf | 0 .../command}/testdata/login-oauth-server/main.go | 4 ++-- .../testdata/login-oauth-server/oauthserver.go | 0 .../command}/testdata/login-tfe-server/tfeserver.go | 0 .../testdata/modules/.terraform/modules/modules.json | 0 .../command}/testdata/modules/child/main.tf | 0 {command => internal/command}/testdata/modules/main.tf | 0 .../command}/testdata/modules/terraform.tfstate | 0 .../command}/testdata/parallelism/main.tf | 0 .../command}/testdata/plan-emptydiff/main.tf | 0 .../command}/testdata/plan-invalid/main.tf | 0 .../command}/testdata/plan-out-backend-legacy/main.tf | 0 .../command}/testdata/plan-out-backend/main.tf | 0 .../command}/testdata/plan-replace/main.tf | 0 .../command}/testdata/plan-vars/main.tf | 0 {command => internal/command}/testdata/plan/main.tf | 0 .../testdata/providers-schema/basic/output.json | 0 .../testdata/providers-schema/basic/provider.tf | 0 .../command}/testdata/providers-schema/empty/main.tf | 0 .../testdata/providers-schema/empty/output.json | 0 .../testdata/providers-schema/required/output.json | 0 .../testdata/providers-schema/required/provider.tf | 0 .../command}/testdata/providers/basic/main.tf | 0 .../command}/testdata/providers/modules/child/main.tf | 0 .../command}/testdata/providers/modules/main.tf | 0 .../command}/testdata/providers/state/main.tf | 0 .../testdata/providers/state/terraform.tfstate | 0 .../command}/testdata/push-backend-new/main.tf | 0 .../command}/testdata/push-input-partial/main.tf | 0 .../command}/testdata/push-input/main.tf | 0 .../command}/testdata/push-no-remote/main.tf | 0 .../command}/testdata/push-no-upload/child/main.tf | 0 .../command}/testdata/push-no-upload/main.tf | 0 .../command}/testdata/push-tfvars/main.tf | 0 .../command}/testdata/push-tfvars/terraform.tfvars | 0 {command => internal/command}/testdata/push/main.tf | 0 .../command}/testdata/refresh-empty/main.tf | 0 .../command}/testdata/refresh-output/main.tf | 0 .../command}/testdata/refresh-targeted/main.tf | 0 .../command}/testdata/refresh-unset-var/main.tf | 0 .../command}/testdata/refresh-var/main.tf | 0 {command => internal/command}/testdata/refresh/main.tf | 0 .../command}/testdata/show-json-sensitive/main.tf | 0 .../command}/testdata/show-json-sensitive/output.json | 0 .../testdata/show-json-state/basic/output.json | 0 .../testdata/show-json-state/basic/terraform.tfstate | 0 .../testdata/show-json-state/empty/output.json | 0 .../testdata/show-json-state/modules/bar/main.tf | 0 .../testdata/show-json-state/modules/foo/main.tf | 0 .../command}/testdata/show-json-state/modules/main.tf | 0 .../testdata/show-json-state/modules/output.json | 0 .../testdata/show-json-state/modules/terraform.tfstate | 0 .../show-json-state/sensitive-variables/output.json | 0 .../sensitive-variables/terraform.tfstate | 0 .../command}/testdata/show-json/basic-create/main.tf | 0 .../testdata/show-json/basic-create/output.json | 0 .../command}/testdata/show-json/basic-delete/main.tf | 0 .../testdata/show-json/basic-delete/output.json | 0 .../testdata/show-json/basic-delete/terraform.tfstate | 0 .../command}/testdata/show-json/basic-update/main.tf | 0 .../testdata/show-json/basic-update/output.json | 0 .../testdata/show-json/basic-update/terraform.tfstate | 0 .../testdata/show-json/module-depends-on/foo/main.tf | 0 .../testdata/show-json/module-depends-on/main.tf | 0 .../testdata/show-json/module-depends-on/output.json | 0 .../command}/testdata/show-json/modules/bar/main.tf | 0 .../command}/testdata/show-json/modules/foo/main.tf | 0 .../command}/testdata/show-json/modules/main.tf | 0 .../command}/testdata/show-json/modules/output.json | 0 .../testdata/show-json/multi-resource-update/main.tf | 0 .../show-json/multi-resource-update/output.json | 0 .../show-json/multi-resource-update/terraform.tfstate | 0 .../testdata/show-json/nested-module-error/main.tf | 0 .../show-json/nested-module-error/modules/main.tf | 0 .../nested-module-error/modules/more-modules/main.tf | 0 .../command}/testdata/show-json/nested-modules/main.tf | 0 .../testdata/show-json/nested-modules/modules/main.tf | 0 .../nested-modules/modules/more-modules/main.tf | 0 .../testdata/show-json/nested-modules/output.json | 0 .../show-json/provider-version-no-config/main.tf | 0 .../show-json/provider-version-no-config/output.json | 0 .../testdata/show-json/provider-version/main.tf | 0 .../testdata/show-json/provider-version/output.json | 0 .../testdata/show-json/requires-replace/main.tf | 0 .../testdata/show-json/requires-replace/output.json | 0 .../show-json/requires-replace/terraform.tfstate | 0 .../testdata/show-json/sensitive-values/main.tf | 0 .../testdata/show-json/sensitive-values/output.json | 0 {command => internal/command}/testdata/show/main.tf | 0 .../.terraform/terraform.tfstate | 0 .../state-list-backend-custom/local-state.tfstate | 0 .../testdata/state-list-backend-custom/main.tf | 0 .../.terraform/terraform.tfstate | 0 .../testdata/state-list-backend-default/main.tf | 0 .../state-list-backend-default/terraform.tfstate | 0 .../state-list-nested-modules/terraform.tfstate | 0 .../state-pull-backend/.terraform/terraform.tfstate | 0 .../testdata/state-pull-backend/local-state.tfstate | 0 .../command}/testdata/state-pull-backend/main.tf | 0 .../.terraform/terraform.tfstate | 0 .../state-push-bad-lineage/local-state.tfstate | 0 .../command}/testdata/state-push-bad-lineage/main.tf | 0 .../testdata/state-push-bad-lineage/replace.tfstate | 0 .../state-push-good/.terraform/terraform.tfstate | 0 .../command}/testdata/state-push-good/main.tf | 0 .../command}/testdata/state-push-good/replace.tfstate | 0 .../.terraform/terraform.tfstate | 0 .../state-push-replace-match/local-state.tfstate | 0 .../command}/testdata/state-push-replace-match/main.tf | 0 .../testdata/state-push-replace-match/replace.tfstate | 0 .../.terraform/terraform.tfstate | 0 .../state-push-serial-newer/local-state.tfstate | 0 .../command}/testdata/state-push-serial-newer/main.tf | 0 .../testdata/state-push-serial-newer/replace.tfstate | 0 .../.terraform/terraform.tfstate | 0 .../state-push-serial-older/local-state.tfstate | 0 .../command}/testdata/state-push-serial-older/main.tf | 0 .../testdata/state-push-serial-older/replace.tfstate | 0 {command => internal/command}/testdata/statelocker.go | 2 +- .../testdata/taint-check-required-version/main.tf | 0 .../command}/testdata/test-fails/test-fails.tf | 0 .../command}/testdata/test-fails/tests/hello/hello.tf | 0 .../command}/testdata/test-passes/test-passes.tf | 0 .../command}/testdata/test-passes/tests/hello/hello.tf | 0 .../validate-invalid/incorrectmodulename/main.tf | 0 .../validate-invalid/incorrectmodulename/output.json | 0 .../testdata/validate-invalid/interpolation/main.tf | 0 .../validate-invalid/interpolation/output.json | 0 .../command}/testdata/validate-invalid/main.tf | 0 .../validate-invalid/missing_defined_var/main.tf | 0 .../validate-invalid/missing_defined_var/output.json | 0 .../testdata/validate-invalid/missing_quote/main.tf | 0 .../validate-invalid/missing_quote/output.json | 0 .../testdata/validate-invalid/missing_var/main.tf | 0 .../testdata/validate-invalid/missing_var/output.json | 0 .../testdata/validate-invalid/multiple_modules/main.tf | 0 .../validate-invalid/multiple_modules/output.json | 0 .../validate-invalid/multiple_providers/main.tf | 0 .../validate-invalid/multiple_providers/output.json | 0 .../validate-invalid/multiple_resources/main.tf | 0 .../validate-invalid/multiple_resources/output.json | 0 .../command}/testdata/validate-invalid/output.json | 0 .../command}/testdata/validate-invalid/outputs/main.tf | 0 .../testdata/validate-invalid/outputs/output.json | 0 .../command}/testdata/validate-valid/main.tf | 0 .../command}/testdata/validate-valid/output.json | 0 .../testdata/validate-valid/with-tfvars-file/main.tf | 0 .../validate-valid/with-tfvars-file/terraform.tfvars | 0 .../command}/testdata/variables/main.tf | 0 {command => internal/command}/ui_input.go | 0 {command => internal/command}/ui_input_test.go | 0 {command => internal/command}/unlock.go | 0 {command => internal/command}/unlock_test.go | 0 {command => internal/command}/untaint.go | 6 +++--- {command => internal/command}/untaint_test.go | 0 {command => internal/command}/validate.go | 4 ++-- {command => internal/command}/validate_test.go | 0 {command => internal/command}/version.go | 0 {command => internal/command}/version_test.go | 0 {command => internal/command}/views/apply.go | 6 +++--- {command => internal/command}/views/apply_test.go | 2 +- {command => internal/command}/views/hook_count.go | 0 {command => internal/command}/views/hook_count_test.go | 0 {command => internal/command}/views/hook_json.go | 4 ++-- {command => internal/command}/views/hook_json_test.go | 0 {command => internal/command}/views/hook_ui.go | 2 +- {command => internal/command}/views/hook_ui_test.go | 2 +- {command => internal/command}/views/json/change.go | 0 .../command}/views/json/change_summary.go | 0 {command => internal/command}/views/json/diagnostic.go | 0 .../command}/views/json/diagnostic_test.go | 0 {command => internal/command}/views/json/hook.go | 0 .../command}/views/json/message_types.go | 0 {command => internal/command}/views/json/output.go | 0 .../command}/views/json/output_test.go | 0 .../command}/views/json/resource_addr.go | 0 ...th-empty-highlight-range-at-end-of-source-code.json | 0 .../diagnostic/error-with-multi-line-snippet.json | 0 ...g-to-a-collection-containing-a-sensitive-value.json | 0 ...ct-and-expression-referring-to-sensitive-value.json | 0 ...-with-source-code-subject-and-known-expression.json | 0 ...subject-and-unknown-expression-of-unknown-type.json | 0 ...rce-code-subject-and-unknown-string-expression.json | 0 .../error-with-source-code-subject-but-no-context.json | 0 ...e-code-subject-with-multiple-expression-values.json | 0 .../diagnostic/error-with-source-code-subject.json | 0 .../diagnostic/error-with-source-code-unavailable.json | 0 .../error-with-unset-highlight-end-position.json | 0 .../json/testdata/diagnostic/sourceless-warning.json | 0 {command => internal/command}/views/json_view.go | 2 +- {command => internal/command}/views/json_view_test.go | 2 +- {command => internal/command}/views/operation.go | 6 +++--- {command => internal/command}/views/operation_test.go | 2 +- {command => internal/command}/views/output.go | 2 +- {command => internal/command}/views/output_test.go | 2 +- {command => internal/command}/views/plan.go | 4 ++-- {command => internal/command}/views/plan_test.go | 2 +- {command => internal/command}/views/refresh.go | 4 ++-- {command => internal/command}/views/refresh_test.go | 2 +- {command => internal/command}/views/show.go | 2 +- {command => internal/command}/views/state_locker.go | 2 +- {command => internal/command}/views/test.go | 4 ++-- {command => internal/command}/views/test_test.go | 2 +- {command => internal/command}/views/validate.go | 6 +++--- {command => internal/command}/views/validate_test.go | 2 +- {command => internal/command}/views/view.go | 4 ++-- {command => internal/command}/webbrowser/mock.go | 0 {command => internal/command}/webbrowser/mock_test.go | 0 {command => internal/command}/webbrowser/native.go | 0 {command => internal/command}/webbrowser/webbrowser.go | 0 {command => internal/command}/workspace_command.go | 0 .../command}/workspace_command_test.go | 0 {command => internal/command}/workspace_delete.go | 6 +++--- {command => internal/command}/workspace_list.go | 0 {command => internal/command}/workspace_new.go | 6 +++--- {command => internal/command}/workspace_select.go | 0 {command => internal/command}/workspace_show.go | 0 main.go | 4 ++-- plugins.go | 2 +- provider_source.go | 2 +- 572 files changed, 144 insertions(+), 144 deletions(-) rename {command => internal/command}/apply.go (99%) rename {command => internal/command}/apply_destroy_test.go (100%) rename {command => internal/command}/apply_test.go (99%) rename {command => internal/command}/arguments/apply.go (100%) rename {command => internal/command}/arguments/apply_test.go (100%) rename {command => internal/command}/arguments/default.go (100%) rename {command => internal/command}/arguments/extended.go (100%) rename {command => internal/command}/arguments/flags.go (100%) rename {command => internal/command}/arguments/output.go (100%) rename {command => internal/command}/arguments/output_test.go (100%) rename {command => internal/command}/arguments/plan.go (100%) rename {command => internal/command}/arguments/plan_test.go (100%) rename {command => internal/command}/arguments/refresh.go (100%) rename {command => internal/command}/arguments/refresh_test.go (100%) rename {command => internal/command}/arguments/test.go (100%) rename {command => internal/command}/arguments/test_test.go (100%) rename {command => internal/command}/arguments/types.go (100%) rename {command => internal/command}/arguments/validate.go (100%) rename {command => internal/command}/arguments/validate_test.go (100%) rename {command => internal/command}/arguments/view.go (100%) rename {command => internal/command}/arguments/view_test.go (100%) rename {command => internal/command}/autocomplete.go (100%) rename {command => internal/command}/autocomplete_test.go (100%) rename {command => internal/command}/cli_ui.go (100%) rename {command => internal/command}/cli_ui_test.go (100%) rename {command => internal/command}/cliconfig/cliconfig.go (100%) rename {command => internal/command}/cliconfig/cliconfig_test.go (100%) rename {command => internal/command}/cliconfig/config_unix.go (100%) rename {command => internal/command}/cliconfig/config_windows.go (100%) rename {command => internal/command}/cliconfig/credentials.go (100%) rename {command => internal/command}/cliconfig/credentials_test.go (100%) rename {command => internal/command}/cliconfig/provider_installation.go (100%) rename {command => internal/command}/cliconfig/provider_installation_test.go (100%) rename {command => internal/command}/cliconfig/testdata/config (100%) rename {command => internal/command}/cliconfig/testdata/config-env (100%) rename {command => internal/command}/cliconfig/testdata/credentials (100%) rename {command => internal/command}/cliconfig/testdata/hosts (100%) rename {command => internal/command}/cliconfig/testdata/provider-installation (100%) rename {command => internal/command}/cliconfig/testdata/provider-installation-errors (100%) rename {command => internal/command}/cliconfig/testdata/provider-installation.json (100%) rename {command => internal/command}/clistate/local_state.go (100%) rename {command => internal/command}/clistate/local_state_lock_unix.go (100%) rename {command => internal/command}/clistate/local_state_lock_windows.go (100%) rename {command => internal/command}/clistate/state.go (98%) rename {command => internal/command}/clistate/state_test.go (80%) rename {command => internal/command}/command.go (100%) rename {command => internal/command}/command_test.go (99%) rename {command => internal/command}/console.go (100%) rename {command => internal/command}/console_interactive.go (100%) rename {command => internal/command}/console_interactive_solaris.go (100%) rename {command => internal/command}/console_test.go (100%) rename {command => internal/command}/e2etest/.gitignore (100%) rename {command => internal/command}/e2etest/automation_test.go (100%) rename {command => internal/command}/e2etest/doc.go (100%) rename {command => internal/command}/e2etest/init_test.go (100%) rename {command => internal/command}/e2etest/main_test.go (100%) rename {command => internal/command}/e2etest/make-archive.sh (100%) rename {command => internal/command}/e2etest/primary_test.go (100%) rename {command => internal/command}/e2etest/provider_dev_test.go (100%) rename {command => internal/command}/e2etest/provider_plugin_test.go (100%) rename {command => internal/command}/e2etest/providers_mirror_test.go (100%) rename {command => internal/command}/e2etest/provisioner_plugin_test.go (100%) rename {command => internal/command}/e2etest/provisioner_test.go (100%) rename {command => internal/command}/e2etest/remote_state_test.go (100%) rename {command => internal/command}/e2etest/strip_ansi.go (100%) rename {command => internal/command}/e2etest/testdata/chdir-option/subdir/main.tf (100%) rename {command => internal/command}/e2etest/testdata/custom-provider-install-method/cliconfig.tfrc (100%) rename {command => internal/command}/e2etest/testdata/custom-provider-install-method/cliconfig.tfrc.json (100%) rename {command => internal/command}/e2etest/testdata/custom-provider-install-method/fs-mirror/example.com/awesomecorp/happycloud/1.2.0/os_arch/terraform-provider-happycloud_v1.2.0 (100%) rename {command => internal/command}/e2etest/testdata/custom-provider-install-method/main.tf (100%) rename {command => internal/command}/e2etest/testdata/empty/.exists (100%) rename {command => internal/command}/e2etest/testdata/full-workflow-null/main.tf (100%) rename {command => internal/command}/e2etest/testdata/local-only-provider/main.tf (100%) rename {command => internal/command}/e2etest/testdata/local-only-provider/terraform.d/plugins/example.com/awesomecorp/happycloud/1.2.0/os_arch/terraform-provider-happycloud_v1.2.0 (100%) rename {command => internal/command}/e2etest/testdata/plugin-cache/cache/registry.terraform.io/hashicorp/template/2.1.0/os_arch/terraform-provider-template_v2.1.0_x4 (100%) rename {command => internal/command}/e2etest/testdata/plugin-cache/main.tf (100%) rename {command => internal/command}/e2etest/testdata/provider-dev-override/pkgdir/.exists (100%) rename {command => internal/command}/e2etest/testdata/provider-dev-override/provider-dev-override.tf (100%) rename {command => internal/command}/e2etest/testdata/provider-not-found-non-default/main.tf (100%) rename {command => internal/command}/e2etest/testdata/provider-not-found/main.tf (100%) rename {command => internal/command}/e2etest/testdata/provider-plugin/main.tf (100%) rename {command => internal/command}/e2etest/testdata/provider-warnings/main.tf (100%) rename {command => internal/command}/e2etest/testdata/provisioner-plugin/main.tf (100%) rename {command => internal/command}/e2etest/testdata/provisioner/main.tf (100%) rename {command => internal/command}/e2etest/testdata/template-provider/main.tf (100%) rename {command => internal/command}/e2etest/testdata/terraform-provider/main.tf (100%) rename {command => internal/command}/e2etest/testdata/terraform-provider/test.tfstate (100%) rename {command => internal/command}/e2etest/testdata/terraform-providers-mirror/terraform-providers-mirror.tf (100%) rename {command => internal/command}/e2etest/testdata/test-provider/main.tf (100%) rename {command => internal/command}/e2etest/testdata/vendored-provider/main.tf (100%) rename {command => internal/command}/e2etest/testdata/vendored-provider/terraform.d/plugins/registry.terraform.io/hashicorp/null/1.0.0+local/os_arch/terraform-provider-null_v1.0.0 (100%) rename {command => internal/command}/e2etest/unmanaged_test.go (100%) rename {command => internal/command}/e2etest/version_test.go (100%) rename {command => internal/command}/flag_kv.go (100%) rename {command => internal/command}/flag_kv_test.go (100%) rename {command => internal/command}/fmt.go (100%) rename {command => internal/command}/fmt_test.go (100%) rename {command => internal/command}/format/diagnostic.go (99%) rename {command => internal/command}/format/diagnostic_test.go (99%) rename {command => internal/command}/format/diff.go (100%) rename {command => internal/command}/format/diff_test.go (100%) rename {command => internal/command}/format/format.go (100%) rename {command => internal/command}/format/object_id.go (100%) rename {command => internal/command}/format/object_id_test.go (100%) rename {command => internal/command}/format/state.go (100%) rename {command => internal/command}/format/state_test.go (100%) rename {command => internal/command}/format/trivia.go (100%) rename {command => internal/command}/get.go (100%) rename {command => internal/command}/get_test.go (100%) rename {command => internal/command}/graph.go (100%) rename {command => internal/command}/graph_test.go (100%) rename {command => internal/command}/hook_module_install.go (100%) rename {command => internal/command}/import.go (99%) rename {command => internal/command}/import_test.go (100%) rename {command => internal/command}/init.go (100%) rename {command => internal/command}/init_test.go (100%) rename {command => internal/command}/jsonconfig/config.go (100%) rename {command => internal/command}/jsonconfig/doc.go (100%) rename {command => internal/command}/jsonconfig/expression.go (100%) rename {command => internal/command}/jsonconfig/expression_test.go (100%) rename {command => internal/command}/jsonplan/doc.go (100%) rename {command => internal/command}/jsonplan/module.go (100%) rename {command => internal/command}/jsonplan/plan.go (99%) rename {command => internal/command}/jsonplan/plan_test.go (100%) rename {command => internal/command}/jsonplan/resource.go (100%) rename {command => internal/command}/jsonplan/values.go (100%) rename {command => internal/command}/jsonplan/values_test.go (100%) rename {command => internal/command}/jsonprovider/attribute.go (100%) rename {command => internal/command}/jsonprovider/attribute_test.go (100%) rename {command => internal/command}/jsonprovider/block.go (100%) rename {command => internal/command}/jsonprovider/block_test.go (100%) rename {command => internal/command}/jsonprovider/doc.go (100%) rename {command => internal/command}/jsonprovider/provider.go (100%) rename {command => internal/command}/jsonprovider/provider_test.go (100%) rename {command => internal/command}/jsonprovider/schema.go (100%) rename {command => internal/command}/jsonprovider/schema_test.go (100%) rename {command => internal/command}/jsonstate/doc.go (100%) rename {command => internal/command}/jsonstate/state.go (100%) rename {command => internal/command}/jsonstate/state_test.go (100%) rename {command => internal/command}/login.go (99%) rename {command => internal/command}/login_test.go (97%) rename {command => internal/command}/logout.go (98%) rename {command => internal/command}/logout_test.go (97%) rename {command => internal/command}/meta.go (99%) rename {command => internal/command}/meta_backend.go (99%) rename {command => internal/command}/meta_backend_migrate.go (99%) rename {command => internal/command}/meta_backend_test.go (100%) rename {command => internal/command}/meta_config.go (100%) rename {command => internal/command}/meta_dependencies.go (100%) rename {command => internal/command}/meta_new.go (100%) rename {command => internal/command}/meta_providers.go (100%) rename {command => internal/command}/meta_test.go (100%) rename {command => internal/command}/meta_vars.go (100%) rename {command => internal/command}/output.go (96%) rename {command => internal/command}/output_test.go (100%) rename {command => internal/command}/plan.go (98%) rename {command => internal/command}/plan_test.go (100%) rename {command => internal/command}/plugins.go (100%) rename {command => internal/command}/plugins_lock.go (100%) rename {command => internal/command}/plugins_lock_test.go (100%) rename {command => internal/command}/plugins_test.go (100%) rename {command => internal/command}/providers.go (100%) rename {command => internal/command}/providers_lock.go (100%) rename {command => internal/command}/providers_mirror.go (100%) rename {command => internal/command}/providers_schema.go (97%) rename {command => internal/command}/providers_schema_test.go (100%) rename {command => internal/command}/providers_test.go (100%) rename {command => internal/command}/push.go (100%) rename {command => internal/command}/refresh.go (98%) rename {command => internal/command}/refresh_test.go (100%) rename {command => internal/command}/show.go (95%) rename {command => internal/command}/show_test.go (100%) rename {command => internal/command}/state_command.go (100%) rename {command => internal/command}/state_list.go (100%) rename {command => internal/command}/state_list_test.go (100%) rename {command => internal/command}/state_meta.go (100%) rename {command => internal/command}/state_mv.go (98%) rename {command => internal/command}/state_mv_test.go (100%) rename {command => internal/command}/state_pull.go (100%) rename {command => internal/command}/state_pull_test.go (100%) rename {command => internal/command}/state_push.go (96%) rename {command => internal/command}/state_push_test.go (100%) rename {command => internal/command}/state_replace_provider.go (96%) rename {command => internal/command}/state_replace_provider_test.go (100%) rename {command => internal/command}/state_rm.go (96%) rename {command => internal/command}/state_rm_test.go (100%) rename {command => internal/command}/state_show.go (98%) rename {command => internal/command}/state_show_test.go (100%) rename {command => internal/command}/state_test.go (100%) rename {command => internal/command}/taint.go (97%) rename {command => internal/command}/taint_test.go (100%) rename {command => internal/command}/test.go (99%) rename {command => internal/command}/test_test.go (98%) rename {command => internal/command}/testdata/apply-config-invalid/main.tf (100%) rename {command => internal/command}/testdata/apply-destroy-targeted/main.tf (100%) rename {command => internal/command}/testdata/apply-error/main.tf (100%) rename {command => internal/command}/testdata/apply-input-partial/main.tf (100%) rename {command => internal/command}/testdata/apply-input/main.tf (100%) rename {command => internal/command}/testdata/apply-plan-no-module/main.tf (100%) rename {command => internal/command}/testdata/apply-replace/main.tf (100%) rename {command => internal/command}/testdata/apply-sensitive-output/main.tf (100%) rename {command => internal/command}/testdata/apply-shutdown/main.tf (100%) rename {command => internal/command}/testdata/apply-targeted/main.tf (100%) rename {command => internal/command}/testdata/apply-terraform-env/main.tf (100%) rename {command => internal/command}/testdata/apply-vars/main.tf (100%) rename {command => internal/command}/testdata/apply/main.tf (100%) rename {command => internal/command}/testdata/apply/output.jsonlog (100%) rename {command => internal/command}/testdata/backend-change-multi-default-to-single/.terraform/terraform.tfstate (100%) rename {command => internal/command}/testdata/backend-change-multi-default-to-single/local-state.tfstate (100%) rename {command => internal/command}/testdata/backend-change-multi-default-to-single/main.tf (100%) rename {command => internal/command}/testdata/backend-change-multi-to-multi/.terraform/terraform.tfstate (100%) rename {command => internal/command}/testdata/backend-change-multi-to-multi/local-state.tfstate (100%) rename {command => internal/command}/testdata/backend-change-multi-to-multi/main.tf (100%) rename {command => internal/command}/testdata/backend-change-multi-to-multi/terraform.tfstate.d/env2/terraform.tfstate (100%) rename {command => internal/command}/testdata/backend-change-multi-to-no-default-with-default/.terraform/terraform.tfstate (100%) rename {command => internal/command}/testdata/backend-change-multi-to-no-default-with-default/local-state.tfstate (100%) rename {command => internal/command}/testdata/backend-change-multi-to-no-default-with-default/main.tf (100%) rename {command => internal/command}/testdata/backend-change-multi-to-no-default-with-default/terraform.tfstate.d/env2/terraform.tfstate (100%) rename {command => internal/command}/testdata/backend-change-multi-to-no-default-without-default/.terraform/terraform.tfstate (100%) rename {command => internal/command}/testdata/backend-change-multi-to-no-default-without-default/main.tf (100%) rename {command => internal/command}/testdata/backend-change-multi-to-no-default-without-default/terraform.tfstate.d/env2/terraform.tfstate (100%) rename {command => internal/command}/testdata/backend-change-multi-to-single/.terraform/environment (100%) rename {command => internal/command}/testdata/backend-change-multi-to-single/.terraform/terraform.tfstate (100%) rename {command => internal/command}/testdata/backend-change-multi-to-single/main.tf (100%) rename {command => internal/command}/testdata/backend-change-multi-to-single/terraform.tfstate.d/env1/terraform.tfstate (100%) rename {command => internal/command}/testdata/backend-change-multi-to-single/terraform.tfstate.d/env2/terraform.tfstate (100%) rename {command => internal/command}/testdata/backend-change-single-to-single/.terraform/terraform.tfstate (100%) rename {command => internal/command}/testdata/backend-change-single-to-single/local-state.tfstate (100%) rename {command => internal/command}/testdata/backend-change-single-to-single/main.tf (100%) rename {command => internal/command}/testdata/backend-change/.terraform/terraform.tfstate (100%) rename {command => internal/command}/testdata/backend-change/local-state.tfstate (100%) rename {command => internal/command}/testdata/backend-change/main.tf (100%) rename {command => internal/command}/testdata/backend-changed-with-legacy/.terraform/terraform.tfstate (100%) rename {command => internal/command}/testdata/backend-changed-with-legacy/local-state-old.tfstate (100%) rename {command => internal/command}/testdata/backend-changed-with-legacy/local-state.tfstate (100%) rename {command => internal/command}/testdata/backend-changed-with-legacy/main.tf (100%) rename {command => internal/command}/testdata/backend-from-state/terraform.tfstate (100%) rename {command => internal/command}/testdata/backend-inmem-locked/main.tf (100%) rename {command => internal/command}/testdata/backend-new-interp/main.tf (100%) rename {command => internal/command}/testdata/backend-new-legacy/.terraform/terraform.tfstate (100%) rename {command => internal/command}/testdata/backend-new-legacy/local-state-old.tfstate (100%) rename {command => internal/command}/testdata/backend-new-legacy/main.tf (100%) rename {command => internal/command}/testdata/backend-new-migrate-existing/local-state.tfstate (100%) rename {command => internal/command}/testdata/backend-new-migrate-existing/main.tf (100%) rename {command => internal/command}/testdata/backend-new-migrate-existing/terraform.tfstate (100%) rename {command => internal/command}/testdata/backend-new-migrate/main.tf (100%) rename {command => internal/command}/testdata/backend-new-migrate/terraform.tfstate (100%) rename {command => internal/command}/testdata/backend-new/main.tf (100%) rename {command => internal/command}/testdata/backend-plan-backend-empty-config/.terraform/terraform.tfstate (100%) rename {command => internal/command}/testdata/backend-plan-backend-empty-config/local-state.tfstate (100%) rename {command => internal/command}/testdata/backend-plan-backend-empty-config/main.tf (100%) rename {command => internal/command}/testdata/backend-plan-backend-empty/readme.txt (100%) rename {command => internal/command}/testdata/backend-plan-backend-match/local-state.tfstate (100%) rename {command => internal/command}/testdata/backend-plan-backend-match/readme.txt (100%) rename {command => internal/command}/testdata/backend-plan-backend-mismatch/local-state.tfstate (100%) rename {command => internal/command}/testdata/backend-plan-legacy-data/local-state.tfstate (100%) rename {command => internal/command}/testdata/backend-plan-legacy-data/main.tf (100%) rename {command => internal/command}/testdata/backend-plan-legacy-data/state.tfstate (100%) rename {command => internal/command}/testdata/backend-plan-legacy/readme.txt (100%) rename {command => internal/command}/testdata/backend-plan-local-match/main.tf (100%) rename {command => internal/command}/testdata/backend-plan-local-match/terraform.tfstate (100%) rename {command => internal/command}/testdata/backend-plan-local-mismatch-lineage/main.tf (100%) rename {command => internal/command}/testdata/backend-plan-local-mismatch-lineage/terraform.tfstate (100%) rename {command => internal/command}/testdata/backend-plan-local-newer/main.tf (100%) rename {command => internal/command}/testdata/backend-plan-local-newer/terraform.tfstate (100%) rename {command => internal/command}/testdata/backend-plan-local/main.tf (100%) rename {command => internal/command}/testdata/backend-unchanged-with-legacy/.terraform/terraform.tfstate (100%) rename {command => internal/command}/testdata/backend-unchanged-with-legacy/local-state-old.tfstate (100%) rename {command => internal/command}/testdata/backend-unchanged-with-legacy/local-state.tfstate (100%) rename {command => internal/command}/testdata/backend-unchanged-with-legacy/main.tf (100%) rename {command => internal/command}/testdata/backend-unchanged/.terraform/terraform.tfstate (100%) rename {command => internal/command}/testdata/backend-unchanged/local-state.tfstate (100%) rename {command => internal/command}/testdata/backend-unchanged/main.tf (100%) rename {command => internal/command}/testdata/backend-unset-with-legacy/.terraform/terraform.tfstate (100%) rename {command => internal/command}/testdata/backend-unset-with-legacy/local-state-old.tfstate (100%) rename {command => internal/command}/testdata/backend-unset-with-legacy/local-state.tfstate (100%) rename {command => internal/command}/testdata/backend-unset-with-legacy/main.tf (100%) rename {command => internal/command}/testdata/backend-unset/.terraform/terraform.tfstate (100%) rename {command => internal/command}/testdata/backend-unset/local-state.tfstate (100%) rename {command => internal/command}/testdata/backend-unset/main.tf (100%) rename {command => internal/command}/testdata/empty-file (100%) rename {command => internal/command}/testdata/empty/README (100%) rename {command => internal/command}/testdata/fmt/general_in.tf (100%) rename {command => internal/command}/testdata/fmt/general_out.tf (100%) rename {command => internal/command}/testdata/fmt/variable_type_in.tf (100%) rename {command => internal/command}/testdata/fmt/variable_type_out.tf (100%) rename {command => internal/command}/testdata/get/foo/main.tf (100%) rename {command => internal/command}/testdata/get/main.tf (100%) rename {command => internal/command}/testdata/graph/main.tf (100%) rename {command => internal/command}/testdata/import-missing-resource-config/main.tf (100%) rename {command => internal/command}/testdata/import-module-input-variable/child/main.tf (100%) rename {command => internal/command}/testdata/import-module-input-variable/main.tf (100%) rename {command => internal/command}/testdata/import-module-input-variable/terraform.tfvars (100%) rename {command => internal/command}/testdata/import-module-var-file/child/main.tf (100%) rename {command => internal/command}/testdata/import-module-var-file/main.tf (100%) rename {command => internal/command}/testdata/import-module-var-file/terraform.tfvars (100%) rename {command => internal/command}/testdata/import-provider-aliased/main.tf (100%) rename {command => internal/command}/testdata/import-provider-datasource/main.tf (100%) rename {command => internal/command}/testdata/import-provider-implicit/main.tf (100%) rename {command => internal/command}/testdata/import-provider-invalid/main.tf (100%) rename {command => internal/command}/testdata/import-provider-remote-state/main.tf (100%) rename {command => internal/command}/testdata/import-provider-var-default/main.tf (100%) rename {command => internal/command}/testdata/import-provider-var-default/terraform.tfvars (100%) rename {command => internal/command}/testdata/import-provider-var-file/blah.tfvars (100%) rename {command => internal/command}/testdata/import-provider-var-file/main.tf (100%) rename {command => internal/command}/testdata/import-provider-var/main.tf (100%) rename {command => internal/command}/testdata/import-provider/main.tf (100%) rename {command => internal/command}/testdata/init-backend-config-file-change/.terraform/terraform.tfstate (100%) rename {command => internal/command}/testdata/init-backend-config-file-change/input.config (100%) rename {command => internal/command}/testdata/init-backend-config-file-change/main.tf (100%) rename {command => internal/command}/testdata/init-backend-config-file/backend.config (100%) rename {command => internal/command}/testdata/init-backend-config-file/input.config (100%) rename {command => internal/command}/testdata/init-backend-config-file/invalid.config (100%) rename {command => internal/command}/testdata/init-backend-config-file/main.tf (100%) rename {command => internal/command}/testdata/init-backend-config-kv/main.tf (100%) rename {command => internal/command}/testdata/init-backend-empty/main.tf (100%) rename {command => internal/command}/testdata/init-backend/main.tf (100%) rename {command => internal/command}/testdata/init-check-required-version/main.tf (100%) rename {command => internal/command}/testdata/init-get-provider-detected-legacy/.terraform/modules/dicerolls/terraform-random-bar-1.0.0/main.tf (100%) rename {command => internal/command}/testdata/init-get-provider-detected-legacy/.terraform/modules/modules.json (100%) rename {command => internal/command}/testdata/init-get-provider-detected-legacy/child/main.tf (100%) rename {command => internal/command}/testdata/init-get-provider-detected-legacy/main.tf (100%) rename {command => internal/command}/testdata/init-get-provider-invalid-package/main.tf (100%) rename {command => internal/command}/testdata/init-get-provider-legacy-from-state/main.tf (100%) rename {command => internal/command}/testdata/init-get-provider-legacy-from-state/terraform.tfstate (100%) rename {command => internal/command}/testdata/init-get-provider-source/main.tf (100%) rename {command => internal/command}/testdata/init-get-providers/main.tf (100%) rename {command => internal/command}/testdata/init-get/foo/main.tf (100%) rename {command => internal/command}/testdata/init-get/main.tf (100%) rename {command => internal/command}/testdata/init-internal-invalid/main.tf (100%) rename {command => internal/command}/testdata/init-internal/main.tf (100%) rename {command => internal/command}/testdata/init-legacy-provider-cache/.terraform/plugins/example.com/test/b/1.1.0/os_arch/terraform-provider-b (100%) rename {command => internal/command}/testdata/init-legacy-provider-cache/.terraform/plugins/registry.terraform.io/hashicorp/c/2.0.0/os_arch/terraform-provider-c (100%) rename {command => internal/command}/testdata/init-legacy-provider-cache/versions.tf (100%) rename {command => internal/command}/testdata/init-legacy-rc/main.tf (100%) rename {command => internal/command}/testdata/init-provider-lock-file-readonly-add/main.tf (100%) rename {command => internal/command}/testdata/init-provider-lock-file/main.tf (100%) rename {command => internal/command}/testdata/init-providers-lock/main.tf (100%) rename {command => internal/command}/testdata/init-required-providers/main.tf (100%) rename {command => internal/command}/testdata/init/hello.tf (100%) rename {command => internal/command}/testdata/inmem-backend/main.tf (100%) rename {command => internal/command}/testdata/login-oauth-server/main.go (88%) rename {command => internal/command}/testdata/login-oauth-server/oauthserver.go (100%) rename {command => internal/command}/testdata/login-tfe-server/tfeserver.go (100%) rename {command => internal/command}/testdata/modules/.terraform/modules/modules.json (100%) rename {command => internal/command}/testdata/modules/child/main.tf (100%) rename {command => internal/command}/testdata/modules/main.tf (100%) rename {command => internal/command}/testdata/modules/terraform.tfstate (100%) rename {command => internal/command}/testdata/parallelism/main.tf (100%) rename {command => internal/command}/testdata/plan-emptydiff/main.tf (100%) rename {command => internal/command}/testdata/plan-invalid/main.tf (100%) rename {command => internal/command}/testdata/plan-out-backend-legacy/main.tf (100%) rename {command => internal/command}/testdata/plan-out-backend/main.tf (100%) rename {command => internal/command}/testdata/plan-replace/main.tf (100%) rename {command => internal/command}/testdata/plan-vars/main.tf (100%) rename {command => internal/command}/testdata/plan/main.tf (100%) rename {command => internal/command}/testdata/providers-schema/basic/output.json (100%) rename {command => internal/command}/testdata/providers-schema/basic/provider.tf (100%) rename {command => internal/command}/testdata/providers-schema/empty/main.tf (100%) rename {command => internal/command}/testdata/providers-schema/empty/output.json (100%) rename {command => internal/command}/testdata/providers-schema/required/output.json (100%) rename {command => internal/command}/testdata/providers-schema/required/provider.tf (100%) rename {command => internal/command}/testdata/providers/basic/main.tf (100%) rename {command => internal/command}/testdata/providers/modules/child/main.tf (100%) rename {command => internal/command}/testdata/providers/modules/main.tf (100%) rename {command => internal/command}/testdata/providers/state/main.tf (100%) rename {command => internal/command}/testdata/providers/state/terraform.tfstate (100%) rename {command => internal/command}/testdata/push-backend-new/main.tf (100%) rename {command => internal/command}/testdata/push-input-partial/main.tf (100%) rename {command => internal/command}/testdata/push-input/main.tf (100%) rename {command => internal/command}/testdata/push-no-remote/main.tf (100%) rename {command => internal/command}/testdata/push-no-upload/child/main.tf (100%) rename {command => internal/command}/testdata/push-no-upload/main.tf (100%) rename {command => internal/command}/testdata/push-tfvars/main.tf (100%) rename {command => internal/command}/testdata/push-tfvars/terraform.tfvars (100%) rename {command => internal/command}/testdata/push/main.tf (100%) rename {command => internal/command}/testdata/refresh-empty/main.tf (100%) rename {command => internal/command}/testdata/refresh-output/main.tf (100%) rename {command => internal/command}/testdata/refresh-targeted/main.tf (100%) rename {command => internal/command}/testdata/refresh-unset-var/main.tf (100%) rename {command => internal/command}/testdata/refresh-var/main.tf (100%) rename {command => internal/command}/testdata/refresh/main.tf (100%) rename {command => internal/command}/testdata/show-json-sensitive/main.tf (100%) rename {command => internal/command}/testdata/show-json-sensitive/output.json (100%) rename {command => internal/command}/testdata/show-json-state/basic/output.json (100%) rename {command => internal/command}/testdata/show-json-state/basic/terraform.tfstate (100%) rename {command => internal/command}/testdata/show-json-state/empty/output.json (100%) rename {command => internal/command}/testdata/show-json-state/modules/bar/main.tf (100%) rename {command => internal/command}/testdata/show-json-state/modules/foo/main.tf (100%) rename {command => internal/command}/testdata/show-json-state/modules/main.tf (100%) rename {command => internal/command}/testdata/show-json-state/modules/output.json (100%) rename {command => internal/command}/testdata/show-json-state/modules/terraform.tfstate (100%) rename {command => internal/command}/testdata/show-json-state/sensitive-variables/output.json (100%) rename {command => internal/command}/testdata/show-json-state/sensitive-variables/terraform.tfstate (100%) rename {command => internal/command}/testdata/show-json/basic-create/main.tf (100%) rename {command => internal/command}/testdata/show-json/basic-create/output.json (100%) rename {command => internal/command}/testdata/show-json/basic-delete/main.tf (100%) rename {command => internal/command}/testdata/show-json/basic-delete/output.json (100%) rename {command => internal/command}/testdata/show-json/basic-delete/terraform.tfstate (100%) rename {command => internal/command}/testdata/show-json/basic-update/main.tf (100%) rename {command => internal/command}/testdata/show-json/basic-update/output.json (100%) rename {command => internal/command}/testdata/show-json/basic-update/terraform.tfstate (100%) rename {command => internal/command}/testdata/show-json/module-depends-on/foo/main.tf (100%) rename {command => internal/command}/testdata/show-json/module-depends-on/main.tf (100%) rename {command => internal/command}/testdata/show-json/module-depends-on/output.json (100%) rename {command => internal/command}/testdata/show-json/modules/bar/main.tf (100%) rename {command => internal/command}/testdata/show-json/modules/foo/main.tf (100%) rename {command => internal/command}/testdata/show-json/modules/main.tf (100%) rename {command => internal/command}/testdata/show-json/modules/output.json (100%) rename {command => internal/command}/testdata/show-json/multi-resource-update/main.tf (100%) rename {command => internal/command}/testdata/show-json/multi-resource-update/output.json (100%) rename {command => internal/command}/testdata/show-json/multi-resource-update/terraform.tfstate (100%) rename {command => internal/command}/testdata/show-json/nested-module-error/main.tf (100%) rename {command => internal/command}/testdata/show-json/nested-module-error/modules/main.tf (100%) rename {command => internal/command}/testdata/show-json/nested-module-error/modules/more-modules/main.tf (100%) rename {command => internal/command}/testdata/show-json/nested-modules/main.tf (100%) rename {command => internal/command}/testdata/show-json/nested-modules/modules/main.tf (100%) rename {command => internal/command}/testdata/show-json/nested-modules/modules/more-modules/main.tf (100%) rename {command => internal/command}/testdata/show-json/nested-modules/output.json (100%) rename {command => internal/command}/testdata/show-json/provider-version-no-config/main.tf (100%) rename {command => internal/command}/testdata/show-json/provider-version-no-config/output.json (100%) rename {command => internal/command}/testdata/show-json/provider-version/main.tf (100%) rename {command => internal/command}/testdata/show-json/provider-version/output.json (100%) rename {command => internal/command}/testdata/show-json/requires-replace/main.tf (100%) rename {command => internal/command}/testdata/show-json/requires-replace/output.json (100%) rename {command => internal/command}/testdata/show-json/requires-replace/terraform.tfstate (100%) rename {command => internal/command}/testdata/show-json/sensitive-values/main.tf (100%) rename {command => internal/command}/testdata/show-json/sensitive-values/output.json (100%) rename {command => internal/command}/testdata/show/main.tf (100%) rename {command => internal/command}/testdata/state-list-backend-custom/.terraform/terraform.tfstate (100%) rename {command => internal/command}/testdata/state-list-backend-custom/local-state.tfstate (100%) rename {command => internal/command}/testdata/state-list-backend-custom/main.tf (100%) rename {command => internal/command}/testdata/state-list-backend-default/.terraform/terraform.tfstate (100%) rename {command => internal/command}/testdata/state-list-backend-default/main.tf (100%) rename {command => internal/command}/testdata/state-list-backend-default/terraform.tfstate (100%) rename {command => internal/command}/testdata/state-list-nested-modules/terraform.tfstate (100%) rename {command => internal/command}/testdata/state-pull-backend/.terraform/terraform.tfstate (100%) rename {command => internal/command}/testdata/state-pull-backend/local-state.tfstate (100%) rename {command => internal/command}/testdata/state-pull-backend/main.tf (100%) rename {command => internal/command}/testdata/state-push-bad-lineage/.terraform/terraform.tfstate (100%) rename {command => internal/command}/testdata/state-push-bad-lineage/local-state.tfstate (100%) rename {command => internal/command}/testdata/state-push-bad-lineage/main.tf (100%) rename {command => internal/command}/testdata/state-push-bad-lineage/replace.tfstate (100%) rename {command => internal/command}/testdata/state-push-good/.terraform/terraform.tfstate (100%) rename {command => internal/command}/testdata/state-push-good/main.tf (100%) rename {command => internal/command}/testdata/state-push-good/replace.tfstate (100%) rename {command => internal/command}/testdata/state-push-replace-match/.terraform/terraform.tfstate (100%) rename {command => internal/command}/testdata/state-push-replace-match/local-state.tfstate (100%) rename {command => internal/command}/testdata/state-push-replace-match/main.tf (100%) rename {command => internal/command}/testdata/state-push-replace-match/replace.tfstate (100%) rename {command => internal/command}/testdata/state-push-serial-newer/.terraform/terraform.tfstate (100%) rename {command => internal/command}/testdata/state-push-serial-newer/local-state.tfstate (100%) rename {command => internal/command}/testdata/state-push-serial-newer/main.tf (100%) rename {command => internal/command}/testdata/state-push-serial-newer/replace.tfstate (100%) rename {command => internal/command}/testdata/state-push-serial-older/.terraform/terraform.tfstate (100%) rename {command => internal/command}/testdata/state-push-serial-older/local-state.tfstate (100%) rename {command => internal/command}/testdata/state-push-serial-older/main.tf (100%) rename {command => internal/command}/testdata/state-push-serial-older/replace.tfstate (100%) rename {command => internal/command}/testdata/statelocker.go (94%) rename {command => internal/command}/testdata/taint-check-required-version/main.tf (100%) rename {command => internal/command}/testdata/test-fails/test-fails.tf (100%) rename {command => internal/command}/testdata/test-fails/tests/hello/hello.tf (100%) rename {command => internal/command}/testdata/test-passes/test-passes.tf (100%) rename {command => internal/command}/testdata/test-passes/tests/hello/hello.tf (100%) rename {command => internal/command}/testdata/validate-invalid/incorrectmodulename/main.tf (100%) rename {command => internal/command}/testdata/validate-invalid/incorrectmodulename/output.json (100%) rename {command => internal/command}/testdata/validate-invalid/interpolation/main.tf (100%) rename {command => internal/command}/testdata/validate-invalid/interpolation/output.json (100%) rename {command => internal/command}/testdata/validate-invalid/main.tf (100%) rename {command => internal/command}/testdata/validate-invalid/missing_defined_var/main.tf (100%) rename {command => internal/command}/testdata/validate-invalid/missing_defined_var/output.json (100%) rename {command => internal/command}/testdata/validate-invalid/missing_quote/main.tf (100%) rename {command => internal/command}/testdata/validate-invalid/missing_quote/output.json (100%) rename {command => internal/command}/testdata/validate-invalid/missing_var/main.tf (100%) rename {command => internal/command}/testdata/validate-invalid/missing_var/output.json (100%) rename {command => internal/command}/testdata/validate-invalid/multiple_modules/main.tf (100%) rename {command => internal/command}/testdata/validate-invalid/multiple_modules/output.json (100%) rename {command => internal/command}/testdata/validate-invalid/multiple_providers/main.tf (100%) rename {command => internal/command}/testdata/validate-invalid/multiple_providers/output.json (100%) rename {command => internal/command}/testdata/validate-invalid/multiple_resources/main.tf (100%) rename {command => internal/command}/testdata/validate-invalid/multiple_resources/output.json (100%) rename {command => internal/command}/testdata/validate-invalid/output.json (100%) rename {command => internal/command}/testdata/validate-invalid/outputs/main.tf (100%) rename {command => internal/command}/testdata/validate-invalid/outputs/output.json (100%) rename {command => internal/command}/testdata/validate-valid/main.tf (100%) rename {command => internal/command}/testdata/validate-valid/output.json (100%) rename {command => internal/command}/testdata/validate-valid/with-tfvars-file/main.tf (100%) rename {command => internal/command}/testdata/validate-valid/with-tfvars-file/terraform.tfvars (100%) rename {command => internal/command}/testdata/variables/main.tf (100%) rename {command => internal/command}/ui_input.go (100%) rename {command => internal/command}/ui_input_test.go (100%) rename {command => internal/command}/unlock.go (100%) rename {command => internal/command}/unlock_test.go (100%) rename {command => internal/command}/untaint.go (97%) rename {command => internal/command}/untaint_test.go (100%) rename {command => internal/command}/validate.go (97%) rename {command => internal/command}/validate_test.go (100%) rename {command => internal/command}/version.go (100%) rename {command => internal/command}/version_test.go (100%) rename {command => internal/command}/views/apply.go (95%) rename {command => internal/command}/views/apply_test.go (99%) rename {command => internal/command}/views/hook_count.go (100%) rename {command => internal/command}/views/hook_count_test.go (100%) rename {command => internal/command}/views/hook_json.go (97%) rename {command => internal/command}/views/hook_json_test.go (100%) rename {command => internal/command}/views/hook_ui.go (99%) rename {command => internal/command}/views/hook_ui_test.go (99%) rename {command => internal/command}/views/json/change.go (100%) rename {command => internal/command}/views/json/change_summary.go (100%) rename {command => internal/command}/views/json/diagnostic.go (100%) rename {command => internal/command}/views/json/diagnostic_test.go (100%) rename {command => internal/command}/views/json/hook.go (100%) rename {command => internal/command}/views/json/message_types.go (100%) rename {command => internal/command}/views/json/output.go (100%) rename {command => internal/command}/views/json/output_test.go (100%) rename {command => internal/command}/views/json/resource_addr.go (100%) rename {command => internal/command}/views/json/testdata/diagnostic/error-with-empty-highlight-range-at-end-of-source-code.json (100%) rename {command => internal/command}/views/json/testdata/diagnostic/error-with-multi-line-snippet.json (100%) rename {command => internal/command}/views/json/testdata/diagnostic/error-with-source-code-subject-and-expression-referring-to-a-collection-containing-a-sensitive-value.json (100%) rename {command => internal/command}/views/json/testdata/diagnostic/error-with-source-code-subject-and-expression-referring-to-sensitive-value.json (100%) rename {command => internal/command}/views/json/testdata/diagnostic/error-with-source-code-subject-and-known-expression.json (100%) rename {command => internal/command}/views/json/testdata/diagnostic/error-with-source-code-subject-and-unknown-expression-of-unknown-type.json (100%) rename {command => internal/command}/views/json/testdata/diagnostic/error-with-source-code-subject-and-unknown-string-expression.json (100%) rename {command => internal/command}/views/json/testdata/diagnostic/error-with-source-code-subject-but-no-context.json (100%) rename {command => internal/command}/views/json/testdata/diagnostic/error-with-source-code-subject-with-multiple-expression-values.json (100%) rename {command => internal/command}/views/json/testdata/diagnostic/error-with-source-code-subject.json (100%) rename {command => internal/command}/views/json/testdata/diagnostic/error-with-source-code-unavailable.json (100%) rename {command => internal/command}/views/json/testdata/diagnostic/error-with-unset-highlight-end-position.json (100%) rename {command => internal/command}/views/json/testdata/diagnostic/sourceless-warning.json (100%) rename {command => internal/command}/views/json_view.go (97%) rename {command => internal/command}/views/json_view_test.go (99%) rename {command => internal/command}/views/operation.go (97%) rename {command => internal/command}/views/operation_test.go (99%) rename {command => internal/command}/views/output.go (99%) rename {command => internal/command}/views/output_test.go (99%) rename {command => internal/command}/views/plan.go (99%) rename {command => internal/command}/views/plan_test.go (98%) rename {command => internal/command}/views/refresh.go (95%) rename {command => internal/command}/views/refresh_test.go (97%) rename {command => internal/command}/views/show.go (93%) rename {command => internal/command}/views/state_locker.go (94%) rename {command => internal/command}/views/test.go (99%) rename {command => internal/command}/views/test_test.go (93%) rename {command => internal/command}/views/validate.go (95%) rename {command => internal/command}/views/validate_test.go (98%) rename {command => internal/command}/views/view.go (97%) rename {command => internal/command}/webbrowser/mock.go (100%) rename {command => internal/command}/webbrowser/mock_test.go (100%) rename {command => internal/command}/webbrowser/native.go (100%) rename {command => internal/command}/webbrowser/webbrowser.go (100%) rename {command => internal/command}/workspace_command.go (100%) rename {command => internal/command}/workspace_command_test.go (100%) rename {command => internal/command}/workspace_delete.go (96%) rename {command => internal/command}/workspace_list.go (100%) rename {command => internal/command}/workspace_new.go (96%) rename {command => internal/command}/workspace_select.go (100%) rename {command => internal/command}/workspace_show.go (100%) diff --git a/checkpoint.go b/checkpoint.go index 5885bb345e..31cc29bf75 100644 --- a/checkpoint.go +++ b/checkpoint.go @@ -6,8 +6,8 @@ import ( "path/filepath" "github.com/hashicorp/go-checkpoint" - "github.com/hashicorp/terraform/command" - "github.com/hashicorp/terraform/command/cliconfig" + "github.com/hashicorp/terraform/internal/command" + "github.com/hashicorp/terraform/internal/command/cliconfig" ) func init() { diff --git a/commands.go b/commands.go index 555e3e127f..db764a810e 100644 --- a/commands.go +++ b/commands.go @@ -10,11 +10,11 @@ import ( svchost "github.com/hashicorp/terraform-svchost" "github.com/hashicorp/terraform-svchost/auth" "github.com/hashicorp/terraform-svchost/disco" - "github.com/hashicorp/terraform/command" - "github.com/hashicorp/terraform/command/cliconfig" - "github.com/hashicorp/terraform/command/views" - "github.com/hashicorp/terraform/command/webbrowser" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/command" + "github.com/hashicorp/terraform/internal/command/cliconfig" + "github.com/hashicorp/terraform/internal/command/views" + "github.com/hashicorp/terraform/internal/command/webbrowser" "github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/internal/terminal" pluginDiscovery "github.com/hashicorp/terraform/plugin/discovery" diff --git a/internal/backend/backend.go b/internal/backend/backend.go index 2bc0636063..6bffc9205c 100644 --- a/internal/backend/backend.go +++ b/internal/backend/backend.go @@ -11,12 +11,12 @@ import ( "log" "os" - "github.com/hashicorp/terraform/command/clistate" - "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configload" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/command/clistate" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/plans/planfile" diff --git a/internal/backend/local/backend.go b/internal/backend/local/backend.go index a47192d4d6..051a516149 100644 --- a/internal/backend/local/backend.go +++ b/internal/backend/local/backend.go @@ -11,9 +11,9 @@ import ( "sort" "sync" - "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/terraform" diff --git a/internal/backend/local/backend_apply.go b/internal/backend/local/backend_apply.go index 8f75419ed1..d206608992 100644 --- a/internal/backend/local/backend_apply.go +++ b/internal/backend/local/backend_apply.go @@ -6,8 +6,8 @@ import ( "log" "github.com/hashicorp/errwrap" - "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" diff --git a/internal/backend/local/backend_apply_test.go b/internal/backend/local/backend_apply_test.go index e321a03115..5bc896e419 100644 --- a/internal/backend/local/backend_apply_test.go +++ b/internal/backend/local/backend_apply_test.go @@ -11,11 +11,11 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/clistate" - "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/clistate" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/terminal" diff --git a/internal/backend/local/backend_local_test.go b/internal/backend/local/backend_local_test.go index 396ee46578..75f4a7a46a 100644 --- a/internal/backend/local/backend_local_test.go +++ b/internal/backend/local/backend_local_test.go @@ -3,10 +3,10 @@ package local import ( "testing" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/clistate" - "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/clistate" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/terminal" ) diff --git a/internal/backend/local/backend_plan_test.go b/internal/backend/local/backend_plan_test.go index b599ca96ab..a037409ffb 100644 --- a/internal/backend/local/backend_plan_test.go +++ b/internal/backend/local/backend_plan_test.go @@ -7,12 +7,12 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/clistate" - "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/clistate" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/plans" diff --git a/internal/backend/local/backend_refresh_test.go b/internal/backend/local/backend_refresh_test.go index 5d2a931b9e..0c75133cbe 100644 --- a/internal/backend/local/backend_refresh_test.go +++ b/internal/backend/local/backend_refresh_test.go @@ -6,12 +6,12 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/clistate" - "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/clistate" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/terminal" diff --git a/internal/backend/remote/backend_apply_test.go b/internal/backend/remote/backend_apply_test.go index 0b3f424e0b..6797ece455 100644 --- a/internal/backend/remote/backend_apply_test.go +++ b/internal/backend/remote/backend_apply_test.go @@ -12,11 +12,11 @@ import ( "github.com/google/go-cmp/cmp" tfe "github.com/hashicorp/go-tfe" version "github.com/hashicorp/go-version" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/clistate" - "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/clistate" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/plans" diff --git a/internal/backend/remote/backend_context_test.go b/internal/backend/remote/backend_context_test.go index b1d1dd596c..6950487dd3 100644 --- a/internal/backend/remote/backend_context_test.go +++ b/internal/backend/remote/backend_context_test.go @@ -5,11 +5,11 @@ import ( "testing" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/clistate" - "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/clistate" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/states/statemgr" diff --git a/internal/backend/remote/backend_plan_test.go b/internal/backend/remote/backend_plan_test.go index 8505f0dfad..ac73ead3ed 100644 --- a/internal/backend/remote/backend_plan_test.go +++ b/internal/backend/remote/backend_plan_test.go @@ -11,11 +11,11 @@ import ( "github.com/google/go-cmp/cmp" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/clistate" - "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/clistate" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/plans" diff --git a/command/apply.go b/internal/command/apply.go similarity index 99% rename from command/apply.go rename to internal/command/apply.go index 132aa5324c..755e2eda5c 100644 --- a/command/apply.go +++ b/internal/command/apply.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/internal/backend" remoteBackend "github.com/hashicorp/terraform/internal/backend/remote" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans/planfile" ) diff --git a/command/apply_destroy_test.go b/internal/command/apply_destroy_test.go similarity index 100% rename from command/apply_destroy_test.go rename to internal/command/apply_destroy_test.go diff --git a/command/apply_test.go b/internal/command/apply_test.go similarity index 99% rename from command/apply_test.go rename to internal/command/apply_test.go index 0a8c5e65b5..25c604f9ab 100644 --- a/command/apply_test.go +++ b/internal/command/apply_test.go @@ -20,9 +20,9 @@ import ( "github.com/mitchellh/cli" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" diff --git a/command/arguments/apply.go b/internal/command/arguments/apply.go similarity index 100% rename from command/arguments/apply.go rename to internal/command/arguments/apply.go diff --git a/command/arguments/apply_test.go b/internal/command/arguments/apply_test.go similarity index 100% rename from command/arguments/apply_test.go rename to internal/command/arguments/apply_test.go diff --git a/command/arguments/default.go b/internal/command/arguments/default.go similarity index 100% rename from command/arguments/default.go rename to internal/command/arguments/default.go diff --git a/command/arguments/extended.go b/internal/command/arguments/extended.go similarity index 100% rename from command/arguments/extended.go rename to internal/command/arguments/extended.go diff --git a/command/arguments/flags.go b/internal/command/arguments/flags.go similarity index 100% rename from command/arguments/flags.go rename to internal/command/arguments/flags.go diff --git a/command/arguments/output.go b/internal/command/arguments/output.go similarity index 100% rename from command/arguments/output.go rename to internal/command/arguments/output.go diff --git a/command/arguments/output_test.go b/internal/command/arguments/output_test.go similarity index 100% rename from command/arguments/output_test.go rename to internal/command/arguments/output_test.go diff --git a/command/arguments/plan.go b/internal/command/arguments/plan.go similarity index 100% rename from command/arguments/plan.go rename to internal/command/arguments/plan.go diff --git a/command/arguments/plan_test.go b/internal/command/arguments/plan_test.go similarity index 100% rename from command/arguments/plan_test.go rename to internal/command/arguments/plan_test.go diff --git a/command/arguments/refresh.go b/internal/command/arguments/refresh.go similarity index 100% rename from command/arguments/refresh.go rename to internal/command/arguments/refresh.go diff --git a/command/arguments/refresh_test.go b/internal/command/arguments/refresh_test.go similarity index 100% rename from command/arguments/refresh_test.go rename to internal/command/arguments/refresh_test.go diff --git a/command/arguments/test.go b/internal/command/arguments/test.go similarity index 100% rename from command/arguments/test.go rename to internal/command/arguments/test.go diff --git a/command/arguments/test_test.go b/internal/command/arguments/test_test.go similarity index 100% rename from command/arguments/test_test.go rename to internal/command/arguments/test_test.go diff --git a/command/arguments/types.go b/internal/command/arguments/types.go similarity index 100% rename from command/arguments/types.go rename to internal/command/arguments/types.go diff --git a/command/arguments/validate.go b/internal/command/arguments/validate.go similarity index 100% rename from command/arguments/validate.go rename to internal/command/arguments/validate.go diff --git a/command/arguments/validate_test.go b/internal/command/arguments/validate_test.go similarity index 100% rename from command/arguments/validate_test.go rename to internal/command/arguments/validate_test.go diff --git a/command/arguments/view.go b/internal/command/arguments/view.go similarity index 100% rename from command/arguments/view.go rename to internal/command/arguments/view.go diff --git a/command/arguments/view_test.go b/internal/command/arguments/view_test.go similarity index 100% rename from command/arguments/view_test.go rename to internal/command/arguments/view_test.go diff --git a/command/autocomplete.go b/internal/command/autocomplete.go similarity index 100% rename from command/autocomplete.go rename to internal/command/autocomplete.go diff --git a/command/autocomplete_test.go b/internal/command/autocomplete_test.go similarity index 100% rename from command/autocomplete_test.go rename to internal/command/autocomplete_test.go diff --git a/command/cli_ui.go b/internal/command/cli_ui.go similarity index 100% rename from command/cli_ui.go rename to internal/command/cli_ui.go diff --git a/command/cli_ui_test.go b/internal/command/cli_ui_test.go similarity index 100% rename from command/cli_ui_test.go rename to internal/command/cli_ui_test.go diff --git a/command/cliconfig/cliconfig.go b/internal/command/cliconfig/cliconfig.go similarity index 100% rename from command/cliconfig/cliconfig.go rename to internal/command/cliconfig/cliconfig.go diff --git a/command/cliconfig/cliconfig_test.go b/internal/command/cliconfig/cliconfig_test.go similarity index 100% rename from command/cliconfig/cliconfig_test.go rename to internal/command/cliconfig/cliconfig_test.go diff --git a/command/cliconfig/config_unix.go b/internal/command/cliconfig/config_unix.go similarity index 100% rename from command/cliconfig/config_unix.go rename to internal/command/cliconfig/config_unix.go diff --git a/command/cliconfig/config_windows.go b/internal/command/cliconfig/config_windows.go similarity index 100% rename from command/cliconfig/config_windows.go rename to internal/command/cliconfig/config_windows.go diff --git a/command/cliconfig/credentials.go b/internal/command/cliconfig/credentials.go similarity index 100% rename from command/cliconfig/credentials.go rename to internal/command/cliconfig/credentials.go diff --git a/command/cliconfig/credentials_test.go b/internal/command/cliconfig/credentials_test.go similarity index 100% rename from command/cliconfig/credentials_test.go rename to internal/command/cliconfig/credentials_test.go diff --git a/command/cliconfig/provider_installation.go b/internal/command/cliconfig/provider_installation.go similarity index 100% rename from command/cliconfig/provider_installation.go rename to internal/command/cliconfig/provider_installation.go diff --git a/command/cliconfig/provider_installation_test.go b/internal/command/cliconfig/provider_installation_test.go similarity index 100% rename from command/cliconfig/provider_installation_test.go rename to internal/command/cliconfig/provider_installation_test.go diff --git a/command/cliconfig/testdata/config b/internal/command/cliconfig/testdata/config similarity index 100% rename from command/cliconfig/testdata/config rename to internal/command/cliconfig/testdata/config diff --git a/command/cliconfig/testdata/config-env b/internal/command/cliconfig/testdata/config-env similarity index 100% rename from command/cliconfig/testdata/config-env rename to internal/command/cliconfig/testdata/config-env diff --git a/command/cliconfig/testdata/credentials b/internal/command/cliconfig/testdata/credentials similarity index 100% rename from command/cliconfig/testdata/credentials rename to internal/command/cliconfig/testdata/credentials diff --git a/command/cliconfig/testdata/hosts b/internal/command/cliconfig/testdata/hosts similarity index 100% rename from command/cliconfig/testdata/hosts rename to internal/command/cliconfig/testdata/hosts diff --git a/command/cliconfig/testdata/provider-installation b/internal/command/cliconfig/testdata/provider-installation similarity index 100% rename from command/cliconfig/testdata/provider-installation rename to internal/command/cliconfig/testdata/provider-installation diff --git a/command/cliconfig/testdata/provider-installation-errors b/internal/command/cliconfig/testdata/provider-installation-errors similarity index 100% rename from command/cliconfig/testdata/provider-installation-errors rename to internal/command/cliconfig/testdata/provider-installation-errors diff --git a/command/cliconfig/testdata/provider-installation.json b/internal/command/cliconfig/testdata/provider-installation.json similarity index 100% rename from command/cliconfig/testdata/provider-installation.json rename to internal/command/cliconfig/testdata/provider-installation.json diff --git a/command/clistate/local_state.go b/internal/command/clistate/local_state.go similarity index 100% rename from command/clistate/local_state.go rename to internal/command/clistate/local_state.go diff --git a/command/clistate/local_state_lock_unix.go b/internal/command/clistate/local_state_lock_unix.go similarity index 100% rename from command/clistate/local_state_lock_unix.go rename to internal/command/clistate/local_state_lock_unix.go diff --git a/command/clistate/local_state_lock_windows.go b/internal/command/clistate/local_state_lock_windows.go similarity index 100% rename from command/clistate/local_state_lock_windows.go rename to internal/command/clistate/local_state_lock_windows.go diff --git a/command/clistate/state.go b/internal/command/clistate/state.go similarity index 98% rename from command/clistate/state.go rename to internal/command/clistate/state.go index b24562f5f7..b99c085f9b 100644 --- a/command/clistate/state.go +++ b/internal/command/clistate/state.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/hashicorp/terraform/command/views" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/helper/slowmessage" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states/statemgr" diff --git a/command/clistate/state_test.go b/internal/command/clistate/state_test.go similarity index 80% rename from command/clistate/state_test.go rename to internal/command/clistate/state_test.go index b455b58b56..c0bcef112c 100644 --- a/command/clistate/state_test.go +++ b/internal/command/clistate/state_test.go @@ -3,8 +3,8 @@ package clistate import ( "testing" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/views" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/states/statemgr" ) diff --git a/command/command.go b/internal/command/command.go similarity index 100% rename from command/command.go rename to internal/command/command.go diff --git a/command/command_test.go b/internal/command/command_test.go similarity index 99% rename from command/command_test.go rename to internal/command/command_test.go index c48db1f5ac..bf862148b4 100644 --- a/command/command_test.go +++ b/internal/command/command_test.go @@ -20,13 +20,13 @@ import ( svchost "github.com/hashicorp/terraform-svchost" "github.com/hashicorp/terraform-svchost/disco" - "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configload" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" backendInit "github.com/hashicorp/terraform/internal/backend/init" backendLocal "github.com/hashicorp/terraform/internal/backend/local" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/copy" "github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/internal/initwd" diff --git a/command/console.go b/internal/command/console.go similarity index 100% rename from command/console.go rename to internal/command/console.go diff --git a/command/console_interactive.go b/internal/command/console_interactive.go similarity index 100% rename from command/console_interactive.go rename to internal/command/console_interactive.go diff --git a/command/console_interactive_solaris.go b/internal/command/console_interactive_solaris.go similarity index 100% rename from command/console_interactive_solaris.go rename to internal/command/console_interactive_solaris.go diff --git a/command/console_test.go b/internal/command/console_test.go similarity index 100% rename from command/console_test.go rename to internal/command/console_test.go diff --git a/command/e2etest/.gitignore b/internal/command/e2etest/.gitignore similarity index 100% rename from command/e2etest/.gitignore rename to internal/command/e2etest/.gitignore diff --git a/command/e2etest/automation_test.go b/internal/command/e2etest/automation_test.go similarity index 100% rename from command/e2etest/automation_test.go rename to internal/command/e2etest/automation_test.go diff --git a/command/e2etest/doc.go b/internal/command/e2etest/doc.go similarity index 100% rename from command/e2etest/doc.go rename to internal/command/e2etest/doc.go diff --git a/command/e2etest/init_test.go b/internal/command/e2etest/init_test.go similarity index 100% rename from command/e2etest/init_test.go rename to internal/command/e2etest/init_test.go diff --git a/command/e2etest/main_test.go b/internal/command/e2etest/main_test.go similarity index 100% rename from command/e2etest/main_test.go rename to internal/command/e2etest/main_test.go diff --git a/command/e2etest/make-archive.sh b/internal/command/e2etest/make-archive.sh similarity index 100% rename from command/e2etest/make-archive.sh rename to internal/command/e2etest/make-archive.sh diff --git a/command/e2etest/primary_test.go b/internal/command/e2etest/primary_test.go similarity index 100% rename from command/e2etest/primary_test.go rename to internal/command/e2etest/primary_test.go diff --git a/command/e2etest/provider_dev_test.go b/internal/command/e2etest/provider_dev_test.go similarity index 100% rename from command/e2etest/provider_dev_test.go rename to internal/command/e2etest/provider_dev_test.go diff --git a/command/e2etest/provider_plugin_test.go b/internal/command/e2etest/provider_plugin_test.go similarity index 100% rename from command/e2etest/provider_plugin_test.go rename to internal/command/e2etest/provider_plugin_test.go diff --git a/command/e2etest/providers_mirror_test.go b/internal/command/e2etest/providers_mirror_test.go similarity index 100% rename from command/e2etest/providers_mirror_test.go rename to internal/command/e2etest/providers_mirror_test.go diff --git a/command/e2etest/provisioner_plugin_test.go b/internal/command/e2etest/provisioner_plugin_test.go similarity index 100% rename from command/e2etest/provisioner_plugin_test.go rename to internal/command/e2etest/provisioner_plugin_test.go diff --git a/command/e2etest/provisioner_test.go b/internal/command/e2etest/provisioner_test.go similarity index 100% rename from command/e2etest/provisioner_test.go rename to internal/command/e2etest/provisioner_test.go diff --git a/command/e2etest/remote_state_test.go b/internal/command/e2etest/remote_state_test.go similarity index 100% rename from command/e2etest/remote_state_test.go rename to internal/command/e2etest/remote_state_test.go diff --git a/command/e2etest/strip_ansi.go b/internal/command/e2etest/strip_ansi.go similarity index 100% rename from command/e2etest/strip_ansi.go rename to internal/command/e2etest/strip_ansi.go diff --git a/command/e2etest/testdata/chdir-option/subdir/main.tf b/internal/command/e2etest/testdata/chdir-option/subdir/main.tf similarity index 100% rename from command/e2etest/testdata/chdir-option/subdir/main.tf rename to internal/command/e2etest/testdata/chdir-option/subdir/main.tf diff --git a/command/e2etest/testdata/custom-provider-install-method/cliconfig.tfrc b/internal/command/e2etest/testdata/custom-provider-install-method/cliconfig.tfrc similarity index 100% rename from command/e2etest/testdata/custom-provider-install-method/cliconfig.tfrc rename to internal/command/e2etest/testdata/custom-provider-install-method/cliconfig.tfrc diff --git a/command/e2etest/testdata/custom-provider-install-method/cliconfig.tfrc.json b/internal/command/e2etest/testdata/custom-provider-install-method/cliconfig.tfrc.json similarity index 100% rename from command/e2etest/testdata/custom-provider-install-method/cliconfig.tfrc.json rename to internal/command/e2etest/testdata/custom-provider-install-method/cliconfig.tfrc.json diff --git a/command/e2etest/testdata/custom-provider-install-method/fs-mirror/example.com/awesomecorp/happycloud/1.2.0/os_arch/terraform-provider-happycloud_v1.2.0 b/internal/command/e2etest/testdata/custom-provider-install-method/fs-mirror/example.com/awesomecorp/happycloud/1.2.0/os_arch/terraform-provider-happycloud_v1.2.0 similarity index 100% rename from command/e2etest/testdata/custom-provider-install-method/fs-mirror/example.com/awesomecorp/happycloud/1.2.0/os_arch/terraform-provider-happycloud_v1.2.0 rename to internal/command/e2etest/testdata/custom-provider-install-method/fs-mirror/example.com/awesomecorp/happycloud/1.2.0/os_arch/terraform-provider-happycloud_v1.2.0 diff --git a/command/e2etest/testdata/custom-provider-install-method/main.tf b/internal/command/e2etest/testdata/custom-provider-install-method/main.tf similarity index 100% rename from command/e2etest/testdata/custom-provider-install-method/main.tf rename to internal/command/e2etest/testdata/custom-provider-install-method/main.tf diff --git a/command/e2etest/testdata/empty/.exists b/internal/command/e2etest/testdata/empty/.exists similarity index 100% rename from command/e2etest/testdata/empty/.exists rename to internal/command/e2etest/testdata/empty/.exists diff --git a/command/e2etest/testdata/full-workflow-null/main.tf b/internal/command/e2etest/testdata/full-workflow-null/main.tf similarity index 100% rename from command/e2etest/testdata/full-workflow-null/main.tf rename to internal/command/e2etest/testdata/full-workflow-null/main.tf diff --git a/command/e2etest/testdata/local-only-provider/main.tf b/internal/command/e2etest/testdata/local-only-provider/main.tf similarity index 100% rename from command/e2etest/testdata/local-only-provider/main.tf rename to internal/command/e2etest/testdata/local-only-provider/main.tf diff --git a/command/e2etest/testdata/local-only-provider/terraform.d/plugins/example.com/awesomecorp/happycloud/1.2.0/os_arch/terraform-provider-happycloud_v1.2.0 b/internal/command/e2etest/testdata/local-only-provider/terraform.d/plugins/example.com/awesomecorp/happycloud/1.2.0/os_arch/terraform-provider-happycloud_v1.2.0 similarity index 100% rename from command/e2etest/testdata/local-only-provider/terraform.d/plugins/example.com/awesomecorp/happycloud/1.2.0/os_arch/terraform-provider-happycloud_v1.2.0 rename to internal/command/e2etest/testdata/local-only-provider/terraform.d/plugins/example.com/awesomecorp/happycloud/1.2.0/os_arch/terraform-provider-happycloud_v1.2.0 diff --git a/command/e2etest/testdata/plugin-cache/cache/registry.terraform.io/hashicorp/template/2.1.0/os_arch/terraform-provider-template_v2.1.0_x4 b/internal/command/e2etest/testdata/plugin-cache/cache/registry.terraform.io/hashicorp/template/2.1.0/os_arch/terraform-provider-template_v2.1.0_x4 similarity index 100% rename from command/e2etest/testdata/plugin-cache/cache/registry.terraform.io/hashicorp/template/2.1.0/os_arch/terraform-provider-template_v2.1.0_x4 rename to internal/command/e2etest/testdata/plugin-cache/cache/registry.terraform.io/hashicorp/template/2.1.0/os_arch/terraform-provider-template_v2.1.0_x4 diff --git a/command/e2etest/testdata/plugin-cache/main.tf b/internal/command/e2etest/testdata/plugin-cache/main.tf similarity index 100% rename from command/e2etest/testdata/plugin-cache/main.tf rename to internal/command/e2etest/testdata/plugin-cache/main.tf diff --git a/command/e2etest/testdata/provider-dev-override/pkgdir/.exists b/internal/command/e2etest/testdata/provider-dev-override/pkgdir/.exists similarity index 100% rename from command/e2etest/testdata/provider-dev-override/pkgdir/.exists rename to internal/command/e2etest/testdata/provider-dev-override/pkgdir/.exists diff --git a/command/e2etest/testdata/provider-dev-override/provider-dev-override.tf b/internal/command/e2etest/testdata/provider-dev-override/provider-dev-override.tf similarity index 100% rename from command/e2etest/testdata/provider-dev-override/provider-dev-override.tf rename to internal/command/e2etest/testdata/provider-dev-override/provider-dev-override.tf diff --git a/command/e2etest/testdata/provider-not-found-non-default/main.tf b/internal/command/e2etest/testdata/provider-not-found-non-default/main.tf similarity index 100% rename from command/e2etest/testdata/provider-not-found-non-default/main.tf rename to internal/command/e2etest/testdata/provider-not-found-non-default/main.tf diff --git a/command/e2etest/testdata/provider-not-found/main.tf b/internal/command/e2etest/testdata/provider-not-found/main.tf similarity index 100% rename from command/e2etest/testdata/provider-not-found/main.tf rename to internal/command/e2etest/testdata/provider-not-found/main.tf diff --git a/command/e2etest/testdata/provider-plugin/main.tf b/internal/command/e2etest/testdata/provider-plugin/main.tf similarity index 100% rename from command/e2etest/testdata/provider-plugin/main.tf rename to internal/command/e2etest/testdata/provider-plugin/main.tf diff --git a/command/e2etest/testdata/provider-warnings/main.tf b/internal/command/e2etest/testdata/provider-warnings/main.tf similarity index 100% rename from command/e2etest/testdata/provider-warnings/main.tf rename to internal/command/e2etest/testdata/provider-warnings/main.tf diff --git a/command/e2etest/testdata/provisioner-plugin/main.tf b/internal/command/e2etest/testdata/provisioner-plugin/main.tf similarity index 100% rename from command/e2etest/testdata/provisioner-plugin/main.tf rename to internal/command/e2etest/testdata/provisioner-plugin/main.tf diff --git a/command/e2etest/testdata/provisioner/main.tf b/internal/command/e2etest/testdata/provisioner/main.tf similarity index 100% rename from command/e2etest/testdata/provisioner/main.tf rename to internal/command/e2etest/testdata/provisioner/main.tf diff --git a/command/e2etest/testdata/template-provider/main.tf b/internal/command/e2etest/testdata/template-provider/main.tf similarity index 100% rename from command/e2etest/testdata/template-provider/main.tf rename to internal/command/e2etest/testdata/template-provider/main.tf diff --git a/command/e2etest/testdata/terraform-provider/main.tf b/internal/command/e2etest/testdata/terraform-provider/main.tf similarity index 100% rename from command/e2etest/testdata/terraform-provider/main.tf rename to internal/command/e2etest/testdata/terraform-provider/main.tf diff --git a/command/e2etest/testdata/terraform-provider/test.tfstate b/internal/command/e2etest/testdata/terraform-provider/test.tfstate similarity index 100% rename from command/e2etest/testdata/terraform-provider/test.tfstate rename to internal/command/e2etest/testdata/terraform-provider/test.tfstate diff --git a/command/e2etest/testdata/terraform-providers-mirror/terraform-providers-mirror.tf b/internal/command/e2etest/testdata/terraform-providers-mirror/terraform-providers-mirror.tf similarity index 100% rename from command/e2etest/testdata/terraform-providers-mirror/terraform-providers-mirror.tf rename to internal/command/e2etest/testdata/terraform-providers-mirror/terraform-providers-mirror.tf diff --git a/command/e2etest/testdata/test-provider/main.tf b/internal/command/e2etest/testdata/test-provider/main.tf similarity index 100% rename from command/e2etest/testdata/test-provider/main.tf rename to internal/command/e2etest/testdata/test-provider/main.tf diff --git a/command/e2etest/testdata/vendored-provider/main.tf b/internal/command/e2etest/testdata/vendored-provider/main.tf similarity index 100% rename from command/e2etest/testdata/vendored-provider/main.tf rename to internal/command/e2etest/testdata/vendored-provider/main.tf diff --git a/command/e2etest/testdata/vendored-provider/terraform.d/plugins/registry.terraform.io/hashicorp/null/1.0.0+local/os_arch/terraform-provider-null_v1.0.0 b/internal/command/e2etest/testdata/vendored-provider/terraform.d/plugins/registry.terraform.io/hashicorp/null/1.0.0+local/os_arch/terraform-provider-null_v1.0.0 similarity index 100% rename from command/e2etest/testdata/vendored-provider/terraform.d/plugins/registry.terraform.io/hashicorp/null/1.0.0+local/os_arch/terraform-provider-null_v1.0.0 rename to internal/command/e2etest/testdata/vendored-provider/terraform.d/plugins/registry.terraform.io/hashicorp/null/1.0.0+local/os_arch/terraform-provider-null_v1.0.0 diff --git a/command/e2etest/unmanaged_test.go b/internal/command/e2etest/unmanaged_test.go similarity index 100% rename from command/e2etest/unmanaged_test.go rename to internal/command/e2etest/unmanaged_test.go diff --git a/command/e2etest/version_test.go b/internal/command/e2etest/version_test.go similarity index 100% rename from command/e2etest/version_test.go rename to internal/command/e2etest/version_test.go diff --git a/command/flag_kv.go b/internal/command/flag_kv.go similarity index 100% rename from command/flag_kv.go rename to internal/command/flag_kv.go diff --git a/command/flag_kv_test.go b/internal/command/flag_kv_test.go similarity index 100% rename from command/flag_kv_test.go rename to internal/command/flag_kv_test.go diff --git a/command/fmt.go b/internal/command/fmt.go similarity index 100% rename from command/fmt.go rename to internal/command/fmt.go diff --git a/command/fmt_test.go b/internal/command/fmt_test.go similarity index 100% rename from command/fmt_test.go rename to internal/command/fmt_test.go diff --git a/command/format/diagnostic.go b/internal/command/format/diagnostic.go similarity index 99% rename from command/format/diagnostic.go rename to internal/command/format/diagnostic.go index e9699f1d42..c4c0c06758 100644 --- a/command/format/diagnostic.go +++ b/internal/command/format/diagnostic.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - viewsjson "github.com/hashicorp/terraform/command/views/json" + viewsjson "github.com/hashicorp/terraform/internal/command/views/json" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/mitchellh/colorstring" diff --git a/command/format/diagnostic_test.go b/internal/command/format/diagnostic_test.go similarity index 99% rename from command/format/diagnostic_test.go rename to internal/command/format/diagnostic_test.go index e2f2fc5122..ee082f33de 100644 --- a/command/format/diagnostic_test.go +++ b/internal/command/format/diagnostic_test.go @@ -10,7 +10,7 @@ import ( "github.com/mitchellh/colorstring" "github.com/zclconf/go-cty/cty" - viewsjson "github.com/hashicorp/terraform/command/views/json" + viewsjson "github.com/hashicorp/terraform/internal/command/views/json" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/command/format/diff.go b/internal/command/format/diff.go similarity index 100% rename from command/format/diff.go rename to internal/command/format/diff.go diff --git a/command/format/diff_test.go b/internal/command/format/diff_test.go similarity index 100% rename from command/format/diff_test.go rename to internal/command/format/diff_test.go diff --git a/command/format/format.go b/internal/command/format/format.go similarity index 100% rename from command/format/format.go rename to internal/command/format/format.go diff --git a/command/format/object_id.go b/internal/command/format/object_id.go similarity index 100% rename from command/format/object_id.go rename to internal/command/format/object_id.go diff --git a/command/format/object_id_test.go b/internal/command/format/object_id_test.go similarity index 100% rename from command/format/object_id_test.go rename to internal/command/format/object_id_test.go diff --git a/command/format/state.go b/internal/command/format/state.go similarity index 100% rename from command/format/state.go rename to internal/command/format/state.go diff --git a/command/format/state_test.go b/internal/command/format/state_test.go similarity index 100% rename from command/format/state_test.go rename to internal/command/format/state_test.go diff --git a/command/format/trivia.go b/internal/command/format/trivia.go similarity index 100% rename from command/format/trivia.go rename to internal/command/format/trivia.go diff --git a/command/get.go b/internal/command/get.go similarity index 100% rename from command/get.go rename to internal/command/get.go diff --git a/command/get_test.go b/internal/command/get_test.go similarity index 100% rename from command/get_test.go rename to internal/command/get_test.go diff --git a/command/graph.go b/internal/command/graph.go similarity index 100% rename from command/graph.go rename to internal/command/graph.go diff --git a/command/graph_test.go b/internal/command/graph_test.go similarity index 100% rename from command/graph_test.go rename to internal/command/graph_test.go diff --git a/command/hook_module_install.go b/internal/command/hook_module_install.go similarity index 100% rename from command/hook_module_install.go rename to internal/command/hook_module_install.go diff --git a/command/import.go b/internal/command/import.go similarity index 99% rename from command/import.go rename to internal/command/import.go index 386734e73a..ea9e2f2fc2 100644 --- a/command/import.go +++ b/internal/command/import.go @@ -10,11 +10,11 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/terraform" ) diff --git a/command/import_test.go b/internal/command/import_test.go similarity index 100% rename from command/import_test.go rename to internal/command/import_test.go diff --git a/command/init.go b/internal/command/init.go similarity index 100% rename from command/init.go rename to internal/command/init.go diff --git a/command/init_test.go b/internal/command/init_test.go similarity index 100% rename from command/init_test.go rename to internal/command/init_test.go diff --git a/command/jsonconfig/config.go b/internal/command/jsonconfig/config.go similarity index 100% rename from command/jsonconfig/config.go rename to internal/command/jsonconfig/config.go diff --git a/command/jsonconfig/doc.go b/internal/command/jsonconfig/doc.go similarity index 100% rename from command/jsonconfig/doc.go rename to internal/command/jsonconfig/doc.go diff --git a/command/jsonconfig/expression.go b/internal/command/jsonconfig/expression.go similarity index 100% rename from command/jsonconfig/expression.go rename to internal/command/jsonconfig/expression.go diff --git a/command/jsonconfig/expression_test.go b/internal/command/jsonconfig/expression_test.go similarity index 100% rename from command/jsonconfig/expression_test.go rename to internal/command/jsonconfig/expression_test.go diff --git a/command/jsonplan/doc.go b/internal/command/jsonplan/doc.go similarity index 100% rename from command/jsonplan/doc.go rename to internal/command/jsonplan/doc.go diff --git a/command/jsonplan/module.go b/internal/command/jsonplan/module.go similarity index 100% rename from command/jsonplan/module.go rename to internal/command/jsonplan/module.go diff --git a/command/jsonplan/plan.go b/internal/command/jsonplan/plan.go similarity index 99% rename from command/jsonplan/plan.go rename to internal/command/jsonplan/plan.go index 12fee997b9..f6216f3315 100644 --- a/command/jsonplan/plan.go +++ b/internal/command/jsonplan/plan.go @@ -8,10 +8,10 @@ import ( "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" - "github.com/hashicorp/terraform/command/jsonconfig" - "github.com/hashicorp/terraform/command/jsonstate" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/command/jsonconfig" + "github.com/hashicorp/terraform/internal/command/jsonstate" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statefile" diff --git a/command/jsonplan/plan_test.go b/internal/command/jsonplan/plan_test.go similarity index 100% rename from command/jsonplan/plan_test.go rename to internal/command/jsonplan/plan_test.go diff --git a/command/jsonplan/resource.go b/internal/command/jsonplan/resource.go similarity index 100% rename from command/jsonplan/resource.go rename to internal/command/jsonplan/resource.go diff --git a/command/jsonplan/values.go b/internal/command/jsonplan/values.go similarity index 100% rename from command/jsonplan/values.go rename to internal/command/jsonplan/values.go diff --git a/command/jsonplan/values_test.go b/internal/command/jsonplan/values_test.go similarity index 100% rename from command/jsonplan/values_test.go rename to internal/command/jsonplan/values_test.go diff --git a/command/jsonprovider/attribute.go b/internal/command/jsonprovider/attribute.go similarity index 100% rename from command/jsonprovider/attribute.go rename to internal/command/jsonprovider/attribute.go diff --git a/command/jsonprovider/attribute_test.go b/internal/command/jsonprovider/attribute_test.go similarity index 100% rename from command/jsonprovider/attribute_test.go rename to internal/command/jsonprovider/attribute_test.go diff --git a/command/jsonprovider/block.go b/internal/command/jsonprovider/block.go similarity index 100% rename from command/jsonprovider/block.go rename to internal/command/jsonprovider/block.go diff --git a/command/jsonprovider/block_test.go b/internal/command/jsonprovider/block_test.go similarity index 100% rename from command/jsonprovider/block_test.go rename to internal/command/jsonprovider/block_test.go diff --git a/command/jsonprovider/doc.go b/internal/command/jsonprovider/doc.go similarity index 100% rename from command/jsonprovider/doc.go rename to internal/command/jsonprovider/doc.go diff --git a/command/jsonprovider/provider.go b/internal/command/jsonprovider/provider.go similarity index 100% rename from command/jsonprovider/provider.go rename to internal/command/jsonprovider/provider.go diff --git a/command/jsonprovider/provider_test.go b/internal/command/jsonprovider/provider_test.go similarity index 100% rename from command/jsonprovider/provider_test.go rename to internal/command/jsonprovider/provider_test.go diff --git a/command/jsonprovider/schema.go b/internal/command/jsonprovider/schema.go similarity index 100% rename from command/jsonprovider/schema.go rename to internal/command/jsonprovider/schema.go diff --git a/command/jsonprovider/schema_test.go b/internal/command/jsonprovider/schema_test.go similarity index 100% rename from command/jsonprovider/schema_test.go rename to internal/command/jsonprovider/schema_test.go diff --git a/command/jsonstate/doc.go b/internal/command/jsonstate/doc.go similarity index 100% rename from command/jsonstate/doc.go rename to internal/command/jsonstate/doc.go diff --git a/command/jsonstate/state.go b/internal/command/jsonstate/state.go similarity index 100% rename from command/jsonstate/state.go rename to internal/command/jsonstate/state.go diff --git a/command/jsonstate/state_test.go b/internal/command/jsonstate/state_test.go similarity index 100% rename from command/jsonstate/state_test.go rename to internal/command/jsonstate/state_test.go diff --git a/command/login.go b/internal/command/login.go similarity index 99% rename from command/login.go rename to internal/command/login.go index d29df2ed43..f7545a1784 100644 --- a/command/login.go +++ b/internal/command/login.go @@ -20,7 +20,7 @@ import ( svchost "github.com/hashicorp/terraform-svchost" svcauth "github.com/hashicorp/terraform-svchost/auth" "github.com/hashicorp/terraform-svchost/disco" - "github.com/hashicorp/terraform/command/cliconfig" + "github.com/hashicorp/terraform/internal/command/cliconfig" "github.com/hashicorp/terraform/internal/httpclient" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/terraform" diff --git a/command/login_test.go b/internal/command/login_test.go similarity index 97% rename from command/login_test.go rename to internal/command/login_test.go index 409caa92ad..35c51f44e0 100644 --- a/command/login_test.go +++ b/internal/command/login_test.go @@ -13,10 +13,10 @@ import ( svchost "github.com/hashicorp/terraform-svchost" "github.com/hashicorp/terraform-svchost/disco" - "github.com/hashicorp/terraform/command/cliconfig" - oauthserver "github.com/hashicorp/terraform/command/testdata/login-oauth-server" - tfeserver "github.com/hashicorp/terraform/command/testdata/login-tfe-server" - "github.com/hashicorp/terraform/command/webbrowser" + "github.com/hashicorp/terraform/internal/command/cliconfig" + oauthserver "github.com/hashicorp/terraform/internal/command/testdata/login-oauth-server" + tfeserver "github.com/hashicorp/terraform/internal/command/testdata/login-tfe-server" + "github.com/hashicorp/terraform/internal/command/webbrowser" "github.com/hashicorp/terraform/internal/httpclient" "github.com/hashicorp/terraform/version" ) diff --git a/command/logout.go b/internal/command/logout.go similarity index 98% rename from command/logout.go rename to internal/command/logout.go index 36eaac4720..8d3df7a319 100644 --- a/command/logout.go +++ b/internal/command/logout.go @@ -6,7 +6,7 @@ import ( "strings" svchost "github.com/hashicorp/terraform-svchost" - "github.com/hashicorp/terraform/command/cliconfig" + "github.com/hashicorp/terraform/internal/command/cliconfig" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/command/logout_test.go b/internal/command/logout_test.go similarity index 97% rename from command/logout_test.go rename to internal/command/logout_test.go index a4c17cf175..19472e3149 100644 --- a/command/logout_test.go +++ b/internal/command/logout_test.go @@ -11,7 +11,7 @@ import ( svchost "github.com/hashicorp/terraform-svchost" svcauth "github.com/hashicorp/terraform-svchost/auth" "github.com/hashicorp/terraform-svchost/disco" - "github.com/hashicorp/terraform/command/cliconfig" + "github.com/hashicorp/terraform/internal/command/cliconfig" ) func TestLogout(t *testing.T) { diff --git a/command/meta.go b/internal/command/meta.go similarity index 99% rename from command/meta.go rename to internal/command/meta.go index 6054587e41..044525ef96 100644 --- a/command/meta.go +++ b/internal/command/meta.go @@ -18,14 +18,14 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/hashicorp/terraform-svchost/disco" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/format" - "github.com/hashicorp/terraform/command/views" - "github.com/hashicorp/terraform/command/webbrowser" "github.com/hashicorp/terraform/configs/configload" "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend/local" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/format" + "github.com/hashicorp/terraform/internal/command/views" + "github.com/hashicorp/terraform/internal/command/webbrowser" "github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" diff --git a/command/meta_backend.go b/internal/command/meta_backend.go similarity index 99% rename from command/meta_backend.go rename to internal/command/meta_backend.go index 1f45af29a0..5d75b17570 100644 --- a/command/meta_backend.go +++ b/internal/command/meta_backend.go @@ -15,12 +15,12 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/clistate" - "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/backend" remoteBackend "github.com/hashicorp/terraform/internal/backend/remote" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/clistate" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states/statemgr" diff --git a/command/meta_backend_migrate.go b/internal/command/meta_backend_migrate.go similarity index 99% rename from command/meta_backend_migrate.go rename to internal/command/meta_backend_migrate.go index 797eff0542..ed81f6c264 100644 --- a/command/meta_backend_migrate.go +++ b/internal/command/meta_backend_migrate.go @@ -11,10 +11,10 @@ import ( "sort" "strings" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/clistate" - "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/clistate" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/terraform" diff --git a/command/meta_backend_test.go b/internal/command/meta_backend_test.go similarity index 100% rename from command/meta_backend_test.go rename to internal/command/meta_backend_test.go diff --git a/command/meta_config.go b/internal/command/meta_config.go similarity index 100% rename from command/meta_config.go rename to internal/command/meta_config.go diff --git a/command/meta_dependencies.go b/internal/command/meta_dependencies.go similarity index 100% rename from command/meta_dependencies.go rename to internal/command/meta_dependencies.go diff --git a/command/meta_new.go b/internal/command/meta_new.go similarity index 100% rename from command/meta_new.go rename to internal/command/meta_new.go diff --git a/command/meta_providers.go b/internal/command/meta_providers.go similarity index 100% rename from command/meta_providers.go rename to internal/command/meta_providers.go diff --git a/command/meta_test.go b/internal/command/meta_test.go similarity index 100% rename from command/meta_test.go rename to internal/command/meta_test.go diff --git a/command/meta_vars.go b/internal/command/meta_vars.go similarity index 100% rename from command/meta_vars.go rename to internal/command/meta_vars.go diff --git a/command/output.go b/internal/command/output.go similarity index 96% rename from command/output.go rename to internal/command/output.go index 2561e83376..c84e3c3c32 100644 --- a/command/output.go +++ b/internal/command/output.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/views" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" ) diff --git a/command/output_test.go b/internal/command/output_test.go similarity index 100% rename from command/output_test.go rename to internal/command/output_test.go diff --git a/command/plan.go b/internal/command/plan.go similarity index 98% rename from command/plan.go rename to internal/command/plan.go index ccbf711b42..ec90d8371b 100644 --- a/command/plan.go +++ b/internal/command/plan.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/command/plan_test.go b/internal/command/plan_test.go similarity index 100% rename from command/plan_test.go rename to internal/command/plan_test.go diff --git a/command/plugins.go b/internal/command/plugins.go similarity index 100% rename from command/plugins.go rename to internal/command/plugins.go diff --git a/command/plugins_lock.go b/internal/command/plugins_lock.go similarity index 100% rename from command/plugins_lock.go rename to internal/command/plugins_lock.go diff --git a/command/plugins_lock_test.go b/internal/command/plugins_lock_test.go similarity index 100% rename from command/plugins_lock_test.go rename to internal/command/plugins_lock_test.go diff --git a/command/plugins_test.go b/internal/command/plugins_test.go similarity index 100% rename from command/plugins_test.go rename to internal/command/plugins_test.go diff --git a/command/providers.go b/internal/command/providers.go similarity index 100% rename from command/providers.go rename to internal/command/providers.go diff --git a/command/providers_lock.go b/internal/command/providers_lock.go similarity index 100% rename from command/providers_lock.go rename to internal/command/providers_lock.go diff --git a/command/providers_mirror.go b/internal/command/providers_mirror.go similarity index 100% rename from command/providers_mirror.go rename to internal/command/providers_mirror.go diff --git a/command/providers_schema.go b/internal/command/providers_schema.go similarity index 97% rename from command/providers_schema.go rename to internal/command/providers_schema.go index 5013a67091..e2be06ca04 100644 --- a/command/providers_schema.go +++ b/internal/command/providers_schema.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/hashicorp/terraform/command/jsonprovider" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/command/jsonprovider" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/command/providers_schema_test.go b/internal/command/providers_schema_test.go similarity index 100% rename from command/providers_schema_test.go rename to internal/command/providers_schema_test.go diff --git a/command/providers_test.go b/internal/command/providers_test.go similarity index 100% rename from command/providers_test.go rename to internal/command/providers_test.go diff --git a/command/push.go b/internal/command/push.go similarity index 100% rename from command/push.go rename to internal/command/push.go diff --git a/command/refresh.go b/internal/command/refresh.go similarity index 98% rename from command/refresh.go rename to internal/command/refresh.go index 0a37b05e80..75cfc3458e 100644 --- a/command/refresh.go +++ b/internal/command/refresh.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/command/refresh_test.go b/internal/command/refresh_test.go similarity index 100% rename from command/refresh_test.go rename to internal/command/refresh_test.go diff --git a/command/show.go b/internal/command/show.go similarity index 95% rename from command/show.go rename to internal/command/show.go index f524002f0d..fd703b5a71 100644 --- a/command/show.go +++ b/internal/command/show.go @@ -5,12 +5,12 @@ import ( "os" "strings" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/format" - "github.com/hashicorp/terraform/command/jsonplan" - "github.com/hashicorp/terraform/command/jsonstate" - "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/format" + "github.com/hashicorp/terraform/internal/command/jsonplan" + "github.com/hashicorp/terraform/internal/command/jsonstate" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/plans/planfile" diff --git a/command/show_test.go b/internal/command/show_test.go similarity index 100% rename from command/show_test.go rename to internal/command/show_test.go diff --git a/command/state_command.go b/internal/command/state_command.go similarity index 100% rename from command/state_command.go rename to internal/command/state_command.go diff --git a/command/state_list.go b/internal/command/state_list.go similarity index 100% rename from command/state_list.go rename to internal/command/state_list.go diff --git a/command/state_list_test.go b/internal/command/state_list_test.go similarity index 100% rename from command/state_list_test.go rename to internal/command/state_list_test.go diff --git a/command/state_meta.go b/internal/command/state_meta.go similarity index 100% rename from command/state_meta.go rename to internal/command/state_meta.go diff --git a/command/state_mv.go b/internal/command/state_mv.go similarity index 98% rename from command/state_mv.go rename to internal/command/state_mv.go index 22119d8ecb..eceb3aa96e 100644 --- a/command/state_mv.go +++ b/internal/command/state_mv.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/clistate" - "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/clistate" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" "github.com/mitchellh/cli" diff --git a/command/state_mv_test.go b/internal/command/state_mv_test.go similarity index 100% rename from command/state_mv_test.go rename to internal/command/state_mv_test.go diff --git a/command/state_pull.go b/internal/command/state_pull.go similarity index 100% rename from command/state_pull.go rename to internal/command/state_pull.go diff --git a/command/state_pull_test.go b/internal/command/state_pull_test.go similarity index 100% rename from command/state_pull_test.go rename to internal/command/state_pull_test.go diff --git a/command/state_push.go b/internal/command/state_push.go similarity index 96% rename from command/state_push.go rename to internal/command/state_push.go index 8d5f86bcd5..2846fd31bb 100644 --- a/command/state_push.go +++ b/internal/command/state_push.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/clistate" - "github.com/hashicorp/terraform/command/views" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/clistate" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/states/statefile" "github.com/hashicorp/terraform/states/statemgr" "github.com/mitchellh/cli" diff --git a/command/state_push_test.go b/internal/command/state_push_test.go similarity index 100% rename from command/state_push_test.go rename to internal/command/state_push_test.go diff --git a/command/state_replace_provider.go b/internal/command/state_replace_provider.go similarity index 96% rename from command/state_replace_provider.go rename to internal/command/state_replace_provider.go index 157666ce39..76c978233a 100644 --- a/command/state_replace_provider.go +++ b/internal/command/state_replace_provider.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/clistate" - "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/clistate" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" "github.com/mitchellh/cli" diff --git a/command/state_replace_provider_test.go b/internal/command/state_replace_provider_test.go similarity index 100% rename from command/state_replace_provider_test.go rename to internal/command/state_replace_provider_test.go diff --git a/command/state_rm.go b/internal/command/state_rm.go similarity index 96% rename from command/state_rm.go rename to internal/command/state_rm.go index 7fad63013e..03547f658f 100644 --- a/command/state_rm.go +++ b/internal/command/state_rm.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/clistate" - "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/clistate" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/mitchellh/cli" ) diff --git a/command/state_rm_test.go b/internal/command/state_rm_test.go similarity index 100% rename from command/state_rm_test.go rename to internal/command/state_rm_test.go diff --git a/command/state_show.go b/internal/command/state_show.go similarity index 98% rename from command/state_show.go rename to internal/command/state_show.go index dcea93e662..a8188c09f1 100644 --- a/command/state_show.go +++ b/internal/command/state_show.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "github.com/hashicorp/terraform/command/format" "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/command/format" "github.com/hashicorp/terraform/states" "github.com/mitchellh/cli" ) diff --git a/command/state_show_test.go b/internal/command/state_show_test.go similarity index 100% rename from command/state_show_test.go rename to internal/command/state_show_test.go diff --git a/command/state_test.go b/internal/command/state_test.go similarity index 100% rename from command/state_test.go rename to internal/command/state_test.go diff --git a/command/taint.go b/internal/command/taint.go similarity index 97% rename from command/taint.go rename to internal/command/taint.go index 75f49084ff..e73aed95ca 100644 --- a/command/taint.go +++ b/internal/command/taint.go @@ -5,10 +5,10 @@ import ( "os" "strings" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/clistate" - "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/clistate" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" diff --git a/command/taint_test.go b/internal/command/taint_test.go similarity index 100% rename from command/taint_test.go rename to internal/command/taint_test.go diff --git a/command/test.go b/internal/command/test.go similarity index 99% rename from command/test.go rename to internal/command/test.go index 9d26ea15aa..03a45c5215 100644 --- a/command/test.go +++ b/internal/command/test.go @@ -11,12 +11,12 @@ import ( ctyjson "github.com/zclconf/go-cty/cty/json" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/format" - "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configload" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/format" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/depsfile" "github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/moduletest" diff --git a/command/test_test.go b/internal/command/test_test.go similarity index 98% rename from command/test_test.go rename to internal/command/test_test.go index ea7a1aa725..1f776b5ffd 100644 --- a/command/test_test.go +++ b/internal/command/test_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform/command/views" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/terminal" ) diff --git a/command/testdata/apply-config-invalid/main.tf b/internal/command/testdata/apply-config-invalid/main.tf similarity index 100% rename from command/testdata/apply-config-invalid/main.tf rename to internal/command/testdata/apply-config-invalid/main.tf diff --git a/command/testdata/apply-destroy-targeted/main.tf b/internal/command/testdata/apply-destroy-targeted/main.tf similarity index 100% rename from command/testdata/apply-destroy-targeted/main.tf rename to internal/command/testdata/apply-destroy-targeted/main.tf diff --git a/command/testdata/apply-error/main.tf b/internal/command/testdata/apply-error/main.tf similarity index 100% rename from command/testdata/apply-error/main.tf rename to internal/command/testdata/apply-error/main.tf diff --git a/command/testdata/apply-input-partial/main.tf b/internal/command/testdata/apply-input-partial/main.tf similarity index 100% rename from command/testdata/apply-input-partial/main.tf rename to internal/command/testdata/apply-input-partial/main.tf diff --git a/command/testdata/apply-input/main.tf b/internal/command/testdata/apply-input/main.tf similarity index 100% rename from command/testdata/apply-input/main.tf rename to internal/command/testdata/apply-input/main.tf diff --git a/command/testdata/apply-plan-no-module/main.tf b/internal/command/testdata/apply-plan-no-module/main.tf similarity index 100% rename from command/testdata/apply-plan-no-module/main.tf rename to internal/command/testdata/apply-plan-no-module/main.tf diff --git a/command/testdata/apply-replace/main.tf b/internal/command/testdata/apply-replace/main.tf similarity index 100% rename from command/testdata/apply-replace/main.tf rename to internal/command/testdata/apply-replace/main.tf diff --git a/command/testdata/apply-sensitive-output/main.tf b/internal/command/testdata/apply-sensitive-output/main.tf similarity index 100% rename from command/testdata/apply-sensitive-output/main.tf rename to internal/command/testdata/apply-sensitive-output/main.tf diff --git a/command/testdata/apply-shutdown/main.tf b/internal/command/testdata/apply-shutdown/main.tf similarity index 100% rename from command/testdata/apply-shutdown/main.tf rename to internal/command/testdata/apply-shutdown/main.tf diff --git a/command/testdata/apply-targeted/main.tf b/internal/command/testdata/apply-targeted/main.tf similarity index 100% rename from command/testdata/apply-targeted/main.tf rename to internal/command/testdata/apply-targeted/main.tf diff --git a/command/testdata/apply-terraform-env/main.tf b/internal/command/testdata/apply-terraform-env/main.tf similarity index 100% rename from command/testdata/apply-terraform-env/main.tf rename to internal/command/testdata/apply-terraform-env/main.tf diff --git a/command/testdata/apply-vars/main.tf b/internal/command/testdata/apply-vars/main.tf similarity index 100% rename from command/testdata/apply-vars/main.tf rename to internal/command/testdata/apply-vars/main.tf diff --git a/command/testdata/apply/main.tf b/internal/command/testdata/apply/main.tf similarity index 100% rename from command/testdata/apply/main.tf rename to internal/command/testdata/apply/main.tf diff --git a/command/testdata/apply/output.jsonlog b/internal/command/testdata/apply/output.jsonlog similarity index 100% rename from command/testdata/apply/output.jsonlog rename to internal/command/testdata/apply/output.jsonlog diff --git a/command/testdata/backend-change-multi-default-to-single/.terraform/terraform.tfstate b/internal/command/testdata/backend-change-multi-default-to-single/.terraform/terraform.tfstate similarity index 100% rename from command/testdata/backend-change-multi-default-to-single/.terraform/terraform.tfstate rename to internal/command/testdata/backend-change-multi-default-to-single/.terraform/terraform.tfstate diff --git a/command/testdata/backend-change-multi-default-to-single/local-state.tfstate b/internal/command/testdata/backend-change-multi-default-to-single/local-state.tfstate similarity index 100% rename from command/testdata/backend-change-multi-default-to-single/local-state.tfstate rename to internal/command/testdata/backend-change-multi-default-to-single/local-state.tfstate diff --git a/command/testdata/backend-change-multi-default-to-single/main.tf b/internal/command/testdata/backend-change-multi-default-to-single/main.tf similarity index 100% rename from command/testdata/backend-change-multi-default-to-single/main.tf rename to internal/command/testdata/backend-change-multi-default-to-single/main.tf diff --git a/command/testdata/backend-change-multi-to-multi/.terraform/terraform.tfstate b/internal/command/testdata/backend-change-multi-to-multi/.terraform/terraform.tfstate similarity index 100% rename from command/testdata/backend-change-multi-to-multi/.terraform/terraform.tfstate rename to internal/command/testdata/backend-change-multi-to-multi/.terraform/terraform.tfstate diff --git a/command/testdata/backend-change-multi-to-multi/local-state.tfstate b/internal/command/testdata/backend-change-multi-to-multi/local-state.tfstate similarity index 100% rename from command/testdata/backend-change-multi-to-multi/local-state.tfstate rename to internal/command/testdata/backend-change-multi-to-multi/local-state.tfstate diff --git a/command/testdata/backend-change-multi-to-multi/main.tf b/internal/command/testdata/backend-change-multi-to-multi/main.tf similarity index 100% rename from command/testdata/backend-change-multi-to-multi/main.tf rename to internal/command/testdata/backend-change-multi-to-multi/main.tf diff --git a/command/testdata/backend-change-multi-to-multi/terraform.tfstate.d/env2/terraform.tfstate b/internal/command/testdata/backend-change-multi-to-multi/terraform.tfstate.d/env2/terraform.tfstate similarity index 100% rename from command/testdata/backend-change-multi-to-multi/terraform.tfstate.d/env2/terraform.tfstate rename to internal/command/testdata/backend-change-multi-to-multi/terraform.tfstate.d/env2/terraform.tfstate diff --git a/command/testdata/backend-change-multi-to-no-default-with-default/.terraform/terraform.tfstate b/internal/command/testdata/backend-change-multi-to-no-default-with-default/.terraform/terraform.tfstate similarity index 100% rename from command/testdata/backend-change-multi-to-no-default-with-default/.terraform/terraform.tfstate rename to internal/command/testdata/backend-change-multi-to-no-default-with-default/.terraform/terraform.tfstate diff --git a/command/testdata/backend-change-multi-to-no-default-with-default/local-state.tfstate b/internal/command/testdata/backend-change-multi-to-no-default-with-default/local-state.tfstate similarity index 100% rename from command/testdata/backend-change-multi-to-no-default-with-default/local-state.tfstate rename to internal/command/testdata/backend-change-multi-to-no-default-with-default/local-state.tfstate diff --git a/command/testdata/backend-change-multi-to-no-default-with-default/main.tf b/internal/command/testdata/backend-change-multi-to-no-default-with-default/main.tf similarity index 100% rename from command/testdata/backend-change-multi-to-no-default-with-default/main.tf rename to internal/command/testdata/backend-change-multi-to-no-default-with-default/main.tf diff --git a/command/testdata/backend-change-multi-to-no-default-with-default/terraform.tfstate.d/env2/terraform.tfstate b/internal/command/testdata/backend-change-multi-to-no-default-with-default/terraform.tfstate.d/env2/terraform.tfstate similarity index 100% rename from command/testdata/backend-change-multi-to-no-default-with-default/terraform.tfstate.d/env2/terraform.tfstate rename to internal/command/testdata/backend-change-multi-to-no-default-with-default/terraform.tfstate.d/env2/terraform.tfstate diff --git a/command/testdata/backend-change-multi-to-no-default-without-default/.terraform/terraform.tfstate b/internal/command/testdata/backend-change-multi-to-no-default-without-default/.terraform/terraform.tfstate similarity index 100% rename from command/testdata/backend-change-multi-to-no-default-without-default/.terraform/terraform.tfstate rename to internal/command/testdata/backend-change-multi-to-no-default-without-default/.terraform/terraform.tfstate diff --git a/command/testdata/backend-change-multi-to-no-default-without-default/main.tf b/internal/command/testdata/backend-change-multi-to-no-default-without-default/main.tf similarity index 100% rename from command/testdata/backend-change-multi-to-no-default-without-default/main.tf rename to internal/command/testdata/backend-change-multi-to-no-default-without-default/main.tf diff --git a/command/testdata/backend-change-multi-to-no-default-without-default/terraform.tfstate.d/env2/terraform.tfstate b/internal/command/testdata/backend-change-multi-to-no-default-without-default/terraform.tfstate.d/env2/terraform.tfstate similarity index 100% rename from command/testdata/backend-change-multi-to-no-default-without-default/terraform.tfstate.d/env2/terraform.tfstate rename to internal/command/testdata/backend-change-multi-to-no-default-without-default/terraform.tfstate.d/env2/terraform.tfstate diff --git a/command/testdata/backend-change-multi-to-single/.terraform/environment b/internal/command/testdata/backend-change-multi-to-single/.terraform/environment similarity index 100% rename from command/testdata/backend-change-multi-to-single/.terraform/environment rename to internal/command/testdata/backend-change-multi-to-single/.terraform/environment diff --git a/command/testdata/backend-change-multi-to-single/.terraform/terraform.tfstate b/internal/command/testdata/backend-change-multi-to-single/.terraform/terraform.tfstate similarity index 100% rename from command/testdata/backend-change-multi-to-single/.terraform/terraform.tfstate rename to internal/command/testdata/backend-change-multi-to-single/.terraform/terraform.tfstate diff --git a/command/testdata/backend-change-multi-to-single/main.tf b/internal/command/testdata/backend-change-multi-to-single/main.tf similarity index 100% rename from command/testdata/backend-change-multi-to-single/main.tf rename to internal/command/testdata/backend-change-multi-to-single/main.tf diff --git a/command/testdata/backend-change-multi-to-single/terraform.tfstate.d/env1/terraform.tfstate b/internal/command/testdata/backend-change-multi-to-single/terraform.tfstate.d/env1/terraform.tfstate similarity index 100% rename from command/testdata/backend-change-multi-to-single/terraform.tfstate.d/env1/terraform.tfstate rename to internal/command/testdata/backend-change-multi-to-single/terraform.tfstate.d/env1/terraform.tfstate diff --git a/command/testdata/backend-change-multi-to-single/terraform.tfstate.d/env2/terraform.tfstate b/internal/command/testdata/backend-change-multi-to-single/terraform.tfstate.d/env2/terraform.tfstate similarity index 100% rename from command/testdata/backend-change-multi-to-single/terraform.tfstate.d/env2/terraform.tfstate rename to internal/command/testdata/backend-change-multi-to-single/terraform.tfstate.d/env2/terraform.tfstate diff --git a/command/testdata/backend-change-single-to-single/.terraform/terraform.tfstate b/internal/command/testdata/backend-change-single-to-single/.terraform/terraform.tfstate similarity index 100% rename from command/testdata/backend-change-single-to-single/.terraform/terraform.tfstate rename to internal/command/testdata/backend-change-single-to-single/.terraform/terraform.tfstate diff --git a/command/testdata/backend-change-single-to-single/local-state.tfstate b/internal/command/testdata/backend-change-single-to-single/local-state.tfstate similarity index 100% rename from command/testdata/backend-change-single-to-single/local-state.tfstate rename to internal/command/testdata/backend-change-single-to-single/local-state.tfstate diff --git a/command/testdata/backend-change-single-to-single/main.tf b/internal/command/testdata/backend-change-single-to-single/main.tf similarity index 100% rename from command/testdata/backend-change-single-to-single/main.tf rename to internal/command/testdata/backend-change-single-to-single/main.tf diff --git a/command/testdata/backend-change/.terraform/terraform.tfstate b/internal/command/testdata/backend-change/.terraform/terraform.tfstate similarity index 100% rename from command/testdata/backend-change/.terraform/terraform.tfstate rename to internal/command/testdata/backend-change/.terraform/terraform.tfstate diff --git a/command/testdata/backend-change/local-state.tfstate b/internal/command/testdata/backend-change/local-state.tfstate similarity index 100% rename from command/testdata/backend-change/local-state.tfstate rename to internal/command/testdata/backend-change/local-state.tfstate diff --git a/command/testdata/backend-change/main.tf b/internal/command/testdata/backend-change/main.tf similarity index 100% rename from command/testdata/backend-change/main.tf rename to internal/command/testdata/backend-change/main.tf diff --git a/command/testdata/backend-changed-with-legacy/.terraform/terraform.tfstate b/internal/command/testdata/backend-changed-with-legacy/.terraform/terraform.tfstate similarity index 100% rename from command/testdata/backend-changed-with-legacy/.terraform/terraform.tfstate rename to internal/command/testdata/backend-changed-with-legacy/.terraform/terraform.tfstate diff --git a/command/testdata/backend-changed-with-legacy/local-state-old.tfstate b/internal/command/testdata/backend-changed-with-legacy/local-state-old.tfstate similarity index 100% rename from command/testdata/backend-changed-with-legacy/local-state-old.tfstate rename to internal/command/testdata/backend-changed-with-legacy/local-state-old.tfstate diff --git a/command/testdata/backend-changed-with-legacy/local-state.tfstate b/internal/command/testdata/backend-changed-with-legacy/local-state.tfstate similarity index 100% rename from command/testdata/backend-changed-with-legacy/local-state.tfstate rename to internal/command/testdata/backend-changed-with-legacy/local-state.tfstate diff --git a/command/testdata/backend-changed-with-legacy/main.tf b/internal/command/testdata/backend-changed-with-legacy/main.tf similarity index 100% rename from command/testdata/backend-changed-with-legacy/main.tf rename to internal/command/testdata/backend-changed-with-legacy/main.tf diff --git a/command/testdata/backend-from-state/terraform.tfstate b/internal/command/testdata/backend-from-state/terraform.tfstate similarity index 100% rename from command/testdata/backend-from-state/terraform.tfstate rename to internal/command/testdata/backend-from-state/terraform.tfstate diff --git a/command/testdata/backend-inmem-locked/main.tf b/internal/command/testdata/backend-inmem-locked/main.tf similarity index 100% rename from command/testdata/backend-inmem-locked/main.tf rename to internal/command/testdata/backend-inmem-locked/main.tf diff --git a/command/testdata/backend-new-interp/main.tf b/internal/command/testdata/backend-new-interp/main.tf similarity index 100% rename from command/testdata/backend-new-interp/main.tf rename to internal/command/testdata/backend-new-interp/main.tf diff --git a/command/testdata/backend-new-legacy/.terraform/terraform.tfstate b/internal/command/testdata/backend-new-legacy/.terraform/terraform.tfstate similarity index 100% rename from command/testdata/backend-new-legacy/.terraform/terraform.tfstate rename to internal/command/testdata/backend-new-legacy/.terraform/terraform.tfstate diff --git a/command/testdata/backend-new-legacy/local-state-old.tfstate b/internal/command/testdata/backend-new-legacy/local-state-old.tfstate similarity index 100% rename from command/testdata/backend-new-legacy/local-state-old.tfstate rename to internal/command/testdata/backend-new-legacy/local-state-old.tfstate diff --git a/command/testdata/backend-new-legacy/main.tf b/internal/command/testdata/backend-new-legacy/main.tf similarity index 100% rename from command/testdata/backend-new-legacy/main.tf rename to internal/command/testdata/backend-new-legacy/main.tf diff --git a/command/testdata/backend-new-migrate-existing/local-state.tfstate b/internal/command/testdata/backend-new-migrate-existing/local-state.tfstate similarity index 100% rename from command/testdata/backend-new-migrate-existing/local-state.tfstate rename to internal/command/testdata/backend-new-migrate-existing/local-state.tfstate diff --git a/command/testdata/backend-new-migrate-existing/main.tf b/internal/command/testdata/backend-new-migrate-existing/main.tf similarity index 100% rename from command/testdata/backend-new-migrate-existing/main.tf rename to internal/command/testdata/backend-new-migrate-existing/main.tf diff --git a/command/testdata/backend-new-migrate-existing/terraform.tfstate b/internal/command/testdata/backend-new-migrate-existing/terraform.tfstate similarity index 100% rename from command/testdata/backend-new-migrate-existing/terraform.tfstate rename to internal/command/testdata/backend-new-migrate-existing/terraform.tfstate diff --git a/command/testdata/backend-new-migrate/main.tf b/internal/command/testdata/backend-new-migrate/main.tf similarity index 100% rename from command/testdata/backend-new-migrate/main.tf rename to internal/command/testdata/backend-new-migrate/main.tf diff --git a/command/testdata/backend-new-migrate/terraform.tfstate b/internal/command/testdata/backend-new-migrate/terraform.tfstate similarity index 100% rename from command/testdata/backend-new-migrate/terraform.tfstate rename to internal/command/testdata/backend-new-migrate/terraform.tfstate diff --git a/command/testdata/backend-new/main.tf b/internal/command/testdata/backend-new/main.tf similarity index 100% rename from command/testdata/backend-new/main.tf rename to internal/command/testdata/backend-new/main.tf diff --git a/command/testdata/backend-plan-backend-empty-config/.terraform/terraform.tfstate b/internal/command/testdata/backend-plan-backend-empty-config/.terraform/terraform.tfstate similarity index 100% rename from command/testdata/backend-plan-backend-empty-config/.terraform/terraform.tfstate rename to internal/command/testdata/backend-plan-backend-empty-config/.terraform/terraform.tfstate diff --git a/command/testdata/backend-plan-backend-empty-config/local-state.tfstate b/internal/command/testdata/backend-plan-backend-empty-config/local-state.tfstate similarity index 100% rename from command/testdata/backend-plan-backend-empty-config/local-state.tfstate rename to internal/command/testdata/backend-plan-backend-empty-config/local-state.tfstate diff --git a/command/testdata/backend-plan-backend-empty-config/main.tf b/internal/command/testdata/backend-plan-backend-empty-config/main.tf similarity index 100% rename from command/testdata/backend-plan-backend-empty-config/main.tf rename to internal/command/testdata/backend-plan-backend-empty-config/main.tf diff --git a/command/testdata/backend-plan-backend-empty/readme.txt b/internal/command/testdata/backend-plan-backend-empty/readme.txt similarity index 100% rename from command/testdata/backend-plan-backend-empty/readme.txt rename to internal/command/testdata/backend-plan-backend-empty/readme.txt diff --git a/command/testdata/backend-plan-backend-match/local-state.tfstate b/internal/command/testdata/backend-plan-backend-match/local-state.tfstate similarity index 100% rename from command/testdata/backend-plan-backend-match/local-state.tfstate rename to internal/command/testdata/backend-plan-backend-match/local-state.tfstate diff --git a/command/testdata/backend-plan-backend-match/readme.txt b/internal/command/testdata/backend-plan-backend-match/readme.txt similarity index 100% rename from command/testdata/backend-plan-backend-match/readme.txt rename to internal/command/testdata/backend-plan-backend-match/readme.txt diff --git a/command/testdata/backend-plan-backend-mismatch/local-state.tfstate b/internal/command/testdata/backend-plan-backend-mismatch/local-state.tfstate similarity index 100% rename from command/testdata/backend-plan-backend-mismatch/local-state.tfstate rename to internal/command/testdata/backend-plan-backend-mismatch/local-state.tfstate diff --git a/command/testdata/backend-plan-legacy-data/local-state.tfstate b/internal/command/testdata/backend-plan-legacy-data/local-state.tfstate similarity index 100% rename from command/testdata/backend-plan-legacy-data/local-state.tfstate rename to internal/command/testdata/backend-plan-legacy-data/local-state.tfstate diff --git a/command/testdata/backend-plan-legacy-data/main.tf b/internal/command/testdata/backend-plan-legacy-data/main.tf similarity index 100% rename from command/testdata/backend-plan-legacy-data/main.tf rename to internal/command/testdata/backend-plan-legacy-data/main.tf diff --git a/command/testdata/backend-plan-legacy-data/state.tfstate b/internal/command/testdata/backend-plan-legacy-data/state.tfstate similarity index 100% rename from command/testdata/backend-plan-legacy-data/state.tfstate rename to internal/command/testdata/backend-plan-legacy-data/state.tfstate diff --git a/command/testdata/backend-plan-legacy/readme.txt b/internal/command/testdata/backend-plan-legacy/readme.txt similarity index 100% rename from command/testdata/backend-plan-legacy/readme.txt rename to internal/command/testdata/backend-plan-legacy/readme.txt diff --git a/command/testdata/backend-plan-local-match/main.tf b/internal/command/testdata/backend-plan-local-match/main.tf similarity index 100% rename from command/testdata/backend-plan-local-match/main.tf rename to internal/command/testdata/backend-plan-local-match/main.tf diff --git a/command/testdata/backend-plan-local-match/terraform.tfstate b/internal/command/testdata/backend-plan-local-match/terraform.tfstate similarity index 100% rename from command/testdata/backend-plan-local-match/terraform.tfstate rename to internal/command/testdata/backend-plan-local-match/terraform.tfstate diff --git a/command/testdata/backend-plan-local-mismatch-lineage/main.tf b/internal/command/testdata/backend-plan-local-mismatch-lineage/main.tf similarity index 100% rename from command/testdata/backend-plan-local-mismatch-lineage/main.tf rename to internal/command/testdata/backend-plan-local-mismatch-lineage/main.tf diff --git a/command/testdata/backend-plan-local-mismatch-lineage/terraform.tfstate b/internal/command/testdata/backend-plan-local-mismatch-lineage/terraform.tfstate similarity index 100% rename from command/testdata/backend-plan-local-mismatch-lineage/terraform.tfstate rename to internal/command/testdata/backend-plan-local-mismatch-lineage/terraform.tfstate diff --git a/command/testdata/backend-plan-local-newer/main.tf b/internal/command/testdata/backend-plan-local-newer/main.tf similarity index 100% rename from command/testdata/backend-plan-local-newer/main.tf rename to internal/command/testdata/backend-plan-local-newer/main.tf diff --git a/command/testdata/backend-plan-local-newer/terraform.tfstate b/internal/command/testdata/backend-plan-local-newer/terraform.tfstate similarity index 100% rename from command/testdata/backend-plan-local-newer/terraform.tfstate rename to internal/command/testdata/backend-plan-local-newer/terraform.tfstate diff --git a/command/testdata/backend-plan-local/main.tf b/internal/command/testdata/backend-plan-local/main.tf similarity index 100% rename from command/testdata/backend-plan-local/main.tf rename to internal/command/testdata/backend-plan-local/main.tf diff --git a/command/testdata/backend-unchanged-with-legacy/.terraform/terraform.tfstate b/internal/command/testdata/backend-unchanged-with-legacy/.terraform/terraform.tfstate similarity index 100% rename from command/testdata/backend-unchanged-with-legacy/.terraform/terraform.tfstate rename to internal/command/testdata/backend-unchanged-with-legacy/.terraform/terraform.tfstate diff --git a/command/testdata/backend-unchanged-with-legacy/local-state-old.tfstate b/internal/command/testdata/backend-unchanged-with-legacy/local-state-old.tfstate similarity index 100% rename from command/testdata/backend-unchanged-with-legacy/local-state-old.tfstate rename to internal/command/testdata/backend-unchanged-with-legacy/local-state-old.tfstate diff --git a/command/testdata/backend-unchanged-with-legacy/local-state.tfstate b/internal/command/testdata/backend-unchanged-with-legacy/local-state.tfstate similarity index 100% rename from command/testdata/backend-unchanged-with-legacy/local-state.tfstate rename to internal/command/testdata/backend-unchanged-with-legacy/local-state.tfstate diff --git a/command/testdata/backend-unchanged-with-legacy/main.tf b/internal/command/testdata/backend-unchanged-with-legacy/main.tf similarity index 100% rename from command/testdata/backend-unchanged-with-legacy/main.tf rename to internal/command/testdata/backend-unchanged-with-legacy/main.tf diff --git a/command/testdata/backend-unchanged/.terraform/terraform.tfstate b/internal/command/testdata/backend-unchanged/.terraform/terraform.tfstate similarity index 100% rename from command/testdata/backend-unchanged/.terraform/terraform.tfstate rename to internal/command/testdata/backend-unchanged/.terraform/terraform.tfstate diff --git a/command/testdata/backend-unchanged/local-state.tfstate b/internal/command/testdata/backend-unchanged/local-state.tfstate similarity index 100% rename from command/testdata/backend-unchanged/local-state.tfstate rename to internal/command/testdata/backend-unchanged/local-state.tfstate diff --git a/command/testdata/backend-unchanged/main.tf b/internal/command/testdata/backend-unchanged/main.tf similarity index 100% rename from command/testdata/backend-unchanged/main.tf rename to internal/command/testdata/backend-unchanged/main.tf diff --git a/command/testdata/backend-unset-with-legacy/.terraform/terraform.tfstate b/internal/command/testdata/backend-unset-with-legacy/.terraform/terraform.tfstate similarity index 100% rename from command/testdata/backend-unset-with-legacy/.terraform/terraform.tfstate rename to internal/command/testdata/backend-unset-with-legacy/.terraform/terraform.tfstate diff --git a/command/testdata/backend-unset-with-legacy/local-state-old.tfstate b/internal/command/testdata/backend-unset-with-legacy/local-state-old.tfstate similarity index 100% rename from command/testdata/backend-unset-with-legacy/local-state-old.tfstate rename to internal/command/testdata/backend-unset-with-legacy/local-state-old.tfstate diff --git a/command/testdata/backend-unset-with-legacy/local-state.tfstate b/internal/command/testdata/backend-unset-with-legacy/local-state.tfstate similarity index 100% rename from command/testdata/backend-unset-with-legacy/local-state.tfstate rename to internal/command/testdata/backend-unset-with-legacy/local-state.tfstate diff --git a/command/testdata/backend-unset-with-legacy/main.tf b/internal/command/testdata/backend-unset-with-legacy/main.tf similarity index 100% rename from command/testdata/backend-unset-with-legacy/main.tf rename to internal/command/testdata/backend-unset-with-legacy/main.tf diff --git a/command/testdata/backend-unset/.terraform/terraform.tfstate b/internal/command/testdata/backend-unset/.terraform/terraform.tfstate similarity index 100% rename from command/testdata/backend-unset/.terraform/terraform.tfstate rename to internal/command/testdata/backend-unset/.terraform/terraform.tfstate diff --git a/command/testdata/backend-unset/local-state.tfstate b/internal/command/testdata/backend-unset/local-state.tfstate similarity index 100% rename from command/testdata/backend-unset/local-state.tfstate rename to internal/command/testdata/backend-unset/local-state.tfstate diff --git a/command/testdata/backend-unset/main.tf b/internal/command/testdata/backend-unset/main.tf similarity index 100% rename from command/testdata/backend-unset/main.tf rename to internal/command/testdata/backend-unset/main.tf diff --git a/command/testdata/empty-file b/internal/command/testdata/empty-file similarity index 100% rename from command/testdata/empty-file rename to internal/command/testdata/empty-file diff --git a/command/testdata/empty/README b/internal/command/testdata/empty/README similarity index 100% rename from command/testdata/empty/README rename to internal/command/testdata/empty/README diff --git a/command/testdata/fmt/general_in.tf b/internal/command/testdata/fmt/general_in.tf similarity index 100% rename from command/testdata/fmt/general_in.tf rename to internal/command/testdata/fmt/general_in.tf diff --git a/command/testdata/fmt/general_out.tf b/internal/command/testdata/fmt/general_out.tf similarity index 100% rename from command/testdata/fmt/general_out.tf rename to internal/command/testdata/fmt/general_out.tf diff --git a/command/testdata/fmt/variable_type_in.tf b/internal/command/testdata/fmt/variable_type_in.tf similarity index 100% rename from command/testdata/fmt/variable_type_in.tf rename to internal/command/testdata/fmt/variable_type_in.tf diff --git a/command/testdata/fmt/variable_type_out.tf b/internal/command/testdata/fmt/variable_type_out.tf similarity index 100% rename from command/testdata/fmt/variable_type_out.tf rename to internal/command/testdata/fmt/variable_type_out.tf diff --git a/command/testdata/get/foo/main.tf b/internal/command/testdata/get/foo/main.tf similarity index 100% rename from command/testdata/get/foo/main.tf rename to internal/command/testdata/get/foo/main.tf diff --git a/command/testdata/get/main.tf b/internal/command/testdata/get/main.tf similarity index 100% rename from command/testdata/get/main.tf rename to internal/command/testdata/get/main.tf diff --git a/command/testdata/graph/main.tf b/internal/command/testdata/graph/main.tf similarity index 100% rename from command/testdata/graph/main.tf rename to internal/command/testdata/graph/main.tf diff --git a/command/testdata/import-missing-resource-config/main.tf b/internal/command/testdata/import-missing-resource-config/main.tf similarity index 100% rename from command/testdata/import-missing-resource-config/main.tf rename to internal/command/testdata/import-missing-resource-config/main.tf diff --git a/command/testdata/import-module-input-variable/child/main.tf b/internal/command/testdata/import-module-input-variable/child/main.tf similarity index 100% rename from command/testdata/import-module-input-variable/child/main.tf rename to internal/command/testdata/import-module-input-variable/child/main.tf diff --git a/command/testdata/import-module-input-variable/main.tf b/internal/command/testdata/import-module-input-variable/main.tf similarity index 100% rename from command/testdata/import-module-input-variable/main.tf rename to internal/command/testdata/import-module-input-variable/main.tf diff --git a/command/testdata/import-module-input-variable/terraform.tfvars b/internal/command/testdata/import-module-input-variable/terraform.tfvars similarity index 100% rename from command/testdata/import-module-input-variable/terraform.tfvars rename to internal/command/testdata/import-module-input-variable/terraform.tfvars diff --git a/command/testdata/import-module-var-file/child/main.tf b/internal/command/testdata/import-module-var-file/child/main.tf similarity index 100% rename from command/testdata/import-module-var-file/child/main.tf rename to internal/command/testdata/import-module-var-file/child/main.tf diff --git a/command/testdata/import-module-var-file/main.tf b/internal/command/testdata/import-module-var-file/main.tf similarity index 100% rename from command/testdata/import-module-var-file/main.tf rename to internal/command/testdata/import-module-var-file/main.tf diff --git a/command/testdata/import-module-var-file/terraform.tfvars b/internal/command/testdata/import-module-var-file/terraform.tfvars similarity index 100% rename from command/testdata/import-module-var-file/terraform.tfvars rename to internal/command/testdata/import-module-var-file/terraform.tfvars diff --git a/command/testdata/import-provider-aliased/main.tf b/internal/command/testdata/import-provider-aliased/main.tf similarity index 100% rename from command/testdata/import-provider-aliased/main.tf rename to internal/command/testdata/import-provider-aliased/main.tf diff --git a/command/testdata/import-provider-datasource/main.tf b/internal/command/testdata/import-provider-datasource/main.tf similarity index 100% rename from command/testdata/import-provider-datasource/main.tf rename to internal/command/testdata/import-provider-datasource/main.tf diff --git a/command/testdata/import-provider-implicit/main.tf b/internal/command/testdata/import-provider-implicit/main.tf similarity index 100% rename from command/testdata/import-provider-implicit/main.tf rename to internal/command/testdata/import-provider-implicit/main.tf diff --git a/command/testdata/import-provider-invalid/main.tf b/internal/command/testdata/import-provider-invalid/main.tf similarity index 100% rename from command/testdata/import-provider-invalid/main.tf rename to internal/command/testdata/import-provider-invalid/main.tf diff --git a/command/testdata/import-provider-remote-state/main.tf b/internal/command/testdata/import-provider-remote-state/main.tf similarity index 100% rename from command/testdata/import-provider-remote-state/main.tf rename to internal/command/testdata/import-provider-remote-state/main.tf diff --git a/command/testdata/import-provider-var-default/main.tf b/internal/command/testdata/import-provider-var-default/main.tf similarity index 100% rename from command/testdata/import-provider-var-default/main.tf rename to internal/command/testdata/import-provider-var-default/main.tf diff --git a/command/testdata/import-provider-var-default/terraform.tfvars b/internal/command/testdata/import-provider-var-default/terraform.tfvars similarity index 100% rename from command/testdata/import-provider-var-default/terraform.tfvars rename to internal/command/testdata/import-provider-var-default/terraform.tfvars diff --git a/command/testdata/import-provider-var-file/blah.tfvars b/internal/command/testdata/import-provider-var-file/blah.tfvars similarity index 100% rename from command/testdata/import-provider-var-file/blah.tfvars rename to internal/command/testdata/import-provider-var-file/blah.tfvars diff --git a/command/testdata/import-provider-var-file/main.tf b/internal/command/testdata/import-provider-var-file/main.tf similarity index 100% rename from command/testdata/import-provider-var-file/main.tf rename to internal/command/testdata/import-provider-var-file/main.tf diff --git a/command/testdata/import-provider-var/main.tf b/internal/command/testdata/import-provider-var/main.tf similarity index 100% rename from command/testdata/import-provider-var/main.tf rename to internal/command/testdata/import-provider-var/main.tf diff --git a/command/testdata/import-provider/main.tf b/internal/command/testdata/import-provider/main.tf similarity index 100% rename from command/testdata/import-provider/main.tf rename to internal/command/testdata/import-provider/main.tf diff --git a/command/testdata/init-backend-config-file-change/.terraform/terraform.tfstate b/internal/command/testdata/init-backend-config-file-change/.terraform/terraform.tfstate similarity index 100% rename from command/testdata/init-backend-config-file-change/.terraform/terraform.tfstate rename to internal/command/testdata/init-backend-config-file-change/.terraform/terraform.tfstate diff --git a/command/testdata/init-backend-config-file-change/input.config b/internal/command/testdata/init-backend-config-file-change/input.config similarity index 100% rename from command/testdata/init-backend-config-file-change/input.config rename to internal/command/testdata/init-backend-config-file-change/input.config diff --git a/command/testdata/init-backend-config-file-change/main.tf b/internal/command/testdata/init-backend-config-file-change/main.tf similarity index 100% rename from command/testdata/init-backend-config-file-change/main.tf rename to internal/command/testdata/init-backend-config-file-change/main.tf diff --git a/command/testdata/init-backend-config-file/backend.config b/internal/command/testdata/init-backend-config-file/backend.config similarity index 100% rename from command/testdata/init-backend-config-file/backend.config rename to internal/command/testdata/init-backend-config-file/backend.config diff --git a/command/testdata/init-backend-config-file/input.config b/internal/command/testdata/init-backend-config-file/input.config similarity index 100% rename from command/testdata/init-backend-config-file/input.config rename to internal/command/testdata/init-backend-config-file/input.config diff --git a/command/testdata/init-backend-config-file/invalid.config b/internal/command/testdata/init-backend-config-file/invalid.config similarity index 100% rename from command/testdata/init-backend-config-file/invalid.config rename to internal/command/testdata/init-backend-config-file/invalid.config diff --git a/command/testdata/init-backend-config-file/main.tf b/internal/command/testdata/init-backend-config-file/main.tf similarity index 100% rename from command/testdata/init-backend-config-file/main.tf rename to internal/command/testdata/init-backend-config-file/main.tf diff --git a/command/testdata/init-backend-config-kv/main.tf b/internal/command/testdata/init-backend-config-kv/main.tf similarity index 100% rename from command/testdata/init-backend-config-kv/main.tf rename to internal/command/testdata/init-backend-config-kv/main.tf diff --git a/command/testdata/init-backend-empty/main.tf b/internal/command/testdata/init-backend-empty/main.tf similarity index 100% rename from command/testdata/init-backend-empty/main.tf rename to internal/command/testdata/init-backend-empty/main.tf diff --git a/command/testdata/init-backend/main.tf b/internal/command/testdata/init-backend/main.tf similarity index 100% rename from command/testdata/init-backend/main.tf rename to internal/command/testdata/init-backend/main.tf diff --git a/command/testdata/init-check-required-version/main.tf b/internal/command/testdata/init-check-required-version/main.tf similarity index 100% rename from command/testdata/init-check-required-version/main.tf rename to internal/command/testdata/init-check-required-version/main.tf diff --git a/command/testdata/init-get-provider-detected-legacy/.terraform/modules/dicerolls/terraform-random-bar-1.0.0/main.tf b/internal/command/testdata/init-get-provider-detected-legacy/.terraform/modules/dicerolls/terraform-random-bar-1.0.0/main.tf similarity index 100% rename from command/testdata/init-get-provider-detected-legacy/.terraform/modules/dicerolls/terraform-random-bar-1.0.0/main.tf rename to internal/command/testdata/init-get-provider-detected-legacy/.terraform/modules/dicerolls/terraform-random-bar-1.0.0/main.tf diff --git a/command/testdata/init-get-provider-detected-legacy/.terraform/modules/modules.json b/internal/command/testdata/init-get-provider-detected-legacy/.terraform/modules/modules.json similarity index 100% rename from command/testdata/init-get-provider-detected-legacy/.terraform/modules/modules.json rename to internal/command/testdata/init-get-provider-detected-legacy/.terraform/modules/modules.json diff --git a/command/testdata/init-get-provider-detected-legacy/child/main.tf b/internal/command/testdata/init-get-provider-detected-legacy/child/main.tf similarity index 100% rename from command/testdata/init-get-provider-detected-legacy/child/main.tf rename to internal/command/testdata/init-get-provider-detected-legacy/child/main.tf diff --git a/command/testdata/init-get-provider-detected-legacy/main.tf b/internal/command/testdata/init-get-provider-detected-legacy/main.tf similarity index 100% rename from command/testdata/init-get-provider-detected-legacy/main.tf rename to internal/command/testdata/init-get-provider-detected-legacy/main.tf diff --git a/command/testdata/init-get-provider-invalid-package/main.tf b/internal/command/testdata/init-get-provider-invalid-package/main.tf similarity index 100% rename from command/testdata/init-get-provider-invalid-package/main.tf rename to internal/command/testdata/init-get-provider-invalid-package/main.tf diff --git a/command/testdata/init-get-provider-legacy-from-state/main.tf b/internal/command/testdata/init-get-provider-legacy-from-state/main.tf similarity index 100% rename from command/testdata/init-get-provider-legacy-from-state/main.tf rename to internal/command/testdata/init-get-provider-legacy-from-state/main.tf diff --git a/command/testdata/init-get-provider-legacy-from-state/terraform.tfstate b/internal/command/testdata/init-get-provider-legacy-from-state/terraform.tfstate similarity index 100% rename from command/testdata/init-get-provider-legacy-from-state/terraform.tfstate rename to internal/command/testdata/init-get-provider-legacy-from-state/terraform.tfstate diff --git a/command/testdata/init-get-provider-source/main.tf b/internal/command/testdata/init-get-provider-source/main.tf similarity index 100% rename from command/testdata/init-get-provider-source/main.tf rename to internal/command/testdata/init-get-provider-source/main.tf diff --git a/command/testdata/init-get-providers/main.tf b/internal/command/testdata/init-get-providers/main.tf similarity index 100% rename from command/testdata/init-get-providers/main.tf rename to internal/command/testdata/init-get-providers/main.tf diff --git a/command/testdata/init-get/foo/main.tf b/internal/command/testdata/init-get/foo/main.tf similarity index 100% rename from command/testdata/init-get/foo/main.tf rename to internal/command/testdata/init-get/foo/main.tf diff --git a/command/testdata/init-get/main.tf b/internal/command/testdata/init-get/main.tf similarity index 100% rename from command/testdata/init-get/main.tf rename to internal/command/testdata/init-get/main.tf diff --git a/command/testdata/init-internal-invalid/main.tf b/internal/command/testdata/init-internal-invalid/main.tf similarity index 100% rename from command/testdata/init-internal-invalid/main.tf rename to internal/command/testdata/init-internal-invalid/main.tf diff --git a/command/testdata/init-internal/main.tf b/internal/command/testdata/init-internal/main.tf similarity index 100% rename from command/testdata/init-internal/main.tf rename to internal/command/testdata/init-internal/main.tf diff --git a/command/testdata/init-legacy-provider-cache/.terraform/plugins/example.com/test/b/1.1.0/os_arch/terraform-provider-b b/internal/command/testdata/init-legacy-provider-cache/.terraform/plugins/example.com/test/b/1.1.0/os_arch/terraform-provider-b similarity index 100% rename from command/testdata/init-legacy-provider-cache/.terraform/plugins/example.com/test/b/1.1.0/os_arch/terraform-provider-b rename to internal/command/testdata/init-legacy-provider-cache/.terraform/plugins/example.com/test/b/1.1.0/os_arch/terraform-provider-b diff --git a/command/testdata/init-legacy-provider-cache/.terraform/plugins/registry.terraform.io/hashicorp/c/2.0.0/os_arch/terraform-provider-c b/internal/command/testdata/init-legacy-provider-cache/.terraform/plugins/registry.terraform.io/hashicorp/c/2.0.0/os_arch/terraform-provider-c similarity index 100% rename from command/testdata/init-legacy-provider-cache/.terraform/plugins/registry.terraform.io/hashicorp/c/2.0.0/os_arch/terraform-provider-c rename to internal/command/testdata/init-legacy-provider-cache/.terraform/plugins/registry.terraform.io/hashicorp/c/2.0.0/os_arch/terraform-provider-c diff --git a/command/testdata/init-legacy-provider-cache/versions.tf b/internal/command/testdata/init-legacy-provider-cache/versions.tf similarity index 100% rename from command/testdata/init-legacy-provider-cache/versions.tf rename to internal/command/testdata/init-legacy-provider-cache/versions.tf diff --git a/command/testdata/init-legacy-rc/main.tf b/internal/command/testdata/init-legacy-rc/main.tf similarity index 100% rename from command/testdata/init-legacy-rc/main.tf rename to internal/command/testdata/init-legacy-rc/main.tf diff --git a/command/testdata/init-provider-lock-file-readonly-add/main.tf b/internal/command/testdata/init-provider-lock-file-readonly-add/main.tf similarity index 100% rename from command/testdata/init-provider-lock-file-readonly-add/main.tf rename to internal/command/testdata/init-provider-lock-file-readonly-add/main.tf diff --git a/command/testdata/init-provider-lock-file/main.tf b/internal/command/testdata/init-provider-lock-file/main.tf similarity index 100% rename from command/testdata/init-provider-lock-file/main.tf rename to internal/command/testdata/init-provider-lock-file/main.tf diff --git a/command/testdata/init-providers-lock/main.tf b/internal/command/testdata/init-providers-lock/main.tf similarity index 100% rename from command/testdata/init-providers-lock/main.tf rename to internal/command/testdata/init-providers-lock/main.tf diff --git a/command/testdata/init-required-providers/main.tf b/internal/command/testdata/init-required-providers/main.tf similarity index 100% rename from command/testdata/init-required-providers/main.tf rename to internal/command/testdata/init-required-providers/main.tf diff --git a/command/testdata/init/hello.tf b/internal/command/testdata/init/hello.tf similarity index 100% rename from command/testdata/init/hello.tf rename to internal/command/testdata/init/hello.tf diff --git a/command/testdata/inmem-backend/main.tf b/internal/command/testdata/inmem-backend/main.tf similarity index 100% rename from command/testdata/inmem-backend/main.tf rename to internal/command/testdata/inmem-backend/main.tf diff --git a/command/testdata/login-oauth-server/main.go b/internal/command/testdata/login-oauth-server/main.go similarity index 88% rename from command/testdata/login-oauth-server/main.go rename to internal/command/testdata/login-oauth-server/main.go index 70333b61a7..4dddec9dbf 100644 --- a/command/testdata/login-oauth-server/main.go +++ b/internal/command/testdata/login-oauth-server/main.go @@ -9,7 +9,7 @@ // This is _not_ the main way to use this oauthserver package. For automated // test code, import it as a normal Go package instead: // -// import oauthserver "github.com/hashicorp/terraform/command/testdata/login-oauth-server" +// import oauthserver "github.com/hashicorp/terraform/internal/command/testdata/login-oauth-server" package main @@ -19,7 +19,7 @@ import ( "net/http" "os" - oauthserver "github.com/hashicorp/terraform/command/testdata/login-oauth-server" + oauthserver "github.com/hashicorp/terraform/internal/command/testdata/login-oauth-server" ) func main() { diff --git a/command/testdata/login-oauth-server/oauthserver.go b/internal/command/testdata/login-oauth-server/oauthserver.go similarity index 100% rename from command/testdata/login-oauth-server/oauthserver.go rename to internal/command/testdata/login-oauth-server/oauthserver.go diff --git a/command/testdata/login-tfe-server/tfeserver.go b/internal/command/testdata/login-tfe-server/tfeserver.go similarity index 100% rename from command/testdata/login-tfe-server/tfeserver.go rename to internal/command/testdata/login-tfe-server/tfeserver.go diff --git a/command/testdata/modules/.terraform/modules/modules.json b/internal/command/testdata/modules/.terraform/modules/modules.json similarity index 100% rename from command/testdata/modules/.terraform/modules/modules.json rename to internal/command/testdata/modules/.terraform/modules/modules.json diff --git a/command/testdata/modules/child/main.tf b/internal/command/testdata/modules/child/main.tf similarity index 100% rename from command/testdata/modules/child/main.tf rename to internal/command/testdata/modules/child/main.tf diff --git a/command/testdata/modules/main.tf b/internal/command/testdata/modules/main.tf similarity index 100% rename from command/testdata/modules/main.tf rename to internal/command/testdata/modules/main.tf diff --git a/command/testdata/modules/terraform.tfstate b/internal/command/testdata/modules/terraform.tfstate similarity index 100% rename from command/testdata/modules/terraform.tfstate rename to internal/command/testdata/modules/terraform.tfstate diff --git a/command/testdata/parallelism/main.tf b/internal/command/testdata/parallelism/main.tf similarity index 100% rename from command/testdata/parallelism/main.tf rename to internal/command/testdata/parallelism/main.tf diff --git a/command/testdata/plan-emptydiff/main.tf b/internal/command/testdata/plan-emptydiff/main.tf similarity index 100% rename from command/testdata/plan-emptydiff/main.tf rename to internal/command/testdata/plan-emptydiff/main.tf diff --git a/command/testdata/plan-invalid/main.tf b/internal/command/testdata/plan-invalid/main.tf similarity index 100% rename from command/testdata/plan-invalid/main.tf rename to internal/command/testdata/plan-invalid/main.tf diff --git a/command/testdata/plan-out-backend-legacy/main.tf b/internal/command/testdata/plan-out-backend-legacy/main.tf similarity index 100% rename from command/testdata/plan-out-backend-legacy/main.tf rename to internal/command/testdata/plan-out-backend-legacy/main.tf diff --git a/command/testdata/plan-out-backend/main.tf b/internal/command/testdata/plan-out-backend/main.tf similarity index 100% rename from command/testdata/plan-out-backend/main.tf rename to internal/command/testdata/plan-out-backend/main.tf diff --git a/command/testdata/plan-replace/main.tf b/internal/command/testdata/plan-replace/main.tf similarity index 100% rename from command/testdata/plan-replace/main.tf rename to internal/command/testdata/plan-replace/main.tf diff --git a/command/testdata/plan-vars/main.tf b/internal/command/testdata/plan-vars/main.tf similarity index 100% rename from command/testdata/plan-vars/main.tf rename to internal/command/testdata/plan-vars/main.tf diff --git a/command/testdata/plan/main.tf b/internal/command/testdata/plan/main.tf similarity index 100% rename from command/testdata/plan/main.tf rename to internal/command/testdata/plan/main.tf diff --git a/command/testdata/providers-schema/basic/output.json b/internal/command/testdata/providers-schema/basic/output.json similarity index 100% rename from command/testdata/providers-schema/basic/output.json rename to internal/command/testdata/providers-schema/basic/output.json diff --git a/command/testdata/providers-schema/basic/provider.tf b/internal/command/testdata/providers-schema/basic/provider.tf similarity index 100% rename from command/testdata/providers-schema/basic/provider.tf rename to internal/command/testdata/providers-schema/basic/provider.tf diff --git a/command/testdata/providers-schema/empty/main.tf b/internal/command/testdata/providers-schema/empty/main.tf similarity index 100% rename from command/testdata/providers-schema/empty/main.tf rename to internal/command/testdata/providers-schema/empty/main.tf diff --git a/command/testdata/providers-schema/empty/output.json b/internal/command/testdata/providers-schema/empty/output.json similarity index 100% rename from command/testdata/providers-schema/empty/output.json rename to internal/command/testdata/providers-schema/empty/output.json diff --git a/command/testdata/providers-schema/required/output.json b/internal/command/testdata/providers-schema/required/output.json similarity index 100% rename from command/testdata/providers-schema/required/output.json rename to internal/command/testdata/providers-schema/required/output.json diff --git a/command/testdata/providers-schema/required/provider.tf b/internal/command/testdata/providers-schema/required/provider.tf similarity index 100% rename from command/testdata/providers-schema/required/provider.tf rename to internal/command/testdata/providers-schema/required/provider.tf diff --git a/command/testdata/providers/basic/main.tf b/internal/command/testdata/providers/basic/main.tf similarity index 100% rename from command/testdata/providers/basic/main.tf rename to internal/command/testdata/providers/basic/main.tf diff --git a/command/testdata/providers/modules/child/main.tf b/internal/command/testdata/providers/modules/child/main.tf similarity index 100% rename from command/testdata/providers/modules/child/main.tf rename to internal/command/testdata/providers/modules/child/main.tf diff --git a/command/testdata/providers/modules/main.tf b/internal/command/testdata/providers/modules/main.tf similarity index 100% rename from command/testdata/providers/modules/main.tf rename to internal/command/testdata/providers/modules/main.tf diff --git a/command/testdata/providers/state/main.tf b/internal/command/testdata/providers/state/main.tf similarity index 100% rename from command/testdata/providers/state/main.tf rename to internal/command/testdata/providers/state/main.tf diff --git a/command/testdata/providers/state/terraform.tfstate b/internal/command/testdata/providers/state/terraform.tfstate similarity index 100% rename from command/testdata/providers/state/terraform.tfstate rename to internal/command/testdata/providers/state/terraform.tfstate diff --git a/command/testdata/push-backend-new/main.tf b/internal/command/testdata/push-backend-new/main.tf similarity index 100% rename from command/testdata/push-backend-new/main.tf rename to internal/command/testdata/push-backend-new/main.tf diff --git a/command/testdata/push-input-partial/main.tf b/internal/command/testdata/push-input-partial/main.tf similarity index 100% rename from command/testdata/push-input-partial/main.tf rename to internal/command/testdata/push-input-partial/main.tf diff --git a/command/testdata/push-input/main.tf b/internal/command/testdata/push-input/main.tf similarity index 100% rename from command/testdata/push-input/main.tf rename to internal/command/testdata/push-input/main.tf diff --git a/command/testdata/push-no-remote/main.tf b/internal/command/testdata/push-no-remote/main.tf similarity index 100% rename from command/testdata/push-no-remote/main.tf rename to internal/command/testdata/push-no-remote/main.tf diff --git a/command/testdata/push-no-upload/child/main.tf b/internal/command/testdata/push-no-upload/child/main.tf similarity index 100% rename from command/testdata/push-no-upload/child/main.tf rename to internal/command/testdata/push-no-upload/child/main.tf diff --git a/command/testdata/push-no-upload/main.tf b/internal/command/testdata/push-no-upload/main.tf similarity index 100% rename from command/testdata/push-no-upload/main.tf rename to internal/command/testdata/push-no-upload/main.tf diff --git a/command/testdata/push-tfvars/main.tf b/internal/command/testdata/push-tfvars/main.tf similarity index 100% rename from command/testdata/push-tfvars/main.tf rename to internal/command/testdata/push-tfvars/main.tf diff --git a/command/testdata/push-tfvars/terraform.tfvars b/internal/command/testdata/push-tfvars/terraform.tfvars similarity index 100% rename from command/testdata/push-tfvars/terraform.tfvars rename to internal/command/testdata/push-tfvars/terraform.tfvars diff --git a/command/testdata/push/main.tf b/internal/command/testdata/push/main.tf similarity index 100% rename from command/testdata/push/main.tf rename to internal/command/testdata/push/main.tf diff --git a/command/testdata/refresh-empty/main.tf b/internal/command/testdata/refresh-empty/main.tf similarity index 100% rename from command/testdata/refresh-empty/main.tf rename to internal/command/testdata/refresh-empty/main.tf diff --git a/command/testdata/refresh-output/main.tf b/internal/command/testdata/refresh-output/main.tf similarity index 100% rename from command/testdata/refresh-output/main.tf rename to internal/command/testdata/refresh-output/main.tf diff --git a/command/testdata/refresh-targeted/main.tf b/internal/command/testdata/refresh-targeted/main.tf similarity index 100% rename from command/testdata/refresh-targeted/main.tf rename to internal/command/testdata/refresh-targeted/main.tf diff --git a/command/testdata/refresh-unset-var/main.tf b/internal/command/testdata/refresh-unset-var/main.tf similarity index 100% rename from command/testdata/refresh-unset-var/main.tf rename to internal/command/testdata/refresh-unset-var/main.tf diff --git a/command/testdata/refresh-var/main.tf b/internal/command/testdata/refresh-var/main.tf similarity index 100% rename from command/testdata/refresh-var/main.tf rename to internal/command/testdata/refresh-var/main.tf diff --git a/command/testdata/refresh/main.tf b/internal/command/testdata/refresh/main.tf similarity index 100% rename from command/testdata/refresh/main.tf rename to internal/command/testdata/refresh/main.tf diff --git a/command/testdata/show-json-sensitive/main.tf b/internal/command/testdata/show-json-sensitive/main.tf similarity index 100% rename from command/testdata/show-json-sensitive/main.tf rename to internal/command/testdata/show-json-sensitive/main.tf diff --git a/command/testdata/show-json-sensitive/output.json b/internal/command/testdata/show-json-sensitive/output.json similarity index 100% rename from command/testdata/show-json-sensitive/output.json rename to internal/command/testdata/show-json-sensitive/output.json diff --git a/command/testdata/show-json-state/basic/output.json b/internal/command/testdata/show-json-state/basic/output.json similarity index 100% rename from command/testdata/show-json-state/basic/output.json rename to internal/command/testdata/show-json-state/basic/output.json diff --git a/command/testdata/show-json-state/basic/terraform.tfstate b/internal/command/testdata/show-json-state/basic/terraform.tfstate similarity index 100% rename from command/testdata/show-json-state/basic/terraform.tfstate rename to internal/command/testdata/show-json-state/basic/terraform.tfstate diff --git a/command/testdata/show-json-state/empty/output.json b/internal/command/testdata/show-json-state/empty/output.json similarity index 100% rename from command/testdata/show-json-state/empty/output.json rename to internal/command/testdata/show-json-state/empty/output.json diff --git a/command/testdata/show-json-state/modules/bar/main.tf b/internal/command/testdata/show-json-state/modules/bar/main.tf similarity index 100% rename from command/testdata/show-json-state/modules/bar/main.tf rename to internal/command/testdata/show-json-state/modules/bar/main.tf diff --git a/command/testdata/show-json-state/modules/foo/main.tf b/internal/command/testdata/show-json-state/modules/foo/main.tf similarity index 100% rename from command/testdata/show-json-state/modules/foo/main.tf rename to internal/command/testdata/show-json-state/modules/foo/main.tf diff --git a/command/testdata/show-json-state/modules/main.tf b/internal/command/testdata/show-json-state/modules/main.tf similarity index 100% rename from command/testdata/show-json-state/modules/main.tf rename to internal/command/testdata/show-json-state/modules/main.tf diff --git a/command/testdata/show-json-state/modules/output.json b/internal/command/testdata/show-json-state/modules/output.json similarity index 100% rename from command/testdata/show-json-state/modules/output.json rename to internal/command/testdata/show-json-state/modules/output.json diff --git a/command/testdata/show-json-state/modules/terraform.tfstate b/internal/command/testdata/show-json-state/modules/terraform.tfstate similarity index 100% rename from command/testdata/show-json-state/modules/terraform.tfstate rename to internal/command/testdata/show-json-state/modules/terraform.tfstate diff --git a/command/testdata/show-json-state/sensitive-variables/output.json b/internal/command/testdata/show-json-state/sensitive-variables/output.json similarity index 100% rename from command/testdata/show-json-state/sensitive-variables/output.json rename to internal/command/testdata/show-json-state/sensitive-variables/output.json diff --git a/command/testdata/show-json-state/sensitive-variables/terraform.tfstate b/internal/command/testdata/show-json-state/sensitive-variables/terraform.tfstate similarity index 100% rename from command/testdata/show-json-state/sensitive-variables/terraform.tfstate rename to internal/command/testdata/show-json-state/sensitive-variables/terraform.tfstate diff --git a/command/testdata/show-json/basic-create/main.tf b/internal/command/testdata/show-json/basic-create/main.tf similarity index 100% rename from command/testdata/show-json/basic-create/main.tf rename to internal/command/testdata/show-json/basic-create/main.tf diff --git a/command/testdata/show-json/basic-create/output.json b/internal/command/testdata/show-json/basic-create/output.json similarity index 100% rename from command/testdata/show-json/basic-create/output.json rename to internal/command/testdata/show-json/basic-create/output.json diff --git a/command/testdata/show-json/basic-delete/main.tf b/internal/command/testdata/show-json/basic-delete/main.tf similarity index 100% rename from command/testdata/show-json/basic-delete/main.tf rename to internal/command/testdata/show-json/basic-delete/main.tf diff --git a/command/testdata/show-json/basic-delete/output.json b/internal/command/testdata/show-json/basic-delete/output.json similarity index 100% rename from command/testdata/show-json/basic-delete/output.json rename to internal/command/testdata/show-json/basic-delete/output.json diff --git a/command/testdata/show-json/basic-delete/terraform.tfstate b/internal/command/testdata/show-json/basic-delete/terraform.tfstate similarity index 100% rename from command/testdata/show-json/basic-delete/terraform.tfstate rename to internal/command/testdata/show-json/basic-delete/terraform.tfstate diff --git a/command/testdata/show-json/basic-update/main.tf b/internal/command/testdata/show-json/basic-update/main.tf similarity index 100% rename from command/testdata/show-json/basic-update/main.tf rename to internal/command/testdata/show-json/basic-update/main.tf diff --git a/command/testdata/show-json/basic-update/output.json b/internal/command/testdata/show-json/basic-update/output.json similarity index 100% rename from command/testdata/show-json/basic-update/output.json rename to internal/command/testdata/show-json/basic-update/output.json diff --git a/command/testdata/show-json/basic-update/terraform.tfstate b/internal/command/testdata/show-json/basic-update/terraform.tfstate similarity index 100% rename from command/testdata/show-json/basic-update/terraform.tfstate rename to internal/command/testdata/show-json/basic-update/terraform.tfstate diff --git a/command/testdata/show-json/module-depends-on/foo/main.tf b/internal/command/testdata/show-json/module-depends-on/foo/main.tf similarity index 100% rename from command/testdata/show-json/module-depends-on/foo/main.tf rename to internal/command/testdata/show-json/module-depends-on/foo/main.tf diff --git a/command/testdata/show-json/module-depends-on/main.tf b/internal/command/testdata/show-json/module-depends-on/main.tf similarity index 100% rename from command/testdata/show-json/module-depends-on/main.tf rename to internal/command/testdata/show-json/module-depends-on/main.tf diff --git a/command/testdata/show-json/module-depends-on/output.json b/internal/command/testdata/show-json/module-depends-on/output.json similarity index 100% rename from command/testdata/show-json/module-depends-on/output.json rename to internal/command/testdata/show-json/module-depends-on/output.json diff --git a/command/testdata/show-json/modules/bar/main.tf b/internal/command/testdata/show-json/modules/bar/main.tf similarity index 100% rename from command/testdata/show-json/modules/bar/main.tf rename to internal/command/testdata/show-json/modules/bar/main.tf diff --git a/command/testdata/show-json/modules/foo/main.tf b/internal/command/testdata/show-json/modules/foo/main.tf similarity index 100% rename from command/testdata/show-json/modules/foo/main.tf rename to internal/command/testdata/show-json/modules/foo/main.tf diff --git a/command/testdata/show-json/modules/main.tf b/internal/command/testdata/show-json/modules/main.tf similarity index 100% rename from command/testdata/show-json/modules/main.tf rename to internal/command/testdata/show-json/modules/main.tf diff --git a/command/testdata/show-json/modules/output.json b/internal/command/testdata/show-json/modules/output.json similarity index 100% rename from command/testdata/show-json/modules/output.json rename to internal/command/testdata/show-json/modules/output.json diff --git a/command/testdata/show-json/multi-resource-update/main.tf b/internal/command/testdata/show-json/multi-resource-update/main.tf similarity index 100% rename from command/testdata/show-json/multi-resource-update/main.tf rename to internal/command/testdata/show-json/multi-resource-update/main.tf diff --git a/command/testdata/show-json/multi-resource-update/output.json b/internal/command/testdata/show-json/multi-resource-update/output.json similarity index 100% rename from command/testdata/show-json/multi-resource-update/output.json rename to internal/command/testdata/show-json/multi-resource-update/output.json diff --git a/command/testdata/show-json/multi-resource-update/terraform.tfstate b/internal/command/testdata/show-json/multi-resource-update/terraform.tfstate similarity index 100% rename from command/testdata/show-json/multi-resource-update/terraform.tfstate rename to internal/command/testdata/show-json/multi-resource-update/terraform.tfstate diff --git a/command/testdata/show-json/nested-module-error/main.tf b/internal/command/testdata/show-json/nested-module-error/main.tf similarity index 100% rename from command/testdata/show-json/nested-module-error/main.tf rename to internal/command/testdata/show-json/nested-module-error/main.tf diff --git a/command/testdata/show-json/nested-module-error/modules/main.tf b/internal/command/testdata/show-json/nested-module-error/modules/main.tf similarity index 100% rename from command/testdata/show-json/nested-module-error/modules/main.tf rename to internal/command/testdata/show-json/nested-module-error/modules/main.tf diff --git a/command/testdata/show-json/nested-module-error/modules/more-modules/main.tf b/internal/command/testdata/show-json/nested-module-error/modules/more-modules/main.tf similarity index 100% rename from command/testdata/show-json/nested-module-error/modules/more-modules/main.tf rename to internal/command/testdata/show-json/nested-module-error/modules/more-modules/main.tf diff --git a/command/testdata/show-json/nested-modules/main.tf b/internal/command/testdata/show-json/nested-modules/main.tf similarity index 100% rename from command/testdata/show-json/nested-modules/main.tf rename to internal/command/testdata/show-json/nested-modules/main.tf diff --git a/command/testdata/show-json/nested-modules/modules/main.tf b/internal/command/testdata/show-json/nested-modules/modules/main.tf similarity index 100% rename from command/testdata/show-json/nested-modules/modules/main.tf rename to internal/command/testdata/show-json/nested-modules/modules/main.tf diff --git a/command/testdata/show-json/nested-modules/modules/more-modules/main.tf b/internal/command/testdata/show-json/nested-modules/modules/more-modules/main.tf similarity index 100% rename from command/testdata/show-json/nested-modules/modules/more-modules/main.tf rename to internal/command/testdata/show-json/nested-modules/modules/more-modules/main.tf diff --git a/command/testdata/show-json/nested-modules/output.json b/internal/command/testdata/show-json/nested-modules/output.json similarity index 100% rename from command/testdata/show-json/nested-modules/output.json rename to internal/command/testdata/show-json/nested-modules/output.json diff --git a/command/testdata/show-json/provider-version-no-config/main.tf b/internal/command/testdata/show-json/provider-version-no-config/main.tf similarity index 100% rename from command/testdata/show-json/provider-version-no-config/main.tf rename to internal/command/testdata/show-json/provider-version-no-config/main.tf diff --git a/command/testdata/show-json/provider-version-no-config/output.json b/internal/command/testdata/show-json/provider-version-no-config/output.json similarity index 100% rename from command/testdata/show-json/provider-version-no-config/output.json rename to internal/command/testdata/show-json/provider-version-no-config/output.json diff --git a/command/testdata/show-json/provider-version/main.tf b/internal/command/testdata/show-json/provider-version/main.tf similarity index 100% rename from command/testdata/show-json/provider-version/main.tf rename to internal/command/testdata/show-json/provider-version/main.tf diff --git a/command/testdata/show-json/provider-version/output.json b/internal/command/testdata/show-json/provider-version/output.json similarity index 100% rename from command/testdata/show-json/provider-version/output.json rename to internal/command/testdata/show-json/provider-version/output.json diff --git a/command/testdata/show-json/requires-replace/main.tf b/internal/command/testdata/show-json/requires-replace/main.tf similarity index 100% rename from command/testdata/show-json/requires-replace/main.tf rename to internal/command/testdata/show-json/requires-replace/main.tf diff --git a/command/testdata/show-json/requires-replace/output.json b/internal/command/testdata/show-json/requires-replace/output.json similarity index 100% rename from command/testdata/show-json/requires-replace/output.json rename to internal/command/testdata/show-json/requires-replace/output.json diff --git a/command/testdata/show-json/requires-replace/terraform.tfstate b/internal/command/testdata/show-json/requires-replace/terraform.tfstate similarity index 100% rename from command/testdata/show-json/requires-replace/terraform.tfstate rename to internal/command/testdata/show-json/requires-replace/terraform.tfstate diff --git a/command/testdata/show-json/sensitive-values/main.tf b/internal/command/testdata/show-json/sensitive-values/main.tf similarity index 100% rename from command/testdata/show-json/sensitive-values/main.tf rename to internal/command/testdata/show-json/sensitive-values/main.tf diff --git a/command/testdata/show-json/sensitive-values/output.json b/internal/command/testdata/show-json/sensitive-values/output.json similarity index 100% rename from command/testdata/show-json/sensitive-values/output.json rename to internal/command/testdata/show-json/sensitive-values/output.json diff --git a/command/testdata/show/main.tf b/internal/command/testdata/show/main.tf similarity index 100% rename from command/testdata/show/main.tf rename to internal/command/testdata/show/main.tf diff --git a/command/testdata/state-list-backend-custom/.terraform/terraform.tfstate b/internal/command/testdata/state-list-backend-custom/.terraform/terraform.tfstate similarity index 100% rename from command/testdata/state-list-backend-custom/.terraform/terraform.tfstate rename to internal/command/testdata/state-list-backend-custom/.terraform/terraform.tfstate diff --git a/command/testdata/state-list-backend-custom/local-state.tfstate b/internal/command/testdata/state-list-backend-custom/local-state.tfstate similarity index 100% rename from command/testdata/state-list-backend-custom/local-state.tfstate rename to internal/command/testdata/state-list-backend-custom/local-state.tfstate diff --git a/command/testdata/state-list-backend-custom/main.tf b/internal/command/testdata/state-list-backend-custom/main.tf similarity index 100% rename from command/testdata/state-list-backend-custom/main.tf rename to internal/command/testdata/state-list-backend-custom/main.tf diff --git a/command/testdata/state-list-backend-default/.terraform/terraform.tfstate b/internal/command/testdata/state-list-backend-default/.terraform/terraform.tfstate similarity index 100% rename from command/testdata/state-list-backend-default/.terraform/terraform.tfstate rename to internal/command/testdata/state-list-backend-default/.terraform/terraform.tfstate diff --git a/command/testdata/state-list-backend-default/main.tf b/internal/command/testdata/state-list-backend-default/main.tf similarity index 100% rename from command/testdata/state-list-backend-default/main.tf rename to internal/command/testdata/state-list-backend-default/main.tf diff --git a/command/testdata/state-list-backend-default/terraform.tfstate b/internal/command/testdata/state-list-backend-default/terraform.tfstate similarity index 100% rename from command/testdata/state-list-backend-default/terraform.tfstate rename to internal/command/testdata/state-list-backend-default/terraform.tfstate diff --git a/command/testdata/state-list-nested-modules/terraform.tfstate b/internal/command/testdata/state-list-nested-modules/terraform.tfstate similarity index 100% rename from command/testdata/state-list-nested-modules/terraform.tfstate rename to internal/command/testdata/state-list-nested-modules/terraform.tfstate diff --git a/command/testdata/state-pull-backend/.terraform/terraform.tfstate b/internal/command/testdata/state-pull-backend/.terraform/terraform.tfstate similarity index 100% rename from command/testdata/state-pull-backend/.terraform/terraform.tfstate rename to internal/command/testdata/state-pull-backend/.terraform/terraform.tfstate diff --git a/command/testdata/state-pull-backend/local-state.tfstate b/internal/command/testdata/state-pull-backend/local-state.tfstate similarity index 100% rename from command/testdata/state-pull-backend/local-state.tfstate rename to internal/command/testdata/state-pull-backend/local-state.tfstate diff --git a/command/testdata/state-pull-backend/main.tf b/internal/command/testdata/state-pull-backend/main.tf similarity index 100% rename from command/testdata/state-pull-backend/main.tf rename to internal/command/testdata/state-pull-backend/main.tf diff --git a/command/testdata/state-push-bad-lineage/.terraform/terraform.tfstate b/internal/command/testdata/state-push-bad-lineage/.terraform/terraform.tfstate similarity index 100% rename from command/testdata/state-push-bad-lineage/.terraform/terraform.tfstate rename to internal/command/testdata/state-push-bad-lineage/.terraform/terraform.tfstate diff --git a/command/testdata/state-push-bad-lineage/local-state.tfstate b/internal/command/testdata/state-push-bad-lineage/local-state.tfstate similarity index 100% rename from command/testdata/state-push-bad-lineage/local-state.tfstate rename to internal/command/testdata/state-push-bad-lineage/local-state.tfstate diff --git a/command/testdata/state-push-bad-lineage/main.tf b/internal/command/testdata/state-push-bad-lineage/main.tf similarity index 100% rename from command/testdata/state-push-bad-lineage/main.tf rename to internal/command/testdata/state-push-bad-lineage/main.tf diff --git a/command/testdata/state-push-bad-lineage/replace.tfstate b/internal/command/testdata/state-push-bad-lineage/replace.tfstate similarity index 100% rename from command/testdata/state-push-bad-lineage/replace.tfstate rename to internal/command/testdata/state-push-bad-lineage/replace.tfstate diff --git a/command/testdata/state-push-good/.terraform/terraform.tfstate b/internal/command/testdata/state-push-good/.terraform/terraform.tfstate similarity index 100% rename from command/testdata/state-push-good/.terraform/terraform.tfstate rename to internal/command/testdata/state-push-good/.terraform/terraform.tfstate diff --git a/command/testdata/state-push-good/main.tf b/internal/command/testdata/state-push-good/main.tf similarity index 100% rename from command/testdata/state-push-good/main.tf rename to internal/command/testdata/state-push-good/main.tf diff --git a/command/testdata/state-push-good/replace.tfstate b/internal/command/testdata/state-push-good/replace.tfstate similarity index 100% rename from command/testdata/state-push-good/replace.tfstate rename to internal/command/testdata/state-push-good/replace.tfstate diff --git a/command/testdata/state-push-replace-match/.terraform/terraform.tfstate b/internal/command/testdata/state-push-replace-match/.terraform/terraform.tfstate similarity index 100% rename from command/testdata/state-push-replace-match/.terraform/terraform.tfstate rename to internal/command/testdata/state-push-replace-match/.terraform/terraform.tfstate diff --git a/command/testdata/state-push-replace-match/local-state.tfstate b/internal/command/testdata/state-push-replace-match/local-state.tfstate similarity index 100% rename from command/testdata/state-push-replace-match/local-state.tfstate rename to internal/command/testdata/state-push-replace-match/local-state.tfstate diff --git a/command/testdata/state-push-replace-match/main.tf b/internal/command/testdata/state-push-replace-match/main.tf similarity index 100% rename from command/testdata/state-push-replace-match/main.tf rename to internal/command/testdata/state-push-replace-match/main.tf diff --git a/command/testdata/state-push-replace-match/replace.tfstate b/internal/command/testdata/state-push-replace-match/replace.tfstate similarity index 100% rename from command/testdata/state-push-replace-match/replace.tfstate rename to internal/command/testdata/state-push-replace-match/replace.tfstate diff --git a/command/testdata/state-push-serial-newer/.terraform/terraform.tfstate b/internal/command/testdata/state-push-serial-newer/.terraform/terraform.tfstate similarity index 100% rename from command/testdata/state-push-serial-newer/.terraform/terraform.tfstate rename to internal/command/testdata/state-push-serial-newer/.terraform/terraform.tfstate diff --git a/command/testdata/state-push-serial-newer/local-state.tfstate b/internal/command/testdata/state-push-serial-newer/local-state.tfstate similarity index 100% rename from command/testdata/state-push-serial-newer/local-state.tfstate rename to internal/command/testdata/state-push-serial-newer/local-state.tfstate diff --git a/command/testdata/state-push-serial-newer/main.tf b/internal/command/testdata/state-push-serial-newer/main.tf similarity index 100% rename from command/testdata/state-push-serial-newer/main.tf rename to internal/command/testdata/state-push-serial-newer/main.tf diff --git a/command/testdata/state-push-serial-newer/replace.tfstate b/internal/command/testdata/state-push-serial-newer/replace.tfstate similarity index 100% rename from command/testdata/state-push-serial-newer/replace.tfstate rename to internal/command/testdata/state-push-serial-newer/replace.tfstate diff --git a/command/testdata/state-push-serial-older/.terraform/terraform.tfstate b/internal/command/testdata/state-push-serial-older/.terraform/terraform.tfstate similarity index 100% rename from command/testdata/state-push-serial-older/.terraform/terraform.tfstate rename to internal/command/testdata/state-push-serial-older/.terraform/terraform.tfstate diff --git a/command/testdata/state-push-serial-older/local-state.tfstate b/internal/command/testdata/state-push-serial-older/local-state.tfstate similarity index 100% rename from command/testdata/state-push-serial-older/local-state.tfstate rename to internal/command/testdata/state-push-serial-older/local-state.tfstate diff --git a/command/testdata/state-push-serial-older/main.tf b/internal/command/testdata/state-push-serial-older/main.tf similarity index 100% rename from command/testdata/state-push-serial-older/main.tf rename to internal/command/testdata/state-push-serial-older/main.tf diff --git a/command/testdata/state-push-serial-older/replace.tfstate b/internal/command/testdata/state-push-serial-older/replace.tfstate similarity index 100% rename from command/testdata/state-push-serial-older/replace.tfstate rename to internal/command/testdata/state-push-serial-older/replace.tfstate diff --git a/command/testdata/statelocker.go b/internal/command/testdata/statelocker.go similarity index 94% rename from command/testdata/statelocker.go rename to internal/command/testdata/statelocker.go index 98e13a23a4..15d4eb8717 100644 --- a/command/testdata/statelocker.go +++ b/internal/command/testdata/statelocker.go @@ -11,7 +11,7 @@ import ( "syscall" "time" - "github.com/hashicorp/terraform/command/clistate" + "github.com/hashicorp/terraform/internal/command/clistate" "github.com/hashicorp/terraform/states/statemgr" ) diff --git a/command/testdata/taint-check-required-version/main.tf b/internal/command/testdata/taint-check-required-version/main.tf similarity index 100% rename from command/testdata/taint-check-required-version/main.tf rename to internal/command/testdata/taint-check-required-version/main.tf diff --git a/command/testdata/test-fails/test-fails.tf b/internal/command/testdata/test-fails/test-fails.tf similarity index 100% rename from command/testdata/test-fails/test-fails.tf rename to internal/command/testdata/test-fails/test-fails.tf diff --git a/command/testdata/test-fails/tests/hello/hello.tf b/internal/command/testdata/test-fails/tests/hello/hello.tf similarity index 100% rename from command/testdata/test-fails/tests/hello/hello.tf rename to internal/command/testdata/test-fails/tests/hello/hello.tf diff --git a/command/testdata/test-passes/test-passes.tf b/internal/command/testdata/test-passes/test-passes.tf similarity index 100% rename from command/testdata/test-passes/test-passes.tf rename to internal/command/testdata/test-passes/test-passes.tf diff --git a/command/testdata/test-passes/tests/hello/hello.tf b/internal/command/testdata/test-passes/tests/hello/hello.tf similarity index 100% rename from command/testdata/test-passes/tests/hello/hello.tf rename to internal/command/testdata/test-passes/tests/hello/hello.tf diff --git a/command/testdata/validate-invalid/incorrectmodulename/main.tf b/internal/command/testdata/validate-invalid/incorrectmodulename/main.tf similarity index 100% rename from command/testdata/validate-invalid/incorrectmodulename/main.tf rename to internal/command/testdata/validate-invalid/incorrectmodulename/main.tf diff --git a/command/testdata/validate-invalid/incorrectmodulename/output.json b/internal/command/testdata/validate-invalid/incorrectmodulename/output.json similarity index 100% rename from command/testdata/validate-invalid/incorrectmodulename/output.json rename to internal/command/testdata/validate-invalid/incorrectmodulename/output.json diff --git a/command/testdata/validate-invalid/interpolation/main.tf b/internal/command/testdata/validate-invalid/interpolation/main.tf similarity index 100% rename from command/testdata/validate-invalid/interpolation/main.tf rename to internal/command/testdata/validate-invalid/interpolation/main.tf diff --git a/command/testdata/validate-invalid/interpolation/output.json b/internal/command/testdata/validate-invalid/interpolation/output.json similarity index 100% rename from command/testdata/validate-invalid/interpolation/output.json rename to internal/command/testdata/validate-invalid/interpolation/output.json diff --git a/command/testdata/validate-invalid/main.tf b/internal/command/testdata/validate-invalid/main.tf similarity index 100% rename from command/testdata/validate-invalid/main.tf rename to internal/command/testdata/validate-invalid/main.tf diff --git a/command/testdata/validate-invalid/missing_defined_var/main.tf b/internal/command/testdata/validate-invalid/missing_defined_var/main.tf similarity index 100% rename from command/testdata/validate-invalid/missing_defined_var/main.tf rename to internal/command/testdata/validate-invalid/missing_defined_var/main.tf diff --git a/command/testdata/validate-invalid/missing_defined_var/output.json b/internal/command/testdata/validate-invalid/missing_defined_var/output.json similarity index 100% rename from command/testdata/validate-invalid/missing_defined_var/output.json rename to internal/command/testdata/validate-invalid/missing_defined_var/output.json diff --git a/command/testdata/validate-invalid/missing_quote/main.tf b/internal/command/testdata/validate-invalid/missing_quote/main.tf similarity index 100% rename from command/testdata/validate-invalid/missing_quote/main.tf rename to internal/command/testdata/validate-invalid/missing_quote/main.tf diff --git a/command/testdata/validate-invalid/missing_quote/output.json b/internal/command/testdata/validate-invalid/missing_quote/output.json similarity index 100% rename from command/testdata/validate-invalid/missing_quote/output.json rename to internal/command/testdata/validate-invalid/missing_quote/output.json diff --git a/command/testdata/validate-invalid/missing_var/main.tf b/internal/command/testdata/validate-invalid/missing_var/main.tf similarity index 100% rename from command/testdata/validate-invalid/missing_var/main.tf rename to internal/command/testdata/validate-invalid/missing_var/main.tf diff --git a/command/testdata/validate-invalid/missing_var/output.json b/internal/command/testdata/validate-invalid/missing_var/output.json similarity index 100% rename from command/testdata/validate-invalid/missing_var/output.json rename to internal/command/testdata/validate-invalid/missing_var/output.json diff --git a/command/testdata/validate-invalid/multiple_modules/main.tf b/internal/command/testdata/validate-invalid/multiple_modules/main.tf similarity index 100% rename from command/testdata/validate-invalid/multiple_modules/main.tf rename to internal/command/testdata/validate-invalid/multiple_modules/main.tf diff --git a/command/testdata/validate-invalid/multiple_modules/output.json b/internal/command/testdata/validate-invalid/multiple_modules/output.json similarity index 100% rename from command/testdata/validate-invalid/multiple_modules/output.json rename to internal/command/testdata/validate-invalid/multiple_modules/output.json diff --git a/command/testdata/validate-invalid/multiple_providers/main.tf b/internal/command/testdata/validate-invalid/multiple_providers/main.tf similarity index 100% rename from command/testdata/validate-invalid/multiple_providers/main.tf rename to internal/command/testdata/validate-invalid/multiple_providers/main.tf diff --git a/command/testdata/validate-invalid/multiple_providers/output.json b/internal/command/testdata/validate-invalid/multiple_providers/output.json similarity index 100% rename from command/testdata/validate-invalid/multiple_providers/output.json rename to internal/command/testdata/validate-invalid/multiple_providers/output.json diff --git a/command/testdata/validate-invalid/multiple_resources/main.tf b/internal/command/testdata/validate-invalid/multiple_resources/main.tf similarity index 100% rename from command/testdata/validate-invalid/multiple_resources/main.tf rename to internal/command/testdata/validate-invalid/multiple_resources/main.tf diff --git a/command/testdata/validate-invalid/multiple_resources/output.json b/internal/command/testdata/validate-invalid/multiple_resources/output.json similarity index 100% rename from command/testdata/validate-invalid/multiple_resources/output.json rename to internal/command/testdata/validate-invalid/multiple_resources/output.json diff --git a/command/testdata/validate-invalid/output.json b/internal/command/testdata/validate-invalid/output.json similarity index 100% rename from command/testdata/validate-invalid/output.json rename to internal/command/testdata/validate-invalid/output.json diff --git a/command/testdata/validate-invalid/outputs/main.tf b/internal/command/testdata/validate-invalid/outputs/main.tf similarity index 100% rename from command/testdata/validate-invalid/outputs/main.tf rename to internal/command/testdata/validate-invalid/outputs/main.tf diff --git a/command/testdata/validate-invalid/outputs/output.json b/internal/command/testdata/validate-invalid/outputs/output.json similarity index 100% rename from command/testdata/validate-invalid/outputs/output.json rename to internal/command/testdata/validate-invalid/outputs/output.json diff --git a/command/testdata/validate-valid/main.tf b/internal/command/testdata/validate-valid/main.tf similarity index 100% rename from command/testdata/validate-valid/main.tf rename to internal/command/testdata/validate-valid/main.tf diff --git a/command/testdata/validate-valid/output.json b/internal/command/testdata/validate-valid/output.json similarity index 100% rename from command/testdata/validate-valid/output.json rename to internal/command/testdata/validate-valid/output.json diff --git a/command/testdata/validate-valid/with-tfvars-file/main.tf b/internal/command/testdata/validate-valid/with-tfvars-file/main.tf similarity index 100% rename from command/testdata/validate-valid/with-tfvars-file/main.tf rename to internal/command/testdata/validate-valid/with-tfvars-file/main.tf diff --git a/command/testdata/validate-valid/with-tfvars-file/terraform.tfvars b/internal/command/testdata/validate-valid/with-tfvars-file/terraform.tfvars similarity index 100% rename from command/testdata/validate-valid/with-tfvars-file/terraform.tfvars rename to internal/command/testdata/validate-valid/with-tfvars-file/terraform.tfvars diff --git a/command/testdata/variables/main.tf b/internal/command/testdata/variables/main.tf similarity index 100% rename from command/testdata/variables/main.tf rename to internal/command/testdata/variables/main.tf diff --git a/command/ui_input.go b/internal/command/ui_input.go similarity index 100% rename from command/ui_input.go rename to internal/command/ui_input.go diff --git a/command/ui_input_test.go b/internal/command/ui_input_test.go similarity index 100% rename from command/ui_input_test.go rename to internal/command/ui_input_test.go diff --git a/command/unlock.go b/internal/command/unlock.go similarity index 100% rename from command/unlock.go rename to internal/command/unlock.go diff --git a/command/unlock_test.go b/internal/command/unlock_test.go similarity index 100% rename from command/unlock_test.go rename to internal/command/unlock_test.go diff --git a/command/untaint.go b/internal/command/untaint.go similarity index 97% rename from command/untaint.go rename to internal/command/untaint.go index 707bfe8ee9..319e0f02ca 100644 --- a/command/untaint.go +++ b/internal/command/untaint.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/clistate" - "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/clistate" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" ) diff --git a/command/untaint_test.go b/internal/command/untaint_test.go similarity index 100% rename from command/untaint_test.go rename to internal/command/untaint_test.go diff --git a/command/validate.go b/internal/command/validate.go similarity index 97% rename from command/validate.go rename to internal/command/validate.go index 7d13dd933a..ce4c45b573 100644 --- a/command/validate.go +++ b/internal/command/validate.go @@ -7,8 +7,8 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/views" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/terraform" ) diff --git a/command/validate_test.go b/internal/command/validate_test.go similarity index 100% rename from command/validate_test.go rename to internal/command/validate_test.go diff --git a/command/version.go b/internal/command/version.go similarity index 100% rename from command/version.go rename to internal/command/version.go diff --git a/command/version_test.go b/internal/command/version_test.go similarity index 100% rename from command/version_test.go rename to internal/command/version_test.go diff --git a/command/views/apply.go b/internal/command/views/apply.go similarity index 95% rename from command/views/apply.go rename to internal/command/views/apply.go index 9626bf1254..41797d0828 100644 --- a/command/views/apply.go +++ b/internal/command/views/apply.go @@ -3,9 +3,9 @@ package views import ( "fmt" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/format" - "github.com/hashicorp/terraform/command/views/json" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/format" + "github.com/hashicorp/terraform/internal/command/views/json" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" diff --git a/command/views/apply_test.go b/internal/command/views/apply_test.go similarity index 99% rename from command/views/apply_test.go rename to internal/command/views/apply_test.go index fac161ac46..0c64ca6ba2 100644 --- a/command/views/apply_test.go +++ b/internal/command/views/apply_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/command/arguments" + "github.com/hashicorp/terraform/internal/command/arguments" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" diff --git a/command/views/hook_count.go b/internal/command/views/hook_count.go similarity index 100% rename from command/views/hook_count.go rename to internal/command/views/hook_count.go diff --git a/command/views/hook_count_test.go b/internal/command/views/hook_count_test.go similarity index 100% rename from command/views/hook_count_test.go rename to internal/command/views/hook_count_test.go diff --git a/command/views/hook_json.go b/internal/command/views/hook_json.go similarity index 97% rename from command/views/hook_json.go rename to internal/command/views/hook_json.go index 45125c01ca..e3013d2d4e 100644 --- a/command/views/hook_json.go +++ b/internal/command/views/hook_json.go @@ -7,9 +7,9 @@ import ( "time" "unicode" - "github.com/hashicorp/terraform/command/format" - "github.com/hashicorp/terraform/command/views/json" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/command/format" + "github.com/hashicorp/terraform/internal/command/views/json" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" diff --git a/command/views/hook_json_test.go b/internal/command/views/hook_json_test.go similarity index 100% rename from command/views/hook_json_test.go rename to internal/command/views/hook_json_test.go diff --git a/command/views/hook_ui.go b/internal/command/views/hook_ui.go similarity index 99% rename from command/views/hook_ui.go rename to internal/command/views/hook_ui.go index f0b6bfafe2..7bd9cf874f 100644 --- a/command/views/hook_ui.go +++ b/internal/command/views/hook_ui.go @@ -11,8 +11,8 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/command/format" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/command/format" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" diff --git a/command/views/hook_ui_test.go b/internal/command/views/hook_ui_test.go similarity index 99% rename from command/views/hook_ui_test.go rename to internal/command/views/hook_ui_test.go index 49591741ab..b12087c0b3 100644 --- a/command/views/hook_ui_test.go +++ b/internal/command/views/hook_ui_test.go @@ -10,8 +10,8 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/command/arguments" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/command/arguments" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/plans" diff --git a/command/views/json/change.go b/internal/command/views/json/change.go similarity index 100% rename from command/views/json/change.go rename to internal/command/views/json/change.go diff --git a/command/views/json/change_summary.go b/internal/command/views/json/change_summary.go similarity index 100% rename from command/views/json/change_summary.go rename to internal/command/views/json/change_summary.go diff --git a/command/views/json/diagnostic.go b/internal/command/views/json/diagnostic.go similarity index 100% rename from command/views/json/diagnostic.go rename to internal/command/views/json/diagnostic.go diff --git a/command/views/json/diagnostic_test.go b/internal/command/views/json/diagnostic_test.go similarity index 100% rename from command/views/json/diagnostic_test.go rename to internal/command/views/json/diagnostic_test.go diff --git a/command/views/json/hook.go b/internal/command/views/json/hook.go similarity index 100% rename from command/views/json/hook.go rename to internal/command/views/json/hook.go diff --git a/command/views/json/message_types.go b/internal/command/views/json/message_types.go similarity index 100% rename from command/views/json/message_types.go rename to internal/command/views/json/message_types.go diff --git a/command/views/json/output.go b/internal/command/views/json/output.go similarity index 100% rename from command/views/json/output.go rename to internal/command/views/json/output.go diff --git a/command/views/json/output_test.go b/internal/command/views/json/output_test.go similarity index 100% rename from command/views/json/output_test.go rename to internal/command/views/json/output_test.go diff --git a/command/views/json/resource_addr.go b/internal/command/views/json/resource_addr.go similarity index 100% rename from command/views/json/resource_addr.go rename to internal/command/views/json/resource_addr.go diff --git a/command/views/json/testdata/diagnostic/error-with-empty-highlight-range-at-end-of-source-code.json b/internal/command/views/json/testdata/diagnostic/error-with-empty-highlight-range-at-end-of-source-code.json similarity index 100% rename from command/views/json/testdata/diagnostic/error-with-empty-highlight-range-at-end-of-source-code.json rename to internal/command/views/json/testdata/diagnostic/error-with-empty-highlight-range-at-end-of-source-code.json diff --git a/command/views/json/testdata/diagnostic/error-with-multi-line-snippet.json b/internal/command/views/json/testdata/diagnostic/error-with-multi-line-snippet.json similarity index 100% rename from command/views/json/testdata/diagnostic/error-with-multi-line-snippet.json rename to internal/command/views/json/testdata/diagnostic/error-with-multi-line-snippet.json diff --git a/command/views/json/testdata/diagnostic/error-with-source-code-subject-and-expression-referring-to-a-collection-containing-a-sensitive-value.json b/internal/command/views/json/testdata/diagnostic/error-with-source-code-subject-and-expression-referring-to-a-collection-containing-a-sensitive-value.json similarity index 100% rename from command/views/json/testdata/diagnostic/error-with-source-code-subject-and-expression-referring-to-a-collection-containing-a-sensitive-value.json rename to internal/command/views/json/testdata/diagnostic/error-with-source-code-subject-and-expression-referring-to-a-collection-containing-a-sensitive-value.json diff --git a/command/views/json/testdata/diagnostic/error-with-source-code-subject-and-expression-referring-to-sensitive-value.json b/internal/command/views/json/testdata/diagnostic/error-with-source-code-subject-and-expression-referring-to-sensitive-value.json similarity index 100% rename from command/views/json/testdata/diagnostic/error-with-source-code-subject-and-expression-referring-to-sensitive-value.json rename to internal/command/views/json/testdata/diagnostic/error-with-source-code-subject-and-expression-referring-to-sensitive-value.json diff --git a/command/views/json/testdata/diagnostic/error-with-source-code-subject-and-known-expression.json b/internal/command/views/json/testdata/diagnostic/error-with-source-code-subject-and-known-expression.json similarity index 100% rename from command/views/json/testdata/diagnostic/error-with-source-code-subject-and-known-expression.json rename to internal/command/views/json/testdata/diagnostic/error-with-source-code-subject-and-known-expression.json diff --git a/command/views/json/testdata/diagnostic/error-with-source-code-subject-and-unknown-expression-of-unknown-type.json b/internal/command/views/json/testdata/diagnostic/error-with-source-code-subject-and-unknown-expression-of-unknown-type.json similarity index 100% rename from command/views/json/testdata/diagnostic/error-with-source-code-subject-and-unknown-expression-of-unknown-type.json rename to internal/command/views/json/testdata/diagnostic/error-with-source-code-subject-and-unknown-expression-of-unknown-type.json diff --git a/command/views/json/testdata/diagnostic/error-with-source-code-subject-and-unknown-string-expression.json b/internal/command/views/json/testdata/diagnostic/error-with-source-code-subject-and-unknown-string-expression.json similarity index 100% rename from command/views/json/testdata/diagnostic/error-with-source-code-subject-and-unknown-string-expression.json rename to internal/command/views/json/testdata/diagnostic/error-with-source-code-subject-and-unknown-string-expression.json diff --git a/command/views/json/testdata/diagnostic/error-with-source-code-subject-but-no-context.json b/internal/command/views/json/testdata/diagnostic/error-with-source-code-subject-but-no-context.json similarity index 100% rename from command/views/json/testdata/diagnostic/error-with-source-code-subject-but-no-context.json rename to internal/command/views/json/testdata/diagnostic/error-with-source-code-subject-but-no-context.json diff --git a/command/views/json/testdata/diagnostic/error-with-source-code-subject-with-multiple-expression-values.json b/internal/command/views/json/testdata/diagnostic/error-with-source-code-subject-with-multiple-expression-values.json similarity index 100% rename from command/views/json/testdata/diagnostic/error-with-source-code-subject-with-multiple-expression-values.json rename to internal/command/views/json/testdata/diagnostic/error-with-source-code-subject-with-multiple-expression-values.json diff --git a/command/views/json/testdata/diagnostic/error-with-source-code-subject.json b/internal/command/views/json/testdata/diagnostic/error-with-source-code-subject.json similarity index 100% rename from command/views/json/testdata/diagnostic/error-with-source-code-subject.json rename to internal/command/views/json/testdata/diagnostic/error-with-source-code-subject.json diff --git a/command/views/json/testdata/diagnostic/error-with-source-code-unavailable.json b/internal/command/views/json/testdata/diagnostic/error-with-source-code-unavailable.json similarity index 100% rename from command/views/json/testdata/diagnostic/error-with-source-code-unavailable.json rename to internal/command/views/json/testdata/diagnostic/error-with-source-code-unavailable.json diff --git a/command/views/json/testdata/diagnostic/error-with-unset-highlight-end-position.json b/internal/command/views/json/testdata/diagnostic/error-with-unset-highlight-end-position.json similarity index 100% rename from command/views/json/testdata/diagnostic/error-with-unset-highlight-end-position.json rename to internal/command/views/json/testdata/diagnostic/error-with-unset-highlight-end-position.json diff --git a/command/views/json/testdata/diagnostic/sourceless-warning.json b/internal/command/views/json/testdata/diagnostic/sourceless-warning.json similarity index 100% rename from command/views/json/testdata/diagnostic/sourceless-warning.json rename to internal/command/views/json/testdata/diagnostic/sourceless-warning.json diff --git a/command/views/json_view.go b/internal/command/views/json_view.go similarity index 97% rename from command/views/json_view.go rename to internal/command/views/json_view.go index 6540a487e1..06a2c797ff 100644 --- a/command/views/json_view.go +++ b/internal/command/views/json_view.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/terraform/command/views/json" + "github.com/hashicorp/terraform/internal/command/views/json" "github.com/hashicorp/terraform/internal/tfdiags" tfversion "github.com/hashicorp/terraform/version" ) diff --git a/command/views/json_view_test.go b/internal/command/views/json_view_test.go similarity index 99% rename from command/views/json_view_test.go rename to internal/command/views/json_view_test.go index 34cfa56737..7d92ffe9b7 100644 --- a/command/views/json_view_test.go +++ b/internal/command/views/json_view_test.go @@ -8,8 +8,8 @@ import ( "time" "github.com/google/go-cmp/cmp" - viewsjson "github.com/hashicorp/terraform/command/views/json" "github.com/hashicorp/terraform/internal/addrs" + viewsjson "github.com/hashicorp/terraform/internal/command/views/json" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" diff --git a/command/views/operation.go b/internal/command/views/operation.go similarity index 97% rename from command/views/operation.go rename to internal/command/views/operation.go index b52418965f..930f854029 100644 --- a/command/views/operation.go +++ b/internal/command/views/operation.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/format" - "github.com/hashicorp/terraform/command/views/json" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/format" + "github.com/hashicorp/terraform/internal/command/views/json" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states/statefile" diff --git a/command/views/operation_test.go b/internal/command/views/operation_test.go similarity index 99% rename from command/views/operation_test.go rename to internal/command/views/operation_test.go index 4ec6378773..41f22eca89 100644 --- a/command/views/operation_test.go +++ b/internal/command/views/operation_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/command/arguments" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/command/arguments" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" diff --git a/command/views/output.go b/internal/command/views/output.go similarity index 99% rename from command/views/output.go rename to internal/command/views/output.go index dbe347e53c..6ca2fefb25 100644 --- a/command/views/output.go +++ b/internal/command/views/output.go @@ -11,7 +11,7 @@ import ( "github.com/zclconf/go-cty/cty/convert" ctyjson "github.com/zclconf/go-cty/cty/json" - "github.com/hashicorp/terraform/command/arguments" + "github.com/hashicorp/terraform/internal/command/arguments" "github.com/hashicorp/terraform/internal/repl" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" diff --git a/command/views/output_test.go b/internal/command/views/output_test.go similarity index 99% rename from command/views/output_test.go rename to internal/command/views/output_test.go index a1204950af..a77a3b7b91 100644 --- a/command/views/output_test.go +++ b/internal/command/views/output_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/command/arguments" + "github.com/hashicorp/terraform/internal/command/arguments" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" diff --git a/command/views/plan.go b/internal/command/views/plan.go similarity index 99% rename from command/views/plan.go rename to internal/command/views/plan.go index 4cdc0d1459..5e3a0ab30c 100644 --- a/command/views/plan.go +++ b/internal/command/views/plan.go @@ -6,9 +6,9 @@ import ( "sort" "strings" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/format" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/format" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" diff --git a/command/views/plan_test.go b/internal/command/views/plan_test.go similarity index 98% rename from command/views/plan_test.go rename to internal/command/views/plan_test.go index 906e7b849c..4a36f8c5c4 100644 --- a/command/views/plan_test.go +++ b/internal/command/views/plan_test.go @@ -3,9 +3,9 @@ package views import ( "testing" - "github.com/hashicorp/terraform/command/arguments" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/command/arguments" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/plans" diff --git a/command/views/refresh.go b/internal/command/views/refresh.go similarity index 95% rename from command/views/refresh.go rename to internal/command/views/refresh.go index 1e08365fae..ea5790dad8 100644 --- a/command/views/refresh.go +++ b/internal/command/views/refresh.go @@ -3,8 +3,8 @@ package views import ( "fmt" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/views/json" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/views/json" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" diff --git a/command/views/refresh_test.go b/internal/command/views/refresh_test.go similarity index 97% rename from command/views/refresh_test.go rename to internal/command/views/refresh_test.go index ff14511848..b1456e46db 100644 --- a/command/views/refresh_test.go +++ b/internal/command/views/refresh_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/command/arguments" + "github.com/hashicorp/terraform/internal/command/arguments" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" diff --git a/command/views/show.go b/internal/command/views/show.go similarity index 93% rename from command/views/show.go rename to internal/command/views/show.go index d04d9e206e..625cb22a44 100644 --- a/command/views/show.go +++ b/internal/command/views/show.go @@ -3,7 +3,7 @@ package views import ( "fmt" - "github.com/hashicorp/terraform/command/arguments" + "github.com/hashicorp/terraform/internal/command/arguments" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/terraform" ) diff --git a/command/views/state_locker.go b/internal/command/views/state_locker.go similarity index 94% rename from command/views/state_locker.go rename to internal/command/views/state_locker.go index 3a06bcec29..df3d51b0f9 100644 --- a/command/views/state_locker.go +++ b/internal/command/views/state_locker.go @@ -3,7 +3,7 @@ package views import ( "fmt" - "github.com/hashicorp/terraform/command/arguments" + "github.com/hashicorp/terraform/internal/command/arguments" ) // The StateLocker view is used to display locking/unlocking status messages diff --git a/command/views/test.go b/internal/command/views/test.go similarity index 99% rename from command/views/test.go rename to internal/command/views/test.go index e2f3003b5f..18c32c747b 100644 --- a/command/views/test.go +++ b/internal/command/views/test.go @@ -7,8 +7,8 @@ import ( "sort" "strings" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/format" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/format" "github.com/hashicorp/terraform/internal/moduletest" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/internal/tfdiags" diff --git a/command/views/test_test.go b/internal/command/views/test_test.go similarity index 93% rename from command/views/test_test.go rename to internal/command/views/test_test.go index ad339b3012..6acd889e85 100644 --- a/command/views/test_test.go +++ b/internal/command/views/test_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/command/arguments" + "github.com/hashicorp/terraform/internal/command/arguments" "github.com/hashicorp/terraform/internal/moduletest" "github.com/hashicorp/terraform/internal/terminal" ) diff --git a/command/views/validate.go b/internal/command/views/validate.go similarity index 95% rename from command/views/validate.go rename to internal/command/views/validate.go index 31c9f2c768..1e597277a4 100644 --- a/command/views/validate.go +++ b/internal/command/views/validate.go @@ -4,9 +4,9 @@ import ( "encoding/json" "fmt" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/format" - viewsjson "github.com/hashicorp/terraform/command/views/json" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/format" + viewsjson "github.com/hashicorp/terraform/internal/command/views/json" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/command/views/validate_test.go b/internal/command/views/validate_test.go similarity index 98% rename from command/views/validate_test.go rename to internal/command/views/validate_test.go index 4825f6c0d7..6545c3b314 100644 --- a/command/views/validate_test.go +++ b/internal/command/views/validate_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/command/arguments" + "github.com/hashicorp/terraform/internal/command/arguments" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/command/views/view.go b/internal/command/views/view.go similarity index 97% rename from command/views/view.go rename to internal/command/views/view.go index b48ae6541d..206ead7fd5 100644 --- a/command/views/view.go +++ b/internal/command/views/view.go @@ -1,8 +1,8 @@ package views import ( - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/format" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/format" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/mitchellh/colorstring" diff --git a/command/webbrowser/mock.go b/internal/command/webbrowser/mock.go similarity index 100% rename from command/webbrowser/mock.go rename to internal/command/webbrowser/mock.go diff --git a/command/webbrowser/mock_test.go b/internal/command/webbrowser/mock_test.go similarity index 100% rename from command/webbrowser/mock_test.go rename to internal/command/webbrowser/mock_test.go diff --git a/command/webbrowser/native.go b/internal/command/webbrowser/native.go similarity index 100% rename from command/webbrowser/native.go rename to internal/command/webbrowser/native.go diff --git a/command/webbrowser/webbrowser.go b/internal/command/webbrowser/webbrowser.go similarity index 100% rename from command/webbrowser/webbrowser.go rename to internal/command/webbrowser/webbrowser.go diff --git a/command/workspace_command.go b/internal/command/workspace_command.go similarity index 100% rename from command/workspace_command.go rename to internal/command/workspace_command.go diff --git a/command/workspace_command_test.go b/internal/command/workspace_command_test.go similarity index 100% rename from command/workspace_command_test.go rename to internal/command/workspace_command_test.go diff --git a/command/workspace_delete.go b/internal/command/workspace_delete.go similarity index 96% rename from command/workspace_delete.go rename to internal/command/workspace_delete.go index 87c4a35b05..a29479e925 100644 --- a/command/workspace_delete.go +++ b/internal/command/workspace_delete.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/clistate" - "github.com/hashicorp/terraform/command/views" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/clistate" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/mitchellh/cli" "github.com/posener/complete" diff --git a/command/workspace_list.go b/internal/command/workspace_list.go similarity index 100% rename from command/workspace_list.go rename to internal/command/workspace_list.go diff --git a/command/workspace_new.go b/internal/command/workspace_new.go similarity index 96% rename from command/workspace_new.go rename to internal/command/workspace_new.go index 3e95a86f36..c8483c915b 100644 --- a/command/workspace_new.go +++ b/internal/command/workspace_new.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "github.com/hashicorp/terraform/command/arguments" - "github.com/hashicorp/terraform/command/clistate" - "github.com/hashicorp/terraform/command/views" + "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/command/clistate" + "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states/statefile" "github.com/mitchellh/cli" diff --git a/command/workspace_select.go b/internal/command/workspace_select.go similarity index 100% rename from command/workspace_select.go rename to internal/command/workspace_select.go diff --git a/command/workspace_show.go b/internal/command/workspace_show.go similarity index 100% rename from command/workspace_show.go rename to internal/command/workspace_show.go diff --git a/main.go b/main.go index 3842680738..2c23d5e5c0 100644 --- a/main.go +++ b/main.go @@ -13,9 +13,9 @@ import ( "github.com/hashicorp/go-plugin" "github.com/hashicorp/terraform-svchost/disco" - "github.com/hashicorp/terraform/command/cliconfig" - "github.com/hashicorp/terraform/command/format" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/command/cliconfig" + "github.com/hashicorp/terraform/internal/command/format" "github.com/hashicorp/terraform/internal/didyoumean" "github.com/hashicorp/terraform/internal/httpclient" "github.com/hashicorp/terraform/internal/logging" diff --git a/plugins.go b/plugins.go index 47ae2e4f61..be576e81ac 100644 --- a/plugins.go +++ b/plugins.go @@ -6,7 +6,7 @@ import ( "path/filepath" "runtime" - "github.com/hashicorp/terraform/command/cliconfig" + "github.com/hashicorp/terraform/internal/command/cliconfig" ) // globalPluginDirs returns directories that should be searched for diff --git a/provider_source.go b/provider_source.go index 06ef6127da..f27ca54b2a 100644 --- a/provider_source.go +++ b/provider_source.go @@ -10,8 +10,8 @@ import ( "github.com/apparentlymart/go-userdirs/userdirs" "github.com/hashicorp/terraform-svchost/disco" - "github.com/hashicorp/terraform/command/cliconfig" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/command/cliconfig" "github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/internal/tfdiags" )