simplify filter

Author: vanhtuan0409

cmd/debug.go

@@ -19,16 +19,16 @@ import (
 	"strings"
 
 	"github.com/anduintransaction/rivendell/project"
-	"github.com/anduintransaction/rivendell/project/filters"
+	pfilters "github.com/anduintransaction/rivendell/project/filters"
 	"github.com/anduintransaction/rivendell/project/formatters"
 	"github.com/anduintransaction/rivendell/utils"
 	"github.com/spf13/cobra"
 )
 
 var (
 	outputFormat       string
-	filterGroups       []string
-	filterGroupsRegex  string
+	filterGroup        string
+	filterExact        bool
 	debugPrintResource bool
 )
 
@@ -45,23 +45,8 @@ var debugCmd = &cobra.Command{
 		}
 
 		var filterFns []project.FilterFunc
-
-		if len(filterGroups) > 0 {
-			filterFns = append(filterFns, filters.FilterBySlice(filterGroups))
-		}
-
-		var filterPattern *regexp.Regexp
-		if fgr := strings.TrimSpace(filterGroupsRegex); fgr != "" {
-			filterPattern, err = regexp.Compile(fgr)
-			if err != nil {
-				utils.Warn("Invalid filter group regex. Ignore pattern")
-			}
-			if filterPattern != nil {
-				filterFns = append(filterFns, filters.FilterByRegex(filterPattern))
-			}
-		}
-
-		p.SetFilter(filters.CombineFilter(filterFns...))
+		addFilterRegex(&filterFns)
+		p.SetFilter(pfilters.CombineFilter(filterFns...))
 
 		var formatter project.Formatter
 		switch strings.ToLower(outputFormat) {
@@ -84,11 +69,30 @@ var debugCmd = &cobra.Command{
 	},
 }
 
+func addFilterRegex(filters *[]project.FilterFunc) {
+	p := strings.TrimSpace(filterGroup)
+	if p == "" {
+		return
+	}
+	if filterExact && !strings.HasPrefix("^", p) {
+		p = "^" + p
+	}
+	if filterExact && !strings.HasSuffix("$", p) {
+		p = p + "$"
+	}
+	rexp, err := regexp.Compile(p)
+	if err != nil {
+		utils.Warn("Invalid filter group pattern. Ignoring filter")
+		return
+	}
+	*filters = append(*filters, pfilters.FilterByRegex(rexp))
+}
+
 func init() {
 	RootCmd.AddCommand(debugCmd)
 
 	debugCmd.Flags().StringVarP(&outputFormat, "output", "o", "console", "print format. One of: console|yaml|tree|config")
-	debugCmd.Flags().StringSliceVar(&filterGroups, "filter-groups", []string{}, "Only print resource groups")
-	debugCmd.Flags().StringVar(&filterGroupsRegex, "filter-groups-regex", "", "Only print resource groups matching pattern")
+	debugCmd.Flags().StringVar(&filterGroup, "filter-group", "", "Only print resource groups")
+	debugCmd.Flags().BoolVar(&filterExact, "exact", false, "Filter group by exact match")
 	debugCmd.Flags().BoolVar(&debugPrintResource, "print-resource", false, "Print resource in tree format")
 }

go.sum

@@ -467,7 +467,6 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b
 golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
 golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=