1
0
Fork 0

Merge current v2.11 into v3.0

This commit is contained in:
mmatur 2024-03-12 10:38:29 +01:00
commit 05be441027
No known key found for this signature in database
GPG key ID: 2FFE42FC256CFF8E
156 changed files with 5826 additions and 8436 deletions

View file

@ -3,6 +3,7 @@ package constraints
import (
"errors"
"regexp"
"slices"
"github.com/vulcand/predicate"
)
@ -47,12 +48,7 @@ func MatchTags(tags []string, expr string) (bool, error) {
func tagFn(name string) constraintTagFunc {
return func(tags []string) bool {
for _, tag := range tags {
if tag == name {
return true
}
}
return false
return slices.Contains(tags, name)
}
}
@ -63,13 +59,9 @@ func tagRegexFn(expr string) constraintTagFunc {
return false
}
for _, tag := range tags {
if exp.MatchString(tag) {
return true
}
}
return false
return slices.ContainsFunc(tags, func(tag string) bool {
return exp.MatchString(tag)
})
}
}