From 4b3bf764062dcf937e153f8b01b3d0b1cd604071 Mon Sep 17 00:00:00 2001
From: Luke Amdor <luke.amdor@gmail.com>
Date: Fri, 28 Nov 2014 07:14:58 -0600
Subject: [PATCH 1/2] looking up count of multivars in module config

---
 terraform/context.go | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/terraform/context.go b/terraform/context.go
index d481bdc17..91811fc91 100644
--- a/terraform/context.go
+++ b/terraform/context.go
@@ -1679,10 +1679,19 @@ func (c *walkContext) computeResourceMultiVariable(
 	c.Context.sl.RLock()
 	defer c.Context.sl.RUnlock()
 
+	childPath := c.Path[1:len(c.Path)]
+
+	var modTree *module.Tree
+	if len(childPath) == 0 {
+		modTree = c.Context.module
+	} else {
+		modTree = c.Context.module.Child(childPath)
+	}
+
 	// Get the resource from the configuration so we can know how
 	// many of the resource there is.
 	var cr *config.Resource
-	for _, r := range c.Context.module.Config().Resources {
+	for _, r := range modTree.Config().Resources {
 		if r.Id() == v.ResourceId() {
 			cr = r
 			break
@@ -1697,7 +1706,7 @@ func (c *walkContext) computeResourceMultiVariable(
 
 	// Get the relevant module
 	// TODO: Not use only root module
-	module := c.Context.state.RootModule()
+	module := c.Context.state.ModuleByPath(c.Path)
 
 	count, err := cr.Count()
 	if err != nil {

From 60022978a6898ecfc70c56778d5f0b9ac840965c Mon Sep 17 00:00:00 2001
From: Luke Amdor <luke.amdor@gmail.com>
Date: Fri, 28 Nov 2014 13:16:33 -0600
Subject: [PATCH 2/2] adding context test for module multi-vars

---
 terraform/context_test.go                     | 22 +++++++++++++++++++
 terraform/terraform_test.go                   | 19 ++++++++++++++++
 .../plan-module-multi-var/child/main.tf       |  8 +++++++
 .../plan-module-multi-var/main.tf             |  4 ++++
 4 files changed, 53 insertions(+)
 create mode 100644 terraform/test-fixtures/plan-module-multi-var/child/main.tf
 create mode 100644 terraform/test-fixtures/plan-module-multi-var/main.tf

diff --git a/terraform/context_test.go b/terraform/context_test.go
index b19d7945c..db839195f 100644
--- a/terraform/context_test.go
+++ b/terraform/context_test.go
@@ -2978,6 +2978,28 @@ func TestContextPlan_moduleInputFromVar(t *testing.T) {
 		t.Fatalf("bad:\n%s", actual)
 	}
 }
+func TestContextPlan_moduleMultiVar(t *testing.T) {
+	m := testModule(t, "plan-module-multi-var")
+	p := testProvider("aws")
+	p.DiffFn = testDiffFn
+	ctx := testContext(t, &ContextOpts{
+		Module: m,
+		Providers: map[string]ResourceProviderFactory{
+			"aws": testProviderFuncFixed(p),
+		},
+	})
+
+	plan, err := ctx.Plan(nil)
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	actual := strings.TrimSpace(plan.String())
+	expected := strings.TrimSpace(testTerraformPlanModuleMultiVarStr)
+	if actual != expected {
+		t.Fatalf("bad:\n%s", actual)
+	}
+}
 func TestContextPlan_moduleOrphans(t *testing.T) {
 	m := testModule(t, "plan-modules-remove")
 	p := testProvider("aws")
diff --git a/terraform/terraform_test.go b/terraform/terraform_test.go
index 6ebd2f53f..ac1ac0613 100644
--- a/terraform/terraform_test.go
+++ b/terraform/terraform_test.go
@@ -841,6 +841,25 @@ STATE:
 <no state>
 `
 
+const testTerraformPlanModuleMultiVarStr = `
+DIFF:
+
+module.child:
+  CREATE: aws_instance.bar.0
+    baz:  "" => "baz"
+    type: "" => "aws_instance"
+  CREATE: aws_instance.bar.1
+    baz:  "" => "baz"
+    type: "" => "aws_instance"
+  CREATE: aws_instance.foo
+    foo:  "" => "baz,baz"
+    type: "" => "aws_instance"
+
+STATE:
+
+<no state>
+`
+
 const testTerraformPlanModuleOrphansStr = `
 DIFF:
 
diff --git a/terraform/test-fixtures/plan-module-multi-var/child/main.tf b/terraform/test-fixtures/plan-module-multi-var/child/main.tf
new file mode 100644
index 000000000..ca0b9c7ed
--- /dev/null
+++ b/terraform/test-fixtures/plan-module-multi-var/child/main.tf
@@ -0,0 +1,8 @@
+resource "aws_instance" "bar" {
+  baz = "baz"
+  count = 2
+}
+
+resource "aws_instance" "foo" {
+  foo = "${join(",",aws_instance.bar.*.baz)}"
+}
diff --git a/terraform/test-fixtures/plan-module-multi-var/main.tf b/terraform/test-fixtures/plan-module-multi-var/main.tf
new file mode 100644
index 000000000..9b9c77f3d
--- /dev/null
+++ b/terraform/test-fixtures/plan-module-multi-var/main.tf
@@ -0,0 +1,4 @@
+module "child" {
+    source = "./child"
+}
+