aws-sdk-core 2.4.0 → 3.53.0

data/lib/aws-sdk-core/stubbing/protocols/api_gateway.rb

@@ -0,0 +1,8 @@
+module Aws
+  module Stubbing
+    module Protocols
+      class ApiGateway < RestJson
+      end
+    end
+  end
+end

data/lib/aws-sdk-core/stubbing/protocols/ec2.rb

@@ -6,7 +6,7 @@ module Aws
         def stub_data(api, operation, data)
           resp = Seahorse::Client::Http::Response.new
           resp.status_code = 200
-          resp.body = build_body(api, operation, data)
+          resp.body = build_body(api, operation, data) if operation.output
           resp.headers['Content-Length'] = resp.body.size
           resp.headers['Content-Type'] = 'text/xml;charset=UTF-8'
           resp.headers['Server'] = 'AmazonEC2'

data/lib/aws-sdk-core/stubbing/protocols/rest.rb

@@ -1,3 +1,5 @@
+require 'aws-eventstream'
+
 module Aws
   module Stubbing
     module Protocols
@@ -40,7 +42,9 @@ module Aws
 
         def build_body(api, operation, data)
           rules = operation.output
-          if streaming?(rules)
+          if head_operation(operation)
+            ""
+          elsif streaming?(rules)
             data[rules[:payload]]
           elsif rules[:payload]
             body_for(api, operation, rules[:payload_member], data[rules[:payload]])
@@ -68,6 +72,100 @@ module Aws
           end
         end
 
+        def head_operation(operation)
+          operation.http_method == "HEAD"
+        end
+
+        def eventstream?(rules)
+          rules.eventstream
+        end
+
+        def encode_eventstream_response(rules, data, builder)
+          data.inject('') do |stream, event_data|
+            # construct message headers and payload
+            opts = {headers: {}}
+            case event_data.delete(:message_type)
+            when 'event'
+              encode_event(opts, rules, event_data, builder)
+            when 'error'
+              # errors are unmodeled
+              encode_error(opts, event_data)
+            when 'exception'
+              # Pending
+              raise 'Stubbing :exception event is not supported'
+            end
+            stream << Aws::EventStream::Encoder.new.encode(
+              Aws::EventStream::Message.new(opts))
+            stream
+          end
+        end
+
+        def encode_error(opts, event_data)
+          opts[:headers][':error-message'] = Aws::EventStream::HeaderValue.new(
+            value: event_data[:error_message],
+            type: 'string'
+          )
+          opts[:headers][':error-code'] = Aws::EventStream::HeaderValue.new(
+            value: event_data[:error_code],
+            type: 'string'
+          )
+          opts[:headers][':message-type'] = Aws::EventStream::HeaderValue.new(
+            value: 'error',
+            type: 'string'
+          )
+          opts
+        end
+
+        def encode_event(opts, rules, event_data, builder)
+          event_ref = rules.shape.member(event_data.delete(:event_type))
+          explicit_payload = false
+          implicit_payload_members = {}
+          event_ref.shape.members.each do |name, ref|
+            if ref.eventpayload
+              explicit_payload = true
+            else
+              implicit_payload_members[name] = ref
+            end
+          end
+
+          if !explicit_payload && !implicit_payload_members.empty?
+            unless implicit_payload_members.size > 1
+              m_name, _ = implicit_payload_members.first
+              value = {}
+              value[m_name] = event_data[m_name]
+              opts[:payload] = StringIO.new(builder.new(event_ref).serialize(value))
+            end
+          end
+
+          event_data.each do |k, v|
+            member_ref = event_ref.shape.member(k)
+            if member_ref.eventheader
+              opts[:headers][member_ref.location_name] = Aws::EventStream::HeaderValue.new(
+                value: v,
+                type: member_ref.eventheader_type
+              )
+            elsif member_ref.eventpayload
+              case member_ref.eventpayload_type
+              when 'string'
+                opts[:payload] = StringIO.new(v)
+              when 'blob'
+                opts[:payload] = v
+              when 'structure'
+                opts[:payload] = StringIO.new(builder.new(member_ref).serialize(v))
+              end
+            end
+          end
+          opts[:headers][':event-type'] = Aws::EventStream::HeaderValue.new(
+            value: event_ref.location_name,
+            type: 'string'
+          )
+          opts[:headers][':message-type'] = Aws::EventStream::HeaderValue.new(
+            value: 'event',
+            type: 'string'
+          )
+          opts
+        end
+
       end
     end
   end

data/lib/aws-sdk-core/stubbing/protocols/rest_json.rb

@@ -4,7 +4,11 @@ module Aws
       class RestJson < Rest
 
         def body_for(_, _, rules, data)
-          Aws::Json::Builder.new(rules).serialize(data)
+          if eventstream?(rules)
+            encode_eventstream_response(rules, data, Aws::Json::Builder)
+          else
+            Aws::Json::Builder.new(rules).serialize(data)
+          end
         end
 
         def stub_error(error_code)

data/lib/aws-sdk-core/stubbing/protocols/rest_xml.rb

@@ -6,11 +6,15 @@ module Aws
         include Seahorse::Model::Shapes
 
         def body_for(api, operation, rules, data)
-          xml = []
-          rules.location_name = operation.name + 'Result'
-          rules['xmlNamespace'] = { 'uri' => api.metadata['xmlNamespace'] }
-          Xml::Builder.new(rules, target:xml).to_xml(data)
-          xml.join
+          if eventstream?(rules)
+            encode_eventstream_response(rules, data, Xml::Builder)
+          else
+            xml = []
+            rules.location_name = operation.name + 'Result'
+            rules['xmlNamespace'] = { 'uri' => api.metadata['xmlNamespace'] }
+            Xml::Builder.new(rules, target:xml).to_xml(data)
+            xml.join
+          end
         end
 
         def stub_error(error_code)

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

@@ -1,4 +1,5 @@
 module Aws
+  # @api private
   module Stubbing
     class StubData
 
@@ -19,14 +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')
+            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/util.rb

@@ -0,0 +1,66 @@
+require 'cgi'
+
+module Aws
+  # @api private
+  module Util
+    class << self
+
+      def deep_merge(left, right)
+        case left
+        when Hash then left.merge(right) { |key, v1, v2| deep_merge(v1, v2) }
+        when Array then right + left
+        else right
+        end
+      end
+
+      def copy_hash(hash)
+        if Hash === hash
+          deep_copy(hash)
+        else
+          raise ArgumentError, "expected hash, got `#{hash.class}`"
+        end
+      end
+
+      def deep_copy(obj)
+        case obj
+        when nil then nil
+        when true then true
+        when false then false
+        when Hash
+          obj.inject({}) do |h, (k,v)|
+            h[k] = deep_copy(v)
+            h
+          end
+        when Array
+          obj.map { |v| deep_copy(v) }
+        else
+          if obj.respond_to?(:dup)
+            obj.dup
+          elsif obj.respond_to?(:clone)
+            obj.clone
+          else
+            obj
+          end
+        end
+      end
+
+      def monotonic_milliseconds
+        if defined?(Process::CLOCK_MONOTONIC)
+          Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond)
+        else
+          DateTime.now.strftime('%Q').to_i
+        end
+      end
+
+      def str_2_bool(str)
+        case str.to_s
+        when "true" then true
+        when "false" then false
+        else
+          nil
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,3 @@
+require_relative 'waiters/errors'
+require_relative 'waiters/poller'
+require_relative 'waiters/waiter'

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

@@ -9,10 +9,12 @@ module Aws
       # @api private
       RAISE_HANDLER = Seahorse::Client::Plugins::RaiseResponseErrors::Handler
 
+      # @option options [required, String] :operation_name
+      # @option options [required, Array<Hash>] :acceptors
       # @api private
       def initialize(options = {})
-        @operation_name = underscore(options['operation']).to_sym
-        @acceptors = options['acceptors'] || []
+        @operation_name = options.fetch(:operation_name)
+        @acceptors = options.fetch(:acceptors)
       end
 
       # @return [Symbol]
@@ -95,7 +97,7 @@ module Aws
       end
 
       def path(acceptor)
-        acceptor['argument'].gsub(/\w+/) { |s| Seahorse::Util.underscore(s) }
+        acceptor['argument']
       end
 
       def non_empty_array(acceptor, response, &block)
@@ -107,10 +109,6 @@ module Aws
         end
       end
 
-      def underscore(str)
-        Seahorse::Util.underscore(str)
-      end
-
     end
   end
 end

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

@@ -1,5 +1,6 @@
 module Aws
   module Waiters
+    # @api private
     class Waiter
 
       # @api private

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

@@ -0,0 +1,9 @@
+require_relative 'xml/builder'
+require_relative 'xml/default_list'
+require_relative 'xml/default_map'
+require_relative 'xml/doc_builder'
+require_relative 'xml/error_handler'
+require_relative 'xml/parser'
+require_relative 'xml/parser/stack'
+require_relative 'xml/parser/frame'
+require_relative 'xml/parser/parsing_error'

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

@@ -46,7 +46,7 @@ module Aws
       end
 
       def list(name, ref, values)
-        if ref['flattened']
+        if ref.shape.flattened
           values.each do |value|
             member(ref.shape.member.location_name || name, ref.shape.member, value)
           end
@@ -63,7 +63,7 @@ module Aws
       def map(name, ref, hash)
         key_ref = ref.shape.key
         value_ref = ref.shape.value
-        if ref['flattened']
+        if ref.shape.flattened
           hash.each do |key, value|
             node(name, ref) do
               member(key_ref.location_name || 'key', key_ref, key)
@@ -87,7 +87,7 @@ module Aws
         when StructureShape then structure(name, ref, value)
         when ListShape      then list(name, ref, value)
         when MapShape       then map(name, ref, value)
-        when TimestampShape then node(name, ref, timestamp(value))
+        when TimestampShape then node(name, ref, timestamp(ref, value))
         when BlobShape      then node(name, ref, blob(value))
         else
           node(name, ref, value.to_s)
@@ -99,8 +99,14 @@ module Aws
         Base64.strict_encode64(value)
       end
 
-      def timestamp(value)
-        value.utc.iso8601
+      def timestamp(ref, value)
+        case ref['timestampFormat'] || ref.shape['timestampFormat']
+        when 'unixTimestamp' then value.to_i
+        when 'rfc822' then value.utc.httpdate
+        else
+          # xml defaults to iso8601
+          value.utc.iso8601
+        end
       end
 
       # The `args` list may contain:

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

@@ -18,21 +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
-        svc = context.client.class.name.split('::')[1]
-        errors_module = Aws.const_get(svc).const_get(:Errors)
-        errors_module.error_class(code).new(context, message)
+        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)
+        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/xml/parser.rb

@@ -1,19 +1,9 @@
 module Aws
+  # @api private
   module Xml
-
     # A SAX-style XML parser that uses a shape context to handle types.
     class Parser
 
-      autoload :Stack, 'aws-sdk-core/xml/parser/stack'
-      autoload :Frame, 'aws-sdk-core/xml/parser/frame'
-      autoload :ParsingError, 'aws-sdk-core/xml/parser/parsing_error'
-
-      autoload :LibxmlEngine, 'aws-sdk-core/xml/parser/engines/libxml'
-      autoload :NokogiriEngine, 'aws-sdk-core/xml/parser/engines/nokogiri'
-      autoload :OgaEngine, 'aws-sdk-core/xml/parser/engines/oga'
-      autoload :OxEngine, 'aws-sdk-core/xml/parser/engines/ox'
-      autoload :RexmlEngine, 'aws-sdk-core/xml/parser/engines/rexml'
-
       # @param [Seahorse::Model::ShapeRef] rules
       def initialize(rules, options = {})
         @rules = rules