aws-sdk-core 3.39.0 → 3.54.2

data/lib/aws-sdk-core/stubbing/stub_data.rb

@@ -20,17 +20,26 @@ module Aws
       def remove_paging_tokens(stub)
         if @pager
           @pager.instance_variable_get("@tokens").keys.each do |path|
-            key = path.split(/\b/)[0]
-            stub[key] = nil
+            if divide = (path[' || '] || path[' or '])
+              path = path.split(divide)[0]
+            end
+            parts = path.split(/\b/)
+            # if nested struct/expression, EmptyStub auto-pop "string"
+            # currently not support remove "string" for nested/expression
+            # as it requires reverse JMESPATH search
+            stub[parts[0]] = nil if parts.size == 1
           end
           if more_results = @pager.instance_variable_get('@more_results')
-            stub[more_results] = false
+            parts = more_results.split(/\b/)
+            # if nested struct/expression, EmptyStub auto-pop false value
+            # no further work needed
+            stub[parts[0]] = false if parts.size == 1
           end
         end
       end
 
       def apply_data(data, stub)
-        ParamValidator.new(@rules, validate_required:false).validate!(data)
+        ParamValidator.new(@rules, validate_required: false, input: false).validate!(data)
         DataApplicator.new(@rules).apply_data(data, stub)
       end
     end

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

@@ -50,7 +50,7 @@ module Aws
       #
       # @yieldparam [Integer] attempts The number of attempts made.
       def before_attempt(&block)
-        @before_attempt << Proc.new
+        @before_attempt << block if block_given?
       end
 
       # Register a callback that is invoked after an attempt but before
@@ -81,7 +81,7 @@ module Aws
       # @yieldparam [Seahorse::Client::Response] response The response from
       #   the previous polling attempts.
       def before_wait(&block)
-        @before_wait << Proc.new
+        @before_wait << block if block_given?
       end
 
       # @option options [Client] :client

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

@@ -18,20 +18,43 @@ module Aws
         if body.empty?
           code = http_status_error_code(context)
           message = ''
+          data = EmptyStructure.new
         else
-          code, message = extract_error(body, context)
+          code, message, data = extract_error(body, context)
         end
         errors_module = context.client.class.errors_module
-        errors_module.error_class(code).new(context, message)
+        error_class = errors_module.error_class(code).new(context, message, data)
+        error_class
       end
 
       def extract_error(body, context)
+        code = error_code(body, context)
         [
-          error_code(body, context),
+          code,
           error_message(body),
+          error_data(context, code)
         ]
       end
 
+      def error_data(context, code)
+        data = EmptyStructure.new
+        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
+            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
+          end
+        end
+        data
+      rescue Xml::Parser::ParsingError
+        EmptyStructure.new
+      end
+
       def error_code(body, context)
         if matches = body.match(/<Code>(.+?)<\/Code>/)
           remove_prefix(unescape(matches[1]), context)

data/lib/aws-sdk-core.rb

@@ -19,6 +19,7 @@ require_relative 'aws-sdk-core/process_credentials'
 # 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'