Skip to content

fix: data filter != comparator should require NO matches (NOT IN behavior) #3809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
uptownhr wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: data filter != comparator should require NO matches (NOT IN behavior) #3809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9590fe5
fix: make != comparator work as NOT IN for data filters with multiple…
uptownhr Nov 12, 2025
eb89f7a
Merge branch 'master' into fix/data-filter-not-equal-comparator
uptownhr Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 76 additions & 17 deletions pkg/sensors/dependencies/filter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,44 @@ filterData:
}

case v1alpha1.JSONTypeNumber:
// Special handling for NotEqualTo: check ALL values first
if f.Comparator == v1alpha1.NotEqualTo {
matchFound := false
for _, value := range f.Value {
filterVal, err := strconv.ParseFloat(value, 64)
eventVal := pathResult.Float()
if err != nil {
if operator == v1alpha1.OrLogicalOperator {
errMessages = append(errMessages, err.Error())
continue filterData
} else {
return false, fmt.Errorf(errMsgTemplate, "data", err.Error())
}
}

if eventVal == filterVal {
matchFound = true
break
}
}

// For NotEqualTo: pass only if NO match was found (NOT IN semantics)
if !matchFound {
if operator == v1alpha1.OrLogicalOperator {
return true, nil
} else {
continue filterData
}
}

if operator == v1alpha1.OrLogicalOperator {
continue filterData
} else {
return false, nil
}
}

// Standard handling for all other comparators
for _, value := range f.Value {
filterVal, err := strconv.ParseFloat(value, 64)
eventVal := pathResult.Float()
Expand Down Expand Up @@ -334,10 +372,6 @@ filterData:
if eventVal <= filterVal {
compareResult = true
}
case v1alpha1.NotEqualTo:
if eventVal != filterVal {
compareResult = true
}
case v1alpha1.EqualTo, v1alpha1.EmptyComparator:
if eventVal == filterVal {
compareResult = true
Expand All @@ -359,6 +393,43 @@ filterData:
}

case v1alpha1.JSONTypeString:
// Special handling for NotEqualTo: check ALL values first
if f.Comparator == v1alpha1.NotEqualTo {
matchFound := false
for _, value := range f.Value {
exp, err := regexp.Compile(value)
if err != nil {
if operator == v1alpha1.OrLogicalOperator {
errMessages = append(errMessages, err.Error())
continue filterData
} else {
return false, fmt.Errorf(errMsgTemplate, "data", err.Error())
}
}

if exp.Match([]byte(pathResult.String())) {
matchFound = true
break
}
}

// For NotEqualTo: pass only if NO match was found (NOT IN semantics)
if !matchFound {
if operator == v1alpha1.OrLogicalOperator {
return true, nil
} else {
continue filterData
}
}

if operator == v1alpha1.OrLogicalOperator {
continue filterData
} else {
return false, nil
}
}

// Standard handling for EqualTo comparator
for _, value := range f.Value {
exp, err := regexp.Compile(value)
if err != nil {
Expand All @@ -370,20 +441,8 @@ filterData:
}
}

matchResult := false
match := exp.Match([]byte(pathResult.String()))
switch f.Comparator {
case v1alpha1.EqualTo, v1alpha1.EmptyComparator:
if match {
matchResult = true
}
case v1alpha1.NotEqualTo:
if !match {
matchResult = true
}
}

if matchResult {
if match {
if operator == v1alpha1.OrLogicalOperator {
return true, nil
} else {
Expand Down
88 changes: 88 additions & 0 deletions pkg/sensors/dependencies/filter_data_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,94 @@ func TestFilterData(t *testing.T) {
expectedResult: true,
expectErr: false,
},
{
name: "string filter NotEqualTo with multiple values - value IN array (should FAIL with fix)",
args: args{
data: []v1alpha1.DataFilter{
{
Path: "k",
Type: v1alpha1.JSONTypeString,
Value: []string{"id1", "id2", "id3"},
Comparator: "!=",
},
},
operator: v1alpha1.EmptyLogicalOperator,
event: &v1alpha1.Event{
Context: &v1alpha1.EventContext{
DataContentType: "application/json",
},
Data: []byte(`{"k": "id1"}`),
},
},
expectedResult: false, // Should FAIL - value IS in array
expectErr: false,
},
{
name: "string filter NotEqualTo with multiple values - value NOT IN array (should PASS)",
args: args{
data: []v1alpha1.DataFilter{
{
Path: "k",
Type: v1alpha1.JSONTypeString,
Value: []string{"id1", "id2", "id3"},
Comparator: "!=",
},
},
operator: v1alpha1.EmptyLogicalOperator,
event: &v1alpha1.Event{
Context: &v1alpha1.EventContext{
DataContentType: "application/json",
},
Data: []byte(`{"k": "id_other"}`),
},
},
expectedResult: true, // Should PASS - value NOT in array
expectErr: false,
},
{
name: "number filter NotEqualTo with multiple values - value IN array (should FAIL with fix)",
args: args{
data: []v1alpha1.DataFilter{
{
Path: "k",
Type: v1alpha1.JSONTypeNumber,
Value: []string{"1.0", "2.0", "3.0"},
Comparator: "!=",
},
},
operator: v1alpha1.EmptyLogicalOperator,
event: &v1alpha1.Event{
Context: &v1alpha1.EventContext{
DataContentType: "application/json",
},
Data: []byte(`{"k": 2.0}`),
},
},
expectedResult: false, // Should FAIL - value IS in array
expectErr: false,
},
{
name: "number filter NotEqualTo with multiple values - value NOT IN array (should PASS)",
args: args{
data: []v1alpha1.DataFilter{
{
Path: "k",
Type: v1alpha1.JSONTypeNumber,
Value: []string{"1.0", "2.0", "3.0"},
Comparator: "!=",
},
},
operator: v1alpha1.EmptyLogicalOperator,
event: &v1alpha1.Event{
Context: &v1alpha1.EventContext{
DataContentType: "application/json",
},
Data: []byte(`{"k": 5.0}`),
},
},
expectedResult: true, // Should PASS - value NOT in array
expectErr: false,
},
}

for _, test := range tests {
Expand Down