From 90bc237b7baac432070fd479b70b88e3fc3a7fc7 Mon Sep 17 00:00:00 2001
From: Sander van Harmelen <sander@xanzy.io>
Date: Thu, 11 Apr 2019 14:34:14 +0200
Subject: [PATCH] Prevent a panic caused by writing to a nil map

---
 backend/remote/backend_context.go | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/backend/remote/backend_context.go b/backend/remote/backend_context.go
index dfc5783d4..d548a4eec 100644
--- a/backend/remote/backend_context.go
+++ b/backend/remote/backend_context.go
@@ -89,6 +89,9 @@ func (b *Remote) Context(op *backend.Operation) (*terraform.Context, statemgr.Fu
 	}
 
 	if tfeVariables != nil {
+		if op.Variables == nil {
+			op.Variables = make(map[string]backend.UnparsedVariableValue)
+		}
 		for _, v := range tfeVariables.Items {
 			if v.Sensitive {
 				v.Value = "<sensitive>"
@@ -100,12 +103,12 @@ func (b *Remote) Context(op *backend.Operation) (*terraform.Context, statemgr.Fu
 		}
 	}
 
-	variables, varDiags := backend.ParseVariableValues(op.Variables, config.Module.Variables)
-	diags = diags.Append(varDiags)
-	if diags.HasErrors() {
-		return nil, nil, diags
-	}
 	if op.Variables != nil {
+		variables, varDiags := backend.ParseVariableValues(op.Variables, config.Module.Variables)
+		diags = diags.Append(varDiags)
+		if diags.HasErrors() {
+			return nil, nil, diags
+		}
 		opts.Variables = variables
 	}