Misc. fixes

Author: yolken-segment

pkg/util/template.go

@@ -226,6 +226,7 @@ func lookup(path string, input interface{}) interface{} {
 	obj := reflect.ValueOf(input)
 
 	components := strings.Split(path, ".")
+
 	for i := 0; i < len(components); {
 		component := components[i]
 
@@ -240,8 +241,8 @@ func lookup(path string, input interface{}) interface{} {
 			// Get the thing being pointed to or interfaced, don't advance index
 			obj = obj.Elem()
 		default:
-			obj = zeroValue
-			break
+			// Got an unexpected type
+			return nil
 		}
 	}
 

pkg/util/template_test.go

@@ -169,6 +169,7 @@ func TestLookup(t *testing.T) {
 	assert.Equal(t, "value0", lookup("Key", s))
 	assert.Equal(t, nil, lookup("bad-key", s))
 	assert.Equal(t, nil, lookup("", s))
+	assert.Equal(t, nil, lookup("key", "not a map"))
 	assert.Equal(t, "value1", lookup("Inner.Map.key1", s))
 	assert.Equal(t, "value1", lookup("Inner.Map.key1", &s))
 	assert.Equal(t, "value4", lookup("Inner.Map.key2.key3.key4", s))