From ac38339b61ed0083734486d5fe5c645f95bfeb7b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Mar 2021 07:29:15 +0000 Subject: [PATCH] build(deps): bump github.com/aws/aws-sdk-go-v2 from 1.1.0 to 1.2.1 Bumps [github.com/aws/aws-sdk-go-v2](https://github.com/aws/aws-sdk-go-v2) from 1.1.0 to 1.2.1. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.1.0...v1.2.1) Signed-off-by: dependabot[bot] --- go.mod | 4 +-- go.sum | 6 ++-- .../aws-sdk-go-v2/aws/middleware/metadata.go | 15 ++++++++++ .../aws/middleware/middleware.go | 6 ++-- .../aws/aws-sdk-go-v2/aws/signer/v4/v4.go | 29 +++++++++++++++++-- .../aws/aws-sdk-go-v2/aws/version.go | 2 +- vendor/github.com/aws/smithy-go/.travis.yml | 10 +++++-- vendor/github.com/aws/smithy-go/CHANGELOG.md | 12 ++++++++ vendor/github.com/aws/smithy-go/go.mod | 4 +-- vendor/github.com/aws/smithy-go/go.sum | 4 +-- .../aws/smithy-go/logging/logger.go | 8 +++++ vendor/github.com/aws/smithy-go/time/time.go | 2 +- .../aws/smithy-go/transport/http/time.go | 28 ++++++++++++++++++ vendor/modules.txt | 4 +-- 14 files changed, 113 insertions(+), 21 deletions(-) create mode 100644 vendor/github.com/aws/smithy-go/CHANGELOG.md create mode 100644 vendor/github.com/aws/smithy-go/transport/http/time.go diff --git a/go.mod b/go.mod index 6b6882ccb9c01..8b2aca22ebcda 100644 --- a/go.mod +++ b/go.mod @@ -11,11 +11,11 @@ require ( github.com/Azure/go-autorest/autorest/to v0.4.0 github.com/Azure/go-autorest/autorest/validation v0.2.0 // indirect github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef - github.com/aws/aws-sdk-go-v2 v1.1.0 + github.com/aws/aws-sdk-go-v2 v1.2.1 github.com/aws/aws-sdk-go-v2/config v1.0.0 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.0 github.com/aws/aws-sdk-go-v2/service/ec2 v1.0.0 - github.com/aws/smithy-go v1.0.0 + github.com/aws/smithy-go v1.2.0 github.com/blang/semver/v4 v4.0.0 github.com/cilium/customvet v0.0.0-20201209211516-9852765c1ac4 github.com/cilium/deepequal-gen v0.0.0-20200406125435-ad6a9003139e diff --git a/go.sum b/go.sum index 0607597d6d5e2..4f4a1412cf406 100644 --- a/go.sum +++ b/go.sum @@ -108,8 +108,8 @@ github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.0.0/go.mod h1:smfAbmpW+tcRVuNUjo3MOArSZmW72t62rkCzc2i0TWM= -github.com/aws/aws-sdk-go-v2 v1.1.0 h1:sKP6QWxdN1oRYjl+k6S3bpgBI+XUx/0mqVOLIw4lR/Q= -github.com/aws/aws-sdk-go-v2 v1.1.0/go.mod h1:smfAbmpW+tcRVuNUjo3MOArSZmW72t62rkCzc2i0TWM= +github.com/aws/aws-sdk-go-v2 v1.2.1 h1:055XAi+MtmhyYX161p+jWRibkCb9YpI2ymXZiW1dwVY= +github.com/aws/aws-sdk-go-v2 v1.2.1/go.mod h1:hTQc/9pYq5bfFACIUY9tc/2SYWd9Vnmw+testmuQeRY= github.com/aws/aws-sdk-go-v2/config v1.0.0 h1:x6vSFAwqAvhYPeSu60f0ZUlGHo3PKKmwDOTL8aMXtv4= github.com/aws/aws-sdk-go-v2/config v1.0.0/go.mod h1:WysE/OpUgE37tjtmtJd8GXgT8s1euilE5XtUkRNUQ1w= github.com/aws/aws-sdk-go-v2/credentials v1.0.0 h1:0M7netgZ8gCV4v7z1km+Fbl7j6KQYyZL7SS0/l5Jn/4= @@ -124,6 +124,8 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.0.0 h1:6XCgxNfE4L/Fnq+InhVNd16DKc6Ue github.com/aws/aws-sdk-go-v2/service/sts v1.0.0/go.mod h1:5f+cELGATgill5Pu3/vK3Ebuigstc+qYEHW5MvGWZO4= github.com/aws/smithy-go v1.0.0 h1:hkhcRKG9rJ4Fn+RbfXY7Tz7b3ITLDyolBnLLBhwbg/c= github.com/aws/smithy-go v1.0.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw= +github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= +github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= diff --git a/vendor/github.com/aws/aws-sdk-go-v2/aws/middleware/metadata.go b/vendor/github.com/aws/aws-sdk-go-v2/aws/middleware/metadata.go index f8e6a98f72d48..2820121740612 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/aws/middleware/metadata.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/aws/middleware/metadata.go @@ -2,6 +2,7 @@ package middleware import ( "context" + "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/smithy-go/middleware" ) @@ -150,3 +151,17 @@ func setOperationName(ctx context.Context, value string) context.Context { func SetPartitionID(ctx context.Context, value string) context.Context { return middleware.WithStackValue(ctx, partitionIDKey{}, value) } + +// EndpointSource key +type endpointSourceKey struct{} + +// GetEndpointSource returns an endpoint source if set on context +func GetEndpointSource(ctx context.Context) (v aws.EndpointSource) { + v, _ = middleware.GetStackValue(ctx, endpointSourceKey{}).(aws.EndpointSource) + return v +} + +// SetEndpointSource sets endpoint source on context +func SetEndpointSource(ctx context.Context, value aws.EndpointSource) context.Context { + return middleware.WithStackValue(ctx, endpointSourceKey{}, value) +} diff --git a/vendor/github.com/aws/aws-sdk-go-v2/aws/middleware/middleware.go b/vendor/github.com/aws/aws-sdk-go-v2/aws/middleware/middleware.go index 2e324cb3cc901..9bd0dfb15086e 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/aws/middleware/middleware.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/aws/middleware/middleware.go @@ -3,11 +3,11 @@ package middleware import ( "context" "fmt" - "net/http" "time" "github.com/aws/aws-sdk-go-v2/internal/rand" "github.com/aws/aws-sdk-go-v2/internal/sdk" + "github.com/aws/smithy-go/logging" "github.com/aws/smithy-go/middleware" smithyrand "github.com/aws/smithy-go/rand" smithyhttp "github.com/aws/smithy-go/transport/http" @@ -67,10 +67,10 @@ func (a RecordResponseTiming) HandleDeserialize(ctx context.Context, in middlewa break } var parseErr error - serverTime, parseErr = http.ParseTime(respDateHeader) + serverTime, parseErr = smithyhttp.ParseTime(respDateHeader) if parseErr != nil { logger := middleware.GetLogger(ctx) - logger.Logf("failed to parse response Date Header value, got %v", + logger.Logf(logging.Warn, "failed to parse response Date header value, got %v", parseErr.Error()) break } diff --git a/vendor/github.com/aws/aws-sdk-go-v2/aws/signer/v4/v4.go b/vendor/github.com/aws/aws-sdk-go-v2/aws/signer/v4/v4.go index b77558c89cd7b..61c6698439710 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/aws/signer/v4/v4.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/aws/signer/v4/v4.go @@ -130,9 +130,6 @@ type httpSigner struct { KeyDerivator keyDerivator IsPreSign bool - // PayloadHash is the hex encoded SHA-256 hash of the request payload - // If len(PayloadHash) == 0 the signer will attempt to send the request - // as an unsigned payload. Note: Unsigned payloads only work for a subset of services. PayloadHash string DisableHeaderHoisting bool @@ -250,6 +247,19 @@ func buildAuthorizationHeader(credentialStr, signedHeadersStr, signingSignature // you to specify that a request is signed for the future, and cannot be // used until then. // +// The payloadHash is the hex encoded SHA-256 hash of the request payload, and +// must be provided. Even if the request has no payload (aka body). If the +// request has no payload you should use the hex encoded SHA-256 of an empty +// string as the payloadHash value. +// +// "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" +// +// Some services such as Amazon S3 accept alternative values for the payload +// hash, such as "UNSIGNED-PAYLOAD" for requests where the body will not be +// included in the request signature. +// +// https://docs.aws.amazon.com/AmazonS3/latest/API/sig-v4-header-based-auth.html +// // Sign differs from Presign in that it will sign the request using HTTP // header values. This type of signing is intended for http.Request values that // will not be shared, or are shared in a way the header values on the request @@ -296,6 +306,19 @@ func (s Signer) SignHTTP(ctx context.Context, credentials aws.Credentials, r *ht // is made. This is helpful to know what header values need to be shared with // the party the presigned request will be distributed to. // +// The payloadHash is the hex encoded SHA-256 hash of the request payload, and +// must be provided. Even if the request has no payload (aka body). If the +// request has no payload you should use the hex encoded SHA-256 of an empty +// string as the payloadHash value. +// +// "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" +// +// Some services such as Amazon S3 accept alternative values for the payload +// hash, such as "UNSIGNED-PAYLOAD" for requests where the body will not be +// included in the request signature. +// +// https://docs.aws.amazon.com/AmazonS3/latest/API/sig-v4-header-based-auth.html +// // PresignHTTP differs from SignHTTP in that it will sign the request using // query string instead of header values. This allows you to share the // Presigned Request's URL with third parties, or distribute it throughout your diff --git a/vendor/github.com/aws/aws-sdk-go-v2/aws/version.go b/vendor/github.com/aws/aws-sdk-go-v2/aws/version.go index 382ed4306e324..b7ba41a53902f 100644 --- a/vendor/github.com/aws/aws-sdk-go-v2/aws/version.go +++ b/vendor/github.com/aws/aws-sdk-go-v2/aws/version.go @@ -5,4 +5,4 @@ package aws const SDKName = "aws-sdk-go-v2" // SDKVersion is the version of this SDK -const SDKVersion = "1.1.0" +const SDKVersion = "1.2.1" diff --git a/vendor/github.com/aws/smithy-go/.travis.yml b/vendor/github.com/aws/smithy-go/.travis.yml index 6e75f301de375..b02e9903deb42 100644 --- a/vendor/github.com/aws/smithy-go/.travis.yml +++ b/vendor/github.com/aws/smithy-go/.travis.yml @@ -3,7 +3,7 @@ sudo: true dist: bionic install: - - eval "$(curl -sL https://raw.githubusercontent.com/travis-ci/gimme/master/gimme | GIMME_GO_VERSION=1.15.x bash)" + - eval "$(curl -sL https://raw.githubusercontent.com/travis-ci/gimme/master/gimme | GIMME_GO_VERSION=1.16.x bash)" - echo `go env` - echo `which go` @@ -12,17 +12,21 @@ script: cd codegen && ./gradlew clean build -Plog-tests matrix: include: - language: java - go: 1.15.x + go: 1.16.x jdk: openjdk8 - language: java - go: 1.15.x + go: 1.16.x jdk: openjdk11 - language: go go: 1.15.x script: go test -v ./... + - language: go + go: 1.16.x + script: go test -v ./... + allow_failures: - language: go go: tip diff --git a/vendor/github.com/aws/smithy-go/CHANGELOG.md b/vendor/github.com/aws/smithy-go/CHANGELOG.md new file mode 100644 index 0000000000000..8a35893d12aee --- /dev/null +++ b/vendor/github.com/aws/smithy-go/CHANGELOG.md @@ -0,0 +1,12 @@ +# Release 2021-03-12 v1.2.0 + +### Smithy Go module +* Fix support for parsing shortened year format in HTTP Date header. +* Fix GitHub APIDiff action workflow to get gorelease tool correctly. +* Fix codegen artifact unit test for Go 1.16 + +### Codegen +* Fix generating paginator nil parameter handling before usage. +* Fix Serialize unboxed members decorated as required. +* Add ability to define resolvers at both client construction and operation invocation. +* Support for extending paginators with custom runtime trait diff --git a/vendor/github.com/aws/smithy-go/go.mod b/vendor/github.com/aws/smithy-go/go.mod index e3ec6d442c071..02a91c4a829ff 100644 --- a/vendor/github.com/aws/smithy-go/go.mod +++ b/vendor/github.com/aws/smithy-go/go.mod @@ -1,5 +1,5 @@ module github.com/aws/smithy-go -go 1.14 +go 1.15 -require github.com/google/go-cmp v0.4.1 +require github.com/google/go-cmp v0.5.4 diff --git a/vendor/github.com/aws/smithy-go/go.sum b/vendor/github.com/aws/smithy-go/go.sum index 210ab773fc501..1ffcbdbe2e128 100644 --- a/vendor/github.com/aws/smithy-go/go.sum +++ b/vendor/github.com/aws/smithy-go/go.sum @@ -1,4 +1,4 @@ -github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= -github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +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= 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/vendor/github.com/aws/smithy-go/logging/logger.go b/vendor/github.com/aws/smithy-go/logging/logger.go index 18c7fb97799a6..70b38762198c2 100644 --- a/vendor/github.com/aws/smithy-go/logging/logger.go +++ b/vendor/github.com/aws/smithy-go/logging/logger.go @@ -21,6 +21,14 @@ type Logger interface { Logf(classification Classification, format string, v ...interface{}) } +// LoggerFunc is a wrapper around a function to satisfy the Logger interface. +type LoggerFunc func(classification Classification, format string, v ...interface{}) + +// Logf delegates the logging request to the wrapped function. +func (f LoggerFunc) Logf(classification Classification, format string, v ...interface{}) { + f(classification, format, v...) +} + // ContextLogger is an optional interface a Logger implementation may expose that provides // the ability to create context aware log entries. type ContextLogger interface { diff --git a/vendor/github.com/aws/smithy-go/time/time.go b/vendor/github.com/aws/smithy-go/time/time.go index 35a387031ad8d..54f9f0fef52d1 100644 --- a/vendor/github.com/aws/smithy-go/time/time.go +++ b/vendor/github.com/aws/smithy-go/time/time.go @@ -49,7 +49,7 @@ func ParseHTTPDate(value string) (time.Time, error) { // Example: 1515531081.123 func FormatEpochSeconds(value time.Time) float64 { ms := value.UnixNano() / int64(time.Millisecond) - return float64(ms)/1e3 + return float64(ms) / 1e3 } // ParseEpochSeconds returns value as a Unix time in seconds with with decimal precision diff --git a/vendor/github.com/aws/smithy-go/transport/http/time.go b/vendor/github.com/aws/smithy-go/transport/http/time.go new file mode 100644 index 0000000000000..a6535c87ffa50 --- /dev/null +++ b/vendor/github.com/aws/smithy-go/transport/http/time.go @@ -0,0 +1,28 @@ +package http + +import ( + "fmt" + "time" +) + +// Time parsing function sourced from stdlib with an additional time format so +// non-compliant timestamps are still parseable. +// https://github.com/golang/go/blob/8869086d8f0a31033ccdc103106c768dc17216b1/src/net/http/header.go#L110-L127 +var timeFormats = []string{ + "Mon, _2 Jan 2006 15:04:05 GMT", // Modifies http.TimeFormat with a leading underscore for day number (leading 0 optional). + "Mon, _2 Jan 06 15:04:05 GMT", // two digit year + time.RFC850, + time.ANSIC, +} + +// ParseTime parses a time header like the HTTP Date header. +// This uses a more relaxed rule set for date parsing compared to the standard library. +func ParseTime(text string) (t time.Time, err error) { + for _, layout := range timeFormats { + t, err = time.Parse(layout, text) + if err == nil { + return t, nil + } + } + return time.Time{}, fmt.Errorf("unknown time format: %w", err) +} diff --git a/vendor/modules.txt b/vendor/modules.txt index 628557cf432e0..aaa686bba9b10 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -44,7 +44,7 @@ github.com/armon/go-metrics # github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef ## explicit github.com/asaskevich/govalidator -# github.com/aws/aws-sdk-go-v2 v1.1.0 +# github.com/aws/aws-sdk-go-v2 v1.2.1 ## explicit github.com/aws/aws-sdk-go-v2/aws github.com/aws/aws-sdk-go-v2/aws/middleware @@ -88,7 +88,7 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url github.com/aws/aws-sdk-go-v2/service/sts github.com/aws/aws-sdk-go-v2/service/sts/internal/endpoints github.com/aws/aws-sdk-go-v2/service/sts/types -# github.com/aws/smithy-go v1.0.0 +# github.com/aws/smithy-go v1.2.0 ## explicit github.com/aws/smithy-go github.com/aws/smithy-go/encoding