Skip to content
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.

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

🐛 respect match-all label values #499

Merged
merged 2 commits into from
Feb 12, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
2 changes: 1 addition & 1 deletion engine/labels/labels.go
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ func tokenize(expr string) []string {

func matchesAny(elem string, items []string) bool {
for _, item := range items {
if labelValueMatches(item, elem) {
if item == "" || labelValueMatches(item, elem) {
return true
}
}
Expand Down
27 changes: 27 additions & 0 deletions engine/labels/labels_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,33 @@ func Test_ruleSelector_Matches(t *testing.T) {
},
want: false,
},
{
name: "rule has a match-all source label",
expr: "konveyor.io/target=t1 && konveyor.io/source=t2",
ruleLabels: []string{
"konveyor.io/target=t1",
"konveyor.io/source",
},
want: true,
},
{
name: "rule has a specific source label",
expr: "konveyor.io/target=t1 && konveyor.io/source=t2",
ruleLabels: []string{
"konveyor.io/target=t1",
"konveyor.io/source=t3",
},
want: false,
},
{
name: "query contains match-all label",
expr: "konveyor.io/target=t1 && konveyor.io/source",
ruleLabels: []string{
"konveyor.io/target=t1",
"konveyor.io/source=t3",
},
want: true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
Expand Down
Loading