Update runtime/vam/expr/function/grok.go

Co-authored-by: Noah Treuhaft <noah.treuhaft@gmail.com>

Author: mattnibs

runtime/sam/expr/function/grok.go

@@ -40,6 +40,9 @@ func (g *Grok) Call(_ super.Allocator, args []super.Value) super.Value {
 	if err != nil {
 		return g.error(err.Error(), defArg)
 	}
+	if patternArg.IsNull() || inputArg.IsNull() {
+		return super.NewValue(g.zctx.MustLookupTypeRecord(nil), nil)
+	}
 	p, err := h.getPattern(patternArg.AsString())
 	if err != nil {
 		return g.error(err.Error(), patternArg)

runtime/vam/expr/function/grok.go

@@ -26,7 +26,7 @@ func newGrok(zctx *super.Context) *Grok {
 
 func (g *Grok) Call(args ...vector.Any) vector.Any {
 	patternArg, inputArg := args[0], args[1]
-	var defArg vector.Any = vector.NewConst(super.NullString, args[0].Len(), nil)
+	defArg := vector.Any(vector.NewConst(super.NullString, args[0].Len(), nil))
 	if len(args) == 3 {
 		defArg = args[2]
 	}
@@ -49,14 +49,22 @@ func (g *Grok) Call(args ...vector.Any) vector.Any {
 			defErrsIdx = append(defErrsIdx, i)
 			continue
 		}
-		pat, _ := vector.StringValue(patternArg, i)
+		pat, isnull := vector.StringValue(patternArg, i)
+		if isnull {
+			builder.Write(super.NewValue(g.zctx.MustLookupTypeRecord(nil), nil))
+			continue
+		}
 		p, err := h.getPattern(pat)
 		if err != nil {
 			patErrs = append(patErrs, err.Error())
 			patErrsIdx = append(patErrsIdx, i)
 			continue
 		}
-		in, _ := vector.StringValue(inputArg, i)
+		in, isnull := vector.StringValue(inputArg, i)
+		if isnull {
+			builder.Write(super.NewValue(g.zctx.MustLookupTypeRecord(nil), nil))
+			continue
+		}
 		keys, vals, match := p.ParseKeyValues(in)
 		if !match {
 			inErrsIdx = append(inErrsIdx, i)

runtime/ztests/expr/function/grok.yaml

@@ -37,6 +37,8 @@ input: |
     input: "foo",
     defs: null(string)
   }
+  {pattern: null(string),input: "foo",defs: null(string)}
+  {pattern: "%{INT:int}",input:null(string),defs: null(string)}
   // Error cases
   {
     pattern: "%{INT:int}",
@@ -48,6 +50,9 @@ input: |
     input: "foo",
     defs: null(string)
   }
+  {pattern: 1,input: "foo",defs: null(string)}
+  {pattern: "%{INT:int}",input:1,defs: null(string)}
+  {pattern: "%{INT:int}",input:"1",defs:1}
 
 output: |
   {event_time:"2020-09-16T04:20:42.45+01:00",log_level:"DEBUG",log_message:"This is a sample debug log message"}
@@ -56,5 +61,10 @@ output: |
   {one:"2"}
   {}
   error({message:"grok(): value does not match pattern",on:"foo"})
+  null({})
+  null({})
   error({message:"grok(): value does not match pattern",on:"string value"})
   error({message:"grok(): the 'DOESNOTEXIST' pattern doesn't exist",on:"%{DOESNOTEXIST:dne}"})
+  error({message:"grok(): pattern argument must be a string",on:1})
+  error({message:"grok(): input argument must be a string",on:1})
+  error({message:"grok(): definitions argument must be a string",on:1})