guard against nil maps

hashicorp · Apr 6, 2020 · da93e23 · da93e23
1 parent a142302
commit da93e23
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/nomad/structs/diff.go b/nomad/structs/diff.go
@@ -225,15 +225,17 @@ func (tg *TaskGroup) Diff(other *TaskGroup, contextual bool) (*TaskGroupDiff, er
 	}
 
 	// ShutdownDelay diff
-	if tg.ShutdownDelay == nil {
-		oldPrimitiveFlat["ShutdownDelay"] = ""
-	} else {
-		oldPrimitiveFlat["ShutdownDelay"] = fmt.Sprintf("%d", *tg.ShutdownDelay)
-	}
-	if other.ShutdownDelay == nil {
-		newPrimitiveFlat["ShutdownDelay"] = ""
-	} else {
-		newPrimitiveFlat["ShutdownDelay"] = fmt.Sprintf("%d", *other.ShutdownDelay)
+	if oldPrimitiveFlat != nil && newPrimitiveFlat != nil {
+		if tg.ShutdownDelay == nil {
+			oldPrimitiveFlat["ShutdownDelay"] = ""
+		} else {
+			oldPrimitiveFlat["ShutdownDelay"] = fmt.Sprintf("%d", *tg.ShutdownDelay)
+		}
+		if other.ShutdownDelay == nil {
+			newPrimitiveFlat["ShutdownDelay"] = ""
+		} else {
+			newPrimitiveFlat["ShutdownDelay"] = fmt.Sprintf("%d", *other.ShutdownDelay)
+		}
 	}
 
 	// Diff the primitive fields.