From 70eebe3521d2f1ffcb5c12b75e90f1b82db94551 Mon Sep 17 00:00:00 2001 From: Martin Atkins Date: Mon, 17 May 2021 09:30:37 -0700 Subject: [PATCH] Move dag/ to internal/dag/ This is part of a general effort to move all of Terraform's non-library package surface under internal in order to reinforce that these are for internal use within Terraform only. If you were previously importing packages under this prefix into an external codebase, you could pin to an earlier release tag as an interim solution until you've make a plan to achieve the same functionality some other way. --- command/graph.go | 2 +- {dag => internal/dag}/dag.go | 0 {dag => internal/dag}/dag_test.go | 0 {dag => internal/dag}/dot.go | 0 {dag => internal/dag}/dot_test.go | 0 {dag => internal/dag}/edge.go | 0 {dag => internal/dag}/edge_test.go | 0 {dag => internal/dag}/graph.go | 0 {dag => internal/dag}/graph_test.go | 0 {dag => internal/dag}/marshal.go | 0 {dag => internal/dag}/marshal_test.go | 0 {dag => internal/dag}/set.go | 0 {dag => internal/dag}/set_test.go | 0 {dag => internal/dag}/tarjan.go | 0 {dag => internal/dag}/tarjan_test.go | 0 {dag => internal/dag}/walk.go | 0 {dag => internal/dag}/walk_test.go | 0 terraform/graph.go | 2 +- terraform/graph_builder_apply.go | 2 +- terraform/graph_builder_destroy_plan.go | 2 +- terraform/graph_builder_eval.go | 2 +- terraform/graph_builder_import.go | 2 +- terraform/graph_builder_plan.go | 2 +- terraform/graph_builder_test.go | 2 +- terraform/graph_builder_validate.go | 2 +- terraform/graph_dot.go | 2 +- terraform/graph_dot_test.go | 2 +- terraform/graph_test.go | 2 +- terraform/node_local.go | 2 +- terraform/node_module_expand.go | 2 +- terraform/node_module_variable.go | 2 +- terraform/node_output.go | 2 +- terraform/node_provider_abstract.go | 2 +- terraform/node_resource_abstract.go | 2 +- terraform/node_resource_apply.go | 2 +- terraform/node_resource_destroy_deposed.go | 2 +- terraform/node_resource_plan.go | 2 +- terraform/node_root_variable.go | 2 +- terraform/transform.go | 2 +- terraform/transform_attach_config_resource.go | 2 +- terraform/transform_attach_schema.go | 2 +- terraform/transform_attach_state.go | 2 +- terraform/transform_config.go | 2 +- terraform/transform_count_boundary.go | 2 +- terraform/transform_destroy_cbd.go | 2 +- terraform/transform_destroy_edge.go | 2 +- terraform/transform_diff.go | 2 +- terraform/transform_module_expansion.go | 2 +- terraform/transform_orphan_count.go | 2 +- terraform/transform_orphan_resource.go | 2 +- terraform/transform_orphan_resource_test.go | 2 +- terraform/transform_output.go | 2 +- terraform/transform_provider.go | 2 +- terraform/transform_provider_test.go | 2 +- terraform/transform_reference.go | 2 +- terraform/transform_reference_test.go | 2 +- terraform/transform_resource_count.go | 2 +- terraform/transform_root.go | 2 +- terraform/transform_targets.go | 2 +- terraform/transform_vertex.go | 2 +- terraform/transform_vertex_test.go | 2 +- 61 files changed, 45 insertions(+), 45 deletions(-) rename {dag => internal/dag}/dag.go (100%) rename {dag => internal/dag}/dag_test.go (100%) rename {dag => internal/dag}/dot.go (100%) rename {dag => internal/dag}/dot_test.go (100%) rename {dag => internal/dag}/edge.go (100%) rename {dag => internal/dag}/edge_test.go (100%) rename {dag => internal/dag}/graph.go (100%) rename {dag => internal/dag}/graph_test.go (100%) rename {dag => internal/dag}/marshal.go (100%) rename {dag => internal/dag}/marshal_test.go (100%) rename {dag => internal/dag}/set.go (100%) rename {dag => internal/dag}/set_test.go (100%) rename {dag => internal/dag}/tarjan.go (100%) rename {dag => internal/dag}/tarjan_test.go (100%) rename {dag => internal/dag}/walk.go (100%) rename {dag => internal/dag}/walk_test.go (100%) diff --git a/command/graph.go b/command/graph.go index 77a2683c96..26a0bbe1cb 100644 --- a/command/graph.go +++ b/command/graph.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform/plans/planfile" "github.com/hashicorp/terraform/tfdiags" - "github.com/hashicorp/terraform/dag" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/terraform" ) diff --git a/dag/dag.go b/internal/dag/dag.go similarity index 100% rename from dag/dag.go rename to internal/dag/dag.go diff --git a/dag/dag_test.go b/internal/dag/dag_test.go similarity index 100% rename from dag/dag_test.go rename to internal/dag/dag_test.go diff --git a/dag/dot.go b/internal/dag/dot.go similarity index 100% rename from dag/dot.go rename to internal/dag/dot.go diff --git a/dag/dot_test.go b/internal/dag/dot_test.go similarity index 100% rename from dag/dot_test.go rename to internal/dag/dot_test.go diff --git a/dag/edge.go b/internal/dag/edge.go similarity index 100% rename from dag/edge.go rename to internal/dag/edge.go diff --git a/dag/edge_test.go b/internal/dag/edge_test.go similarity index 100% rename from dag/edge_test.go rename to internal/dag/edge_test.go diff --git a/dag/graph.go b/internal/dag/graph.go similarity index 100% rename from dag/graph.go rename to internal/dag/graph.go diff --git a/dag/graph_test.go b/internal/dag/graph_test.go similarity index 100% rename from dag/graph_test.go rename to internal/dag/graph_test.go diff --git a/dag/marshal.go b/internal/dag/marshal.go similarity index 100% rename from dag/marshal.go rename to internal/dag/marshal.go diff --git a/dag/marshal_test.go b/internal/dag/marshal_test.go similarity index 100% rename from dag/marshal_test.go rename to internal/dag/marshal_test.go diff --git a/dag/set.go b/internal/dag/set.go similarity index 100% rename from dag/set.go rename to internal/dag/set.go diff --git a/dag/set_test.go b/internal/dag/set_test.go similarity index 100% rename from dag/set_test.go rename to internal/dag/set_test.go diff --git a/dag/tarjan.go b/internal/dag/tarjan.go similarity index 100% rename from dag/tarjan.go rename to internal/dag/tarjan.go diff --git a/dag/tarjan_test.go b/internal/dag/tarjan_test.go similarity index 100% rename from dag/tarjan_test.go rename to internal/dag/tarjan_test.go diff --git a/dag/walk.go b/internal/dag/walk.go similarity index 100% rename from dag/walk.go rename to internal/dag/walk.go diff --git a/dag/walk_test.go b/internal/dag/walk_test.go similarity index 100% rename from dag/walk_test.go rename to internal/dag/walk_test.go diff --git a/terraform/graph.go b/terraform/graph.go index 5fa1ff283f..03d6edb1aa 100644 --- a/terraform/graph.go +++ b/terraform/graph.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" ) // Graph represents the graph that Terraform uses to represent resources diff --git a/terraform/graph_builder_apply.go b/terraform/graph_builder_apply.go index d927cde139..1a702e3729 100644 --- a/terraform/graph_builder_apply.go +++ b/terraform/graph_builder_apply.go @@ -3,7 +3,7 @@ package terraform import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/tfdiags" diff --git a/terraform/graph_builder_destroy_plan.go b/terraform/graph_builder_destroy_plan.go index 7f5d2e5a75..413b6a6863 100644 --- a/terraform/graph_builder_destroy_plan.go +++ b/terraform/graph_builder_destroy_plan.go @@ -3,7 +3,7 @@ package terraform import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/terraform/graph_builder_eval.go b/terraform/graph_builder_eval.go index 5c01f6fc93..ef17d5d48f 100644 --- a/terraform/graph_builder_eval.go +++ b/terraform/graph_builder_eval.go @@ -3,7 +3,7 @@ package terraform import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/terraform/graph_builder_import.go b/terraform/graph_builder_import.go index e2bd1788f9..1aa1fe1801 100644 --- a/terraform/graph_builder_import.go +++ b/terraform/graph_builder_import.go @@ -3,7 +3,7 @@ package terraform import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/terraform/graph_builder_plan.go b/terraform/graph_builder_plan.go index 8f8bb7f881..7b6585ae6b 100644 --- a/terraform/graph_builder_plan.go +++ b/terraform/graph_builder_plan.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/terraform/graph_builder_test.go b/terraform/graph_builder_test.go index 21a3f15392..83d8afecdd 100644 --- a/terraform/graph_builder_test.go +++ b/terraform/graph_builder_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" ) func TestBasicGraphBuilder_impl(t *testing.T) { diff --git a/terraform/graph_builder_validate.go b/terraform/graph_builder_validate.go index 57d4c7b77b..ff5148216c 100644 --- a/terraform/graph_builder_validate.go +++ b/terraform/graph_builder_validate.go @@ -1,7 +1,7 @@ package terraform import ( - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" ) // ValidateGraphBuilder creates the graph for the validate operation. diff --git a/terraform/graph_dot.go b/terraform/graph_dot.go index 73e3821fbb..22e701bcc1 100644 --- a/terraform/graph_dot.go +++ b/terraform/graph_dot.go @@ -1,6 +1,6 @@ package terraform -import "github.com/hashicorp/terraform/dag" +import "github.com/hashicorp/terraform/internal/dag" // GraphDot returns the dot formatting of a visual representation of // the given Terraform graph. diff --git a/terraform/graph_dot_test.go b/terraform/graph_dot_test.go index c204424d9f..5042534b4e 100644 --- a/terraform/graph_dot_test.go +++ b/terraform/graph_dot_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" ) func TestGraphDot(t *testing.T) { diff --git a/terraform/graph_test.go b/terraform/graph_test.go index e61da9878a..6676aa8467 100644 --- a/terraform/graph_test.go +++ b/terraform/graph_test.go @@ -3,7 +3,7 @@ package terraform import ( "testing" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" ) // testGraphContains is an assertion helper that tests that a node is diff --git a/terraform/node_local.go b/terraform/node_local.go index eb04b39549..a59f922939 100644 --- a/terraform/node_local.go +++ b/terraform/node_local.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/lang" "github.com/hashicorp/terraform/tfdiags" "github.com/zclconf/go-cty/cty" diff --git a/terraform/node_module_expand.go b/terraform/node_module_expand.go index 07ff4545cd..fd7d4015fe 100644 --- a/terraform/node_module_expand.go +++ b/terraform/node_module_expand.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/lang" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/terraform/node_module_variable.go b/terraform/node_module_variable.go index 675242d766..35fd632b23 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/dag" "github.com/hashicorp/terraform/instances" + "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/lang" "github.com/hashicorp/terraform/tfdiags" "github.com/zclconf/go-cty/cty" diff --git a/terraform/node_output.go b/terraform/node_output.go index 2ec5ccbf91..4d2e9a4a8a 100644 --- a/terraform/node_output.go +++ b/terraform/node_output.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/lang" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" diff --git a/terraform/node_provider_abstract.go b/terraform/node_provider_abstract.go index 7903ff6d7b..85c90a0e96 100644 --- a/terraform/node_provider_abstract.go +++ b/terraform/node_provider_abstract.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" ) // ConcreteProviderNodeFunc is a callback type used to convert an diff --git a/terraform/node_resource_abstract.go b/terraform/node_resource_abstract.go index c03103b9c3..defdca2110 100644 --- a/terraform/node_resource_abstract.go +++ b/terraform/node_resource_abstract.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/lang" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/tfdiags" diff --git a/terraform/node_resource_apply.go b/terraform/node_resource_apply.go index 7c23483b7c..34497bbd72 100644 --- a/terraform/node_resource_apply.go +++ b/terraform/node_resource_apply.go @@ -4,7 +4,7 @@ import ( "log" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/lang" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/terraform/node_resource_destroy_deposed.go b/terraform/node_resource_destroy_deposed.go index 212381fc1d..459a525862 100644 --- a/terraform/node_resource_destroy_deposed.go +++ b/terraform/node_resource_destroy_deposed.go @@ -5,7 +5,7 @@ import ( "log" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/tfdiags" diff --git a/terraform/node_resource_plan.go b/terraform/node_resource_plan.go index a946527eb1..d3c99fc1ad 100644 --- a/terraform/node_resource_plan.go +++ b/terraform/node_resource_plan.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/terraform/node_root_variable.go b/terraform/node_root_variable.go index 5e90e4ad67..36edf983eb 100644 --- a/terraform/node_root_variable.go +++ b/terraform/node_root_variable.go @@ -3,7 +3,7 @@ package terraform import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/terraform/transform.go b/terraform/transform.go index 3b41219060..2cc812ffe4 100644 --- a/terraform/transform.go +++ b/terraform/transform.go @@ -3,7 +3,7 @@ package terraform import ( "log" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/internal/logging" ) diff --git a/terraform/transform_attach_config_resource.go b/terraform/transform_attach_config_resource.go index 37afbde2e6..fe3d443271 100644 --- a/terraform/transform_attach_config_resource.go +++ b/terraform/transform_attach_config_resource.go @@ -4,7 +4,7 @@ import ( "log" "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" ) // GraphNodeAttachResourceConfig is an interface that must be implemented by nodes diff --git a/terraform/transform_attach_schema.go b/terraform/transform_attach_schema.go index 1499f920f8..23ecb91ba5 100644 --- a/terraform/transform_attach_schema.go +++ b/terraform/transform_attach_schema.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" ) // GraphNodeAttachResourceSchema is an interface implemented by node types diff --git a/terraform/transform_attach_state.go b/terraform/transform_attach_state.go index 3af7b989dc..d4b52d2f3d 100644 --- a/terraform/transform_attach_state.go +++ b/terraform/transform_attach_state.go @@ -3,7 +3,7 @@ package terraform import ( "log" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/transform_config.go b/terraform/transform_config.go index 35f448490b..99264efb6f 100644 --- a/terraform/transform_config.go +++ b/terraform/transform_config.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" ) // ConfigTransformer is a GraphTransformer that adds all the resources diff --git a/terraform/transform_count_boundary.go b/terraform/transform_count_boundary.go index 01601bdda7..1039c3d6a3 100644 --- a/terraform/transform_count_boundary.go +++ b/terraform/transform_count_boundary.go @@ -2,7 +2,7 @@ package terraform import ( "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" ) // CountBoundaryTransformer adds a node that depends on everything else diff --git a/terraform/transform_destroy_cbd.go b/terraform/transform_destroy_cbd.go index 168fb03e6e..52ed04b04d 100644 --- a/terraform/transform_destroy_cbd.go +++ b/terraform/transform_destroy_cbd.go @@ -5,7 +5,7 @@ import ( "log" "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/dag" + "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 9a177cbe22..8fbe25aa92 100644 --- a/terraform/transform_destroy_edge.go +++ b/terraform/transform_destroy_edge.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" ) // GraphNodeDestroyer must be implemented by nodes that destroy resources. diff --git a/terraform/transform_diff.go b/terraform/transform_diff.go index bed71a0e3d..93950f2849 100644 --- a/terraform/transform_diff.go +++ b/terraform/transform_diff.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/plans" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/tfdiags" diff --git a/terraform/transform_module_expansion.go b/terraform/transform_module_expansion.go index b0bcd9f004..729d9b5b40 100644 --- a/terraform/transform_module_expansion.go +++ b/terraform/transform_module_expansion.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" ) // ModuleExpansionTransformer is a GraphTransformer that adds graph nodes diff --git a/terraform/transform_orphan_count.go b/terraform/transform_orphan_count.go index 0e2ead6f04..08db1dd3e5 100644 --- a/terraform/transform_orphan_count.go +++ b/terraform/transform_orphan_count.go @@ -4,7 +4,7 @@ import ( "log" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/transform_orphan_resource.go b/terraform/transform_orphan_resource.go index 6098d89854..4994c7b718 100644 --- a/terraform/transform_orphan_resource.go +++ b/terraform/transform_orphan_resource.go @@ -4,7 +4,7 @@ import ( "log" "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/transform_orphan_resource_test.go b/terraform/transform_orphan_resource_test.go index bb8845f29d..c68e2a4fa6 100644 --- a/terraform/transform_orphan_resource_test.go +++ b/terraform/transform_orphan_resource_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/states" ) diff --git a/terraform/transform_output.go b/terraform/transform_output.go index 1e40f9edd5..04b96089d9 100644 --- a/terraform/transform_output.go +++ b/terraform/transform_output.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/plans" ) diff --git a/terraform/transform_provider.go b/terraform/transform_provider.go index 0ce42e100a..fa89655dd9 100644 --- a/terraform/transform_provider.go +++ b/terraform/transform_provider.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/terraform/transform_provider_test.go b/terraform/transform_provider_test.go index dc1d0ad434..cc06007822 100644 --- a/terraform/transform_provider_test.go +++ b/terraform/transform_provider_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" ) func testProviderTransformerGraph(t *testing.T, cfg *configs.Config) *Graph { diff --git a/terraform/transform_reference.go b/terraform/transform_reference.go index 37937d05e3..70d9e246ed 100644 --- a/terraform/transform_reference.go +++ b/terraform/transform_reference.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" "github.com/hashicorp/terraform/lang" ) diff --git a/terraform/transform_reference_test.go b/terraform/transform_reference_test.go index e6bf1940be..ba2c84089f 100644 --- a/terraform/transform_reference_test.go +++ b/terraform/transform_reference_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" ) func TestReferenceTransformer_simple(t *testing.T) { diff --git a/terraform/transform_resource_count.go b/terraform/transform_resource_count.go index 70a843ab5e..39593a5177 100644 --- a/terraform/transform_resource_count.go +++ b/terraform/transform_resource_count.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" ) // ResourceCountTransformer is a GraphTransformer that expands the count diff --git a/terraform/transform_root.go b/terraform/transform_root.go index 0c44084b48..27804ff024 100644 --- a/terraform/transform_root.go +++ b/terraform/transform_root.go @@ -1,7 +1,7 @@ package terraform import ( - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" ) const rootNodeName = "root" diff --git a/terraform/transform_targets.go b/terraform/transform_targets.go index 0989390e49..cf36dcf76d 100644 --- a/terraform/transform_targets.go +++ b/terraform/transform_targets.go @@ -4,7 +4,7 @@ import ( "log" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" ) // GraphNodeTargetable is an interface for graph nodes to implement when they diff --git a/terraform/transform_vertex.go b/terraform/transform_vertex.go index 9620e6eb8b..6dd2f98dce 100644 --- a/terraform/transform_vertex.go +++ b/terraform/transform_vertex.go @@ -3,7 +3,7 @@ package terraform import ( "fmt" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" ) // VertexTransformer is a GraphTransformer that transforms vertices diff --git a/terraform/transform_vertex_test.go b/terraform/transform_vertex_test.go index 05d117689f..21d5d914a7 100644 --- a/terraform/transform_vertex_test.go +++ b/terraform/transform_vertex_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform/dag" + "github.com/hashicorp/terraform/internal/dag" ) func TestVertexTransformer_impl(t *testing.T) {