aws-sdk-core 3.91.0 → 3.91.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '018176486b2589c3e5643f0517d600048b788239'
-  data.tar.gz: bf23afa4bc903911cc3a571b318eb38911a4cb62
+SHA256:
+  metadata.gz: 3c1fbacace50e0f25fdf2055b3881d1d12ca187a34009b26dc94ceded9ab5cec
+  data.tar.gz: b0f1c6b91e78d28b2ae9cc303bf93c4654a8d309a6ce34ac612fe2ce72e9a052
 SHA512:
-  metadata.gz: 8c5827b6dfca9a435419df7ec67f006179fe4656e909769e7545dbd4803b6723bdfedc7a9e89f23bff052d3e93428dcd39c9b803a1f35aba3ac26cfc3c33fb87
-  data.tar.gz: a244072123870020dbca0dee7bbe8f7057367b1ce81e18c7078b994e79a5f48c5ca5639e0df4113d4e68fdbc12627097751d21e45a65c4359e7d0abd4a548474
+  metadata.gz: a598be184e28664f405dd2e3dff5ea7562fbaabeafe4b1c3047b6d795510e9e7b613107b90df7f9ff6b8a89070acfb0b35a5e31fd2db219ee3daca8a3497fa2c
+  data.tar.gz: 79f72a46988468762042e55a2f543a0faca9ca3cf66b00081e23b335f80ae9440ec49877aa4e1b645c899566a686e0673c261c928f0893cd120c51e4239333c4

data/VERSION

@@ -1 +1 @@
-3.91.0
+3.91.1

data/lib/aws-sdk-core/json.rb

@@ -7,28 +7,24 @@ require_relative 'json/parser'
 module Aws
   # @api private
   module Json
-
     class ParseError < StandardError
-
       def initialize(error)
         @error = error
         super(error.message)
       end
 
       attr_reader :error
-
     end
 
     class << self
-
       def load(json)
         ENGINE.load(json, *ENGINE_LOAD_OPTIONS)
       rescue *ENGINE_ERRORS => e
-        raise ParseError.new(e)
+        raise ParseError, e
       end
 
       def load_file(path)
-        self.load(File.open(path, 'r', encoding: 'UTF-8') { |f| f.read })
+        load(File.open(path, 'r', encoding: 'UTF-8', &:read))
       end
 
       def dump(value)
@@ -39,7 +35,12 @@ module Aws
 
       def oj_engine
         require 'oj'
-        [Oj, [{mode: :compat, symbol_keys: false}], [{ mode: :compat }], oj_parse_error]
+        [
+          Oj,
+          [{ mode: :compat, symbol_keys: false }],
+          [{ mode: :compat }],
+          oj_parse_error
+        ]
       rescue LoadError
         false
       end
@@ -50,17 +51,15 @@ module Aws
 
       def oj_parse_error
         if Oj.const_defined?('ParseError')
-          [Oj::ParseError, EncodingError]
+          [Oj::ParseError, EncodingError, JSON::ParserError]
         else
           [SyntaxError]
         end
       end
-
     end
 
     # @api private
     ENGINE, ENGINE_LOAD_OPTIONS, ENGINE_DUMP_OPTIONS, ENGINE_ERRORS =
       oj_engine || json_engine
-
   end
 end

data/lib/aws-sdk-core/plugins/retries/clock_skew.rb

@@ -9,7 +9,14 @@ module Aws
 
         def initialize
           @mutex = Mutex.new
+          # clock_corrections are recorded only on errors
+          # and only when time difference is greater than the
+          # CLOCK_SKEW_THRESHOLD
           @endpoint_clock_corrections = Hash.new(0)
+
+          # estimated_skew is calculated on every request
+          # and is used to estimate a TTL for requests
+          @endpoint_estimated_skews = Hash.new(nil)
         end
 
         # Gets the clock_correction in seconds to apply to a given endpoint
@@ -18,11 +25,15 @@ module Aws
           @mutex.synchronize { @endpoint_clock_corrections[endpoint.to_s] }
         end
 
-        # Sets the clock correction for an endpoint
-        # @param endpoint [URI / String]
-        # @param correction [Number]
-        def set_clock_correction(endpoint, correction)
-          @mutex.synchronize { @endpoint_clock_corrections[endpoint.to_s] = correction }
+        # The estimated skew factors in any clock skew from
+        # the service along with any network latency.
+        # This provides a more accurate value for the ttl,
+        # which should represent when the client will stop
+        # waiting for a request.
+        # Estimated Skew should not be used to correct clock skew errors
+        # it should only be used to estimate TTL for a request
+        def estimated_skew(endpoint)
+          @mutex.synchronize { @endpoint_estimated_skews[endpoint.to_s] }
         end
 
         # Determines whether a request has clock skew by comparing
@@ -30,13 +41,15 @@ module Aws
         # @param context [Seahorse::Client::RequestContext]
         def clock_skewed?(context)
           server_time = server_time(context.http_response)
-          !!server_time && (Time.now.utc - server_time).abs > CLOCK_SKEW_THRESHOLD
+          !!server_time &&
+            (Time.now.utc - server_time).abs > CLOCK_SKEW_THRESHOLD
         end
 
-        # Update the stored clock skew value for an endpoint
+        # Called only on clock skew related errors
+        # Update the stored clock skew correction value for an endpoint
         # from the server's time in the response
         # @param context [Seahorse::Client::RequestContext]
-        def update_clock_skew(context)
+        def update_clock_correction(context)
           endpoint = context.http_request.endpoint
           now_utc = Time.now.utc
           server_time = server_time(context.http_response)
@@ -45,6 +58,20 @@ module Aws
           end
         end
 
+        # Called for every request
+        # Update our estimated clock skew for the endpoint
+        # from the servers time in the response
+        # @param context [Seahorse::Client::RequestContext]
+        def update_estimated_skew(context)
+          endpoint = context.http_request.endpoint
+          now_utc = Time.now.utc
+          server_time = server_time(context.http_response)
+          return unless server_time
+          @mutex.synchronize do
+            @endpoint_estimated_skews[endpoint.to_s] = server_time - now_utc
+          end
+        end
+
         private
 
         # @param response [Seahorse::Client::Http::Response:]
@@ -56,6 +83,14 @@ module Aws
           end
         end
 
+        # Sets the clock correction for an endpoint
+        # @param endpoint [URI / String]
+        # @param correction [Number]
+        def set_clock_correction(endpoint, correction)
+          @mutex.synchronize do
+            @endpoint_clock_corrections[endpoint.to_s] = correction
+          end
+        end
       end
     end
   end

data/lib/aws-sdk-core/plugins/retry_errors.rb

@@ -97,15 +97,19 @@ This option is only used in the `legacy` retry mode.
         doc_type: String,
         docstring: <<-DOCS) do |cfg|
 Specifies which retry algorithm to use. Values are:
-  * `legacy` - The pre-existing retry behavior.  This is default value if
-    no retry mode is provided.
-  * `standard` - A standardized set of retry rules across the AWS SDKs.
-    This includes support for retry quotas, which limit the number of
-    unsuccessful retries a client can make.
-  * `adaptive` - An experimental retry mode that includes all the
-    functionality of `standard` mode along with automatic client side
-    throttling.  This is a provisional mode that may change behavior
-    in the future.
+
+* `legacy` - The pre-existing retry behavior.  This is default value if
+  no retry mode is provided.
+
+* `standard` - A standardized set of retry rules across the AWS SDKs.
+  This includes support for retry quotas, which limit the number of
+  unsuccessful retries a client can make.
+
+* `adaptive` - An experimental retry mode that includes all the
+  functionality of `standard` mode along with automatic client side
+  throttling.  This is a provisional mode that may change behavior
+  in the future.
+
         DOCS
         resolve_retry_mode(cfg)
       end
@@ -223,6 +227,7 @@ a clock skew correction and retry requests with skewed client clocks.
           config = context.config
 
           get_send_token(config)
+          add_retry_headers(context)
           response = @handler.call(context)
           error_inspector = Retries::ErrorInspector.new(
             response.error, response.context.http_response.status_code
@@ -235,12 +240,16 @@ a clock skew correction and retry requests with skewed client clocks.
             config.endpoint_cache.delete(key)
           end
 
-          # Clock skew needs to be updated from the response even when
-          # the request is not retryable
+          # Clock correction needs to be updated from the response even when
+          # the request is not retryable but should only be updated
+          # in the case of clock skew errors
           if error_inspector.clock_skew?(context)
-            config.clock_skew.update_clock_skew(context)
+            config.clock_skew.update_clock_correction(context)
           end
 
+          # Estimated skew needs to be updated on every request
+          config.clock_skew.update_estimated_skew(context)
+
           return response unless retryable?(context, response, error_inspector)
 
           return response if context.retries >= config.max_attempts - 1
@@ -304,6 +313,35 @@ a clock skew correction and retry requests with skewed client clocks.
           context.http_response.reset
           call(context)
         end
+
+        def add_retry_headers(context)
+          request_pairs = {
+            'attempt' => context.retries,
+            'max' => context.config.max_attempts
+          }
+          if (ttl = compute_request_ttl(context))
+            request_pairs['ttl'] = ttl
+          end
+
+          # create the request header
+          formatted_header = request_pairs.map { |k, v| "#{k}=#{v}" }.join('; ')
+          context.http_request.headers['amz-sdk-request'] = formatted_header
+        end
+
+        def compute_request_ttl(context)
+          return if context.operation.async
+
+          endpoint = context.http_request.endpoint
+          estimated_skew = context.config.clock_skew.estimated_skew(endpoint)
+          if context.config.respond_to?(:http_read_timeout)
+            read_timeout = context.config.http_read_timeout
+          end
+
+          if estimated_skew && read_timeout
+            (Time.now.utc + read_timeout + estimated_skew)
+              .strftime('%Y%m%dT%H%M%SZ')
+          end
+        end
       end
 
       class LegacyHandler < Seahorse::Client::Handler

data/lib/aws-sdk-sts.rb

@@ -43,6 +43,6 @@ require_relative 'aws-sdk-sts/customizations'
 # @service
 module Aws::STS
 
-  GEM_VERSION = '3.91.0'
+  GEM_VERSION = '3.91.1'
 
 end

data/lib/aws-sdk-sts/client.rb

@@ -33,11 +33,11 @@ Aws::Plugins::GlobalConfiguration.add_identifier(:sts)
 module Aws::STS
   # An API client for STS.  To construct a client, you need to configure a `:region` and `:credentials`.
   #
-  #   client = Aws::STS::Client.new(
-  #     region: region_name,
-  #     credentials: credentials,
-  #     # ...
-  #   )
+  #     client = Aws::STS::Client.new(
+  #       region: region_name,
+  #       credentials: credentials,
+  #       # ...
+  #     )
   #
   # For details on configuring region and credentials see
   # the [developer guide](/sdk-for-ruby/v3/developer-guide/setup-config.html).
@@ -231,15 +231,19 @@ module Aws::STS
     #
     #   @option options [String] :retry_mode ("legacy")
     #     Specifies which retry algorithm to use. Values are:
-    #       * `legacy` - The pre-existing retry behavior.  This is default value if
-    #         no retry mode is provided.
-    #       * `standard` - A standardized set of retry rules across the AWS SDKs.
-    #         This includes support for retry quotas, which limit the number of
-    #         unsuccessful retries a client can make.
-    #       * `adaptive` - An experimental retry mode that includes all the
-    #         functionality of `standard` mode along with automatic client side
-    #         throttling.  This is a provisional mode that may change behavior
-    #         in the future.
+    #
+    #     * `legacy` - The pre-existing retry behavior.  This is default value if
+    #       no retry mode is provided.
+    #
+    #     * `standard` - A standardized set of retry rules across the AWS SDKs.
+    #       This includes support for retry quotas, which limit the number of
+    #       unsuccessful retries a client can make.
+    #
+    #     * `adaptive` - An experimental retry mode that includes all the
+    #       functionality of `standard` mode along with automatic client side
+    #       throttling.  This is a provisional mode that may change behavior
+    #       in the future.
+    #
     #
     #   @option options [String] :secret_access_key
     #
@@ -2182,7 +2186,7 @@ module Aws::STS
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-core'
-      context[:gem_version] = '3.91.0'
+      context[:gem_version] = '3.91.1'
       Seahorse::Client::Request.new(handlers, context)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-core
 version: !ruby/object:Gem::Version
-  version: 3.91.0
+  version: 3.91.1
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-09 00:00:00.000000000 Z
+date: 2020-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jmespath
@@ -293,8 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: AWS SDK for Ruby - Core