diff --git a/backend/remote-state/oss/backend_test.go b/backend/remote-state/oss/backend_test.go index 51310388b..8ae4a4ec7 100644 --- a/backend/remote-state/oss/backend_test.go +++ b/backend/remote-state/oss/backend_test.go @@ -9,7 +9,7 @@ import ( "github.com/aliyun/aliyun-oss-go-sdk/oss" "github.com/aliyun/aliyun-tablestore-go-sdk/tablestore" "github.com/hashicorp/terraform/backend" - "github.com/hashicorp/terraform/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" "strings" ) diff --git a/backend/remote-state/s3/backend_test.go b/backend/remote-state/s3/backend_test.go index a24325880..eeaf91de6 100644 --- a/backend/remote-state/s3/backend_test.go +++ b/backend/remote-state/s3/backend_test.go @@ -11,7 +11,7 @@ import ( "github.com/aws/aws-sdk-go/service/dynamodb" "github.com/aws/aws-sdk-go/service/s3" "github.com/hashicorp/terraform/backend" - "github.com/hashicorp/terraform/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/state/remote" "github.com/hashicorp/terraform/states" ) diff --git a/backend/testing.go b/backend/testing.go index 79980debf..1034eac23 100644 --- a/backend/testing.go +++ b/backend/testing.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/hcl2/hcldec" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/hcl2shim" "github.com/hashicorp/terraform/configs" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/state" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statemgr" diff --git a/builtin/providers/test/resource_map.go b/builtin/providers/test/resource_map.go index d78c827d4..c6bf62bd6 100644 --- a/builtin/providers/test/resource_map.go +++ b/builtin/providers/test/resource_map.go @@ -3,7 +3,7 @@ package test import ( "fmt" - "github.com/hashicorp/terraform/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/provisioners/chef/resource_provisioner_test.go b/builtin/provisioners/chef/resource_provisioner_test.go index d82ed6f7a..bc9f24279 100644 --- a/builtin/provisioners/chef/resource_provisioner_test.go +++ b/builtin/provisioners/chef/resource_provisioner_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform/communicator" - "github.com/hashicorp/terraform/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/provisioners/file/resource_provisioner_test.go b/builtin/provisioners/file/resource_provisioner_test.go index 620ae042c..c7e34c0ab 100644 --- a/builtin/provisioners/file/resource_provisioner_test.go +++ b/builtin/provisioners/file/resource_provisioner_test.go @@ -3,7 +3,7 @@ package file import ( "testing" - "github.com/hashicorp/terraform/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/terraform" ) diff --git a/command/apply.go b/command/apply.go index 01751b7be..28ddec774 100644 --- a/command/apply.go +++ b/command/apply.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/go-getter" "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/backend" - "github.com/hashicorp/terraform/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/repl" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/tfdiags" diff --git a/command/output.go b/command/output.go index 789be53a4..ecc09b99d 100644 --- a/command/output.go +++ b/command/output.go @@ -10,7 +10,7 @@ import ( ctyjson "github.com/zclconf/go-cty/cty/json" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/repl" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/tfdiags" diff --git a/config/hcl2_shim_util.go b/config/hcl2_shim_util.go index 207d10598..80561b6cc 100644 --- a/config/hcl2_shim_util.go +++ b/config/hcl2_shim_util.go @@ -6,7 +6,7 @@ import ( "github.com/zclconf/go-cty/cty/function/stdlib" "github.com/hashicorp/hil/ast" - "github.com/hashicorp/terraform/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" hcl2 "github.com/hashicorp/hcl2/hcl" "github.com/zclconf/go-cty/cty" diff --git a/config/interpolate_walk.go b/config/interpolate_walk.go index ce33ab1a4..f152d8004 100644 --- a/config/interpolate_walk.go +++ b/config/interpolate_walk.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/hil" "github.com/hashicorp/hil/ast" - "github.com/hashicorp/terraform/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/mitchellh/reflectwalk" ) diff --git a/config/interpolate_walk_test.go b/config/interpolate_walk_test.go index 7629c579d..b5afacffa 100644 --- a/config/interpolate_walk_test.go +++ b/config/interpolate_walk_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/hil/ast" - "github.com/hashicorp/terraform/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/mitchellh/reflectwalk" ) diff --git a/config/loader_hcl2.go b/config/loader_hcl2.go index 4f9f129f2..34c66c9ca 100644 --- a/config/loader_hcl2.go +++ b/config/loader_hcl2.go @@ -8,7 +8,7 @@ import ( gohcl2 "github.com/hashicorp/hcl2/gohcl" hcl2 "github.com/hashicorp/hcl2/hcl" hcl2parse "github.com/hashicorp/hcl2/hclparse" - "github.com/hashicorp/terraform/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/zclconf/go-cty/cty" ) diff --git a/config/raw_config_test.go b/config/raw_config_test.go index b0924df40..d415a5faa 100644 --- a/config/raw_config_test.go +++ b/config/raw_config_test.go @@ -7,7 +7,7 @@ import ( hcl2 "github.com/hashicorp/hcl2/hcl" "github.com/hashicorp/hil/ast" - "github.com/hashicorp/terraform/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" ) func TestNewRawConfig(t *testing.T) { diff --git a/config/hcl2shim/flatmap.go b/configs/hcl2shim/flatmap.go similarity index 100% rename from config/hcl2shim/flatmap.go rename to configs/hcl2shim/flatmap.go diff --git a/config/hcl2shim/flatmap_test.go b/configs/hcl2shim/flatmap_test.go similarity index 100% rename from config/hcl2shim/flatmap_test.go rename to configs/hcl2shim/flatmap_test.go diff --git a/config/hcl2shim/paths.go b/configs/hcl2shim/paths.go similarity index 100% rename from config/hcl2shim/paths.go rename to configs/hcl2shim/paths.go diff --git a/config/hcl2shim/paths_test.go b/configs/hcl2shim/paths_test.go similarity index 100% rename from config/hcl2shim/paths_test.go rename to configs/hcl2shim/paths_test.go diff --git a/config/hcl2shim/single_attr_body.go b/configs/hcl2shim/single_attr_body.go similarity index 100% rename from config/hcl2shim/single_attr_body.go rename to configs/hcl2shim/single_attr_body.go diff --git a/config/hcl2shim/values.go b/configs/hcl2shim/values.go similarity index 100% rename from config/hcl2shim/values.go rename to configs/hcl2shim/values.go diff --git a/config/hcl2shim/values_equiv.go b/configs/hcl2shim/values_equiv.go similarity index 100% rename from config/hcl2shim/values_equiv.go rename to configs/hcl2shim/values_equiv.go diff --git a/config/hcl2shim/values_equiv_test.go b/configs/hcl2shim/values_equiv_test.go similarity index 100% rename from config/hcl2shim/values_equiv_test.go rename to configs/hcl2shim/values_equiv_test.go diff --git a/config/hcl2shim/values_test.go b/configs/hcl2shim/values_test.go similarity index 100% rename from config/hcl2shim/values_test.go rename to configs/hcl2shim/values_test.go diff --git a/helper/plugin/grpc_provider.go b/helper/plugin/grpc_provider.go index 104c8f5f4..f32610c6c 100644 --- a/helper/plugin/grpc_provider.go +++ b/helper/plugin/grpc_provider.go @@ -11,8 +11,8 @@ import ( "github.com/zclconf/go-cty/cty/msgpack" context "golang.org/x/net/context" - "github.com/hashicorp/terraform/config/hcl2shim" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/helper/schema" proto "github.com/hashicorp/terraform/internal/tfplugin5" "github.com/hashicorp/terraform/plans/objchange" diff --git a/helper/resource/state_shim.go b/helper/resource/state_shim.go index f4882075d..7cf06dd9d 100644 --- a/helper/resource/state_shim.go +++ b/helper/resource/state_shim.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/states" diff --git a/helper/resource/testing_config.go b/helper/resource/testing_config.go index f34e17a2e..e3da9bc02 100644 --- a/helper/resource/testing_config.go +++ b/helper/resource/testing_config.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/states" "github.com/hashicorp/errwrap" diff --git a/helper/schema/backend.go b/helper/schema/backend.go index c8d8ae28c..42c2bed92 100644 --- a/helper/schema/backend.go +++ b/helper/schema/backend.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform/tfdiags" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/config/hcl2shim" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/terraform" ctyconvert "github.com/zclconf/go-cty/cty/convert" ) diff --git a/helper/schema/field_reader_config_test.go b/helper/schema/field_reader_config_test.go index e6ade5b44..5e2728250 100644 --- a/helper/schema/field_reader_config_test.go +++ b/helper/schema/field_reader_config_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/terraform/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/terraform" ) diff --git a/helper/schema/resource_diff_test.go b/helper/schema/resource_diff_test.go index b43c06996..e6897b731 100644 --- a/helper/schema/resource_diff_test.go +++ b/helper/schema/resource_diff_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/hashicorp/terraform/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/terraform" ) diff --git a/helper/schema/resource_test.go b/helper/schema/resource_test.go index f55803a74..a532dba39 100644 --- a/helper/schema/resource_test.go +++ b/helper/schema/resource_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/terraform" "github.com/zclconf/go-cty/cty" diff --git a/helper/schema/resource_timeout.go b/helper/schema/resource_timeout.go index 1a15a0ebd..5ad7aafc8 100644 --- a/helper/schema/resource_timeout.go +++ b/helper/schema/resource_timeout.go @@ -5,7 +5,7 @@ import ( "log" "time" - "github.com/hashicorp/terraform/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/terraform" "github.com/mitchellh/copystructure" ) diff --git a/helper/schema/schema.go b/helper/schema/schema.go index bcc8e4ba3..214e3fe46 100644 --- a/helper/schema/schema.go +++ b/helper/schema/schema.go @@ -22,7 +22,7 @@ import ( "strings" "sync" - "github.com/hashicorp/terraform/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/terraform" "github.com/mitchellh/copystructure" "github.com/mitchellh/mapstructure" diff --git a/helper/schema/schema_test.go b/helper/schema/schema_test.go index e21fdc6ac..cfadbbc2b 100644 --- a/helper/schema/schema_test.go +++ b/helper/schema/schema_test.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/hil" "github.com/hashicorp/hil/ast" - "github.com/hashicorp/terraform/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/terraform" ) diff --git a/helper/schema/shims.go b/helper/schema/shims.go index 988573e27..d2dbff53c 100644 --- a/helper/schema/shims.go +++ b/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/config/hcl2shim" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/terraform" ) diff --git a/helper/schema/shims_test.go b/helper/schema/shims_test.go index 1d8d3ad1b..050286a02 100644 --- a/helper/schema/shims_test.go +++ b/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/config/hcl2shim" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/terraform" diff --git a/plugin/grpc_provider_test.go b/plugin/grpc_provider_test.go index cacc36a2e..5abbff51a 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/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/tfdiags" "github.com/zclconf/go-cty/cty" diff --git a/plugin/grpc_provisioner_test.go b/plugin/grpc_provisioner_test.go index 2c281333b..62ab0c7d1 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/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" proto "github.com/hashicorp/terraform/internal/tfplugin5" "github.com/hashicorp/terraform/provisioners" "github.com/zclconf/go-cty/cty" diff --git a/repl/session.go b/repl/session.go index 56e11b39d..b6d45888c 100644 --- a/repl/session.go +++ b/repl/session.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/hcl2/hcl" "github.com/hashicorp/hcl2/hcl/hclsyntax" - "github.com/hashicorp/terraform/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/lang" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/states/instance_object_src.go b/states/instance_object_src.go index 6cb3c27e2..62907ab76 100644 --- a/states/instance_object_src.go +++ b/states/instance_object_src.go @@ -5,7 +5,7 @@ import ( ctyjson "github.com/zclconf/go-cty/cty/json" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" ) // ResourceInstanceObjectSrc is a not-fully-decoded version of diff --git a/states/state_string.go b/states/state_string.go index bca4581c9..8be3d01a0 100644 --- a/states/state_string.go +++ b/states/state_string.go @@ -11,7 +11,7 @@ import ( ctyjson "github.com/zclconf/go-cty/cty/json" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" ) // String returns a rather-odd string representation of the entire state. diff --git a/terraform/context_apply_test.go b/terraform/context_apply_test.go index 4c71dbdd9..c3ce2ce3b 100644 --- a/terraform/context_apply_test.go +++ b/terraform/context_apply_test.go @@ -21,9 +21,9 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/hcl2shim" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/provisioners" diff --git a/terraform/context_plan_test.go b/terraform/context_plan_test.go index 0bf293d72..d1e3c9ed2 100644 --- a/terraform/context_plan_test.go +++ b/terraform/context_plan_test.go @@ -16,8 +16,8 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/hcl2shim" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/states" diff --git a/terraform/context_refresh_test.go b/terraform/context_refresh_test.go index 7f6670296..45c4ae2eb 100644 --- a/terraform/context_refresh_test.go +++ b/terraform/context_refresh_test.go @@ -12,8 +12,8 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/hcl2shim" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/context_test.go b/terraform/context_test.go index 0bbe73fa7..abf121405 100644 --- a/terraform/context_test.go +++ b/terraform/context_test.go @@ -21,10 +21,10 @@ import ( "github.com/hashicorp/hil" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/config/hcl2shim" "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/flatmap" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/plans/planfile" diff --git a/terraform/diff.go b/terraform/diff.go index 323462f0b..00cfdac54 100644 --- a/terraform/diff.go +++ b/terraform/diff.go @@ -13,8 +13,8 @@ import ( "sync" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/hcl2shim" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/zclconf/go-cty/cty" "github.com/mitchellh/copystructure" diff --git a/terraform/eval_local_test.go b/terraform/eval_local_test.go index f862b5e4d..077482ba2 100644 --- a/terraform/eval_local_test.go +++ b/terraform/eval_local_test.go @@ -10,7 +10,7 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/eval_variable.go b/terraform/eval_variable.go index ea4697398..f21761b77 100644 --- a/terraform/eval_variable.go +++ b/terraform/eval_variable.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/config" - "github.com/hashicorp/terraform/config/hcl2shim" "github.com/hashicorp/terraform/config/module" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/convert" ) diff --git a/terraform/interpolate.go b/terraform/interpolate.go index 97bb1f699..a43da971c 100644 --- a/terraform/interpolate.go +++ b/terraform/interpolate.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/hil" "github.com/hashicorp/hil/ast" "github.com/hashicorp/terraform/config" - "github.com/hashicorp/terraform/config/hcl2shim" "github.com/hashicorp/terraform/config/module" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/flatmap" ) diff --git a/terraform/provider_mock.go b/terraform/provider_mock.go index 8eede4821..d82dc0f4e 100644 --- a/terraform/provider_mock.go +++ b/terraform/provider_mock.go @@ -8,7 +8,7 @@ import ( "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" - "github.com/hashicorp/terraform/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/terraform/resource.go b/terraform/resource.go index 9b8ce1d36..fcf28aa65 100644 --- a/terraform/resource.go +++ b/terraform/resource.go @@ -13,8 +13,8 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/config" - "github.com/hashicorp/terraform/config/hcl2shim" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/configs/hcl2shim" ) // Resource is a legacy way to identify a particular resource instance. diff --git a/terraform/resource_test.go b/terraform/resource_test.go index 154af4bc4..5ad2de415 100644 --- a/terraform/resource_test.go +++ b/terraform/resource_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform/configs/configschema" "github.com/zclconf/go-cty/cty" - "github.com/hashicorp/terraform/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/mitchellh/reflectwalk" ) diff --git a/terraform/state.go b/terraform/state.go index 6280fb0e4..ff1cfe745 100644 --- a/terraform/state.go +++ b/terraform/state.go @@ -28,9 +28,9 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/config" - "github.com/hashicorp/terraform/config/hcl2shim" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" + "github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/tfdiags" tfversion "github.com/hashicorp/terraform/version" diff --git a/terraform/state_test.go b/terraform/state_test.go index f6275cb55..6fd07b5c5 100644 --- a/terraform/state_test.go +++ b/terraform/state_test.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/config" - "github.com/hashicorp/terraform/config/hcl2shim" + "github.com/hashicorp/terraform/configs/hcl2shim" ) func TestStateValidate(t *testing.T) {