From ef546517be6235359009a06d8441e99ccfe63143 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Fri, 17 Feb 2017 09:27:47 -0800 Subject: [PATCH] terraform: close transform should not include untargeted providers --- terraform/transform_provider.go | 7 +++++++ terraform/transform_provider_test.go | 6 +----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/terraform/transform_provider.go b/terraform/transform_provider.go index aa4992227..b9695d524 100644 --- a/terraform/transform_provider.go +++ b/terraform/transform_provider.go @@ -355,6 +355,13 @@ func (n *graphNodeCloseProvider) DotNode(name string, opts *dag.DotOpts) *dag.Do } } +// RemovableIfNotTargeted +func (n *graphNodeCloseProvider) RemoveIfNotTargeted() bool { + // We need to add this so that this node will be removed if + // it isn't targeted or a dependency of a target. + return true +} + // graphNodeProviderConsumerDummy is a struct that never enters the real // graph (though it could to no ill effect). It implements // GraphNodeProviderConsumer and GraphNodeSubpath as a way to force diff --git a/terraform/transform_provider_test.go b/terraform/transform_provider_test.go index a84562379..b9f52a1f7 100644 --- a/terraform/transform_provider_test.go +++ b/terraform/transform_provider_test.go @@ -147,11 +147,7 @@ func TestCloseProviderTransformer_withTargets(t *testing.T) { } actual := strings.TrimSpace(g.String()) - expected := strings.TrimSpace(` -provider.aws -provider.aws (close) - provider.aws - `) + expected := strings.TrimSpace(``) if actual != expected { t.Fatalf("expected:%s\n\ngot:\n\n%s", expected, actual) }