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.
hashicorp · May 17, 2021 · ffe056bacb9f2cf403fa3b6b894c5fbe1fa850a7 · ffe056b
1 parent b9a93a0
commit ffe056bacb9f2cf403fa3b6b894c5fbe1fa850a7
Showing 572 changed files with 144 additions and 144 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → internal/command/apply.go b/command/apply.go → 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 → internal/command/apply_destroy_test.go b/command/apply_destroy_test.go → internal/command/apply_destroy_test.go
diff --git a/command/apply_test.go → internal/command/apply_test.go b/command/apply_test.go → 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 → internal/command/arguments/apply.go b/command/arguments/apply.go → internal/command/arguments/apply.go
diff --git a/command/arguments/apply_test.go → internal/command/arguments/apply_test.go b/command/arguments/apply_test.go → internal/command/arguments/apply_test.go
diff --git a/command/arguments/default.go → internal/command/arguments/default.go b/command/arguments/default.go → internal/command/arguments/default.go
diff --git a/command/arguments/extended.go → internal/command/arguments/extended.go b/command/arguments/extended.go → internal/command/arguments/extended.go
diff --git a/command/arguments/flags.go → internal/command/arguments/flags.go b/command/arguments/flags.go → internal/command/arguments/flags.go
diff --git a/command/arguments/output.go → internal/command/arguments/output.go b/command/arguments/output.go → internal/command/arguments/output.go
diff --git a/command/arguments/output_test.go → internal/command/arguments/output_test.go b/command/arguments/output_test.go → internal/command/arguments/output_test.go
diff --git a/command/arguments/plan.go → internal/command/arguments/plan.go b/command/arguments/plan.go → internal/command/arguments/plan.go
diff --git a/command/arguments/plan_test.go → internal/command/arguments/plan_test.go b/command/arguments/plan_test.go → internal/command/arguments/plan_test.go
diff --git a/command/arguments/refresh.go → internal/command/arguments/refresh.go b/command/arguments/refresh.go → internal/command/arguments/refresh.go
diff --git a/command/arguments/refresh_test.go → internal/command/arguments/refresh_test.go b/command/arguments/refresh_test.go → internal/command/arguments/refresh_test.go
diff --git a/command/arguments/test.go → internal/command/arguments/test.go b/command/arguments/test.go → internal/command/arguments/test.go
diff --git a/command/arguments/test_test.go → internal/command/arguments/test_test.go b/command/arguments/test_test.go → internal/command/arguments/test_test.go
diff --git a/command/arguments/types.go → internal/command/arguments/types.go b/command/arguments/types.go → internal/command/arguments/types.go
diff --git a/command/arguments/validate.go → internal/command/arguments/validate.go b/command/arguments/validate.go → internal/command/arguments/validate.go
diff --git a/command/arguments/validate_test.go → internal/command/arguments/validate_test.go b/command/arguments/validate_test.go → internal/command/arguments/validate_test.go
diff --git a/command/arguments/view.go → internal/command/arguments/view.go b/command/arguments/view.go → internal/command/arguments/view.go
diff --git a/command/arguments/view_test.go → internal/command/arguments/view_test.go b/command/arguments/view_test.go → internal/command/arguments/view_test.go
diff --git a/command/autocomplete.go → internal/command/autocomplete.go b/command/autocomplete.go → internal/command/autocomplete.go
diff --git a/command/autocomplete_test.go → internal/command/autocomplete_test.go b/command/autocomplete_test.go → internal/command/autocomplete_test.go
diff --git a/command/cli_ui.go → internal/command/cli_ui.go b/command/cli_ui.go → internal/command/cli_ui.go
diff --git a/command/cli_ui_test.go → internal/command/cli_ui_test.go b/command/cli_ui_test.go → internal/command/cli_ui_test.go
diff --git a/command/cliconfig/cliconfig.go → internal/command/cliconfig/cliconfig.go b/command/cliconfig/cliconfig.go → internal/command/cliconfig/cliconfig.go
diff --git a/command/cliconfig/cliconfig_test.go → internal/command/cliconfig/cliconfig_test.go b/command/cliconfig/cliconfig_test.go → internal/command/cliconfig/cliconfig_test.go
diff --git a/command/cliconfig/config_unix.go → internal/command/cliconfig/config_unix.go b/command/cliconfig/config_unix.go → internal/command/cliconfig/config_unix.go
diff --git a/command/cliconfig/config_windows.go → internal/command/cliconfig/config_windows.go b/command/cliconfig/config_windows.go → internal/command/cliconfig/config_windows.go
diff --git a/command/cliconfig/credentials.go → internal/command/cliconfig/credentials.go b/command/cliconfig/credentials.go → internal/command/cliconfig/credentials.go
diff --git a/command/cliconfig/credentials_test.go → ...nal/command/cliconfig/credentials_test.go b/command/cliconfig/credentials_test.go → ...nal/command/cliconfig/credentials_test.go
diff --git a/command/cliconfig/provider_installation.go → ...ommand/cliconfig/provider_installation.go b/command/cliconfig/provider_installation.go → ...ommand/cliconfig/provider_installation.go
diff --git a/...d/cliconfig/provider_installation_test.go → ...d/cliconfig/provider_installation_test.go b/...d/cliconfig/provider_installation_test.go → ...d/cliconfig/provider_installation_test.go
diff --git a/command/cliconfig/testdata/config → internal/command/cliconfig/testdata/config b/command/cliconfig/testdata/config → internal/command/cliconfig/testdata/config
diff --git a/command/cliconfig/testdata/config-env → ...nal/command/cliconfig/testdata/config-env b/command/cliconfig/testdata/config-env → ...nal/command/cliconfig/testdata/config-env
diff --git a/command/cliconfig/testdata/credentials → ...al/command/cliconfig/testdata/credentials b/command/cliconfig/testdata/credentials → ...al/command/cliconfig/testdata/credentials
diff --git a/command/cliconfig/testdata/hosts → internal/command/cliconfig/testdata/hosts b/command/cliconfig/testdata/hosts → internal/command/cliconfig/testdata/hosts
diff --git a/.../cliconfig/testdata/provider-installation → .../cliconfig/testdata/provider-installation b/.../cliconfig/testdata/provider-installation → .../cliconfig/testdata/provider-installation
diff --git a/...fig/testdata/provider-installation-errors → ...fig/testdata/provider-installation-errors b/...fig/testdata/provider-installation-errors → ...fig/testdata/provider-installation-errors
diff --git a/...onfig/testdata/provider-installation.json → ...onfig/testdata/provider-installation.json b/...onfig/testdata/provider-installation.json → ...onfig/testdata/provider-installation.json
diff --git a/command/clistate/local_state.go → internal/command/clistate/local_state.go b/command/clistate/local_state.go → internal/command/clistate/local_state.go
diff --git a/command/clistate/local_state_lock_unix.go → ...command/clistate/local_state_lock_unix.go b/command/clistate/local_state_lock_unix.go → ...command/clistate/local_state_lock_unix.go
diff --git a/command/clistate/local_state_lock_windows.go → ...mand/clistate/local_state_lock_windows.go b/command/clistate/local_state_lock_windows.go → ...mand/clistate/local_state_lock_windows.go
diff --git a/command/clistate/state.go → internal/command/clistate/state.go b/command/clistate/state.go → 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 → internal/command/clistate/state_test.go b/command/clistate/state_test.go → 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 → internal/command/command.go b/command/command.go → internal/command/command.go
diff --git a/command/command_test.go → internal/command/command_test.go b/command/command_test.go → 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 → internal/command/console.go b/command/console.go → internal/command/console.go
diff --git a/command/console_interactive.go → internal/command/console_interactive.go b/command/console_interactive.go → internal/command/console_interactive.go
diff --git a/command/console_interactive_solaris.go → ...al/command/console_interactive_solaris.go b/command/console_interactive_solaris.go → ...al/command/console_interactive_solaris.go
diff --git a/command/console_test.go → internal/command/console_test.go b/command/console_test.go → internal/command/console_test.go
diff --git a/command/e2etest/.gitignore → internal/command/e2etest/.gitignore b/command/e2etest/.gitignore → internal/command/e2etest/.gitignore
diff --git a/command/e2etest/automation_test.go → internal/command/e2etest/automation_test.go b/command/e2etest/automation_test.go → internal/command/e2etest/automation_test.go
diff --git a/command/e2etest/doc.go → internal/command/e2etest/doc.go b/command/e2etest/doc.go → internal/command/e2etest/doc.go
diff --git a/command/e2etest/init_test.go → internal/command/e2etest/init_test.go b/command/e2etest/init_test.go → internal/command/e2etest/init_test.go
diff --git a/command/e2etest/main_test.go → internal/command/e2etest/main_test.go b/command/e2etest/main_test.go → internal/command/e2etest/main_test.go
diff --git a/command/e2etest/make-archive.sh → internal/command/e2etest/make-archive.sh b/command/e2etest/make-archive.sh → internal/command/e2etest/make-archive.sh
diff --git a/command/e2etest/primary_test.go → internal/command/e2etest/primary_test.go b/command/e2etest/primary_test.go → internal/command/e2etest/primary_test.go
diff --git a/command/e2etest/provider_dev_test.go → ...rnal/command/e2etest/provider_dev_test.go b/command/e2etest/provider_dev_test.go → ...rnal/command/e2etest/provider_dev_test.go
diff --git a/command/e2etest/provider_plugin_test.go → ...l/command/e2etest/provider_plugin_test.go b/command/e2etest/provider_plugin_test.go → ...l/command/e2etest/provider_plugin_test.go
diff --git a/command/e2etest/providers_mirror_test.go → .../command/e2etest/providers_mirror_test.go b/command/e2etest/providers_mirror_test.go → .../command/e2etest/providers_mirror_test.go
diff --git a/command/e2etest/provisioner_plugin_test.go → ...ommand/e2etest/provisioner_plugin_test.go b/command/e2etest/provisioner_plugin_test.go → ...ommand/e2etest/provisioner_plugin_test.go
diff --git a/command/e2etest/provisioner_test.go → internal/command/e2etest/provisioner_test.go b/command/e2etest/provisioner_test.go → internal/command/e2etest/provisioner_test.go
diff --git a/command/e2etest/remote_state_test.go → ...rnal/command/e2etest/remote_state_test.go b/command/e2etest/remote_state_test.go → ...rnal/command/e2etest/remote_state_test.go
diff --git a/command/e2etest/strip_ansi.go → internal/command/e2etest/strip_ansi.go b/command/e2etest/strip_ansi.go → internal/command/e2etest/strip_ansi.go
diff --git a/...test/testdata/chdir-option/subdir/main.tf → ...test/testdata/chdir-option/subdir/main.tf b/...test/testdata/chdir-option/subdir/main.tf → ...test/testdata/chdir-option/subdir/main.tf
diff --git a/...om-provider-install-method/cliconfig.tfrc → ...om-provider-install-method/cliconfig.tfrc b/...om-provider-install-method/cliconfig.tfrc → ...om-provider-install-method/cliconfig.tfrc
diff --git a/...ovider-install-method/cliconfig.tfrc.json → ...ovider-install-method/cliconfig.tfrc.json b/...ovider-install-method/cliconfig.tfrc.json → ...ovider-install-method/cliconfig.tfrc.json
diff --git a/...arch/terraform-provider-happycloud_v1.2.0 → ...arch/terraform-provider-happycloud_v1.2.0 b/...arch/terraform-provider-happycloud_v1.2.0 → ...arch/terraform-provider-happycloud_v1.2.0
diff --git a/...ta/custom-provider-install-method/main.tf → ...ta/custom-provider-install-method/main.tf b/...ta/custom-provider-install-method/main.tf → ...ta/custom-provider-install-method/main.tf
diff --git a/command/e2etest/testdata/empty/.exists → ...al/command/e2etest/testdata/empty/.exists b/command/e2etest/testdata/empty/.exists → ...al/command/e2etest/testdata/empty/.exists
diff --git a/...etest/testdata/full-workflow-null/main.tf → ...etest/testdata/full-workflow-null/main.tf b/...etest/testdata/full-workflow-null/main.tf → ...etest/testdata/full-workflow-null/main.tf
diff --git a/...test/testdata/local-only-provider/main.tf → ...test/testdata/local-only-provider/main.tf b/...test/testdata/local-only-provider/main.tf → ...test/testdata/local-only-provider/main.tf
diff --git a/...arch/terraform-provider-happycloud_v1.2.0 → ...arch/terraform-provider-happycloud_v1.2.0 b/...arch/terraform-provider-happycloud_v1.2.0 → ...arch/terraform-provider-happycloud_v1.2.0
diff --git a/...rch/terraform-provider-template_v2.1.0_x4 → ...rch/terraform-provider-template_v2.1.0_x4 b/...rch/terraform-provider-template_v2.1.0_x4 → ...rch/terraform-provider-template_v2.1.0_x4
diff --git a/...and/e2etest/testdata/plugin-cache/main.tf → ...and/e2etest/testdata/plugin-cache/main.tf b/...and/e2etest/testdata/plugin-cache/main.tf → ...and/e2etest/testdata/plugin-cache/main.tf
diff --git a/...data/provider-dev-override/pkgdir/.exists → ...data/provider-dev-override/pkgdir/.exists b/...data/provider-dev-override/pkgdir/.exists → ...data/provider-dev-override/pkgdir/.exists
diff --git a/...der-dev-override/provider-dev-override.tf → ...der-dev-override/provider-dev-override.tf b/...der-dev-override/provider-dev-override.tf → ...der-dev-override/provider-dev-override.tf
diff --git a/...ta/provider-not-found-non-default/main.tf → ...ta/provider-not-found-non-default/main.tf b/...ta/provider-not-found-non-default/main.tf → ...ta/provider-not-found-non-default/main.tf
diff --git a/...etest/testdata/provider-not-found/main.tf → ...etest/testdata/provider-not-found/main.tf b/...etest/testdata/provider-not-found/main.tf → ...etest/testdata/provider-not-found/main.tf
diff --git a/.../e2etest/testdata/provider-plugin/main.tf → .../e2etest/testdata/provider-plugin/main.tf b/.../e2etest/testdata/provider-plugin/main.tf → .../e2etest/testdata/provider-plugin/main.tf
diff --git a/...2etest/testdata/provider-warnings/main.tf → ...2etest/testdata/provider-warnings/main.tf b/...2etest/testdata/provider-warnings/main.tf → ...2etest/testdata/provider-warnings/main.tf
diff --git a/...etest/testdata/provisioner-plugin/main.tf → ...etest/testdata/provisioner-plugin/main.tf b/...etest/testdata/provisioner-plugin/main.tf → ...etest/testdata/provisioner-plugin/main.tf
diff --git a/command/e2etest/testdata/provisioner/main.tf → ...mand/e2etest/testdata/provisioner/main.tf b/command/e2etest/testdata/provisioner/main.tf → ...mand/e2etest/testdata/provisioner/main.tf
diff --git a/...2etest/testdata/template-provider/main.tf → ...2etest/testdata/template-provider/main.tf b/...2etest/testdata/template-provider/main.tf → ...2etest/testdata/template-provider/main.tf
diff --git a/...etest/testdata/terraform-provider/main.tf → ...etest/testdata/terraform-provider/main.tf b/...etest/testdata/terraform-provider/main.tf → ...etest/testdata/terraform-provider/main.tf
diff --git a/.../testdata/terraform-provider/test.tfstate → .../testdata/terraform-provider/test.tfstate b/.../testdata/terraform-provider/test.tfstate → .../testdata/terraform-provider/test.tfstate
diff --git a/...ders-mirror/terraform-providers-mirror.tf → ...ders-mirror/terraform-providers-mirror.tf b/...ders-mirror/terraform-providers-mirror.tf → ...ders-mirror/terraform-providers-mirror.tf
diff --git a/...nd/e2etest/testdata/test-provider/main.tf → ...nd/e2etest/testdata/test-provider/main.tf b/...nd/e2etest/testdata/test-provider/main.tf → ...nd/e2etest/testdata/test-provider/main.tf
diff --git a/...2etest/testdata/vendored-provider/main.tf → ...2etest/testdata/vendored-provider/main.tf b/...2etest/testdata/vendored-provider/main.tf → ...2etest/testdata/vendored-provider/main.tf
diff --git a/...al/os_arch/terraform-provider-null_v1.0.0 → ...al/os_arch/terraform-provider-null_v1.0.0 b/...al/os_arch/terraform-provider-null_v1.0.0 → ...al/os_arch/terraform-provider-null_v1.0.0
diff --git a/command/e2etest/unmanaged_test.go → internal/command/e2etest/unmanaged_test.go b/command/e2etest/unmanaged_test.go → internal/command/e2etest/unmanaged_test.go
diff --git a/command/e2etest/version_test.go → internal/command/e2etest/version_test.go b/command/e2etest/version_test.go → internal/command/e2etest/version_test.go
diff --git a/command/flag_kv.go → internal/command/flag_kv.go b/command/flag_kv.go → internal/command/flag_kv.go
diff --git a/command/flag_kv_test.go → internal/command/flag_kv_test.go b/command/flag_kv_test.go → internal/command/flag_kv_test.go
diff --git a/command/fmt.go → internal/command/fmt.go b/command/fmt.go → internal/command/fmt.go
diff --git a/command/fmt_test.go → internal/command/fmt_test.go b/command/fmt_test.go → internal/command/fmt_test.go
diff --git a/command/format/diagnostic.go → internal/command/format/diagnostic.go b/command/format/diagnostic.go → 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 → internal/command/format/diagnostic_test.go b/command/format/diagnostic_test.go → 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 → internal/command/format/diff.go b/command/format/diff.go → internal/command/format/diff.go
diff --git a/command/format/diff_test.go → internal/command/format/diff_test.go b/command/format/diff_test.go → internal/command/format/diff_test.go
diff --git a/command/format/format.go → internal/command/format/format.go b/command/format/format.go → internal/command/format/format.go
diff --git a/command/format/object_id.go → internal/command/format/object_id.go b/command/format/object_id.go → internal/command/format/object_id.go
diff --git a/command/format/object_id_test.go → internal/command/format/object_id_test.go b/command/format/object_id_test.go → internal/command/format/object_id_test.go
diff --git a/command/format/state.go → internal/command/format/state.go b/command/format/state.go → internal/command/format/state.go
diff --git a/command/format/state_test.go → internal/command/format/state_test.go b/command/format/state_test.go → internal/command/format/state_test.go
diff --git a/command/format/trivia.go → internal/command/format/trivia.go b/command/format/trivia.go → internal/command/format/trivia.go
diff --git a/command/get.go → internal/command/get.go b/command/get.go → internal/command/get.go
diff --git a/command/get_test.go → internal/command/get_test.go b/command/get_test.go → internal/command/get_test.go
diff --git a/command/graph.go → internal/command/graph.go b/command/graph.go → internal/command/graph.go
diff --git a/command/graph_test.go → internal/command/graph_test.go b/command/graph_test.go → internal/command/graph_test.go
diff --git a/command/hook_module_install.go → internal/command/hook_module_install.go b/command/hook_module_install.go → internal/command/hook_module_install.go
diff --git a/command/import.go → internal/command/import.go b/command/import.go → 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 → internal/command/import_test.go b/command/import_test.go → internal/command/import_test.go
diff --git a/command/init.go → internal/command/init.go b/command/init.go → internal/command/init.go
diff --git a/command/init_test.go → internal/command/init_test.go b/command/init_test.go → internal/command/init_test.go
diff --git a/command/jsonconfig/config.go → internal/command/jsonconfig/config.go b/command/jsonconfig/config.go → internal/command/jsonconfig/config.go
diff --git a/command/jsonconfig/doc.go → internal/command/jsonconfig/doc.go b/command/jsonconfig/doc.go → internal/command/jsonconfig/doc.go
diff --git a/command/jsonconfig/expression.go → internal/command/jsonconfig/expression.go b/command/jsonconfig/expression.go → internal/command/jsonconfig/expression.go
diff --git a/command/jsonconfig/expression_test.go → ...nal/command/jsonconfig/expression_test.go b/command/jsonconfig/expression_test.go → ...nal/command/jsonconfig/expression_test.go
diff --git a/command/jsonplan/doc.go → internal/command/jsonplan/doc.go b/command/jsonplan/doc.go → internal/command/jsonplan/doc.go
diff --git a/command/jsonplan/module.go → internal/command/jsonplan/module.go b/command/jsonplan/module.go → internal/command/jsonplan/module.go
diff --git a/command/jsonplan/plan.go → internal/command/jsonplan/plan.go b/command/jsonplan/plan.go → 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 → internal/command/jsonplan/plan_test.go b/command/jsonplan/plan_test.go → internal/command/jsonplan/plan_test.go
diff --git a/command/jsonplan/resource.go → internal/command/jsonplan/resource.go b/command/jsonplan/resource.go → internal/command/jsonplan/resource.go
diff --git a/command/jsonplan/values.go → internal/command/jsonplan/values.go b/command/jsonplan/values.go → internal/command/jsonplan/values.go
diff --git a/command/jsonplan/values_test.go → internal/command/jsonplan/values_test.go b/command/jsonplan/values_test.go → internal/command/jsonplan/values_test.go
diff --git a/command/jsonprovider/attribute.go → internal/command/jsonprovider/attribute.go b/command/jsonprovider/attribute.go → internal/command/jsonprovider/attribute.go
diff --git a/command/jsonprovider/attribute_test.go → ...al/command/jsonprovider/attribute_test.go b/command/jsonprovider/attribute_test.go → ...al/command/jsonprovider/attribute_test.go
diff --git a/command/jsonprovider/block.go → internal/command/jsonprovider/block.go b/command/jsonprovider/block.go → internal/command/jsonprovider/block.go
diff --git a/command/jsonprovider/block_test.go → internal/command/jsonprovider/block_test.go b/command/jsonprovider/block_test.go → internal/command/jsonprovider/block_test.go
diff --git a/command/jsonprovider/doc.go → internal/command/jsonprovider/doc.go b/command/jsonprovider/doc.go → internal/command/jsonprovider/doc.go
diff --git a/command/jsonprovider/provider.go → internal/command/jsonprovider/provider.go b/command/jsonprovider/provider.go → internal/command/jsonprovider/provider.go
diff --git a/command/jsonprovider/provider_test.go → ...nal/command/jsonprovider/provider_test.go b/command/jsonprovider/provider_test.go → ...nal/command/jsonprovider/provider_test.go
diff --git a/command/jsonprovider/schema.go → internal/command/jsonprovider/schema.go b/command/jsonprovider/schema.go → internal/command/jsonprovider/schema.go
diff --git a/command/jsonprovider/schema_test.go → internal/command/jsonprovider/schema_test.go b/command/jsonprovider/schema_test.go → internal/command/jsonprovider/schema_test.go
diff --git a/command/jsonstate/doc.go → internal/command/jsonstate/doc.go b/command/jsonstate/doc.go → internal/command/jsonstate/doc.go
diff --git a/command/jsonstate/state.go → internal/command/jsonstate/state.go b/command/jsonstate/state.go → internal/command/jsonstate/state.go
diff --git a/command/jsonstate/state_test.go → internal/command/jsonstate/state_test.go b/command/jsonstate/state_test.go → internal/command/jsonstate/state_test.go
diff --git a/command/login.go → internal/command/login.go b/command/login.go → 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 → internal/command/login_test.go b/command/login_test.go → 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 → internal/command/logout.go b/command/logout.go → 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 → internal/command/logout_test.go b/command/logout_test.go → 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 → internal/command/meta.go b/command/meta.go → 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 → internal/command/meta_backend.go b/command/meta_backend.go → 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 → internal/command/meta_backend_migrate.go b/command/meta_backend_migrate.go → 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 → internal/command/meta_backend_test.go b/command/meta_backend_test.go → internal/command/meta_backend_test.go
diff --git a/command/meta_config.go → internal/command/meta_config.go b/command/meta_config.go → internal/command/meta_config.go
diff --git a/command/meta_dependencies.go → internal/command/meta_dependencies.go b/command/meta_dependencies.go → internal/command/meta_dependencies.go
diff --git a/command/meta_new.go → internal/command/meta_new.go b/command/meta_new.go → internal/command/meta_new.go
diff --git a/command/meta_providers.go → internal/command/meta_providers.go b/command/meta_providers.go → internal/command/meta_providers.go
diff --git a/command/meta_test.go → internal/command/meta_test.go b/command/meta_test.go → internal/command/meta_test.go
diff --git a/command/meta_vars.go → internal/command/meta_vars.go b/command/meta_vars.go → internal/command/meta_vars.go
diff --git a/command/output.go → internal/command/output.go b/command/output.go → 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 → internal/command/output_test.go b/command/output_test.go → internal/command/output_test.go
diff --git a/command/plan.go → internal/command/plan.go b/command/plan.go → 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 → internal/command/plan_test.go b/command/plan_test.go → internal/command/plan_test.go
diff --git a/command/plugins.go → internal/command/plugins.go b/command/plugins.go → internal/command/plugins.go
diff --git a/command/plugins_lock.go → internal/command/plugins_lock.go b/command/plugins_lock.go → internal/command/plugins_lock.go
diff --git a/command/plugins_lock_test.go → internal/command/plugins_lock_test.go b/command/plugins_lock_test.go → internal/command/plugins_lock_test.go
diff --git a/command/plugins_test.go → internal/command/plugins_test.go b/command/plugins_test.go → internal/command/plugins_test.go
diff --git a/command/providers.go → internal/command/providers.go b/command/providers.go → internal/command/providers.go
diff --git a/command/providers_lock.go → internal/command/providers_lock.go b/command/providers_lock.go → internal/command/providers_lock.go
diff --git a/command/providers_mirror.go → internal/command/providers_mirror.go b/command/providers_mirror.go → internal/command/providers_mirror.go
diff --git a/command/providers_schema.go → internal/command/providers_schema.go b/command/providers_schema.go → 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 → internal/command/providers_schema_test.go b/command/providers_schema_test.go → internal/command/providers_schema_test.go
diff --git a/command/providers_test.go → internal/command/providers_test.go b/command/providers_test.go → internal/command/providers_test.go
diff --git a/command/push.go → internal/command/push.go b/command/push.go → internal/command/push.go