Manage numeric comparisons

Author: jotak

README.md

@@ -955,6 +955,7 @@ Images
   image-push            Push MULTIARCH_TARGETS images  
   manifest-build        Build MULTIARCH_TARGETS manifest  
   manifest-push         Push MULTIARCH_TARGETS manifest  
+  goyacc                Regenerate filters query langage  
   
 kubernetes  
   deploy                Deploy the image  

docs/filtering.md

@@ -11,11 +11,13 @@ The syntax includes:
 - Logical boolean operators (case insensitive)
   - `and`
   - `or`
-- String comparison operators
+- Comparison operators
   - equals `=`
   - not equals `!=`
   - matches regexp `=~`
   - not matches regexp `!~`
+  - greater than `>`
+  - less than `<`
 - Unary operations
   - field is present: `with(field)`
   - field is absent: `without(field)`

pkg/dsl/eval_test.go

@@ -103,3 +103,43 @@ func TestWithout(t *testing.T) {
 	})
 	assert.False(t, result, "Should reject flows from bar")
 }
+
+func TestNumeric(t *testing.T) {
+	predicate, err := Parse(`flowdirection=0 and bytes > 15`)
+	assert.NoError(t, err)
+	assert.NotNil(t, predicate)
+
+	result := predicate(config.GenericMap{
+		"srcnamespace":  "plop",
+		"flowdirection": 0,
+		"bytes":         20,
+	})
+	assert.True(t, result)
+
+	result = predicate(config.GenericMap{
+		"srcnamespace":  "plop",
+		"flowdirection": int16(0),
+		"bytes":         int16(20),
+	})
+	assert.True(t, result)
+
+	result = predicate(config.GenericMap{
+		"srcnamespace":  "plop",
+		"flowdirection": 1,
+		"bytes":         20,
+	})
+	assert.False(t, result)
+
+	result = predicate(config.GenericMap{
+		"srcnamespace":  "plop",
+		"flowdirection": 0,
+		"bytes":         10,
+	})
+	assert.False(t, result)
+
+	result = predicate(config.GenericMap{
+		"srcnamespace": "plop",
+		"bytes":        20,
+	})
+	assert.False(t, result)
+}

pkg/dsl/expr.y

@@ -5,12 +5,14 @@ package dsl
 %union{
 	expr  Expression
 	value string
+	intValue int
 }
 
 %type <expr> root
 %type <expr> expr
 
-%token <value> NF_FIELD STRING NUMBER AND OR EQ NEQ REG NREG OPEN_PARENTHESIS CLOSE_PARENTHESIS WITH WITHOUT
+%token <value> NF_FIELD STRING AND OR EQ NEQ GT LT REG NREG OPEN_PARENTHESIS CLOSE_PARENTHESIS WITH WITHOUT
+%token <intValue> NUMBER
 %left AND
 %left OR
 %%
@@ -29,6 +31,10 @@ expr:
 	| WITHOUT OPEN_PARENTHESIS NF_FIELD CLOSE_PARENTHESIS { $$ = WithoutExpr{key: $3} }
 	| NF_FIELD EQ STRING { $$ = EqExpr{key: $1, value: $3} }
 	| NF_FIELD NEQ STRING { $$ = NEqExpr{key: $1, value: $3} }
+	| NF_FIELD EQ NUMBER { $$ = EqNumExpr{key: $1, value: $3} }
+	| NF_FIELD NEQ NUMBER { $$ = NEqNumExpr{key: $1, value: $3} }
+	| NF_FIELD LT NUMBER { $$ = LessThanExpr{key: $1, value: $3} }
+	| NF_FIELD GT NUMBER { $$ = GreaterThanExpr{key: $1, value: $3} }
 	| NF_FIELD REG STRING { $$ = RegExpr{key: $1, value: $3} }
 	| NF_FIELD NREG STRING { $$ = NRegExpr{key: $1, value: $3} }
 %%