From 479c6b246676e080ae4cabd313338f8733700bcd Mon Sep 17 00:00:00 2001 From: Martin Atkins Date: Thu, 5 Jul 2018 10:33:29 -0700 Subject: [PATCH] move "configschema" from "config" to "configs" The "config" package is no longer used and will be removed as part of the 0.12 release cleanup. Since configschema is part of the "new world" of configuration modelling, it makes more sense for it to live as a subdirectory of the newer "configs" package. --- backend/atlas/backend.go | 2 +- backend/backend.go | 2 +- backend/local/backend.go | 2 +- backend/local/backend_apply_test.go | 2 +- backend/local/backend_plan_test.go | 2 +- backend/local/backend_refresh_test.go | 2 +- backend/nil.go | 2 +- command/apply_destroy_test.go | 2 +- command/apply_test.go | 2 +- command/init.go | 2 +- command/meta_config.go | 2 +- configs/backend.go | 2 +- {config => configs}/configschema/coerce_value.go | 0 {config => configs}/configschema/coerce_value_test.go | 0 {config => configs}/configschema/decoder_spec.go | 0 {config => configs}/configschema/decoder_spec_test.go | 0 {config => configs}/configschema/doc.go | 0 {config => configs}/configschema/implied_type.go | 0 {config => configs}/configschema/implied_type_test.go | 0 {config => configs}/configschema/internal_validate.go | 0 {config => configs}/configschema/internal_validate_test.go | 0 {config => configs}/configschema/nestingmode_string.go | 0 {config => configs}/configschema/none_required.go | 0 {config => configs}/configschema/schema.go | 0 configs/configupgrade/analysis.go | 2 +- helper/schema/backend.go | 2 +- helper/schema/core_schema.go | 2 +- helper/schema/core_schema_test.go | 2 +- helper/schema/provider.go | 2 +- helper/schema/provider_test.go | 2 +- helper/schema/provisioner.go | 2 +- lang/eval.go | 2 +- lang/eval_test.go | 2 +- lang/references.go | 2 +- providers/provider.go | 2 +- provisioners/provisioner.go | 2 +- terraform/context_apply_test.go | 2 +- terraform/context_components_test.go | 2 +- terraform/context_fixtures_test.go | 2 +- terraform/context_import_test.go | 2 +- terraform/context_input_test.go | 2 +- terraform/context_plan_test.go | 2 +- terraform/context_refresh_test.go | 2 +- terraform/context_test.go | 2 +- terraform/context_validate_test.go | 2 +- terraform/debug_test.go | 2 +- terraform/eval_context.go | 2 +- terraform/eval_context_builtin.go | 2 +- terraform/eval_context_mock.go | 2 +- terraform/eval_lang.go | 2 +- terraform/eval_provider_test.go | 2 +- terraform/eval_provisioner.go | 2 +- terraform/eval_validate.go | 2 +- terraform/eval_validate_selfref.go | 2 +- terraform/eval_validate_selfref_test.go | 2 +- terraform/eval_validate_test.go | 2 +- terraform/evaluate.go | 2 +- terraform/graph_builder_plan_test.go | 2 +- terraform/graph_walk_context.go | 2 +- terraform/node_provider_abstract.go | 2 +- terraform/node_resource_abstract.go | 2 +- terraform/node_resource_validate.go | 2 +- terraform/resource.go | 2 +- terraform/resource_provider_mock_test.go | 2 +- terraform/resource_provisioner.go | 2 +- terraform/resource_provisioner_mock.go | 2 +- terraform/schemas.go | 2 +- terraform/schemas_test.go | 2 +- terraform/state.go | 2 +- terraform/transform_attach_schema.go | 2 +- terraform/transform_reference.go | 2 +- terraform/transform_resource_count.go | 2 +- terraform/transform_transitive_reduction_test.go | 2 +- 73 files changed, 61 insertions(+), 61 deletions(-) rename {config => configs}/configschema/coerce_value.go (100%) rename {config => configs}/configschema/coerce_value_test.go (100%) rename {config => configs}/configschema/decoder_spec.go (100%) rename {config => configs}/configschema/decoder_spec_test.go (100%) rename {config => configs}/configschema/doc.go (100%) rename {config => configs}/configschema/implied_type.go (100%) rename {config => configs}/configschema/implied_type_test.go (100%) rename {config => configs}/configschema/internal_validate.go (100%) rename {config => configs}/configschema/internal_validate_test.go (100%) rename {config => configs}/configschema/nestingmode_string.go (100%) rename {config => configs}/configschema/none_required.go (100%) rename {config => configs}/configschema/schema.go (100%) diff --git a/backend/atlas/backend.go b/backend/atlas/backend.go index cd839820dc..8903e5b2bc 100644 --- a/backend/atlas/backend.go +++ b/backend/atlas/backend.go @@ -11,7 +11,7 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/backend" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/state" "github.com/hashicorp/terraform/state/remote" diff --git a/backend/backend.go b/backend/backend.go index 90bbebcce4..7e9f6d7622 100644 --- a/backend/backend.go +++ b/backend/backend.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/clistate" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configload" "github.com/hashicorp/terraform/state" diff --git a/backend/local/backend.go b/backend/local/backend.go index 57ab0ae40f..47101364b6 100644 --- a/backend/local/backend.go +++ b/backend/local/backend.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/terraform/backend" "github.com/hashicorp/terraform/command/clistate" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/state" "github.com/hashicorp/terraform/terraform" diff --git a/backend/local/backend_apply_test.go b/backend/local/backend_apply_test.go index 6757d4ec5c..55a43b5448 100644 --- a/backend/local/backend_apply_test.go +++ b/backend/local/backend_apply_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/hashicorp/terraform/backend" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs/configload" "github.com/hashicorp/terraform/state" "github.com/hashicorp/terraform/terraform" diff --git a/backend/local/backend_plan_test.go b/backend/local/backend_plan_test.go index e23f387a60..b41e185999 100644 --- a/backend/local/backend_plan_test.go +++ b/backend/local/backend_plan_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/hashicorp/terraform/backend" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs/configload" "github.com/hashicorp/terraform/terraform" "github.com/mitchellh/cli" diff --git a/backend/local/backend_refresh_test.go b/backend/local/backend_refresh_test.go index d0328a9623..68a3680a08 100644 --- a/backend/local/backend_refresh_test.go +++ b/backend/local/backend_refresh_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform/backend" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs/configload" "github.com/hashicorp/terraform/terraform" "github.com/zclconf/go-cty/cty" diff --git a/backend/nil.go b/backend/nil.go index a8dad7525c..d7317de049 100644 --- a/backend/nil.go +++ b/backend/nil.go @@ -1,7 +1,7 @@ package backend import ( - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/state" "github.com/hashicorp/terraform/tfdiags" "github.com/zclconf/go-cty/cty" diff --git a/command/apply_destroy_test.go b/command/apply_destroy_test.go index 109b5061ae..894db1b7f3 100644 --- a/command/apply_destroy_test.go +++ b/command/apply_destroy_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/terraform" "github.com/mitchellh/cli" "github.com/zclconf/go-cty/cty" diff --git a/command/apply_test.go b/command/apply_test.go index a876c5eefc..6cbdc03344 100644 --- a/command/apply_test.go +++ b/command/apply_test.go @@ -19,7 +19,7 @@ import ( "github.com/mitchellh/cli" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/state" "github.com/hashicorp/terraform/terraform" ) diff --git a/command/init.go b/command/init.go index 007884078b..669f70794e 100644 --- a/command/init.go +++ b/command/init.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform/backend" backendinit "github.com/hashicorp/terraform/backend/init" "github.com/hashicorp/terraform/config" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/plugin" "github.com/hashicorp/terraform/plugin/discovery" diff --git a/command/meta_config.go b/command/meta_config.go index 06ebd738ae..dd2315c506 100644 --- a/command/meta_config.go +++ b/command/meta_config.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/hcl2/hcl/hclsyntax" "github.com/hashicorp/hcl2/hcl" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configload" "github.com/hashicorp/terraform/terraform" diff --git a/configs/backend.go b/configs/backend.go index 56cd04f415..6df7ddd02e 100644 --- a/configs/backend.go +++ b/configs/backend.go @@ -3,7 +3,7 @@ package configs import ( "github.com/hashicorp/hcl2/hcl" "github.com/hashicorp/hcl2/hcldec" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/zclconf/go-cty/cty" ) diff --git a/config/configschema/coerce_value.go b/configs/configschema/coerce_value.go similarity index 100% rename from config/configschema/coerce_value.go rename to configs/configschema/coerce_value.go diff --git a/config/configschema/coerce_value_test.go b/configs/configschema/coerce_value_test.go similarity index 100% rename from config/configschema/coerce_value_test.go rename to configs/configschema/coerce_value_test.go diff --git a/config/configschema/decoder_spec.go b/configs/configschema/decoder_spec.go similarity index 100% rename from config/configschema/decoder_spec.go rename to configs/configschema/decoder_spec.go diff --git a/config/configschema/decoder_spec_test.go b/configs/configschema/decoder_spec_test.go similarity index 100% rename from config/configschema/decoder_spec_test.go rename to configs/configschema/decoder_spec_test.go diff --git a/config/configschema/doc.go b/configs/configschema/doc.go similarity index 100% rename from config/configschema/doc.go rename to configs/configschema/doc.go diff --git a/config/configschema/implied_type.go b/configs/configschema/implied_type.go similarity index 100% rename from config/configschema/implied_type.go rename to configs/configschema/implied_type.go diff --git a/config/configschema/implied_type_test.go b/configs/configschema/implied_type_test.go similarity index 100% rename from config/configschema/implied_type_test.go rename to configs/configschema/implied_type_test.go diff --git a/config/configschema/internal_validate.go b/configs/configschema/internal_validate.go similarity index 100% rename from config/configschema/internal_validate.go rename to configs/configschema/internal_validate.go diff --git a/config/configschema/internal_validate_test.go b/configs/configschema/internal_validate_test.go similarity index 100% rename from config/configschema/internal_validate_test.go rename to configs/configschema/internal_validate_test.go diff --git a/config/configschema/nestingmode_string.go b/configs/configschema/nestingmode_string.go similarity index 100% rename from config/configschema/nestingmode_string.go rename to configs/configschema/nestingmode_string.go diff --git a/config/configschema/none_required.go b/configs/configschema/none_required.go similarity index 100% rename from config/configschema/none_required.go rename to configs/configschema/none_required.go diff --git a/config/configschema/schema.go b/configs/configschema/schema.go similarity index 100% rename from config/configschema/schema.go rename to configs/configschema/schema.go diff --git a/configs/configupgrade/analysis.go b/configs/configupgrade/analysis.go index ea67e12115..bca92d434a 100644 --- a/configs/configupgrade/analysis.go +++ b/configs/configupgrade/analysis.go @@ -8,7 +8,7 @@ import ( hcl1parser "github.com/hashicorp/hcl/hcl/parser" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/moduledeps" "github.com/hashicorp/terraform/plugin/discovery" "github.com/hashicorp/terraform/terraform" diff --git a/helper/schema/backend.go b/helper/schema/backend.go index 6d5fb4be88..6785c9f335 100644 --- a/helper/schema/backend.go +++ b/helper/schema/backend.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform/tfdiags" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/config/hcl2shim" "github.com/hashicorp/terraform/terraform" ) diff --git a/helper/schema/core_schema.go b/helper/schema/core_schema.go index d6f81027fb..3e8bdd91e7 100644 --- a/helper/schema/core_schema.go +++ b/helper/schema/core_schema.go @@ -3,7 +3,7 @@ package schema import ( "fmt" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/zclconf/go-cty/cty" ) diff --git a/helper/schema/core_schema_test.go b/helper/schema/core_schema_test.go index 6a198b84cb..68f8a9159d 100644 --- a/helper/schema/core_schema_test.go +++ b/helper/schema/core_schema_test.go @@ -8,7 +8,7 @@ import ( "github.com/davecgh/go-spew/spew" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" ) func TestSchemaMapCoreConfigSchema(t *testing.T) { diff --git a/helper/schema/provider.go b/helper/schema/provider.go index 6cd325daf4..4355fa4c2a 100644 --- a/helper/schema/provider.go +++ b/helper/schema/provider.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/go-multierror" "github.com/hashicorp/terraform/config" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/terraform" ) diff --git a/helper/schema/provider_test.go b/helper/schema/provider_test.go index 959a88a341..603bb5da98 100644 --- a/helper/schema/provider_test.go +++ b/helper/schema/provider_test.go @@ -10,7 +10,7 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/config" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/terraform" ) diff --git a/helper/schema/provisioner.go b/helper/schema/provisioner.go index 478e59870b..2def998b49 100644 --- a/helper/schema/provisioner.go +++ b/helper/schema/provisioner.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/go-multierror" "github.com/hashicorp/terraform/config" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/terraform" ) diff --git a/lang/eval.go b/lang/eval.go index 486eded2d9..ab8ec33e16 100644 --- a/lang/eval.go +++ b/lang/eval.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/hcl2/ext/dynblock" "github.com/hashicorp/hcl2/hcl" "github.com/hashicorp/hcl2/hcldec" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/tfdiags" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/convert" diff --git a/lang/eval_test.go b/lang/eval_test.go index 09da43edc5..f772386a2a 100644 --- a/lang/eval_test.go +++ b/lang/eval_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/hcl2/hcl" "github.com/hashicorp/hcl2/hcl/hclsyntax" diff --git a/lang/references.go b/lang/references.go index 132616fa87..69dd0d82ca 100644 --- a/lang/references.go +++ b/lang/references.go @@ -4,7 +4,7 @@ import ( "github.com/hashicorp/hcl2/hcl" "github.com/hashicorp/hcl2/hcldec" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/providers/provider.go b/providers/provider.go index d490ff6646..7cf1da9de6 100644 --- a/providers/provider.go +++ b/providers/provider.go @@ -1,7 +1,7 @@ package providers import ( - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/tfdiags" "github.com/zclconf/go-cty/cty" ) diff --git a/provisioners/provisioner.go b/provisioners/provisioner.go index 332d08c0ca..13e1e30a86 100644 --- a/provisioners/provisioner.go +++ b/provisioners/provisioner.go @@ -1,7 +1,7 @@ package provisioner import ( - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/tfdiags" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/context_apply_test.go b/terraform/context_apply_test.go index 266258d16c..908c3fe253 100644 --- a/terraform/context_apply_test.go +++ b/terraform/context_apply_test.go @@ -19,7 +19,7 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/terraform/context_components_test.go b/terraform/context_components_test.go index 354257bed0..1eb2ee7203 100644 --- a/terraform/context_components_test.go +++ b/terraform/context_components_test.go @@ -3,7 +3,7 @@ package terraform import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" ) // simpleMockComponentFactory returns a component factory pre-configured with diff --git a/terraform/context_fixtures_test.go b/terraform/context_fixtures_test.go index 61536c249a..912bfd3dd1 100644 --- a/terraform/context_fixtures_test.go +++ b/terraform/context_fixtures_test.go @@ -3,7 +3,7 @@ package terraform import ( "testing" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/context_import_test.go b/terraform/context_import_test.go index bdbb1d6136..70cde67029 100644 --- a/terraform/context_import_test.go +++ b/terraform/context_import_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/context_input_test.go b/terraform/context_input_test.go index 500b681b92..30cabde699 100644 --- a/terraform/context_input_test.go +++ b/terraform/context_input_test.go @@ -9,7 +9,7 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" ) func TestContext2Input(t *testing.T) { diff --git a/terraform/context_plan_test.go b/terraform/context_plan_test.go index 0ad11fcaf0..a898f652cf 100644 --- a/terraform/context_plan_test.go +++ b/terraform/context_plan_test.go @@ -14,7 +14,7 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" ) func TestContext2Plan_basic(t *testing.T) { diff --git a/terraform/context_refresh_test.go b/terraform/context_refresh_test.go index 62c30447f4..8ddb693619 100644 --- a/terraform/context_refresh_test.go +++ b/terraform/context_refresh_test.go @@ -11,7 +11,7 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" ) func TestContext2Refresh(t *testing.T) { diff --git a/terraform/context_test.go b/terraform/context_test.go index f21e6471f5..a966d2d0ec 100644 --- a/terraform/context_test.go +++ b/terraform/context_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/hil" "github.com/hashicorp/terraform/config" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs" "github.com/zclconf/go-cty/cty" diff --git a/terraform/context_validate_test.go b/terraform/context_validate_test.go index c09847111a..aa4ecef4a0 100644 --- a/terraform/context_validate_test.go +++ b/terraform/context_validate_test.go @@ -8,7 +8,7 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" ) func TestContext2Validate_badCount(t *testing.T) { diff --git a/terraform/debug_test.go b/terraform/debug_test.go index b41e17a7bc..58d194b8e6 100644 --- a/terraform/debug_test.go +++ b/terraform/debug_test.go @@ -12,7 +12,7 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" ) // debugInfo should be safe when nil diff --git a/terraform/eval_context.go b/terraform/eval_context.go index 660d6bb79e..21255e67f3 100644 --- a/terraform/eval_context.go +++ b/terraform/eval_context.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/hcl2/hcl" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/lang" "github.com/hashicorp/terraform/tfdiags" "github.com/zclconf/go-cty/cty" diff --git a/terraform/eval_context_builtin.go b/terraform/eval_context_builtin.go index cbbe9b377d..465504ba9c 100644 --- a/terraform/eval_context_builtin.go +++ b/terraform/eval_context_builtin.go @@ -7,7 +7,7 @@ import ( "sync" "github.com/hashicorp/hcl2/hcl" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/lang" "github.com/hashicorp/terraform/tfdiags" diff --git a/terraform/eval_context_mock.go b/terraform/eval_context_mock.go index c31ad62a0e..99e3cc3adc 100644 --- a/terraform/eval_context_mock.go +++ b/terraform/eval_context_mock.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/config" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/lang" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/terraform/eval_lang.go b/terraform/eval_lang.go index f99e4c4bfa..0c051f76ab 100644 --- a/terraform/eval_lang.go +++ b/terraform/eval_lang.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/hcl2/hcl" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/eval_provider_test.go b/terraform/eval_provider_test.go index 81e79bd1eb..78b438b978 100644 --- a/terraform/eval_provider_test.go +++ b/terraform/eval_provider_test.go @@ -7,7 +7,7 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs" ) diff --git a/terraform/eval_provisioner.go b/terraform/eval_provisioner.go index ea3a05c66a..b0945e3b7e 100644 --- a/terraform/eval_provisioner.go +++ b/terraform/eval_provisioner.go @@ -3,7 +3,7 @@ package terraform import ( "fmt" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" ) // EvalInitProvisioner is an EvalNode implementation that initializes a provisioner diff --git a/terraform/eval_validate.go b/terraform/eval_validate.go index dd9acf6bb0..548d82f501 100644 --- a/terraform/eval_validate.go +++ b/terraform/eval_validate.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/hcl2/hcl" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/tfdiags" "github.com/zclconf/go-cty/cty" diff --git a/terraform/eval_validate_selfref.go b/terraform/eval_validate_selfref.go index c577fc2919..2121f5dacd 100644 --- a/terraform/eval_validate_selfref.go +++ b/terraform/eval_validate_selfref.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/hcl2/hcl" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/lang" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/terraform/eval_validate_selfref_test.go b/terraform/eval_validate_selfref_test.go index 461b06a833..dc8800581e 100644 --- a/terraform/eval_validate_selfref_test.go +++ b/terraform/eval_validate_selfref_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/tfdiags" "github.com/hashicorp/hcl2/hcl" diff --git a/terraform/eval_validate_test.go b/terraform/eval_validate_test.go index 869eb776e3..023e84e399 100644 --- a/terraform/eval_validate_test.go +++ b/terraform/eval_validate_test.go @@ -10,7 +10,7 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/terraform/evaluate.go b/terraform/evaluate.go index 32064b8d67..ba1b020221 100644 --- a/terraform/evaluate.go +++ b/terraform/evaluate.go @@ -14,7 +14,7 @@ import ( "github.com/zclconf/go-cty/cty/convert" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/config/hcl2shim" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/lang" diff --git a/terraform/graph_builder_plan_test.go b/terraform/graph_builder_plan_test.go index c0bbbee9e7..57e78a4b5b 100644 --- a/terraform/graph_builder_plan_test.go +++ b/terraform/graph_builder_plan_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" ) func TestPlanGraphBuilder_impl(t *testing.T) { diff --git a/terraform/graph_walk_context.go b/terraform/graph_walk_context.go index 4ecfbbdd23..9e0df140d9 100644 --- a/terraform/graph_walk_context.go +++ b/terraform/graph_walk_context.go @@ -7,7 +7,7 @@ import ( "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/tfdiags" "github.com/hashicorp/terraform/addrs" diff --git a/terraform/node_provider_abstract.go b/terraform/node_provider_abstract.go index ff82a2197f..41b24fb13a 100644 --- a/terraform/node_provider_abstract.go +++ b/terraform/node_provider_abstract.go @@ -2,7 +2,7 @@ package terraform import ( "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/dag" diff --git a/terraform/node_resource_abstract.go b/terraform/node_resource_abstract.go index bed6655704..82e5841649 100644 --- a/terraform/node_resource_abstract.go +++ b/terraform/node_resource_abstract.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/hcl2/hcl/hclsyntax" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/dag" "github.com/hashicorp/terraform/lang" diff --git a/terraform/node_resource_validate.go b/terraform/node_resource_validate.go index c8531801ed..ef07c9bd91 100644 --- a/terraform/node_resource_validate.go +++ b/terraform/node_resource_validate.go @@ -1,7 +1,7 @@ package terraform import ( - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/resource.go b/terraform/resource.go index 1d9acbfecc..403243ce66 100644 --- a/terraform/resource.go +++ b/terraform/resource.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/config/hcl2shim" "github.com/hashicorp/terraform/config" diff --git a/terraform/resource_provider_mock_test.go b/terraform/resource_provider_mock_test.go index 87af91f706..7b77e2150e 100644 --- a/terraform/resource_provider_mock_test.go +++ b/terraform/resource_provider_mock_test.go @@ -3,7 +3,7 @@ package terraform import ( "testing" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/zclconf/go-cty/cty" ) diff --git a/terraform/resource_provisioner.go b/terraform/resource_provisioner.go index 17bf1ce2ec..e557181004 100644 --- a/terraform/resource_provisioner.go +++ b/terraform/resource_provisioner.go @@ -1,7 +1,7 @@ package terraform import ( - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" ) // ResourceProvisioner is an interface that must be implemented by any diff --git a/terraform/resource_provisioner_mock.go b/terraform/resource_provisioner_mock.go index 5337f545c6..7b88cf7333 100644 --- a/terraform/resource_provisioner_mock.go +++ b/terraform/resource_provisioner_mock.go @@ -3,7 +3,7 @@ package terraform import ( "sync" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" ) // MockResourceProvisioner implements ResourceProvisioner but mocks out all the diff --git a/terraform/schemas.go b/terraform/schemas.go index cd8d811f27..27ff440c07 100644 --- a/terraform/schemas.go +++ b/terraform/schemas.go @@ -5,7 +5,7 @@ import ( "log" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/terraform/schemas_test.go b/terraform/schemas_test.go index 613de44ed3..1283b60b76 100644 --- a/terraform/schemas_test.go +++ b/terraform/schemas_test.go @@ -1,7 +1,7 @@ package terraform import ( - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" ) func simpleTestSchemas() *Schemas { diff --git a/terraform/state.go b/terraform/state.go index bdc2538d98..7f74a96639 100644 --- a/terraform/state.go +++ b/terraform/state.go @@ -23,7 +23,7 @@ import ( "github.com/hashicorp/hcl2/hcl/hclsyntax" "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/config" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/tfdiags" tfversion "github.com/hashicorp/terraform/version" diff --git a/terraform/transform_attach_schema.go b/terraform/transform_attach_schema.go index c6b5187ea1..2eceb1255d 100644 --- a/terraform/transform_attach_schema.go +++ b/terraform/transform_attach_schema.go @@ -5,7 +5,7 @@ import ( "log" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/dag" ) diff --git a/terraform/transform_reference.go b/terraform/transform_reference.go index 4e2c629b56..4215ad5875 100644 --- a/terraform/transform_reference.go +++ b/terraform/transform_reference.go @@ -5,7 +5,7 @@ import ( "log" "github.com/hashicorp/hcl2/hcl" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/lang" "github.com/hashicorp/terraform/addrs" diff --git a/terraform/transform_resource_count.go b/terraform/transform_resource_count.go index 7f325df385..f886ed6ef5 100644 --- a/terraform/transform_resource_count.go +++ b/terraform/transform_resource_count.go @@ -2,7 +2,7 @@ package terraform import ( "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/dag" ) diff --git a/terraform/transform_transitive_reduction_test.go b/terraform/transform_transitive_reduction_test.go index 147101657f..311a10a091 100644 --- a/terraform/transform_transitive_reduction_test.go +++ b/terraform/transform_transitive_reduction_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/configschema" + "github.com/hashicorp/terraform/configs/configschema" "github.com/zclconf/go-cty/cty" )