From 73dda868cca4010a244fceabea2d5812abdd0c2a Mon Sep 17 00:00:00 2001 From: Martin Atkins Date: Mon, 17 May 2021 08:42:17 -0700 Subject: [PATCH] Move backend/ to internal/backend/ 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. --- .../providers/terraform/data_source_state.go | 6 ++-- .../terraform/data_source_state_test.go | 2 +- builtin/providers/terraform/provider_test.go | 2 +- command/apply.go | 4 +-- command/command_test.go | 4 +-- command/console.go | 2 +- command/graph.go | 2 +- command/import.go | 2 +- command/init.go | 4 +-- command/meta.go | 4 +-- command/meta_backend.go | 8 ++--- command/meta_backend_migrate.go | 2 +- command/meta_backend_test.go | 8 ++--- command/meta_test.go | 4 +-- command/meta_vars.go | 2 +- command/plan.go | 2 +- command/plan_test.go | 2 +- command/providers_schema.go | 2 +- command/refresh.go | 2 +- command/show.go | 2 +- command/state_meta.go | 2 +- command/state_push_test.go | 4 +-- command/state_show.go | 2 +- command/unlock_test.go | 2 +- command/workspace_command_test.go | 6 ++-- {backend => internal/backend}/backend.go | 0 {backend => internal/backend}/backend_test.go | 0 {backend => internal/backend}/cli.go | 0 .../backend}/init/deprecate_test.go | 2 +- {backend => internal/backend}/init/init.go | 36 +++++++++---------- .../backend}/init/init_test.go | 0 .../backend}/local/backend.go | 2 +- .../backend}/local/backend_apply.go | 2 +- .../backend}/local/backend_apply_test.go | 2 +- .../backend}/local/backend_local.go | 2 +- .../backend}/local/backend_local_test.go | 2 +- .../backend}/local/backend_plan.go | 2 +- .../backend}/local/backend_plan_test.go | 2 +- .../backend}/local/backend_refresh.go | 2 +- .../backend}/local/backend_refresh_test.go | 2 +- .../backend}/local/backend_test.go | 2 +- {backend => internal/backend}/local/cli.go | 2 +- .../backend}/local/hook_state.go | 0 .../backend}/local/hook_state_test.go | 0 .../backend}/local/local_test.go | 0 .../local/testdata/apply-empty/hello.txt | 0 .../local/testdata/apply-error/main.tf | 0 .../backend}/local/testdata/apply/main.tf | 0 .../local/testdata/destroy-with-ds/main.tf | 0 .../backend}/local/testdata/empty/.gitignore | 0 .../backend}/local/testdata/plan-cbd/main.tf | 0 .../plan-module-outputs-changed/main.tf | 0 .../plan-module-outputs-changed/mod/main.tf | 0 .../testdata/plan-outputs-changed/main.tf | 0 .../plan-outputs-changed/submodule/main.tf | 0 .../backend}/local/testdata/plan/main.tf | 0 .../testdata/refresh-provider-config/main.tf | 0 .../local/testdata/refresh-var-unset/main.tf | 0 .../backend}/local/testdata/refresh/main.tf | 0 .../backend}/local/testing.go | 2 +- .../backend}/operation_type.go | 0 .../backend}/operationtype_string.go | 0 .../remote-state/artifactory/backend.go | 2 +- .../remote-state/artifactory/client.go | 0 .../remote-state/artifactory/client_test.go | 2 +- .../backend}/remote-state/azure/arm_client.go | 0 .../backend}/remote-state/azure/backend.go | 2 +- .../remote-state/azure/backend_state.go | 2 +- .../remote-state/azure/backend_test.go | 2 +- .../backend}/remote-state/azure/client.go | 0 .../remote-state/azure/client_test.go | 2 +- .../remote-state/azure/helpers_test.go | 0 .../backend}/remote-state/azure/sender.go | 0 .../backend}/remote-state/consul/backend.go | 2 +- .../remote-state/consul/backend_state.go | 2 +- .../remote-state/consul/backend_test.go | 2 +- .../backend}/remote-state/consul/client.go | 0 .../remote-state/consul/client_test.go | 2 +- .../backend}/remote-state/cos/backend.go | 2 +- .../remote-state/cos/backend_state.go | 2 +- .../backend}/remote-state/cos/backend_test.go | 2 +- .../backend}/remote-state/cos/client.go | 0 .../backend}/remote-state/etcdv2/backend.go | 2 +- .../remote-state/etcdv2/backend_test.go | 2 +- .../backend}/remote-state/etcdv2/client.go | 0 .../remote-state/etcdv2/client_test.go | 2 +- .../backend}/remote-state/etcdv3/backend.go | 2 +- .../remote-state/etcdv3/backend_state.go | 2 +- .../remote-state/etcdv3/backend_test.go | 2 +- .../backend}/remote-state/etcdv3/client.go | 0 .../remote-state/etcdv3/client_test.go | 2 +- .../backend}/remote-state/gcs/backend.go | 2 +- .../remote-state/gcs/backend_state.go | 2 +- .../backend}/remote-state/gcs/backend_test.go | 2 +- .../backend}/remote-state/gcs/client.go | 0 .../backend}/remote-state/http/backend.go | 2 +- .../remote-state/http/backend_test.go | 2 +- .../backend}/remote-state/http/client.go | 0 .../backend}/remote-state/http/client_test.go | 0 .../backend}/remote-state/inmem/backend.go | 2 +- .../remote-state/inmem/backend_test.go | 2 +- .../backend}/remote-state/inmem/client.go | 0 .../remote-state/inmem/client_test.go | 2 +- .../remote-state/kubernetes/backend.go | 2 +- .../remote-state/kubernetes/backend_state.go | 2 +- .../remote-state/kubernetes/backend_test.go | 2 +- .../remote-state/kubernetes/client.go | 0 .../remote-state/kubernetes/client_test.go | 2 +- .../backend}/remote-state/manta/backend.go | 2 +- .../remote-state/manta/backend_state.go | 2 +- .../remote-state/manta/backend_test.go | 2 +- .../backend}/remote-state/manta/client.go | 0 .../remote-state/manta/client_test.go | 2 +- .../backend}/remote-state/oss/backend.go | 2 +- .../remote-state/oss/backend_state.go | 2 +- .../backend}/remote-state/oss/backend_test.go | 2 +- .../backend}/remote-state/oss/client.go | 0 .../backend}/remote-state/oss/client_test.go | 2 +- .../backend}/remote-state/pg/backend.go | 2 +- .../backend}/remote-state/pg/backend_state.go | 2 +- .../backend}/remote-state/pg/backend_test.go | 2 +- .../backend}/remote-state/pg/client.go | 0 .../backend}/remote-state/pg/client_test.go | 2 +- .../backend}/remote-state/s3/backend.go | 2 +- .../backend}/remote-state/s3/backend_state.go | 2 +- .../backend}/remote-state/s3/backend_test.go | 2 +- .../backend}/remote-state/s3/client.go | 0 .../backend}/remote-state/s3/client_test.go | 2 +- .../backend}/remote-state/swift/backend.go | 2 +- .../remote-state/swift/backend_state.go | 2 +- .../remote-state/swift/backend_test.go | 2 +- .../backend}/remote-state/swift/client.go | 0 .../remote-state/swift/client_test.go | 2 +- .../backend}/remote/backend.go | 4 +-- .../backend}/remote/backend_apply.go | 2 +- .../backend}/remote/backend_apply_test.go | 2 +- .../backend}/remote/backend_common.go | 2 +- .../backend}/remote/backend_context.go | 2 +- .../backend}/remote/backend_context_test.go | 2 +- .../backend}/remote/backend_mock.go | 0 .../backend}/remote/backend_plan.go | 2 +- .../backend}/remote/backend_plan_test.go | 2 +- .../backend}/remote/backend_state.go | 0 .../backend}/remote/backend_state_test.go | 2 +- .../backend}/remote/backend_test.go | 4 +-- {backend => internal/backend}/remote/cli.go | 2 +- .../backend}/remote/colorize.go | 0 .../backend}/remote/remote_test.go | 0 .../remote/testdata/apply-destroy/apply.log | 0 .../remote/testdata/apply-destroy/main.tf | 0 .../remote/testdata/apply-destroy/plan.log | 0 .../remote/testdata/apply-no-changes/main.tf | 0 .../remote/testdata/apply-no-changes/plan.log | 0 .../testdata/apply-no-changes/policy.log | 0 .../testdata/apply-policy-hard-failed/main.tf | 0 .../apply-policy-hard-failed/plan.log | 0 .../apply-policy-hard-failed/policy.log | 0 .../testdata/apply-policy-passed/apply.log | 0 .../testdata/apply-policy-passed/main.tf | 0 .../testdata/apply-policy-passed/plan.log | 0 .../testdata/apply-policy-passed/policy.log | 0 .../apply-policy-soft-failed/apply.log | 0 .../testdata/apply-policy-soft-failed/main.tf | 0 .../apply-policy-soft-failed/plan.log | 0 .../apply-policy-soft-failed/policy.log | 0 .../remote/testdata/apply-variables/apply.log | 0 .../remote/testdata/apply-variables/main.tf | 0 .../remote/testdata/apply-variables/plan.log | 0 .../remote/testdata/apply-with-error/main.tf | 0 .../remote/testdata/apply-with-error/plan.log | 0 .../backend}/remote/testdata/apply/apply.log | 0 .../backend}/remote/testdata/apply/main.tf | 0 .../backend}/remote/testdata/apply/plan.log | 0 .../backend}/remote/testdata/empty/.gitignore | 0 .../testdata/plan-cost-estimation/ce.log | 0 .../plan-cost-estimation/cost-estimate.log | 0 .../testdata/plan-cost-estimation/main.tf | 0 .../testdata/plan-cost-estimation/plan.log | 0 .../remote/testdata/plan-long-line/main.tf | 0 .../remote/testdata/plan-long-line/plan.log | 0 .../remote/testdata/plan-no-changes/main.tf | 0 .../remote/testdata/plan-no-changes/plan.log | 0 .../testdata/plan-no-changes/policy.log | 0 .../testdata/plan-policy-hard-failed/main.tf | 0 .../testdata/plan-policy-hard-failed/plan.log | 0 .../plan-policy-hard-failed/policy.log | 0 .../testdata/plan-policy-passed/main.tf | 0 .../testdata/plan-policy-passed/plan.log | 0 .../testdata/plan-policy-passed/policy.log | 0 .../testdata/plan-policy-soft-failed/main.tf | 0 .../testdata/plan-policy-soft-failed/plan.log | 0 .../plan-policy-soft-failed/policy.log | 0 .../remote/testdata/plan-variables/main.tf | 0 .../remote/testdata/plan-variables/plan.log | 0 .../remote/testdata/plan-with-error/main.tf | 0 .../remote/testdata/plan-with-error/plan.log | 0 .../terraform/main.tf | 0 .../terraform/plan.log | 0 .../backend}/remote/testdata/plan/main.tf | 0 .../backend}/remote/testdata/plan/plan.log | 0 .../backend}/remote/testing.go | 4 +-- {backend => internal/backend}/testing.go | 0 .../backend}/unparsed_value.go | 0 .../backend}/unparsed_value_test.go | 0 main.go | 2 +- 205 files changed, 140 insertions(+), 140 deletions(-) rename {backend => internal/backend}/backend.go (100%) rename {backend => internal/backend}/backend_test.go (100%) rename {backend => internal/backend}/cli.go (100%) rename {backend => internal/backend}/init/deprecate_test.go (89%) rename {backend => internal/backend}/init/init.go (76%) rename {backend => internal/backend}/init/init_test.go (100%) rename {backend => internal/backend}/local/backend.go (99%) rename {backend => internal/backend}/local/backend_apply.go (99%) rename {backend => internal/backend}/local/backend_apply_test.go (99%) rename {backend => internal/backend}/local/backend_local.go (99%) rename {backend => internal/backend}/local/backend_local_test.go (97%) rename {backend => internal/backend}/local/backend_plan.go (99%) rename {backend => internal/backend}/local/backend_plan_test.go (99%) rename {backend => internal/backend}/local/backend_refresh.go (98%) rename {backend => internal/backend}/local/backend_refresh_test.go (99%) rename {backend => internal/backend}/local/backend_test.go (99%) rename {backend => internal/backend}/local/cli.go (94%) rename {backend => internal/backend}/local/hook_state.go (100%) rename {backend => internal/backend}/local/hook_state_test.go (100%) rename {backend => internal/backend}/local/local_test.go (100%) rename {backend => internal/backend}/local/testdata/apply-empty/hello.txt (100%) rename {backend => internal/backend}/local/testdata/apply-error/main.tf (100%) rename {backend => internal/backend}/local/testdata/apply/main.tf (100%) rename {backend => internal/backend}/local/testdata/destroy-with-ds/main.tf (100%) rename {backend => internal/backend}/local/testdata/empty/.gitignore (100%) rename {backend => internal/backend}/local/testdata/plan-cbd/main.tf (100%) rename {backend => internal/backend}/local/testdata/plan-module-outputs-changed/main.tf (100%) rename {backend => internal/backend}/local/testdata/plan-module-outputs-changed/mod/main.tf (100%) rename {backend => internal/backend}/local/testdata/plan-outputs-changed/main.tf (100%) rename {backend => internal/backend}/local/testdata/plan-outputs-changed/submodule/main.tf (100%) rename {backend => internal/backend}/local/testdata/plan/main.tf (100%) rename {backend => internal/backend}/local/testdata/refresh-provider-config/main.tf (100%) rename {backend => internal/backend}/local/testdata/refresh-var-unset/main.tf (100%) rename {backend => internal/backend}/local/testdata/refresh/main.tf (100%) rename {backend => internal/backend}/local/testing.go (99%) rename {backend => internal/backend}/operation_type.go (100%) rename {backend => internal/backend}/operationtype_string.go (100%) rename {backend => internal/backend}/remote-state/artifactory/backend.go (98%) rename {backend => internal/backend}/remote-state/artifactory/client.go (100%) rename {backend => internal/backend}/remote-state/artifactory/client_test.go (97%) rename {backend => internal/backend}/remote-state/azure/arm_client.go (100%) rename {backend => internal/backend}/remote-state/azure/backend.go (99%) rename {backend => internal/backend}/remote-state/azure/backend_state.go (98%) rename {backend => internal/backend}/remote-state/azure/backend_test.go (99%) rename {backend => internal/backend}/remote-state/azure/client.go (100%) rename {backend => internal/backend}/remote-state/azure/client_test.go (99%) rename {backend => internal/backend}/remote-state/azure/helpers_test.go (100%) rename {backend => internal/backend}/remote-state/azure/sender.go (100%) rename {backend => internal/backend}/remote-state/consul/backend.go (98%) rename {backend => internal/backend}/remote-state/consul/backend_state.go (98%) rename {backend => internal/backend}/remote-state/consul/backend_test.go (97%) rename {backend => internal/backend}/remote-state/consul/client.go (100%) rename {backend => internal/backend}/remote-state/consul/client_test.go (99%) rename {backend => internal/backend}/remote-state/cos/backend.go (98%) rename {backend => internal/backend}/remote-state/cos/backend_state.go (98%) rename {backend => internal/backend}/remote-state/cos/backend_test.go (99%) rename {backend => internal/backend}/remote-state/cos/client.go (100%) rename {backend => internal/backend}/remote-state/etcdv2/backend.go (97%) rename {backend => internal/backend}/remote-state/etcdv2/backend_test.go (69%) rename {backend => internal/backend}/remote-state/etcdv2/client.go (100%) rename {backend => internal/backend}/remote-state/etcdv2/client_test.go (95%) rename {backend => internal/backend}/remote-state/etcdv3/backend.go (98%) rename {backend => internal/backend}/remote-state/etcdv3/backend_state.go (97%) rename {backend => internal/backend}/remote-state/etcdv3/backend_test.go (98%) rename {backend => internal/backend}/remote-state/etcdv3/client.go (100%) rename {backend => internal/backend}/remote-state/etcdv3/client_test.go (97%) rename {backend => internal/backend}/remote-state/gcs/backend.go (99%) rename {backend => internal/backend}/remote-state/gcs/backend_state.go (98%) rename {backend => internal/backend}/remote-state/gcs/backend_test.go (99%) rename {backend => internal/backend}/remote-state/gcs/client.go (100%) rename {backend => internal/backend}/remote-state/http/backend.go (99%) rename {backend => internal/backend}/remote-state/http/backend_test.go (99%) rename {backend => internal/backend}/remote-state/http/client.go (100%) rename {backend => internal/backend}/remote-state/http/client_test.go (100%) rename {backend => internal/backend}/remote-state/inmem/backend.go (98%) rename {backend => internal/backend}/remote-state/inmem/backend_test.go (97%) rename {backend => internal/backend}/remote-state/inmem/client.go (100%) rename {backend => internal/backend}/remote-state/inmem/client_test.go (93%) rename {backend => internal/backend}/remote-state/kubernetes/backend.go (99%) rename {backend => internal/backend}/remote-state/kubernetes/backend_state.go (98%) rename {backend => internal/backend}/remote-state/kubernetes/backend_test.go (98%) rename {backend => internal/backend}/remote-state/kubernetes/client.go (100%) rename {backend => internal/backend}/remote-state/kubernetes/client_test.go (98%) rename {backend => internal/backend}/remote-state/manta/backend.go (99%) rename {backend => internal/backend}/remote-state/manta/backend_state.go (98%) rename {backend => internal/backend}/remote-state/manta/backend_test.go (98%) rename {backend => internal/backend}/remote-state/manta/client.go (100%) rename {backend => internal/backend}/remote-state/manta/client_test.go (96%) rename {backend => internal/backend}/remote-state/oss/backend.go (99%) rename {backend => internal/backend}/remote-state/oss/backend_state.go (98%) rename {backend => internal/backend}/remote-state/oss/backend_test.go (99%) rename {backend => internal/backend}/remote-state/oss/client.go (100%) rename {backend => internal/backend}/remote-state/oss/client_test.go (99%) rename {backend => internal/backend}/remote-state/pg/backend.go (98%) rename {backend => internal/backend}/remote-state/pg/backend_state.go (98%) rename {backend => internal/backend}/remote-state/pg/backend_test.go (99%) rename {backend => internal/backend}/remote-state/pg/client.go (100%) rename {backend => internal/backend}/remote-state/pg/client_test.go (97%) rename {backend => internal/backend}/remote-state/s3/backend.go (99%) rename {backend => internal/backend}/remote-state/s3/backend_state.go (98%) rename {backend => internal/backend}/remote-state/s3/backend_test.go (99%) rename {backend => internal/backend}/remote-state/s3/client.go (100%) rename {backend => internal/backend}/remote-state/s3/client_test.go (99%) rename {backend => internal/backend}/remote-state/swift/backend.go (99%) rename {backend => internal/backend}/remote-state/swift/backend_state.go (99%) rename {backend => internal/backend}/remote-state/swift/backend_test.go (98%) rename {backend => internal/backend}/remote-state/swift/client.go (100%) rename {backend => internal/backend}/remote-state/swift/client_test.go (93%) rename {backend => internal/backend}/remote/backend.go (99%) rename {backend => internal/backend}/remote/backend_apply.go (99%) rename {backend => internal/backend}/remote/backend_apply_test.go (99%) rename {backend => internal/backend}/remote/backend_common.go (99%) rename {backend => internal/backend}/remote/backend_context.go (99%) rename {backend => internal/backend}/remote/backend_context_test.go (99%) rename {backend => internal/backend}/remote/backend_mock.go (100%) rename {backend => internal/backend}/remote/backend_plan.go (99%) rename {backend => internal/backend}/remote/backend_plan_test.go (99%) rename {backend => internal/backend}/remote/backend_state.go (100%) rename {backend => internal/backend}/remote/backend_state_test.go (96%) rename {backend => internal/backend}/remote/backend_test.go (99%) rename {backend => internal/backend}/remote/cli.go (86%) rename {backend => internal/backend}/remote/colorize.go (100%) rename {backend => internal/backend}/remote/remote_test.go (100%) rename {backend => internal/backend}/remote/testdata/apply-destroy/apply.log (100%) rename {backend => internal/backend}/remote/testdata/apply-destroy/main.tf (100%) rename {backend => internal/backend}/remote/testdata/apply-destroy/plan.log (100%) rename {backend => internal/backend}/remote/testdata/apply-no-changes/main.tf (100%) rename {backend => internal/backend}/remote/testdata/apply-no-changes/plan.log (100%) rename {backend => internal/backend}/remote/testdata/apply-no-changes/policy.log (100%) rename {backend => internal/backend}/remote/testdata/apply-policy-hard-failed/main.tf (100%) rename {backend => internal/backend}/remote/testdata/apply-policy-hard-failed/plan.log (100%) rename {backend => internal/backend}/remote/testdata/apply-policy-hard-failed/policy.log (100%) rename {backend => internal/backend}/remote/testdata/apply-policy-passed/apply.log (100%) rename {backend => internal/backend}/remote/testdata/apply-policy-passed/main.tf (100%) rename {backend => internal/backend}/remote/testdata/apply-policy-passed/plan.log (100%) rename {backend => internal/backend}/remote/testdata/apply-policy-passed/policy.log (100%) rename {backend => internal/backend}/remote/testdata/apply-policy-soft-failed/apply.log (100%) rename {backend => internal/backend}/remote/testdata/apply-policy-soft-failed/main.tf (100%) rename {backend => internal/backend}/remote/testdata/apply-policy-soft-failed/plan.log (100%) rename {backend => internal/backend}/remote/testdata/apply-policy-soft-failed/policy.log (100%) rename {backend => internal/backend}/remote/testdata/apply-variables/apply.log (100%) rename {backend => internal/backend}/remote/testdata/apply-variables/main.tf (100%) rename {backend => internal/backend}/remote/testdata/apply-variables/plan.log (100%) rename {backend => internal/backend}/remote/testdata/apply-with-error/main.tf (100%) rename {backend => internal/backend}/remote/testdata/apply-with-error/plan.log (100%) rename {backend => internal/backend}/remote/testdata/apply/apply.log (100%) rename {backend => internal/backend}/remote/testdata/apply/main.tf (100%) rename {backend => internal/backend}/remote/testdata/apply/plan.log (100%) rename {backend => internal/backend}/remote/testdata/empty/.gitignore (100%) rename {backend => internal/backend}/remote/testdata/plan-cost-estimation/ce.log (100%) rename {backend => internal/backend}/remote/testdata/plan-cost-estimation/cost-estimate.log (100%) rename {backend => internal/backend}/remote/testdata/plan-cost-estimation/main.tf (100%) rename {backend => internal/backend}/remote/testdata/plan-cost-estimation/plan.log (100%) rename {backend => internal/backend}/remote/testdata/plan-long-line/main.tf (100%) rename {backend => internal/backend}/remote/testdata/plan-long-line/plan.log (100%) rename {backend => internal/backend}/remote/testdata/plan-no-changes/main.tf (100%) rename {backend => internal/backend}/remote/testdata/plan-no-changes/plan.log (100%) rename {backend => internal/backend}/remote/testdata/plan-no-changes/policy.log (100%) rename {backend => internal/backend}/remote/testdata/plan-policy-hard-failed/main.tf (100%) rename {backend => internal/backend}/remote/testdata/plan-policy-hard-failed/plan.log (100%) rename {backend => internal/backend}/remote/testdata/plan-policy-hard-failed/policy.log (100%) rename {backend => internal/backend}/remote/testdata/plan-policy-passed/main.tf (100%) rename {backend => internal/backend}/remote/testdata/plan-policy-passed/plan.log (100%) rename {backend => internal/backend}/remote/testdata/plan-policy-passed/policy.log (100%) rename {backend => internal/backend}/remote/testdata/plan-policy-soft-failed/main.tf (100%) rename {backend => internal/backend}/remote/testdata/plan-policy-soft-failed/plan.log (100%) rename {backend => internal/backend}/remote/testdata/plan-policy-soft-failed/policy.log (100%) rename {backend => internal/backend}/remote/testdata/plan-variables/main.tf (100%) rename {backend => internal/backend}/remote/testdata/plan-variables/plan.log (100%) rename {backend => internal/backend}/remote/testdata/plan-with-error/main.tf (100%) rename {backend => internal/backend}/remote/testdata/plan-with-error/plan.log (100%) rename {backend => internal/backend}/remote/testdata/plan-with-working-directory/terraform/main.tf (100%) rename {backend => internal/backend}/remote/testdata/plan-with-working-directory/terraform/plan.log (100%) rename {backend => internal/backend}/remote/testdata/plan/main.tf (100%) rename {backend => internal/backend}/remote/testdata/plan/plan.log (100%) rename {backend => internal/backend}/remote/testing.go (98%) rename {backend => internal/backend}/testing.go (100%) rename {backend => internal/backend}/unparsed_value.go (100%) rename {backend => internal/backend}/unparsed_value_test.go (100%) diff --git a/builtin/providers/terraform/data_source_state.go b/builtin/providers/terraform/data_source_state.go index f2fdd5122e..00d9ebe1ef 100644 --- a/builtin/providers/terraform/data_source_state.go +++ b/builtin/providers/terraform/data_source_state.go @@ -4,14 +4,14 @@ import ( "fmt" "log" - "github.com/hashicorp/terraform/backend" - "github.com/hashicorp/terraform/backend/remote" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/backend/remote" "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/tfdiags" "github.com/zclconf/go-cty/cty" - backendInit "github.com/hashicorp/terraform/backend/init" + backendInit "github.com/hashicorp/terraform/internal/backend/init" ) func dataSourceRemoteStateGetSchema() providers.Schema { diff --git a/builtin/providers/terraform/data_source_state_test.go b/builtin/providers/terraform/data_source_state_test.go index 3aa1b16ea2..a55ce6eacf 100644 --- a/builtin/providers/terraform/data_source_state_test.go +++ b/builtin/providers/terraform/data_source_state_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/apparentlymart/go-dump/dump" - "github.com/hashicorp/terraform/backend" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/tfdiags" "github.com/zclconf/go-cty/cty" diff --git a/builtin/providers/terraform/provider_test.go b/builtin/providers/terraform/provider_test.go index fecf720d2f..5f06e9c342 100644 --- a/builtin/providers/terraform/provider_test.go +++ b/builtin/providers/terraform/provider_test.go @@ -1,7 +1,7 @@ package terraform import ( - backendInit "github.com/hashicorp/terraform/backend/init" + backendInit "github.com/hashicorp/terraform/internal/backend/init" ) func init() { diff --git a/command/apply.go b/command/apply.go index e7587e40c6..50fba0c0ab 100644 --- a/command/apply.go +++ b/command/apply.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "github.com/hashicorp/terraform/backend" - remoteBackend "github.com/hashicorp/terraform/backend/remote" "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/plans/planfile" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/command/command_test.go b/command/command_test.go index 44369a96f3..9353504334 100644 --- a/command/command_test.go +++ b/command/command_test.go @@ -40,8 +40,8 @@ import ( "github.com/hashicorp/terraform/version" "github.com/zclconf/go-cty/cty" - backendInit "github.com/hashicorp/terraform/backend/init" - backendLocal "github.com/hashicorp/terraform/backend/local" + backendInit "github.com/hashicorp/terraform/internal/backend/init" + backendLocal "github.com/hashicorp/terraform/internal/backend/local" legacy "github.com/hashicorp/terraform/internal/legacy/terraform" _ "github.com/hashicorp/terraform/internal/logging" ) diff --git a/command/console.go b/command/console.go index ebecd9edf0..d0128bf4b5 100644 --- a/command/console.go +++ b/command/console.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/helper/wrappedstreams" "github.com/hashicorp/terraform/repl" "github.com/hashicorp/terraform/tfdiags" diff --git a/command/graph.go b/command/graph.go index 2144fd2b69..77a2683c96 100644 --- a/command/graph.go +++ b/command/graph.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform/plans/planfile" "github.com/hashicorp/terraform/tfdiags" - "github.com/hashicorp/terraform/backend" "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/terraform" ) diff --git a/command/import.go b/command/import.go index 219b145785..fcba25fafe 100644 --- a/command/import.go +++ b/command/import.go @@ -11,10 +11,10 @@ import ( "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/backend" "github.com/hashicorp/terraform/command/arguments" "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/command/init.go b/command/init.go index 0f0b41d819..f12a91682e 100644 --- a/command/init.go +++ b/command/init.go @@ -13,10 +13,10 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/backend" - backendInit "github.com/hashicorp/terraform/backend/init" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/backend" + backendInit "github.com/hashicorp/terraform/internal/backend/init" "github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/internal/providercache" "github.com/hashicorp/terraform/states" diff --git a/command/meta.go b/command/meta.go index 4bebceb4e2..cce6f2a66d 100644 --- a/command/meta.go +++ b/command/meta.go @@ -19,13 +19,13 @@ import ( "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/hashicorp/terraform-svchost/disco" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/backend" - "github.com/hashicorp/terraform/backend/local" "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/backend" + "github.com/hashicorp/terraform/internal/backend/local" "github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/providers" diff --git a/command/meta_backend.go b/command/meta_backend.go index 2c378ae67e..4185d241c2 100644 --- a/command/meta_backend.go +++ b/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/backend" - remoteBackend "github.com/hashicorp/terraform/backend/remote" "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/plans" "github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/terraform" @@ -28,8 +28,8 @@ import ( "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" - backendInit "github.com/hashicorp/terraform/backend/init" - backendLocal "github.com/hashicorp/terraform/backend/local" + backendInit "github.com/hashicorp/terraform/internal/backend/init" + backendLocal "github.com/hashicorp/terraform/internal/backend/local" legacy "github.com/hashicorp/terraform/internal/legacy/terraform" ) diff --git a/command/meta_backend_migrate.go b/command/meta_backend_migrate.go index 85644508ca..797eff0542 100644 --- a/command/meta_backend_migrate.go +++ b/command/meta_backend_migrate.go @@ -11,10 +11,10 @@ import ( "sort" "strings" - "github.com/hashicorp/terraform/backend" "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/states" "github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/terraform" diff --git a/command/meta_backend_test.go b/command/meta_backend_test.go index 1749b28e96..4d84dd87e9 100644 --- a/command/meta_backend_test.go +++ b/command/meta_backend_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/backend" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/copy" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" @@ -19,9 +19,9 @@ import ( "github.com/mitchellh/cli" "github.com/zclconf/go-cty/cty" - backendInit "github.com/hashicorp/terraform/backend/init" - backendLocal "github.com/hashicorp/terraform/backend/local" - backendInmem "github.com/hashicorp/terraform/backend/remote-state/inmem" + backendInit "github.com/hashicorp/terraform/internal/backend/init" + backendLocal "github.com/hashicorp/terraform/internal/backend/local" + backendInmem "github.com/hashicorp/terraform/internal/backend/remote-state/inmem" ) // Test empty directory with no config/state creates a local state. diff --git a/command/meta_test.go b/command/meta_test.go index fe212d5322..5d4dc44643 100644 --- a/command/meta_test.go +++ b/command/meta_test.go @@ -10,8 +10,8 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform/backend" - "github.com/hashicorp/terraform/backend/local" + "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/backend/local" "github.com/hashicorp/terraform/terraform" ) diff --git a/command/meta_vars.go b/command/meta_vars.go index 69cb85ae5f..ba666eea17 100644 --- a/command/meta_vars.go +++ b/command/meta_vars.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" hcljson "github.com/hashicorp/hcl/v2/json" - "github.com/hashicorp/terraform/backend" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/command/plan.go b/command/plan.go index d73041af5d..4a92f7dae0 100644 --- a/command/plan.go +++ b/command/plan.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/hashicorp/terraform/backend" "github.com/hashicorp/terraform/command/arguments" "github.com/hashicorp/terraform/command/views" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/command/plan_test.go b/command/plan_test.go index 7d4611b1ae..d925c121a9 100644 --- a/command/plan_test.go +++ b/command/plan_test.go @@ -17,8 +17,8 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/addrs" - backendinit "github.com/hashicorp/terraform/backend/init" "github.com/hashicorp/terraform/configs/configschema" + backendinit "github.com/hashicorp/terraform/internal/backend/init" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/states" diff --git a/command/providers_schema.go b/command/providers_schema.go index 287af436a9..324c5600c9 100644 --- a/command/providers_schema.go +++ b/command/providers_schema.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/hashicorp/terraform/backend" "github.com/hashicorp/terraform/command/jsonprovider" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/command/refresh.go b/command/refresh.go index fc077ad692..c5093e7659 100644 --- a/command/refresh.go +++ b/command/refresh.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/hashicorp/terraform/backend" "github.com/hashicorp/terraform/command/arguments" "github.com/hashicorp/terraform/command/views" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/command/show.go b/command/show.go index e8cc880427..cd549cf15b 100644 --- a/command/show.go +++ b/command/show.go @@ -5,12 +5,12 @@ import ( "os" "strings" - "github.com/hashicorp/terraform/backend" "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/plans" "github.com/hashicorp/terraform/plans/planfile" "github.com/hashicorp/terraform/states/statefile" diff --git a/command/state_meta.go b/command/state_meta.go index 50ff5d3801..4beeb9e024 100644 --- a/command/state_meta.go +++ b/command/state_meta.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/tfdiags" - backendLocal "github.com/hashicorp/terraform/backend/local" + backendLocal "github.com/hashicorp/terraform/internal/backend/local" ) // StateMeta is the meta struct that should be embedded in state subcommands. diff --git a/command/state_push_test.go b/command/state_push_test.go index d906053daf..7c4d30e850 100644 --- a/command/state_push_test.go +++ b/command/state_push_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/backend" - "github.com/hashicorp/terraform/backend/remote-state/inmem" + "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/backend/remote-state/inmem" "github.com/hashicorp/terraform/states" "github.com/mitchellh/cli" ) diff --git a/command/state_show.go b/command/state_show.go index ee018cc55b..94cef8f59b 100644 --- a/command/state_show.go +++ b/command/state_show.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/backend" "github.com/hashicorp/terraform/command/format" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states" "github.com/mitchellh/cli" ) diff --git a/command/unlock_test.go b/command/unlock_test.go index 0b42b0cbe7..8219b587ed 100644 --- a/command/unlock_test.go +++ b/command/unlock_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/hashicorp/terraform/backend/remote-state/inmem" + "github.com/hashicorp/terraform/internal/backend/remote-state/inmem" "github.com/mitchellh/cli" legacy "github.com/hashicorp/terraform/internal/legacy/terraform" diff --git a/command/workspace_command_test.go b/command/workspace_command_test.go index 99c156bbc2..d60e3a13c9 100644 --- a/command/workspace_command_test.go +++ b/command/workspace_command_test.go @@ -8,9 +8,9 @@ import ( "testing" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/backend" - "github.com/hashicorp/terraform/backend/local" - "github.com/hashicorp/terraform/backend/remote-state/inmem" + "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/backend/local" + "github.com/hashicorp/terraform/internal/backend/remote-state/inmem" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statemgr" "github.com/mitchellh/cli" diff --git a/backend/backend.go b/internal/backend/backend.go similarity index 100% rename from backend/backend.go rename to internal/backend/backend.go diff --git a/backend/backend_test.go b/internal/backend/backend_test.go similarity index 100% rename from backend/backend_test.go rename to internal/backend/backend_test.go diff --git a/backend/cli.go b/internal/backend/cli.go similarity index 100% rename from backend/cli.go rename to internal/backend/cli.go diff --git a/backend/init/deprecate_test.go b/internal/backend/init/deprecate_test.go similarity index 89% rename from backend/init/deprecate_test.go rename to internal/backend/init/deprecate_test.go index c45d62d2b3..f84cab808d 100644 --- a/backend/init/deprecate_test.go +++ b/internal/backend/init/deprecate_test.go @@ -3,7 +3,7 @@ package init import ( "testing" - "github.com/hashicorp/terraform/backend/remote-state/inmem" + "github.com/hashicorp/terraform/internal/backend/remote-state/inmem" "github.com/zclconf/go-cty/cty" ) diff --git a/backend/init/init.go b/internal/backend/init/init.go similarity index 76% rename from backend/init/init.go rename to internal/backend/init/init.go index 9e990da06d..922a64e14e 100644 --- a/backend/init/init.go +++ b/internal/backend/init/init.go @@ -6,27 +6,27 @@ import ( "sync" "github.com/hashicorp/terraform-svchost/disco" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/tfdiags" "github.com/zclconf/go-cty/cty" - backendLocal "github.com/hashicorp/terraform/backend/local" - backendRemote "github.com/hashicorp/terraform/backend/remote" - backendArtifactory "github.com/hashicorp/terraform/backend/remote-state/artifactory" - backendAzure "github.com/hashicorp/terraform/backend/remote-state/azure" - backendConsul "github.com/hashicorp/terraform/backend/remote-state/consul" - backendCos "github.com/hashicorp/terraform/backend/remote-state/cos" - backendEtcdv2 "github.com/hashicorp/terraform/backend/remote-state/etcdv2" - backendEtcdv3 "github.com/hashicorp/terraform/backend/remote-state/etcdv3" - backendGCS "github.com/hashicorp/terraform/backend/remote-state/gcs" - backendHTTP "github.com/hashicorp/terraform/backend/remote-state/http" - backendInmem "github.com/hashicorp/terraform/backend/remote-state/inmem" - backendKubernetes "github.com/hashicorp/terraform/backend/remote-state/kubernetes" - backendManta "github.com/hashicorp/terraform/backend/remote-state/manta" - backendOSS "github.com/hashicorp/terraform/backend/remote-state/oss" - backendPg "github.com/hashicorp/terraform/backend/remote-state/pg" - backendS3 "github.com/hashicorp/terraform/backend/remote-state/s3" - backendSwift "github.com/hashicorp/terraform/backend/remote-state/swift" + backendLocal "github.com/hashicorp/terraform/internal/backend/local" + backendRemote "github.com/hashicorp/terraform/internal/backend/remote" + backendArtifactory "github.com/hashicorp/terraform/internal/backend/remote-state/artifactory" + backendAzure "github.com/hashicorp/terraform/internal/backend/remote-state/azure" + backendConsul "github.com/hashicorp/terraform/internal/backend/remote-state/consul" + backendCos "github.com/hashicorp/terraform/internal/backend/remote-state/cos" + backendEtcdv2 "github.com/hashicorp/terraform/internal/backend/remote-state/etcdv2" + backendEtcdv3 "github.com/hashicorp/terraform/internal/backend/remote-state/etcdv3" + backendGCS "github.com/hashicorp/terraform/internal/backend/remote-state/gcs" + backendHTTP "github.com/hashicorp/terraform/internal/backend/remote-state/http" + backendInmem "github.com/hashicorp/terraform/internal/backend/remote-state/inmem" + backendKubernetes "github.com/hashicorp/terraform/internal/backend/remote-state/kubernetes" + backendManta "github.com/hashicorp/terraform/internal/backend/remote-state/manta" + backendOSS "github.com/hashicorp/terraform/internal/backend/remote-state/oss" + backendPg "github.com/hashicorp/terraform/internal/backend/remote-state/pg" + backendS3 "github.com/hashicorp/terraform/internal/backend/remote-state/s3" + backendSwift "github.com/hashicorp/terraform/internal/backend/remote-state/swift" ) // backends is the list of available backends. This is a global variable diff --git a/backend/init/init_test.go b/internal/backend/init/init_test.go similarity index 100% rename from backend/init/init_test.go rename to internal/backend/init/init_test.go diff --git a/backend/local/backend.go b/internal/backend/local/backend.go similarity index 99% rename from backend/local/backend.go rename to internal/backend/local/backend.go index ecfe0c90d3..343452cbd0 100644 --- a/backend/local/backend.go +++ b/internal/backend/local/backend.go @@ -11,9 +11,9 @@ import ( "sort" "sync" - "github.com/hashicorp/terraform/backend" "github.com/hashicorp/terraform/command/views" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/tfdiags" diff --git a/backend/local/backend_apply.go b/internal/backend/local/backend_apply.go similarity index 99% rename from backend/local/backend_apply.go rename to internal/backend/local/backend_apply.go index db7d768296..dcc1f7c6bf 100644 --- a/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/backend" "github.com/hashicorp/terraform/command/views" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statefile" diff --git a/backend/local/backend_apply_test.go b/internal/backend/local/backend_apply_test.go similarity index 99% rename from backend/local/backend_apply_test.go rename to internal/backend/local/backend_apply_test.go index 95848d113e..9f3b547b84 100644 --- a/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/backend" "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/initwd" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/plans" diff --git a/backend/local/backend_local.go b/internal/backend/local/backend_local.go similarity index 99% rename from backend/local/backend_local.go rename to internal/backend/local/backend_local.go index eade3ec67e..58ce76da1e 100644 --- a/backend/local/backend_local.go +++ b/internal/backend/local/backend_local.go @@ -7,9 +7,9 @@ import ( "sort" "github.com/hashicorp/errwrap" - "github.com/hashicorp/terraform/backend" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configload" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/plans/planfile" "github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/terraform" diff --git a/backend/local/backend_local_test.go b/internal/backend/local/backend_local_test.go similarity index 97% rename from backend/local/backend_local_test.go rename to internal/backend/local/backend_local_test.go index 97f18129de..396ee46578 100644 --- a/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/backend" "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/initwd" "github.com/hashicorp/terraform/internal/terminal" ) diff --git a/backend/local/backend_plan.go b/internal/backend/local/backend_plan.go similarity index 99% rename from backend/local/backend_plan.go rename to internal/backend/local/backend_plan.go index 5bdd0d0409..cae8b19aaa 100644 --- a/backend/local/backend_plan.go +++ b/internal/backend/local/backend_plan.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/plans/planfile" "github.com/hashicorp/terraform/states/statefile" diff --git a/backend/local/backend_plan_test.go b/internal/backend/local/backend_plan_test.go similarity index 99% rename from backend/local/backend_plan_test.go rename to internal/backend/local/backend_plan_test.go index 3b90724d88..c46cebe74c 100644 --- a/backend/local/backend_plan_test.go +++ b/internal/backend/local/backend_plan_test.go @@ -8,11 +8,11 @@ import ( "testing" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/backend" "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/initwd" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/plans" diff --git a/backend/local/backend_refresh.go b/internal/backend/local/backend_refresh.go similarity index 98% rename from backend/local/backend_refresh.go rename to internal/backend/local/backend_refresh.go index 54ecc07b0c..deaf44adac 100644 --- a/backend/local/backend_refresh.go +++ b/internal/backend/local/backend_refresh.go @@ -7,7 +7,7 @@ import ( "os" "github.com/hashicorp/errwrap" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/tfdiags" diff --git a/backend/local/backend_refresh_test.go b/internal/backend/local/backend_refresh_test.go similarity index 99% rename from backend/local/backend_refresh_test.go rename to internal/backend/local/backend_refresh_test.go index bef5c5d015..db6be42288 100644 --- a/backend/local/backend_refresh_test.go +++ b/internal/backend/local/backend_refresh_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/backend" "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/initwd" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/providers" diff --git a/backend/local/backend_test.go b/internal/backend/local/backend_test.go similarity index 99% rename from backend/local/backend_test.go rename to internal/backend/local/backend_test.go index 863020efae..237be324d5 100644 --- a/backend/local/backend_test.go +++ b/internal/backend/local/backend_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states/statefile" "github.com/hashicorp/terraform/states/statemgr" ) diff --git a/backend/local/cli.go b/internal/backend/local/cli.go similarity index 94% rename from backend/local/cli.go rename to internal/backend/local/cli.go index 9963cbee6b..41d2477c6a 100644 --- a/backend/local/cli.go +++ b/internal/backend/local/cli.go @@ -3,7 +3,7 @@ package local import ( "log" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" ) // backend.CLI impl. diff --git a/backend/local/hook_state.go b/internal/backend/local/hook_state.go similarity index 100% rename from backend/local/hook_state.go rename to internal/backend/local/hook_state.go diff --git a/backend/local/hook_state_test.go b/internal/backend/local/hook_state_test.go similarity index 100% rename from backend/local/hook_state_test.go rename to internal/backend/local/hook_state_test.go diff --git a/backend/local/local_test.go b/internal/backend/local/local_test.go similarity index 100% rename from backend/local/local_test.go rename to internal/backend/local/local_test.go diff --git a/backend/local/testdata/apply-empty/hello.txt b/internal/backend/local/testdata/apply-empty/hello.txt similarity index 100% rename from backend/local/testdata/apply-empty/hello.txt rename to internal/backend/local/testdata/apply-empty/hello.txt diff --git a/backend/local/testdata/apply-error/main.tf b/internal/backend/local/testdata/apply-error/main.tf similarity index 100% rename from backend/local/testdata/apply-error/main.tf rename to internal/backend/local/testdata/apply-error/main.tf diff --git a/backend/local/testdata/apply/main.tf b/internal/backend/local/testdata/apply/main.tf similarity index 100% rename from backend/local/testdata/apply/main.tf rename to internal/backend/local/testdata/apply/main.tf diff --git a/backend/local/testdata/destroy-with-ds/main.tf b/internal/backend/local/testdata/destroy-with-ds/main.tf similarity index 100% rename from backend/local/testdata/destroy-with-ds/main.tf rename to internal/backend/local/testdata/destroy-with-ds/main.tf diff --git a/backend/local/testdata/empty/.gitignore b/internal/backend/local/testdata/empty/.gitignore similarity index 100% rename from backend/local/testdata/empty/.gitignore rename to internal/backend/local/testdata/empty/.gitignore diff --git a/backend/local/testdata/plan-cbd/main.tf b/internal/backend/local/testdata/plan-cbd/main.tf similarity index 100% rename from backend/local/testdata/plan-cbd/main.tf rename to internal/backend/local/testdata/plan-cbd/main.tf diff --git a/backend/local/testdata/plan-module-outputs-changed/main.tf b/internal/backend/local/testdata/plan-module-outputs-changed/main.tf similarity index 100% rename from backend/local/testdata/plan-module-outputs-changed/main.tf rename to internal/backend/local/testdata/plan-module-outputs-changed/main.tf diff --git a/backend/local/testdata/plan-module-outputs-changed/mod/main.tf b/internal/backend/local/testdata/plan-module-outputs-changed/mod/main.tf similarity index 100% rename from backend/local/testdata/plan-module-outputs-changed/mod/main.tf rename to internal/backend/local/testdata/plan-module-outputs-changed/mod/main.tf diff --git a/backend/local/testdata/plan-outputs-changed/main.tf b/internal/backend/local/testdata/plan-outputs-changed/main.tf similarity index 100% rename from backend/local/testdata/plan-outputs-changed/main.tf rename to internal/backend/local/testdata/plan-outputs-changed/main.tf diff --git a/backend/local/testdata/plan-outputs-changed/submodule/main.tf b/internal/backend/local/testdata/plan-outputs-changed/submodule/main.tf similarity index 100% rename from backend/local/testdata/plan-outputs-changed/submodule/main.tf rename to internal/backend/local/testdata/plan-outputs-changed/submodule/main.tf diff --git a/backend/local/testdata/plan/main.tf b/internal/backend/local/testdata/plan/main.tf similarity index 100% rename from backend/local/testdata/plan/main.tf rename to internal/backend/local/testdata/plan/main.tf diff --git a/backend/local/testdata/refresh-provider-config/main.tf b/internal/backend/local/testdata/refresh-provider-config/main.tf similarity index 100% rename from backend/local/testdata/refresh-provider-config/main.tf rename to internal/backend/local/testdata/refresh-provider-config/main.tf diff --git a/backend/local/testdata/refresh-var-unset/main.tf b/internal/backend/local/testdata/refresh-var-unset/main.tf similarity index 100% rename from backend/local/testdata/refresh-var-unset/main.tf rename to internal/backend/local/testdata/refresh-var-unset/main.tf diff --git a/backend/local/testdata/refresh/main.tf b/internal/backend/local/testdata/refresh/main.tf similarity index 100% rename from backend/local/testdata/refresh/main.tf rename to internal/backend/local/testdata/refresh/main.tf diff --git a/backend/local/testing.go b/internal/backend/local/testing.go similarity index 99% rename from backend/local/testing.go rename to internal/backend/local/testing.go index 87e57fc322..32d9289019 100644 --- a/backend/local/testing.go +++ b/internal/backend/local/testing.go @@ -9,8 +9,8 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/backend" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statemgr" diff --git a/backend/operation_type.go b/internal/backend/operation_type.go similarity index 100% rename from backend/operation_type.go rename to internal/backend/operation_type.go diff --git a/backend/operationtype_string.go b/internal/backend/operationtype_string.go similarity index 100% rename from backend/operationtype_string.go rename to internal/backend/operationtype_string.go diff --git a/backend/remote-state/artifactory/backend.go b/internal/backend/remote-state/artifactory/backend.go similarity index 98% rename from backend/remote-state/artifactory/backend.go rename to internal/backend/remote-state/artifactory/backend.go index 8f504a6108..56dd50c06a 100644 --- a/backend/remote-state/artifactory/backend.go +++ b/internal/backend/remote-state/artifactory/backend.go @@ -4,7 +4,7 @@ import ( "context" cleanhttp "github.com/hashicorp/go-cleanhttp" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/legacy/helper/schema" "github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/states/statemgr" diff --git a/backend/remote-state/artifactory/client.go b/internal/backend/remote-state/artifactory/client.go similarity index 100% rename from backend/remote-state/artifactory/client.go rename to internal/backend/remote-state/artifactory/client.go diff --git a/backend/remote-state/artifactory/client_test.go b/internal/backend/remote-state/artifactory/client_test.go similarity index 97% rename from backend/remote-state/artifactory/client_test.go rename to internal/backend/remote-state/artifactory/client_test.go index ebc1a28177..7499ec854f 100644 --- a/backend/remote-state/artifactory/client_test.go +++ b/internal/backend/remote-state/artifactory/client_test.go @@ -3,8 +3,8 @@ package artifactory import ( "testing" - "github.com/hashicorp/terraform/backend" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states/remote" "github.com/zclconf/go-cty/cty" ) diff --git a/backend/remote-state/azure/arm_client.go b/internal/backend/remote-state/azure/arm_client.go similarity index 100% rename from backend/remote-state/azure/arm_client.go rename to internal/backend/remote-state/azure/arm_client.go diff --git a/backend/remote-state/azure/backend.go b/internal/backend/remote-state/azure/backend.go similarity index 99% rename from backend/remote-state/azure/backend.go rename to internal/backend/remote-state/azure/backend.go index 8b8c7d32e2..889b1f7f82 100644 --- a/backend/remote-state/azure/backend.go +++ b/internal/backend/remote-state/azure/backend.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/legacy/helper/schema" ) diff --git a/backend/remote-state/azure/backend_state.go b/internal/backend/remote-state/azure/backend_state.go similarity index 98% rename from backend/remote-state/azure/backend_state.go rename to internal/backend/remote-state/azure/backend_state.go index 9017690e3e..9bd263565a 100644 --- a/backend/remote-state/azure/backend_state.go +++ b/internal/backend/remote-state/azure/backend_state.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/states/statemgr" diff --git a/backend/remote-state/azure/backend_test.go b/internal/backend/remote-state/azure/backend_test.go similarity index 99% rename from backend/remote-state/azure/backend_test.go rename to internal/backend/remote-state/azure/backend_test.go index c292fd63af..8ae20a31ae 100644 --- a/backend/remote-state/azure/backend_test.go +++ b/internal/backend/remote-state/azure/backend_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/legacy/helper/acctest" ) diff --git a/backend/remote-state/azure/client.go b/internal/backend/remote-state/azure/client.go similarity index 100% rename from backend/remote-state/azure/client.go rename to internal/backend/remote-state/azure/client.go diff --git a/backend/remote-state/azure/client_test.go b/internal/backend/remote-state/azure/client_test.go similarity index 99% rename from backend/remote-state/azure/client_test.go rename to internal/backend/remote-state/azure/client_test.go index c254e9ca1b..e015613143 100644 --- a/backend/remote-state/azure/client_test.go +++ b/internal/backend/remote-state/azure/client_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/legacy/helper/acctest" "github.com/hashicorp/terraform/states/remote" "github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/blobs" diff --git a/backend/remote-state/azure/helpers_test.go b/internal/backend/remote-state/azure/helpers_test.go similarity index 100% rename from backend/remote-state/azure/helpers_test.go rename to internal/backend/remote-state/azure/helpers_test.go diff --git a/backend/remote-state/azure/sender.go b/internal/backend/remote-state/azure/sender.go similarity index 100% rename from backend/remote-state/azure/sender.go rename to internal/backend/remote-state/azure/sender.go diff --git a/backend/remote-state/consul/backend.go b/internal/backend/remote-state/consul/backend.go similarity index 98% rename from backend/remote-state/consul/backend.go rename to internal/backend/remote-state/consul/backend.go index ebe62471bf..8846969813 100644 --- a/backend/remote-state/consul/backend.go +++ b/internal/backend/remote-state/consul/backend.go @@ -7,7 +7,7 @@ import ( "time" consulapi "github.com/hashicorp/consul/api" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/legacy/helper/schema" ) diff --git a/backend/remote-state/consul/backend_state.go b/internal/backend/remote-state/consul/backend_state.go similarity index 98% rename from backend/remote-state/consul/backend_state.go rename to internal/backend/remote-state/consul/backend_state.go index 30a12afeac..e4e2588ad1 100644 --- a/backend/remote-state/consul/backend_state.go +++ b/internal/backend/remote-state/consul/backend_state.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/states/statemgr" diff --git a/backend/remote-state/consul/backend_test.go b/internal/backend/remote-state/consul/backend_test.go similarity index 97% rename from backend/remote-state/consul/backend_test.go rename to internal/backend/remote-state/consul/backend_test.go index 394bf428e5..6e04b6034e 100644 --- a/backend/remote-state/consul/backend_test.go +++ b/internal/backend/remote-state/consul/backend_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/hashicorp/consul/testutil" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" ) func TestBackend_impl(t *testing.T) { diff --git a/backend/remote-state/consul/client.go b/internal/backend/remote-state/consul/client.go similarity index 100% rename from backend/remote-state/consul/client.go rename to internal/backend/remote-state/consul/client.go diff --git a/backend/remote-state/consul/client_test.go b/internal/backend/remote-state/consul/client_test.go similarity index 99% rename from backend/remote-state/consul/client_test.go rename to internal/backend/remote-state/consul/client_test.go index 42ebbf50a0..cd6496611b 100644 --- a/backend/remote-state/consul/client_test.go +++ b/internal/backend/remote-state/consul/client_test.go @@ -13,7 +13,7 @@ import ( "testing" "time" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/states/statemgr" ) diff --git a/backend/remote-state/cos/backend.go b/internal/backend/remote-state/cos/backend.go similarity index 98% rename from backend/remote-state/cos/backend.go rename to internal/backend/remote-state/cos/backend.go index fa358aa105..8d0d014541 100644 --- a/backend/remote-state/cos/backend.go +++ b/internal/backend/remote-state/cos/backend.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/legacy/helper/schema" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" diff --git a/backend/remote-state/cos/backend_state.go b/internal/backend/remote-state/cos/backend_state.go similarity index 98% rename from backend/remote-state/cos/backend_state.go rename to internal/backend/remote-state/cos/backend_state.go index 7784ab4ff3..91e446e82a 100644 --- a/backend/remote-state/cos/backend_state.go +++ b/internal/backend/remote-state/cos/backend_state.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/states/statemgr" diff --git a/backend/remote-state/cos/backend_test.go b/internal/backend/remote-state/cos/backend_test.go similarity index 99% rename from backend/remote-state/cos/backend_test.go rename to internal/backend/remote-state/cos/backend_test.go index 81200de932..0b259390ed 100644 --- a/backend/remote-state/cos/backend_test.go +++ b/internal/backend/remote-state/cos/backend_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states/remote" "github.com/likexian/gokit/assert" ) diff --git a/backend/remote-state/cos/client.go b/internal/backend/remote-state/cos/client.go similarity index 100% rename from backend/remote-state/cos/client.go rename to internal/backend/remote-state/cos/client.go diff --git a/backend/remote-state/etcdv2/backend.go b/internal/backend/remote-state/etcdv2/backend.go similarity index 97% rename from backend/remote-state/etcdv2/backend.go rename to internal/backend/remote-state/etcdv2/backend.go index ee0f0bda55..06bd5f71d3 100644 --- a/backend/remote-state/etcdv2/backend.go +++ b/internal/backend/remote-state/etcdv2/backend.go @@ -7,7 +7,7 @@ import ( "strings" etcdapi "github.com/coreos/etcd/client" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/legacy/helper/schema" "github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/states/statemgr" diff --git a/backend/remote-state/etcdv2/backend_test.go b/internal/backend/remote-state/etcdv2/backend_test.go similarity index 69% rename from backend/remote-state/etcdv2/backend_test.go rename to internal/backend/remote-state/etcdv2/backend_test.go index c992f624e6..6b8299178a 100644 --- a/backend/remote-state/etcdv2/backend_test.go +++ b/internal/backend/remote-state/etcdv2/backend_test.go @@ -3,7 +3,7 @@ package etcdv2 import ( "testing" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" ) func TestBackend_impl(t *testing.T) { diff --git a/backend/remote-state/etcdv2/client.go b/internal/backend/remote-state/etcdv2/client.go similarity index 100% rename from backend/remote-state/etcdv2/client.go rename to internal/backend/remote-state/etcdv2/client.go diff --git a/backend/remote-state/etcdv2/client_test.go b/internal/backend/remote-state/etcdv2/client_test.go similarity index 95% rename from backend/remote-state/etcdv2/client_test.go rename to internal/backend/remote-state/etcdv2/client_test.go index a212c5fcd0..bc3a213cea 100644 --- a/backend/remote-state/etcdv2/client_test.go +++ b/internal/backend/remote-state/etcdv2/client_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform/backend" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states/remote" "github.com/zclconf/go-cty/cty" ) diff --git a/backend/remote-state/etcdv3/backend.go b/internal/backend/remote-state/etcdv3/backend.go similarity index 98% rename from backend/remote-state/etcdv3/backend.go rename to internal/backend/remote-state/etcdv3/backend.go index 1bf5809bf3..91b8082b54 100644 --- a/backend/remote-state/etcdv3/backend.go +++ b/internal/backend/remote-state/etcdv3/backend.go @@ -5,7 +5,7 @@ import ( etcdv3 "github.com/coreos/etcd/clientv3" "github.com/coreos/etcd/pkg/transport" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/legacy/helper/schema" ) diff --git a/backend/remote-state/etcdv3/backend_state.go b/internal/backend/remote-state/etcdv3/backend_state.go similarity index 97% rename from backend/remote-state/etcdv3/backend_state.go rename to internal/backend/remote-state/etcdv3/backend_state.go index 1f514a8f4d..0ee132e22f 100644 --- a/backend/remote-state/etcdv3/backend_state.go +++ b/internal/backend/remote-state/etcdv3/backend_state.go @@ -8,7 +8,7 @@ import ( etcdv3 "github.com/coreos/etcd/clientv3" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/states/statemgr" diff --git a/backend/remote-state/etcdv3/backend_test.go b/internal/backend/remote-state/etcdv3/backend_test.go similarity index 98% rename from backend/remote-state/etcdv3/backend_test.go rename to internal/backend/remote-state/etcdv3/backend_test.go index 4b05220e54..2b4d312a74 100644 --- a/backend/remote-state/etcdv3/backend_test.go +++ b/internal/backend/remote-state/etcdv3/backend_test.go @@ -10,7 +10,7 @@ import ( "time" etcdv3 "github.com/coreos/etcd/clientv3" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" ) var ( diff --git a/backend/remote-state/etcdv3/client.go b/internal/backend/remote-state/etcdv3/client.go similarity index 100% rename from backend/remote-state/etcdv3/client.go rename to internal/backend/remote-state/etcdv3/client.go diff --git a/backend/remote-state/etcdv3/client_test.go b/internal/backend/remote-state/etcdv3/client_test.go similarity index 97% rename from backend/remote-state/etcdv3/client_test.go rename to internal/backend/remote-state/etcdv3/client_test.go index 69f9c944b6..f6aa2ed039 100644 --- a/backend/remote-state/etcdv3/client_test.go +++ b/internal/backend/remote-state/etcdv3/client_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/states/statemgr" ) diff --git a/backend/remote-state/gcs/backend.go b/internal/backend/remote-state/gcs/backend.go similarity index 99% rename from backend/remote-state/gcs/backend.go rename to internal/backend/remote-state/gcs/backend.go index b4e3cdf536..3149e2ee2a 100644 --- a/backend/remote-state/gcs/backend.go +++ b/internal/backend/remote-state/gcs/backend.go @@ -9,8 +9,8 @@ import ( "strings" "cloud.google.com/go/storage" - "github.com/hashicorp/terraform/backend" "github.com/hashicorp/terraform/httpclient" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/legacy/helper/schema" "golang.org/x/oauth2" "google.golang.org/api/impersonate" diff --git a/backend/remote-state/gcs/backend_state.go b/internal/backend/remote-state/gcs/backend_state.go similarity index 98% rename from backend/remote-state/gcs/backend_state.go rename to internal/backend/remote-state/gcs/backend_state.go index a7e511cd2b..2e88e6e61f 100644 --- a/backend/remote-state/gcs/backend_state.go +++ b/internal/backend/remote-state/gcs/backend_state.go @@ -9,7 +9,7 @@ import ( "cloud.google.com/go/storage" "google.golang.org/api/iterator" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/states/statemgr" diff --git a/backend/remote-state/gcs/backend_test.go b/internal/backend/remote-state/gcs/backend_test.go similarity index 99% rename from backend/remote-state/gcs/backend_test.go rename to internal/backend/remote-state/gcs/backend_test.go index dd089aeb4a..b4b9218d9e 100644 --- a/backend/remote-state/gcs/backend_test.go +++ b/internal/backend/remote-state/gcs/backend_test.go @@ -9,7 +9,7 @@ import ( "time" "cloud.google.com/go/storage" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states/remote" ) diff --git a/backend/remote-state/gcs/client.go b/internal/backend/remote-state/gcs/client.go similarity index 100% rename from backend/remote-state/gcs/client.go rename to internal/backend/remote-state/gcs/client.go diff --git a/backend/remote-state/http/backend.go b/internal/backend/remote-state/http/backend.go similarity index 99% rename from backend/remote-state/http/backend.go rename to internal/backend/remote-state/http/backend.go index dee59f48cc..f8eb82a42c 100644 --- a/backend/remote-state/http/backend.go +++ b/internal/backend/remote-state/http/backend.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/go-cleanhttp" "github.com/hashicorp/go-retryablehttp" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/legacy/helper/schema" "github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/states/statemgr" diff --git a/backend/remote-state/http/backend_test.go b/internal/backend/remote-state/http/backend_test.go similarity index 99% rename from backend/remote-state/http/backend_test.go rename to internal/backend/remote-state/http/backend_test.go index a03ebb319d..0932467ab0 100644 --- a/backend/remote-state/http/backend_test.go +++ b/internal/backend/remote-state/http/backend_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform/configs" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" ) func TestBackend_impl(t *testing.T) { diff --git a/backend/remote-state/http/client.go b/internal/backend/remote-state/http/client.go similarity index 100% rename from backend/remote-state/http/client.go rename to internal/backend/remote-state/http/client.go diff --git a/backend/remote-state/http/client_test.go b/internal/backend/remote-state/http/client_test.go similarity index 100% rename from backend/remote-state/http/client_test.go rename to internal/backend/remote-state/http/client_test.go diff --git a/backend/remote-state/inmem/backend.go b/internal/backend/remote-state/inmem/backend.go similarity index 98% rename from backend/remote-state/inmem/backend.go rename to internal/backend/remote-state/inmem/backend.go index 035f3c973d..a228b18edb 100644 --- a/backend/remote-state/inmem/backend.go +++ b/internal/backend/remote-state/inmem/backend.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/legacy/helper/schema" statespkg "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/remote" diff --git a/backend/remote-state/inmem/backend_test.go b/internal/backend/remote-state/inmem/backend_test.go similarity index 97% rename from backend/remote-state/inmem/backend_test.go rename to internal/backend/remote-state/inmem/backend_test.go index 218e706ffb..e85b81d9ad 100644 --- a/backend/remote-state/inmem/backend_test.go +++ b/internal/backend/remote-state/inmem/backend_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" statespkg "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/remote" diff --git a/backend/remote-state/inmem/client.go b/internal/backend/remote-state/inmem/client.go similarity index 100% rename from backend/remote-state/inmem/client.go rename to internal/backend/remote-state/inmem/client.go diff --git a/backend/remote-state/inmem/client_test.go b/internal/backend/remote-state/inmem/client_test.go similarity index 93% rename from backend/remote-state/inmem/client_test.go rename to internal/backend/remote-state/inmem/client_test.go index 765eac9ee1..e2cb8f5203 100644 --- a/backend/remote-state/inmem/client_test.go +++ b/internal/backend/remote-state/inmem/client_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states/remote" ) diff --git a/backend/remote-state/kubernetes/backend.go b/internal/backend/remote-state/kubernetes/backend.go similarity index 99% rename from backend/remote-state/kubernetes/backend.go rename to internal/backend/remote-state/kubernetes/backend.go index a3398a464c..907cda9e24 100644 --- a/backend/remote-state/kubernetes/backend.go +++ b/internal/backend/remote-state/kubernetes/backend.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/legacy/helper/schema" "github.com/hashicorp/terraform/version" "github.com/mitchellh/go-homedir" diff --git a/backend/remote-state/kubernetes/backend_state.go b/internal/backend/remote-state/kubernetes/backend_state.go similarity index 98% rename from backend/remote-state/kubernetes/backend_state.go rename to internal/backend/remote-state/kubernetes/backend_state.go index f9c3c76d59..5d2390aa62 100644 --- a/backend/remote-state/kubernetes/backend_state.go +++ b/internal/backend/remote-state/kubernetes/backend_state.go @@ -5,7 +5,7 @@ import ( "fmt" "sort" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/states/statemgr" diff --git a/backend/remote-state/kubernetes/backend_test.go b/internal/backend/remote-state/kubernetes/backend_test.go similarity index 98% rename from backend/remote-state/kubernetes/backend_test.go rename to internal/backend/remote-state/kubernetes/backend_test.go index acb3f572ed..616a78c984 100644 --- a/backend/remote-state/kubernetes/backend_test.go +++ b/internal/backend/remote-state/kubernetes/backend_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states/statemgr" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/backend/remote-state/kubernetes/client.go b/internal/backend/remote-state/kubernetes/client.go similarity index 100% rename from backend/remote-state/kubernetes/client.go rename to internal/backend/remote-state/kubernetes/client.go diff --git a/backend/remote-state/kubernetes/client_test.go b/internal/backend/remote-state/kubernetes/client_test.go similarity index 98% rename from backend/remote-state/kubernetes/client_test.go rename to internal/backend/remote-state/kubernetes/client_test.go index 3026afc2d8..d2e94c6e6a 100644 --- a/backend/remote-state/kubernetes/client_test.go +++ b/internal/backend/remote-state/kubernetes/client_test.go @@ -3,7 +3,7 @@ package kubernetes import ( "testing" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/states/statemgr" ) diff --git a/backend/remote-state/manta/backend.go b/internal/backend/remote-state/manta/backend.go similarity index 99% rename from backend/remote-state/manta/backend.go rename to internal/backend/remote-state/manta/backend.go index c7e32403bc..3a7a21bc5a 100644 --- a/backend/remote-state/manta/backend.go +++ b/internal/backend/remote-state/manta/backend.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/legacy/helper/schema" triton "github.com/joyent/triton-go" "github.com/joyent/triton-go/authentication" diff --git a/backend/remote-state/manta/backend_state.go b/internal/backend/remote-state/manta/backend_state.go similarity index 98% rename from backend/remote-state/manta/backend_state.go rename to internal/backend/remote-state/manta/backend_state.go index 6ce9ba0f6f..5c03bd7fae 100644 --- a/backend/remote-state/manta/backend_state.go +++ b/internal/backend/remote-state/manta/backend_state.go @@ -11,7 +11,7 @@ import ( tritonErrors "github.com/joyent/triton-go/errors" "github.com/joyent/triton-go/storage" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/states/statemgr" diff --git a/backend/remote-state/manta/backend_test.go b/internal/backend/remote-state/manta/backend_test.go similarity index 98% rename from backend/remote-state/manta/backend_test.go rename to internal/backend/remote-state/manta/backend_test.go index be9b2575dd..180b2aece3 100644 --- a/backend/remote-state/manta/backend_test.go +++ b/internal/backend/remote-state/manta/backend_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/joyent/triton-go/storage" ) diff --git a/backend/remote-state/manta/client.go b/internal/backend/remote-state/manta/client.go similarity index 100% rename from backend/remote-state/manta/client.go rename to internal/backend/remote-state/manta/client.go diff --git a/backend/remote-state/manta/client_test.go b/internal/backend/remote-state/manta/client_test.go similarity index 96% rename from backend/remote-state/manta/client_test.go rename to internal/backend/remote-state/manta/client_test.go index 078bbe5e81..b17e5bef50 100644 --- a/backend/remote-state/manta/client_test.go +++ b/internal/backend/remote-state/manta/client_test.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states/remote" ) diff --git a/backend/remote-state/oss/backend.go b/internal/backend/remote-state/oss/backend.go similarity index 99% rename from backend/remote-state/oss/backend.go rename to internal/backend/remote-state/oss/backend.go index f87c5f467a..e8e357a73f 100644 --- a/backend/remote-state/oss/backend.go +++ b/internal/backend/remote-state/oss/backend.go @@ -24,7 +24,7 @@ import ( "github.com/aliyun/aliyun-oss-go-sdk/oss" "github.com/aliyun/aliyun-tablestore-go-sdk/tablestore" "github.com/hashicorp/go-cleanhttp" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/legacy/helper/schema" "github.com/hashicorp/terraform/version" "github.com/jmespath/go-jmespath" diff --git a/backend/remote-state/oss/backend_state.go b/internal/backend/remote-state/oss/backend_state.go similarity index 98% rename from backend/remote-state/oss/backend_state.go rename to internal/backend/remote-state/oss/backend_state.go index 1af33d2680..f08df24651 100644 --- a/backend/remote-state/oss/backend_state.go +++ b/internal/backend/remote-state/oss/backend_state.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/aliyun/aliyun-oss-go-sdk/oss" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/states/statemgr" diff --git a/backend/remote-state/oss/backend_test.go b/internal/backend/remote-state/oss/backend_test.go similarity index 99% rename from backend/remote-state/oss/backend_test.go rename to internal/backend/remote-state/oss/backend_test.go index 42f99b7542..84433be5d2 100644 --- a/backend/remote-state/oss/backend_test.go +++ b/internal/backend/remote-state/oss/backend_test.go @@ -10,8 +10,8 @@ import ( "github.com/aliyun/aliyun-oss-go-sdk/oss" "github.com/aliyun/aliyun-tablestore-go-sdk/tablestore" - "github.com/hashicorp/terraform/backend" "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/backend" ) // verify that we are doing ACC tests or the OSS tests specifically diff --git a/backend/remote-state/oss/client.go b/internal/backend/remote-state/oss/client.go similarity index 100% rename from backend/remote-state/oss/client.go rename to internal/backend/remote-state/oss/client.go diff --git a/backend/remote-state/oss/client_test.go b/internal/backend/remote-state/oss/client_test.go similarity index 99% rename from backend/remote-state/oss/client_test.go rename to internal/backend/remote-state/oss/client_test.go index 49a2d63b61..ef7990f6f8 100644 --- a/backend/remote-state/oss/client_test.go +++ b/internal/backend/remote-state/oss/client_test.go @@ -9,7 +9,7 @@ import ( "bytes" "crypto/md5" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/states/statefile" "github.com/hashicorp/terraform/states/statemgr" diff --git a/backend/remote-state/pg/backend.go b/internal/backend/remote-state/pg/backend.go similarity index 98% rename from backend/remote-state/pg/backend.go rename to internal/backend/remote-state/pg/backend.go index cc24697392..e7e63028d3 100644 --- a/backend/remote-state/pg/backend.go +++ b/internal/backend/remote-state/pg/backend.go @@ -5,7 +5,7 @@ import ( "database/sql" "fmt" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/legacy/helper/schema" "github.com/lib/pq" ) diff --git a/backend/remote-state/pg/backend_state.go b/internal/backend/remote-state/pg/backend_state.go similarity index 98% rename from backend/remote-state/pg/backend_state.go rename to internal/backend/remote-state/pg/backend_state.go index fcf3d9795f..93f269bbc1 100644 --- a/backend/remote-state/pg/backend_state.go +++ b/internal/backend/remote-state/pg/backend_state.go @@ -3,7 +3,7 @@ package pg import ( "fmt" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/states/statemgr" diff --git a/backend/remote-state/pg/backend_test.go b/internal/backend/remote-state/pg/backend_test.go similarity index 99% rename from backend/remote-state/pg/backend_test.go rename to internal/backend/remote-state/pg/backend_test.go index 00f1fd9615..774993d51c 100644 --- a/backend/remote-state/pg/backend_test.go +++ b/internal/backend/remote-state/pg/backend_test.go @@ -9,7 +9,7 @@ import ( "os" "testing" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/states/statemgr" "github.com/lib/pq" diff --git a/backend/remote-state/pg/client.go b/internal/backend/remote-state/pg/client.go similarity index 100% rename from backend/remote-state/pg/client.go rename to internal/backend/remote-state/pg/client.go diff --git a/backend/remote-state/pg/client_test.go b/internal/backend/remote-state/pg/client_test.go similarity index 97% rename from backend/remote-state/pg/client_test.go rename to internal/backend/remote-state/pg/client_test.go index ded47a5d12..5cd30d414a 100644 --- a/backend/remote-state/pg/client_test.go +++ b/internal/backend/remote-state/pg/client_test.go @@ -8,7 +8,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states/remote" ) diff --git a/backend/remote-state/s3/backend.go b/internal/backend/remote-state/s3/backend.go similarity index 99% rename from backend/remote-state/s3/backend.go rename to internal/backend/remote-state/s3/backend.go index 90570d8e6e..98aa1c561e 100644 --- a/backend/remote-state/s3/backend.go +++ b/internal/backend/remote-state/s3/backend.go @@ -11,7 +11,7 @@ import ( "github.com/aws/aws-sdk-go/service/dynamodb" "github.com/aws/aws-sdk-go/service/s3" awsbase "github.com/hashicorp/aws-sdk-go-base" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/legacy/helper/schema" "github.com/hashicorp/terraform/internal/logging" "github.com/hashicorp/terraform/version" diff --git a/backend/remote-state/s3/backend_state.go b/internal/backend/remote-state/s3/backend_state.go similarity index 98% rename from backend/remote-state/s3/backend_state.go rename to internal/backend/remote-state/s3/backend_state.go index c6809f5d6c..0514ad3241 100644 --- a/backend/remote-state/s3/backend_state.go +++ b/internal/backend/remote-state/s3/backend_state.go @@ -11,7 +11,7 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/s3" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/states/statemgr" diff --git a/backend/remote-state/s3/backend_test.go b/internal/backend/remote-state/s3/backend_test.go similarity index 99% rename from backend/remote-state/s3/backend_test.go rename to internal/backend/remote-state/s3/backend_test.go index f3fccba611..0fcc4bfc68 100644 --- a/backend/remote-state/s3/backend_test.go +++ b/internal/backend/remote-state/s3/backend_test.go @@ -12,8 +12,8 @@ import ( "github.com/aws/aws-sdk-go/service/dynamodb" "github.com/aws/aws-sdk-go/service/s3" awsbase "github.com/hashicorp/aws-sdk-go-base" - "github.com/hashicorp/terraform/backend" "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/remote" ) diff --git a/backend/remote-state/s3/client.go b/internal/backend/remote-state/s3/client.go similarity index 100% rename from backend/remote-state/s3/client.go rename to internal/backend/remote-state/s3/client.go diff --git a/backend/remote-state/s3/client_test.go b/internal/backend/remote-state/s3/client_test.go similarity index 99% rename from backend/remote-state/s3/client_test.go rename to internal/backend/remote-state/s3/client_test.go index c18f99e3cf..4e51ddc8c0 100644 --- a/backend/remote-state/s3/client_test.go +++ b/internal/backend/remote-state/s3/client_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/states/statefile" "github.com/hashicorp/terraform/states/statemgr" diff --git a/backend/remote-state/swift/backend.go b/internal/backend/remote-state/swift/backend.go similarity index 99% rename from backend/remote-state/swift/backend.go rename to internal/backend/remote-state/swift/backend.go index ca7571c716..6084131338 100644 --- a/backend/remote-state/swift/backend.go +++ b/internal/backend/remote-state/swift/backend.go @@ -11,7 +11,7 @@ import ( "github.com/gophercloud/gophercloud" "github.com/gophercloud/utils/terraform/auth" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/legacy/helper/schema" "github.com/hashicorp/terraform/version" ) diff --git a/backend/remote-state/swift/backend_state.go b/internal/backend/remote-state/swift/backend_state.go similarity index 99% rename from backend/remote-state/swift/backend_state.go rename to internal/backend/remote-state/swift/backend_state.go index bdc21c79f8..6cc8c09cfd 100644 --- a/backend/remote-state/swift/backend_state.go +++ b/internal/backend/remote-state/swift/backend_state.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/states/statemgr" diff --git a/backend/remote-state/swift/backend_test.go b/internal/backend/remote-state/swift/backend_test.go similarity index 98% rename from backend/remote-state/swift/backend_test.go rename to internal/backend/remote-state/swift/backend_test.go index 959713d806..864e3963b1 100644 --- a/backend/remote-state/swift/backend_test.go +++ b/internal/backend/remote-state/swift/backend_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" ) // verify that we are doing ACC tests or the Swift tests specifically diff --git a/backend/remote-state/swift/client.go b/internal/backend/remote-state/swift/client.go similarity index 100% rename from backend/remote-state/swift/client.go rename to internal/backend/remote-state/swift/client.go diff --git a/backend/remote-state/swift/client_test.go b/internal/backend/remote-state/swift/client_test.go similarity index 93% rename from backend/remote-state/swift/client_test.go rename to internal/backend/remote-state/swift/client_test.go index e256f665eb..6d76bcee0a 100644 --- a/backend/remote-state/swift/client_test.go +++ b/internal/backend/remote-state/swift/client_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states/remote" ) diff --git a/backend/remote/backend.go b/internal/backend/remote/backend.go similarity index 99% rename from backend/remote/backend.go rename to internal/backend/remote/backend.go index 880a384ba2..a654d72928 100644 --- a/backend/remote/backend.go +++ b/internal/backend/remote/backend.go @@ -16,8 +16,8 @@ import ( version "github.com/hashicorp/go-version" svchost "github.com/hashicorp/terraform-svchost" "github.com/hashicorp/terraform-svchost/disco" - "github.com/hashicorp/terraform/backend" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/terraform" @@ -27,7 +27,7 @@ import ( "github.com/mitchellh/colorstring" "github.com/zclconf/go-cty/cty" - backendLocal "github.com/hashicorp/terraform/backend/local" + backendLocal "github.com/hashicorp/terraform/internal/backend/local" ) const ( diff --git a/backend/remote/backend_apply.go b/internal/backend/remote/backend_apply.go similarity index 99% rename from backend/remote/backend_apply.go rename to internal/backend/remote/backend_apply.go index 23e81625ab..ceb11be417 100644 --- a/backend/remote/backend_apply.go +++ b/internal/backend/remote/backend_apply.go @@ -9,7 +9,7 @@ import ( tfe "github.com/hashicorp/go-tfe" version "github.com/hashicorp/go-version" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/tfdiags" diff --git a/backend/remote/backend_apply_test.go b/internal/backend/remote/backend_apply_test.go similarity index 99% rename from backend/remote/backend_apply_test.go rename to internal/backend/remote/backend_apply_test.go index 5576fecd4d..a6389d32d2 100644 --- a/backend/remote/backend_apply_test.go +++ b/internal/backend/remote/backend_apply_test.go @@ -13,10 +13,10 @@ import ( tfe "github.com/hashicorp/go-tfe" version "github.com/hashicorp/go-version" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/backend" "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/initwd" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/plans" diff --git a/backend/remote/backend_common.go b/internal/backend/remote/backend_common.go similarity index 99% rename from backend/remote/backend_common.go rename to internal/backend/remote/backend_common.go index eb8ed2c8a7..4c94400701 100644 --- a/backend/remote/backend_common.go +++ b/internal/backend/remote/backend_common.go @@ -12,7 +12,7 @@ import ( "time" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/terraform" ) diff --git a/backend/remote/backend_context.go b/internal/backend/remote/backend_context.go similarity index 99% rename from backend/remote/backend_context.go rename to internal/backend/remote/backend_context.go index 09bace58d2..01aa525a5a 100644 --- a/backend/remote/backend_context.go +++ b/internal/backend/remote/backend_context.go @@ -10,8 +10,8 @@ import ( tfe "github.com/hashicorp/go-tfe" "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" - "github.com/hashicorp/terraform/backend" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/tfdiags" diff --git a/backend/remote/backend_context_test.go b/internal/backend/remote/backend_context_test.go similarity index 99% rename from backend/remote/backend_context_test.go rename to internal/backend/remote/backend_context_test.go index 3fa61f142a..b1d1dd596c 100644 --- a/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/backend" "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/initwd" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/states/statemgr" diff --git a/backend/remote/backend_mock.go b/internal/backend/remote/backend_mock.go similarity index 100% rename from backend/remote/backend_mock.go rename to internal/backend/remote/backend_mock.go diff --git a/backend/remote/backend_plan.go b/internal/backend/remote/backend_plan.go similarity index 99% rename from backend/remote/backend_plan.go rename to internal/backend/remote/backend_plan.go index 5011bf8291..0c3a6e6404 100644 --- a/backend/remote/backend_plan.go +++ b/internal/backend/remote/backend_plan.go @@ -16,7 +16,7 @@ import ( tfe "github.com/hashicorp/go-tfe" version "github.com/hashicorp/go-version" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/backend/remote/backend_plan_test.go b/internal/backend/remote/backend_plan_test.go similarity index 99% rename from backend/remote/backend_plan_test.go rename to internal/backend/remote/backend_plan_test.go index 16e482e39a..71e73d1526 100644 --- a/backend/remote/backend_plan_test.go +++ b/internal/backend/remote/backend_plan_test.go @@ -12,10 +12,10 @@ import ( "github.com/google/go-cmp/cmp" tfe "github.com/hashicorp/go-tfe" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/backend" "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/initwd" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/plans" diff --git a/backend/remote/backend_state.go b/internal/backend/remote/backend_state.go similarity index 100% rename from backend/remote/backend_state.go rename to internal/backend/remote/backend_state.go diff --git a/backend/remote/backend_state_test.go b/internal/backend/remote/backend_state_test.go similarity index 96% rename from backend/remote/backend_state_test.go rename to internal/backend/remote/backend_state_test.go index b1ca1789a5..5e3339537d 100644 --- a/backend/remote/backend_state_test.go +++ b/internal/backend/remote/backend_state_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/states/statefile" diff --git a/backend/remote/backend_test.go b/internal/backend/remote/backend_test.go similarity index 99% rename from backend/remote/backend_test.go rename to internal/backend/remote/backend_test.go index fd66606855..049359c2bc 100644 --- a/backend/remote/backend_test.go +++ b/internal/backend/remote/backend_test.go @@ -10,12 +10,12 @@ import ( tfe "github.com/hashicorp/go-tfe" version "github.com/hashicorp/go-version" "github.com/hashicorp/terraform-svchost/disco" - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/tfdiags" tfversion "github.com/hashicorp/terraform/version" "github.com/zclconf/go-cty/cty" - backendLocal "github.com/hashicorp/terraform/backend/local" + backendLocal "github.com/hashicorp/terraform/internal/backend/local" ) func TestRemote(t *testing.T) { diff --git a/backend/remote/cli.go b/internal/backend/remote/cli.go similarity index 86% rename from backend/remote/cli.go rename to internal/backend/remote/cli.go index 9a4f24d081..926908360e 100644 --- a/backend/remote/cli.go +++ b/internal/backend/remote/cli.go @@ -1,7 +1,7 @@ package remote import ( - "github.com/hashicorp/terraform/backend" + "github.com/hashicorp/terraform/internal/backend" ) // CLIInit implements backend.CLI diff --git a/backend/remote/colorize.go b/internal/backend/remote/colorize.go similarity index 100% rename from backend/remote/colorize.go rename to internal/backend/remote/colorize.go diff --git a/backend/remote/remote_test.go b/internal/backend/remote/remote_test.go similarity index 100% rename from backend/remote/remote_test.go rename to internal/backend/remote/remote_test.go diff --git a/backend/remote/testdata/apply-destroy/apply.log b/internal/backend/remote/testdata/apply-destroy/apply.log similarity index 100% rename from backend/remote/testdata/apply-destroy/apply.log rename to internal/backend/remote/testdata/apply-destroy/apply.log diff --git a/backend/remote/testdata/apply-destroy/main.tf b/internal/backend/remote/testdata/apply-destroy/main.tf similarity index 100% rename from backend/remote/testdata/apply-destroy/main.tf rename to internal/backend/remote/testdata/apply-destroy/main.tf diff --git a/backend/remote/testdata/apply-destroy/plan.log b/internal/backend/remote/testdata/apply-destroy/plan.log similarity index 100% rename from backend/remote/testdata/apply-destroy/plan.log rename to internal/backend/remote/testdata/apply-destroy/plan.log diff --git a/backend/remote/testdata/apply-no-changes/main.tf b/internal/backend/remote/testdata/apply-no-changes/main.tf similarity index 100% rename from backend/remote/testdata/apply-no-changes/main.tf rename to internal/backend/remote/testdata/apply-no-changes/main.tf diff --git a/backend/remote/testdata/apply-no-changes/plan.log b/internal/backend/remote/testdata/apply-no-changes/plan.log similarity index 100% rename from backend/remote/testdata/apply-no-changes/plan.log rename to internal/backend/remote/testdata/apply-no-changes/plan.log diff --git a/backend/remote/testdata/apply-no-changes/policy.log b/internal/backend/remote/testdata/apply-no-changes/policy.log similarity index 100% rename from backend/remote/testdata/apply-no-changes/policy.log rename to internal/backend/remote/testdata/apply-no-changes/policy.log diff --git a/backend/remote/testdata/apply-policy-hard-failed/main.tf b/internal/backend/remote/testdata/apply-policy-hard-failed/main.tf similarity index 100% rename from backend/remote/testdata/apply-policy-hard-failed/main.tf rename to internal/backend/remote/testdata/apply-policy-hard-failed/main.tf diff --git a/backend/remote/testdata/apply-policy-hard-failed/plan.log b/internal/backend/remote/testdata/apply-policy-hard-failed/plan.log similarity index 100% rename from backend/remote/testdata/apply-policy-hard-failed/plan.log rename to internal/backend/remote/testdata/apply-policy-hard-failed/plan.log diff --git a/backend/remote/testdata/apply-policy-hard-failed/policy.log b/internal/backend/remote/testdata/apply-policy-hard-failed/policy.log similarity index 100% rename from backend/remote/testdata/apply-policy-hard-failed/policy.log rename to internal/backend/remote/testdata/apply-policy-hard-failed/policy.log diff --git a/backend/remote/testdata/apply-policy-passed/apply.log b/internal/backend/remote/testdata/apply-policy-passed/apply.log similarity index 100% rename from backend/remote/testdata/apply-policy-passed/apply.log rename to internal/backend/remote/testdata/apply-policy-passed/apply.log diff --git a/backend/remote/testdata/apply-policy-passed/main.tf b/internal/backend/remote/testdata/apply-policy-passed/main.tf similarity index 100% rename from backend/remote/testdata/apply-policy-passed/main.tf rename to internal/backend/remote/testdata/apply-policy-passed/main.tf diff --git a/backend/remote/testdata/apply-policy-passed/plan.log b/internal/backend/remote/testdata/apply-policy-passed/plan.log similarity index 100% rename from backend/remote/testdata/apply-policy-passed/plan.log rename to internal/backend/remote/testdata/apply-policy-passed/plan.log diff --git a/backend/remote/testdata/apply-policy-passed/policy.log b/internal/backend/remote/testdata/apply-policy-passed/policy.log similarity index 100% rename from backend/remote/testdata/apply-policy-passed/policy.log rename to internal/backend/remote/testdata/apply-policy-passed/policy.log diff --git a/backend/remote/testdata/apply-policy-soft-failed/apply.log b/internal/backend/remote/testdata/apply-policy-soft-failed/apply.log similarity index 100% rename from backend/remote/testdata/apply-policy-soft-failed/apply.log rename to internal/backend/remote/testdata/apply-policy-soft-failed/apply.log diff --git a/backend/remote/testdata/apply-policy-soft-failed/main.tf b/internal/backend/remote/testdata/apply-policy-soft-failed/main.tf similarity index 100% rename from backend/remote/testdata/apply-policy-soft-failed/main.tf rename to internal/backend/remote/testdata/apply-policy-soft-failed/main.tf diff --git a/backend/remote/testdata/apply-policy-soft-failed/plan.log b/internal/backend/remote/testdata/apply-policy-soft-failed/plan.log similarity index 100% rename from backend/remote/testdata/apply-policy-soft-failed/plan.log rename to internal/backend/remote/testdata/apply-policy-soft-failed/plan.log diff --git a/backend/remote/testdata/apply-policy-soft-failed/policy.log b/internal/backend/remote/testdata/apply-policy-soft-failed/policy.log similarity index 100% rename from backend/remote/testdata/apply-policy-soft-failed/policy.log rename to internal/backend/remote/testdata/apply-policy-soft-failed/policy.log diff --git a/backend/remote/testdata/apply-variables/apply.log b/internal/backend/remote/testdata/apply-variables/apply.log similarity index 100% rename from backend/remote/testdata/apply-variables/apply.log rename to internal/backend/remote/testdata/apply-variables/apply.log diff --git a/backend/remote/testdata/apply-variables/main.tf b/internal/backend/remote/testdata/apply-variables/main.tf similarity index 100% rename from backend/remote/testdata/apply-variables/main.tf rename to internal/backend/remote/testdata/apply-variables/main.tf diff --git a/backend/remote/testdata/apply-variables/plan.log b/internal/backend/remote/testdata/apply-variables/plan.log similarity index 100% rename from backend/remote/testdata/apply-variables/plan.log rename to internal/backend/remote/testdata/apply-variables/plan.log diff --git a/backend/remote/testdata/apply-with-error/main.tf b/internal/backend/remote/testdata/apply-with-error/main.tf similarity index 100% rename from backend/remote/testdata/apply-with-error/main.tf rename to internal/backend/remote/testdata/apply-with-error/main.tf diff --git a/backend/remote/testdata/apply-with-error/plan.log b/internal/backend/remote/testdata/apply-with-error/plan.log similarity index 100% rename from backend/remote/testdata/apply-with-error/plan.log rename to internal/backend/remote/testdata/apply-with-error/plan.log diff --git a/backend/remote/testdata/apply/apply.log b/internal/backend/remote/testdata/apply/apply.log similarity index 100% rename from backend/remote/testdata/apply/apply.log rename to internal/backend/remote/testdata/apply/apply.log diff --git a/backend/remote/testdata/apply/main.tf b/internal/backend/remote/testdata/apply/main.tf similarity index 100% rename from backend/remote/testdata/apply/main.tf rename to internal/backend/remote/testdata/apply/main.tf diff --git a/backend/remote/testdata/apply/plan.log b/internal/backend/remote/testdata/apply/plan.log similarity index 100% rename from backend/remote/testdata/apply/plan.log rename to internal/backend/remote/testdata/apply/plan.log diff --git a/backend/remote/testdata/empty/.gitignore b/internal/backend/remote/testdata/empty/.gitignore similarity index 100% rename from backend/remote/testdata/empty/.gitignore rename to internal/backend/remote/testdata/empty/.gitignore diff --git a/backend/remote/testdata/plan-cost-estimation/ce.log b/internal/backend/remote/testdata/plan-cost-estimation/ce.log similarity index 100% rename from backend/remote/testdata/plan-cost-estimation/ce.log rename to internal/backend/remote/testdata/plan-cost-estimation/ce.log diff --git a/backend/remote/testdata/plan-cost-estimation/cost-estimate.log b/internal/backend/remote/testdata/plan-cost-estimation/cost-estimate.log similarity index 100% rename from backend/remote/testdata/plan-cost-estimation/cost-estimate.log rename to internal/backend/remote/testdata/plan-cost-estimation/cost-estimate.log diff --git a/backend/remote/testdata/plan-cost-estimation/main.tf b/internal/backend/remote/testdata/plan-cost-estimation/main.tf similarity index 100% rename from backend/remote/testdata/plan-cost-estimation/main.tf rename to internal/backend/remote/testdata/plan-cost-estimation/main.tf diff --git a/backend/remote/testdata/plan-cost-estimation/plan.log b/internal/backend/remote/testdata/plan-cost-estimation/plan.log similarity index 100% rename from backend/remote/testdata/plan-cost-estimation/plan.log rename to internal/backend/remote/testdata/plan-cost-estimation/plan.log diff --git a/backend/remote/testdata/plan-long-line/main.tf b/internal/backend/remote/testdata/plan-long-line/main.tf similarity index 100% rename from backend/remote/testdata/plan-long-line/main.tf rename to internal/backend/remote/testdata/plan-long-line/main.tf diff --git a/backend/remote/testdata/plan-long-line/plan.log b/internal/backend/remote/testdata/plan-long-line/plan.log similarity index 100% rename from backend/remote/testdata/plan-long-line/plan.log rename to internal/backend/remote/testdata/plan-long-line/plan.log diff --git a/backend/remote/testdata/plan-no-changes/main.tf b/internal/backend/remote/testdata/plan-no-changes/main.tf similarity index 100% rename from backend/remote/testdata/plan-no-changes/main.tf rename to internal/backend/remote/testdata/plan-no-changes/main.tf diff --git a/backend/remote/testdata/plan-no-changes/plan.log b/internal/backend/remote/testdata/plan-no-changes/plan.log similarity index 100% rename from backend/remote/testdata/plan-no-changes/plan.log rename to internal/backend/remote/testdata/plan-no-changes/plan.log diff --git a/backend/remote/testdata/plan-no-changes/policy.log b/internal/backend/remote/testdata/plan-no-changes/policy.log similarity index 100% rename from backend/remote/testdata/plan-no-changes/policy.log rename to internal/backend/remote/testdata/plan-no-changes/policy.log diff --git a/backend/remote/testdata/plan-policy-hard-failed/main.tf b/internal/backend/remote/testdata/plan-policy-hard-failed/main.tf similarity index 100% rename from backend/remote/testdata/plan-policy-hard-failed/main.tf rename to internal/backend/remote/testdata/plan-policy-hard-failed/main.tf diff --git a/backend/remote/testdata/plan-policy-hard-failed/plan.log b/internal/backend/remote/testdata/plan-policy-hard-failed/plan.log similarity index 100% rename from backend/remote/testdata/plan-policy-hard-failed/plan.log rename to internal/backend/remote/testdata/plan-policy-hard-failed/plan.log diff --git a/backend/remote/testdata/plan-policy-hard-failed/policy.log b/internal/backend/remote/testdata/plan-policy-hard-failed/policy.log similarity index 100% rename from backend/remote/testdata/plan-policy-hard-failed/policy.log rename to internal/backend/remote/testdata/plan-policy-hard-failed/policy.log diff --git a/backend/remote/testdata/plan-policy-passed/main.tf b/internal/backend/remote/testdata/plan-policy-passed/main.tf similarity index 100% rename from backend/remote/testdata/plan-policy-passed/main.tf rename to internal/backend/remote/testdata/plan-policy-passed/main.tf diff --git a/backend/remote/testdata/plan-policy-passed/plan.log b/internal/backend/remote/testdata/plan-policy-passed/plan.log similarity index 100% rename from backend/remote/testdata/plan-policy-passed/plan.log rename to internal/backend/remote/testdata/plan-policy-passed/plan.log diff --git a/backend/remote/testdata/plan-policy-passed/policy.log b/internal/backend/remote/testdata/plan-policy-passed/policy.log similarity index 100% rename from backend/remote/testdata/plan-policy-passed/policy.log rename to internal/backend/remote/testdata/plan-policy-passed/policy.log diff --git a/backend/remote/testdata/plan-policy-soft-failed/main.tf b/internal/backend/remote/testdata/plan-policy-soft-failed/main.tf similarity index 100% rename from backend/remote/testdata/plan-policy-soft-failed/main.tf rename to internal/backend/remote/testdata/plan-policy-soft-failed/main.tf diff --git a/backend/remote/testdata/plan-policy-soft-failed/plan.log b/internal/backend/remote/testdata/plan-policy-soft-failed/plan.log similarity index 100% rename from backend/remote/testdata/plan-policy-soft-failed/plan.log rename to internal/backend/remote/testdata/plan-policy-soft-failed/plan.log diff --git a/backend/remote/testdata/plan-policy-soft-failed/policy.log b/internal/backend/remote/testdata/plan-policy-soft-failed/policy.log similarity index 100% rename from backend/remote/testdata/plan-policy-soft-failed/policy.log rename to internal/backend/remote/testdata/plan-policy-soft-failed/policy.log diff --git a/backend/remote/testdata/plan-variables/main.tf b/internal/backend/remote/testdata/plan-variables/main.tf similarity index 100% rename from backend/remote/testdata/plan-variables/main.tf rename to internal/backend/remote/testdata/plan-variables/main.tf diff --git a/backend/remote/testdata/plan-variables/plan.log b/internal/backend/remote/testdata/plan-variables/plan.log similarity index 100% rename from backend/remote/testdata/plan-variables/plan.log rename to internal/backend/remote/testdata/plan-variables/plan.log diff --git a/backend/remote/testdata/plan-with-error/main.tf b/internal/backend/remote/testdata/plan-with-error/main.tf similarity index 100% rename from backend/remote/testdata/plan-with-error/main.tf rename to internal/backend/remote/testdata/plan-with-error/main.tf diff --git a/backend/remote/testdata/plan-with-error/plan.log b/internal/backend/remote/testdata/plan-with-error/plan.log similarity index 100% rename from backend/remote/testdata/plan-with-error/plan.log rename to internal/backend/remote/testdata/plan-with-error/plan.log diff --git a/backend/remote/testdata/plan-with-working-directory/terraform/main.tf b/internal/backend/remote/testdata/plan-with-working-directory/terraform/main.tf similarity index 100% rename from backend/remote/testdata/plan-with-working-directory/terraform/main.tf rename to internal/backend/remote/testdata/plan-with-working-directory/terraform/main.tf diff --git a/backend/remote/testdata/plan-with-working-directory/terraform/plan.log b/internal/backend/remote/testdata/plan-with-working-directory/terraform/plan.log similarity index 100% rename from backend/remote/testdata/plan-with-working-directory/terraform/plan.log rename to internal/backend/remote/testdata/plan-with-working-directory/terraform/plan.log diff --git a/backend/remote/testdata/plan/main.tf b/internal/backend/remote/testdata/plan/main.tf similarity index 100% rename from backend/remote/testdata/plan/main.tf rename to internal/backend/remote/testdata/plan/main.tf diff --git a/backend/remote/testdata/plan/plan.log b/internal/backend/remote/testdata/plan/plan.log similarity index 100% rename from backend/remote/testdata/plan/plan.log rename to internal/backend/remote/testdata/plan/plan.log diff --git a/backend/remote/testing.go b/internal/backend/remote/testing.go similarity index 98% rename from backend/remote/testing.go rename to internal/backend/remote/testing.go index 82e201e32b..c903d16e13 100644 --- a/backend/remote/testing.go +++ b/internal/backend/remote/testing.go @@ -13,10 +13,10 @@ import ( svchost "github.com/hashicorp/terraform-svchost" "github.com/hashicorp/terraform-svchost/auth" "github.com/hashicorp/terraform-svchost/disco" - "github.com/hashicorp/terraform/backend" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/httpclient" + "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/terraform" @@ -25,7 +25,7 @@ import ( "github.com/mitchellh/cli" "github.com/zclconf/go-cty/cty" - backendLocal "github.com/hashicorp/terraform/backend/local" + backendLocal "github.com/hashicorp/terraform/internal/backend/local" ) const ( diff --git a/backend/testing.go b/internal/backend/testing.go similarity index 100% rename from backend/testing.go rename to internal/backend/testing.go diff --git a/backend/unparsed_value.go b/internal/backend/unparsed_value.go similarity index 100% rename from backend/unparsed_value.go rename to internal/backend/unparsed_value.go diff --git a/backend/unparsed_value_test.go b/internal/backend/unparsed_value_test.go similarity index 100% rename from backend/unparsed_value_test.go rename to internal/backend/unparsed_value_test.go diff --git a/main.go b/main.go index 68726a0fdc..9a1c372847 100644 --- a/main.go +++ b/main.go @@ -26,7 +26,7 @@ import ( "github.com/mitchellh/colorstring" "github.com/mitchellh/panicwrap" - backendInit "github.com/hashicorp/terraform/backend/init" + backendInit "github.com/hashicorp/terraform/internal/backend/init" ) const (