Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 27 additions & 2 deletions pkg/filter/attribute.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,18 +103,43 @@ func buildMatcher[T any](getters attributes.NamedGetters[T, string], attribute a
if err := def.Validate(); err != nil {
return m, err
}
if def.Match != "" {
switch {
case def.Match != "":
var err error
if m.Glob, err = glob.Compile(def.Match); err != nil {
return m, fmt.Errorf("invalid glob in match property: %w", err)
}
} else {
case def.NotMatch != "":
var err error
if m.Glob, err = glob.Compile(def.NotMatch); err != nil {
return m, fmt.Errorf("invalid glob in not_match property: %w", err)
}
m.Negate = true
default:
// use match-all as dummy for numeric-only comparisons
m.Glob = glob.MustCompile("*")

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need to add some statement that checks if none of these are set and report an error.


// Set up numeric comparisons
if def.Equals != nil {
m.Equals = def.Equals
}
if def.NotEquals != nil {
m.NotEquals = def.NotEquals
}
if def.GreaterEquals != nil {
m.GreaterEquals = def.GreaterEquals
}
if def.GreaterThan != nil {
m.GreaterThan = def.GreaterThan
}
if def.LessEquals != nil {
m.LessEquals = def.LessEquals
}
if def.LessThan != nil {
m.LessThan = def.LessThan
}
}

getter, ok := getters(attribute)
if !ok {
var t T
Expand Down
Loading