diff --git a/cli/cmd/tapRunner.go b/cli/cmd/tapRunner.go index 6008a38f1..3c417cb6a 100644 --- a/cli/cmd/tapRunner.go +++ b/cli/cmd/tapRunner.go @@ -28,7 +28,6 @@ import ( "github.com/up9inc/mizu/shared" "github.com/up9inc/mizu/shared/kubernetes" "github.com/up9inc/mizu/shared/logger" - "github.com/up9inc/mizu/tap/api" ) const cleanupTimeout = time.Minute @@ -276,12 +275,12 @@ func readValidationRules(file string) (string, error) { } func getMizuApiFilteringOptions() (*shared.TrafficFilteringOptions, error) { - var compiledRegexSlice []*api.SerializableRegexp + var compiledRegexSlice []*shared.SerializableRegexp if config.Config.Tap.PlainTextFilterRegexes != nil && len(config.Config.Tap.PlainTextFilterRegexes) > 0 { - compiledRegexSlice = make([]*api.SerializableRegexp, 0) + compiledRegexSlice = make([]*shared.SerializableRegexp, 0) for _, regexStr := range config.Config.Tap.PlainTextFilterRegexes { - compiledRegex, err := api.CompileRegexToSerializableRegexp(regexStr) + compiledRegex, err := shared.CompileRegexToSerializableRegexp(regexStr) if err != nil { return nil, err } diff --git a/cli/go.mod b/cli/go.mod index acf9db04b..a68989973 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -13,7 +13,6 @@ require ( github.com/spf13/pflag v1.0.5 github.com/up9inc/basenine/server/lib v0.0.0-20220419100955-e2ca51087607 github.com/up9inc/mizu/shared v0.0.0 - github.com/up9inc/mizu/tap/api v0.0.0 golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b k8s.io/api v0.23.3 @@ -55,7 +54,6 @@ require ( github.com/google/go-cmp v0.5.7 // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/martian v2.1.0+incompatible // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/googleapis/gnostic v0.5.5 // indirect github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect diff --git a/cli/go.sum b/cli/go.sum index 6156cedfe..9d8420bac 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -302,7 +302,6 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/ github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=