From 2a6c7cc858cc350965bd0bc51abf81498118ef02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Muhammed=20Can=20K=C3=BC=C3=A7=C3=BCkaslan?= <32893303+Kucukaslan@users.noreply.github.com> Date: Tue, 9 Aug 2022 13:27:18 +0300 Subject: [PATCH] ci: use Go 1.19 for builds, remove 1.16 support (#481) --- .github/workflows/ci.yml | 6 ++-- .github/workflows/goreleaser.yml | 2 +- CHANGELOG.md | 2 ++ Dockerfile | 2 +- README.md | 2 +- command/cp.go | 3 +- command/cp_test.go | 3 +- command/sync_strategy.go | 9 ++--- e2e/util_test.go | 3 +- go.mod | 27 +++++++++++--- storage/s3_test.go | 13 +++---- storage/url/url.go | 33 ++++++++--------- vendor/github.com/hashicorp/errwrap/go.mod | 1 - .../github.com/hashicorp/go-multierror/go.mod | 3 -- .../github.com/hashicorp/go-multierror/go.sum | 4 --- vendor/github.com/igungor/gofakes3/go.mod | 23 ------------ vendor/github.com/igungor/gofakes3/go.sum | 36 ------------------- vendor/github.com/jmespath/go-jmespath/go.mod | 5 --- vendor/github.com/jmespath/go-jmespath/go.sum | 11 ------ vendor/github.com/karrick/godirwalk/go.mod | 3 -- vendor/github.com/karrick/godirwalk/go.sum | 0 vendor/github.com/posener/complete/go.mod | 8 ----- vendor/github.com/posener/complete/go.sum | 15 -------- .../github.com/russross/blackfriday/v2/go.mod | 1 - .../shurcooL/sanitized_anchor_name/go.mod | 1 - vendor/github.com/urfave/cli/v2/go.mod | 9 ----- vendor/github.com/urfave/cli/v2/go.sum | 14 -------- vendor/go.etcd.io/bbolt/go.mod | 5 --- vendor/go.etcd.io/bbolt/go.sum | 2 -- vendor/golang.org/x/xerrors/go.mod | 3 -- vendor/gopkg.in/yaml.v2/go.mod | 5 --- vendor/modules.txt | 33 +++++++++++++++++ 32 files changed, 96 insertions(+), 191 deletions(-) delete mode 100644 vendor/github.com/hashicorp/errwrap/go.mod delete mode 100644 vendor/github.com/hashicorp/go-multierror/go.mod delete mode 100644 vendor/github.com/hashicorp/go-multierror/go.sum delete mode 100644 vendor/github.com/igungor/gofakes3/go.mod delete mode 100644 vendor/github.com/igungor/gofakes3/go.sum delete mode 100644 vendor/github.com/jmespath/go-jmespath/go.mod delete mode 100644 vendor/github.com/jmespath/go-jmespath/go.sum delete mode 100644 vendor/github.com/karrick/godirwalk/go.mod delete mode 100644 vendor/github.com/karrick/godirwalk/go.sum delete mode 100644 vendor/github.com/posener/complete/go.mod delete mode 100644 vendor/github.com/posener/complete/go.sum delete mode 100644 vendor/github.com/russross/blackfriday/v2/go.mod delete mode 100644 vendor/github.com/shurcooL/sanitized_anchor_name/go.mod delete mode 100644 vendor/github.com/urfave/cli/v2/go.mod delete mode 100644 vendor/github.com/urfave/cli/v2/go.sum delete mode 100644 vendor/go.etcd.io/bbolt/go.mod delete mode 100644 vendor/go.etcd.io/bbolt/go.sum delete mode 100644 vendor/golang.org/x/xerrors/go.mod delete mode 100644 vendor/gopkg.in/yaml.v2/go.mod diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3b9e633fa..631c2f9f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,9 +5,9 @@ jobs: strategy: matrix: go-version: + - 1.19.x - 1.18.x - 1.17.x - - 1.16.x os: - macos - ubuntu @@ -27,9 +27,9 @@ jobs: strategy: matrix: go-version: + - 1.19.x - 1.18.x - 1.17.x - - 1.16.x os: - macos - ubuntu @@ -49,7 +49,7 @@ jobs: strategy: matrix: go-version: - - 1.18.x + - 1.19.x os: - ubuntu diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml index ce6bcd575..5a9ee9a48 100644 --- a/.github/workflows/goreleaser.yml +++ b/.github/workflows/goreleaser.yml @@ -16,7 +16,7 @@ jobs: name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.18 + go-version: 1.19 - name: Run GoReleaser uses: goreleaser/goreleaser-action@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 70757642e..83abfb361 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ - Disable AWS SDK logger if log level is not `trace`. ([##460](https://github.com/peak/s5cmd/pull/460)) - Allow adjacent slashes to be used as keys when uploading to remote. ([#459](https://github.com/peak/s5cmd/pull/459)) - Debian packages are provided on [releases page](https://github.com/peak/s5cmd/releases) ([#380](https://github.com/peak/s5cmd/issues/380)) +- Upgraded minimum required Go version to 1.17. + #### Bugfixes - Fixed a bug where (`--stat`) prints unnecessarily when used with help and version commands ([#452](https://github.com/peak/s5cmd/issues/452)) diff --git a/Dockerfile b/Dockerfile index e5512ab80..dc2c88542 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.18-alpine as build +FROM golang:1.19-alpine as build COPY . /s5cmd/ RUN apk add --no-cache git make && \ cd /s5cmd/ && \ diff --git a/README.md b/README.md index 2d6c30777..ff9341b52 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ ps. Quoted from [s5cmd feedstock](https://github.com/conda-forge/s5cmd-feedstoc ### Build from source -You can build `s5cmd` from source if you have [Go](https://golang.org/dl/) 1.16+ +You can build `s5cmd` from source if you have [Go](https://golang.org/dl/) 1.17+ installed. go get github.com/peak/s5cmd diff --git a/command/cp.go b/command/cp.go index bae23f88e..448bd4b37 100644 --- a/command/cp.go +++ b/command/cp.go @@ -5,7 +5,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "mime" "net/http" "os" @@ -914,7 +913,7 @@ func guessContentType(file *os.File) string { defer file.Seek(0, io.SeekStart) const bufsize = 512 - buf, err := ioutil.ReadAll(io.LimitReader(file, bufsize)) + buf, err := io.ReadAll(io.LimitReader(file, bufsize)) if err != nil { return "" } diff --git a/command/cp_test.go b/command/cp_test.go index 5d1e0f8d1..9127d8d42 100644 --- a/command/cp_test.go +++ b/command/cp_test.go @@ -2,7 +2,6 @@ package command import ( "io" - "io/ioutil" "os" "testing" @@ -46,7 +45,7 @@ func TestGuessContentType(t *testing.T) { for _, tc := range testcases { tc := tc - f, err := ioutil.TempFile("", tc.filename) + f, err := os.CreateTemp("", tc.filename) if err != nil { t.Error(err) } diff --git a/command/sync_strategy.go b/command/sync_strategy.go index 4f84db91b..cd6db2d36 100644 --- a/command/sync_strategy.go +++ b/command/sync_strategy.go @@ -31,10 +31,11 @@ func (s *SizeOnlyStrategy) ShouldSync(srcObj, dstObj *storage.Object) error { // SizeAndModificationStrategy determines to sync based on objects' both sizes and modification times. // It treats source object as the source-of-truth; -// time: src > dst size: src != dst should sync: yes -// time: src > dst size: src == dst should sync: yes -// time: src <= dst size: src != dst should sync: yes -// time: src <= dst size: src == dst should sync: no +// +// time: src > dst size: src != dst should sync: yes +// time: src > dst size: src == dst should sync: yes +// time: src <= dst size: src != dst should sync: yes +// time: src <= dst size: src == dst should sync: no type SizeAndModificationStrategy struct{} func (sm *SizeAndModificationStrategy) ShouldSync(srcObj, dstObj *storage.Object) error { diff --git a/e2e/util_test.go b/e2e/util_test.go index 0e2301f02..b4877bf40 100644 --- a/e2e/util_test.go +++ b/e2e/util_test.go @@ -9,7 +9,6 @@ import ( "flag" "fmt" "io" - "io/ioutil" "math/rand" "os" "os/exec" @@ -195,7 +194,7 @@ func s5cmd(workdir, endpoint string) func(args ...string) icmd.Cmd { } func goBuildS5cmd() func() { - tmpdir, err := ioutil.TempDir("", "") + tmpdir, err := os.MkdirTemp("", "") if err != nil { panic(err) } diff --git a/go.mod b/go.mod index 5b5aa4485..b06f77cd8 100644 --- a/go.mod +++ b/go.mod @@ -1,21 +1,40 @@ module github.com/peak/s5cmd -go 1.13 +go 1.17 require ( github.com/aws/aws-sdk-go v1.40.25 - github.com/davecgh/go-spew v1.1.1 // indirect github.com/google/go-cmp v0.4.0 github.com/hashicorp/go-multierror v1.0.0 github.com/iancoleman/strcase v0.0.0-20191112232945-16388991a334 github.com/igungor/gofakes3 v0.0.11 github.com/karrick/godirwalk v1.15.3 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 - github.com/kr/pretty v0.2.0 // indirect github.com/posener/complete v1.2.3 github.com/stretchr/testify v1.4.0 github.com/termie/go-shutil v0.0.0-20140729215957-bcacb06fecae github.com/urfave/cli/v2 v2.2.0 - gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect gotest.tools/v3 v3.0.2 ) + +require ( + github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/hashicorp/errwrap v1.0.0 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/kr/pretty v0.2.0 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/russross/blackfriday/v2 v2.0.1 // indirect + github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 // indirect + github.com/shabbyrobe/gocovmerge v0.0.0-20180507124511-f6ea450bfb63 // indirect + github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect + github.com/stretchr/objx v0.1.0 // indirect + go.etcd.io/bbolt v1.3.6 // indirect + golang.org/x/sys v0.0.0-20220405210540-1e041c57c461 // indirect + golang.org/x/tools v0.0.0-20190624222133-a101b041ded4 // indirect + golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect + gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect + gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce // indirect + gopkg.in/yaml.v2 v2.2.8 // indirect +) diff --git a/storage/s3_test.go b/storage/s3_test.go index 8b84aac00..75b823f41 100644 --- a/storage/s3_test.go +++ b/storage/s3_test.go @@ -6,7 +6,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "math/rand" "net/http" "net/http/httptest" @@ -701,7 +700,7 @@ func TestS3CopyEncryptionRequest(t *testing.T) { r.HTTPResponse = &http.Response{ StatusCode: http.StatusOK, - Body: ioutil.NopCloser(strings.NewReader("")), + Body: io.NopCloser(strings.NewReader("")), } params := r.Params @@ -803,7 +802,7 @@ func TestS3PutEncryptionRequest(t *testing.T) { r.HTTPResponse = &http.Response{ StatusCode: http.StatusOK, - Body: ioutil.NopCloser(strings.NewReader("")), + Body: io.NopCloser(strings.NewReader("")), } params := r.Params @@ -896,7 +895,7 @@ func TestS3listObjectsV2(t *testing.T) { mockApi.Handlers.Send.PushBack(func(r *request.Request) { r.HTTPResponse = &http.Response{ StatusCode: http.StatusOK, - Body: ioutil.NopCloser(strings.NewReader("")), + Body: io.NopCloser(strings.NewReader("")), } r.Data = &s3.ListObjectsV2Output{ @@ -1128,7 +1127,7 @@ func TestSessionAutoRegion(t *testing.T) { r.HTTPResponse = &http.Response{ StatusCode: tc.status, Header: header, - Body: ioutil.NopCloser(strings.NewReader("")), + Body: io.NopCloser(strings.NewReader("")), } }) @@ -1260,7 +1259,9 @@ func valueAtPath(i interface{}, s string) interface{} { // tempError is a wrapper error type that implements anonymous // interface getting checked in url.Error.Temporary; -// interface { Temporary() bool } +// +// interface { Temporary() bool } +// // see: https://github.com/golang/go/blob/2ebe77a2fda1ee9ff6fd9a3e08933ad1ebaea039/src/net/url/url.go#L38-L43 // // AWS SDK checks if the underlying error in received url.Error implements it; diff --git a/storage/url/url.go b/storage/url/url.go index b19f8ed96..22ab37df7 100644 --- a/storage/url/url.go +++ b/storage/url/url.go @@ -226,23 +226,24 @@ func (u *URL) remoteURL() string { // prefix is the part that comes before the wildcard string. // // Example: -// key: a/b/test?/c/*.tsv -// prefix: a/b/test -// filter: ?/c/* -// regex: ^a/b/test./c/.*?\\.tsv$ -// delimiter: "" +// +// key: a/b/test?/c/*.tsv +// prefix: a/b/test +// filter: ?/c/* +// regex: ^a/b/test./c/.*?\\.tsv$ +// delimiter: "" // // It prepares delimiter, prefix and regex for regular strings. // These are used in S3 listing operations. // See: https://docs.aws.amazon.com/AmazonS3/latest/dev/ListingKeysHierarchy.html // // Example: -// key: a/b/c -// prefix: a/b/c -// filter: "" -// regex: ^a/b/c.*$ -// delimiter: "/" // +// key: a/b/c +// prefix: a/b/c +// filter: "" +// regex: ^a/b/c.*$ +// delimiter: "/" func (u *URL) setPrefixAndFilter() error { if u.raw { return nil @@ -361,10 +362,10 @@ func (u *URL) IsWildcard() bool { // wildcard part (filter) // // Example: -// key: a/b/test2/c/example_file.tsv -// prefix: a/b/ -// output: test2/c/example_file.tsv // +// key: a/b/test2/c/example_file.tsv +// prefix: a/b/ +// output: test2/c/example_file.tsv func parseBatch(prefix string, key string) string { index := strings.LastIndex(prefix, s3Separator) if index < 0 || !strings.HasPrefix(key, prefix) { @@ -380,10 +381,10 @@ func parseBatch(prefix string, key string) string { // path. // // Example: -// key: a/b/c/d -// prefix: a/b -// output: c/ // +// key: a/b/c/d +// prefix: a/b +// output: c/ func parseNonBatch(prefix string, key string) string { if key == prefix || !strings.HasPrefix(key, prefix) { return key diff --git a/vendor/github.com/hashicorp/errwrap/go.mod b/vendor/github.com/hashicorp/errwrap/go.mod deleted file mode 100644 index c9b84022c..000000000 --- a/vendor/github.com/hashicorp/errwrap/go.mod +++ /dev/null @@ -1 +0,0 @@ -module github.com/hashicorp/errwrap diff --git a/vendor/github.com/hashicorp/go-multierror/go.mod b/vendor/github.com/hashicorp/go-multierror/go.mod deleted file mode 100644 index 2534331d5..000000000 --- a/vendor/github.com/hashicorp/go-multierror/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module github.com/hashicorp/go-multierror - -require github.com/hashicorp/errwrap v1.0.0 diff --git a/vendor/github.com/hashicorp/go-multierror/go.sum b/vendor/github.com/hashicorp/go-multierror/go.sum deleted file mode 100644 index 85b1f8ff3..000000000 --- a/vendor/github.com/hashicorp/go-multierror/go.sum +++ /dev/null @@ -1,4 +0,0 @@ -github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce h1:prjrVgOk2Yg6w+PflHoszQNLTUh4kaByUcEWM/9uin4= -github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= diff --git a/vendor/github.com/igungor/gofakes3/go.mod b/vendor/github.com/igungor/gofakes3/go.mod deleted file mode 100644 index 6bb1d8721..000000000 --- a/vendor/github.com/igungor/gofakes3/go.mod +++ /dev/null @@ -1,23 +0,0 @@ -module github.com/igungor/gofakes3 - -require ( - github.com/aws/aws-sdk-go v1.17.4 - github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 - github.com/shabbyrobe/gocovmerge v0.0.0-20180507124511-f6ea450bfb63 - github.com/spf13/afero v1.2.1 - go.etcd.io/bbolt v1.3.6 - golang.org/x/tools v0.0.0-20190308174544-00c44ba9c14f - gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce -) - -require ( - github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect - github.com/stretchr/testify v1.3.0 // indirect - golang.org/x/net v0.0.0-20190310074541-c10a0554eabf // indirect - golang.org/x/sys v0.0.0-20220405210540-1e041c57c461 // indirect - golang.org/x/text v0.3.0 // indirect - gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 // indirect - gopkg.in/yaml.v2 v2.2.2 // indirect -) - -go 1.13 diff --git a/vendor/github.com/igungor/gofakes3/go.sum b/vendor/github.com/igungor/gofakes3/go.sum deleted file mode 100644 index 63ec5e139..000000000 --- a/vendor/github.com/igungor/gofakes3/go.sum +++ /dev/null @@ -1,36 +0,0 @@ -github.com/aws/aws-sdk-go v1.17.4 h1:L2KFocQhg48kIzEAV98SnSz3nmIZ3UDFP+vU647KO3c= -github.com/aws/aws-sdk-go v1.17.4/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -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/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -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/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 h1:GHRpF1pTW19a8tTFrMLUcfWwyC0pnifVo2ClaLq+hP8= -github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46/go.mod h1:uAQ5PCi+MFsC7HjREoAz1BU+Mq60+05gifQSsHSDG/8= -github.com/shabbyrobe/gocovmerge v0.0.0-20180507124511-f6ea450bfb63 h1:J6qvD6rbmOil46orKqJaRPG+zTpoGlBTUdyv8ki63L0= -github.com/shabbyrobe/gocovmerge v0.0.0-20180507124511-f6ea450bfb63/go.mod h1:n+VKSARF5y/tS9XFSP7vWDfS+GUC5vs/YT7M5XDTUEM= -github.com/spf13/afero v1.2.1 h1:qgMbHoJbPbw579P+1zVY+6n4nIFuIchaIjzZ/I/Yq8M= -github.com/spf13/afero v1.2.1/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= -go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190310074541-c10a0554eabf h1:J7RqX9u0J9ZB37CGaFc2VC+QZZT6E6jnDbrboEFVo0U= -golang.org/x/net v0.0.0-20190310074541-c10a0554eabf/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d h1:L/IKR6COd7ubZrs2oTnTi73IhgqJ71c9s80WsQnh0Es= -golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20220405210540-1e041c57c461 h1:kHVeDEnfKn3T238CvrUcz6KeEsFHVaKh4kMTt6Wsysg= -golang.org/x/sys v0.0.0-20220405210540-1e041c57c461/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -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/tools v0.0.0-20190308174544-00c44ba9c14f h1:SUQ6L9W8e5xt2GFO9s+i18JGITAfem+a0AQuFU8Ls74= -golang.org/x/tools v0.0.0-20190308174544-00c44ba9c14f/go.mod h1:25r3+/G6/xytQM8iWZKq3Hn0kr0rgFKPUNVEL/dr3z4= -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/mgo.v2 v2.0.0-20180705113604-9856a29383ce h1:xcEWjVhvbDy+nHP67nPDDpbYrY+ILlfndk4bRioVHaU= -gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/vendor/github.com/jmespath/go-jmespath/go.mod b/vendor/github.com/jmespath/go-jmespath/go.mod deleted file mode 100644 index 4d448e88b..000000000 --- a/vendor/github.com/jmespath/go-jmespath/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module github.com/jmespath/go-jmespath - -go 1.14 - -require github.com/jmespath/go-jmespath/internal/testify v1.5.1 diff --git a/vendor/github.com/jmespath/go-jmespath/go.sum b/vendor/github.com/jmespath/go-jmespath/go.sum deleted file mode 100644 index d2db411e5..000000000 --- a/vendor/github.com/jmespath/go-jmespath/go.sum +++ /dev/null @@ -1,11 +0,0 @@ -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/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= -github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= -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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -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/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/vendor/github.com/karrick/godirwalk/go.mod b/vendor/github.com/karrick/godirwalk/go.mod deleted file mode 100644 index faf23fd98..000000000 --- a/vendor/github.com/karrick/godirwalk/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module github.com/karrick/godirwalk - -go 1.13 diff --git a/vendor/github.com/karrick/godirwalk/go.sum b/vendor/github.com/karrick/godirwalk/go.sum deleted file mode 100644 index e69de29bb..000000000 diff --git a/vendor/github.com/posener/complete/go.mod b/vendor/github.com/posener/complete/go.mod deleted file mode 100644 index 6d82a9801..000000000 --- a/vendor/github.com/posener/complete/go.mod +++ /dev/null @@ -1,8 +0,0 @@ -module github.com/posener/complete - -require ( - github.com/hashicorp/go-multierror v1.0.0 - github.com/stretchr/testify v1.4.0 -) - -go 1.13 diff --git a/vendor/github.com/posener/complete/go.sum b/vendor/github.com/posener/complete/go.sum deleted file mode 100644 index accaa27ad..000000000 --- a/vendor/github.com/posener/complete/go.sum +++ /dev/null @@ -1,15 +0,0 @@ -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/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o= -github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -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/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/vendor/github.com/russross/blackfriday/v2/go.mod b/vendor/github.com/russross/blackfriday/v2/go.mod deleted file mode 100644 index 620b74e0a..000000000 --- a/vendor/github.com/russross/blackfriday/v2/go.mod +++ /dev/null @@ -1 +0,0 @@ -module github.com/russross/blackfriday/v2 diff --git a/vendor/github.com/shurcooL/sanitized_anchor_name/go.mod b/vendor/github.com/shurcooL/sanitized_anchor_name/go.mod deleted file mode 100644 index 1e2553475..000000000 --- a/vendor/github.com/shurcooL/sanitized_anchor_name/go.mod +++ /dev/null @@ -1 +0,0 @@ -module github.com/shurcooL/sanitized_anchor_name diff --git a/vendor/github.com/urfave/cli/v2/go.mod b/vendor/github.com/urfave/cli/v2/go.mod deleted file mode 100644 index c38d41c14..000000000 --- a/vendor/github.com/urfave/cli/v2/go.mod +++ /dev/null @@ -1,9 +0,0 @@ -module github.com/urfave/cli/v2 - -go 1.11 - -require ( - github.com/BurntSushi/toml v0.3.1 - github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d - gopkg.in/yaml.v2 v2.2.2 -) diff --git a/vendor/github.com/urfave/cli/v2/go.sum b/vendor/github.com/urfave/cli/v2/go.sum deleted file mode 100644 index ef121ff5d..000000000 --- a/vendor/github.com/urfave/cli/v2/go.sum +++ /dev/null @@ -1,14 +0,0 @@ -github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= -github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -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/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= -github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= -github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -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/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/vendor/go.etcd.io/bbolt/go.mod b/vendor/go.etcd.io/bbolt/go.mod deleted file mode 100644 index 96355a69b..000000000 --- a/vendor/go.etcd.io/bbolt/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module go.etcd.io/bbolt - -go 1.12 - -require golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d diff --git a/vendor/go.etcd.io/bbolt/go.sum b/vendor/go.etcd.io/bbolt/go.sum deleted file mode 100644 index c13f8f470..000000000 --- a/vendor/go.etcd.io/bbolt/go.sum +++ /dev/null @@ -1,2 +0,0 @@ -golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d h1:L/IKR6COd7ubZrs2oTnTi73IhgqJ71c9s80WsQnh0Es= -golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/vendor/golang.org/x/xerrors/go.mod b/vendor/golang.org/x/xerrors/go.mod deleted file mode 100644 index 870d4f612..000000000 --- a/vendor/golang.org/x/xerrors/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module golang.org/x/xerrors - -go 1.11 diff --git a/vendor/gopkg.in/yaml.v2/go.mod b/vendor/gopkg.in/yaml.v2/go.mod deleted file mode 100644 index 1934e8769..000000000 --- a/vendor/gopkg.in/yaml.v2/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module "gopkg.in/yaml.v2" - -require ( - "gopkg.in/check.v1" v0.0.0-20161208181325-20d25e280405 -) diff --git a/vendor/modules.txt b/vendor/modules.txt index 50c14af70..375fbc7dd 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,4 +1,5 @@ # github.com/aws/aws-sdk-go v1.40.25 +## explicit; go 1.11 github.com/aws/aws-sdk-go/aws github.com/aws/aws-sdk-go/aws/arn github.com/aws/aws-sdk-go/aws/awserr @@ -53,10 +54,13 @@ github.com/aws/aws-sdk-go/service/sso/ssoiface github.com/aws/aws-sdk-go/service/sts github.com/aws/aws-sdk-go/service/sts/stsiface # github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d +## explicit; go 1.12 github.com/cpuguy83/go-md2man/v2/md2man # github.com/davecgh/go-spew v1.1.1 +## explicit github.com/davecgh/go-spew/spew # github.com/google/go-cmp v0.4.0 +## explicit; go 1.8 github.com/google/go-cmp/cmp github.com/google/go-cmp/cmp/cmpopts github.com/google/go-cmp/cmp/internal/diff @@ -64,64 +68,93 @@ github.com/google/go-cmp/cmp/internal/flags github.com/google/go-cmp/cmp/internal/function github.com/google/go-cmp/cmp/internal/value # github.com/hashicorp/errwrap v1.0.0 +## explicit github.com/hashicorp/errwrap # github.com/hashicorp/go-multierror v1.0.0 +## explicit github.com/hashicorp/go-multierror # github.com/iancoleman/strcase v0.0.0-20191112232945-16388991a334 +## explicit github.com/iancoleman/strcase # github.com/igungor/gofakes3 v0.0.11 +## explicit; go 1.13 github.com/igungor/gofakes3 github.com/igungor/gofakes3/backend/s3bolt github.com/igungor/gofakes3/backend/s3mem github.com/igungor/gofakes3/internal/goskipiter github.com/igungor/gofakes3/internal/s3io # github.com/jmespath/go-jmespath v0.4.0 +## explicit; go 1.14 github.com/jmespath/go-jmespath # github.com/karrick/godirwalk v1.15.3 +## explicit; go 1.13 github.com/karrick/godirwalk # github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 +## explicit github.com/kballard/go-shellquote +# github.com/kr/pretty v0.2.0 +## explicit; go 1.12 # github.com/pkg/errors v0.9.1 +## explicit github.com/pkg/errors # github.com/pmezard/go-difflib v1.0.0 +## explicit github.com/pmezard/go-difflib/difflib # github.com/posener/complete v1.2.3 +## explicit; go 1.13 github.com/posener/complete github.com/posener/complete/cmd github.com/posener/complete/cmd/install # github.com/russross/blackfriday/v2 v2.0.1 +## explicit github.com/russross/blackfriday/v2 # github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 +## explicit github.com/ryszard/goskiplist/skiplist # github.com/shabbyrobe/gocovmerge v0.0.0-20180507124511-f6ea450bfb63 +## explicit github.com/shabbyrobe/gocovmerge # github.com/shurcooL/sanitized_anchor_name v1.0.0 +## explicit github.com/shurcooL/sanitized_anchor_name # github.com/stretchr/objx v0.1.0 +## explicit github.com/stretchr/objx # github.com/stretchr/testify v1.4.0 +## explicit github.com/stretchr/testify/assert github.com/stretchr/testify/mock # github.com/termie/go-shutil v0.0.0-20140729215957-bcacb06fecae +## explicit github.com/termie/go-shutil # github.com/urfave/cli/v2 v2.2.0 +## explicit; go 1.11 github.com/urfave/cli/v2 # go.etcd.io/bbolt v1.3.6 +## explicit; go 1.12 go.etcd.io/bbolt # golang.org/x/sys v0.0.0-20220405210540-1e041c57c461 +## explicit; go 1.17 golang.org/x/sys/internal/unsafeheader golang.org/x/sys/unix # golang.org/x/tools v0.0.0-20190624222133-a101b041ded4 +## explicit; go 1.11 golang.org/x/tools/cover # golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 +## explicit; go 1.11 golang.org/x/xerrors golang.org/x/xerrors/internal +# gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 +## explicit # gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce +## explicit gopkg.in/mgo.v2/bson gopkg.in/mgo.v2/internal/json # gopkg.in/yaml.v2 v2.2.8 +## explicit gopkg.in/yaml.v2 # gotest.tools/v3 v3.0.2 +## explicit; go 1.11 gotest.tools/v3/assert gotest.tools/v3/assert/cmp gotest.tools/v3/fs