Merge pull request #237 from padilo/tag-matcher-wildcards

Adds wildcards search for tagmatcher
wallix · Dec 10, 2018 · 2765f57 · 2765f57
2 parents 7d279d1 + 7b703bd
commit 2765f57
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/cloud/match/matchers.go b/cloud/match/matchers.go
@@ -18,6 +18,7 @@ package match
 import (
 	"fmt"
 	"reflect"
+	"regexp"
 	"strings"
 
 	"github.com/wallix/awless/cloud"
@@ -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 {
@@ -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 {