aws-sdk-core 3.114.1 → 3.130.1

data/lib/aws-sdk-sts.rb

@@ -50,6 +50,6 @@ require_relative 'aws-sdk-sts/customizations'
 # @!group service
 module Aws::STS
 
-  GEM_VERSION = '3.114.1'
+  GEM_VERSION = '3.130.1'
 
 end

data/lib/seahorse/client/configuration.rb

@@ -195,6 +195,10 @@ module Seahorse
           @members.include?(method_name) or super
         end
 
+        def override_config(k, v)
+          @struct[k] = v
+        end
+
         private
 
         def value_at(opt_name)

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

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-if RUBY_VERSION >= '2.1'
-  begin
-    require 'http/2'
-  rescue LoadError; end
-end
+begin
+  require 'http/2'
+rescue LoadError; end
 require 'openssl'
 require 'socket'
 
@@ -80,13 +78,18 @@ module Seahorse
               _nonblocking_connect(tcp, addr)
               debug_output('opened')
 
-              @socket = OpenSSL::SSL::SSLSocket.new(tcp, _tls_context)
-              @socket.sync_close = true
-              @socket.hostname = endpoint.host
+              if endpoint.scheme == 'https'
+                @socket = OpenSSL::SSL::SSLSocket.new(tcp, _tls_context)
+                @socket.sync_close = true
+                @socket.hostname = endpoint.host
+
+                debug_output("starting TLS for #{endpoint.host}:#{endpoint.port} ...")
+                @socket.connect
+                debug_output('TLS established')
+              else
+                @socket = tcp
+              end
 
-              debug_output("starting TLS for #{endpoint.host}:#{endpoint.port} ...")
-              @socket.connect
-              debug_output('TLS established')
               _register_h2_callbacks
               @status = :active
             elsif @status == :closed

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

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-if RUBY_VERSION >= '2.1'
-  begin
-    require 'http/2'
-  rescue LoadError; end
-end
+begin
+  require 'http/2'
+rescue LoadError; end
+
 require 'securerandom'
 
 module Seahorse

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,97 +11,26 @@ module Seahorse
       module Patches
 
         def self.apply!
+          Net::HTTPGenericRequest.prepend(PatchDefaultContentType)
           return unless RUBY_VERSION < '2.5'
-          if RUBY_VERSION >= '2.3'
-            Net::HTTP::IDEMPOTENT_METHODS_.clear
-            return
-          end
-          # no further patches needed for above versions
 
-          if RUBY_VERSION >= '2.0'
-            Net::HTTP.send(:include, Ruby_2)
-            Net::HTTP::IDEMPOTENT_METHODS_.clear
-          elsif RUBY_VERSION >= '1.9.3'
-            Net::HTTP.send(:include, Ruby_1_9_3)
-          end
-          Net::HTTP.send(:alias_method, :old_transport_request, :transport_request)
-          Net::HTTP.send(:alias_method, :transport_request, :new_transport_request)
+          Net::HTTP::IDEMPOTENT_METHODS_.clear
         end
 
-        module Ruby_2
-          def new_transport_request(req)
-            count = 0
-            begin
-              begin_transport req
-              res = catch(:response) {
-                req.exec @socket, @curr_http_version, edit_path(req.path)
-                begin
-                  res = Net::HTTPResponse.read_new(@socket)
-                  res.decode_content = req.decode_content
-                end while res.kind_of?(Net::HTTPInformation)
-
-                res.uri = req.uri
-
-                res
-              }
-              res.reading_body(@socket, req.response_body_permitted?) {
-                yield res if block_given?
-              }
-            rescue Net::OpenTimeout
-              raise
-            rescue Net::ReadTimeout, IOError, EOFError,
-                   Errno::ECONNRESET, Errno::ECONNABORTED, Errno::EPIPE,
-                   # avoid a dependency on OpenSSL
-                   defined?(OpenSSL::SSL) ? OpenSSL::SSL::SSLError : IOError,
-                   Timeout::Error => exception
-              if count == 0 && Net::HTTP::IDEMPOTENT_METHODS_.include?(req.method)
-                count += 1
-                @socket.close if @socket and not @socket.closed?
-                D "Conn close because of error #{exception}, and retry"
-                if req.body_stream
-                  if req.body_stream.respond_to?(:rewind)
-                    req.body_stream.rewind
-                  else
-                    raise
-                  end
-                end
-                retry
-              end
-              D "Conn close because of error #{exception}"
-              @socket.close if @socket and not @socket.closed?
-              raise
-            end
-
-            end_transport req, res
-            res
-          rescue => exception
-            D "Conn close because of error #{exception}"
-            @socket.close if @socket and not @socket.closed?
-            raise exception
+        # 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
 
-        module Ruby_1_9_3
-          def new_transport_request(req)
-            begin_transport req
-            res = catch(:response) {
-              req.exec @socket, @curr_http_version, edit_path(req.path)
-              begin
-                res = Net::HTTPResponse.read_new(@socket)
-              end while res.kind_of?(Net::HTTPContinue)
-              res
-            }
-            res.reading_body(@socket, req.response_body_permitted?) {
-              yield res if block_given?
-            }
-            end_transport req, res
-            res
-          rescue => exception
-            D "Conn close because of error #{exception}"
-            @socket.close if @socket and not @socket.closed?
-            raise exception
-          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/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/model/shapes.rb

@@ -61,6 +61,9 @@ module Seahorse
         # @return [Boolean]
         attr_accessor :eventheader_type
 
+        # @return [Boolean]
+        attr_accessor :document
+
         # @return [String, nil]
         def location
           @location || (shape && shape[:location])
@@ -114,6 +117,9 @@ module Seahorse
         # @return [String, nil]
         attr_accessor :documentation
 
+        # @return [Boolean]
+        attr_accessor :union
+
         # Gets metadata for the given `key`.
         def [](key)
           @metadata[key.to_s]
@@ -264,8 +270,27 @@ module Seahorse
 
       end
 
+      class UnionShape < StructureShape
+        def initialize(options = {})
+          @member_subclasses = {}
+          super options.merge(union: true)
+        end
+
+        # @api private
+        def member_subclass(member)
+          @member_subclasses[member]
+        end
+
+        # @api private
+        def add_member_subclass(member, subclass)
+          @member_subclasses[member] = subclass
+        end
+      end
+
       class TimestampShape < Shape; end
 
+      class DocumentShape < Shape; end
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-core
 version: !ruby/object:Gem::Version
-  version: 3.114.1
+  version: 3.130.1
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-02 00:00:00.000000000 Z
+date: 2022-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jmespath
@@ -33,7 +33,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.239.0
+        version: 1.525.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.239.0
+        version: 1.525.0
 - !ruby/object:Gem::Dependency
   name: aws-sigv4
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +89,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
@@ -136,9 +139,11 @@ 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/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 +162,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
@@ -230,7 +236,6 @@ files:
 - lib/aws-sdk-sso/client_api.rb
 - lib/aws-sdk-sso/customizations.rb
 - lib/aws-sdk-sso/errors.rb
-- lib/aws-sdk-sso/plugins/content_type.rb
 - lib/aws-sdk-sso/resource.rb
 - lib/aws-sdk-sso/types.rb
 - lib/aws-sdk-sts.rb
@@ -300,7 +305,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

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