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.

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

Jump to bottom

Adds wildcards search for tagmatcher #237

Merged
merged 1 commit into from
Dec 10, 2018
Merged

Adds wildcards search for tagmatcher #237

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions cloud/match/matchers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package match
import (
"fmt"
"reflect"
"regexp"
"strings"

"github.com/wallix/awless/cloud"
Expand Down Expand Up @@ -113,7 +114,7 @@ func (p propertyMatcher) Contains() propertyMatcher {
}

type tagMatcher struct {
key, value string
tagRegexp *regexp.Regexp
}

func (m tagMatcher) Match(r cloud.Resource) bool {
Expand All @@ -122,15 +123,18 @@ func (m tagMatcher) Match(r cloud.Resource) bool {
return false
}
for _, t := range tags {
if fmt.Sprintf("%s=%s", m.key, m.value) == t {
if m.tagRegexp.MatchString(t) {
return true
}
}
return false
}

func Tag(key, val string) tagMatcher {
return tagMatcher{key: key, value: val}
tagQuoteRegexp := "^" + regexp.QuoteMeta(key + "=" + val) + "$"
tagWildcardRegexp := regexp.MustCompile(strings.Replace(tagQuoteRegexp, "\\*", ".*", -1))

return tagMatcher{tagRegexp: tagWildcardRegexp}
}

type tagKeyMatcher struct {
Expand Down