aws-sdk-core 3.0.0 → 3.129.1

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

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+require 'aws-eventstream'
+
 module Aws
   module Stubbing
     module Protocols
@@ -41,7 +45,7 @@ module Aws
         def build_body(api, operation, data)
           rules = operation.output
           if head_operation(operation)
-            ""
+            ''
           elsif streaming?(rules)
             data[rules[:payload]]
           elsif rules[:payload]
@@ -71,7 +75,121 @@ module Aws
         end
 
         def head_operation(operation)
-          operation.http_method == "HEAD"
+          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)
+            )].pack('a*a*')
+          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_unknown_event(opts, event_type, event_data)
+          # right now h2 events are only rest_json
+          opts[:payload] = StringIO.new(Aws::Json.dump(event_data))
+          opts[:headers][':event-type'] = Aws::EventStream::HeaderValue.new(
+            value: event_type.to_s,
+            type: 'string'
+          )
+          opts[:headers][':message-type'] = Aws::EventStream::HeaderValue.new(
+            value: 'event',
+            type: 'string'
+          )
+          opts
+        end
+
+        def encode_modeled_event(opts, rules, event_type, event_data, builder)
+          event_ref = rules.shape.member(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
+
+        def encode_event(opts, rules, event_data, builder)
+          event_type = event_data.delete(:event_type)
+
+          if rules.shape.member?(event_type)
+            encode_modeled_event(opts, rules, event_type, event_data, builder)
+          else
+            encode_unknown_event(opts, event_type, event_data)
+          end
         end
 
       end

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

@@ -1,10 +1,16 @@
+# frozen_string_literal: true
+
 module Aws
   module Stubbing
     module Protocols
       class RestJson < Rest
 
-        def body_for(_, _, rules, data)
-          Aws::Json::Builder.new(rules).serialize(data)
+        def body_for(_a, _b, rules, 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

@@ -1,16 +1,20 @@
+# frozen_string_literal: true
+
 module Aws
   module Stubbing
     module Protocols
       class RestXml < Rest
 
-        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,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   # @api private
   module Stubbing
@@ -20,17 +22,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] = nil
+            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/stubbing/xml_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module Stubbing
     class XmlError

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   # @api private
   class TypeBuilder

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cgi'
 
 module Aws
@@ -23,6 +25,9 @@ module Aws
 
       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)
@@ -31,9 +36,37 @@ module Aws
         when Array
           obj.map { |v| deep_copy(v) }
         else
-          v
+          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 monotonic_seconds
+        monotonic_milliseconds / 1000.0
+      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/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module Waiters
     module Errors

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module Waiters
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module Waiters
     # @api private
@@ -50,7 +52,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 +83,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/waiters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'waiters/errors'
 require_relative 'waiters/poller'
 require_relative 'waiters/waiter'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'base64'
 
 module Aws
@@ -9,9 +11,9 @@ module Aws
       def initialize(rules, options = {})
         @rules = rules
         @xml = options[:target] || []
-        indent = options[:indent] || '  '
+        indent = options[:indent] || ''
         pad = options[:pad] || ''
-        @builder = DocBuilder.new(target:@xml, indent:indent, pad:pad)
+        @builder = DocBuilder.new(target: @xml, indent: indent, pad: pad)
       end
 
       def to_xml(params)
@@ -46,7 +48,7 @@ module Aws
       end
 
       def list(name, ref, values)
-        if ref.shape.flattened
+        if ref[:flattened] || ref.shape.flattened
           values.each do |value|
             member(ref.shape.member.location_name || name, ref.shape.member, value)
           end
@@ -87,7 +89,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 +101,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/default_list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module Xml
     # @api private

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module Xml
     # @api private

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module Xml
     class DocBuilder
@@ -6,7 +8,11 @@ module Aws
       # @option options [String] :pad ('')
       # @option options [String] :indent ('')
       def initialize(options = {})
-        @target = options[:target] || ''
+        @target = options[:target] || (
+          # The String has to be mutable
+          # because @target implements `<<` method.
+          String.new
+        )
         @indent = options[:indent] || ''
         @pad = options[:pad] || ''
         @end_of_line = @indent == '' ? '' : "\n"
@@ -32,7 +38,7 @@ module Aws
         if block_given?
           @target << open_el(name, attrs)
           @target << @end_of_line
-          increase_pad { yield }
+          increase_pad(&block)
           @target << @pad
           @target << close_el(name)
         elsif args.empty?
@@ -61,7 +67,12 @@ module Aws
       end
 
       def escape(string, text_or_attr)
-        string.to_s.encode(:xml => text_or_attr)
+        string.to_s
+          .encode(:xml => text_or_attr)
+          .gsub("\u{000D}", '&#xD;') # Carriage Return
+          .gsub("\u{000A}", '&#xA;') # Line Feed
+          .gsub("\u{0085}", '&#x85;') # Next Line
+          .gsub("\u{2028}", '&#x2028;') # Line Separator
       end
 
       def attributes(attr)
@@ -77,7 +88,7 @@ module Aws
       def increase_pad(&block)
         pre_increase = @pad
         @pad = @pad + @indent
-        yield
+        block.call
         @pad = pre_increase
       end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cgi'
 
 module Aws
@@ -6,7 +8,7 @@ module Aws
 
       def call(context)
         @handler.call(context).on(300..599) do |response|
-          response.error = error(context)
+          response.error = error(context) unless response.error
           response.data = nil
         end
       end
@@ -18,20 +20,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/xml/parser/engines/libxml.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'libxml'
 
 module Aws

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'nokogiri'
 
 module Aws

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'oga'
 
 module Aws

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ox'
 require 'stringio'
 
@@ -14,7 +16,7 @@ module Aws
           Ox.sax_parse(
             @stack, StringIO.new(xml),
             :convert_special => true,
-            :skip => :skip_white
+            :skip => :skip_return
           )
         end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rexml/document'
 require 'rexml/streamlistener'
 
@@ -15,7 +17,8 @@ module Aws
 
         def parse(xml)
           begin
-            source = REXML::Source.new(xml)
+            mutable_xml = xml.dup # REXML only accepts mutable string
+            source = REXML::Source.new(mutable_xml)
             REXML::Parsers::StreamParser.new(source, self).parse
           rescue REXML::ParseException => error
             @stack.error(error.message)

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'base64'
 require 'time'
 
@@ -24,9 +26,9 @@ module Aws
 
           def frame_class(ref)
             klass = FRAME_CLASSES[ref.shape.class]
-            if ListFrame == klass && ref.shape.flattened
+            if ListFrame == klass && (ref.shape.flattened || ref["flattened"])
               FlatListFrame
-            elsif MapFrame == klass && ref.shape.flattened
+            elsif MapFrame == klass && (ref.shape.flattened || ref["flattened"])
               MapEntryFrame
             else
               klass
@@ -93,6 +95,8 @@ module Aws
         def child_frame(xml_name)
           if @member = @members[xml_name]
             Frame.new(xml_name, self, @member[:ref])
+          elsif @ref.shape.union
+            UnknownMemberFrame.new(xml_name, self, nil, @result)
           else
             NullFrame.new(xml_name, self)
           end
@@ -104,10 +108,24 @@ module Aws
             @result[@member[:name]][child.key.result] = child.value.result
           when FlatListFrame
             @result[@member[:name]] << child.result
+          when UnknownMemberFrame
+            @result[:unknown] = { 'name' => child.path.last, 'value' => child.result }
           when NullFrame
           else
             @result[@member[:name]] = child.result
           end
+
+          if @ref.shape.union
+            # a union may only have one member set
+            # convert to the union subclass
+            # The default Struct created will have defaults set for all values
+            # This also sets only one of the values leaving everything else nil
+            # as required for unions
+            set_member_name = @member ? @member[:name] : :unknown
+            member_subclass = @ref.shape.member_subclass(set_member_name).new # shape.member_subclass(target.member).new
+            member_subclass[set_member_name] = @result[set_member_name]
+            @result = member_subclass
+          end
         end
 
         private
@@ -120,15 +138,15 @@ module Aws
         end
 
         def xml_name(ref)
-          if flattened_list?(ref.shape)
+          if flattened_list?(ref)
             ref.shape.member.location_name || ref.location_name
           else
             ref.location_name
           end
         end
 
-        def flattened_list?(shape)
-          ListShape === shape && shape.flattened
+        def flattened_list?(ref)
+          ListShape === ref.shape && (ref.shape.flattened || ref["flattened"])
         end
 
       end
@@ -240,6 +258,12 @@ module Aws
         end
       end
 
+      class UnknownMemberFrame < Frame
+        def result
+          @text.join
+        end
+      end
+
       class BlobFrame < Frame
         def result
           @text.empty? ? nil : Base64.decode64(@text.join)
@@ -300,6 +324,7 @@ module Aws
         MapShape => MapFrame,
         StringShape => StringFrame,
         StructureShape => StructureFrame,
+        UnionShape => StructureFrame,
         TimestampShape => TimestampFrame,
       }
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module Xml
     class Parser

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aws
   module Xml
     class Parser