diff --git a/agent/go.mod b/agent/go.mod index 4853e8756..4220dfdd6 100644 --- a/agent/go.mod +++ b/agent/go.mod @@ -12,9 +12,9 @@ require ( github.com/go-playground/locales v0.13.0 github.com/go-playground/universal-translator v0.17.0 github.com/go-playground/validator/v10 v10.5.0 - github.com/google/uuid v1.1.2 + github.com/google/martian v2.1.0+incompatible + github.com/google/uuid v1.1.2 // indirect github.com/gorilla/websocket v1.4.2 - github.com/mrichman/hargo v0.1.2 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 github.com/orcaman/concurrent-map v0.0.0-20210106121528-16402b402231 github.com/patrickmn/go-cache v2.1.0+incompatible diff --git a/agent/pkg/api/main.go b/agent/pkg/api/main.go index 2e7ff1a05..62d3c0780 100644 --- a/agent/pkg/api/main.go +++ b/agent/pkg/api/main.go @@ -13,7 +13,7 @@ import ( "strings" "time" - har "github.com/mrichman/hargo" + "github.com/google/martian/har" "github.com/up9inc/mizu/shared" "github.com/up9inc/mizu/shared/logger" tapApi "github.com/up9inc/mizu/tap/api" @@ -86,7 +86,7 @@ func startReadingFiles(workingDir string) { file, err := os.Open(inputFilePath) utils.CheckErr(err) - var inputHar har.Har + var inputHar har.HAR decErr := json.NewDecoder(bufio.NewReader(file)).Decode(&inputHar) utils.CheckErr(decErr) @@ -144,7 +144,7 @@ func startReadingChannel(outputItems <-chan *tapApi.OutputChannelItem, extension mizuEntry.ContractContent = contract.Content } - harEntry, err := utils.NewEntry(mizuEntry.Request, mizuEntry.Response, mizuEntry.StartTime, int(mizuEntry.ElapsedTime)) + harEntry, err := utils.NewEntry(mizuEntry.Request, mizuEntry.Response, mizuEntry.StartTime, mizuEntry.ElapsedTime) if err == nil { rules, _, _ := models.RunValidationRulesState(*harEntry, mizuEntry.Destination.Name) baseEntry.Rules = rules diff --git a/agent/pkg/controllers/entries_controller.go b/agent/pkg/controllers/entries_controller.go index 0db61e5b1..0b2f0724a 100644 --- a/agent/pkg/controllers/entries_controller.go +++ b/agent/pkg/controllers/entries_controller.go @@ -118,7 +118,7 @@ func GetEntry(c *gin.Context) { var rules []map[string]interface{} var isRulesEnabled bool if entry.Protocol.Name == "http" { - harEntry, _ := utils.NewEntry(entry.Request, entry.Response, entry.StartTime, int(entry.ElapsedTime)) + harEntry, _ := utils.NewEntry(entry.Request, entry.Response, entry.StartTime, entry.ElapsedTime) _, rulesMatched, _isRulesEnabled := models.RunValidationRulesState(*harEntry, entry.Destination.Name) isRulesEnabled = _isRulesEnabled inrec, _ := json.Marshal(rulesMatched) diff --git a/agent/pkg/models/models.go b/agent/pkg/models/models.go index db242d0d4..84f8e9842 100644 --- a/agent/pkg/models/models.go +++ b/agent/pkg/models/models.go @@ -6,7 +6,7 @@ import ( tapApi "github.com/up9inc/mizu/tap/api" - har "github.com/mrichman/hargo" + "github.com/google/martian/har" basenine "github.com/up9inc/basenine/client/go" "github.com/up9inc/mizu/shared" "github.com/up9inc/mizu/tap" diff --git a/agent/pkg/oas/feeder.go b/agent/pkg/oas/feeder.go index 9c0977601..e1fe14133 100644 --- a/agent/pkg/oas/feeder.go +++ b/agent/pkg/oas/feeder.go @@ -4,7 +4,7 @@ import ( "bufio" "encoding/json" "errors" - har "github.com/mrichman/hargo" + "github.com/google/martian/har" "github.com/up9inc/mizu/shared/logger" "io" "io/ioutil" @@ -76,14 +76,14 @@ func feedFromHAR(file string, out chan<- har.Entry) error { return err } - var harDoc har.Har + var harDoc har.HAR err = json.Unmarshal(data, &harDoc) if err != nil { return err } for _, entry := range harDoc.Log.Entries { - out <- entry + out <- *entry } return nil diff --git a/agent/pkg/oas/feeder_test.go b/agent/pkg/oas/feeder_test.go index 0befe4199..b651809bd 100644 --- a/agent/pkg/oas/feeder_test.go +++ b/agent/pkg/oas/feeder_test.go @@ -3,7 +3,7 @@ package oas import ( "encoding/json" "github.com/chanced/openapi" - har "github.com/mrichman/hargo" + "github.com/google/martian/har" "github.com/op/go-logging" "github.com/up9inc/mizu/shared/logger" "io/ioutil" diff --git a/agent/pkg/oas/specgen.go b/agent/pkg/oas/specgen.go index 62983745e..7e192d40f 100644 --- a/agent/pkg/oas/specgen.go +++ b/agent/pkg/oas/specgen.go @@ -4,8 +4,8 @@ import ( "encoding/json" "errors" "github.com/chanced/openapi" + "github.com/google/martian/har" "github.com/google/uuid" - har "github.com/mrichman/hargo" "github.com/up9inc/mizu/shared/logger" "mime" "net/url" @@ -139,7 +139,7 @@ func (g *SpecGen) handlePathObj(entry *har.Entry) error { logger.Log.Debugf("Dropped traffic entry due to ignored extension: %s", urlParsed.Path) } - ctype := getRespCtype(&entry.Response) + ctype := getRespCtype(entry.Response) if isCtypeIgnored(ctype) { logger.Log.Debugf("Dropped traffic entry due to ignored response ctype: %s", ctype) } @@ -197,12 +197,12 @@ func handleOpObj(entry *har.Entry, pathObj *openapi.PathObj) error { return nil } - err = handleRequest(&entry.Request, opObj, isSuccess) + err = handleRequest(entry.Request, opObj, isSuccess) if err != nil { return err } - err = handleResponse(&entry.Response, opObj, isSuccess) + err = handleResponse(entry.Response, opObj, isSuccess) if err != nil { return err } @@ -211,7 +211,7 @@ func handleOpObj(entry *har.Entry, pathObj *openapi.PathObj) error { } func handleRequest(req *har.Request, opObj *openapi.Operation, isSuccess bool) error { - if req.PostData.Text != "" && isSuccess { + if req.PostData != nil && req.PostData.Text != "" && isSuccess { reqBody, err := getRequestBody(req, opObj, isSuccess) if err != nil { return err diff --git a/agent/pkg/rules/rulesHTTP.go b/agent/pkg/rules/rulesHTTP.go index 5a3f3a215..61550fbcf 100644 --- a/agent/pkg/rules/rulesHTTP.go +++ b/agent/pkg/rules/rulesHTTP.go @@ -10,7 +10,7 @@ import ( "github.com/up9inc/mizu/shared/logger" - har "github.com/mrichman/hargo" + "github.com/google/martian/har" "github.com/up9inc/mizu/shared" jsonpath "github.com/yalp/jsonpath" ) diff --git a/agent/pkg/up9/main.go b/agent/pkg/up9/main.go index bd168924a..e44c2b9e2 100644 --- a/agent/pkg/up9/main.go +++ b/agent/pkg/up9/main.go @@ -15,7 +15,7 @@ import ( "sync" "time" - har "github.com/mrichman/hargo" + "github.com/google/martian/har" basenine "github.com/up9inc/basenine/client/go" "github.com/up9inc/mizu/shared" "github.com/up9inc/mizu/shared/logger" @@ -247,24 +247,21 @@ func syncEntriesImpl(token string, model string, envPrefix string, uploadInterva if err := json.Unmarshal([]byte(dataBytes), &entry); err != nil { continue } - harEntry, err := utils.NewEntry(entry.Request, entry.Response, entry.StartTime, int(entry.ElapsedTime)) + harEntry, err := utils.NewEntry(entry.Request, entry.Response, entry.StartTime, entry.ElapsedTime) if err != nil { continue } if entry.Source.Name != "" { - harEntry.Request.Headers = append(harEntry.Request.Headers, har.NVP{Name: "x-mizu-source", Value: entry.Source.Name}) + harEntry.Request.Headers = append(harEntry.Request.Headers, har.Header{Name: "x-mizu-source", Value: entry.Source.Name}) } if entry.Destination.Name != "" { - harEntry.Request.Headers = append(harEntry.Request.Headers, har.NVP{Name: "x-mizu-destination", Value: entry.Destination.Name}) + harEntry.Request.Headers = append(harEntry.Request.Headers, har.Header{Name: "x-mizu-destination", Value: entry.Destination.Name}) harEntry.Request.URL = utils.SetHostname(harEntry.Request.URL, entry.Destination.Name) } - if harEntry.Response.Content.Encoding == "base64" { - decoded, err := base64.StdEncoding.DecodeString(harEntry.Response.Content.Text) - if err != nil { - continue - } - harEntry.Response.Content.Text = string(decoded) + // go's default marshal behavior is to encode []byte fields to base64, python's default unmarshal behavior is to not decode []byte fields from base64 + if harEntry.Response.Content.Text, err = base64.StdEncoding.DecodeString(string(harEntry.Response.Content.Text)); err != nil { + continue } batch = append(batch, *harEntry) diff --git a/agent/pkg/utils/har.go b/agent/pkg/utils/har.go index 020c44581..108e91b7b 100644 --- a/agent/pkg/utils/har.go +++ b/agent/pkg/utils/har.go @@ -8,7 +8,7 @@ import ( "strings" "time" - har "github.com/mrichman/hargo" + "github.com/google/martian/har" "github.com/up9inc/mizu/shared/logger" ) @@ -55,14 +55,14 @@ import ( // return cookies //} -func BuildHeaders(rawHeaders []interface{}) ([]har.NVP, string, string, string, string, string) { +func BuildHeaders(rawHeaders []interface{}) ([]har.Header, string, string, string, string, string) { var host, scheme, authority, path, status string - headers := make([]har.NVP, 0, len(rawHeaders)) + headers := make([]har.Header, 0, len(rawHeaders)) for _, header := range rawHeaders { h := header.(map[string]interface{}) - headers = append(headers, har.NVP{ + headers = append(headers, har.Header{ Name: h["name"].(string), Value: h["value"].(string), }) @@ -87,8 +87,8 @@ func BuildHeaders(rawHeaders []interface{}) ([]har.NVP, string, string, string, return headers, host, scheme, authority, path, status } -func BuildPostParams(rawParams []interface{}) []har.PostParam { - params := make([]har.PostParam, 0, len(rawParams)) +func BuildPostParams(rawParams []interface{}) []har.Param { + params := make([]har.Param, 0, len(rawParams)) for _, param := range rawParams { p := param.(map[string]interface{}) name := "" @@ -108,10 +108,10 @@ func BuildPostParams(rawParams []interface{}) []har.PostParam { contentType = p["contentType"].(string) } - params = append(params, har.PostParam{ + params = append(params, har.Param{ Name: name, Value: value, - FileName: fileName, + Filename: fileName, ContentType: contentType, }) } @@ -134,10 +134,10 @@ func NewRequest(request map[string]interface{}) (harRequest *har.Request, err er postDataText = text.(string) } - queryString := make([]har.NVP, 0) + queryString := make([]har.QueryString, 0) for _, _qs := range request["_queryString"].([]interface{}) { qs := _qs.(map[string]interface{}) - queryString = append(queryString, har.NVP{ + queryString = append(queryString, har.QueryString{ Name: qs["name"].(string), Value: qs["value"].(string), }) @@ -148,7 +148,7 @@ func NewRequest(request map[string]interface{}) (harRequest *har.Request, err er url = fmt.Sprintf("%s://%s%s", scheme, authority, path) } - harParams := make([]har.PostParam, 0) + harParams := make([]har.Param, 0) if postData["params"] != nil { harParams = BuildPostParams(postData["params"].([]interface{})) } @@ -157,12 +157,12 @@ func NewRequest(request map[string]interface{}) (harRequest *har.Request, err er Method: request["method"].(string), URL: url, HTTPVersion: request["httpVersion"].(string), - HeaderSize: -1, - BodySize: bytes.NewBufferString(postDataText).Len(), + HeadersSize: -1, + BodySize: int64(bytes.NewBufferString(postDataText).Len()), QueryString: queryString, Headers: headers, Cookies: cookies, - PostData: har.PostData{ + PostData: &har.PostData{ MimeType: mimeType.(string), Params: harParams, Text: postDataText, @@ -191,8 +191,8 @@ func NewResponse(response map[string]interface{}) (harResponse *har.Response, er harContent := &har.Content{ Encoding: encoding.(string), MimeType: mimeType.(string), - Text: bodyText, - Size: len(bodyText), + Text: []byte(bodyText), + Size: int64(len(bodyText)), } status := int(response["status"].(float64)) @@ -211,15 +211,15 @@ func NewResponse(response map[string]interface{}) (harResponse *har.Response, er Status: status, StatusText: response["statusText"].(string), HeadersSize: -1, - BodySize: bytes.NewBufferString(bodyText).Len(), + BodySize: int64(bytes.NewBufferString(bodyText).Len()), Headers: headers, Cookies: cookies, - Content: *harContent, + Content: harContent, } return } -func NewEntry(request map[string]interface{}, response map[string]interface{}, startTime time.Time, elapsedTime int) (*har.Entry, error) { +func NewEntry(request map[string]interface{}, response map[string]interface{}, startTime time.Time, elapsedTime int64) (*har.Entry, error) { harRequest, err := NewRequest(request) if err != nil { logger.Log.Errorf("Failed converting request to HAR %s (%v,%+v)", err, err, err) @@ -237,12 +237,12 @@ func NewEntry(request map[string]interface{}, response map[string]interface{}, s } harEntry := har.Entry{ - StartedDateTime: startTime.String(), - Time: float32(elapsedTime), - Request: *harRequest, - Response: *harResponse, - Cache: har.Cache{}, - PageTimings: har.PageTimings{ + StartedDateTime: startTime, + Time: elapsedTime, + Request: harRequest, + Response: harResponse, + Cache: &har.Cache{}, + Timings: &har.Timings{ Send: -1, Wait: -1, Receive: elapsedTime, diff --git a/devops/build_extensions.sh b/devops/build_extensions.sh index 855f1c44a..6ac6791ca 100755 --- a/devops/build_extensions.sh +++ b/devops/build_extensions.sh @@ -2,6 +2,7 @@ for f in tap/extensions/*; do if [ -d "$f" ]; then + echo Building extension: $f extension=$(basename $f) && \ cd tap/extensions/${extension} && \ go build -buildmode=plugin -o ../${extension}.so . && \ diff --git a/tap/api/go.mod b/tap/api/go.mod index 998cde83d..e6aa29754 100644 --- a/tap/api/go.mod +++ b/tap/api/go.mod @@ -2,7 +2,4 @@ module github.com/up9inc/mizu/tap/api go 1.16 -require ( - github.com/google/martian v2.1.0+incompatible - github.com/mrichman/hargo v0.1.2 -) +require github.com/google/martian v2.1.0+incompatible diff --git a/tap/extensions/amqp/go.sum b/tap/extensions/amqp/go.sum index 015caadbd..bbcb7d053 100644 --- a/tap/extensions/amqp/go.sum +++ b/tap/extensions/amqp/go.sum @@ -1,30 +1,2 @@ -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/influxdata/influxdb1-client v0.0.0-20190809212627-fc22c7df067e h1:txQltCyjXAqVVSZDArPEhUTg35hKwVIuXwtQo7eAMNQ= -github.com/influxdata/influxdb1-client v0.0.0-20190809212627-fc22c7df067e/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/mrichman/hargo v0.1.2 h1:ixApAMFVqUGUEdNDRK8q6QayYhVLmY/K3YSoVkAF6go= -github.com/mrichman/hargo v0.1.2/go.mod h1:XliMNJP/mlxJP2Wa0c4STcuXvrY4bMzdft/XHPfdg7w= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/urfave/cli v1.21.0/go.mod h1:lxDj6qX9Q6lWQxIrbrT0nwecwUtRnhVZAJjJZrVUZZQ= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 h1:k7pJ2yAPLPgbskkFdhRCsA77k2fySZ1zf2zCjvQCiIM= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/tap/extensions/http/go.sum b/tap/extensions/http/go.sum index 1d236613a..a9d408e60 100644 --- a/tap/extensions/http/go.sum +++ b/tap/extensions/http/go.sum @@ -1,38 +1,12 @@ -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs= github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A= -github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/influxdata/influxdb1-client v0.0.0-20190809212627-fc22c7df067e h1:txQltCyjXAqVVSZDArPEhUTg35hKwVIuXwtQo7eAMNQ= -github.com/influxdata/influxdb1-client v0.0.0-20190809212627-fc22c7df067e/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/mrichman/hargo v0.1.2 h1:ixApAMFVqUGUEdNDRK8q6QayYhVLmY/K3YSoVkAF6go= -github.com/mrichman/hargo v0.1.2/go.mod h1:XliMNJP/mlxJP2Wa0c4STcuXvrY4bMzdft/XHPfdg7w= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/urfave/cli v1.21.0/go.mod h1:lxDj6qX9Q6lWQxIrbrT0nwecwUtRnhVZAJjJZrVUZZQ= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210224082022-3d97a244fca7 h1:OgUuv8lsRpBibGNbSizVwKWlysjaNzmC9gYMhPVfqFM= golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/tap/extensions/kafka/go.mod b/tap/extensions/kafka/go.mod index 12473fc02..113627f94 100644 --- a/tap/extensions/kafka/go.mod +++ b/tap/extensions/kafka/go.mod @@ -3,7 +3,6 @@ module github.com/up9inc/mizu/tap/extensions/kafka go 1.16 require ( - github.com/klauspost/compress v1.13.6 // indirect, see https://github.com/klauspost/compress/issues/428 github.com/segmentio/kafka-go v0.4.17 github.com/up9inc/mizu/tap/api v0.0.0 ) diff --git a/tap/extensions/kafka/go.sum b/tap/extensions/kafka/go.sum index 145969475..70ec03308 100644 --- a/tap/extensions/kafka/go.sum +++ b/tap/extensions/kafka/go.sum @@ -1,8 +1,4 @@ -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8/yCZMuEPMUDHG0CW/brkkEp8mzqk2+ODEitlw= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/frankban/quicktest v1.11.3 h1:8sXhOn0uLys67V8EsXLc6eszDs8VXWxL3iRvebPhedY= @@ -13,50 +9,29 @@ github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 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/influxdata/influxdb1-client v0.0.0-20190809212627-fc22c7df067e h1:txQltCyjXAqVVSZDArPEhUTg35hKwVIuXwtQo7eAMNQ= -github.com/influxdata/influxdb1-client v0.0.0-20190809212627-fc22c7df067e/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= +github.com/klauspost/compress v1.9.8 h1:VMAMUUOh+gaxKTMk+zqbjsSjsIcUcL/LF4o63i82QyA= github.com/klauspost/compress v1.9.8/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc= -github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/mrichman/hargo v0.1.2 h1:ixApAMFVqUGUEdNDRK8q6QayYhVLmY/K3YSoVkAF6go= -github.com/mrichman/hargo v0.1.2/go.mod h1:XliMNJP/mlxJP2Wa0c4STcuXvrY4bMzdft/XHPfdg7w= github.com/pierrec/lz4 v2.6.0+incompatible h1:Ix9yFKn1nSPBLFl/yZknTp8TU5G4Ps0JDmguYK6iH1A= github.com/pierrec/lz4 v2.6.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/segmentio/kafka-go v0.4.17 h1:IyqRstL9KUTDb3kyGPOOa5VffokKWSEzN6geJ92dSDY= github.com/segmentio/kafka-go v0.4.17/go.mod h1:19+Eg7KwrNKy/PFhiIthEPkO8k+ac7/ZYXwYM9Df10w= -github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/urfave/cli v1.21.0/go.mod h1:lxDj6qX9Q6lWQxIrbrT0nwecwUtRnhVZAJjJZrVUZZQ= github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190506204251-e1dfcc566284/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 h1:k7pJ2yAPLPgbskkFdhRCsA77k2fySZ1zf2zCjvQCiIM= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/tap/extensions/redis/go.sum b/tap/extensions/redis/go.sum index 015caadbd..bbcb7d053 100644 --- a/tap/extensions/redis/go.sum +++ b/tap/extensions/redis/go.sum @@ -1,30 +1,2 @@ -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/influxdata/influxdb1-client v0.0.0-20190809212627-fc22c7df067e h1:txQltCyjXAqVVSZDArPEhUTg35hKwVIuXwtQo7eAMNQ= -github.com/influxdata/influxdb1-client v0.0.0-20190809212627-fc22c7df067e/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/mrichman/hargo v0.1.2 h1:ixApAMFVqUGUEdNDRK8q6QayYhVLmY/K3YSoVkAF6go= -github.com/mrichman/hargo v0.1.2/go.mod h1:XliMNJP/mlxJP2Wa0c4STcuXvrY4bMzdft/XHPfdg7w= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/urfave/cli v1.21.0/go.mod h1:lxDj6qX9Q6lWQxIrbrT0nwecwUtRnhVZAJjJZrVUZZQ= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 h1:k7pJ2yAPLPgbskkFdhRCsA77k2fySZ1zf2zCjvQCiIM= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=