Skip to content

Commit

Permalink
🐛 respect match-all label values
Browse files Browse the repository at this point in the history
Signed-off-by: Pranav Gaikwad <[email protected]>
  • Loading branch information
pranavgaikwad committed Feb 7, 2024
1 parent 61fce08 commit b43893a
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 1 deletion.
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

0 comments on commit b43893a

Please sign in to comment.