aws-sdk-core 3.191.1 → 3.228.0

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'cgi'
+require "cgi/escape"
+require "cgi/util" if RUBY_VERSION < "3.5"
 
 module Aws
   # @api private
@@ -67,6 +68,45 @@ module Aws
         end
       end
 
+      # @param [Number] input
+      # @return [Number, String] The serialized number
+      def serialize_number(input)
+        if input == ::Float::INFINITY then 'Infinity'
+        elsif input == -::Float::INFINITY then '-Infinity'
+        elsif input&.nan? then 'NaN'
+        else
+          input
+        end
+      end
+
+      # @param [String] str
+      # @return [Number] The input as a number
+      def deserialize_number(str)
+        case str
+        when 'Infinity' then ::Float::INFINITY
+        when '-Infinity' then -::Float::INFINITY
+        when 'NaN' then ::Float::NAN
+        when nil then nil
+        else str.to_f
+        end
+      end
+
+      # @param [String] value
+      # @return [Time]
+      def deserialize_time(value)
+        case value
+        when nil then nil
+        when /^[\d.]+$/ then Time.at(value.to_f).utc
+        else
+          begin
+            fractional_time = Time.parse(value).to_f
+            Time.at(fractional_time).utc
+          rescue ArgumentError
+            raise "unhandled timestamp format `#{value}'"
+          end
+        end
+      end
+
     end
   end
 end

data/lib/aws-sdk-core/waiters/poller.rb

@@ -29,7 +29,7 @@ module Aws
       # * `:retry`   - The waiter may be retried.
       # * `:error`   - The waiter encountered an un-expected error.
       #
-      # @example A trival (bad) example of a waiter that polls indefinetly.
+      # @example A trivial (bad) example of a waiter that polls indefinetly.
       #
       #   loop do
       #
@@ -62,7 +62,7 @@ module Aws
       def send_request(options)
         req = options[:client].build_request(@operation_name, options[:params])
         req.handlers.remove(RAISE_HANDLER)
-        Aws::Plugins::UserAgent.feature('waiter') do
+        Aws::Plugins::UserAgent.metric('WAITER') do
           req.send_request
         end
       end
@@ -96,8 +96,13 @@ module Aws
       end
 
       def matches_error?(acceptor, response)
-        Aws::Errors::ServiceError === response.error &&
-        response.error.code == acceptor['expected'].delete('.')
+        case acceptor['expected']
+        when 'false' then response.error.nil?
+        when 'true' then !response.error.nil?
+        else
+          response.error.is_a?(Aws::Errors::ServiceError) &&
+            response.error.code == acceptor['expected'].delete('.')
+        end
       end
 
       def path(acceptor)
@@ -107,7 +112,7 @@ module Aws
       def non_empty_array(acceptor, response, &block)
         if response.data
           values = JMESPath.search(path(acceptor), response.data)
-          Array === values && values.count > 0 ? yield(values) : false
+          values.is_a?(Array) && values.count > 0 ? yield(values) : false
         else
           false
         end

data/lib/aws-sdk-core/xml/builder.rb

@@ -10,6 +10,8 @@ module Aws
 
       def initialize(rules, options = {})
         @rules = rules
+        @location_name =
+          options[:location_name].nil? ? @rules.location_name : options[:location_name]
         @xml = options[:target] || []
         indent = options[:indent] || ''
         pad = options[:pad] || ''
@@ -17,7 +19,7 @@ module Aws
       end
 
       def to_xml(params)
-        structure(@rules.location_name, @rules, params)
+        structure(@location_name, @rules, params)
         @xml.join
       end
       alias serialize to_xml
@@ -50,7 +52,7 @@ module Aws
       def list(name, ref, values)
         if ref[:flattened] || ref.shape.flattened
           values.each do |value|
-            member(ref.shape.member.location_name || name, ref.shape.member, value)
+            member(name, ref.shape.member, value)
           end
         else
           node(name, ref) do
@@ -65,7 +67,7 @@ module Aws
       def map(name, ref, hash)
         key_ref = ref.shape.key
         value_ref = ref.shape.value
-        if ref.shape.flattened
+        if ref[:flattened] || ref.shape.flattened
           hash.each do |key, value|
             node(name, ref) do
               member(key_ref.location_name || 'key', key_ref, key)
@@ -75,7 +77,8 @@ module Aws
         else
           node(name, ref) do
             hash.each do |key, value|
-              node('entry', ref)  do
+              # Pass in a new ShapeRef to create an entry node
+              node('entry', ShapeRef.new) do
                 member(key_ref.location_name || 'key', key_ref, key)
                 member(value_ref.location_name || 'value', value_ref, value)
               end
@@ -129,11 +132,16 @@ module Aws
       end
 
       def shape_attrs(ref)
-        if xmlns = ref['xmlNamespace']
-          if prefix = xmlns['prefix']
-            { 'xmlns:' + prefix => xmlns['uri'] }
-          else
-            { 'xmlns' => xmlns['uri'] }
+        if (xmlns = ref['xmlNamespace'])
+          case xmlns
+          when String
+            { 'xmlns' => xmlns }
+          when Hash
+            if (prefix = xmlns['prefix'])
+              { "xmlns:#{prefix}" => xmlns['uri'] }
+            else
+              { 'xmlns' => xmlns['uri'] }
+            end
           end
         else
           {}

data/lib/aws-sdk-core/xml/error_handler.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
-require 'cgi'
+require "cgi/escape"
+require "cgi/util" if RUBY_VERSION < "3.5"
 
 module Aws
   module Xml
-    class ErrorHandler < Seahorse::Client::Handler
+    # @api private
+    class ErrorHandler < Aws::ErrorHandler
 
       def call(context)
         @handler.call(context).on(300..599) do |response|
@@ -15,42 +17,29 @@ module Aws
 
       private
 
-      def error(context)
-        body = context.http_response.body_contents
-        if body.empty?
-          code = http_status_error_code(context)
-          message = ''
-          data = EmptyStructure.new
-        else
-          code, message, data = extract_error(body, context)
-        end
-        context[:request_id] = request_id(body)
-        errors_module = context.client.class.errors_module
-        error_class = errors_module.error_class(code).new(context, message, data)
-        error_class
-      end
-
       def extract_error(body, context)
+        context[:request_id] = request_id(body)
         code = error_code(body, context)
         [
           code,
           error_message(body),
-          error_data(context, code)
+          error_data(context, body, code)
         ]
       end
 
-      def error_data(context, code)
+      def error_data(context, body, code)
         data = EmptyStructure.new
-        if error_rules = context.operation.errors
+        if (error_rules = context.operation.errors)
           error_rules.each do |rule|
-            # for modeled shape with error trait
-            # match `code` in the error trait before
-            # match modeled shape name
+            # query protocol may have custom error code
+            # reference: https://smithy.io/2.0/aws/protocols/aws-query-protocol.html#error-code-resolution
             error_shape_code = rule.shape['error']['code'] if rule.shape['error']
             match = (code == error_shape_code || code == rule.shape.name)
-            if match && rule.shape.members.any?
-              data = Parser.new(rule).parse(context.http_response.body_contents)
-            end
+            next unless match && rule.shape.members.any?
+
+            data = parse_error_data(rule, body)
+            # supporting HTTP bindings
+            apply_error_headers(rule, context, data)
           end
         end
         data
@@ -58,29 +47,32 @@ module Aws
         EmptyStructure.new
       end
 
+      def parse_error_data(rule, body)
+        # errors may nested under <Errors><Error>structure_data</Error></Errors>
+        # Or may be flat and under <Error>structure_data</Error>
+        body = body.tr("\n", '')
+        if (matches = body.match(/<Error>(.+?)<\/Error>/))
+          Parser.new(rule).parse("<#{rule.shape.name}>#{matches[1]}</#{rule.shape.name}>")
+        else
+          EmptyStructure.new
+        end
+      end
+
+      def apply_error_headers(rule, context, data)
+        headers = Aws::Rest::Response::Headers.new(rule)
+        headers.apply(context.http_response, data)
+      end
+
       def error_code(body, context)
-        if matches = body.match(/<Code>(.+?)<\/Code>/)
+        if (matches = body.match(/<Code>(.+?)<\/Code>/))
           remove_prefix(unescape(matches[1]), context)
         else
           http_status_error_code(context)
         end
       end
 
-      def http_status_error_code(context)
-        status_code = context.http_response.status_code
-        {
-          302 => 'MovedTemporarily',
-          304 => 'NotModified',
-          400 => 'BadRequest',
-          403 => 'Forbidden',
-          404 => 'NotFound',
-          412 => 'PreconditionFailed',
-          413 => 'RequestEntityTooLarge',
-        }[status_code] || "Http#{status_code}Error"
-      end
-
       def remove_prefix(error_code, context)
-        if prefix = context.config.api.metadata['errorPrefix']
+        if (prefix = context.config.api.metadata['errorPrefix'])
           error_code.sub(/^#{prefix}/, '')
         else
           error_code
@@ -88,7 +80,7 @@ module Aws
       end
 
       def error_message(body)
-        if matches = body.match(/<Message>(.+?)<\/Message>/m)
+        if (matches = body.match(/<Message>(.+?)<\/Message>/m))
           unescape(matches[1])
         else
           ''
@@ -96,7 +88,7 @@ module Aws
       end
 
       def request_id(body)
-        if matches = body.match(/<RequestId>(.+?)<\/RequestId>/m)
+        if (matches = body.match(/<RequestId>(.+?)<\/RequestId>/m))
           matches[1]
         end
       end

data/lib/aws-sdk-core/xml/parser/frame.rb

@@ -138,11 +138,7 @@ module Aws
         end
 
         def xml_name(ref)
-          if flattened_list?(ref)
-            ref.shape.member.location_name || ref.location_name
-          else
-            ref.location_name
-          end
+          ref.location_name
         end
 
         def flattened_list?(ref)
@@ -266,7 +262,7 @@ module Aws
 
       class BlobFrame < Frame
         def result
-          @text.empty? ? nil : Base64.decode64(@text.join)
+          @text.empty? ? '' : Base64.decode64(@text.join)
         end
       end
 
@@ -278,7 +274,7 @@ module Aws
 
       class FloatFrame < Frame
         def result
-          @text.empty? ? nil : @text.join.to_f
+          @text.empty? ? nil : Aws::Util.deserialize_number(@text.join)
         end
       end
 
@@ -296,19 +292,7 @@ module Aws
 
       class TimestampFrame < Frame
         def result
-          @text.empty? ? nil : parse(@text.join)
-        end
-        def parse(value)
-          case value
-          when nil then nil
-          when /^\d+$/ then Time.at(value.to_i)
-          else
-            begin
-              Time.parse(value).utc
-            rescue ArgumentError
-              raise "unhandled timestamp format `#{value}'"
-            end
-          end
+          @text.empty? ? nil : Aws::Util.deserialize_time(@text.join)
         end
       end
 

data/lib/aws-sdk-core/xml/parser/stack.rb

@@ -24,6 +24,8 @@ module Aws
           if name.to_s == 'encoding' && value.to_s == 'base64'
             @frame = BlobFrame.new(name, @frame.parent, @frame.ref)
           else
+            # don't try to parse shapes from xml namespace
+            return if name.to_s == 'xmlns'
             start_element(name)
             text(value)
             end_element(name)

data/lib/aws-sdk-core/xml/parser.rb

@@ -5,7 +5,6 @@ module Aws
   module Xml
     # A SAX-style XML parser that uses a shape context to handle types.
     class Parser
-
       # @param [Seahorse::Model::ShapeRef] rules
       def initialize(rules, options = {})
         @rules = rules
@@ -47,8 +46,7 @@ module Aws
         #   * :libxml
         #   * :nokogiri
         #   * :rexml
-        #
-        def engine= engine
+        def engine=(engine)
           @engine = Class === engine ? engine : load_engine(engine)
         end
 
@@ -60,7 +58,6 @@ module Aws
         #   * {LibxmlEngine}
         #   * {NokogiriEngine}
         #   * {RexmlEngine}
-        #
         def engine
           set_default_engine unless @engine
           @engine
@@ -80,7 +77,7 @@ module Aws
         private
 
         def load_engine(name)
-          require "aws-sdk-core/xml/parser/engines/#{name}"
+          require "aws-sdk-core/xml/parser/#{name}_engine"
           const_name = name[0].upcase + name[1..-1] + 'Engine'
           const_get(const_name)
         end
@@ -94,7 +91,6 @@ module Aws
       end
 
       set_default_engine
-
     end
   end
 end

data/lib/aws-sdk-core.rb

@@ -3,120 +3,80 @@
 require 'aws-partitions'
 require 'seahorse'
 require 'jmespath'
+require 'aws-sigv4'
 
 require_relative 'aws-sdk-core/deprecations'
-
-# credential providers
-
-require_relative 'aws-sdk-core/credential_provider'
-require_relative 'aws-sdk-core/refreshing_credentials'
-require_relative 'aws-sdk-core/assume_role_credentials'
-require_relative 'aws-sdk-core/assume_role_web_identity_credentials'
-require_relative 'aws-sdk-core/credentials'
-require_relative 'aws-sdk-core/credential_provider_chain'
-require_relative 'aws-sdk-core/ecs_credentials'
-require_relative 'aws-sdk-core/instance_profile_credentials'
-require_relative 'aws-sdk-core/shared_credentials'
-require_relative 'aws-sdk-core/process_credentials'
-require_relative 'aws-sdk-core/sso_credentials'
-
-# tokens and token providers
-require_relative 'aws-sdk-core/token'
-require_relative 'aws-sdk-core/token_provider'
-require_relative 'aws-sdk-core/static_token_provider'
-require_relative 'aws-sdk-core/refreshing_token'
-require_relative 'aws-sdk-core/sso_token_provider'
-require_relative 'aws-sdk-core/token_provider_chain'
-require_relative 'aws-sdk-core/plugins/bearer_authorization'
-
-# client modules
-
-require_relative 'aws-sdk-core/client_stubs'
-require_relative 'aws-sdk-core/async_client_stubs'
-require_relative 'aws-sdk-core/eager_loader'
-require_relative 'aws-sdk-core/errors'
-require_relative 'aws-sdk-core/pageable_response'
-require_relative 'aws-sdk-core/pager'
-require_relative 'aws-sdk-core/param_converter'
-require_relative 'aws-sdk-core/param_validator'
-require_relative 'aws-sdk-core/shared_config'
-require_relative 'aws-sdk-core/structure'
-require_relative 'aws-sdk-core/type_builder'
-require_relative 'aws-sdk-core/util'
-
-# resource classes
-
-require_relative 'aws-sdk-core/resources/collection'
-
-# logging
-
-require_relative 'aws-sdk-core/log/formatter'
-require_relative 'aws-sdk-core/log/param_filter'
-require_relative 'aws-sdk-core/log/param_formatter'
-
-# stubbing
-
-require_relative 'aws-sdk-core/stubbing/empty_stub'
-require_relative 'aws-sdk-core/stubbing/data_applicator'
-require_relative 'aws-sdk-core/stubbing/stub_data'
-require_relative 'aws-sdk-core/stubbing/xml_error'
-
-# stubbing protocols
-
-require_relative 'aws-sdk-core/stubbing/protocols/ec2'
-require_relative 'aws-sdk-core/stubbing/protocols/json'
-require_relative 'aws-sdk-core/stubbing/protocols/query'
-require_relative 'aws-sdk-core/stubbing/protocols/rest'
-require_relative 'aws-sdk-core/stubbing/protocols/rest_json'
-require_relative 'aws-sdk-core/stubbing/protocols/rest_xml'
-require_relative 'aws-sdk-core/stubbing/protocols/api_gateway'
-
-# protocols
-
-require_relative 'aws-sdk-core/rest'
-require_relative 'aws-sdk-core/xml'
-require_relative 'aws-sdk-core/json'
-
-# event stream
-
-require_relative 'aws-sdk-core/binary'
-require_relative 'aws-sdk-core/event_emitter'
-
-# endpoint discovery
-
-require_relative 'aws-sdk-core/endpoint_cache'
-
-# client metrics
-
-require_relative 'aws-sdk-core/client_side_monitoring/request_metrics'
-require_relative 'aws-sdk-core/client_side_monitoring/publisher'
-
-# utilities
-
-require_relative 'aws-sdk-core/arn'
-require_relative 'aws-sdk-core/arn_parser'
-require_relative 'aws-sdk-core/ec2_metadata'
-
-# dynamic endpoints
-require_relative 'aws-sdk-core/endpoints'
-require_relative 'aws-sdk-core/plugins/signature_v4'
-
 # defaults
 require_relative 'aws-defaults'
 
-# plugins
-# loaded through building STS or SSO ..
-
-# aws-sdk-sts is included to support Aws::AssumeRoleCredentials
-require_relative 'aws-sdk-sts'
-
-# aws-sdk-sso is included to support Aws::SSOCredentials
-require_relative 'aws-sdk-sso'
-require_relative 'aws-sdk-ssooidc'
-
 module Aws
 
-  CORE_GEM_VERSION = File.read(File.expand_path('../../VERSION', __FILE__)).strip
+  autoload :IniParser, 'aws-sdk-core/ini_parser'
+
+  # Credentials and credentials providers
+  autoload :Credentials, 'aws-sdk-core/credentials'
+  autoload :CredentialProvider, 'aws-sdk-core/credential_provider'
+  autoload :RefreshingCredentials, 'aws-sdk-core/refreshing_credentials'
+  autoload :AssumeRoleCredentials, 'aws-sdk-core/assume_role_credentials'
+  autoload :AssumeRoleWebIdentityCredentials, 'aws-sdk-core/assume_role_web_identity_credentials'
+  autoload :CredentialProviderChain, 'aws-sdk-core/credential_provider_chain'
+  autoload :ECSCredentials, 'aws-sdk-core/ecs_credentials'
+  autoload :InstanceProfileCredentials, 'aws-sdk-core/instance_profile_credentials'
+  autoload :SharedCredentials, 'aws-sdk-core/shared_credentials'
+  autoload :ProcessCredentials, 'aws-sdk-core/process_credentials'
+  autoload :SSOCredentials, 'aws-sdk-core/sso_credentials'
+
+
+  # tokens and token providers
+  autoload :Token, 'aws-sdk-core/token'
+  autoload :TokenProvider, 'aws-sdk-core/token_provider'
+  autoload :StaticTokenProvider, 'aws-sdk-core/static_token_provider'
+  autoload :RefreshingToken, 'aws-sdk-core/refreshing_token'
+  autoload :SSOTokenProvider, 'aws-sdk-core/sso_token_provider'
+  autoload :TokenProviderChain, 'aws-sdk-core/token_provider_chain'
+
+  # client modules
+  autoload :ClientStubs, 'aws-sdk-core/client_stubs'
+  autoload :AsyncClientStubs, 'aws-sdk-core/async_client_stubs'
+  autoload :EagerLoader, 'aws-sdk-core/eager_loader'
+  autoload :Errors, 'aws-sdk-core/errors'
+  autoload :PageableResponse, 'aws-sdk-core/pageable_response'
+  autoload :Pager, 'aws-sdk-core/pager'
+  autoload :ParamConverter, 'aws-sdk-core/param_converter'
+  autoload :ParamValidator, 'aws-sdk-core/param_validator'
+  autoload :SharedConfig, 'aws-sdk-core/shared_config'
+  autoload :Structure, 'aws-sdk-core/structure'
+  autoload :EmptyStructure, 'aws-sdk-core/structure'
+  autoload :TypeBuilder, 'aws-sdk-core/type_builder'
+  autoload :Util, 'aws-sdk-core/util'
+
+  # protocols
+  autoload :ErrorHandler, 'aws-sdk-core/error_handler'
+  autoload :Rest, 'aws-sdk-core/rest'
+  autoload :Xml, 'aws-sdk-core/xml'
+  autoload :Json, 'aws-sdk-core/json'
+  autoload :Query, 'aws-sdk-core/query'
+  autoload :RpcV2, 'aws-sdk-core/rpc_v2'
+
+  # event stream
+  autoload :Binary, 'aws-sdk-core/binary'
+  autoload :EventEmitter, 'aws-sdk-core/event_emitter'
+
+  # endpoint discovery
+  autoload :EndpointCache, 'aws-sdk-core/endpoint_cache'
+
+  autoload :Telemetry, 'aws-sdk-core/telemetry'
+
+  # utilities
+  autoload :ARN, 'aws-sdk-core/arn'
+  autoload :ARNParser, 'aws-sdk-core/arn_parser'
+  autoload :EC2Metadata, 'aws-sdk-core/ec2_metadata'
+  autoload :LRUCache, 'aws-sdk-core/lru_cache'
+
+  # dynamic endpoints
+  autoload :Endpoints, 'aws-sdk-core/endpoints'
+
+  CORE_GEM_VERSION = File.read(File.expand_path('../VERSION', __dir__)).strip
 
   @config = {}
 
@@ -200,3 +160,18 @@ module Aws
 
   end
 end
+
+# Setup additional autoloads/modules
+require_relative 'aws-sdk-core/client_side_monitoring'
+require_relative 'aws-sdk-core/log'
+require_relative 'aws-sdk-core/plugins'
+require_relative 'aws-sdk-core/resources'
+require_relative 'aws-sdk-core/stubbing'
+require_relative 'aws-sdk-core/waiters'
+
+# aws-sdk-sts is included to support Aws::AssumeRoleCredentials
+require_relative 'aws-sdk-sts'
+
+# aws-sdk-sso is included to support Aws::SSOCredentials
+require_relative 'aws-sdk-sso'
+require_relative 'aws-sdk-ssooidc'