diff --git a/builtin/providers/terraform/data_source_state.go b/builtin/providers/terraform/data_source_state.go index f2fdd5122..00d9ebe1e 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 3aa1b16ea..a55ce6eac 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 fecf720d2..5f06e9c34 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 e7587e40c..50fba0c0a 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 44369a96f..935350433 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 ebecd9edf..d0128bf4b 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 2144fd2b6..77a2683c9 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 219b14578..fcba25faf 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 0f0b41d81..f12a91682 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 4bebceb4e..cce6f2a66 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 2c378ae67..4185d241c 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 85644508c..797eff054 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 1749b28e9..4d84dd87e 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 fe212d532..5d4dc4464 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 69cb85ae5..ba666eea1 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 d73041af5..4a92f7dae 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 7d4611b1a..d925c121a 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 287af436a..324c5600c 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 fc077ad69..c5093e765 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 e8cc88042..cd549cf15 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 50ff5d380..4beeb9e02 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 d906053da..7c4d30e85 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 ee018cc55..94cef8f59 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 0b42b0cbe..8219b587e 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 99c156bbc..d60e3a13c 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 c45d62d2b..f84cab808 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 9e990da06..922a64e14 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 ecfe0c90d..343452cbd 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 db7d76829..dcc1f7c6b 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 95848d113..9f3b547b8 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 eade3ec67..58ce76da1 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 97f18129d..396ee4657 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 5bdd0d040..cae8b19aa 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 3b90724d8..c46cebe74 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 54ecc07b0..deaf44ada 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 bef5c5d01..db6be4228 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 863020efa..237be324d 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 9963cbee6..41d2477c6 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 87e57fc32..32d928901 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 8f504a610..56dd50c06 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 ebc1a2817..7499ec854 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 8b8c7d32e..889b1f7f8 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 9017690e3..9bd263565 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 c292fd63a..8ae20a31a 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 c254e9ca1..e01561314 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 ebe62471b..884696981 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 30a12afea..e4e2588ad 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 394bf428e..6e04b6034 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 42ebbf50a..cd6496611 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 fa358aa10..8d0d01454 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 7784ab4ff..91e446e82 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 81200de93..0b259390e 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 ee0f0bda5..06bd5f71d 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 c992f624e..6b8299178 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 a212c5fcd..bc3a213ce 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 1bf5809bf..91b8082b5 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 1f514a8f4..0ee132e22 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 4b05220e5..2b4d312a7 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 69f9c944b..f6aa2ed03 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 b4e3cdf53..3149e2ee2 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 a7e511cd2..2e88e6e61 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 dd089aeb4..b4b9218d9 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 dee59f48c..f8eb82a42 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 a03ebb319..0932467ab 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 035f3c973..a228b18ed 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 218e706ff..e85b81d9a 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 765eac9ee..e2cb8f520 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 a3398a464..907cda9e2 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 f9c3c76d5..5d2390aa6 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 acb3f572e..616a78c98 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 3026afc2d..d2e94c6e6 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 c7e32403b..3a7a21bc5 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 6ce9ba0f6..5c03bd7fa 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 be9b2575d..180b2aece 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 078bbe5e8..b17e5bef5 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 f87c5f467..e8e357a73 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 1af33d268..f08df2465 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 42f99b754..84433be5d 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 49a2d63b6..ef7990f6f 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 cc2469739..e7e63028d 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 fcf3d9795..93f269bbc 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 00f1fd961..774993d51 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 ded47a5d1..5cd30d414 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 90570d8e6..98aa1c561 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 c6809f5d6..0514ad324 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 f3fccba61..0fcc4bfc6 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 c18f99e3c..4e51ddc8c 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 ca7571c71..608413133 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 bdc21c79f..6cc8c09cf 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 959713d80..864e3963b 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 e256f665e..6d76bcee0 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 880a384ba..a654d7292 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 23e81625a..ceb11be41 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 5576fecd4..a6389d32d 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 eb8ed2c8a..4c9440070 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 09bace58d..01aa525a5 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 3fa61f142..b1d1dd596 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 5011bf829..0c3a6e640 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 16e482e39..71e73d152 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 b1ca1789a..5e3339537 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 fd6660685..049359c2b 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 9a4f24d08..926908360 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 82e201e32..c903d16e1 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 68726a0fd..9a1c37284 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 (