From 6a8df0cbe2509ad3194350b128ba08c0d8173a98 Mon Sep 17 00:00:00 2001
From: James Bardin <j.bardin@gmail.com>
Date: Fri, 2 Dec 2016 10:53:29 -0500
Subject: [PATCH] Make sure that a Context.diff is never nil

The context and diff passed along during a walk, and the diff is assumed
to be valid.
---
 terraform/context.go               |  7 ++++-
 terraform/context_validate_test.go | 43 ++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/terraform/context.go b/terraform/context.go
index e02b85d8f..fdd65cf6e 100644
--- a/terraform/context.go
+++ b/terraform/context.go
@@ -162,13 +162,18 @@ func NewContext(opts *ContextOpts) (*Context, error) {
 		}
 	}
 
+	diff := opts.Diff
+	if diff == nil {
+		diff = &Diff{}
+	}
+
 	return &Context{
 		components: &basicComponentFactory{
 			providers:    opts.Providers,
 			provisioners: opts.Provisioners,
 		},
 		destroy:   opts.Destroy,
-		diff:      opts.Diff,
+		diff:      diff,
 		hooks:     hooks,
 		module:    opts.Module,
 		shadow:    opts.Shadow,
diff --git a/terraform/context_validate_test.go b/terraform/context_validate_test.go
index 8b704fcf6..131955df3 100644
--- a/terraform/context_validate_test.go
+++ b/terraform/context_validate_test.go
@@ -849,3 +849,46 @@ func TestContext2Validate_interpolateMap(t *testing.T) {
 		t.Fatal("err:", e)
 	}
 }
+
+// Manually validate using the new PlanGraphBuilder
+func TestContext2Validate_PlanGraphBuilder(t *testing.T) {
+	m := testModule(t, "apply-vars")
+	p := testProvider("aws")
+	p.ApplyFn = testApplyFn
+	p.DiffFn = testDiffFn
+	c := testContext2(t, &ContextOpts{
+		Module: m,
+		Providers: map[string]ResourceProviderFactory{
+			"aws": testProviderFuncFixed(p),
+		},
+		Variables: map[string]interface{}{
+			"foo":       "us-west-2",
+			"test_list": []interface{}{"Hello", "World"},
+			"test_map": map[string]interface{}{
+				"Hello": "World",
+				"Foo":   "Bar",
+				"Baz":   "Foo",
+			},
+			"amis": []map[string]interface{}{
+				map[string]interface{}{
+					"us-east-1": "override",
+				},
+			},
+		},
+	})
+
+	graph, err := (&PlanGraphBuilder{
+		Module:    c.module,
+		State:     NewState(),
+		Providers: c.components.ResourceProviders(),
+		Targets:   c.targets,
+	}).Build(RootModulePath)
+
+	walker, err := c.walk(graph, graph, walkValidate)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(walker.ValidationErrors) > 0 {
+		t.Fatal(walker.ValidationErrors)
+	}
+}