diff --git a/instances/expander.go b/internal/instances/expander.go similarity index 100% rename from instances/expander.go rename to internal/instances/expander.go diff --git a/instances/expander_test.go b/internal/instances/expander_test.go similarity index 100% rename from instances/expander_test.go rename to internal/instances/expander_test.go diff --git a/instances/expansion_mode.go b/internal/instances/expansion_mode.go similarity index 100% rename from instances/expansion_mode.go rename to internal/instances/expansion_mode.go diff --git a/instances/instance_key_data.go b/internal/instances/instance_key_data.go similarity index 100% rename from instances/instance_key_data.go rename to internal/instances/instance_key_data.go diff --git a/lang/eval.go b/lang/eval.go index 252c144ec..f4c7474aa 100644 --- a/lang/eval.go +++ b/lang/eval.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/instances" + "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang/blocktoattr" "github.com/zclconf/go-cty/cty" diff --git a/lang/eval_test.go b/lang/eval_test.go index 4b812a7ed..594b01c1e 100644 --- a/lang/eval_test.go +++ b/lang/eval_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/instances" + "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" diff --git a/terraform/context.go b/terraform/context.go index cbb534cd0..a6d538c47 100644 --- a/terraform/context.go +++ b/terraform/context.go @@ -10,7 +10,7 @@ import ( "github.com/apparentlymart/go-versions/versions" "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/instances" + "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang" "github.com/hashicorp/terraform/plans" diff --git a/terraform/eval_context.go b/terraform/eval_context.go index 634fe7397..8d69ddb77 100644 --- a/terraform/eval_context.go +++ b/terraform/eval_context.go @@ -4,7 +4,7 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/instances" + "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang" "github.com/hashicorp/terraform/plans" diff --git a/terraform/eval_context_builtin.go b/terraform/eval_context_builtin.go index acf6edd7a..55cc520ca 100644 --- a/terraform/eval_context_builtin.go +++ b/terraform/eval_context_builtin.go @@ -6,7 +6,7 @@ import ( "log" "sync" - "github.com/hashicorp/terraform/instances" + "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/provisioners" diff --git a/terraform/eval_context_mock.go b/terraform/eval_context_mock.go index a158390de..67a9f954f 100644 --- a/terraform/eval_context_mock.go +++ b/terraform/eval_context_mock.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/instances" + "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang" "github.com/hashicorp/terraform/plans" diff --git a/terraform/evaluate.go b/terraform/evaluate.go index a19c8af8a..7df181627 100644 --- a/terraform/evaluate.go +++ b/terraform/evaluate.go @@ -15,7 +15,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/instances" + "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang" "github.com/hashicorp/terraform/plans" diff --git a/terraform/graph_walk_context.go b/terraform/graph_walk_context.go index cfead392e..13da0d04b 100644 --- a/terraform/graph_walk_context.go +++ b/terraform/graph_walk_context.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/instances" + "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/providers" diff --git a/terraform/node_module_expand_test.go b/terraform/node_module_expand_test.go index c83d16934..3da965871 100644 --- a/terraform/node_module_expand_test.go +++ b/terraform/node_module_expand_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/hcl/v2/hcltest" "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/instances" + "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 fe94d9b4b..7d8c0c6fb 100644 --- a/terraform/node_module_variable.go +++ b/terraform/node_module_variable.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/instances" "github.com/hashicorp/terraform/internal/dag" + "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/lang" "github.com/zclconf/go-cty/cty" diff --git a/terraform/node_resource_apply_test.go b/terraform/node_resource_apply_test.go index 54b65ec4f..53eb70142 100644 --- a/terraform/node_resource_apply_test.go +++ b/terraform/node_resource_apply_test.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/instances" + "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/node_resource_plan_orphan_test.go b/terraform/node_resource_plan_orphan_test.go index df663abac..299011156 100644 --- a/terraform/node_resource_plan_orphan_test.go +++ b/terraform/node_resource_plan_orphan_test.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/instances" + "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/states" diff --git a/terraform/node_resource_plan_test.go b/terraform/node_resource_plan_test.go index e3a8faa19..a961be433 100644 --- a/terraform/node_resource_plan_test.go +++ b/terraform/node_resource_plan_test.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/instances" + "github.com/hashicorp/terraform/internal/instances" "github.com/hashicorp/terraform/states" )