From 24f5ec3e090451b3ed5950d05cb875dfcd63e8d5 Mon Sep 17 00:00:00 2001
From: Michael Schurter <schmichael@hashicorp.com>
Date: Fri, 24 Feb 2017 10:31:05 -0800
Subject: [PATCH] Template.Canonicalize wasn't initializing all fields

---
 api/tasks.go | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/api/tasks.go b/api/tasks.go
index 35712fa40..337dc4938 100644
--- a/api/tasks.go
+++ b/api/tasks.go
@@ -322,15 +322,18 @@ type Template struct {
 }
 
 func (tmpl *Template) Canonicalize() {
+	if tmpl.SourcePath == nil {
+		tmpl.SourcePath = helper.StringToPtr("")
+	}
+	if tmpl.DestPath == nil {
+		tmpl.DestPath = helper.StringToPtr("")
+	}
+	if tmpl.EmbeddedTmpl == nil {
+		tmpl.EmbeddedTmpl = helper.StringToPtr("")
+	}
 	if tmpl.ChangeMode == nil {
 		tmpl.ChangeMode = helper.StringToPtr("restart")
 	}
-	if tmpl.Splay == nil {
-		tmpl.Splay = helper.TimeToPtr(5 * time.Second)
-	}
-	if tmpl.Perms == nil {
-		tmpl.Perms = helper.StringToPtr("0644")
-	}
 	if *tmpl.ChangeMode == "signal" && tmpl.ChangeSignal == nil {
 		tmpl.ChangeSignal = helper.StringToPtr("SIGHUP")
 	}
@@ -338,6 +341,12 @@ func (tmpl *Template) Canonicalize() {
 		sig := *tmpl.ChangeSignal
 		tmpl.ChangeSignal = helper.StringToPtr(strings.ToUpper(sig))
 	}
+	if tmpl.Splay == nil {
+		tmpl.Splay = helper.TimeToPtr(5 * time.Second)
+	}
+	if tmpl.Perms == nil {
+		tmpl.Perms = helper.StringToPtr("0644")
+	}
 	if tmpl.LeftDelim == nil {
 		tmpl.LeftDelim = helper.StringToPtr("{{")
 	}