diff --git a/internal/backend/backend.go b/internal/backend/backend.go index 6bffc9205c..0ee73e2409 100644 --- a/internal/backend/backend.go +++ b/internal/backend/backend.go @@ -11,12 +11,12 @@ import ( "log" "os" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configload" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/command/clistate" "github.com/hashicorp/terraform/internal/command/views" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configload" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/plans/planfile" diff --git a/internal/backend/local/backend.go b/internal/backend/local/backend.go index 051a516149..93e6dd82aa 100644 --- a/internal/backend/local/backend.go +++ b/internal/backend/local/backend.go @@ -11,9 +11,9 @@ import ( "sort" "sync" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/command/views" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/terraform" diff --git a/internal/backend/local/backend_apply_test.go b/internal/backend/local/backend_apply_test.go index 5bc896e419..af3c01c118 100644 --- a/internal/backend/local/backend_apply_test.go +++ b/internal/backend/local/backend_apply_test.go @@ -11,11 +11,11 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/command/arguments" "github.com/hashicorp/terraform/internal/command/clistate" "github.com/hashicorp/terraform/internal/command/views" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/terminal" diff --git a/internal/backend/local/backend_local.go b/internal/backend/local/backend_local.go index bb47d559a4..1c521801aa 100644 --- a/internal/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/configs" - "github.com/hashicorp/terraform/configs/configload" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configload" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans/planfile" "github.com/hashicorp/terraform/states/statemgr" diff --git a/internal/backend/local/backend_plan_test.go b/internal/backend/local/backend_plan_test.go index a037409ffb..1b40e98332 100644 --- a/internal/backend/local/backend_plan_test.go +++ b/internal/backend/local/backend_plan_test.go @@ -7,12 +7,12 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/command/arguments" "github.com/hashicorp/terraform/internal/command/clistate" "github.com/hashicorp/terraform/internal/command/views" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/plans" diff --git a/internal/backend/local/backend_refresh_test.go b/internal/backend/local/backend_refresh_test.go index 0c75133cbe..c6713f3c82 100644 --- a/internal/backend/local/backend_refresh_test.go +++ b/internal/backend/local/backend_refresh_test.go @@ -6,12 +6,12 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/command/arguments" "github.com/hashicorp/terraform/internal/command/clistate" "github.com/hashicorp/terraform/internal/command/views" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/terminal" diff --git a/internal/backend/local/testing.go b/internal/backend/local/testing.go index fc348ed41c..1e26c083fd 100644 --- a/internal/backend/local/testing.go +++ b/internal/backend/local/testing.go @@ -8,9 +8,9 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statemgr" diff --git a/internal/backend/remote-state/artifactory/client_test.go b/internal/backend/remote-state/artifactory/client_test.go index 7499ec854f..c469822711 100644 --- a/internal/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/configs" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/states/remote" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/backend/remote-state/etcdv2/client_test.go b/internal/backend/remote-state/etcdv2/client_test.go index bc3a213cea..12e8f5b2c6 100644 --- a/internal/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/configs" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/states/remote" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/backend/remote-state/http/backend_test.go b/internal/backend/remote-state/http/backend_test.go index 0932467ab0..9f32273cba 100644 --- a/internal/backend/remote-state/http/backend_test.go +++ b/internal/backend/remote-state/http/backend_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/configs" "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/internal/backend" diff --git a/internal/backend/remote-state/oss/backend_test.go b/internal/backend/remote-state/oss/backend_test.go index 84433be5d2..e11e46eb2b 100644 --- a/internal/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/configs/hcl2shim" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" ) // verify that we are doing ACC tests or the OSS tests specifically diff --git a/internal/backend/remote-state/s3/backend_test.go b/internal/backend/remote-state/s3/backend_test.go index 0fcc4bfc68..2a73cc9305 100644 --- a/internal/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/configs/hcl2shim" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/remote" ) diff --git a/internal/backend/remote/backend.go b/internal/backend/remote/backend.go index 021bc5e329..aa1882632a 100644 --- a/internal/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/configs/configschema" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/states/statemgr" diff --git a/internal/backend/remote/backend_context.go b/internal/backend/remote/backend_context.go index 10ea8214eb..d4a30caae2 100644 --- a/internal/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/configs" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/terraform" diff --git a/internal/backend/remote/backend_context_test.go b/internal/backend/remote/backend_context_test.go index 6950487dd3..16dbf2f95f 100644 --- a/internal/backend/remote/backend_context_test.go +++ b/internal/backend/remote/backend_context_test.go @@ -5,11 +5,11 @@ import ( "testing" tfe "github.com/hashicorp/go-tfe" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/command/arguments" "github.com/hashicorp/terraform/internal/command/clistate" "github.com/hashicorp/terraform/internal/command/views" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/states/statemgr" diff --git a/internal/backend/remote/testing.go b/internal/backend/remote/testing.go index cff58e885f..d71f80cbb3 100644 --- a/internal/backend/remote/testing.go +++ b/internal/backend/remote/testing.go @@ -13,9 +13,9 @@ import ( svchost "github.com/hashicorp/terraform-svchost" "github.com/hashicorp/terraform-svchost/auth" "github.com/hashicorp/terraform-svchost/disco" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/httpclient" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" diff --git a/internal/backend/testing.go b/internal/backend/testing.go index bc28c2281b..dba46285a5 100644 --- a/internal/backend/testing.go +++ b/internal/backend/testing.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statemgr" diff --git a/internal/backend/unparsed_value.go b/internal/backend/unparsed_value.go index 61a14c9eb4..22b7167bae 100644 --- a/internal/backend/unparsed_value.go +++ b/internal/backend/unparsed_value.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/terraform" "github.com/zclconf/go-cty/cty" diff --git a/internal/backend/unparsed_value_test.go b/internal/backend/unparsed_value_test.go index e172d4b0ce..fff226eab8 100644 --- a/internal/backend/unparsed_value_test.go +++ b/internal/backend/unparsed_value_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/terraform" ) diff --git a/internal/builtin/providers/terraform/data_source_state.go b/internal/builtin/providers/terraform/data_source_state.go index 24f3d6f47c..c2088c8f31 100644 --- a/internal/builtin/providers/terraform/data_source_state.go +++ b/internal/builtin/providers/terraform/data_source_state.go @@ -4,9 +4,9 @@ import ( "fmt" "log" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend/remote" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/zclconf/go-cty/cty" diff --git a/internal/builtin/providers/terraform/data_source_state_test.go b/internal/builtin/providers/terraform/data_source_state_test.go index 2b53508686..df35f0907a 100644 --- a/internal/builtin/providers/terraform/data_source_state_test.go +++ b/internal/builtin/providers/terraform/data_source_state_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/apparentlymart/go-dump/dump" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states/statemgr" "github.com/zclconf/go-cty/cty" diff --git a/internal/builtin/provisioners/file/resource_provisioner.go b/internal/builtin/provisioners/file/resource_provisioner.go index 638fcc8e63..0ccb836ec6 100644 --- a/internal/builtin/provisioners/file/resource_provisioner.go +++ b/internal/builtin/provisioners/file/resource_provisioner.go @@ -7,8 +7,8 @@ import ( "io/ioutil" "os" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/communicator" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/provisioners" "github.com/mitchellh/go-homedir" "github.com/zclconf/go-cty/cty" diff --git a/internal/builtin/provisioners/local-exec/resource_provisioner.go b/internal/builtin/provisioners/local-exec/resource_provisioner.go index c03617c18d..c4ac3e563f 100644 --- a/internal/builtin/provisioners/local-exec/resource_provisioner.go +++ b/internal/builtin/provisioners/local-exec/resource_provisioner.go @@ -9,7 +9,7 @@ import ( "runtime" "github.com/armon/circbuf" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/provisioners" "github.com/mitchellh/go-linereader" "github.com/zclconf/go-cty/cty" diff --git a/internal/builtin/provisioners/remote-exec/resource_provisioner.go b/internal/builtin/provisioners/remote-exec/resource_provisioner.go index 3a390fcea2..a499add821 100644 --- a/internal/builtin/provisioners/remote-exec/resource_provisioner.go +++ b/internal/builtin/provisioners/remote-exec/resource_provisioner.go @@ -11,9 +11,9 @@ import ( "os" "strings" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/communicator" "github.com/hashicorp/terraform/internal/communicator/remote" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/provisioners" "github.com/mitchellh/go-linereader" "github.com/zclconf/go-cty/cty" diff --git a/internal/command/apply_destroy_test.go b/internal/command/apply_destroy_test.go index 1629b5b456..1bb1ef26d4 100644 --- a/internal/command/apply_destroy_test.go +++ b/internal/command/apply_destroy_test.go @@ -9,8 +9,8 @@ import ( "github.com/mitchellh/cli" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statefile" diff --git a/internal/command/apply_test.go b/internal/command/apply_test.go index 25c604f9ab..e41e8a58b7 100644 --- a/internal/command/apply_test.go +++ b/internal/command/apply_test.go @@ -20,9 +20,9 @@ import ( "github.com/mitchellh/cli" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/command/views" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" diff --git a/internal/command/cliconfig/credentials.go b/internal/command/cliconfig/credentials.go index 0b56191e2e..7c5dcd3207 100644 --- a/internal/command/cliconfig/credentials.go +++ b/internal/command/cliconfig/credentials.go @@ -14,7 +14,7 @@ import ( svchost "github.com/hashicorp/terraform-svchost" svcauth "github.com/hashicorp/terraform-svchost/auth" - "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" "github.com/hashicorp/terraform/internal/replacefile" pluginDiscovery "github.com/hashicorp/terraform/plugin/discovery" ) diff --git a/internal/command/command_test.go b/internal/command/command_test.go index bf862148b4..8114065177 100644 --- a/internal/command/command_test.go +++ b/internal/command/command_test.go @@ -20,13 +20,13 @@ import ( svchost "github.com/hashicorp/terraform-svchost" "github.com/hashicorp/terraform-svchost/disco" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configload" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" backendInit "github.com/hashicorp/terraform/internal/backend/init" backendLocal "github.com/hashicorp/terraform/internal/backend/local" "github.com/hashicorp/terraform/internal/command/views" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configload" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/copy" "github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/internal/initwd" diff --git a/internal/command/console_test.go b/internal/command/console_test.go index 4accbc6ce2..8cd13ef570 100644 --- a/internal/command/console_test.go +++ b/internal/command/console_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/mitchellh/cli" "github.com/zclconf/go-cty/cty" diff --git a/internal/command/fmt.go b/internal/command/fmt.go index 1b2a6f79cc..625e69326b 100644 --- a/internal/command/fmt.go +++ b/internal/command/fmt.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/hcl/v2/hclwrite" "github.com/mitchellh/cli" - "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/internal/command/format/diff.go b/internal/command/format/diff.go index 6cef3fec26..a084dd70f5 100644 --- a/internal/command/format/diff.go +++ b/internal/command/format/diff.go @@ -12,8 +12,8 @@ import ( "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/plans/objchange" "github.com/hashicorp/terraform/states" diff --git a/internal/command/format/diff_test.go b/internal/command/format/diff_test.go index 959ff77471..3d0681152b 100644 --- a/internal/command/format/diff_test.go +++ b/internal/command/format/diff_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/mitchellh/colorstring" diff --git a/internal/command/format/state.go b/internal/command/format/state.go index 5887bf6e7e..5974ba19f3 100644 --- a/internal/command/format/state.go +++ b/internal/command/format/state.go @@ -8,8 +8,8 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" diff --git a/internal/command/format/state_test.go b/internal/command/format/state_test.go index d5e3c1342f..e7772aefc1 100644 --- a/internal/command/format/state_test.go +++ b/internal/command/format/state_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" diff --git a/internal/command/import.go b/internal/command/import.go index ea9e2f2fc2..1c0357b8de 100644 --- a/internal/command/import.go +++ b/internal/command/import.go @@ -10,11 +10,11 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/command/arguments" "github.com/hashicorp/terraform/internal/command/views" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/terraform" ) diff --git a/internal/command/import_test.go b/internal/command/import_test.go index 962b5f2d0d..28470dfc5b 100644 --- a/internal/command/import_test.go +++ b/internal/command/import_test.go @@ -11,7 +11,7 @@ import ( "github.com/mitchellh/cli" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/copy" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" diff --git a/internal/command/init.go b/internal/command/init.go index 83d6547588..1f2c4344b6 100644 --- a/internal/command/init.go +++ b/internal/command/init.go @@ -12,11 +12,11 @@ import ( "github.com/posener/complete" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/backend" backendInit "github.com/hashicorp/terraform/internal/backend/init" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/internal/providercache" "github.com/hashicorp/terraform/internal/tfdiags" diff --git a/internal/command/init_test.go b/internal/command/init_test.go index caf1205f31..62222ba462 100644 --- a/internal/command/init_test.go +++ b/internal/command/init_test.go @@ -17,9 +17,9 @@ import ( "github.com/mitchellh/cli" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/depsfile" "github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/internal/providercache" diff --git a/internal/command/jsonconfig/config.go b/internal/command/jsonconfig/config.go index 00d9093b0d..d7edc3f7da 100644 --- a/internal/command/jsonconfig/config.go +++ b/internal/command/jsonconfig/config.go @@ -8,9 +8,9 @@ import ( "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/terraform" ) diff --git a/internal/command/jsonconfig/expression.go b/internal/command/jsonconfig/expression.go index 81b50f16c6..b948d7e29e 100644 --- a/internal/command/jsonconfig/expression.go +++ b/internal/command/jsonconfig/expression.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/lang" "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" diff --git a/internal/command/jsonconfig/expression_test.go b/internal/command/jsonconfig/expression_test.go index 84cdf3a8df..88b72d4d04 100644 --- a/internal/command/jsonconfig/expression_test.go +++ b/internal/command/jsonconfig/expression_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" ) func TestMarshalExpressions(t *testing.T) { diff --git a/internal/command/jsonplan/plan.go b/internal/command/jsonplan/plan.go index f6216f3315..988405336c 100644 --- a/internal/command/jsonplan/plan.go +++ b/internal/command/jsonplan/plan.go @@ -8,10 +8,10 @@ import ( "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/command/jsonconfig" "github.com/hashicorp/terraform/internal/command/jsonstate" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statefile" diff --git a/internal/command/jsonplan/values.go b/internal/command/jsonplan/values.go index 393bbae07c..6f64451de5 100644 --- a/internal/command/jsonplan/values.go +++ b/internal/command/jsonplan/values.go @@ -8,8 +8,8 @@ import ( "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/terraform" ) diff --git a/internal/command/jsonplan/values_test.go b/internal/command/jsonplan/values_test.go index 8afe894e80..6673f17a6c 100644 --- a/internal/command/jsonplan/values_test.go +++ b/internal/command/jsonplan/values_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/terraform" "github.com/zclconf/go-cty/cty" diff --git a/internal/command/jsonprovider/attribute.go b/internal/command/jsonprovider/attribute.go index 0702e73cef..803e4e5f0a 100644 --- a/internal/command/jsonprovider/attribute.go +++ b/internal/command/jsonprovider/attribute.go @@ -3,7 +3,7 @@ package jsonprovider import ( "encoding/json" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/command/jsonprovider/attribute_test.go b/internal/command/jsonprovider/attribute_test.go index 6cd2cab9b5..a2502eadfc 100644 --- a/internal/command/jsonprovider/attribute_test.go +++ b/internal/command/jsonprovider/attribute_test.go @@ -7,7 +7,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" ) func TestMarshalAttribute(t *testing.T) { diff --git a/internal/command/jsonprovider/block.go b/internal/command/jsonprovider/block.go index a41f9a8399..ebb145a4e6 100644 --- a/internal/command/jsonprovider/block.go +++ b/internal/command/jsonprovider/block.go @@ -1,7 +1,7 @@ package jsonprovider import ( - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" ) type block struct { diff --git a/internal/command/jsonprovider/block_test.go b/internal/command/jsonprovider/block_test.go index 6f61b1c69a..93197fb84b 100644 --- a/internal/command/jsonprovider/block_test.go +++ b/internal/command/jsonprovider/block_test.go @@ -7,7 +7,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" ) func TestMarshalBlock(t *testing.T) { diff --git a/internal/command/jsonprovider/provider_test.go b/internal/command/jsonprovider/provider_test.go index 098d5dc1b9..88e8627b97 100644 --- a/internal/command/jsonprovider/provider_test.go +++ b/internal/command/jsonprovider/provider_test.go @@ -7,7 +7,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/terraform" ) diff --git a/internal/command/jsonprovider/schema.go b/internal/command/jsonprovider/schema.go index dc9e30ce9b..5a1465b8a7 100644 --- a/internal/command/jsonprovider/schema.go +++ b/internal/command/jsonprovider/schema.go @@ -1,7 +1,7 @@ package jsonprovider import ( - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" ) type schema struct { diff --git a/internal/command/jsonprovider/schema_test.go b/internal/command/jsonprovider/schema_test.go index a4939d7d2b..737a8d74f8 100644 --- a/internal/command/jsonprovider/schema_test.go +++ b/internal/command/jsonprovider/schema_test.go @@ -5,7 +5,7 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" ) func TestMarshalSchemas(t *testing.T) { diff --git a/internal/command/jsonstate/state_test.go b/internal/command/jsonstate/state_test.go index 264765c6a0..eac4a097bf 100644 --- a/internal/command/jsonstate/state_test.go +++ b/internal/command/jsonstate/state_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/terraform" "github.com/zclconf/go-cty/cty" diff --git a/internal/command/meta.go b/internal/command/meta.go index 044525ef96..7277f2f27e 100644 --- a/internal/command/meta.go +++ b/internal/command/meta.go @@ -18,7 +18,6 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/hashicorp/terraform-svchost/disco" - "github.com/hashicorp/terraform/configs/configload" "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend/local" @@ -26,6 +25,7 @@ import ( "github.com/hashicorp/terraform/internal/command/format" "github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/command/webbrowser" + "github.com/hashicorp/terraform/internal/configs/configload" "github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" diff --git a/internal/command/meta_backend.go b/internal/command/meta_backend.go index 5d75b17570..dbbe8fc5a5 100644 --- a/internal/command/meta_backend.go +++ b/internal/command/meta_backend.go @@ -15,12 +15,12 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/backend" remoteBackend "github.com/hashicorp/terraform/internal/backend/remote" "github.com/hashicorp/terraform/internal/command/arguments" "github.com/hashicorp/terraform/internal/command/clistate" "github.com/hashicorp/terraform/internal/command/views" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states/statemgr" diff --git a/internal/command/meta_backend_test.go b/internal/command/meta_backend_test.go index f5e98cc680..578adfc625 100644 --- a/internal/command/meta_backend_test.go +++ b/internal/command/meta_backend_test.go @@ -8,9 +8,9 @@ import ( "sort" "testing" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/copy" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" diff --git a/internal/command/meta_config.go b/internal/command/meta_config.go index 7ddd3dd5d4..eaa82274c7 100644 --- a/internal/command/meta_config.go +++ b/internal/command/meta_config.go @@ -10,9 +10,9 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/hashicorp/terraform-config-inspect/tfconfig" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configload" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configload" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/earlyconfig" "github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/registry" diff --git a/internal/command/meta_vars.go b/internal/command/meta_vars.go index 4fd0920e6e..18aa14d475 100644 --- a/internal/command/meta_vars.go +++ b/internal/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/configs" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/terraform" ) diff --git a/internal/command/plan_test.go b/internal/command/plan_test.go index f2ddb172f6..feb8ddb481 100644 --- a/internal/command/plan_test.go +++ b/internal/command/plan_test.go @@ -16,9 +16,9 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" backendinit "github.com/hashicorp/terraform/internal/backend/init" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" diff --git a/internal/command/providers.go b/internal/command/providers.go index c28173af11..31fd795948 100644 --- a/internal/command/providers.go +++ b/internal/command/providers.go @@ -4,7 +4,7 @@ import ( "fmt" "path/filepath" - "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/xlab/treeprint" diff --git a/internal/command/providers_schema_test.go b/internal/command/providers_schema_test.go index aadf61353c..47f7b89852 100644 --- a/internal/command/providers_schema_test.go +++ b/internal/command/providers_schema_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/terraform" "github.com/mitchellh/cli" diff --git a/internal/command/refresh_test.go b/internal/command/refresh_test.go index f13c8105de..12e6b248c7 100644 --- a/internal/command/refresh_test.go +++ b/internal/command/refresh_test.go @@ -16,8 +16,8 @@ import ( "github.com/mitchellh/cli" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" diff --git a/internal/command/show_test.go b/internal/command/show_test.go index 7d233ab8f9..376bd3fdb1 100644 --- a/internal/command/show_test.go +++ b/internal/command/show_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" diff --git a/internal/command/state_show_test.go b/internal/command/state_show_test.go index cfe6dc847e..0016c8fb06 100644 --- a/internal/command/state_show_test.go +++ b/internal/command/state_show_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/states" "github.com/mitchellh/cli" diff --git a/internal/command/test.go b/internal/command/test.go index 03a45c5215..a33fa24667 100644 --- a/internal/command/test.go +++ b/internal/command/test.go @@ -11,12 +11,12 @@ import ( ctyjson "github.com/zclconf/go-cty/cty/json" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configload" "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/command/arguments" "github.com/hashicorp/terraform/internal/command/format" "github.com/hashicorp/terraform/internal/command/views" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configload" "github.com/hashicorp/terraform/internal/depsfile" "github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/moduletest" diff --git a/internal/command/validate_test.go b/internal/command/validate_test.go index 6d65368ac0..afff810707 100644 --- a/internal/command/validate_test.go +++ b/internal/command/validate_test.go @@ -11,7 +11,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/terminal" ) diff --git a/internal/command/views/plan_test.go b/internal/command/views/plan_test.go index 4a36f8c5c4..6e584f4daf 100644 --- a/internal/command/views/plan_test.go +++ b/internal/command/views/plan_test.go @@ -3,9 +3,9 @@ package views import ( "testing" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/command/arguments" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/plans" diff --git a/internal/communicator/shared/shared.go b/internal/communicator/shared/shared.go index a8535ac609..2bc1fb5fde 100644 --- a/internal/communicator/shared/shared.go +++ b/internal/communicator/shared/shared.go @@ -4,7 +4,7 @@ import ( "fmt" "net" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/zclconf/go-cty/cty" ) diff --git a/configs/backend.go b/internal/configs/backend.go similarity index 95% rename from configs/backend.go rename to internal/configs/backend.go index 5d8b9732a8..4bf968e6ad 100644 --- a/configs/backend.go +++ b/internal/configs/backend.go @@ -3,7 +3,7 @@ package configs import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/zclconf/go-cty/cty" ) diff --git a/configs/compat_shim.go b/internal/configs/compat_shim.go similarity index 100% rename from configs/compat_shim.go rename to internal/configs/compat_shim.go diff --git a/configs/config.go b/internal/configs/config.go similarity index 100% rename from configs/config.go rename to internal/configs/config.go diff --git a/configs/config_build.go b/internal/configs/config_build.go similarity index 100% rename from configs/config_build.go rename to internal/configs/config_build.go diff --git a/configs/config_build_test.go b/internal/configs/config_build_test.go similarity index 100% rename from configs/config_build_test.go rename to internal/configs/config_build_test.go diff --git a/configs/config_test.go b/internal/configs/config_test.go similarity index 100% rename from configs/config_test.go rename to internal/configs/config_test.go diff --git a/configs/configload/copy_dir.go b/internal/configs/configload/copy_dir.go similarity index 100% rename from configs/configload/copy_dir.go rename to internal/configs/configload/copy_dir.go diff --git a/configs/configload/copy_dir_test.go b/internal/configs/configload/copy_dir_test.go similarity index 100% rename from configs/configload/copy_dir_test.go rename to internal/configs/configload/copy_dir_test.go diff --git a/configs/configload/doc.go b/internal/configs/configload/doc.go similarity index 100% rename from configs/configload/doc.go rename to internal/configs/configload/doc.go diff --git a/configs/configload/inode.go b/internal/configs/configload/inode.go similarity index 100% rename from configs/configload/inode.go rename to internal/configs/configload/inode.go diff --git a/configs/configload/inode_freebsd.go b/internal/configs/configload/inode_freebsd.go similarity index 100% rename from configs/configload/inode_freebsd.go rename to internal/configs/configload/inode_freebsd.go diff --git a/configs/configload/inode_windows.go b/internal/configs/configload/inode_windows.go similarity index 100% rename from configs/configload/inode_windows.go rename to internal/configs/configload/inode_windows.go diff --git a/configs/configload/loader.go b/internal/configs/configload/loader.go similarity index 99% rename from configs/configload/loader.go rename to internal/configs/configload/loader.go index 9c3ec3ee7d..d861a8d1e6 100644 --- a/configs/configload/loader.go +++ b/internal/configs/configload/loader.go @@ -5,7 +5,7 @@ import ( "path/filepath" "github.com/hashicorp/terraform-svchost/disco" - "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/registry" "github.com/spf13/afero" ) diff --git a/configs/configload/loader_load.go b/internal/configs/configload/loader_load.go similarity index 98% rename from configs/configload/loader_load.go rename to internal/configs/configload/loader_load.go index 8f5f48a993..2a31a22c2b 100644 --- a/configs/configload/loader_load.go +++ b/internal/configs/configload/loader_load.go @@ -5,7 +5,7 @@ import ( version "github.com/hashicorp/go-version" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/configs" ) // LoadConfig reads the Terraform module in the given directory and uses it as the diff --git a/configs/configload/loader_load_test.go b/internal/configs/configload/loader_load_test.go similarity index 98% rename from configs/configload/loader_load_test.go rename to internal/configs/configload/loader_load_test.go index 60fef238d3..82d8db0cd4 100644 --- a/configs/configload/loader_load_test.go +++ b/internal/configs/configload/loader_load_test.go @@ -10,7 +10,7 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/configs" ) func TestLoaderLoadConfig_okay(t *testing.T) { diff --git a/configs/configload/loader_snapshot.go b/internal/configs/configload/loader_snapshot.go similarity index 99% rename from configs/configload/loader_snapshot.go rename to internal/configs/configload/loader_snapshot.go index 9e83895cfe..c1b54b8c2d 100644 --- a/configs/configload/loader_snapshot.go +++ b/internal/configs/configload/loader_snapshot.go @@ -10,7 +10,7 @@ import ( version "github.com/hashicorp/go-version" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/modsdir" "github.com/spf13/afero" ) diff --git a/configs/configload/loader_snapshot_test.go b/internal/configs/configload/loader_snapshot_test.go similarity index 100% rename from configs/configload/loader_snapshot_test.go rename to internal/configs/configload/loader_snapshot_test.go diff --git a/configs/configload/loader_test.go b/internal/configs/configload/loader_test.go similarity index 100% rename from configs/configload/loader_test.go rename to internal/configs/configload/loader_test.go diff --git a/configs/configload/module_mgr.go b/internal/configs/configload/module_mgr.go similarity index 100% rename from configs/configload/module_mgr.go rename to internal/configs/configload/module_mgr.go diff --git a/configs/configload/testdata/add-version-constraint/.terraform/modules/child/empty.tf b/internal/configs/configload/testdata/add-version-constraint/.terraform/modules/child/empty.tf similarity index 100% rename from configs/configload/testdata/add-version-constraint/.terraform/modules/child/empty.tf rename to internal/configs/configload/testdata/add-version-constraint/.terraform/modules/child/empty.tf diff --git a/configs/configload/testdata/add-version-constraint/.terraform/modules/modules.json b/internal/configs/configload/testdata/add-version-constraint/.terraform/modules/modules.json similarity index 100% rename from configs/configload/testdata/add-version-constraint/.terraform/modules/modules.json rename to internal/configs/configload/testdata/add-version-constraint/.terraform/modules/modules.json diff --git a/configs/configload/testdata/add-version-constraint/add-version-constraint.tf b/internal/configs/configload/testdata/add-version-constraint/add-version-constraint.tf similarity index 100% rename from configs/configload/testdata/add-version-constraint/add-version-constraint.tf rename to internal/configs/configload/testdata/add-version-constraint/add-version-constraint.tf diff --git a/configs/configload/testdata/already-installed/.terraform/modules/child_a/child_a.tf b/internal/configs/configload/testdata/already-installed/.terraform/modules/child_a/child_a.tf similarity index 100% rename from configs/configload/testdata/already-installed/.terraform/modules/child_a/child_a.tf rename to internal/configs/configload/testdata/already-installed/.terraform/modules/child_a/child_a.tf diff --git a/configs/configload/testdata/already-installed/.terraform/modules/child_a/child_c/child_c.tf b/internal/configs/configload/testdata/already-installed/.terraform/modules/child_a/child_c/child_c.tf similarity index 100% rename from configs/configload/testdata/already-installed/.terraform/modules/child_a/child_c/child_c.tf rename to internal/configs/configload/testdata/already-installed/.terraform/modules/child_a/child_c/child_c.tf diff --git a/configs/configload/testdata/already-installed/.terraform/modules/child_b.child_d/child_d.tf b/internal/configs/configload/testdata/already-installed/.terraform/modules/child_b.child_d/child_d.tf similarity index 100% rename from configs/configload/testdata/already-installed/.terraform/modules/child_b.child_d/child_d.tf rename to internal/configs/configload/testdata/already-installed/.terraform/modules/child_b.child_d/child_d.tf diff --git a/configs/configload/testdata/already-installed/.terraform/modules/child_b/child_b.tf b/internal/configs/configload/testdata/already-installed/.terraform/modules/child_b/child_b.tf similarity index 100% rename from configs/configload/testdata/already-installed/.terraform/modules/child_b/child_b.tf rename to internal/configs/configload/testdata/already-installed/.terraform/modules/child_b/child_b.tf diff --git a/configs/configload/testdata/already-installed/.terraform/modules/modules.json b/internal/configs/configload/testdata/already-installed/.terraform/modules/modules.json similarity index 100% rename from configs/configload/testdata/already-installed/.terraform/modules/modules.json rename to internal/configs/configload/testdata/already-installed/.terraform/modules/modules.json diff --git a/configs/configload/testdata/already-installed/root.tf b/internal/configs/configload/testdata/already-installed/root.tf similarity index 100% rename from configs/configload/testdata/already-installed/root.tf rename to internal/configs/configload/testdata/already-installed/root.tf diff --git a/configs/configload/testdata/empty/.gitignore b/internal/configs/configload/testdata/empty/.gitignore similarity index 100% rename from configs/configload/testdata/empty/.gitignore rename to internal/configs/configload/testdata/empty/.gitignore diff --git a/configs/configload/testdata/go-getter-modules/.gitignore b/internal/configs/configload/testdata/go-getter-modules/.gitignore similarity index 100% rename from configs/configload/testdata/go-getter-modules/.gitignore rename to internal/configs/configload/testdata/go-getter-modules/.gitignore diff --git a/configs/configload/testdata/go-getter-modules/root.tf b/internal/configs/configload/testdata/go-getter-modules/root.tf similarity index 100% rename from configs/configload/testdata/go-getter-modules/root.tf rename to internal/configs/configload/testdata/go-getter-modules/root.tf diff --git a/configs/configload/testdata/invalid-names/main.tf b/internal/configs/configload/testdata/invalid-names/main.tf similarity index 100% rename from configs/configload/testdata/invalid-names/main.tf rename to internal/configs/configload/testdata/invalid-names/main.tf diff --git a/configs/configload/testdata/local-modules/child_a/child_a.tf b/internal/configs/configload/testdata/local-modules/child_a/child_a.tf similarity index 100% rename from configs/configload/testdata/local-modules/child_a/child_a.tf rename to internal/configs/configload/testdata/local-modules/child_a/child_a.tf diff --git a/configs/configload/testdata/local-modules/child_a/child_b/child_b.tf b/internal/configs/configload/testdata/local-modules/child_a/child_b/child_b.tf similarity index 100% rename from configs/configload/testdata/local-modules/child_a/child_b/child_b.tf rename to internal/configs/configload/testdata/local-modules/child_a/child_b/child_b.tf diff --git a/configs/configload/testdata/local-modules/root.tf b/internal/configs/configload/testdata/local-modules/root.tf similarity index 100% rename from configs/configload/testdata/local-modules/root.tf rename to internal/configs/configload/testdata/local-modules/root.tf diff --git a/configs/configload/testdata/module-depends-on/.terraform/modules/modules.json b/internal/configs/configload/testdata/module-depends-on/.terraform/modules/modules.json similarity index 100% rename from configs/configload/testdata/module-depends-on/.terraform/modules/modules.json rename to internal/configs/configload/testdata/module-depends-on/.terraform/modules/modules.json diff --git a/configs/configload/testdata/module-depends-on/child/main.tf b/internal/configs/configload/testdata/module-depends-on/child/main.tf similarity index 100% rename from configs/configload/testdata/module-depends-on/child/main.tf rename to internal/configs/configload/testdata/module-depends-on/child/main.tf diff --git a/configs/configload/testdata/module-depends-on/child2/main.tf b/internal/configs/configload/testdata/module-depends-on/child2/main.tf similarity index 100% rename from configs/configload/testdata/module-depends-on/child2/main.tf rename to internal/configs/configload/testdata/module-depends-on/child2/main.tf diff --git a/configs/configload/testdata/module-depends-on/root.tf b/internal/configs/configload/testdata/module-depends-on/root.tf similarity index 100% rename from configs/configload/testdata/module-depends-on/root.tf rename to internal/configs/configload/testdata/module-depends-on/root.tf diff --git a/configs/configload/testdata/registry-modules/.gitignore b/internal/configs/configload/testdata/registry-modules/.gitignore similarity index 100% rename from configs/configload/testdata/registry-modules/.gitignore rename to internal/configs/configload/testdata/registry-modules/.gitignore diff --git a/configs/configload/testdata/registry-modules/root.tf b/internal/configs/configload/testdata/registry-modules/root.tf similarity index 100% rename from configs/configload/testdata/registry-modules/root.tf rename to internal/configs/configload/testdata/registry-modules/root.tf diff --git a/configs/configload/testing.go b/internal/configs/configload/testing.go similarity index 100% rename from configs/configload/testing.go rename to internal/configs/configload/testing.go diff --git a/configs/configschema/coerce_value.go b/internal/configs/configschema/coerce_value.go similarity index 100% rename from configs/configschema/coerce_value.go rename to internal/configs/configschema/coerce_value.go diff --git a/configs/configschema/coerce_value_test.go b/internal/configs/configschema/coerce_value_test.go similarity index 100% rename from configs/configschema/coerce_value_test.go rename to internal/configs/configschema/coerce_value_test.go diff --git a/configs/configschema/decoder_spec.go b/internal/configs/configschema/decoder_spec.go similarity index 100% rename from configs/configschema/decoder_spec.go rename to internal/configs/configschema/decoder_spec.go diff --git a/configs/configschema/decoder_spec_test.go b/internal/configs/configschema/decoder_spec_test.go similarity index 100% rename from configs/configschema/decoder_spec_test.go rename to internal/configs/configschema/decoder_spec_test.go diff --git a/configs/configschema/doc.go b/internal/configs/configschema/doc.go similarity index 100% rename from configs/configschema/doc.go rename to internal/configs/configschema/doc.go diff --git a/configs/configschema/empty_value.go b/internal/configs/configschema/empty_value.go similarity index 100% rename from configs/configschema/empty_value.go rename to internal/configs/configschema/empty_value.go diff --git a/configs/configschema/empty_value_test.go b/internal/configs/configschema/empty_value_test.go similarity index 100% rename from configs/configschema/empty_value_test.go rename to internal/configs/configschema/empty_value_test.go diff --git a/configs/configschema/implied_type.go b/internal/configs/configschema/implied_type.go similarity index 100% rename from configs/configschema/implied_type.go rename to internal/configs/configschema/implied_type.go diff --git a/configs/configschema/implied_type_test.go b/internal/configs/configschema/implied_type_test.go similarity index 100% rename from configs/configschema/implied_type_test.go rename to internal/configs/configschema/implied_type_test.go diff --git a/configs/configschema/internal_validate.go b/internal/configs/configschema/internal_validate.go similarity index 100% rename from configs/configschema/internal_validate.go rename to internal/configs/configschema/internal_validate.go diff --git a/configs/configschema/internal_validate_test.go b/internal/configs/configschema/internal_validate_test.go similarity index 100% rename from configs/configschema/internal_validate_test.go rename to internal/configs/configschema/internal_validate_test.go diff --git a/configs/configschema/marks.go b/internal/configs/configschema/marks.go similarity index 100% rename from configs/configschema/marks.go rename to internal/configs/configschema/marks.go diff --git a/configs/configschema/marks_test.go b/internal/configs/configschema/marks_test.go similarity index 100% rename from configs/configschema/marks_test.go rename to internal/configs/configschema/marks_test.go diff --git a/configs/configschema/nestingmode_string.go b/internal/configs/configschema/nestingmode_string.go similarity index 100% rename from configs/configschema/nestingmode_string.go rename to internal/configs/configschema/nestingmode_string.go diff --git a/configs/configschema/none_required.go b/internal/configs/configschema/none_required.go similarity index 100% rename from configs/configschema/none_required.go rename to internal/configs/configschema/none_required.go diff --git a/configs/configschema/path.go b/internal/configs/configschema/path.go similarity index 100% rename from configs/configschema/path.go rename to internal/configs/configschema/path.go diff --git a/configs/configschema/path_test.go b/internal/configs/configschema/path_test.go similarity index 100% rename from configs/configschema/path_test.go rename to internal/configs/configschema/path_test.go diff --git a/configs/configschema/schema.go b/internal/configs/configschema/schema.go similarity index 100% rename from configs/configschema/schema.go rename to internal/configs/configschema/schema.go diff --git a/configs/configschema/validate_traversal.go b/internal/configs/configschema/validate_traversal.go similarity index 100% rename from configs/configschema/validate_traversal.go rename to internal/configs/configschema/validate_traversal.go diff --git a/configs/configschema/validate_traversal_test.go b/internal/configs/configschema/validate_traversal_test.go similarity index 100% rename from configs/configschema/validate_traversal_test.go rename to internal/configs/configschema/validate_traversal_test.go diff --git a/configs/depends_on.go b/internal/configs/depends_on.go similarity index 100% rename from configs/depends_on.go rename to internal/configs/depends_on.go diff --git a/configs/doc.go b/internal/configs/doc.go similarity index 100% rename from configs/doc.go rename to internal/configs/doc.go diff --git a/configs/escaping_blocks_test.go b/internal/configs/escaping_blocks_test.go similarity index 100% rename from configs/escaping_blocks_test.go rename to internal/configs/escaping_blocks_test.go diff --git a/configs/experiments.go b/internal/configs/experiments.go similarity index 100% rename from configs/experiments.go rename to internal/configs/experiments.go diff --git a/configs/experiments_test.go b/internal/configs/experiments_test.go similarity index 100% rename from configs/experiments_test.go rename to internal/configs/experiments_test.go diff --git a/configs/hcl2shim/flatmap.go b/internal/configs/hcl2shim/flatmap.go similarity index 100% rename from configs/hcl2shim/flatmap.go rename to internal/configs/hcl2shim/flatmap.go diff --git a/configs/hcl2shim/flatmap_test.go b/internal/configs/hcl2shim/flatmap_test.go similarity index 100% rename from configs/hcl2shim/flatmap_test.go rename to internal/configs/hcl2shim/flatmap_test.go diff --git a/configs/hcl2shim/paths.go b/internal/configs/hcl2shim/paths.go similarity index 100% rename from configs/hcl2shim/paths.go rename to internal/configs/hcl2shim/paths.go diff --git a/configs/hcl2shim/paths_test.go b/internal/configs/hcl2shim/paths_test.go similarity index 100% rename from configs/hcl2shim/paths_test.go rename to internal/configs/hcl2shim/paths_test.go diff --git a/configs/hcl2shim/single_attr_body.go b/internal/configs/hcl2shim/single_attr_body.go similarity index 100% rename from configs/hcl2shim/single_attr_body.go rename to internal/configs/hcl2shim/single_attr_body.go diff --git a/configs/hcl2shim/values.go b/internal/configs/hcl2shim/values.go similarity index 99% rename from configs/hcl2shim/values.go rename to internal/configs/hcl2shim/values.go index 44551fe1ea..7b0e09607f 100644 --- a/configs/hcl2shim/values.go +++ b/internal/configs/hcl2shim/values.go @@ -6,7 +6,7 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" ) // UnknownVariableValue is a sentinel value that can be used diff --git a/configs/hcl2shim/values_equiv.go b/internal/configs/hcl2shim/values_equiv.go similarity index 100% rename from configs/hcl2shim/values_equiv.go rename to internal/configs/hcl2shim/values_equiv.go diff --git a/configs/hcl2shim/values_equiv_test.go b/internal/configs/hcl2shim/values_equiv_test.go similarity index 100% rename from configs/hcl2shim/values_equiv_test.go rename to internal/configs/hcl2shim/values_equiv_test.go diff --git a/configs/hcl2shim/values_test.go b/internal/configs/hcl2shim/values_test.go similarity index 99% rename from configs/hcl2shim/values_test.go rename to internal/configs/hcl2shim/values_test.go index 7c3011da05..4bc816dd9b 100644 --- a/configs/hcl2shim/values_test.go +++ b/internal/configs/hcl2shim/values_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/zclconf/go-cty/cty" ) diff --git a/configs/module.go b/internal/configs/module.go similarity index 100% rename from configs/module.go rename to internal/configs/module.go diff --git a/configs/module_call.go b/internal/configs/module_call.go similarity index 100% rename from configs/module_call.go rename to internal/configs/module_call.go diff --git a/configs/module_call_test.go b/internal/configs/module_call_test.go similarity index 100% rename from configs/module_call_test.go rename to internal/configs/module_call_test.go diff --git a/configs/module_merge.go b/internal/configs/module_merge.go similarity index 100% rename from configs/module_merge.go rename to internal/configs/module_merge.go diff --git a/configs/module_merge_body.go b/internal/configs/module_merge_body.go similarity index 100% rename from configs/module_merge_body.go rename to internal/configs/module_merge_body.go diff --git a/configs/module_merge_test.go b/internal/configs/module_merge_test.go similarity index 100% rename from configs/module_merge_test.go rename to internal/configs/module_merge_test.go diff --git a/configs/module_test.go b/internal/configs/module_test.go similarity index 100% rename from configs/module_test.go rename to internal/configs/module_test.go diff --git a/configs/named_values.go b/internal/configs/named_values.go similarity index 100% rename from configs/named_values.go rename to internal/configs/named_values.go diff --git a/configs/named_values_test.go b/internal/configs/named_values_test.go similarity index 100% rename from configs/named_values_test.go rename to internal/configs/named_values_test.go diff --git a/configs/parser.go b/internal/configs/parser.go similarity index 100% rename from configs/parser.go rename to internal/configs/parser.go diff --git a/configs/parser_config.go b/internal/configs/parser_config.go similarity index 100% rename from configs/parser_config.go rename to internal/configs/parser_config.go diff --git a/configs/parser_config_dir.go b/internal/configs/parser_config_dir.go similarity index 100% rename from configs/parser_config_dir.go rename to internal/configs/parser_config_dir.go diff --git a/configs/parser_config_dir_test.go b/internal/configs/parser_config_dir_test.go similarity index 100% rename from configs/parser_config_dir_test.go rename to internal/configs/parser_config_dir_test.go diff --git a/configs/parser_config_test.go b/internal/configs/parser_config_test.go similarity index 100% rename from configs/parser_config_test.go rename to internal/configs/parser_config_test.go diff --git a/configs/parser_test.go b/internal/configs/parser_test.go similarity index 100% rename from configs/parser_test.go rename to internal/configs/parser_test.go diff --git a/configs/parser_values.go b/internal/configs/parser_values.go similarity index 100% rename from configs/parser_values.go rename to internal/configs/parser_values.go diff --git a/configs/parser_values_test.go b/internal/configs/parser_values_test.go similarity index 100% rename from configs/parser_values_test.go rename to internal/configs/parser_values_test.go diff --git a/configs/provider.go b/internal/configs/provider.go similarity index 100% rename from configs/provider.go rename to internal/configs/provider.go diff --git a/configs/provider_meta.go b/internal/configs/provider_meta.go similarity index 100% rename from configs/provider_meta.go rename to internal/configs/provider_meta.go diff --git a/configs/provider_requirements.go b/internal/configs/provider_requirements.go similarity index 100% rename from configs/provider_requirements.go rename to internal/configs/provider_requirements.go diff --git a/configs/provider_requirements_test.go b/internal/configs/provider_requirements_test.go similarity index 100% rename from configs/provider_requirements_test.go rename to internal/configs/provider_requirements_test.go diff --git a/configs/provider_test.go b/internal/configs/provider_test.go similarity index 100% rename from configs/provider_test.go rename to internal/configs/provider_test.go diff --git a/configs/provider_validation.go b/internal/configs/provider_validation.go similarity index 100% rename from configs/provider_validation.go rename to internal/configs/provider_validation.go diff --git a/configs/provisioner.go b/internal/configs/provisioner.go similarity index 100% rename from configs/provisioner.go rename to internal/configs/provisioner.go diff --git a/configs/provisioneronfailure_string.go b/internal/configs/provisioneronfailure_string.go similarity index 100% rename from configs/provisioneronfailure_string.go rename to internal/configs/provisioneronfailure_string.go diff --git a/configs/provisionerwhen_string.go b/internal/configs/provisionerwhen_string.go similarity index 100% rename from configs/provisionerwhen_string.go rename to internal/configs/provisionerwhen_string.go diff --git a/configs/resource.go b/internal/configs/resource.go similarity index 100% rename from configs/resource.go rename to internal/configs/resource.go diff --git a/configs/synth_body.go b/internal/configs/synth_body.go similarity index 100% rename from configs/synth_body.go rename to internal/configs/synth_body.go diff --git a/configs/synth_body_test.go b/internal/configs/synth_body_test.go similarity index 100% rename from configs/synth_body_test.go rename to internal/configs/synth_body_test.go diff --git a/configs/testdata/config-build/child_a/child_a.tf b/internal/configs/testdata/config-build/child_a/child_a.tf similarity index 100% rename from configs/testdata/config-build/child_a/child_a.tf rename to internal/configs/testdata/config-build/child_a/child_a.tf diff --git a/configs/testdata/config-build/child_b/child_b.tf b/internal/configs/testdata/config-build/child_b/child_b.tf similarity index 100% rename from configs/testdata/config-build/child_b/child_b.tf rename to internal/configs/testdata/config-build/child_b/child_b.tf diff --git a/configs/testdata/config-build/child_c/child_c.tf b/internal/configs/testdata/config-build/child_c/child_c.tf similarity index 100% rename from configs/testdata/config-build/child_c/child_c.tf rename to internal/configs/testdata/config-build/child_c/child_c.tf diff --git a/configs/testdata/config-build/root.tf b/internal/configs/testdata/config-build/root.tf similarity index 100% rename from configs/testdata/config-build/root.tf rename to internal/configs/testdata/config-build/root.tf diff --git a/configs/testdata/config-diagnostics/empty-configs/main.tf b/internal/configs/testdata/config-diagnostics/empty-configs/main.tf similarity index 100% rename from configs/testdata/config-diagnostics/empty-configs/main.tf rename to internal/configs/testdata/config-diagnostics/empty-configs/main.tf diff --git a/configs/testdata/config-diagnostics/empty-configs/mod/main.tf b/internal/configs/testdata/config-diagnostics/empty-configs/mod/main.tf similarity index 100% rename from configs/testdata/config-diagnostics/empty-configs/mod/main.tf rename to internal/configs/testdata/config-diagnostics/empty-configs/mod/main.tf diff --git a/configs/testdata/config-diagnostics/empty-configs/warnings b/internal/configs/testdata/config-diagnostics/empty-configs/warnings similarity index 100% rename from configs/testdata/config-diagnostics/empty-configs/warnings rename to internal/configs/testdata/config-diagnostics/empty-configs/warnings diff --git a/configs/testdata/config-diagnostics/incorrect-type/errors b/internal/configs/testdata/config-diagnostics/incorrect-type/errors similarity index 100% rename from configs/testdata/config-diagnostics/incorrect-type/errors rename to internal/configs/testdata/config-diagnostics/incorrect-type/errors diff --git a/configs/testdata/config-diagnostics/incorrect-type/main.tf b/internal/configs/testdata/config-diagnostics/incorrect-type/main.tf similarity index 100% rename from configs/testdata/config-diagnostics/incorrect-type/main.tf rename to internal/configs/testdata/config-diagnostics/incorrect-type/main.tf diff --git a/configs/testdata/config-diagnostics/incorrect-type/mod/main.tf b/internal/configs/testdata/config-diagnostics/incorrect-type/mod/main.tf similarity index 100% rename from configs/testdata/config-diagnostics/incorrect-type/mod/main.tf rename to internal/configs/testdata/config-diagnostics/incorrect-type/mod/main.tf diff --git a/configs/testdata/config-diagnostics/incorrect-type/warnings b/internal/configs/testdata/config-diagnostics/incorrect-type/warnings similarity index 100% rename from configs/testdata/config-diagnostics/incorrect-type/warnings rename to internal/configs/testdata/config-diagnostics/incorrect-type/warnings diff --git a/configs/testdata/config-diagnostics/nested-provider/child/child2/main.tf b/internal/configs/testdata/config-diagnostics/nested-provider/child/child2/main.tf similarity index 100% rename from configs/testdata/config-diagnostics/nested-provider/child/child2/main.tf rename to internal/configs/testdata/config-diagnostics/nested-provider/child/child2/main.tf diff --git a/configs/testdata/config-diagnostics/nested-provider/child/main.tf b/internal/configs/testdata/config-diagnostics/nested-provider/child/main.tf similarity index 100% rename from configs/testdata/config-diagnostics/nested-provider/child/main.tf rename to internal/configs/testdata/config-diagnostics/nested-provider/child/main.tf diff --git a/configs/testdata/config-diagnostics/nested-provider/errors b/internal/configs/testdata/config-diagnostics/nested-provider/errors similarity index 100% rename from configs/testdata/config-diagnostics/nested-provider/errors rename to internal/configs/testdata/config-diagnostics/nested-provider/errors diff --git a/configs/testdata/config-diagnostics/nested-provider/root.tf b/internal/configs/testdata/config-diagnostics/nested-provider/root.tf similarity index 100% rename from configs/testdata/config-diagnostics/nested-provider/root.tf rename to internal/configs/testdata/config-diagnostics/nested-provider/root.tf diff --git a/configs/testdata/config-diagnostics/override-provider/errors b/internal/configs/testdata/config-diagnostics/override-provider/errors similarity index 100% rename from configs/testdata/config-diagnostics/override-provider/errors rename to internal/configs/testdata/config-diagnostics/override-provider/errors diff --git a/configs/testdata/config-diagnostics/override-provider/main.tf b/internal/configs/testdata/config-diagnostics/override-provider/main.tf similarity index 100% rename from configs/testdata/config-diagnostics/override-provider/main.tf rename to internal/configs/testdata/config-diagnostics/override-provider/main.tf diff --git a/configs/testdata/config-diagnostics/override-provider/mod/main.tf b/internal/configs/testdata/config-diagnostics/override-provider/mod/main.tf similarity index 100% rename from configs/testdata/config-diagnostics/override-provider/mod/main.tf rename to internal/configs/testdata/config-diagnostics/override-provider/mod/main.tf diff --git a/configs/testdata/config-diagnostics/pass-inherited-provider/main.tf b/internal/configs/testdata/config-diagnostics/pass-inherited-provider/main.tf similarity index 100% rename from configs/testdata/config-diagnostics/pass-inherited-provider/main.tf rename to internal/configs/testdata/config-diagnostics/pass-inherited-provider/main.tf diff --git a/configs/testdata/config-diagnostics/pass-inherited-provider/mod/main.tf b/internal/configs/testdata/config-diagnostics/pass-inherited-provider/mod/main.tf similarity index 100% rename from configs/testdata/config-diagnostics/pass-inherited-provider/mod/main.tf rename to internal/configs/testdata/config-diagnostics/pass-inherited-provider/mod/main.tf diff --git a/configs/testdata/config-diagnostics/pass-inherited-provider/mod2/main.tf b/internal/configs/testdata/config-diagnostics/pass-inherited-provider/mod2/main.tf similarity index 100% rename from configs/testdata/config-diagnostics/pass-inherited-provider/mod2/main.tf rename to internal/configs/testdata/config-diagnostics/pass-inherited-provider/mod2/main.tf diff --git a/configs/testdata/config-diagnostics/pass-inherited-provider/warnings b/internal/configs/testdata/config-diagnostics/pass-inherited-provider/warnings similarity index 100% rename from configs/testdata/config-diagnostics/pass-inherited-provider/warnings rename to internal/configs/testdata/config-diagnostics/pass-inherited-provider/warnings diff --git a/configs/testdata/config-diagnostics/required-alias/errors b/internal/configs/testdata/config-diagnostics/required-alias/errors similarity index 100% rename from configs/testdata/config-diagnostics/required-alias/errors rename to internal/configs/testdata/config-diagnostics/required-alias/errors diff --git a/configs/testdata/config-diagnostics/required-alias/main.tf b/internal/configs/testdata/config-diagnostics/required-alias/main.tf similarity index 100% rename from configs/testdata/config-diagnostics/required-alias/main.tf rename to internal/configs/testdata/config-diagnostics/required-alias/main.tf diff --git a/configs/testdata/config-diagnostics/required-alias/mod/main.tf b/internal/configs/testdata/config-diagnostics/required-alias/mod/main.tf similarity index 100% rename from configs/testdata/config-diagnostics/required-alias/mod/main.tf rename to internal/configs/testdata/config-diagnostics/required-alias/mod/main.tf diff --git a/configs/testdata/config-diagnostics/unexpected-provider/main.tf b/internal/configs/testdata/config-diagnostics/unexpected-provider/main.tf similarity index 100% rename from configs/testdata/config-diagnostics/unexpected-provider/main.tf rename to internal/configs/testdata/config-diagnostics/unexpected-provider/main.tf diff --git a/configs/testdata/config-diagnostics/unexpected-provider/mod/main.tf b/internal/configs/testdata/config-diagnostics/unexpected-provider/mod/main.tf similarity index 100% rename from configs/testdata/config-diagnostics/unexpected-provider/mod/main.tf rename to internal/configs/testdata/config-diagnostics/unexpected-provider/mod/main.tf diff --git a/configs/testdata/config-diagnostics/unexpected-provider/warnings b/internal/configs/testdata/config-diagnostics/unexpected-provider/warnings similarity index 100% rename from configs/testdata/config-diagnostics/unexpected-provider/warnings rename to internal/configs/testdata/config-diagnostics/unexpected-provider/warnings diff --git a/configs/testdata/config-diagnostics/unknown-root-provider/main.tf b/internal/configs/testdata/config-diagnostics/unknown-root-provider/main.tf similarity index 100% rename from configs/testdata/config-diagnostics/unknown-root-provider/main.tf rename to internal/configs/testdata/config-diagnostics/unknown-root-provider/main.tf diff --git a/configs/testdata/config-diagnostics/unknown-root-provider/mod/main.tf b/internal/configs/testdata/config-diagnostics/unknown-root-provider/mod/main.tf similarity index 100% rename from configs/testdata/config-diagnostics/unknown-root-provider/mod/main.tf rename to internal/configs/testdata/config-diagnostics/unknown-root-provider/mod/main.tf diff --git a/configs/testdata/config-diagnostics/unknown-root-provider/warnings b/internal/configs/testdata/config-diagnostics/unknown-root-provider/warnings similarity index 100% rename from configs/testdata/config-diagnostics/unknown-root-provider/warnings rename to internal/configs/testdata/config-diagnostics/unknown-root-provider/warnings diff --git a/configs/testdata/config-diagnostics/with-depends-on/main.tf b/internal/configs/testdata/config-diagnostics/with-depends-on/main.tf similarity index 100% rename from configs/testdata/config-diagnostics/with-depends-on/main.tf rename to internal/configs/testdata/config-diagnostics/with-depends-on/main.tf diff --git a/configs/testdata/config-diagnostics/with-depends-on/mod1/main.tf b/internal/configs/testdata/config-diagnostics/with-depends-on/mod1/main.tf similarity index 100% rename from configs/testdata/config-diagnostics/with-depends-on/mod1/main.tf rename to internal/configs/testdata/config-diagnostics/with-depends-on/mod1/main.tf diff --git a/configs/testdata/config-diagnostics/with-depends-on/mod1/mod2/main.tf b/internal/configs/testdata/config-diagnostics/with-depends-on/mod1/mod2/main.tf similarity index 100% rename from configs/testdata/config-diagnostics/with-depends-on/mod1/mod2/main.tf rename to internal/configs/testdata/config-diagnostics/with-depends-on/mod1/mod2/main.tf diff --git a/configs/testdata/config-diagnostics/with-depends-on/mod1/mod2/mod3/main.tf b/internal/configs/testdata/config-diagnostics/with-depends-on/mod1/mod2/mod3/main.tf similarity index 100% rename from configs/testdata/config-diagnostics/with-depends-on/mod1/mod2/mod3/main.tf rename to internal/configs/testdata/config-diagnostics/with-depends-on/mod1/mod2/mod3/main.tf diff --git a/configs/testdata/dir-empty/.gitkeep b/internal/configs/testdata/dir-empty/.gitkeep similarity index 100% rename from configs/testdata/dir-empty/.gitkeep rename to internal/configs/testdata/dir-empty/.gitkeep diff --git a/configs/testdata/error-files/destroy-provisioners.tf b/internal/configs/testdata/error-files/destroy-provisioners.tf similarity index 100% rename from configs/testdata/error-files/destroy-provisioners.tf rename to internal/configs/testdata/error-files/destroy-provisioners.tf diff --git a/configs/testdata/error-files/ignore_changes.tf b/internal/configs/testdata/error-files/ignore_changes.tf similarity index 100% rename from configs/testdata/error-files/ignore_changes.tf rename to internal/configs/testdata/error-files/ignore_changes.tf diff --git a/configs/testdata/error-files/invalid_language_edition.tf b/internal/configs/testdata/error-files/invalid_language_edition.tf similarity index 100% rename from configs/testdata/error-files/invalid_language_edition.tf rename to internal/configs/testdata/error-files/invalid_language_edition.tf diff --git a/configs/testdata/error-files/provider-source-prefix.tf b/internal/configs/testdata/error-files/provider-source-prefix.tf similarity index 100% rename from configs/testdata/error-files/provider-source-prefix.tf rename to internal/configs/testdata/error-files/provider-source-prefix.tf diff --git a/configs/testdata/error-files/required-providers-toplevel.tf b/internal/configs/testdata/error-files/required-providers-toplevel.tf similarity index 100% rename from configs/testdata/error-files/required-providers-toplevel.tf rename to internal/configs/testdata/error-files/required-providers-toplevel.tf diff --git a/configs/testdata/error-files/unsupported_language_edition.tf b/internal/configs/testdata/error-files/unsupported_language_edition.tf similarity index 100% rename from configs/testdata/error-files/unsupported_language_edition.tf rename to internal/configs/testdata/error-files/unsupported_language_edition.tf diff --git a/configs/testdata/error-files/variable_type_quoted.tf b/internal/configs/testdata/error-files/variable_type_quoted.tf similarity index 100% rename from configs/testdata/error-files/variable_type_quoted.tf rename to internal/configs/testdata/error-files/variable_type_quoted.tf diff --git a/configs/testdata/error-files/vendor_provisioners.tf b/internal/configs/testdata/error-files/vendor_provisioners.tf similarity index 100% rename from configs/testdata/error-files/vendor_provisioners.tf rename to internal/configs/testdata/error-files/vendor_provisioners.tf diff --git a/configs/testdata/escaping-blocks/data/data-escaping-block.tf b/internal/configs/testdata/escaping-blocks/data/data-escaping-block.tf similarity index 100% rename from configs/testdata/escaping-blocks/data/data-escaping-block.tf rename to internal/configs/testdata/escaping-blocks/data/data-escaping-block.tf diff --git a/configs/testdata/escaping-blocks/module/child/nothing.tf b/internal/configs/testdata/escaping-blocks/module/child/nothing.tf similarity index 100% rename from configs/testdata/escaping-blocks/module/child/nothing.tf rename to internal/configs/testdata/escaping-blocks/module/child/nothing.tf diff --git a/configs/testdata/escaping-blocks/module/module-escaping-block.tf b/internal/configs/testdata/escaping-blocks/module/module-escaping-block.tf similarity index 100% rename from configs/testdata/escaping-blocks/module/module-escaping-block.tf rename to internal/configs/testdata/escaping-blocks/module/module-escaping-block.tf diff --git a/configs/testdata/escaping-blocks/provider/provider-escaping-block.tf b/internal/configs/testdata/escaping-blocks/provider/provider-escaping-block.tf similarity index 100% rename from configs/testdata/escaping-blocks/provider/provider-escaping-block.tf rename to internal/configs/testdata/escaping-blocks/provider/provider-escaping-block.tf diff --git a/configs/testdata/escaping-blocks/resource/resource-escaping-block.tf b/internal/configs/testdata/escaping-blocks/resource/resource-escaping-block.tf similarity index 100% rename from configs/testdata/escaping-blocks/resource/resource-escaping-block.tf rename to internal/configs/testdata/escaping-blocks/resource/resource-escaping-block.tf diff --git a/configs/testdata/experiments/concluded/concluded_experiment.tf b/internal/configs/testdata/experiments/concluded/concluded_experiment.tf similarity index 100% rename from configs/testdata/experiments/concluded/concluded_experiment.tf rename to internal/configs/testdata/experiments/concluded/concluded_experiment.tf diff --git a/configs/testdata/experiments/current/current_experiment.tf b/internal/configs/testdata/experiments/current/current_experiment.tf similarity index 100% rename from configs/testdata/experiments/current/current_experiment.tf rename to internal/configs/testdata/experiments/current/current_experiment.tf diff --git a/configs/testdata/experiments/invalid/invalid_experiments.tf b/internal/configs/testdata/experiments/invalid/invalid_experiments.tf similarity index 100% rename from configs/testdata/experiments/invalid/invalid_experiments.tf rename to internal/configs/testdata/experiments/invalid/invalid_experiments.tf diff --git a/configs/testdata/experiments/unknown/unknown_experiment.tf b/internal/configs/testdata/experiments/unknown/unknown_experiment.tf similarity index 100% rename from configs/testdata/experiments/unknown/unknown_experiment.tf rename to internal/configs/testdata/experiments/unknown/unknown_experiment.tf diff --git a/configs/testdata/invalid-files/data-count-and-for_each.tf b/internal/configs/testdata/invalid-files/data-count-and-for_each.tf similarity index 100% rename from configs/testdata/invalid-files/data-count-and-for_each.tf rename to internal/configs/testdata/invalid-files/data-count-and-for_each.tf diff --git a/configs/testdata/invalid-files/data-invalid-provider-reference.tf b/internal/configs/testdata/invalid-files/data-invalid-provider-reference.tf similarity index 100% rename from configs/testdata/invalid-files/data-invalid-provider-reference.tf rename to internal/configs/testdata/invalid-files/data-invalid-provider-reference.tf diff --git a/configs/testdata/invalid-files/data-reserved-lifecycle.tf b/internal/configs/testdata/invalid-files/data-reserved-lifecycle.tf similarity index 100% rename from configs/testdata/invalid-files/data-reserved-lifecycle.tf rename to internal/configs/testdata/invalid-files/data-reserved-lifecycle.tf diff --git a/configs/testdata/invalid-files/data-reserved-locals.tf b/internal/configs/testdata/invalid-files/data-reserved-locals.tf similarity index 100% rename from configs/testdata/invalid-files/data-reserved-locals.tf rename to internal/configs/testdata/invalid-files/data-reserved-locals.tf diff --git a/configs/testdata/invalid-files/data-resource-lifecycle.tf b/internal/configs/testdata/invalid-files/data-resource-lifecycle.tf similarity index 100% rename from configs/testdata/invalid-files/data-resource-lifecycle.tf rename to internal/configs/testdata/invalid-files/data-resource-lifecycle.tf diff --git a/configs/testdata/invalid-files/interp-in-data-label.tf b/internal/configs/testdata/invalid-files/interp-in-data-label.tf similarity index 100% rename from configs/testdata/invalid-files/interp-in-data-label.tf rename to internal/configs/testdata/invalid-files/interp-in-data-label.tf diff --git a/configs/testdata/invalid-files/interp-in-rsrc-label.tf b/internal/configs/testdata/invalid-files/interp-in-rsrc-label.tf similarity index 100% rename from configs/testdata/invalid-files/interp-in-rsrc-label.tf rename to internal/configs/testdata/invalid-files/interp-in-rsrc-label.tf diff --git a/configs/testdata/invalid-files/json-as-native-syntax.tf b/internal/configs/testdata/invalid-files/json-as-native-syntax.tf similarity index 100% rename from configs/testdata/invalid-files/json-as-native-syntax.tf rename to internal/configs/testdata/invalid-files/json-as-native-syntax.tf diff --git a/configs/testdata/invalid-files/module-calls.tf b/internal/configs/testdata/invalid-files/module-calls.tf similarity index 100% rename from configs/testdata/invalid-files/module-calls.tf rename to internal/configs/testdata/invalid-files/module-calls.tf diff --git a/configs/testdata/invalid-files/native-syntax-as-json.tf.json b/internal/configs/testdata/invalid-files/native-syntax-as-json.tf.json similarity index 100% rename from configs/testdata/invalid-files/native-syntax-as-json.tf.json rename to internal/configs/testdata/invalid-files/native-syntax-as-json.tf.json diff --git a/configs/testdata/invalid-files/provider-localname-normalization.tf b/internal/configs/testdata/invalid-files/provider-localname-normalization.tf similarity index 100% rename from configs/testdata/invalid-files/provider-localname-normalization.tf rename to internal/configs/testdata/invalid-files/provider-localname-normalization.tf diff --git a/configs/testdata/invalid-files/provider-reserved.tf b/internal/configs/testdata/invalid-files/provider-reserved.tf similarity index 100% rename from configs/testdata/invalid-files/provider-reserved.tf rename to internal/configs/testdata/invalid-files/provider-reserved.tf diff --git a/configs/testdata/invalid-files/provider-syntax.tf b/internal/configs/testdata/invalid-files/provider-syntax.tf similarity index 100% rename from configs/testdata/invalid-files/provider-syntax.tf rename to internal/configs/testdata/invalid-files/provider-syntax.tf diff --git a/configs/testdata/invalid-files/resource-count-and-for_each.tf b/internal/configs/testdata/invalid-files/resource-count-and-for_each.tf similarity index 100% rename from configs/testdata/invalid-files/resource-count-and-for_each.tf rename to internal/configs/testdata/invalid-files/resource-count-and-for_each.tf diff --git a/configs/testdata/invalid-files/resource-invalid-provider-reference.tf b/internal/configs/testdata/invalid-files/resource-invalid-provider-reference.tf similarity index 100% rename from configs/testdata/invalid-files/resource-invalid-provider-reference.tf rename to internal/configs/testdata/invalid-files/resource-invalid-provider-reference.tf diff --git a/configs/testdata/invalid-files/resource-lifecycle-badbool.tf b/internal/configs/testdata/invalid-files/resource-lifecycle-badbool.tf similarity index 100% rename from configs/testdata/invalid-files/resource-lifecycle-badbool.tf rename to internal/configs/testdata/invalid-files/resource-lifecycle-badbool.tf diff --git a/configs/testdata/invalid-files/resource-name-invalid.tf b/internal/configs/testdata/invalid-files/resource-name-invalid.tf similarity index 100% rename from configs/testdata/invalid-files/resource-name-invalid.tf rename to internal/configs/testdata/invalid-files/resource-name-invalid.tf diff --git a/configs/testdata/invalid-files/resource-reserved-locals.tf b/internal/configs/testdata/invalid-files/resource-reserved-locals.tf similarity index 100% rename from configs/testdata/invalid-files/resource-reserved-locals.tf rename to internal/configs/testdata/invalid-files/resource-reserved-locals.tf diff --git a/configs/testdata/invalid-files/resources-ignorechanges-all-legacymix.tf b/internal/configs/testdata/invalid-files/resources-ignorechanges-all-legacymix.tf similarity index 100% rename from configs/testdata/invalid-files/resources-ignorechanges-all-legacymix.tf rename to internal/configs/testdata/invalid-files/resources-ignorechanges-all-legacymix.tf diff --git a/configs/testdata/invalid-files/unexpected-attr.tf b/internal/configs/testdata/invalid-files/unexpected-attr.tf similarity index 100% rename from configs/testdata/invalid-files/unexpected-attr.tf rename to internal/configs/testdata/invalid-files/unexpected-attr.tf diff --git a/configs/testdata/invalid-files/unexpected-block.tf b/internal/configs/testdata/invalid-files/unexpected-block.tf similarity index 100% rename from configs/testdata/invalid-files/unexpected-block.tf rename to internal/configs/testdata/invalid-files/unexpected-block.tf diff --git a/configs/testdata/invalid-files/variable-bad-default.tf b/internal/configs/testdata/invalid-files/variable-bad-default.tf similarity index 100% rename from configs/testdata/invalid-files/variable-bad-default.tf rename to internal/configs/testdata/invalid-files/variable-bad-default.tf diff --git a/configs/testdata/invalid-files/variable-bad-sensitive.tf b/internal/configs/testdata/invalid-files/variable-bad-sensitive.tf similarity index 100% rename from configs/testdata/invalid-files/variable-bad-sensitive.tf rename to internal/configs/testdata/invalid-files/variable-bad-sensitive.tf diff --git a/configs/testdata/invalid-files/variable-type-unknown.tf b/internal/configs/testdata/invalid-files/variable-type-unknown.tf similarity index 100% rename from configs/testdata/invalid-files/variable-type-unknown.tf rename to internal/configs/testdata/invalid-files/variable-type-unknown.tf diff --git a/configs/testdata/invalid-files/variable-validation-bad-msg.tf b/internal/configs/testdata/invalid-files/variable-validation-bad-msg.tf similarity index 100% rename from configs/testdata/invalid-files/variable-validation-bad-msg.tf rename to internal/configs/testdata/invalid-files/variable-validation-bad-msg.tf diff --git a/configs/testdata/invalid-files/variable-validation-condition-badref.tf b/internal/configs/testdata/invalid-files/variable-validation-condition-badref.tf similarity index 100% rename from configs/testdata/invalid-files/variable-validation-condition-badref.tf rename to internal/configs/testdata/invalid-files/variable-validation-condition-badref.tf diff --git a/configs/testdata/invalid-files/variable-validation-condition-noref.tf b/internal/configs/testdata/invalid-files/variable-validation-condition-noref.tf similarity index 100% rename from configs/testdata/invalid-files/variable-validation-condition-noref.tf rename to internal/configs/testdata/invalid-files/variable-validation-condition-noref.tf diff --git a/configs/testdata/invalid-files/version-variable.tf b/internal/configs/testdata/invalid-files/version-variable.tf similarity index 100% rename from configs/testdata/invalid-files/version-variable.tf rename to internal/configs/testdata/invalid-files/version-variable.tf diff --git a/configs/testdata/invalid-files/zerolen.tf.json b/internal/configs/testdata/invalid-files/zerolen.tf.json similarity index 100% rename from configs/testdata/invalid-files/zerolen.tf.json rename to internal/configs/testdata/invalid-files/zerolen.tf.json diff --git a/configs/testdata/invalid-modules/multiple-required-providers/a.tf b/internal/configs/testdata/invalid-modules/multiple-required-providers/a.tf similarity index 100% rename from configs/testdata/invalid-modules/multiple-required-providers/a.tf rename to internal/configs/testdata/invalid-modules/multiple-required-providers/a.tf diff --git a/configs/testdata/invalid-modules/multiple-required-providers/b.tf b/internal/configs/testdata/invalid-modules/multiple-required-providers/b.tf similarity index 100% rename from configs/testdata/invalid-modules/multiple-required-providers/b.tf rename to internal/configs/testdata/invalid-modules/multiple-required-providers/b.tf diff --git a/configs/testdata/invalid-modules/object-optional-attrs-experiment/object-optional-attrs-experiment.tf b/internal/configs/testdata/invalid-modules/object-optional-attrs-experiment/object-optional-attrs-experiment.tf similarity index 100% rename from configs/testdata/invalid-modules/object-optional-attrs-experiment/object-optional-attrs-experiment.tf rename to internal/configs/testdata/invalid-modules/object-optional-attrs-experiment/object-optional-attrs-experiment.tf diff --git a/configs/testdata/invalid-modules/override-nonexist-variable/override.tf b/internal/configs/testdata/invalid-modules/override-nonexist-variable/override.tf similarity index 100% rename from configs/testdata/invalid-modules/override-nonexist-variable/override.tf rename to internal/configs/testdata/invalid-modules/override-nonexist-variable/override.tf diff --git a/configs/testdata/invalid-modules/override-variable-causes-bad-default/base.tf b/internal/configs/testdata/invalid-modules/override-variable-causes-bad-default/base.tf similarity index 100% rename from configs/testdata/invalid-modules/override-variable-causes-bad-default/base.tf rename to internal/configs/testdata/invalid-modules/override-variable-causes-bad-default/base.tf diff --git a/configs/testdata/invalid-modules/override-variable-causes-bad-default/override.tf b/internal/configs/testdata/invalid-modules/override-variable-causes-bad-default/override.tf similarity index 100% rename from configs/testdata/invalid-modules/override-variable-causes-bad-default/override.tf rename to internal/configs/testdata/invalid-modules/override-variable-causes-bad-default/override.tf diff --git a/configs/testdata/invalid-modules/provider-meta/invalid-interpolation.tf b/internal/configs/testdata/invalid-modules/provider-meta/invalid-interpolation.tf similarity index 100% rename from configs/testdata/invalid-modules/provider-meta/invalid-interpolation.tf rename to internal/configs/testdata/invalid-modules/provider-meta/invalid-interpolation.tf diff --git a/configs/testdata/nested-backend-warning/child/child.tf b/internal/configs/testdata/nested-backend-warning/child/child.tf similarity index 100% rename from configs/testdata/nested-backend-warning/child/child.tf rename to internal/configs/testdata/nested-backend-warning/child/child.tf diff --git a/configs/testdata/nested-backend-warning/root.tf b/internal/configs/testdata/nested-backend-warning/root.tf similarity index 100% rename from configs/testdata/nested-backend-warning/root.tf rename to internal/configs/testdata/nested-backend-warning/root.tf diff --git a/configs/testdata/nested-errors/child_a/child_a.tf b/internal/configs/testdata/nested-errors/child_a/child_a.tf similarity index 100% rename from configs/testdata/nested-errors/child_a/child_a.tf rename to internal/configs/testdata/nested-errors/child_a/child_a.tf diff --git a/configs/testdata/nested-errors/child_c/child_c.tf b/internal/configs/testdata/nested-errors/child_c/child_c.tf similarity index 100% rename from configs/testdata/nested-errors/child_c/child_c.tf rename to internal/configs/testdata/nested-errors/child_c/child_c.tf diff --git a/configs/testdata/nested-errors/root.tf b/internal/configs/testdata/nested-errors/root.tf similarity index 100% rename from configs/testdata/nested-errors/root.tf rename to internal/configs/testdata/nested-errors/root.tf diff --git a/configs/testdata/provider-reqs/child/grandchild/provider-reqs-grandchild.tf b/internal/configs/testdata/provider-reqs/child/grandchild/provider-reqs-grandchild.tf similarity index 100% rename from configs/testdata/provider-reqs/child/grandchild/provider-reqs-grandchild.tf rename to internal/configs/testdata/provider-reqs/child/grandchild/provider-reqs-grandchild.tf diff --git a/configs/testdata/provider-reqs/child/provider-reqs-child.tf b/internal/configs/testdata/provider-reqs/child/provider-reqs-child.tf similarity index 100% rename from configs/testdata/provider-reqs/child/provider-reqs-child.tf rename to internal/configs/testdata/provider-reqs/child/provider-reqs-child.tf diff --git a/configs/testdata/provider-reqs/provider-reqs-root.tf b/internal/configs/testdata/provider-reqs/provider-reqs-root.tf similarity index 100% rename from configs/testdata/provider-reqs/provider-reqs-root.tf rename to internal/configs/testdata/provider-reqs/provider-reqs-root.tf diff --git a/configs/testdata/providers-explicit-fqn/root.tf b/internal/configs/testdata/providers-explicit-fqn/root.tf similarity index 100% rename from configs/testdata/providers-explicit-fqn/root.tf rename to internal/configs/testdata/providers-explicit-fqn/root.tf diff --git a/configs/testdata/valid-files/backend.tf b/internal/configs/testdata/valid-files/backend.tf similarity index 100% rename from configs/testdata/valid-files/backend.tf rename to internal/configs/testdata/valid-files/backend.tf diff --git a/configs/testdata/valid-files/data-sources.tf b/internal/configs/testdata/valid-files/data-sources.tf similarity index 100% rename from configs/testdata/valid-files/data-sources.tf rename to internal/configs/testdata/valid-files/data-sources.tf diff --git a/configs/testdata/valid-files/empty.tf b/internal/configs/testdata/valid-files/empty.tf similarity index 100% rename from configs/testdata/valid-files/empty.tf rename to internal/configs/testdata/valid-files/empty.tf diff --git a/configs/testdata/valid-files/empty.tf.json b/internal/configs/testdata/valid-files/empty.tf.json similarity index 100% rename from configs/testdata/valid-files/empty.tf.json rename to internal/configs/testdata/valid-files/empty.tf.json diff --git a/configs/testdata/valid-files/locals.tf b/internal/configs/testdata/valid-files/locals.tf similarity index 100% rename from configs/testdata/valid-files/locals.tf rename to internal/configs/testdata/valid-files/locals.tf diff --git a/configs/testdata/valid-files/locals.tf.json b/internal/configs/testdata/valid-files/locals.tf.json similarity index 100% rename from configs/testdata/valid-files/locals.tf.json rename to internal/configs/testdata/valid-files/locals.tf.json diff --git a/configs/testdata/valid-files/outputs.tf b/internal/configs/testdata/valid-files/outputs.tf similarity index 100% rename from configs/testdata/valid-files/outputs.tf rename to internal/configs/testdata/valid-files/outputs.tf diff --git a/configs/testdata/valid-files/provider-configs.tf b/internal/configs/testdata/valid-files/provider-configs.tf similarity index 100% rename from configs/testdata/valid-files/provider-configs.tf rename to internal/configs/testdata/valid-files/provider-configs.tf diff --git a/configs/testdata/valid-files/providers-explicit-implied.tf b/internal/configs/testdata/valid-files/providers-explicit-implied.tf similarity index 100% rename from configs/testdata/valid-files/providers-explicit-implied.tf rename to internal/configs/testdata/valid-files/providers-explicit-implied.tf diff --git a/configs/testdata/valid-files/references.tf.json b/internal/configs/testdata/valid-files/references.tf.json similarity index 100% rename from configs/testdata/valid-files/references.tf.json rename to internal/configs/testdata/valid-files/references.tf.json diff --git a/configs/testdata/valid-files/required-providers.tf b/internal/configs/testdata/valid-files/required-providers.tf similarity index 100% rename from configs/testdata/valid-files/required-providers.tf rename to internal/configs/testdata/valid-files/required-providers.tf diff --git a/configs/testdata/valid-files/required-version.tf b/internal/configs/testdata/valid-files/required-version.tf similarity index 100% rename from configs/testdata/valid-files/required-version.tf rename to internal/configs/testdata/valid-files/required-version.tf diff --git a/configs/testdata/valid-files/resources-ignorechanges-all.tf b/internal/configs/testdata/valid-files/resources-ignorechanges-all.tf similarity index 100% rename from configs/testdata/valid-files/resources-ignorechanges-all.tf rename to internal/configs/testdata/valid-files/resources-ignorechanges-all.tf diff --git a/configs/testdata/valid-files/resources-ignorechanges-all.tf.json b/internal/configs/testdata/valid-files/resources-ignorechanges-all.tf.json similarity index 100% rename from configs/testdata/valid-files/resources-ignorechanges-all.tf.json rename to internal/configs/testdata/valid-files/resources-ignorechanges-all.tf.json diff --git a/configs/testdata/valid-files/resources.tf b/internal/configs/testdata/valid-files/resources.tf similarity index 100% rename from configs/testdata/valid-files/resources.tf rename to internal/configs/testdata/valid-files/resources.tf diff --git a/configs/testdata/valid-files/valid-language-edition.tf b/internal/configs/testdata/valid-files/valid-language-edition.tf similarity index 100% rename from configs/testdata/valid-files/valid-language-edition.tf rename to internal/configs/testdata/valid-files/valid-language-edition.tf diff --git a/configs/testdata/valid-files/variable_validation.tf b/internal/configs/testdata/valid-files/variable_validation.tf similarity index 100% rename from configs/testdata/valid-files/variable_validation.tf rename to internal/configs/testdata/valid-files/variable_validation.tf diff --git a/configs/testdata/valid-files/variables.tf b/internal/configs/testdata/valid-files/variables.tf similarity index 100% rename from configs/testdata/valid-files/variables.tf rename to internal/configs/testdata/valid-files/variables.tf diff --git a/configs/testdata/valid-files/variables.tf.json b/internal/configs/testdata/valid-files/variables.tf.json similarity index 100% rename from configs/testdata/valid-files/variables.tf.json rename to internal/configs/testdata/valid-files/variables.tf.json diff --git a/configs/testdata/valid-modules/empty/README b/internal/configs/testdata/valid-modules/empty/README similarity index 100% rename from configs/testdata/valid-modules/empty/README rename to internal/configs/testdata/valid-modules/empty/README diff --git a/configs/testdata/valid-modules/implied-providers/providers.tf b/internal/configs/testdata/valid-modules/implied-providers/providers.tf similarity index 100% rename from configs/testdata/valid-modules/implied-providers/providers.tf rename to internal/configs/testdata/valid-modules/implied-providers/providers.tf diff --git a/configs/testdata/valid-modules/implied-providers/resources.tf b/internal/configs/testdata/valid-modules/implied-providers/resources.tf similarity index 100% rename from configs/testdata/valid-modules/implied-providers/resources.tf rename to internal/configs/testdata/valid-modules/implied-providers/resources.tf diff --git a/configs/testdata/valid-modules/nested-providers-fqns/child/main.tf b/internal/configs/testdata/valid-modules/nested-providers-fqns/child/main.tf similarity index 100% rename from configs/testdata/valid-modules/nested-providers-fqns/child/main.tf rename to internal/configs/testdata/valid-modules/nested-providers-fqns/child/main.tf diff --git a/configs/testdata/valid-modules/nested-providers-fqns/main.tf b/internal/configs/testdata/valid-modules/nested-providers-fqns/main.tf similarity index 100% rename from configs/testdata/valid-modules/nested-providers-fqns/main.tf rename to internal/configs/testdata/valid-modules/nested-providers-fqns/main.tf diff --git a/configs/testdata/valid-modules/override-dynamic-block-base/a_override.tf b/internal/configs/testdata/valid-modules/override-dynamic-block-base/a_override.tf similarity index 100% rename from configs/testdata/valid-modules/override-dynamic-block-base/a_override.tf rename to internal/configs/testdata/valid-modules/override-dynamic-block-base/a_override.tf diff --git a/configs/testdata/valid-modules/override-dynamic-block-base/base.tf b/internal/configs/testdata/valid-modules/override-dynamic-block-base/base.tf similarity index 100% rename from configs/testdata/valid-modules/override-dynamic-block-base/base.tf rename to internal/configs/testdata/valid-modules/override-dynamic-block-base/base.tf diff --git a/configs/testdata/valid-modules/override-dynamic-block-override/a_override.tf b/internal/configs/testdata/valid-modules/override-dynamic-block-override/a_override.tf similarity index 100% rename from configs/testdata/valid-modules/override-dynamic-block-override/a_override.tf rename to internal/configs/testdata/valid-modules/override-dynamic-block-override/a_override.tf diff --git a/configs/testdata/valid-modules/override-dynamic-block-override/base.tf b/internal/configs/testdata/valid-modules/override-dynamic-block-override/base.tf similarity index 100% rename from configs/testdata/valid-modules/override-dynamic-block-override/base.tf rename to internal/configs/testdata/valid-modules/override-dynamic-block-override/base.tf diff --git a/configs/testdata/valid-modules/override-module/a_override.tf b/internal/configs/testdata/valid-modules/override-module/a_override.tf similarity index 100% rename from configs/testdata/valid-modules/override-module/a_override.tf rename to internal/configs/testdata/valid-modules/override-module/a_override.tf diff --git a/configs/testdata/valid-modules/override-module/b_override.tf b/internal/configs/testdata/valid-modules/override-module/b_override.tf similarity index 100% rename from configs/testdata/valid-modules/override-module/b_override.tf rename to internal/configs/testdata/valid-modules/override-module/b_override.tf diff --git a/configs/testdata/valid-modules/override-module/primary.tf b/internal/configs/testdata/valid-modules/override-module/primary.tf similarity index 100% rename from configs/testdata/valid-modules/override-module/primary.tf rename to internal/configs/testdata/valid-modules/override-module/primary.tf diff --git a/configs/testdata/valid-modules/override-output-sensitive/override.tf b/internal/configs/testdata/valid-modules/override-output-sensitive/override.tf similarity index 100% rename from configs/testdata/valid-modules/override-output-sensitive/override.tf rename to internal/configs/testdata/valid-modules/override-output-sensitive/override.tf diff --git a/configs/testdata/valid-modules/override-output-sensitive/primary.tf b/internal/configs/testdata/valid-modules/override-output-sensitive/primary.tf similarity index 100% rename from configs/testdata/valid-modules/override-output-sensitive/primary.tf rename to internal/configs/testdata/valid-modules/override-output-sensitive/primary.tf diff --git a/configs/testdata/valid-modules/override-resource-provider/a_override.tf b/internal/configs/testdata/valid-modules/override-resource-provider/a_override.tf similarity index 100% rename from configs/testdata/valid-modules/override-resource-provider/a_override.tf rename to internal/configs/testdata/valid-modules/override-resource-provider/a_override.tf diff --git a/configs/testdata/valid-modules/override-resource-provider/base.tf b/internal/configs/testdata/valid-modules/override-resource-provider/base.tf similarity index 100% rename from configs/testdata/valid-modules/override-resource-provider/base.tf rename to internal/configs/testdata/valid-modules/override-resource-provider/base.tf diff --git a/configs/testdata/valid-modules/override-variable-sensitive/a_override.tf b/internal/configs/testdata/valid-modules/override-variable-sensitive/a_override.tf similarity index 100% rename from configs/testdata/valid-modules/override-variable-sensitive/a_override.tf rename to internal/configs/testdata/valid-modules/override-variable-sensitive/a_override.tf diff --git a/configs/testdata/valid-modules/override-variable-sensitive/b_override.tf b/internal/configs/testdata/valid-modules/override-variable-sensitive/b_override.tf similarity index 100% rename from configs/testdata/valid-modules/override-variable-sensitive/b_override.tf rename to internal/configs/testdata/valid-modules/override-variable-sensitive/b_override.tf diff --git a/configs/testdata/valid-modules/override-variable-sensitive/primary.tf b/internal/configs/testdata/valid-modules/override-variable-sensitive/primary.tf similarity index 100% rename from configs/testdata/valid-modules/override-variable-sensitive/primary.tf rename to internal/configs/testdata/valid-modules/override-variable-sensitive/primary.tf diff --git a/configs/testdata/valid-modules/override-variable/a_override.tf b/internal/configs/testdata/valid-modules/override-variable/a_override.tf similarity index 100% rename from configs/testdata/valid-modules/override-variable/a_override.tf rename to internal/configs/testdata/valid-modules/override-variable/a_override.tf diff --git a/configs/testdata/valid-modules/override-variable/b_override.tf b/internal/configs/testdata/valid-modules/override-variable/b_override.tf similarity index 100% rename from configs/testdata/valid-modules/override-variable/b_override.tf rename to internal/configs/testdata/valid-modules/override-variable/b_override.tf diff --git a/configs/testdata/valid-modules/override-variable/primary.tf b/internal/configs/testdata/valid-modules/override-variable/primary.tf similarity index 100% rename from configs/testdata/valid-modules/override-variable/primary.tf rename to internal/configs/testdata/valid-modules/override-variable/primary.tf diff --git a/configs/testdata/valid-modules/provider-aliases/main.tf b/internal/configs/testdata/valid-modules/provider-aliases/main.tf similarity index 100% rename from configs/testdata/valid-modules/provider-aliases/main.tf rename to internal/configs/testdata/valid-modules/provider-aliases/main.tf diff --git a/configs/testdata/valid-modules/provider-meta/main.tf b/internal/configs/testdata/valid-modules/provider-meta/main.tf similarity index 100% rename from configs/testdata/valid-modules/provider-meta/main.tf rename to internal/configs/testdata/valid-modules/provider-meta/main.tf diff --git a/configs/testdata/valid-modules/providers-fqns/main.tf b/internal/configs/testdata/valid-modules/providers-fqns/main.tf similarity index 100% rename from configs/testdata/valid-modules/providers-fqns/main.tf rename to internal/configs/testdata/valid-modules/providers-fqns/main.tf diff --git a/configs/testdata/valid-modules/required-providers-after-resource/main.tf b/internal/configs/testdata/valid-modules/required-providers-after-resource/main.tf similarity index 100% rename from configs/testdata/valid-modules/required-providers-after-resource/main.tf rename to internal/configs/testdata/valid-modules/required-providers-after-resource/main.tf diff --git a/configs/testdata/valid-modules/required-providers-after-resource/providers.tf b/internal/configs/testdata/valid-modules/required-providers-after-resource/providers.tf similarity index 100% rename from configs/testdata/valid-modules/required-providers-after-resource/providers.tf rename to internal/configs/testdata/valid-modules/required-providers-after-resource/providers.tf diff --git a/configs/testdata/valid-modules/required-providers-overrides/bar_provider_override.tf b/internal/configs/testdata/valid-modules/required-providers-overrides/bar_provider_override.tf similarity index 100% rename from configs/testdata/valid-modules/required-providers-overrides/bar_provider_override.tf rename to internal/configs/testdata/valid-modules/required-providers-overrides/bar_provider_override.tf diff --git a/configs/testdata/valid-modules/required-providers-overrides/main.tf b/internal/configs/testdata/valid-modules/required-providers-overrides/main.tf similarity index 100% rename from configs/testdata/valid-modules/required-providers-overrides/main.tf rename to internal/configs/testdata/valid-modules/required-providers-overrides/main.tf diff --git a/configs/testdata/valid-modules/required-providers-overrides/providers.tf b/internal/configs/testdata/valid-modules/required-providers-overrides/providers.tf similarity index 100% rename from configs/testdata/valid-modules/required-providers-overrides/providers.tf rename to internal/configs/testdata/valid-modules/required-providers-overrides/providers.tf diff --git a/configs/testdata/warning-files/depends_on.tf b/internal/configs/testdata/warning-files/depends_on.tf similarity index 100% rename from configs/testdata/warning-files/depends_on.tf rename to internal/configs/testdata/warning-files/depends_on.tf diff --git a/configs/testdata/warning-files/object-optional-attrs-experiment.tf b/internal/configs/testdata/warning-files/object-optional-attrs-experiment.tf similarity index 100% rename from configs/testdata/warning-files/object-optional-attrs-experiment.tf rename to internal/configs/testdata/warning-files/object-optional-attrs-experiment.tf diff --git a/configs/testdata/warning-files/provider_ref.tf b/internal/configs/testdata/warning-files/provider_ref.tf similarity index 100% rename from configs/testdata/warning-files/provider_ref.tf rename to internal/configs/testdata/warning-files/provider_ref.tf diff --git a/configs/testdata/warning-files/provisioner_keyword.tf b/internal/configs/testdata/warning-files/provisioner_keyword.tf similarity index 100% rename from configs/testdata/warning-files/provisioner_keyword.tf rename to internal/configs/testdata/warning-files/provisioner_keyword.tf diff --git a/configs/util.go b/internal/configs/util.go similarity index 100% rename from configs/util.go rename to internal/configs/util.go diff --git a/configs/variable_type_hint.go b/internal/configs/variable_type_hint.go similarity index 100% rename from configs/variable_type_hint.go rename to internal/configs/variable_type_hint.go diff --git a/configs/variabletypehint_string.go b/internal/configs/variabletypehint_string.go similarity index 100% rename from configs/variabletypehint_string.go rename to internal/configs/variabletypehint_string.go diff --git a/configs/version_constraint.go b/internal/configs/version_constraint.go similarity index 100% rename from configs/version_constraint.go rename to internal/configs/version_constraint.go diff --git a/internal/grpcwrap/provisioner.go b/internal/grpcwrap/provisioner.go index 0282f9da4f..c56120ec49 100644 --- a/internal/grpcwrap/provisioner.go +++ b/internal/grpcwrap/provisioner.go @@ -6,8 +6,8 @@ import ( "strings" "unicode/utf8" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/communicator/shared" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfplugin5" "github.com/hashicorp/terraform/plugin/convert" diff --git a/internal/initwd/from_module_test.go b/internal/initwd/from_module_test.go index 6c8452b042..186d981a20 100644 --- a/internal/initwd/from_module_test.go +++ b/internal/initwd/from_module_test.go @@ -9,8 +9,8 @@ import ( "testing" version "github.com/hashicorp/go-version" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configload" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configload" "github.com/hashicorp/terraform/internal/copy" "github.com/hashicorp/terraform/internal/registry" "github.com/hashicorp/terraform/internal/tfdiags" diff --git a/internal/initwd/module_install_test.go b/internal/initwd/module_install_test.go index 7dd345e3d0..cab2a7007e 100644 --- a/internal/initwd/module_install_test.go +++ b/internal/initwd/module_install_test.go @@ -11,8 +11,8 @@ import ( "github.com/go-test/deep" version "github.com/hashicorp/go-version" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configload" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configload" "github.com/hashicorp/terraform/internal/copy" "github.com/hashicorp/terraform/internal/registry" "github.com/hashicorp/terraform/internal/tfdiags" diff --git a/internal/initwd/testing.go b/internal/initwd/testing.go index 37b0725947..320540daab 100644 --- a/internal/initwd/testing.go +++ b/internal/initwd/testing.go @@ -3,8 +3,8 @@ package initwd import ( "testing" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configload" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configload" "github.com/hashicorp/terraform/internal/registry" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/internal/legacy/helper/schema/backend.go b/internal/legacy/helper/schema/backend.go index 661e67e239..7bd9426abe 100644 --- a/internal/legacy/helper/schema/backend.go +++ b/internal/legacy/helper/schema/backend.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform/internal/tfdiags" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" "github.com/hashicorp/terraform/internal/legacy/terraform" ctyconvert "github.com/zclconf/go-cty/cty/convert" ) diff --git a/internal/legacy/helper/schema/core_schema.go b/internal/legacy/helper/schema/core_schema.go index 6a53db1a71..da9c502da0 100644 --- a/internal/legacy/helper/schema/core_schema.go +++ b/internal/legacy/helper/schema/core_schema.go @@ -3,7 +3,7 @@ package schema import ( "fmt" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/legacy/helper/schema/core_schema_test.go b/internal/legacy/helper/schema/core_schema_test.go index 7d4b32e019..84649c8bec 100644 --- a/internal/legacy/helper/schema/core_schema_test.go +++ b/internal/legacy/helper/schema/core_schema_test.go @@ -7,7 +7,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" ) // add the implicit "id" attribute for test resources diff --git a/internal/legacy/helper/schema/field_reader_config_test.go b/internal/legacy/helper/schema/field_reader_config_test.go index 53b8e90776..7a22f3ce16 100644 --- a/internal/legacy/helper/schema/field_reader_config_test.go +++ b/internal/legacy/helper/schema/field_reader_config_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" "github.com/hashicorp/terraform/internal/legacy/helper/hashcode" "github.com/hashicorp/terraform/internal/legacy/terraform" ) diff --git a/internal/legacy/helper/schema/provider.go b/internal/legacy/helper/schema/provider.go index 24736566dd..c64c2e3827 100644 --- a/internal/legacy/helper/schema/provider.go +++ b/internal/legacy/helper/schema/provider.go @@ -8,7 +8,7 @@ import ( "sync" multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/legacy/terraform" ) diff --git a/internal/legacy/helper/schema/provider_test.go b/internal/legacy/helper/schema/provider_test.go index 3f3eff4e27..1b176bc0d2 100644 --- a/internal/legacy/helper/schema/provider_test.go +++ b/internal/legacy/helper/schema/provider_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/legacy/terraform" ) diff --git a/internal/legacy/helper/schema/provisioner.go b/internal/legacy/helper/schema/provisioner.go index d0ee581be4..5c2cce2b0b 100644 --- a/internal/legacy/helper/schema/provisioner.go +++ b/internal/legacy/helper/schema/provisioner.go @@ -7,7 +7,7 @@ import ( "sync" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/legacy/terraform" ) diff --git a/internal/legacy/helper/schema/resource_diff_test.go b/internal/legacy/helper/schema/resource_diff_test.go index 7cb9d5188f..9737177147 100644 --- a/internal/legacy/helper/schema/resource_diff_test.go +++ b/internal/legacy/helper/schema/resource_diff_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" "github.com/hashicorp/terraform/internal/legacy/terraform" ) diff --git a/internal/legacy/helper/schema/resource_test.go b/internal/legacy/helper/schema/resource_test.go index 954b1a7050..47f508d81b 100644 --- a/internal/legacy/helper/schema/resource_test.go +++ b/internal/legacy/helper/schema/resource_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" "github.com/hashicorp/terraform/internal/legacy/terraform" "github.com/zclconf/go-cty/cty" diff --git a/internal/legacy/helper/schema/resource_timeout.go b/internal/legacy/helper/schema/resource_timeout.go index cf9654bcbb..e58b1dea93 100644 --- a/internal/legacy/helper/schema/resource_timeout.go +++ b/internal/legacy/helper/schema/resource_timeout.go @@ -5,7 +5,7 @@ import ( "log" "time" - "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" "github.com/hashicorp/terraform/internal/legacy/terraform" "github.com/mitchellh/copystructure" ) diff --git a/internal/legacy/helper/schema/schema.go b/internal/legacy/helper/schema/schema.go index 488fcaaaf0..99657c4660 100644 --- a/internal/legacy/helper/schema/schema.go +++ b/internal/legacy/helper/schema/schema.go @@ -22,7 +22,7 @@ import ( "strings" "sync" - "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" "github.com/hashicorp/terraform/internal/legacy/terraform" "github.com/mitchellh/copystructure" "github.com/mitchellh/mapstructure" diff --git a/internal/legacy/helper/schema/schema_test.go b/internal/legacy/helper/schema/schema_test.go index 2a9da0f686..dcc2008e72 100644 --- a/internal/legacy/helper/schema/schema_test.go +++ b/internal/legacy/helper/schema/schema_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" "github.com/hashicorp/terraform/internal/legacy/helper/hashcode" "github.com/hashicorp/terraform/internal/legacy/terraform" ) diff --git a/internal/legacy/helper/schema/shims.go b/internal/legacy/helper/schema/shims.go index b8cbf6b22c..3f9e2e9ffb 100644 --- a/internal/legacy/helper/schema/shims.go +++ b/internal/legacy/helper/schema/shims.go @@ -6,8 +6,8 @@ import ( "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" - "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" "github.com/hashicorp/terraform/internal/legacy/terraform" ) diff --git a/internal/legacy/helper/schema/shims_test.go b/internal/legacy/helper/schema/shims_test.go index 495dda2613..91e24069dd 100644 --- a/internal/legacy/helper/schema/shims_test.go +++ b/internal/legacy/helper/schema/shims_test.go @@ -11,8 +11,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" "github.com/hashicorp/terraform/internal/legacy/helper/hashcode" "github.com/hashicorp/terraform/internal/legacy/terraform" "github.com/hashicorp/terraform/internal/providers" diff --git a/internal/legacy/terraform/diff.go b/internal/legacy/terraform/diff.go index 66e33e7fff..77bea32589 100644 --- a/internal/legacy/terraform/diff.go +++ b/internal/legacy/terraform/diff.go @@ -12,9 +12,9 @@ import ( "strings" "sync" - "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" "github.com/zclconf/go-cty/cty" "github.com/mitchellh/copystructure" diff --git a/internal/legacy/terraform/provider_mock.go b/internal/legacy/terraform/provider_mock.go index 9536d5e490..abdba43246 100644 --- a/internal/legacy/terraform/provider_mock.go +++ b/internal/legacy/terraform/provider_mock.go @@ -7,7 +7,7 @@ import ( "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" - "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" "github.com/hashicorp/terraform/internal/providers" ) diff --git a/internal/legacy/terraform/resource.go b/internal/legacy/terraform/resource.go index 5f9ade0cab..ddec8f828a 100644 --- a/internal/legacy/terraform/resource.go +++ b/internal/legacy/terraform/resource.go @@ -11,9 +11,9 @@ import ( "github.com/mitchellh/reflectwalk" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" ) // Resource is a legacy way to identify a particular resource instance. diff --git a/internal/legacy/terraform/resource_address.go b/internal/legacy/terraform/resource_address.go index 9b10a1464d..9a3df4e4f7 100644 --- a/internal/legacy/terraform/resource_address.go +++ b/internal/legacy/terraform/resource_address.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" ) // ResourceAddress is a way of identifying an individual resource (or, diff --git a/internal/legacy/terraform/resource_address_test.go b/internal/legacy/terraform/resource_address_test.go index 81e469a62b..e0e8ed0061 100644 --- a/internal/legacy/terraform/resource_address_test.go +++ b/internal/legacy/terraform/resource_address_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" ) func TestParseResourceAddressInternal(t *testing.T) { diff --git a/internal/legacy/terraform/resource_provisioner.go b/internal/legacy/terraform/resource_provisioner.go index 2287ece76f..647693a9fa 100644 --- a/internal/legacy/terraform/resource_provisioner.go +++ b/internal/legacy/terraform/resource_provisioner.go @@ -1,7 +1,7 @@ package terraform import ( - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/provisioners" ) diff --git a/internal/legacy/terraform/resource_provisioner_mock.go b/internal/legacy/terraform/resource_provisioner_mock.go index 7b88cf7333..27c07b7dc6 100644 --- a/internal/legacy/terraform/resource_provisioner_mock.go +++ b/internal/legacy/terraform/resource_provisioner_mock.go @@ -3,7 +3,7 @@ package terraform import ( "sync" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" ) // MockResourceProvisioner implements ResourceProvisioner but mocks out all the diff --git a/internal/legacy/terraform/resource_test.go b/internal/legacy/terraform/resource_test.go index 835163c4a2..c91c70c1c6 100644 --- a/internal/legacy/terraform/resource_test.go +++ b/internal/legacy/terraform/resource_test.go @@ -5,10 +5,10 @@ import ( "reflect" "testing" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" "github.com/mitchellh/reflectwalk" ) diff --git a/internal/legacy/terraform/schemas.go b/internal/legacy/terraform/schemas.go index fdab663fe7..9216707a54 100644 --- a/internal/legacy/terraform/schemas.go +++ b/internal/legacy/terraform/schemas.go @@ -4,9 +4,9 @@ import ( "fmt" "log" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" diff --git a/internal/legacy/terraform/state.go b/internal/legacy/terraform/state.go index c322c2633c..b9d5e70161 100644 --- a/internal/legacy/terraform/state.go +++ b/internal/legacy/terraform/state.go @@ -22,10 +22,10 @@ import ( version "github.com/hashicorp/go-version" "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" tfversion "github.com/hashicorp/terraform/version" diff --git a/internal/legacy/terraform/state_test.go b/internal/legacy/terraform/state_test.go index f4f96a3f65..1edbfb6912 100644 --- a/internal/legacy/terraform/state_test.go +++ b/internal/legacy/terraform/state_test.go @@ -11,8 +11,8 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" ) func TestStateValidate(t *testing.T) { diff --git a/internal/legacy/terraform/version_required.go b/internal/legacy/terraform/version_required.go index 5a0de5b79f..f14d93f681 100644 --- a/internal/legacy/terraform/version_required.go +++ b/internal/legacy/terraform/version_required.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/configs" tfversion "github.com/hashicorp/terraform/version" ) diff --git a/internal/moduletest/provider.go b/internal/moduletest/provider.go index 65a6ca4b49..d27a07ae27 100644 --- a/internal/moduletest/provider.go +++ b/internal/moduletest/provider.go @@ -10,7 +10,7 @@ import ( ctyjson "github.com/zclconf/go-cty/cty/json" "github.com/hashicorp/hcl/v2/hclsyntax" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/repl" "github.com/hashicorp/terraform/internal/tfdiags" diff --git a/internal/provider-simple-v6/provider.go b/internal/provider-simple-v6/provider.go index 1e86aa6685..74fce93538 100644 --- a/internal/provider-simple-v6/provider.go +++ b/internal/provider-simple-v6/provider.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" diff --git a/internal/provider-simple/provider.go b/internal/provider-simple/provider.go index 1e86aa6685..74fce93538 100644 --- a/internal/provider-simple/provider.go +++ b/internal/provider-simple/provider.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" diff --git a/internal/providers/provider.go b/internal/providers/provider.go index ad266f567a..e0ab30929e 100644 --- a/internal/providers/provider.go +++ b/internal/providers/provider.go @@ -3,7 +3,7 @@ package providers import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" ) diff --git a/internal/provisioners/provisioner.go b/internal/provisioners/provisioner.go index 971ad35d78..190740a7fe 100644 --- a/internal/provisioners/provisioner.go +++ b/internal/provisioners/provisioner.go @@ -1,7 +1,7 @@ package provisioners import ( - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/zclconf/go-cty/cty" ) diff --git a/internal/repl/session_test.go b/internal/repl/session_test.go index f2f54b85e6..2154ef051e 100644 --- a/internal/repl/session_test.go +++ b/internal/repl/session_test.go @@ -8,8 +8,8 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/states" diff --git a/lang/blocktoattr/fixup.go b/lang/blocktoattr/fixup.go index 056946ab99..0a459dfa59 100644 --- a/lang/blocktoattr/fixup.go +++ b/lang/blocktoattr/fixup.go @@ -3,7 +3,7 @@ package blocktoattr import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/zclconf/go-cty/cty" ) diff --git a/lang/blocktoattr/fixup_bench_test.go b/lang/blocktoattr/fixup_bench_test.go index 1515d2effd..518fcfd0fb 100644 --- a/lang/blocktoattr/fixup_bench_test.go +++ b/lang/blocktoattr/fixup_bench_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/hcl/v2/hclsyntax" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/zclconf/go-cty/cty" ) diff --git a/lang/blocktoattr/fixup_test.go b/lang/blocktoattr/fixup_test.go index 7dadb2986a..8f70844502 100644 --- a/lang/blocktoattr/fixup_test.go +++ b/lang/blocktoattr/fixup_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/hcl/v2/hclsyntax" hcljson "github.com/hashicorp/hcl/v2/json" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/zclconf/go-cty/cty" ) diff --git a/lang/blocktoattr/schema.go b/lang/blocktoattr/schema.go index 31e010cc79..f704a04870 100644 --- a/lang/blocktoattr/schema.go +++ b/lang/blocktoattr/schema.go @@ -2,7 +2,7 @@ package blocktoattr import ( "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/zclconf/go-cty/cty" ) diff --git a/lang/blocktoattr/variables.go b/lang/blocktoattr/variables.go index ae5c609dfe..92d5931607 100644 --- a/lang/blocktoattr/variables.go +++ b/lang/blocktoattr/variables.go @@ -4,7 +4,7 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/ext/dynblock" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" ) // ExpandedVariables finds all of the global variables referenced in the diff --git a/lang/blocktoattr/variables_test.go b/lang/blocktoattr/variables_test.go index 0fa4171425..94076b75c2 100644 --- a/lang/blocktoattr/variables_test.go +++ b/lang/blocktoattr/variables_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" hcljson "github.com/hashicorp/hcl/v2/json" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/zclconf/go-cty/cty" ) diff --git a/lang/eval.go b/lang/eval.go index 9621dc471c..b49e26b02b 100644 --- a/lang/eval.go +++ b/lang/eval.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/ext/dynblock" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang/blocktoattr" diff --git a/lang/eval_test.go b/lang/eval_test.go index b437a0c1ae..37e9e54a0c 100644 --- a/lang/eval_test.go +++ b/lang/eval_test.go @@ -5,8 +5,8 @@ import ( "encoding/json" "testing" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/hcl/v2" diff --git a/lang/references.go b/lang/references.go index b56fce72e7..eb4e3f435f 100644 --- a/lang/references.go +++ b/lang/references.go @@ -2,8 +2,8 @@ package lang import ( "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang/blocktoattr" ) diff --git a/plans/objchange/all_null.go b/plans/objchange/all_null.go index 93bbfdf5dd..fb7ec4cfb3 100644 --- a/plans/objchange/all_null.go +++ b/plans/objchange/all_null.go @@ -1,7 +1,7 @@ package objchange import ( - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/zclconf/go-cty/cty" ) diff --git a/plans/objchange/compatible.go b/plans/objchange/compatible.go index e4ece3f976..d3c081bc12 100644 --- a/plans/objchange/compatible.go +++ b/plans/objchange/compatible.go @@ -7,7 +7,7 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/convert" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" ) // AssertObjectCompatible checks whether the given "actual" value is a valid diff --git a/plans/objchange/compatible_test.go b/plans/objchange/compatible_test.go index 80fe277816..f8408c1acd 100644 --- a/plans/objchange/compatible_test.go +++ b/plans/objchange/compatible_test.go @@ -7,7 +7,7 @@ import ( "github.com/apparentlymart/go-dump/dump" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/plans/objchange/normalize_obj.go b/plans/objchange/normalize_obj.go index 47229b4748..3db3f66f58 100644 --- a/plans/objchange/normalize_obj.go +++ b/plans/objchange/normalize_obj.go @@ -1,7 +1,7 @@ package objchange import ( - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/zclconf/go-cty/cty" ) diff --git a/plans/objchange/normalize_obj_test.go b/plans/objchange/normalize_obj_test.go index abc9c37709..e350e181c4 100644 --- a/plans/objchange/normalize_obj_test.go +++ b/plans/objchange/normalize_obj_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/apparentlymart/go-dump/dump" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/zclconf/go-cty/cty" ) diff --git a/plans/objchange/objchange.go b/plans/objchange/objchange.go index 6bfc06e22c..51dd2b98bc 100644 --- a/plans/objchange/objchange.go +++ b/plans/objchange/objchange.go @@ -5,7 +5,7 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" ) // ProposedNew constructs a proposed new object value by combining the diff --git a/plans/objchange/objchange_test.go b/plans/objchange/objchange_test.go index 759f37e1dc..3e9cc20556 100644 --- a/plans/objchange/objchange_test.go +++ b/plans/objchange/objchange_test.go @@ -6,7 +6,7 @@ import ( "github.com/apparentlymart/go-dump/dump" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" ) func TestProposedNew(t *testing.T) { diff --git a/plans/objchange/plan_valid.go b/plans/objchange/plan_valid.go index 07dd248654..0697bac618 100644 --- a/plans/objchange/plan_valid.go +++ b/plans/objchange/plan_valid.go @@ -5,7 +5,7 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" ) // AssertPlanValid checks checks whether a planned new state returned by a diff --git a/plans/objchange/plan_valid_test.go b/plans/objchange/plan_valid_test.go index 869d797a63..a07ab4c164 100644 --- a/plans/objchange/plan_valid_test.go +++ b/plans/objchange/plan_valid_test.go @@ -6,7 +6,7 @@ import ( "github.com/apparentlymart/go-dump/dump" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/plans/plan.go b/plans/plan.go index 3445004757..f2d4f11dde 100644 --- a/plans/plan.go +++ b/plans/plan.go @@ -3,8 +3,8 @@ package plans import ( "sort" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" ) diff --git a/plans/planfile/config_snapshot.go b/plans/planfile/config_snapshot.go index a78a99b31f..163366d9bc 100644 --- a/plans/planfile/config_snapshot.go +++ b/plans/planfile/config_snapshot.go @@ -11,7 +11,7 @@ import ( "time" version "github.com/hashicorp/go-version" - "github.com/hashicorp/terraform/configs/configload" + "github.com/hashicorp/terraform/internal/configs/configload" ) const configSnapshotPrefix = "tfconfig/" diff --git a/plans/planfile/config_snapshot_test.go b/plans/planfile/config_snapshot_test.go index 2efd0031f6..91069ea38c 100644 --- a/plans/planfile/config_snapshot_test.go +++ b/plans/planfile/config_snapshot_test.go @@ -9,7 +9,7 @@ import ( "github.com/davecgh/go-spew/spew" - "github.com/hashicorp/terraform/configs/configload" + "github.com/hashicorp/terraform/internal/configs/configload" ) func TestConfigSnapshotRoundtrip(t *testing.T) { diff --git a/plans/planfile/planfile_test.go b/plans/planfile/planfile_test.go index 765f0892af..e487a1a289 100644 --- a/plans/planfile/planfile_test.go +++ b/plans/planfile/planfile_test.go @@ -7,7 +7,7 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform/configs/configload" + "github.com/hashicorp/terraform/internal/configs/configload" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statefile" diff --git a/plans/planfile/reader.go b/plans/planfile/reader.go index a0de2721ad..41aeaf5ea6 100644 --- a/plans/planfile/reader.go +++ b/plans/planfile/reader.go @@ -6,8 +6,8 @@ import ( "fmt" "io/ioutil" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configload" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configload" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states/statefile" diff --git a/plans/planfile/writer.go b/plans/planfile/writer.go index 8fdf7a56bc..92ee4e0300 100644 --- a/plans/planfile/writer.go +++ b/plans/planfile/writer.go @@ -6,7 +6,7 @@ import ( "os" "time" - "github.com/hashicorp/terraform/configs/configload" + "github.com/hashicorp/terraform/internal/configs/configload" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states/statefile" ) diff --git a/plugin/convert/schema.go b/plugin/convert/schema.go index 119d3b1d7c..4a3f909935 100644 --- a/plugin/convert/schema.go +++ b/plugin/convert/schema.go @@ -5,7 +5,7 @@ import ( "reflect" "sort" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" proto "github.com/hashicorp/terraform/internal/tfplugin5" ) diff --git a/plugin/convert/schema_test.go b/plugin/convert/schema_test.go index 45e4d8eac7..4df254fb76 100644 --- a/plugin/convert/schema_test.go +++ b/plugin/convert/schema_test.go @@ -5,7 +5,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" proto "github.com/hashicorp/terraform/internal/tfplugin5" "github.com/zclconf/go-cty/cty" ) diff --git a/plugin/grpc_provider_test.go b/plugin/grpc_provider_test.go index 0e55243864..fce587c2ce 100644 --- a/plugin/grpc_provider_test.go +++ b/plugin/grpc_provider_test.go @@ -7,7 +7,7 @@ import ( "github.com/golang/mock/gomock" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/zclconf/go-cty/cty" diff --git a/plugin/grpc_provisioner.go b/plugin/grpc_provisioner.go index 102bfec1ec..ed5cb64c5c 100644 --- a/plugin/grpc_provisioner.go +++ b/plugin/grpc_provisioner.go @@ -7,7 +7,7 @@ import ( "sync" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/provisioners" proto "github.com/hashicorp/terraform/internal/tfplugin5" "github.com/hashicorp/terraform/plugin/convert" diff --git a/plugin/grpc_provisioner_test.go b/plugin/grpc_provisioner_test.go index a563cef664..775b449f2a 100644 --- a/plugin/grpc_provisioner_test.go +++ b/plugin/grpc_provisioner_test.go @@ -7,7 +7,7 @@ import ( "github.com/golang/mock/gomock" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" "github.com/hashicorp/terraform/internal/provisioners" proto "github.com/hashicorp/terraform/internal/tfplugin5" "github.com/zclconf/go-cty/cty" diff --git a/plugin6/convert/schema.go b/plugin6/convert/schema.go index bb355a483e..fa405acf11 100644 --- a/plugin6/convert/schema.go +++ b/plugin6/convert/schema.go @@ -5,7 +5,7 @@ import ( "reflect" "sort" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" proto "github.com/hashicorp/terraform/internal/tfplugin6" "github.com/zclconf/go-cty/cty" diff --git a/plugin6/convert/schema_test.go b/plugin6/convert/schema_test.go index 1cb97273dd..a94e812f11 100644 --- a/plugin6/convert/schema_test.go +++ b/plugin6/convert/schema_test.go @@ -5,7 +5,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" proto "github.com/hashicorp/terraform/internal/tfplugin6" "github.com/zclconf/go-cty/cty" ) diff --git a/plugin6/grpc_provider_test.go b/plugin6/grpc_provider_test.go index 061c4355e0..645dcf7a1f 100644 --- a/plugin6/grpc_provider_test.go +++ b/plugin6/grpc_provider_test.go @@ -8,7 +8,7 @@ import ( "github.com/golang/mock/gomock" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/zclconf/go-cty/cty" diff --git a/states/instance_object_src.go b/states/instance_object_src.go index 64b41dfbb0..a564e0d907 100644 --- a/states/instance_object_src.go +++ b/states/instance_object_src.go @@ -4,8 +4,8 @@ import ( "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" - "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" ) // ResourceInstanceObjectSrc is a not-fully-decoded version of diff --git a/states/state_string.go b/states/state_string.go index 1851da42d8..2e34834a55 100644 --- a/states/state_string.go +++ b/states/state_string.go @@ -10,8 +10,8 @@ import ( ctyjson "github.com/zclconf/go-cty/cty/json" - "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" ) // String returns a rather-odd string representation of the entire state. diff --git a/states/statefile/version3_upgrade.go b/states/statefile/version3_upgrade.go index 55d067a9cc..6ac19f513d 100644 --- a/states/statefile/version3_upgrade.go +++ b/states/statefile/version3_upgrade.go @@ -10,8 +10,8 @@ import ( "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/context.go b/terraform/context.go index c0c00c5da4..fe06a5114e 100644 --- a/terraform/context.go +++ b/terraform/context.go @@ -8,8 +8,8 @@ import ( "sync" "github.com/apparentlymart/go-versions/versions" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" diff --git a/terraform/context_apply2_test.go b/terraform/context_apply2_test.go index 9d64d0adcf..a2f34bec77 100644 --- a/terraform/context_apply2_test.go +++ b/terraform/context_apply2_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" diff --git a/terraform/context_apply_test.go b/terraform/context_apply_test.go index 46e7b30b87..9854fb7102 100644 --- a/terraform/context_apply_test.go +++ b/terraform/context_apply_test.go @@ -18,10 +18,10 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/go-test/deep" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" diff --git a/terraform/context_components_test.go b/terraform/context_components_test.go index 3d88110422..f92b41b6ac 100644 --- a/terraform/context_components_test.go +++ b/terraform/context_components_test.go @@ -3,8 +3,8 @@ package terraform import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" ) diff --git a/terraform/context_fixtures_test.go b/terraform/context_fixtures_test.go index d4f0e3ce1d..4853f4a422 100644 --- a/terraform/context_fixtures_test.go +++ b/terraform/context_fixtures_test.go @@ -3,9 +3,9 @@ package terraform import ( "testing" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" "github.com/zclconf/go-cty/cty" diff --git a/terraform/context_import_test.go b/terraform/context_import_test.go index 18583336b6..11209e9c98 100644 --- a/terraform/context_import_test.go +++ b/terraform/context_import_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" diff --git a/terraform/context_input.go b/terraform/context_input.go index fe659eda2e..1a94e94bb0 100644 --- a/terraform/context_input.go +++ b/terraform/context_input.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/terraform/context_input_test.go b/terraform/context_input_test.go index cb4a879aea..d673e48c5d 100644 --- a/terraform/context_input_test.go +++ b/terraform/context_input_test.go @@ -8,8 +8,8 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/context_plan2_test.go b/terraform/context_plan2_test.go index 483842a093..a287354388 100644 --- a/terraform/context_plan2_test.go +++ b/terraform/context_plan2_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" diff --git a/terraform/context_plan_test.go b/terraform/context_plan_test.go index 052cc20ad3..43eda257bb 100644 --- a/terraform/context_plan_test.go +++ b/terraform/context_plan_test.go @@ -15,9 +15,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" diff --git a/terraform/context_refresh_test.go b/terraform/context_refresh_test.go index 7479eb5664..4b15435fe3 100644 --- a/terraform/context_refresh_test.go +++ b/terraform/context_refresh_test.go @@ -11,9 +11,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/context_test.go b/terraform/context_test.go index f19c06b3b4..efdd1525b2 100644 --- a/terraform/context_test.go +++ b/terraform/context_test.go @@ -15,11 +15,11 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/hashicorp/go-version" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configload" - "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configload" + "github.com/hashicorp/terraform/internal/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" "github.com/hashicorp/terraform/internal/depsfile" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" diff --git a/terraform/context_validate_test.go b/terraform/context_validate_test.go index 68c4bab186..d309ecafd6 100644 --- a/terraform/context_validate_test.go +++ b/terraform/context_validate_test.go @@ -8,8 +8,8 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" diff --git a/terraform/eval_context.go b/terraform/eval_context.go index 4db0e9712e..8e381b0c3d 100644 --- a/terraform/eval_context.go +++ b/terraform/eval_context.go @@ -2,8 +2,8 @@ package terraform import ( "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" diff --git a/terraform/eval_context_builtin.go b/terraform/eval_context_builtin.go index d39f4e6116..cff23ff688 100644 --- a/terraform/eval_context_builtin.go +++ b/terraform/eval_context_builtin.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/terraform/states" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang" diff --git a/terraform/eval_context_mock.go b/terraform/eval_context_mock.go index e8022e7a07..1813653e6a 100644 --- a/terraform/eval_context_mock.go +++ b/terraform/eval_context_mock.go @@ -3,8 +3,8 @@ package terraform import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" diff --git a/terraform/eval_provider.go b/terraform/eval_provider.go index 930332efbb..0f257b8820 100644 --- a/terraform/eval_provider.go +++ b/terraform/eval_provider.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/providers" ) diff --git a/terraform/eval_provider_test.go b/terraform/eval_provider_test.go index ecf073eedc..0a1aeca703 100644 --- a/terraform/eval_provider_test.go +++ b/terraform/eval_provider_test.go @@ -6,9 +6,9 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configschema" ) func TestBuildProviderConfig(t *testing.T) { diff --git a/terraform/eval_variable.go b/terraform/eval_variable.go index 5c58fa04b9..bdfadd2e9c 100644 --- a/terraform/eval_variable.go +++ b/terraform/eval_variable.go @@ -5,8 +5,8 @@ import ( "log" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/convert" diff --git a/terraform/evaluate.go b/terraform/evaluate.go index 4a3f466056..1f03e14faf 100644 --- a/terraform/evaluate.go +++ b/terraform/evaluate.go @@ -12,9 +12,9 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/convert" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang" diff --git a/terraform/evaluate_test.go b/terraform/evaluate_test.go index 8e7dd1b581..f76be42126 100644 --- a/terraform/evaluate_test.go +++ b/terraform/evaluate_test.go @@ -7,9 +7,9 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" diff --git a/terraform/evaluate_valid.go b/terraform/evaluate_valid.go index a6abd7216f..21adc77f1f 100644 --- a/terraform/evaluate_valid.go +++ b/terraform/evaluate_valid.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/didyoumean" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/terraform/evaluate_valid_test.go b/terraform/evaluate_valid_test.go index cf10c9a1b1..0e27da34d9 100644 --- a/terraform/evaluate_valid_test.go +++ b/terraform/evaluate_valid_test.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/lang" ) diff --git a/terraform/graph_builder_apply.go b/terraform/graph_builder_apply.go index ab28207f46..d87adc54ff 100644 --- a/terraform/graph_builder_apply.go +++ b/terraform/graph_builder_apply.go @@ -1,8 +1,8 @@ package terraform import ( - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" diff --git a/terraform/graph_builder_destroy_plan.go b/terraform/graph_builder_destroy_plan.go index 6d6b45f001..1b80d8c158 100644 --- a/terraform/graph_builder_destroy_plan.go +++ b/terraform/graph_builder_destroy_plan.go @@ -1,8 +1,8 @@ package terraform import ( - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" diff --git a/terraform/graph_builder_eval.go b/terraform/graph_builder_eval.go index 9fa8c4c630..d0832b743e 100644 --- a/terraform/graph_builder_eval.go +++ b/terraform/graph_builder_eval.go @@ -1,8 +1,8 @@ package terraform import ( - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" diff --git a/terraform/graph_builder_import.go b/terraform/graph_builder_import.go index 87d2ec949f..af5df14030 100644 --- a/terraform/graph_builder_import.go +++ b/terraform/graph_builder_import.go @@ -1,8 +1,8 @@ package terraform import ( - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/terraform/graph_builder_plan.go b/terraform/graph_builder_plan.go index 2960d01d59..5118cf2fd3 100644 --- a/terraform/graph_builder_plan.go +++ b/terraform/graph_builder_plan.go @@ -3,8 +3,8 @@ package terraform import ( "sync" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" diff --git a/terraform/graph_builder_plan_test.go b/terraform/graph_builder_plan_test.go index 79a9f6db20..6225e192e6 100644 --- a/terraform/graph_builder_plan_test.go +++ b/terraform/graph_builder_plan_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/graph_walk_context.go b/terraform/graph_walk_context.go index d6d94ae0a8..611cce1ef2 100644 --- a/terraform/graph_walk_context.go +++ b/terraform/graph_walk_context.go @@ -6,8 +6,8 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" diff --git a/terraform/node_count_boundary.go b/terraform/node_count_boundary.go index 0b11699dd2..26968b1193 100644 --- a/terraform/node_count_boundary.go +++ b/terraform/node_count_boundary.go @@ -4,8 +4,8 @@ import ( "fmt" "log" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/terraform/node_count_boundary_test.go b/terraform/node_count_boundary_test.go index ffd52eb14a..ee243f4eea 100644 --- a/terraform/node_count_boundary_test.go +++ b/terraform/node_count_boundary_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/hashicorp/hcl/v2/hcltest" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/node_local.go b/terraform/node_local.go index 58d8bc9c77..cf8f9832f8 100644 --- a/terraform/node_local.go +++ b/terraform/node_local.go @@ -5,8 +5,8 @@ import ( "log" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang" diff --git a/terraform/node_local_test.go b/terraform/node_local_test.go index 15d042d4f1..bb49741cab 100644 --- a/terraform/node_local_test.go +++ b/terraform/node_local_test.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/node_module_expand.go b/terraform/node_module_expand.go index 25ca77d84c..f955be323e 100644 --- a/terraform/node_module_expand.go +++ b/terraform/node_module_expand.go @@ -3,8 +3,8 @@ package terraform import ( "log" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang" diff --git a/terraform/node_module_expand_test.go b/terraform/node_module_expand_test.go index 5b1d0c20ab..3b9cd93fbe 100644 --- a/terraform/node_module_expand_test.go +++ b/terraform/node_module_expand_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/hashicorp/hcl/v2/hcltest" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" diff --git a/terraform/node_module_variable.go b/terraform/node_module_variable.go index b0773f2540..88a9a9c231 100644 --- a/terraform/node_module_variable.go +++ b/terraform/node_module_variable.go @@ -5,8 +5,8 @@ import ( "log" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/tfdiags" diff --git a/terraform/node_module_variable_test.go b/terraform/node_module_variable_test.go index c12feef971..f060d3ea28 100644 --- a/terraform/node_module_variable_test.go +++ b/terraform/node_module_variable_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" ) func TestNodeModuleVariablePath(t *testing.T) { diff --git a/terraform/node_output.go b/terraform/node_output.go index 36830f8f29..d9e3618825 100644 --- a/terraform/node_output.go +++ b/terraform/node_output.go @@ -5,8 +5,8 @@ import ( "log" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang" diff --git a/terraform/node_output_test.go b/terraform/node_output_test.go index ae6725b723..459f23e7e5 100644 --- a/terraform/node_output_test.go +++ b/terraform/node_output_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/node_provider.go b/terraform/node_provider.go index 022ca442fe..fa4c47f320 100644 --- a/terraform/node_provider.go +++ b/terraform/node_provider.go @@ -5,7 +5,7 @@ import ( "log" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/zclconf/go-cty/cty" diff --git a/terraform/node_provider_abstract.go b/terraform/node_provider_abstract.go index 576af5117c..09bdd95b40 100644 --- a/terraform/node_provider_abstract.go +++ b/terraform/node_provider_abstract.go @@ -1,9 +1,9 @@ package terraform import ( - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/dag" ) diff --git a/terraform/node_provider_test.go b/terraform/node_provider_test.go index 2fdba6ebdf..3551debb87 100644 --- a/terraform/node_provider_test.go +++ b/terraform/node_provider_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/zclconf/go-cty/cty" diff --git a/terraform/node_resource_abstract.go b/terraform/node_resource_abstract.go index 828ea7986e..d7a7eadbe1 100644 --- a/terraform/node_resource_abstract.go +++ b/terraform/node_resource_abstract.go @@ -4,9 +4,9 @@ import ( "fmt" "log" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang" diff --git a/terraform/node_resource_abstract_instance.go b/terraform/node_resource_abstract_instance.go index 2f4e2795ab..6704becaa6 100644 --- a/terraform/node_resource_abstract_instance.go +++ b/terraform/node_resource_abstract_instance.go @@ -6,9 +6,9 @@ import ( "strings" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" diff --git a/terraform/node_resource_abstract_instance_test.go b/terraform/node_resource_abstract_instance_test.go index 8cd5cbd848..53a237db00 100644 --- a/terraform/node_resource_abstract_instance_test.go +++ b/terraform/node_resource_abstract_instance_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/node_resource_abstract_test.go b/terraform/node_resource_abstract_test.go index c2ff9e43d0..aedd05b1e8 100644 --- a/terraform/node_resource_abstract_test.go +++ b/terraform/node_resource_abstract_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" diff --git a/terraform/node_resource_apply_instance.go b/terraform/node_resource_apply_instance.go index 59ef8927c1..231867029f 100644 --- a/terraform/node_resource_apply_instance.go +++ b/terraform/node_resource_apply_instance.go @@ -4,8 +4,8 @@ import ( "fmt" "log" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/plans/objchange" diff --git a/terraform/node_resource_apply_test.go b/terraform/node_resource_apply_test.go index 26335c8ba7..b6f217a9e3 100644 --- a/terraform/node_resource_apply_test.go +++ b/terraform/node_resource_apply_test.go @@ -3,8 +3,8 @@ package terraform import ( "testing" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/node_resource_destroy.go b/terraform/node_resource_destroy.go index 7984e4176f..17802c2eab 100644 --- a/terraform/node_resource_destroy.go +++ b/terraform/node_resource_destroy.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/node_resource_destroy_deposed_test.go b/terraform/node_resource_destroy_deposed_test.go index 9ce8d3961f..c839cc8276 100644 --- a/terraform/node_resource_destroy_deposed_test.go +++ b/terraform/node_resource_destroy_deposed_test.go @@ -3,8 +3,8 @@ package terraform import ( "testing" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" diff --git a/terraform/node_resource_plan_orphan_test.go b/terraform/node_resource_plan_orphan_test.go index 755b6c0843..22c66f702d 100644 --- a/terraform/node_resource_plan_orphan_test.go +++ b/terraform/node_resource_plan_orphan_test.go @@ -3,8 +3,8 @@ package terraform import ( "testing" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/plans" diff --git a/terraform/node_resource_plan_test.go b/terraform/node_resource_plan_test.go index d1718a60a8..bb6822e698 100644 --- a/terraform/node_resource_plan_test.go +++ b/terraform/node_resource_plan_test.go @@ -3,8 +3,8 @@ package terraform import ( "testing" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/node_resource_validate.go b/terraform/node_resource_validate.go index 316adc3c02..ebf597c066 100644 --- a/terraform/node_resource_validate.go +++ b/terraform/node_resource_validate.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/didyoumean" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" diff --git a/terraform/node_resource_validate_test.go b/terraform/node_resource_validate_test.go index 43b41502dc..bb491ebecd 100644 --- a/terraform/node_resource_validate_test.go +++ b/terraform/node_resource_validate_test.go @@ -7,9 +7,9 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hcltest" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" "github.com/hashicorp/terraform/internal/tfdiags" diff --git a/terraform/node_root_variable.go b/terraform/node_root_variable.go index 8d3b87c07b..56ee5149a5 100644 --- a/terraform/node_root_variable.go +++ b/terraform/node_root_variable.go @@ -1,8 +1,8 @@ package terraform import ( - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/terraform/node_root_variable_test.go b/terraform/node_root_variable_test.go index 947e2459d4..7a94f4b951 100644 --- a/terraform/node_root_variable_test.go +++ b/terraform/node_root_variable_test.go @@ -3,8 +3,8 @@ package terraform import ( "testing" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" ) func TestNodeRootVariableExecute(t *testing.T) { diff --git a/terraform/provider_mock.go b/terraform/provider_mock.go index e76c30ce73..47227759b2 100644 --- a/terraform/provider_mock.go +++ b/terraform/provider_mock.go @@ -8,8 +8,8 @@ import ( ctyjson "github.com/zclconf/go-cty/cty/json" "github.com/zclconf/go-cty/cty/msgpack" - "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/configs/hcl2shim" + "github.com/hashicorp/terraform/internal/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/hcl2shim" "github.com/hashicorp/terraform/internal/providers" ) diff --git a/terraform/resource_provider_mock_test.go b/terraform/resource_provider_mock_test.go index 4fe916534c..a077ba09d8 100644 --- a/terraform/resource_provider_mock_test.go +++ b/terraform/resource_provider_mock_test.go @@ -1,7 +1,7 @@ package terraform import ( - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/schemas.go b/terraform/schemas.go index 9d757487b6..698be02570 100644 --- a/terraform/schemas.go +++ b/terraform/schemas.go @@ -4,9 +4,9 @@ import ( "fmt" "log" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" diff --git a/terraform/schemas_test.go b/terraform/schemas_test.go index c7cb33f65e..00b6438eeb 100644 --- a/terraform/schemas_test.go +++ b/terraform/schemas_test.go @@ -1,8 +1,8 @@ package terraform import ( - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" ) func simpleTestSchemas() *Schemas { diff --git a/terraform/terraform_test.go b/terraform/terraform_test.go index e7f8e8fd68..ab0985975c 100644 --- a/terraform/terraform_test.go +++ b/terraform/terraform_test.go @@ -13,9 +13,9 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configload" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configload" "github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/provisioners" diff --git a/terraform/transform_attach_config_provider.go b/terraform/transform_attach_config_provider.go index 874e5a54d7..95153eaced 100644 --- a/terraform/transform_attach_config_provider.go +++ b/terraform/transform_attach_config_provider.go @@ -1,8 +1,8 @@ package terraform import ( - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" ) // GraphNodeAttachProvider is an interface that must be implemented by nodes diff --git a/terraform/transform_attach_config_provider_meta.go b/terraform/transform_attach_config_provider_meta.go index bb591755c0..d79df26fa0 100644 --- a/terraform/transform_attach_config_provider_meta.go +++ b/terraform/transform_attach_config_provider_meta.go @@ -1,8 +1,8 @@ package terraform import ( - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" ) // GraphNodeAttachProviderMetaConfigs is an interface that must be implemented diff --git a/terraform/transform_attach_config_resource.go b/terraform/transform_attach_config_resource.go index fe3d443271..e2468a0099 100644 --- a/terraform/transform_attach_config_resource.go +++ b/terraform/transform_attach_config_resource.go @@ -3,7 +3,7 @@ package terraform import ( "log" - "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/dag" ) diff --git a/terraform/transform_attach_schema.go b/terraform/transform_attach_schema.go index 23ecb91ba5..b013931f18 100644 --- a/terraform/transform_attach_schema.go +++ b/terraform/transform_attach_schema.go @@ -4,8 +4,8 @@ import ( "fmt" "log" - "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/dag" ) diff --git a/terraform/transform_config.go b/terraform/transform_config.go index bd915dfd14..6cb42b6200 100644 --- a/terraform/transform_config.go +++ b/terraform/transform_config.go @@ -3,8 +3,8 @@ package terraform import ( "log" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/dag" ) diff --git a/terraform/transform_count_boundary.go b/terraform/transform_count_boundary.go index 1039c3d6a3..9f944240ed 100644 --- a/terraform/transform_count_boundary.go +++ b/terraform/transform_count_boundary.go @@ -1,7 +1,7 @@ package terraform import ( - "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/dag" ) diff --git a/terraform/transform_destroy_cbd.go b/terraform/transform_destroy_cbd.go index 52ed04b04d..3b8f3667ec 100644 --- a/terraform/transform_destroy_cbd.go +++ b/terraform/transform_destroy_cbd.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/transform_destroy_edge.go b/terraform/transform_destroy_edge.go index 8e28312d2d..ecbb361d66 100644 --- a/terraform/transform_destroy_edge.go +++ b/terraform/transform_destroy_edge.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/states" - "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/dag" ) diff --git a/terraform/transform_import_state.go b/terraform/transform_import_state.go index a636dc8679..0eb0ee1b76 100644 --- a/terraform/transform_import_state.go +++ b/terraform/transform_import_state.go @@ -4,8 +4,8 @@ import ( "fmt" "log" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" diff --git a/terraform/transform_import_state_test.go b/terraform/transform_import_state_test.go index 032c0cc0ac..c3c2712a5f 100644 --- a/terraform/transform_import_state_test.go +++ b/terraform/transform_import_state_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/states" "github.com/zclconf/go-cty/cty" diff --git a/terraform/transform_local.go b/terraform/transform_local.go index 78102ac764..667d6f917e 100644 --- a/terraform/transform_local.go +++ b/terraform/transform_local.go @@ -1,8 +1,8 @@ package terraform import ( - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" ) // LocalTransformer is a GraphTransformer that adds all the local values diff --git a/terraform/transform_module_expansion.go b/terraform/transform_module_expansion.go index 59b13ecd93..a4d45d963c 100644 --- a/terraform/transform_module_expansion.go +++ b/terraform/transform_module_expansion.go @@ -3,8 +3,8 @@ package terraform import ( "log" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/dag" ) diff --git a/terraform/transform_module_variable.go b/terraform/transform_module_variable.go index fa7a8ccd75..b739bfd6e4 100644 --- a/terraform/transform_module_variable.go +++ b/terraform/transform_module_variable.go @@ -9,7 +9,7 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/configs" ) // ModuleVariableTransformer is a GraphTransformer that adds all the variables diff --git a/terraform/transform_orphan_output.go b/terraform/transform_orphan_output.go index ef719b6296..d41a260c86 100644 --- a/terraform/transform_orphan_output.go +++ b/terraform/transform_orphan_output.go @@ -3,8 +3,8 @@ package terraform import ( "log" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/transform_orphan_resource.go b/terraform/transform_orphan_resource.go index 4994c7b718..f6c43bb8de 100644 --- a/terraform/transform_orphan_resource.go +++ b/terraform/transform_orphan_resource.go @@ -3,7 +3,7 @@ package terraform import ( "log" - "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/transform_output.go b/terraform/transform_output.go index 15dcb522c2..e82307a720 100644 --- a/terraform/transform_output.go +++ b/terraform/transform_output.go @@ -3,8 +3,8 @@ package terraform import ( "log" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/plans" ) diff --git a/terraform/transform_provider.go b/terraform/transform_provider.go index db2807874b..ee5087eafa 100644 --- a/terraform/transform_provider.go +++ b/terraform/transform_provider.go @@ -5,8 +5,8 @@ import ( "log" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/terraform/transform_provider_test.go b/terraform/transform_provider_test.go index fb856e19bc..596a397354 100644 --- a/terraform/transform_provider_test.go +++ b/terraform/transform_provider_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/dag" ) diff --git a/terraform/transform_reference.go b/terraform/transform_reference.go index 28afd1d599..7d256adc78 100644 --- a/terraform/transform_reference.go +++ b/terraform/transform_reference.go @@ -6,8 +6,8 @@ import ( "sort" "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/lang" ) diff --git a/terraform/transform_removed_modules.go b/terraform/transform_removed_modules.go index eabdc692f1..16c51794fa 100644 --- a/terraform/transform_removed_modules.go +++ b/terraform/transform_removed_modules.go @@ -3,8 +3,8 @@ package terraform import ( "log" - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/transform_resource_count.go b/terraform/transform_resource_count.go index e438448b92..4d853593eb 100644 --- a/terraform/transform_resource_count.go +++ b/terraform/transform_resource_count.go @@ -3,8 +3,8 @@ package terraform import ( "log" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/dag" ) diff --git a/terraform/transform_transitive_reduction_test.go b/terraform/transform_transitive_reduction_test.go index f9605d3651..e1e744b155 100644 --- a/terraform/transform_transitive_reduction_test.go +++ b/terraform/transform_transitive_reduction_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/transform_variable.go b/terraform/transform_variable.go index a94cc6311a..86bd6a981a 100644 --- a/terraform/transform_variable.go +++ b/terraform/transform_variable.go @@ -1,8 +1,8 @@ package terraform import ( - "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs" ) // RootVariableTransformer is a GraphTransformer that adds all the root diff --git a/terraform/upgrade_resource_state.go b/terraform/upgrade_resource_state.go index 0cae201581..f14289793c 100644 --- a/terraform/upgrade_resource_state.go +++ b/terraform/upgrade_resource_state.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/states" diff --git a/terraform/validate_selfref.go b/terraform/validate_selfref.go index 8b15d38c8c..01d98d4ded 100644 --- a/terraform/validate_selfref.go +++ b/terraform/validate_selfref.go @@ -5,8 +5,8 @@ import ( "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/internal/addrs" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang" ) diff --git a/terraform/validate_selfref_test.go b/terraform/validate_selfref_test.go index d9c8892864..73fda25d0a 100644 --- a/terraform/validate_selfref_test.go +++ b/terraform/validate_selfref_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hcltest" diff --git a/terraform/variables.go b/terraform/variables.go index 1ecd9f97c0..f8fd03af29 100644 --- a/terraform/variables.go +++ b/terraform/variables.go @@ -7,7 +7,7 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/convert" - "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/tfdiags" ) diff --git a/terraform/version_required.go b/terraform/version_required.go index 5a0de5b79f..f14d93f681 100644 --- a/terraform/version_required.go +++ b/terraform/version_required.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/terraform/internal/tfdiags" - "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/internal/configs" tfversion "github.com/hashicorp/terraform/version" )