fix: remove string replacement on expressions for event filtering (ar…

…goproj#1670)

Signed-off-by: Dillen Padhiar <dpadhiar99@gmail.com>

common/expr/eval_test.go

@@ -41,6 +41,7 @@ func TestEvalBool(t *testing.T) {
 		"email":      "johndoe@intuit.com",
 		"gender":     "Male",
 		"dept":       "devp",
+		"uuid":       "test-case-hyphen",
 	}
 
 	pass, err := EvalBool("(id == 1) && (last_name == 'Doe')", env)
@@ -54,4 +55,9 @@ func TestEvalBool(t *testing.T) {
 	pass, err = EvalBool("invalidexpression", env)
 	assert.Error(t, err)
 	assert.False(t, pass)
+
+	// expr with '-' evaluate the same as others
+	pass, err = EvalBool("(uuid == 'test-case-hyphen')", env)
+	assert.NoError(t, err)
+	assert.True(t, pass)
 }

eventsources/eventing.go

@@ -565,5 +565,5 @@ func filterEvent(data []byte, filter *v1alpha1.EventSourceFilter) (bool, error)
 		params[strings.ReplaceAll(key, "-", "_")] = value
 	}
 	env := expr.GetFuncMap(params)
-	return expr.EvalBool(strings.ReplaceAll(filter.Expression, "-", "_"), env)
+	return expr.EvalBool(filter.Expression, env)
 }