From fae41951c7dd607d0927816903f00b7356103c93 Mon Sep 17 00:00:00 2001 From: Ruidy Nemausat Date: Tue, 21 Jul 2020 10:13:25 +0200 Subject: [PATCH] scaffold images API --- images/files/local.go | 91 +++++++++++++++++++++++++++++++++++++ images/files/local_test.go | 68 ++++++++++++++++++++++++++++ images/files/storage.go | 9 ++++ images/go.mod | 9 ++++ images/go.sum | 18 ++++++++ images/handlers/files.go | 52 +++++++++++++++++++++ images/main.go | 93 ++++++++++++++++++++++++++++++++++++++ products/go.mod | 5 +- products/go.sum | 27 +---------- 9 files changed, 343 insertions(+), 29 deletions(-) create mode 100644 images/files/local.go create mode 100644 images/files/local_test.go create mode 100644 images/files/storage.go create mode 100644 images/go.mod create mode 100644 images/go.sum create mode 100644 images/handlers/files.go create mode 100644 images/main.go diff --git a/images/files/local.go b/images/files/local.go new file mode 100644 index 0000000..ea30e8b --- /dev/null +++ b/images/files/local.go @@ -0,0 +1,91 @@ +package files + +import ( + "io" + "os" + "path/filepath" + + "golang.org/x/xerrors" +) + +// Local is an implementation of the Storage interface which works with the +// local disk on the current machine +type Local struct { + maxFileSize int // maximum numbber of bytes for files + basePath string +} + +// NewLocal creates a new Local filesytem with the given base path +// basePath is the base directory to save files to +// maxSize is the max number of bytes that a file can be +func NewLocal(basePath string, maxSize int) (*Local, error) { + p, err := filepath.Abs(basePath) + if err != nil { + return nil, err + } + + return &Local{basePath: p}, nil +} + +// Save the contents of the Writer to the given path +// path is a relative path, basePath will be appended +func (l *Local) Save(path string, contents io.Reader) error { + // get the full path for the file + fp := l.fullPath(path) + + // get the directory and make sure it exists + d := filepath.Dir(fp) + err := os.MkdirAll(d, os.ModePerm) + if err != nil { + return xerrors.Errorf("Unable to create directory: %w", err) + } + + // if the file exists delete it + _, err = os.Stat(fp) + if err == nil { + err = os.Remove(fp) + if err != nil { + return xerrors.Errorf("Unable to delete file: %w", err) + } + } else if !os.IsNotExist(err) { + // if this is anything other than a not exists error + return xerrors.Errorf("Unable to get file info: %w", err) + } + + // create a new file at the path + f, err := os.Create(fp) + if err != nil { + return xerrors.Errorf("Unable to create file: %w", err) + } + defer f.Close() + + // write the contents to the new file + // ensure that we are not writing greater than max bytes + _, err = io.Copy(f, contents) + if err != nil { + return xerrors.Errorf("Unable to write to file: %w", err) + } + + return nil +} + +// Get the file at the given path and return a Reader +// the calling function is responsible for closing the reader +func (l *Local) Get(path string) (*os.File, error) { + // get the full path for the file + fp := l.fullPath(path) + + // open the file + f, err := os.Open(fp) + if err != nil { + return nil, xerrors.Errorf("Unable to open file: %w", err) + } + + return f, nil +} + +// returns the absolute path +func (l *Local) fullPath(path string) string { + // append the given path to the base path + return filepath.Join(l.basePath, path) +} diff --git a/images/files/local_test.go b/images/files/local_test.go new file mode 100644 index 0000000..880f40b --- /dev/null +++ b/images/files/local_test.go @@ -0,0 +1,68 @@ +package files + +import ( + "bytes" + "io/ioutil" + "os" + "path/filepath" + "testing" + + "github.com/stretchr/testify/assert" +) + +func setupLocal(t *testing.T) (*Local, string, func()) { + // create a temporary directory + dir, err := ioutil.TempDir("", "files") + if err != nil { + t.Fatal(err) + } + + l, err := NewLocal(dir) + if err != nil { + t.Fatal(err) + } + + return l, dir, func() { + // cleanup function + //os.RemoveAll(dir) + } +} + +func TestSavesContentsOfReader(t *testing.T) { + savePath := "/1/test.png" + fileContents := "Hello World" + l, dir, cleanup := setupLocal(t) + defer cleanup() + + err := l.Save(savePath, bytes.NewBuffer([]byte(fileContents))) + assert.NoError(t, err) + + // check the file has been correctly written + f, err := os.Open(filepath.Join(dir, savePath)) + assert.NoError(t, err) + + // check the contents of the file + d, err := ioutil.ReadAll(f) + assert.NoError(t, err) + assert.Equal(t, fileContents, string(d)) +} + +func TestGetsContentsAndWritesToWriter(t *testing.T) { + savePath := "/1/test.png" + fileContents := "Hello World" + l, _, cleanup := setupLocal(t) + defer cleanup() + + // Save a file + err := l.Save(savePath, bytes.NewBuffer([]byte(fileContents))) + assert.NoError(t, err) + + // Read the file back + r, err := l.Get(savePath) + assert.NoError(t, err) + defer r.Close() + + // read the full contents of the reader + d, err := ioutil.ReadAll(r) + assert.Equal(t, fileContents, string(d)) +} diff --git a/images/files/storage.go b/images/files/storage.go new file mode 100644 index 0000000..b70639f --- /dev/null +++ b/images/files/storage.go @@ -0,0 +1,9 @@ +package files + +import "io" + +// Storage defines the behavior for file operations +// Implementations may be of the time local disk, or cloud storage, etc +type Storage interface { + Save(path string, file io.Reader) error +} diff --git a/images/go.mod b/images/go.mod new file mode 100644 index 0000000..09253dd --- /dev/null +++ b/images/go.mod @@ -0,0 +1,9 @@ +module github.com/rjNemo/go-micro/images + +go 1.14 + +require ( + github.com/gorilla/mux v1.7.4 + github.com/hashicorp/go-hclog v0.14.1 + golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 +) diff --git a/images/go.sum b/images/go.sum new file mode 100644 index 0000000..1e92988 --- /dev/null +++ b/images/go.sum @@ -0,0 +1,18 @@ +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc= +github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/hashicorp/go-hclog v0.14.1 h1:nQcJDQwIAGnmoUWp8ubocEX40cCml/17YkF6csQLReU= +github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.10 h1:qxFzApOv4WsAL965uUPIsXzAKCZxN2p9UqdhFS4ZW10= +github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +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= diff --git a/images/handlers/files.go b/images/handlers/files.go new file mode 100644 index 0000000..ebd8b86 --- /dev/null +++ b/images/handlers/files.go @@ -0,0 +1,52 @@ +package handlers + +import ( + "net/http" + "path/filepath" + + "github.com/gorilla/mux" + hclog "github.com/hashicorp/go-hclog" + "github.com/rjNemo/go-micro/images/files" +) + +// Files is a handler for reading and writing files +type Files struct { + log hclog.Logger + store files.Storage +} + +// NewFiles creates a new File handler +func NewFiles(s files.Storage, l hclog.Logger) *Files { + return &Files{store: s, log: l} +} + +// ServeHTTP implements the http.Handler interface +func (f *Files) ServeHTTP(rw http.ResponseWriter, r *http.Request) { + vars := mux.Vars(r) + id := vars["id"] + fn := vars["filename"] + + f.log.Info("Handle POST", "id", id, "filename", fn) + + // no need to check for invalid id or filename as the mux router will not send requests + // here unless they have the correct parameters + + f.saveFile(id, fn, rw, r) +} + +func (f *Files) invalidURI(uri string, rw http.ResponseWriter) { + f.log.Error("Invalid path", "path", uri) + http.Error(rw, "Invalid file path should be in the format: /[id]/[filepath]", http.StatusBadRequest) +} + +// saveFile saves the contents of the request to a file +func (f *Files) saveFile(id, path string, rw http.ResponseWriter, r *http.Request) { + f.log.Info("Save file for product", "id", id, "path", path) + + fp := filepath.Join(id, path) + err := f.store.Save(fp, r.Body) + if err != nil { + f.log.Error("Unable to save file", "error", err) + http.Error(rw, "Unable to save file", http.StatusInternalServerError) + } +} diff --git a/images/main.go b/images/main.go new file mode 100644 index 0000000..f400d8d --- /dev/null +++ b/images/main.go @@ -0,0 +1,93 @@ +package main + +import ( + "context" + "net/http" + "os" + "os/signal" + "time" + + "github.com/gorilla/mux" + hclog "github.com/hashicorp/go-hclog" + "github.com/rjNemo/go-micro/images/files" + "github.com/rjNemo/go-micro/images/handlers" +) + +const ( + port = ":5000" + logLevel = "debug" + basePath = "./imagestore" +) + +func main() { + + l := hclog.New( + &hclog.LoggerOptions{ + Name: "product-images", + Level: hclog.LevelFromString(logLevel), + }, + ) + + // create a logger for the server from the default logger + sl := l.StandardLogger(&hclog.StandardLoggerOptions{InferLevels: true}) + + // create the storage class, use local storage + // max filesize 5MB + stor, err := files.NewLocal(basePath, 1024*1000*5) + if err != nil { + l.Error("Unable to create storage", "error", err) + os.Exit(1) + } + + // create the handlers + fh := handlers.NewFiles(stor, l) + + // create a new serve mux and register the handlers + sm := mux.NewRouter() + + // filename regex: {filename:[a-zA-Z]+\\.[a-z]{3}} + // problem with FileServer is that it is dumb + ph := sm.Methods(http.MethodPost).Subrouter() + ph.HandleFunc("/images/{id:[0-9]+}/{filename:[a-zA-Z]+\\.[a-z]{3}}", fh.ServeHTTP) + + // get files + gh := sm.Methods(http.MethodGet).Subrouter() + gh.Handle( + "/images/{id:[0-9]+}/{filename:[a-zA-Z]+\\.[a-z]{3}}", + http.StripPrefix("/images/", http.FileServer(http.Dir(basePath))), + ) + + // create a new server + s := http.Server{ + Addr: port, // configure the bind address + Handler: sm, // set the default handler + ErrorLog: sl, // the logger for the server + ReadTimeout: 5 * time.Second, // max time to read request from the client + WriteTimeout: 10 * time.Second, // max time to write response to the client + IdleTimeout: 120 * time.Second, // max time for connections using TCP Keep-Alive + } + + // start the server + go func() { + l.Info("Starting server", "bind_address", port) + + err := s.ListenAndServe() + if err != nil { + l.Error("Unable to start server", "error", err) + os.Exit(1) + } + }() + + // trap sigterm or interupt and gracefully shutdown the server + c := make(chan os.Signal, 1) + signal.Notify(c, os.Interrupt) + signal.Notify(c, os.Kill) + + // Block until a signal is received. + sig := <-c + l.Info("Shutting down server with", "signal", sig) + + // gracefully shutdown the server, waiting max 30 seconds for current operations to complete + ctx, _ := context.WithTimeout(context.Background(), 30*time.Second) + s.Shutdown(ctx) +} diff --git a/products/go.mod b/products/go.mod index 3c465db..3c3d92a 100644 --- a/products/go.mod +++ b/products/go.mod @@ -3,13 +3,10 @@ module github.com/rjNemo/go-micro/products go 1.14 require ( - github.com/go-openapi/runtime v0.19.19 + github.com/go-openapi/runtime v0.19.20 github.com/go-playground/universal-translator v0.17.0 // indirect github.com/go-playground/validator v9.31.0+incompatible github.com/gorilla/handlers v1.4.2 github.com/gorilla/mux v1.7.4 github.com/leodido/go-urn v1.2.0 // indirect - go.mongodb.org/mongo-driver v1.3.5 // indirect - golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect - gopkg.in/go-playground/assert.v1 v1.2.1 // indirect ) diff --git a/products/go.sum b/products/go.sum index 0c3525e..e1fcdb3 100644 --- a/products/go.sum +++ b/products/go.sum @@ -10,9 +10,7 @@ github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:o github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 h1:4daAzAu0S6Vi7/lbWECcX0j45yZReDZ56BQsrVBOEEY= github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= 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/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= @@ -53,8 +51,8 @@ github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6 github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64= github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4= github.com/go-openapi/runtime v0.19.15/go.mod h1:dhGWCTKRXlAfGnQG0ONViOZpjfg0m2gUt9nTQPQZuoo= -github.com/go-openapi/runtime v0.19.19 h1:PCaQSqG0HiCgpekchPrHO9AEc5ZUaAclOUp9T3RSKoQ= -github.com/go-openapi/runtime v0.19.19/go.mod h1:Lm9YGCeecBnUUkFTxPC4s1+lwrkJ0pthx8YvyjCfkgk= +github.com/go-openapi/runtime v0.19.20 h1:J/t+QIjbcoq8WJvjGxRKiFBhqUE8slS9SbmD0Oi/raQ= +github.com/go-openapi/runtime v0.19.20/go.mod h1:Lm9YGCeecBnUUkFTxPC4s1+lwrkJ0pthx8YvyjCfkgk= github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY= @@ -116,10 +114,8 @@ github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/V github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/handlers v1.4.2 h1:0QniY0USkHQ1RGCLfKxeNHK9bkDHGRYGNDFBCS+YARg= github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= @@ -137,7 +133,6 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= @@ -153,13 +148,11 @@ github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh github.com/mitchellh/mapstructure v1.3.2 h1:mRS76wmkOn3KkKAyXDu42V+6ebnXWIztFSYGN7GeoRg= github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -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/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= @@ -174,11 +167,8 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -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/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= @@ -187,8 +177,6 @@ go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qL go.mongodb.org/mongo-driver v1.3.0/go.mod h1:MSWZXKOynuguX+JSvwP8i+58jYCXxbia8HS3gZBapIE= go.mongodb.org/mongo-driver v1.3.4 h1:zs/dKNwX0gYUtzwrN9lLiR15hCO0nDwQj5xXx+vjCdE= go.mongodb.org/mongo-driver v1.3.4/go.mod h1:MSWZXKOynuguX+JSvwP8i+58jYCXxbia8HS3gZBapIE= -go.mongodb.org/mongo-driver v1.3.5 h1:S0ZOruh4YGHjD7JoN7mIsTrNjnQbOjrmgrx6l6pZN7I= -go.mongodb.org/mongo-driver v1.3.5/go.mod h1:Ual6Gkco7ZGQw8wE1t4tLnvBsf6yVSM60qW6TgOeJ5c= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -196,7 +184,6 @@ golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaE golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -206,8 +193,6 @@ golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200602114024-627f9648deb9 h1:pNX+40auqi2JqRfOP1akLGtYcn15TUbkhwuCO3foqqM= golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -224,8 +209,6 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= @@ -234,16 +217,11 @@ golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3 golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM= -gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -251,5 +229,4 @@ gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=