From f97c635ef66d8ab53205f7956138e73428b692b4 Mon Sep 17 00:00:00 2001
From: Paul Hinze <phinze@phinze.com>
Date: Thu, 16 Jul 2015 11:56:58 -0500
Subject: [PATCH 1/2] core: fix "provider ... couldn't be found" bug

The `CloseProviderTransformer` relies on the `ProvidedBy()` interface to
look up the proper dependency for the the graph nodes it adds. This
interface needs to yield the name of a provider, _AND_ for flattened
nodes it needs to yield the full path to a provider.

Destroy nodes did not implement this second part, which resulted in
"provider X couldn't be found" when both of these were true:

 * A module included a resource that dependend on a provider
 * The root did _NOT_ include a provider config

Implementing a proper ProvidedBy() on the flattened version of
destroy nodes solves the issue.

fixes #2581
---
 terraform/graph_config_node_resource.go | 7 +++++++
 terraform/transform_provider.go         | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/terraform/graph_config_node_resource.go b/terraform/graph_config_node_resource.go
index 936398d2a4..2235f49256 100644
--- a/terraform/graph_config_node_resource.go
+++ b/terraform/graph_config_node_resource.go
@@ -335,6 +335,13 @@ func (n *graphNodeResourceDestroyFlat) CreateNode() dag.Vertex {
 	return n.FlatCreateNode
 }
 
+func (n *graphNodeResourceDestroyFlat) ProvidedBy() []string {
+	prefix := modulePrefixStr(n.PathValue)
+	return modulePrefixList(
+		n.GraphNodeConfigResource.ProvidedBy(),
+		prefix)
+}
+
 // graphNodeResourceDestroy represents the logical destruction of a
 // resource. This node doesn't mean it will be destroyed for sure, but
 // instead that if a destroy were to happen, it must happen at this point.
diff --git a/terraform/transform_provider.go b/terraform/transform_provider.go
index fb8857c961..8a6655182b 100644
--- a/terraform/transform_provider.go
+++ b/terraform/transform_provider.go
@@ -130,7 +130,7 @@ func (t *CloseProviderTransformer) Transform(g *Graph) error {
 					provider, ok := pm[p]
 					if !ok {
 						err = multierror.Append(err, fmt.Errorf(
-							"%s: provider %s couldn't be found",
+							"%s: provider %s couldn't be found for closing",
 							dag.VertexName(v), p))
 						continue
 					}

From 2ee46eda9482a1555dd946fda089a657c2d04dc3 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 17 Jul 2015 10:58:47 -0700
Subject: [PATCH 2/2] test case

---
 terraform/context_apply_test.go               | 37 +++++++++++++++++++
 .../child/main.tf                             |  3 ++
 .../child/subchild/main.tf                    |  1 +
 .../main.tf                                   |  3 ++
 4 files changed, 44 insertions(+)
 create mode 100644 terraform/test-fixtures/apply-module-provider-close-nested/child/main.tf
 create mode 100644 terraform/test-fixtures/apply-module-provider-close-nested/child/subchild/main.tf
 create mode 100644 terraform/test-fixtures/apply-module-provider-close-nested/main.tf

diff --git a/terraform/context_apply_test.go b/terraform/context_apply_test.go
index 032310aac0..2f4d432961 100644
--- a/terraform/context_apply_test.go
+++ b/terraform/context_apply_test.go
@@ -894,6 +894,43 @@ func TestContext2Apply_moduleProviderAliasTargets(t *testing.T) {
 	}
 }
 
+func TestContext2Apply_moduleProviderCloseNested(t *testing.T) {
+	m := testModule(t, "apply-module-provider-close-nested")
+	p := testProvider("aws")
+	p.ApplyFn = testApplyFn
+	p.DiffFn = testDiffFn
+	ctx := testContext2(t, &ContextOpts{
+		Module: m,
+		Providers: map[string]ResourceProviderFactory{
+			"aws": testProviderFuncFixed(p),
+		},
+		State: &State{
+			Modules: []*ModuleState{
+				&ModuleState{
+					Path: []string{"root", "child", "subchild"},
+					Resources: map[string]*ResourceState{
+						"aws_instance.foo": &ResourceState{
+							Type: "aws_instance",
+							Primary: &InstanceState{
+								ID: "bar",
+							},
+						},
+					},
+				},
+			},
+		},
+		Destroy: true,
+	})
+
+	if _, err := ctx.Plan(); err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	if _, err := ctx.Apply(); err != nil {
+		t.Fatalf("err: %s", err)
+	}
+}
+
 func TestContext2Apply_moduleVarResourceCount(t *testing.T) {
 	m := testModule(t, "apply-module-var-resource-count")
 	p := testProvider("aws")
diff --git a/terraform/test-fixtures/apply-module-provider-close-nested/child/main.tf b/terraform/test-fixtures/apply-module-provider-close-nested/child/main.tf
new file mode 100644
index 0000000000..852bce8b9f
--- /dev/null
+++ b/terraform/test-fixtures/apply-module-provider-close-nested/child/main.tf
@@ -0,0 +1,3 @@
+module "subchild" {
+    source = "./subchild"
+}
diff --git a/terraform/test-fixtures/apply-module-provider-close-nested/child/subchild/main.tf b/terraform/test-fixtures/apply-module-provider-close-nested/child/subchild/main.tf
new file mode 100644
index 0000000000..919f140bba
--- /dev/null
+++ b/terraform/test-fixtures/apply-module-provider-close-nested/child/subchild/main.tf
@@ -0,0 +1 @@
+resource "aws_instance" "foo" {}
diff --git a/terraform/test-fixtures/apply-module-provider-close-nested/main.tf b/terraform/test-fixtures/apply-module-provider-close-nested/main.tf
new file mode 100644
index 0000000000..0f6991c536
--- /dev/null
+++ b/terraform/test-fixtures/apply-module-provider-close-nested/main.tf
@@ -0,0 +1,3 @@
+module "child" {
+    source = "./child"
+}