aws-sdk-core 3.191.1 → 3.229.0

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

@@ -27,6 +27,12 @@ module Seahorse
       class Handler < Client::Handler
 
         def call(context)
+          span_wrapper(context) { _call(context) }
+        end
+
+        private
+
+        def _call(context)
           stream = nil
           begin
             conn = context.client.connection
@@ -80,8 +86,6 @@ module Seahorse
           )
         end
 
-        private
-
         def _register_callbacks(resp, stream, stream_mutex, close_condition, sync_queue)
           stream.on(:headers) do |headers|
             resp.signal_headers(headers)
@@ -126,6 +130,7 @@ module Seahorse
         # https://http2.github.io/http2-spec/#rfc.section.8.1.2.3
         def _h2_headers(req)
           headers = {}
+          headers[':authority'] = req.endpoint.host
           headers[':method'] = req.http_method.upcase
           headers[':scheme'] = req.endpoint.scheme
           headers[':path'] = req.endpoint.path.empty? ? '/' : req.endpoint.path
@@ -145,8 +150,14 @@ module Seahorse
           end
         end
 
+        def span_wrapper(context, &block)
+          context.tracer.in_span(
+            'Handler.H2',
+            attributes: Aws::Telemetry.http_request_attrs(context),
+            &block
+          )
+        end
       end
-
     end
   end
 end

data/lib/seahorse/client/handler.rb

@@ -15,7 +15,7 @@ module Seahorse
       attr_accessor :handler
 
       # @param [RequestContext] context
-      # @return [Response]
+      # @return [Seahorse::Response]
       def call(context)
         @handler.call(context)
       end

data/lib/seahorse/client/http/response.rb

@@ -66,8 +66,8 @@ module Seahorse
         # @param [string] chunk
         def signal_data(chunk)
           unless chunk == ''
-            @body.write(chunk)
             emit(:data, chunk)
+            @body.write(chunk)
           end
         end
 

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'cgi'
+require "cgi/escape"
+require "cgi/util" if RUBY_VERSION < "3.5"
 require 'net/http'
 require 'net/https'
 require 'delegate'
@@ -34,7 +35,9 @@ module Seahorse
           ssl_ca_bundle: nil,
           ssl_ca_directory: nil,
           ssl_ca_store: nil,
-          ssl_timeout: nil
+          ssl_timeout: nil,
+          ssl_cert: nil,
+          ssl_key: nil
         }
 
         # @api private
@@ -119,11 +122,7 @@ module Seahorse
         #   pool, not counting those currently in use.
         def size
           @pool_mutex.synchronize do
-            size = 0
-            @pool.each_pair do |endpoint,sessions|
-              size += sessions.size
-            end
-            size
+            @pool.values.flatten.size
           end
         end
 
@@ -142,9 +141,7 @@ module Seahorse
         # @return [nil]
         def empty!
           @pool_mutex.synchronize do
-            @pool.each_pair do |endpoint,sessions|
-              sessions.each(&:finish)
-            end
+            @pool.values.flatten.map(&:finish)
             @pool.clear
           end
           nil
@@ -252,7 +249,9 @@ 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]
+              :ssl_timeout => options[:ssl_timeout],
+              :ssl_cert => options[:ssl_cert],
+              :ssl_key => options[:ssl_key]
             }
           end
 
@@ -297,6 +296,8 @@ module Seahorse
               http.ca_file = ssl_ca_bundle if ssl_ca_bundle
               http.ca_path = ssl_ca_directory if ssl_ca_directory
               http.cert_store = ssl_ca_store if ssl_ca_store
+              http.cert = ssl_cert if ssl_cert
+              http.key = ssl_key if ssl_key
             else
               http.verify_mode = OpenSSL::SSL::VERIFY_NONE
             end
@@ -312,7 +313,7 @@ module Seahorse
         # @note **Must** be called behind a `@pool_mutex` synchronize block.
         def _clean
           now = Aws::Util.monotonic_milliseconds
-          @pool.each_pair do |endpoint,sessions|
+          @pool.values.each do |sessions|
             sessions.delete_if do |session|
               if session.last_used.nil? or now - session.last_used > http_idle_timeout * 1000
                 session.finish
@@ -336,6 +337,8 @@ module Seahorse
           attr_reader :last_used
 
           def __getobj__
+            return yield if block_given? && !defined?(@http)
+
             @http
           end
 

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

@@ -23,17 +23,12 @@ module Seahorse
 
         NETWORK_ERRORS = [
           SocketError, EOFError, IOError, Timeout::Error,
-          Errno::ECONNABORTED, Errno::ECONNRESET, Errno::EPIPE,
-          Errno::EINVAL, Errno::ETIMEDOUT, OpenSSL::SSL::SSLError,
-          Errno::EHOSTUNREACH, Errno::ECONNREFUSED,
+          Errno::ECONNABORTED, Errno::ECONNRESET, Errno::EPIPE, Errno::EINVAL,
+          Errno::ETIMEDOUT, Errno::EHOSTUNREACH, Errno::ECONNREFUSED,
+          OpenSSL::SSL::SSLError, OpenSSL::SSL::SSLErrorWaitReadable,
           Net::HTTPFatalError # for proxy connection failures
         ]
 
-        # does not exist in Ruby 1.9.3
-        if OpenSSL::SSL.const_defined?(:SSLErrorWaitReadable)
-          NETWORK_ERRORS << OpenSSL::SSL::SSLErrorWaitReadable
-        end
-
         # @api private
         DNS_ERROR_MESSAGES = [
           'getaddrinfo: nodename nor servname provided, or not known', # MacOS
@@ -47,7 +42,13 @@ module Seahorse
         # @param [RequestContext] context
         # @return [Response]
         def call(context)
-          transmit(context.config, context.http_request, context.http_response)
+          span_wrapper(context) do
+            transmit(
+              context.config,
+              context.http_request,
+              context.http_response
+            )
+          end
           Response.new(context: context)
         end
 
@@ -197,6 +198,17 @@ module Seahorse
           end
         end
 
+        def span_wrapper(context, &block)
+          context.tracer.in_span(
+            'Handler.NetHttp',
+            attributes: Aws::Telemetry.http_request_attrs(context)
+          ) do |span|
+            block.call
+            span.add_attributes(
+              Aws::Telemetry.http_response_attrs(context)
+            )
+          end
+        end
       end
     end
   end

data/lib/seahorse/client/networking_error.rb

@@ -39,7 +39,7 @@ module Seahorse
 
     end
 
-    # Rasied when trying to use an closed connection
+    # Raised when trying to use an closed connection
     class Http2ConnectionClosedError < StandardError; end
   end
 end

data/lib/seahorse/client/plugin.rb

@@ -111,7 +111,15 @@ module Seahorse
 
         def initialize(name, options = {})
           @name = name
+          # prevent unstable object shapes by ensuring
+          # order and presence of instance variables
+          @default = nil
+          @default_block = nil
+          @required = nil
+          @doc_type = nil
           @doc_default = nil
+          @docstring = nil
+          @rbs_type = nil
           options.each_pair do |opt_name, opt_value|
             self.send("#{opt_name}=", opt_value)
           end

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

@@ -17,7 +17,6 @@ be a URI formatted like:
     'http://example.com'
     'https://example.com'
     'http://example.com:123'
-
           DOCS
 
         def add_handlers(handlers, config)

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

@@ -53,10 +53,10 @@ When `true`, SSL peer certificates are verified when establishing a connection.
 When `true`, HTTP2 debug output will be sent to the `:logger`.
         DOCS
 
-        option(:enable_alpn, default: false, doc_type: 'Boolean', docstring: <<-DOCS)
-Set to `true` to enable ALPN in HTTP2 over TLS. Requires Openssl version >= 1.0.2.
-Defaults to false. Note: not all service HTTP2 operations supports ALPN on server
-side, please refer to service documentation.
+        option(:enable_alpn, default: true, doc_type: 'Boolean', docstring: <<-DOCS)
+Set to `false` to disable ALPN in HTTP2 over TLS. ALPN requires Openssl version >= 1.0.2.
+Note: RFC7540 requires HTTP2 to use ALPN over TLS but some
+services may not fully support ALPN and require setting this to `false`.
         DOCS
 
         option(:logger)

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

@@ -7,37 +7,78 @@ module Seahorse
     module Plugins
       class NetHttp < Plugin
 
-        option(:http_proxy, default: nil, doc_type: String, docstring: '')
-
-        option(:http_open_timeout, default: 15, doc_type: Integer, docstring: '') do |cfg|
+        option(:http_proxy, default: nil, doc_type: "URI::HTTP,String", docstring: <<-DOCS)
+A proxy to send requests through.  Formatted like 'http://proxy.com:123'.
+        DOCS
+
+        option(:http_open_timeout, default: 15, doc_type: Float, docstring: <<-DOCS) do |cfg|
+The default number of seconds to wait for response data.
+This value can safely be set per-request on the session.
+        DOCS
           resolve_http_open_timeout(cfg)
         end
 
-        option(:http_read_timeout, default: 60, doc_type: Integer, docstring: '') do |cfg|
+        option(:http_read_timeout, default: 60, doc_type: Float, docstring: <<-DOCS) do |cfg|
+The default number of seconds to wait for response data.
+This value can safely be set per-request on the session.
+        DOCS
           resolve_http_read_timeout(cfg)
         end
 
-        option(:http_idle_timeout, default: 5, doc_type: Integer, docstring: '')
-
-        option(:http_continue_timeout, default: 1, doc_type: Integer, docstring: '')
-
-        option(:http_wire_trace, default: false, doc_type: 'Boolean', docstring: '')
-
-        option(:ssl_verify_peer, default: true, doc_type: 'Boolean', docstring: '')
-
-        option(:ssl_ca_bundle, doc_type: String, docstring: '') do |cfg|
+        option(:http_idle_timeout, default: 5, doc_type: Float, docstring: <<-DOCS)
+The number of seconds a connection is allowed to sit idle before it 
+is considered stale.  Stale connections are closed and removed from the 
+pool before making a request.
+        DOCS
+
+        option(:http_continue_timeout, default: 1, doc_type: Float, docstring: <<-DOCS)
+The number of seconds to wait for a 100-continue response before sending the 
+request body.  This option has no effect unless the request has "Expect"
+header set to "100-continue".  Defaults to `nil` which  disables this 
+behaviour.  This value can safely be set per request on the session.
+          DOCS
+
+        option(:http_wire_trace, default: false, doc_type: 'Boolean', docstring: <<-DOCS)
+When `true`,  HTTP debug output will be sent to the `:logger`.
+        DOCS
+
+        option(:ssl_verify_peer, default: true, doc_type: 'Boolean', docstring: <<-DOCS)
+When `true`, SSL peer certificates are verified when establishing a connection.
+        DOCS
+
+        option(:ssl_ca_bundle, doc_type: String, docstring: <<-DOCS) do |cfg|
+Full path to the SSL certificate authority bundle file that should be used when 
+verifying peer certificates.  If you do not pass `:ssl_ca_bundle` or 
+`:ssl_ca_directory` the the system default will be used if available.       
+        DOCS
           ENV['AWS_CA_BUNDLE'] ||
             Aws.shared_config.ca_bundle(profile: cfg.profile) if cfg.respond_to?(:profile)
         end
 
-        option(:ssl_ca_directory, default: nil, doc_type: String, docstring: '')
+        option(:ssl_ca_directory, default: nil, doc_type: String, docstring: <<-DOCS)
+Full path of the directory that contains the unbundled SSL certificate 
+authority files for verifying peer certificates.  If you do 
+not pass `:ssl_ca_bundle` or `:ssl_ca_directory` the the system 
+default will be used if available.
+        DOCS
 
-        option(:ssl_ca_store, default: nil, doc_type: String, docstring: '')
+        option(:ssl_ca_store, default: nil, doc_type: String, docstring: <<-DOCS)
+Sets the X509::Store to verify peer certificate.
+        DOCS
 
-        option(:ssl_timeout, default: nil, doc_type: Float, docstring: '') do |cfg|
+        option(:ssl_timeout, default: nil, doc_type: Float, docstring: 'Sets the SSL timeout in seconds') do |cfg|
           resolve_ssl_timeout(cfg)
         end
 
+        option(:ssl_cert, default: nil, doc_type: OpenSSL::X509::Certificate, docstring: <<-DOCS)
+Sets a client certificate when creating http connections.
+        DOCS
+
+
+        option(:ssl_key, default: nil, doc_type: OpenSSL::PKey, docstring: <<-DOCS)
+Sets a client key when creating http connections.
+        DOCS
+
         option(:logger) # for backwards compat
 
         handler(Client::NetHttp::Handler, step: :send)

data/lib/seahorse/client/request_context.rb

@@ -5,15 +5,18 @@ require 'stringio'
 module Seahorse
   module Client
     class RequestContext
-
+      # @param [Hash] options
       # @option options [required,Symbol] :operation_name (nil)
       # @option options [required,Model::Operation] :operation (nil)
       # @option options [Model::Authorizer] :authorizer (nil)
+      # @option options [Client] :client (nil)
       # @option options [Hash] :params ({})
       # @option options [Configuration] :config (nil)
       # @option options [Http::Request] :http_request (Http::Request.new)
       # @option options [Http::Response] :http_response (Http::Response.new)
-      #   and #rewind.
+      # @option options [Integer] :retries (0)
+      # @option options [Aws::Telemetry::TracerBase] :tracer (Aws::Telemetry::NoOpTracer.new)
+      # @option options [Hash] :metadata ({})
       def initialize(options = {})
         @operation_name = options[:operation_name]
         @operation = options[:operation]
@@ -24,6 +27,7 @@ module Seahorse
         @http_request = options[:http_request] || Http::Request.new
         @http_response = options[:http_response] || Http::Response.new
         @retries = 0
+        @tracer = options[:tracer] || Aws::Telemetry::NoOpTracer.new
         @metadata = {}
       end
 
@@ -54,6 +58,9 @@ module Seahorse
       # @return [Integer]
       attr_accessor :retries
 
+      # @return [Tracer]
+      attr_accessor :tracer
+
       # @return [Hash]
       attr_reader :metadata
 

data/lib/seahorse/client/response.rb

@@ -75,6 +75,8 @@ module Seahorse
       # Necessary to define as a subclass of Delegator
       # @api private
       def __getobj__
+        return yield if block_given? && !defined?(@data)
+
         @data
       end
 

data/lib/seahorse/model/shapes.rb

@@ -75,7 +75,7 @@ module Seahorse
 
         # @return [String, nil]
         def location_name
-          @location_name || (shape && shape[:location_name])
+          @location_name || (shape && shape['locationName'])
         end
 
         def location_name= location_name
@@ -86,7 +86,7 @@ module Seahorse
         def [](key)
           if @metadata.key?(key.to_s)
             @metadata[key.to_s]
-          else
+          elsif @shape
             @shape[key.to_s]
           end
         end

data/lib/seahorse/util.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'cgi'
+require "cgi/escape"
+require "cgi/util" if RUBY_VERSION < "3.5"
 
 module Seahorse
   # @api private

data/sig/aws-sdk-core/async_client_stubs.rbs

@@ -0,0 +1,21 @@
+module Aws
+  module AsyncClientStubs
+    include ClientStubs
+
+    def send_events: () -> untyped
+
+    class StubsStream
+      def initialize: () -> void
+
+      attr_accessor send_events: untyped
+
+      attr_reader state: Symbol
+
+      def data: (untyped bytes, ?::Hash[untyped, untyped] options) -> untyped
+
+      def closed?: () -> bool
+
+      def close: () -> void
+    end
+  end
+end

data/sig/aws-sdk-core/telemetry/base.rbs

@@ -0,0 +1,46 @@
+module Aws
+  module Telemetry
+    class TelemetryProviderBase
+      def initialize: (?tracer_provider: TracerProviderBase, ?context_manager: ContextManagerBase) -> void
+      attr_reader tracer_provider: TracerProviderBase
+
+      attr_reader context_manager: ContextManagerBase
+    end
+
+    class TracerProviderBase
+      def tracer: (?String name) -> TracerBase
+    end
+
+    class TracerBase
+      def start_span: (String name, ?untyped with_parent, ?Hash[String, untyped] attributes, ?SpanKind kind) -> SpanBase
+
+      def in_span: (String name, ?Hash[String, untyped] attributes, ?SpanKind kind) -> SpanBase
+
+      def current_span: () -> SpanBase
+    end
+
+    class SpanBase
+      def set_attribute: (String key, untyped value) -> self
+      alias []= set_attribute
+
+      def add_attributes: (Hash[String, untyped] attributes) -> self
+
+      def add_event: (String name, ?Hash[String, untyped] attributes) -> self
+
+      def status=: (SpanStatus status) -> void
+
+      def finish: (?Time end_timestamp) -> self
+
+      def record_exception: (untyped exception, ?Hash[String, untyped] attributes) -> void
+    end
+
+    class ContextManagerBase
+      def current: () -> untyped
+
+      def attach: (untyped context) -> untyped
+
+      def detach: (untyped token) -> bool
+    end
+
+  end
+end

data/sig/aws-sdk-core/telemetry/otel.rbs

@@ -0,0 +1,22 @@
+module Aws
+  module Telemetry
+    class OTelProvider < TelemetryProviderBase
+      def initialize: () -> void
+    end
+
+    class OTelTracerProvider < TracerProviderBase
+      def initialize: () -> void
+    end
+
+    class OTelTracer < TracerBase
+      def initialize: (untyped tracer) -> void
+    end
+
+    class OTelSpan < SpanBase
+      def initialize: (untyped span) -> void
+    end
+
+    class OTelContextManager < ContextManagerBase
+    end
+  end
+end

data/sig/aws-sdk-core/telemetry/span_kind.rbs

@@ -0,0 +1,15 @@
+module Aws
+  module Telemetry
+    module SpanKind
+      INTERNAL: :internal
+
+      SERVER: :server
+
+      CLIENT: :client
+
+      CONSUMER: :consumer
+
+      PRODUCER: :producer
+    end
+  end
+end

data/sig/aws-sdk-core/telemetry/span_status.rbs

@@ -0,0 +1,24 @@
+module Aws
+  module Telemetry
+    class SpanStatus
+
+      def self.unset: (?::String description) -> SpanStatus
+
+      def self.ok: (?::String description) -> SpanStatus
+
+      def self.error: (?::String description) -> SpanStatus
+
+      def initialize: (Integer code, ?description: ::String) -> void
+
+      attr_reader code: Integer
+
+      attr_reader description: String
+
+      OK: 0
+
+      UNSET: 1
+
+      ERROR: 2
+    end
+  end
+end

data/sig/seahorse/client/async_base.rbs

@@ -0,0 +1,18 @@
+module Seahorse
+  module Client
+    class AsyncBase < Base
+
+      def self.new: (?untyped options) -> instance
+
+      attr_reader connection: untyped
+
+      def operation_names: () -> Array[Symbol]
+
+      def close_connection: () -> Symbol
+
+      def new_connection: () -> untyped
+
+      def connection_errors: () -> Array[untyped]
+    end
+  end
+end