From ec11efc50a91eff4b74cf34acf699c3f0c3dcb8e Mon Sep 17 00:00:00 2001
From: Martin Atkins <mart@degeneration.co.uk>
Date: Mon, 27 Aug 2018 12:09:46 -0700
Subject: [PATCH] core: Tolerate the prior state being nil in EvalDiff

This happens legitimately in situations where we'll be creating an object
for this resource instance for the first time.
---
 terraform/eval_diff.go | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/terraform/eval_diff.go b/terraform/eval_diff.go
index b5a77b2bc..95f93410b 100644
--- a/terraform/eval_diff.go
+++ b/terraform/eval_diff.go
@@ -97,9 +97,6 @@ func (n *EvalDiff) Eval(ctx EvalContext) (interface{}, error) {
 
 	var diags tfdiags.Diagnostics
 
-	absAddr := n.Addr.Absolute(ctx.Path())
-	priorVal := state.Value
-
 	// Evaluate the configuration
 	schema := providerSchema.ResourceTypes[n.Addr.Resource.Type]
 	if schema == nil {
@@ -113,6 +110,16 @@ func (n *EvalDiff) Eval(ctx EvalContext) (interface{}, error) {
 		return nil, diags.Err()
 	}
 
+	absAddr := n.Addr.Absolute(ctx.Path())
+	var priorVal cty.Value
+	var priorPrivate []byte
+	if state != nil {
+		priorVal = state.Value
+		priorPrivate = state.Private
+	} else {
+		priorVal = cty.NullVal(schema.ImpliedType())
+	}
+
 	proposedNewVal := objchange.ProposedNewObject(schema, priorVal, configVal)
 
 	// Call pre-diff hook
@@ -132,7 +139,7 @@ func (n *EvalDiff) Eval(ctx EvalContext) (interface{}, error) {
 		Config:           configVal,
 		PriorState:       priorVal,
 		ProposedNewState: proposedNewVal,
-		PriorPrivate:     state.Private,
+		PriorPrivate:     priorPrivate,
 	})
 	diags = diags.Append(resp.Diagnostics.InConfigBody(config.Config))
 	if diags.HasErrors() {