aws-sdk-core 3.121.1 → 3.174.0

data/lib/seahorse/client/h2/connection.rb

@@ -43,7 +43,9 @@ module Seahorse
           @h2_client = HTTP2::Client.new(
             settings_max_concurrent_streams: max_concurrent_streams
           )
-          @logger = options[:logger] || Logger.new($stdout) if @http_wire_trace
+          @logger = if @http_wire_trace
+            options[:logger] || Logger.new($stdout)
+          end
           @chunk_size = options[:read_chunk_size] || CHUNKSIZE
           @errors = []
           @status = :ready
@@ -104,7 +106,7 @@ module Seahorse
           @mutex.synchronize {
             return if @socket_thread
             @socket_thread = Thread.new do
-              while !@socket.closed?
+              while @socket && !@socket.closed?
                 begin
                   data = @socket.read_nonblock(@chunk_size)
                   @h2_client << data
@@ -130,6 +132,7 @@ module Seahorse
                   self.close!
                 end
               end
+              @socket_thread = nil
             end
             @socket_thread.abort_on_exception = true
           }
@@ -142,10 +145,6 @@ module Seahorse
               @socket.close
               @socket = nil
             end
-            if @socket_thread
-              Thread.kill(@socket_thread)
-              @socket_thread = nil
-            end
             @status = :closed
           }
         end
@@ -183,11 +182,13 @@ module Seahorse
               @socket.flush
             end
           end
-          @h2_client.on(:frame_sent) do |frame|
-            debug_output("frame: #{frame.inspect}", :send)
-          end
-          @h2_client.on(:frame_received) do |frame|
-            debug_output("frame: #{frame.inspect}", :receive)
+          if @http_wire_trace
+            @h2_client.on(:frame_sent) do |frame|
+              debug_output("frame: #{frame.inspect}", :send)
+            end
+            @h2_client.on(:frame_received) do |frame|
+              debug_output("frame: #{frame.inspect}", :receive)
+            end
           end
         end
 

data/lib/seahorse/client/net_http/connection_pool.rb

@@ -34,6 +34,7 @@ module Seahorse
           ssl_ca_bundle: nil,
           ssl_ca_directory: nil,
           ssl_ca_store: nil,
+          ssl_timeout: nil
         }
 
         # @api private
@@ -187,6 +188,9 @@ module Seahorse
           #   disables this behaviour.  This value can safely be set per
           #   request on the session yielded by {#session_for}.
           #
+          # @option options [Float] :ssl_timeout (nil) Sets the SSL timeout
+          #   in seconds.
+          #
           # @option options [Boolean] :http_wire_trace (false) When `true`,
           #   HTTP debug output will be sent to the `:logger`.
           #
@@ -248,6 +252,7 @@ module Seahorse
               :ssl_ca_bundle => options[:ssl_ca_bundle],
               :ssl_ca_directory => options[:ssl_ca_directory],
               :ssl_ca_store => options[:ssl_ca_store],
+              :ssl_timeout => options[:ssl_timeout]
             }
           end
 
@@ -285,6 +290,8 @@ module Seahorse
 
           if endpoint.scheme == 'https'
             http.use_ssl = true
+            http.ssl_timeout = ssl_timeout
+
             if ssl_verify_peer?
               http.verify_mode = OpenSSL::SSL::VERIFY_PEER
               http.ca_file = ssl_ca_bundle if ssl_ca_bundle

data/lib/seahorse/client/net_http/handler.rb

@@ -74,8 +74,9 @@ module Seahorse
         # @return [void]
         def transmit(config, req, resp)
           session(config, req) do |http|
+            # Monkey patch default content-type set by Net::HTTP
+            Thread.current[:net_http_skip_default_content_type] = true
             http.request(build_net_request(req)) do |net_resp|
-
               status_code = net_resp.code.to_i
               headers = extract_headers(net_resp)
 
@@ -96,6 +97,9 @@ module Seahorse
         rescue => error
           # not retryable
           resp.signal_error(error)
+        ensure
+          # ensure we turn off monkey patch in case of error
+          Thread.current[:net_http_skip_default_content_type] = nil
         end
 
         def complete_response(req, resp, bytes_received)
@@ -147,7 +151,12 @@ module Seahorse
         def build_net_request(request)
           request_class = net_http_request_class(request)
           req = request_class.new(request.endpoint.request_uri, headers(request))
-          req.body_stream = request.body
+          # Net::HTTP adds a default Content-Type when a body is present.
+          # Set the body stream when it has an unknown size or when it is > 0.
+          if !request.body.respond_to?(:size) ||
+             (request.body.respond_to?(:size) && request.body.size > 0)
+            req.body_stream = request.body
+          end
           req
         end
 
@@ -166,14 +175,13 @@ module Seahorse
         # @return [Hash] Returns a vanilla hash of headers to send with the
         #   HTTP request.
         def headers(request)
-          # Net::HTTP adds default headers for content-type to POSTs (1.8.7+)
-          # and accept-encoding (2.0.0+). Setting a default empty value defeats
-          # this.
+          # Net::HTTP adds a default header for accept-encoding (2.0.0+).
+          # Setting a default empty value defeats this.
           #
-          # Removing these are necessary for most services to not break request
+          # Removing this is necessary for most services to not break request
           # signatures as well as dynamodb crc32 checks (these fail if the
           # response is gzipped).
-          headers = { 'content-type' => '', 'accept-encoding' => '' }
+          headers = { 'accept-encoding' => '' }
           request.headers.each_pair do |key, value|
             headers[key] = value
           end

data/lib/seahorse/client/net_http/patches.rb

@@ -11,10 +11,26 @@ module Seahorse
       module Patches
 
         def self.apply!
+          Net::HTTPGenericRequest.prepend(PatchDefaultContentType)
           return unless RUBY_VERSION < '2.5'
+
           Net::HTTP::IDEMPOTENT_METHODS_.clear
         end
 
+        # For requests with bodys, Net::HTTP sets a default content type of:
+        #   'application/x-www-form-urlencoded'
+        # There are cases where we should not send content type at all.
+        # Even when no body is supplied, Net::HTTP uses a default empty body
+        # and sets it anyway. This patch disables the behavior when a Thread
+        # local variable is set.
+        module PatchDefaultContentType
+          def supply_default_content_type
+            return if Thread.current[:net_http_skip_default_content_type]
+
+            super
+          end
+        end
+
       end
     end
   end

data/lib/seahorse/client/plugins/content_length.rb

@@ -7,16 +7,22 @@ module Seahorse
 
         # @api private
         class Handler < Client::Handler
+          # https://github.com/ruby/net-http/blob/master/lib/net/http/requests.rb
+          # Methods without body are forwards compatible, because content-length
+          # may be set for requests without body but is technically incorrect.
+          METHODS_WITHOUT_BODY = Set.new(
+            %w[GET HEAD DELETE OPTIONS TRACE COPY MOVE]
+          )
 
           def call(context)
-            # If it's an IO object and not a File / String / String IO
-            if context.http_request.body.respond_to?(:size)
-              length = context.http_request.body.size
-              context.http_request.headers['Content-Length'] = length
+            body = context.http_request.body
+            method = context.http_request.http_method
+            # We use Net::HTTP with body_stream which doesn't do this by default
+            if body.respond_to?(:size) && !METHODS_WITHOUT_BODY.include?(method)
+              context.http_request.headers['Content-Length'] = body.size
             end
             @handler.call(context)
           end
-
         end
 
         handler(Handler, step: :sign, priority: 0)

data/lib/seahorse/client/plugins/net_http.rb

@@ -9,9 +9,13 @@ module Seahorse
 
         option(:http_proxy, default: nil, doc_type: String, docstring: '')
 
-        option(:http_open_timeout, default: 15, doc_type: Integer, docstring: '')
+        option(:http_open_timeout, default: 15, doc_type: Integer, docstring: '') do |cfg|
+          resolve_http_open_timeout(cfg)
+        end
 
-        option(:http_read_timeout, default: 60, doc_type: Integer, docstring: '')
+        option(:http_read_timeout, default: 60, doc_type: Integer, docstring: '') do |cfg|
+          resolve_http_read_timeout(cfg)
+        end
 
         option(:http_idle_timeout, default: 5, doc_type: Integer, docstring: '')
 
@@ -30,10 +34,37 @@ module Seahorse
 
         option(:ssl_ca_store, default: nil, doc_type: String, docstring: '')
 
+        option(:ssl_timeout, default: nil, doc_type: Float, docstring: '') do |cfg|
+          resolve_ssl_timeout(cfg)
+        end
+
         option(:logger) # for backwards compat
 
         handler(Client::NetHttp::Handler, step: :send)
 
+        def self.resolve_http_open_timeout(cfg)
+          default_mode_value =
+            if cfg.respond_to?(:defaults_mode_config_resolver)
+              cfg.defaults_mode_config_resolver.resolve(:http_open_timeout)
+            end
+          default_mode_value || 15
+        end
+
+        def self.resolve_http_read_timeout(cfg)
+          default_mode_value =
+            if cfg.respond_to?(:defaults_mode_config_resolver)
+              cfg.defaults_mode_config_resolver.resolve(:http_read_timeout)
+            end
+          default_mode_value || 60
+        end
+
+        def self.resolve_ssl_timeout(cfg)
+          default_mode_value =
+            if cfg.respond_to?(:defaults_mode_config_resolver)
+              cfg.defaults_mode_config_resolver.resolve(:ssl_timeout)
+            end
+          default_mode_value || nil
+        end
       end
     end
   end

data/lib/seahorse/client/plugins/request_callback.rb

@@ -80,18 +80,18 @@ bytes in the body.
                 context.http_request.body,
                 callback
               )
-              add_event_listeners(context)
+              @handler.call(context).tap do
+                unwrap_callback_body(context)
+              end
+            else
+              @handler.call(context)
             end
-            @handler.call(context)
           end
 
-          def add_event_listeners(context)
-            # unwrap the request body as soon as we start receiving a response
-            context.http_response.on_headers do
-              body = context.http_request.body
-              if body.is_a? ReadCallbackIO
-                context.http_request.body = body.io
-              end
+          def unwrap_callback_body(context)
+            body = context.http_request.body
+            if body.is_a? ReadCallbackIO
+              context.http_request.body = body.io
             end
           end
         end

data/lib/seahorse/model/operation.rb

@@ -25,6 +25,9 @@ module Seahorse
       # @return [Boolean]
       attr_accessor :http_checksum_required
 
+      # @return [Hash]
+      attr_accessor :http_checksum
+
       # @return [Boolean]
       attr_accessor :deprecated
 

data/lib/seahorse/util.rb

@@ -14,6 +14,10 @@ module Seahorse
         path.gsub(/[^\/]+/) { |part| uri_escape(part) }
       end
 
+      def escape_header_list_string(s)
+        s.include?('"') || s.include?(',') ? "\"#{s.gsub('"', '\"')}\"" : s
+      end
+
       # Checks for a valid host label
       # @see https://tools.ietf.org/html/rfc3986#section-3.2.2
       # @see https://tools.ietf.org/html/rfc1123#page-13

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-core
 version: !ruby/object:Gem::Version
-  version: 3.121.1
+  version: 3.174.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2023-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jmespath
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: aws-partitions
   requirement: !ruby/object:Gem::Requirement
@@ -33,7 +39,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.239.0
+        version: 1.651.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,21 +49,21 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.239.0
+        version: 1.651.0
 - !ruby/object:Gem::Dependency
   name: aws-sigv4
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: aws-eventstream
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +95,9 @@ files:
 - LICENSE.txt
 - VERSION
 - ca-bundle.crt
+- lib/aws-defaults.rb
+- lib/aws-defaults/default_configuration.rb
+- lib/aws-defaults/defaults_mode_config_resolver.rb
 - lib/aws-sdk-core.rb
 - lib/aws-sdk-core/arn.rb
 - lib/aws-sdk-core/arn_parser.rb
@@ -113,6 +122,20 @@ files:
 - lib/aws-sdk-core/ec2_metadata.rb
 - lib/aws-sdk-core/ecs_credentials.rb
 - lib/aws-sdk-core/endpoint_cache.rb
+- lib/aws-sdk-core/endpoints.rb
+- lib/aws-sdk-core/endpoints/condition.rb
+- lib/aws-sdk-core/endpoints/endpoint.rb
+- lib/aws-sdk-core/endpoints/endpoint_rule.rb
+- lib/aws-sdk-core/endpoints/error_rule.rb
+- lib/aws-sdk-core/endpoints/function.rb
+- lib/aws-sdk-core/endpoints/matchers.rb
+- lib/aws-sdk-core/endpoints/reference.rb
+- lib/aws-sdk-core/endpoints/rule.rb
+- lib/aws-sdk-core/endpoints/rule_set.rb
+- lib/aws-sdk-core/endpoints/rules_provider.rb
+- lib/aws-sdk-core/endpoints/templater.rb
+- lib/aws-sdk-core/endpoints/tree_rule.rb
+- lib/aws-sdk-core/endpoints/url.rb
 - lib/aws-sdk-core/errors.rb
 - lib/aws-sdk-core/event_emitter.rb
 - lib/aws-sdk-core/ini_parser.rb
@@ -136,9 +159,12 @@ files:
 - lib/aws-sdk-core/plugins/apig_authorizer_token.rb
 - lib/aws-sdk-core/plugins/apig_credentials_configuration.rb
 - lib/aws-sdk-core/plugins/apig_user_agent.rb
+- lib/aws-sdk-core/plugins/bearer_authorization.rb
+- lib/aws-sdk-core/plugins/checksum_algorithm.rb
 - lib/aws-sdk-core/plugins/client_metrics_plugin.rb
 - lib/aws-sdk-core/plugins/client_metrics_send_plugin.rb
 - lib/aws-sdk-core/plugins/credentials_configuration.rb
+- lib/aws-sdk-core/plugins/defaults_mode.rb
 - lib/aws-sdk-core/plugins/endpoint_discovery.rb
 - lib/aws-sdk-core/plugins/endpoint_pattern.rb
 - lib/aws-sdk-core/plugins/event_stream_configuration.rb
@@ -157,6 +183,7 @@ files:
 - lib/aws-sdk-core/plugins/protocols/query.rb
 - lib/aws-sdk-core/plugins/protocols/rest_json.rb
 - lib/aws-sdk-core/plugins/protocols/rest_xml.rb
+- lib/aws-sdk-core/plugins/recursion_detection.rb
 - lib/aws-sdk-core/plugins/regional_endpoint.rb
 - lib/aws-sdk-core/plugins/response_paging.rb
 - lib/aws-sdk-core/plugins/retries/client_rate_limiter.rb
@@ -164,6 +191,7 @@ files:
 - lib/aws-sdk-core/plugins/retries/error_inspector.rb
 - lib/aws-sdk-core/plugins/retries/retry_quota.rb
 - lib/aws-sdk-core/plugins/retry_errors.rb
+- lib/aws-sdk-core/plugins/sign.rb
 - lib/aws-sdk-core/plugins/signature_v2.rb
 - lib/aws-sdk-core/plugins/signature_v4.rb
 - lib/aws-sdk-core/plugins/stub_responses.rb
@@ -177,6 +205,7 @@ files:
 - lib/aws-sdk-core/query/param_builder.rb
 - lib/aws-sdk-core/query/param_list.rb
 - lib/aws-sdk-core/refreshing_credentials.rb
+- lib/aws-sdk-core/refreshing_token.rb
 - lib/aws-sdk-core/resources/collection.rb
 - lib/aws-sdk-core/rest.rb
 - lib/aws-sdk-core/rest/handler.rb
@@ -192,6 +221,8 @@ files:
 - lib/aws-sdk-core/shared_config.rb
 - lib/aws-sdk-core/shared_credentials.rb
 - lib/aws-sdk-core/sso_credentials.rb
+- lib/aws-sdk-core/sso_token_provider.rb
+- lib/aws-sdk-core/static_token_provider.rb
 - lib/aws-sdk-core/structure.rb
 - lib/aws-sdk-core/stubbing/data_applicator.rb
 - lib/aws-sdk-core/stubbing/empty_stub.rb
@@ -204,6 +235,9 @@ files:
 - lib/aws-sdk-core/stubbing/protocols/rest_xml.rb
 - lib/aws-sdk-core/stubbing/stub_data.rb
 - lib/aws-sdk-core/stubbing/xml_error.rb
+- lib/aws-sdk-core/token.rb
+- lib/aws-sdk-core/token_provider.rb
+- lib/aws-sdk-core/token_provider_chain.rb
 - lib/aws-sdk-core/type_builder.rb
 - lib/aws-sdk-core/util.rb
 - lib/aws-sdk-core/waiters.rb
@@ -229,15 +263,33 @@ files:
 - lib/aws-sdk-sso/client.rb
 - lib/aws-sdk-sso/client_api.rb
 - lib/aws-sdk-sso/customizations.rb
+- lib/aws-sdk-sso/endpoint_parameters.rb
+- lib/aws-sdk-sso/endpoint_provider.rb
+- lib/aws-sdk-sso/endpoints.rb
 - lib/aws-sdk-sso/errors.rb
-- lib/aws-sdk-sso/plugins/content_type.rb
+- lib/aws-sdk-sso/plugins/endpoints.rb
 - lib/aws-sdk-sso/resource.rb
 - lib/aws-sdk-sso/types.rb
+- lib/aws-sdk-ssooidc.rb
+- lib/aws-sdk-ssooidc/client.rb
+- lib/aws-sdk-ssooidc/client_api.rb
+- lib/aws-sdk-ssooidc/customizations.rb
+- lib/aws-sdk-ssooidc/endpoint_parameters.rb
+- lib/aws-sdk-ssooidc/endpoint_provider.rb
+- lib/aws-sdk-ssooidc/endpoints.rb
+- lib/aws-sdk-ssooidc/errors.rb
+- lib/aws-sdk-ssooidc/plugins/endpoints.rb
+- lib/aws-sdk-ssooidc/resource.rb
+- lib/aws-sdk-ssooidc/types.rb
 - lib/aws-sdk-sts.rb
 - lib/aws-sdk-sts/client.rb
 - lib/aws-sdk-sts/client_api.rb
 - lib/aws-sdk-sts/customizations.rb
+- lib/aws-sdk-sts/endpoint_parameters.rb
+- lib/aws-sdk-sts/endpoint_provider.rb
+- lib/aws-sdk-sts/endpoints.rb
 - lib/aws-sdk-sts/errors.rb
+- lib/aws-sdk-sts/plugins/endpoints.rb
 - lib/aws-sdk-sts/plugins/sts_regional_endpoints.rb
 - lib/aws-sdk-sts/presigner.rb
 - lib/aws-sdk-sts/resource.rb

data/lib/aws-sdk-sso/plugins/content_type.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module Aws
-  module SSO
-    module Plugins
-      class ContentType < Seahorse::Client::Plugin
-
-        def add_handlers(handlers, config)
-          handlers.add(Handler)
-        end
-
-        class Handler < Seahorse::Client::Handler
-          def call(context)
-            # Some operations break when given an empty content-type header.
-            # The SDK adds this blank content-type header
-            # since Net::HTTP provides a default that can break services.
-            # We're setting one here even though it's not used or necessary.
-            context.http_request.headers['content-type'] = 'application/json'
-            @handler.call(context)
-          end
-        end
-      end
-    end
-  end
-end