Fix bug with equals/not-equals for empty string

zix99 · Apr 1, 2023 · 2cdaf89 · 2cdaf89
1 parent 2883a9b
commit 2cdaf89
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/pkg/expressions/stdlib/funcs.go b/pkg/expressions/stdlib/funcs.go
@@ -30,15 +30,15 @@ var StandardFunctions = map[string]KeyBuilderFunction{
 	"unless": KeyBuilderFunction(kfUnless),
 	"eq": stringComparator(func(a, b string) string {
 		if a == b {
-			return a
+			return TruthyVal
 		}
-		return ""
+		return FalsyVal
 	}),
 	"neq": stringComparator(func(a, b string) string {
 		if a != b {
-			return a
+			return TruthyVal
 		}
-		return ""
+		return FalsyVal
 	}),
 	"not": KeyBuilderFunction(kfNot),
 	"lt":  arithmaticEqualityHelper(func(a, b float64) bool { return a < b }),

diff --git a/pkg/expressions/stdlib/funcs_test.go b/pkg/expressions/stdlib/funcs_test.go
@@ -83,6 +83,10 @@ func TestIfStatement(t *testing.T) {
 		`{if {0} {1} efg} {if {0} abc} {if {not {0}} a b} {if "" a} {if "" a b}`,
 		"q abc b  b")
 	testExpression(t, mockContext("abc efg"), `{if {eq {0} "abc efg"} beq}`, "beq")
+	testExpression(t, mockContext(), `{if {eq "" ""} true false}`, "true")
+	testExpression(t, mockContext(), `{if {eq "" "abc"} true false}`, "false")
+	testExpression(t, mockContext(), `{if {neq "" "abc"} true false}`, "true")
+	testExpression(t, mockContext(), `{if {neq "" ""} true false}`, "false")
 }
 
 func TestUnlessStatement(t *testing.T) {