Move TrafficFilteringOptions struct to shared module

tap/api/api.go

@@ -15,6 +15,7 @@ import (
 	"time"
 
 	"github.com/google/martian/har"
+	"github.com/up9inc/mizu/shared"
 	"github.com/up9inc/mizu/tap/api/diagnose"
 )
 
@@ -131,7 +132,7 @@ func (p *ReadProgress) Current() (n int) {
 type Dissector interface {
 	Register(*Extension)
 	Ping()
-	Dissect(b *bufio.Reader, progress *ReadProgress, capture Capture, isClient bool, tcpID *TcpID, counterPair *CounterPair, superTimer *SuperTimer, superIdentifier *SuperIdentifier, emitter Emitter, options *TrafficFilteringOptions, reqResMatcher RequestResponseMatcher) error
+	Dissect(b *bufio.Reader, progress *ReadProgress, capture Capture, isClient bool, tcpID *TcpID, counterPair *CounterPair, superTimer *SuperTimer, superIdentifier *SuperIdentifier, emitter Emitter, options *shared.TrafficFilteringOptions, reqResMatcher RequestResponseMatcher) error
 	Analyze(item *OutputChannelItem, resolvedSource string, resolvedDestination string, namespace string) *Entry
 	Summarize(entry *Entry) *BaseEntry
 	Represent(request map[string]interface{}, response map[string]interface{}) (object []byte, err error)

tap/api/options.go

@@ -1,7 +0,0 @@
-package api
-
-type TrafficFilteringOptions struct {
-	IgnoredUserAgents       []string
-	PlainTextMaskingRegexes []*SerializableRegexp
-	DisableRedaction        bool
-}

tap/api/serializable_regexp.go

@@ -1,30 +0,0 @@
-package api
-
-import "regexp"
-
-type SerializableRegexp struct {
-	regexp.Regexp
-}
-
-func CompileRegexToSerializableRegexp(expr string) (*SerializableRegexp, error) {
-	re, err := regexp.Compile(expr)
-	if err != nil {
-		return nil, err
-	}
-	return &SerializableRegexp{*re}, nil
-}
-
-// UnmarshalText is by json.Unmarshal.
-func (r *SerializableRegexp) UnmarshalText(text []byte) error {
-	rr, err := CompileRegexToSerializableRegexp(string(text))
-	if err != nil {
-		return err
-	}
-	*r = *rr
-	return nil
-}
-
-// MarshalText is used by json.Marshal.
-func (r *SerializableRegexp) MarshalText() ([]byte, error) {
-	return []byte(r.String()), nil
-}

tap/api/tcp_reader.go

@@ -7,6 +7,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/up9inc/mizu/shared"
 	"github.com/up9inc/mizu/shared/logger"
 )
 
@@ -72,7 +73,7 @@ func (h *TcpReader) Close() {
 	h.Unlock()
 }
 
-func (h *TcpReader) Run(filteringOptions *TrafficFilteringOptions, wg *sync.WaitGroup) {
+func (h *TcpReader) Run(filteringOptions *shared.TrafficFilteringOptions, wg *sync.WaitGroup) {
 	defer wg.Done()
 	b := bufio.NewReader(h)
 	err := h.Extension.Dissector.Dissect(b, h.Progress, h.Parent.Origin, h.IsClient, h.TcpID, h.CounterPair, h.SuperTimer, h.Parent.SuperIdentifier, h.Emitter, filteringOptions, h.ReqResMatcher)