aws-sdk-core 2.4.0 → 3.53.0

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

@@ -1,28 +1,28 @@
 module Aws
   module Plugins
-
-    # Enables logging for all requests.  This plugin allows you to configure
-    # your logging device, the log format and the level to log messages at.
-    #
     # @see Log::Formatter
-    #
-    # @seahorse.client.option [Logger] :logger (nil) The Logger instance
-    #   to send log messages to.  If this option is not set, logging
-    #   will be disabled.
-    #
-    # @seahorse.client.option [Symbol] :log_level (:info) The log level
-    #   to send messages to the logger at.
-    #
-    # @seahorse.client.option [Logging::LogFormatter] :log_formatter The log
-    #   formatter.  Defaults to {Seahorse::Client::Logging::Formatter.default}.
-    #
+    # @api private
     class Logging < Seahorse::Client::Plugin
 
-      option(:logger)
+      option(:logger,
+        doc_type: 'Logger',
+        docstring: <<-DOCS
+The Logger instance to send log messages to.  If this option
+is not set, logging will be disabled.
+        DOCS
+      )
 
-      option(:log_level, :info)
+      option(:log_level,
+        default: :info,
+        doc_type: Symbol,
+        docstring: 'The log level to send messages to the `:logger` at.'
+      )
 
-      option(:log_formatter) do |config|
+      option(:log_formatter,
+        doc_type: 'Aws::Log::Formatter',
+        doc_default: literal('Aws::Log::Formatter.default'),
+        docstring: 'The log formatter.'
+      ) do |config|
         Log::Formatter.default if config.logger
       end
 

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

@@ -1,12 +1,16 @@
 module Aws
   module Plugins
-
-    # @seahorse.client.option [Boolean] :convert_params (true)
-    #   When `true`, an attempt is made to coerce request parameters
-    #   into the required types.
+    # @api private
     class ParamConverter < Seahorse::Client::Plugin
 
-      option(:convert_params, true)
+      option(:convert_params,
+         default: true,
+         doc_type: 'Boolean',
+         docstring: <<-DOCS
+When `true`, an attempt is made to coerce request parameters into
+the required types.
+         DOCS
+      )
 
       def add_handlers(handlers, config)
         handlers.add(Handler, step: :initialize) if config.convert_params

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

@@ -1,12 +1,15 @@
 module Aws
   module Plugins
-
-    # @seahorse.client.option [Boolean] :validate_params (true)
-    #   When `true`, request parameters are validated before
-    #   sending the request.
+    # @api private
     class ParamValidator < Seahorse::Client::Plugin
 
-      option(:validate_params, true)
+      option(:validate_params,
+        default: true,
+        doc_type: 'Boolean',
+        docstring: <<-DOCS)
+When `true`, request parameters are validated before
+sending the request.
+      DOCS
 
       def add_handlers(handlers, config)
         if config.validate_params

data/lib/aws-sdk-core/plugins/protocols/api_gateway.rb

@@ -0,0 +1,10 @@
+module Aws
+  module Plugins
+    module Protocols
+      class ApiGateway < Seahorse::Client::Plugin
+        handler(Rest::Handler)
+        handler(Json::ErrorHandler, step: :sign)
+      end
+    end
+  end
+end

data/lib/aws-sdk-core/plugins/protocols/ec2.rb

@@ -1,3 +1,5 @@
+require_relative '../../query'
+
 module Aws
   module Plugins
     module Protocols
@@ -26,7 +28,6 @@ module Aws
         end
 
         handler(Handler)
-
         handler(Xml::ErrorHandler, step: :sign)
 
       end

data/lib/aws-sdk-core/plugins/protocols/json_rpc.rb

@@ -1,20 +1,21 @@
 module Aws
   module Plugins
     module Protocols
-
-      # @seahorse.client.option [Boolean] :simple_json (false)
-      #   Disables request parameter conversion, validation, and formatting.
-      #   Also disable response data type conversions. This option is useful
-      #   when you want to ensure the highest level of performance by
-      #   avoiding overhead of walking request parameters and response data
-      #   structures.
-      #
-      #   When `:simple_json` is enabled, the request parameters hash must
-      #   be formatted exactly as the DynamoDB API expects.
-      #
       class JsonRpc < Seahorse::Client::Plugin
 
-        option(:simple_json, false)
+        option(:simple_json,
+          default: false,
+          doc_type: 'Boolean',
+          docstring: <<-DOCS)
+Disables request parameter conversion, validation, and formatting.
+Also disable response data type conversions. This option is useful
+when you want to ensure the highest level of performance by
+avoiding overhead of walking request parameters and response data
+structures.
+
+When `:simple_json` is enabled, the request parameters hash must
+be formatted exactly as the DynamoDB API expects.
+          DOCS
 
         option(:validate_params) { |config| !config.simple_json }
 

data/lib/aws-sdk-core/plugins/protocols/query.rb

@@ -1,11 +1,11 @@
+require_relative '../../query'
+
 module Aws
   module Plugins
     module Protocols
       class Query < Seahorse::Client::Plugin
-
         handler(Aws::Query::Handler)
         handler(Xml::ErrorHandler, step: :sign)
-
       end
     end
   end

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

@@ -1,14 +1,6 @@
 module Aws
   module Plugins
-
-    # @seahorse.client.option [required, String] :region
-    #   The AWS region to connect to.  The region is used to construct
-    #   the client endpoint.  Defaults to `ENV['AWS_REGION']`.
-    #   Also checks `AMAZON_REGION` and `AWS_DEFAULT_REGION`.
-    #
-    # @seahorse.client.option [String] :endpoint A default endpoint is
-    #   constructed from the `:region`.
-    #
+    # @api private
     class RegionalEndpoint < Seahorse::Client::Plugin
 
       # raised when region is not configured
@@ -16,25 +8,45 @@ module Aws
 
       option(:profile)
 
-      option(:region) do |cfg|
+      option(:region,
+        required: true,
+        doc_type: String,
+        docstring: <<-DOCS) do |cfg|
+The AWS region to connect to.  The configured `:region` is
+used to determine the service `:endpoint`. When not passed,
+a default `:region` is search for in the following locations:
+
+* `Aws.config[:region]`
+* `ENV['AWS_REGION']`
+* `ENV['AMAZON_REGION']`
+* `ENV['AWS_DEFAULT_REGION']`
+* `~/.aws/credentials`
+* `~/.aws/config`
+        DOCS
         resolve_region(cfg)
       end
 
-      option(:endpoint) do |cfg|
-        if endpoint_prefix = cfg.api.metadata['endpointPrefix']
-          EndpointProvider.resolve(cfg.region, endpoint_prefix)
+      option(:regional_endpoint, false)
+
+      option(:endpoint, doc_type: String, docstring: <<-DOCS) do |cfg|
+The client endpoint is normally constructed from the `:region`
+option. You should only configure an `:endpoint` when connecting
+to test endpoints. This should be avalid HTTP(S) URI.
+        DOCS
+        endpoint_prefix = cfg.api.metadata['endpointPrefix']
+        if cfg.region && endpoint_prefix
+          Aws::Partitions::EndpointProvider.resolve(cfg.region, endpoint_prefix)
         end
       end
 
       def after_initialize(client)
         if client.config.region.nil? or client.config.region == ''
-          msg = "missing region; use :region option or "
-          msg << "export region name to ENV['AWS_REGION']"
-          raise Errors::MissingRegionError, msg
+          raise Errors::MissingRegionError
         end
       end
 
       private
+
       def self.resolve_region(cfg)
         keys = %w(AWS_REGION AMAZON_REGION AWS_DEFAULT_REGION)
         env_region = ENV.values_at(*keys).compact.first

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

@@ -1,35 +1,22 @@
 module Aws
   module Plugins
+    # @api private
     class ResponsePaging < Seahorse::Client::Plugin
 
-      def add_handlers(handlers, config)
-        handlers.add(Handler,
-          operations: pageable_operations(config),
-          step: :initialize,
-          priority: 90)
-      end
-
-      private
-
-      def pageable_operations(config)
-        config.api.operations.inject([]) do |pageable, (name, operation)|
-          pageable << name if operation[:pager]
-          pageable
-        end
-      end
-
-      # @api private
       class Handler < Seahorse::Client::Handler
 
         def call(context)
           context[:original_params] = context.params
           resp = @handler.call(context)
           resp.extend(PageableResponse)
-          resp.pager = context.operation[:pager]
+          resp.pager = context.operation[:pager] || Aws::Pager::NullPager.new
           resp
         end
 
       end
+
+      handle(Handler, step: :initialize, priority: 90)
+
     end
   end
 end

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

@@ -2,18 +2,67 @@ require 'set'
 
 module Aws
   module Plugins
-
-    # @seahorse.client.option [Integer] :retry_limit (3)
-    #   The maximum number of times to retry failed requests.  Only
-    #   ~ 500 level server errors and certain ~ 400 level client errors
-    #   are retried.  Generally, these are throttling errors, data
-    #   checksum errors, networking errors, timeout errors and auth
-    #   errors from expired credentials.
+    # @api private
     class RetryErrors < Seahorse::Client::Plugin
 
-      option(:retry_limit, 3)
+      EQUAL_JITTER = lambda { |delay| (delay / 2) + Kernel.rand(0..(delay/2))}
+      FULL_JITTER= lambda { |delay| Kernel.rand(0..delay) }
+      NO_JITTER = lambda { |delay| delay }
+
+      JITTERS = {
+        none: NO_JITTER,
+        equal: EQUAL_JITTER,
+        full: FULL_JITTER
+      }
+
+      JITTERS.default_proc = lambda { |h,k|
+        raise KeyError, "#{k} is not a named jitter function. Must be one of #{h.keys}"
+      }
+
+      DEFAULT_BACKOFF = lambda do |c|
+        delay = 2 ** c.retries * c.config.retry_base_delay
+        delay = [delay, c.config.retry_max_delay].min if (c.config.retry_max_delay || 0) > 0
+        jitter = c.config.retry_jitter
+        jitter = JITTERS[jitter] if Symbol === jitter
+        delay = jitter.call(delay) if jitter
+        Kernel.sleep(delay)
+      end
 
-      option(:retry_backoff, lambda { |c| Kernel.sleep(2 ** c.retries * 0.3) })
+      option(:retry_limit,
+        default: 3,
+        doc_type: Integer,
+        docstring: <<-DOCS)
+The maximum number of times to retry failed requests.  Only
+~ 500 level server errors and certain ~ 400 level client errors
+are retried.  Generally, these are throttling errors, data
+checksum errors, networking errors, timeout errors and auth
+errors from expired credentials.
+        DOCS
+
+      option(:retry_max_delay,
+        default: 0,
+        doc_type: Integer,
+        docstring: <<-DOCS)
+The maximum number of seconds to delay between retries (0 for no limit) used by the default backoff function.
+        DOCS
+
+      option(:retry_base_delay,
+        default: 0.3,
+        doc_type: Float,
+        docstring: <<-DOCS)
+The base delay in seconds used by the default backoff function.
+        DOCS
+
+      option(:retry_jitter,
+        default: :none,
+        doc_type: Symbol,
+        docstring: <<-DOCS)
+A delay randomiser function used by the default backoff function. Some predefined functions can be referenced by name - :none, :equal, :full, otherwise a Proc that takes and returns a number.
+
+@see https://www.awsarchitectureblog.com/2015/03/backoff.html
+        DOCS
+
+      option(:retry_backoff, DEFAULT_BACKOFF)
 
       # @api private
       class ErrorInspector
@@ -29,9 +78,14 @@ module Aws
           'Throttling',                             # query services
           'ThrottlingException',                    # json services
           'RequestThrottled',                       # sqs
+          'RequestThrottledException',
           'ProvisionedThroughputExceededException', # dynamodb
+          'TransactionInProgressException',         # dynamodb
           'RequestLimitExceeded',                   # ec2
           'BandwidthLimitExceeded',                 # cloud search
+          'LimitExceededException',                 # kinesis
+          'TooManyRequestsException',               # batch
+          'PriorRequestNotComplete',                # route53
         ])
 
         CHECKSUM_ERRORS = Set.new([
@@ -53,7 +107,7 @@ module Aws
         end
 
         def throttling_error?
-          !!(THROTTLING_ERRORS.include?(@name) || @name.match(/throttl/i))
+          !!(THROTTLING_ERRORS.include?(@name) || @name.match(/throttl/i) || @http_status_code == 429)
         end
 
         def checksum?
@@ -69,8 +123,40 @@ module Aws
           (500..599).include?(@http_status_code)
         end
 
+        def endpoint_discovery?(context)
+          return false unless context.operation.endpoint_discovery
+
+          if @http_status_code == 421 ||
+            extract_name(@error) == 'InvalidEndpointException'
+            @error = Errors::EndpointDiscoveryError.new
+          end
+
+          # When endpoint discovery error occurs
+          # evict the endpoint from cache
+          if @error.is_a?(Errors::EndpointDiscoveryError)
+            key = context.config.endpoint_cache.extract_key(context)
+            context.config.endpoint_cache.delete(key)
+            true
+          else
+            false
+          end
+        end
+          
+        def retryable?(context)
+          (expired_credentials? and refreshable_credentials?(context)) or
+            throttling_error? or
+            checksum? or
+            networking? or
+            server? or
+            endpoint_discovery?(context)
+        end
+
         private
 
+        def refreshable_credentials?(context)
+          context.config.credentials.respond_to?(:refresh!)
+        end
+
         def extract_name(error)
           if error.is_a?(Errors::ServiceError)
             error.class.code
@@ -123,23 +209,11 @@ module Aws
         end
 
         def should_retry?(context, error)
-          retryable?(context, error) and
+          error.retryable?(context) and
           context.retries < retry_limit(context) and
           response_truncatable?(context)
         end
 
-        def retryable?(context, error)
-          (error.expired_credentials? and refreshable_credentials?(context)) or
-          error.throttling_error? or
-          error.checksum? or
-          error.networking? or
-          error.server?
-        end
-
-        def refreshable_credentials?(context)
-          context.config.credentials.respond_to?(:refresh!)
-        end
-
         def retry_limit(context)
           context.config.retry_limit
         end

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

@@ -0,0 +1,51 @@
+module Aws
+  module Plugins
+    # @api private
+    class SignatureV2 < Seahorse::Client::Plugin
+
+      option(:v2_signer) do |cfg|
+        Aws::Sigv2::Signer.new(credentials_provider: cfg.credentials)
+      end
+
+      def add_handlers(handlers, _)
+        handlers.add(Handler, step: :sign)
+      end
+
+      class Handler < Seahorse::Client::Handler
+
+        def call(context)
+          apply_signature(
+            context.http_request,
+            context.config.v2_signer
+          )
+          @handler.call(context)
+        end
+
+        private
+
+        def apply_signature(req, signer)
+
+          param_list = req.body.param_list
+          param_list.delete('Timestamp') # in case of re-signing
+
+          signature = signer.sign_request(
+            http_method: req.http_method,
+            url: req.endpoint,
+            params: param_list.inject({}) do |hash, param|
+              hash[param.name] = param.value
+              hash
+            end
+          )
+
+          # apply signature
+          signature.each_pair do |param_name, param_value|
+            param_list.set(param_name, param_value)
+          end
+
+          req.body = param_list.to_io
+
+        end
+      end
+    end
+  end
+end