Nil is not a map

Antoine Pelisse · Antoine Pelisse · commit 53b71b4c5495 · 2019-12-09T14:44:04.000-08:00
diff --git a/typed/union.go b/typed/union.go
@@ -35,7 +35,7 @@ func normalizeUnions(w *mergingWalker) error {
 	}
 
 	var old value.Map
-	if w.lhs != nil {
+	if w.lhs != nil && !w.lhs.IsNull() {
 		old = w.lhs.Map()
 	}
 	for _, union := range atom.Map.Unions {
@@ -57,7 +57,7 @@ func normalizeUnionsApply(w *mergingWalker) error {
 	}
 
 	var old value.Map
-	if w.lhs != nil {
+	if w.lhs != nil && !w.lhs.IsNull() {
 		old = w.lhs.Map()
 	}
 
diff --git a/value/valueunstructured.go b/value/valueunstructured.go
@@ -51,7 +51,7 @@ func (v valueUnstructured) IsMap() bool {
 
 func (v valueUnstructured) Map() Map {
 	if v.Value == nil {
-		return nil
+		panic("invalid nil")
 	}
 	switch t := v.Value.(type) {
 	case map[string]interface{}:

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func normalizeUnions(w *mergingWalker) error {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`var old value.Map`
`38`		`- if w.lhs != nil {`
	`38`	`+ if w.lhs != nil && !w.lhs.IsNull() {`
`39`	`39`	`old = w.lhs.Map()`
`40`	`40`	`}`
`41`	`41`	`for _, union := range atom.Map.Unions {`
`@@ -57,7 +57,7 @@ func normalizeUnionsApply(w *mergingWalker) error {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`var old value.Map`
`60`		`- if w.lhs != nil {`
	`60`	`+ if w.lhs != nil && !w.lhs.IsNull() {`
`61`	`61`	`old = w.lhs.Map()`
`62`	`62`	`}`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ func (v valueUnstructured) IsMap() bool {`
`51`	`51`
`52`	`52`	`func (v valueUnstructured) Map() Map {`
`53`	`53`	`if v.Value == nil {`
`54`		`- return nil`
	`54`	`+ panic("invalid nil")`
`55`	`55`	`}`
`56`	`56`	`switch t := v.Value.(type) {`
`57`	`57`	`case map[string]interface{}:`