From cfdee5b6275688d01b8f91e02e04f0edcb2da6b6 Mon Sep 17 00:00:00 2001 From: Anderson Queiroz Date: Sat, 19 Oct 2019 13:16:25 +0200 Subject: [PATCH] AWS EKS: Update the AWS Go SDK to version v1.23.13 Fixes: #1019 --- go.mod | 1 + go.sum | 2 ++ .../aws/aws-sdk-go/aws/client/default_retryer.go | 15 +++++++++------ .../aws/aws-sdk-go/aws/csm/metric_chan.go | 11 ++++++----- vendor/github.com/aws/aws-sdk-go/aws/version.go | 2 +- vendor/modules.txt | 2 +- 6 files changed, 20 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index a4681d9cfabbb..8a5b1ef2570d6 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,7 @@ go 1.13 require ( github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect github.com/Microsoft/go-winio v0.4.12 // indirect + github.com/aws/aws-sdk-go v1.23.13 // indirect github.com/blang/semver v3.5.1+incompatible // indirect github.com/bmatcuk/doublestar v1.1.1 github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448 // indirect diff --git a/go.sum b/go.sum index a04ce04557a21..2f53ec7c26cc5 100644 --- a/go.sum +++ b/go.sum @@ -53,6 +53,8 @@ github.com/aws/aws-sdk-go v1.22.4 h1:Mcq67g9mZEBvBuj/x7mF9KCyw5M8/4I/cjQPkdCsq0I github.com/aws/aws-sdk-go v1.22.4/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.23.12 h1:2UnxgNO6Y5J1OrkXS8XNp0UatDxD1bWHiDT62RDPggI= github.com/aws/aws-sdk-go v1.23.12/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.23.13 h1:l/NG+mgQFRGG3dsFzEj0jw9JIs/zYdtU6MXhY1WIDmM= +github.com/aws/aws-sdk-go v1.23.13/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= 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/aws/client/default_retryer.go b/vendor/github.com/aws/aws-sdk-go/aws/client/default_retryer.go index 2f20d31028de8..0680e838cde01 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/client/default_retryer.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/client/default_retryer.go @@ -34,10 +34,12 @@ func (d DefaultRetryer) MaxRetries() int { func (d DefaultRetryer) RetryRules(r *request.Request) time.Duration { // Set the upper limit of delay in retrying at ~five minutes var minTime int64 = 30 + var initialDelay time.Duration + isThrottle := r.IsErrorThrottle() if isThrottle { - if delay, ok := getRetryDelay(r); ok { - return delay + if delay, ok := getRetryAfterDelay(r); ok { + initialDelay = delay } minTime = 500 @@ -46,12 +48,13 @@ func (d DefaultRetryer) RetryRules(r *request.Request) time.Duration { retryCount := r.RetryCount if isThrottle && retryCount > 8 { retryCount = 8 - } else if retryCount > 13 { - retryCount = 13 + } else if retryCount > 12 { + retryCount = 12 } delay := (1 << uint(retryCount)) * (sdkrand.SeededRand.Int63n(minTime) + minTime) - return time.Duration(delay) * time.Millisecond + return (time.Duration(delay) * time.Millisecond) + initialDelay + } // ShouldRetry returns true if the request should be retried. @@ -71,7 +74,7 @@ func (d DefaultRetryer) ShouldRetry(r *request.Request) bool { // This will look in the Retry-After header, RFC 7231, for how long // it will wait before attempting another request -func getRetryDelay(r *request.Request) (time.Duration, bool) { +func getRetryAfterDelay(r *request.Request) (time.Duration, bool) { if !canUseRetryAfterHeader(r) { return 0, false } diff --git a/vendor/github.com/aws/aws-sdk-go/aws/csm/metric_chan.go b/vendor/github.com/aws/aws-sdk-go/aws/csm/metric_chan.go index 514fc3739a5f4..82a3e345e936a 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/csm/metric_chan.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/csm/metric_chan.go @@ -16,25 +16,26 @@ var ( type metricChan struct { ch chan metric - paused int64 + paused *int64 } func newMetricChan(size int) metricChan { return metricChan{ - ch: make(chan metric, size), + ch: make(chan metric, size), + paused: new(int64), } } func (ch *metricChan) Pause() { - atomic.StoreInt64(&ch.paused, pausedEnum) + atomic.StoreInt64(ch.paused, pausedEnum) } func (ch *metricChan) Continue() { - atomic.StoreInt64(&ch.paused, runningEnum) + atomic.StoreInt64(ch.paused, runningEnum) } func (ch *metricChan) IsPaused() bool { - v := atomic.LoadInt64(&ch.paused) + v := atomic.LoadInt64(ch.paused) return v == pausedEnum } diff --git a/vendor/github.com/aws/aws-sdk-go/aws/version.go b/vendor/github.com/aws/aws-sdk-go/aws/version.go index 742d63a3232de..761636317c7e7 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/version.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/version.go @@ -5,4 +5,4 @@ package aws const SDKName = "aws-sdk-go" // SDKVersion is the version of this SDK -const SDKVersion = "1.23.12" +const SDKVersion = "1.23.13" diff --git a/vendor/modules.txt b/vendor/modules.txt index 21498a5d4aa5f..2e577fd24967b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -38,7 +38,7 @@ github.com/alecthomas/template/parse github.com/alecthomas/units # github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878 github.com/armon/go-metrics -# github.com/aws/aws-sdk-go v1.23.12 +# github.com/aws/aws-sdk-go v1.23.13 github.com/aws/aws-sdk-go/aws github.com/aws/aws-sdk-go/aws/awserr github.com/aws/aws-sdk-go/aws/awsutil