aws-sdk-core 3.191.1 → 3.229.0

data/lib/aws-sdk-core/binary/decode_handler.rb

@@ -22,22 +22,16 @@ module Aws
       end
 
       def attach_eventstream_listeners(context, rules)
-
         context.http_response.on_headers(200) do
-          protocol = context.config.api.metadata['protocol']
-          output_handler = context[:output_event_stream_handler] || context[:event_stream_handler]
+          output_handler = context[:output_event_stream_handler] ||
+                           context[:event_stream_handler]
           context.http_response.body = EventStreamDecoder.new(
-            protocol,
+            context.config.protocol,
             rules,
             context.operation.output,
             context.operation.errors,
             context.http_response.body,
             output_handler)
-          if input_emitter = context[:input_event_emitter]
-            # #emit will be blocked until 200 success
-            # see Aws::EventEmitter#emit
-            input_emitter.signal_queue << "ready"
-          end
         end
 
         context.http_response.on_success(200) do

data/lib/aws-sdk-core/binary/encode_handler.rb

@@ -10,7 +10,7 @@ module Aws
         if eventstream_member = eventstream_input?(context)
           input_es_handler = context[:input_event_stream_handler]
           input_es_handler.event_emitter.encoder = EventStreamEncoder.new(
-            context.config.api.metadata['protocol'],
+            context.config.protocol,
             eventstream_member,
             context.operation.input,
             signer_for(context)

data/lib/aws-sdk-core/binary/event_builder.rb

@@ -42,41 +42,39 @@ module Aws
           end
         end
 
-        # implict payload
-        if !explicit_payload && !implicit_payload_members.empty?
-          if implicit_payload_members.size > 1
-            payload_shape = Shapes::StructureShape.new
-            implicit_payload_members.each do |m_name, m_ref|
-              payload_shape.add_member(m_name, m_ref)
-            end
-            payload_ref = Shapes::ShapeRef.new(shape: payload_shape)
-
-            payload = build_payload_members(payload_ref, params)
-          else
-            m_name, m_ref = implicit_payload_members.first
-            streaming, content_type = _content_type(m_ref.shape)
-
-            es_headers[":content-type"] = Aws::EventStream::HeaderValue.new(
-              type: "string", value: content_type)
-            payload = _build_payload(streaming, m_ref, params[m_name])
-          end
-        end
-
-
+        # handle header members for all cases
         event_ref.shape.members.each do |member_name, member_ref|
           if member_ref.eventheader && params[member_name]
             header_value = params[member_name]
             es_headers[member_ref.shape.name] = Aws::EventStream::HeaderValue.new(
-              type: _header_value_type(member_ref.shape, header_value),
+              type: header_value_type(member_ref.shape, header_value),
               value: header_value
             )
-          elsif member_ref.eventpayload && params[member_name]
-            # explicit payload
-            streaming, content_type = _content_type(member_ref.shape)
+          end
+        end
+
+        # implict payload
+        if !explicit_payload && !implicit_payload_members.empty?
+          payload_shape = StructureShape.new
+          implicit_payload_members.each do |m_name, m_ref|
+            payload_shape.add_member(m_name, m_ref)
+          end
+          payload_ref = ShapeRef.new(shape: payload_shape)
 
-            es_headers[":content-type"] = Aws::EventStream::HeaderValue.new(
-              type: "string", value: content_type)
-            payload = _build_payload(streaming, member_ref, params[member_name])
+          payload = build_payload_members(payload_ref, params)
+                      .force_encoding(Encoding::BINARY)
+
+
+          es_headers[":content-type"] = Aws::EventStream::HeaderValue.new(
+            type: "string", value: content_type(payload_ref.shape))
+        else
+          # explicit payload, serialize just the payload member
+          event_ref.shape.members.each do |member_name, member_ref|
+            if member_ref.eventpayload && params[member_name]
+              es_headers[":content-type"] = Aws::EventStream::HeaderValue.new(
+                type: "string", value: content_type(member_ref.shape))
+              payload = params[member_name]
+            end
           end
         end
 
@@ -86,15 +84,15 @@ module Aws
         )
       end
 
-      def _content_type(shape)
+      def content_type(shape)
         case shape
-        when BlobShape then [true, "application/octet-stream"]
-        when StringShape then [true, "text/plain"]
+        when BlobShape then "application/octet-stream"
+        when StringShape then "text/plain"
         when StructureShape then
           if @serializer_class.name.include?('Xml')
-            [false, "text/xml"]
+            "text/xml"
           elsif @serializer_class.name.include?('Json')
-            [false, "application/json"]
+            "application/json"
           end
         else
           raise Aws::Errors::EventStreamBuilderError.new(
@@ -102,7 +100,7 @@ module Aws
         end
       end
 
-      def _header_value_type(shape, value)
+      def header_value_type(shape, value)
         case shape
         when StringShape then "string"
         when IntegerShape then "integer"
@@ -115,10 +113,9 @@ module Aws
         end
       end
 
-      def _build_payload(streaming, ref, value)
-        streaming ? value : @serializer_class.new(ref).serialize(value)
+      def build_payload_members(payload_ref, params)
+        @serializer_class.new(payload_ref).serialize(params)
       end
-
     end
   end
 end

data/lib/aws-sdk-core/binary/event_stream_decoder.rb

@@ -47,6 +47,7 @@ module Aws
         when 'rest-xml' then Aws::Xml::Parser
         when 'rest-json' then Aws::Json::Parser
         when 'json' then Aws::Json::Parser
+        when 'smithy-rpc-v2-cbor' then Aws::RpcV2::Parser
         else raise "unsupported protocol #{protocol} for event stream"
         end
       end

data/lib/aws-sdk-core/binary/event_stream_encoder.rb

@@ -43,9 +43,10 @@ module Aws
 
       def serializer_class(protocol)
         case protocol
-        when 'rest-xml' then Xml::Builder
-        when 'rest-json' then Json::Builder
-        when 'json' then Json::Builder
+        when 'rest-xml' then Aws::Xml::Builder
+        when 'rest-json' then Aws::Json::Builder
+        when 'json' then Aws::Json::Builder
+        when 'smithy-rpc-v2-cbor' then Aws::RpcV2::Builder
         else raise "unsupported protocol #{protocol} for event stream"
         end
       end

data/lib/aws-sdk-core/cbor/decoder.rb

@@ -0,0 +1,308 @@
+# frozen_string_literal: true
+
+module Aws
+  module Cbor
+    # Pure Ruby implementation of CBOR Decoder
+    class Decoder
+      def initialize(bytes)
+        @buffer = bytes
+        @pos = 0
+      end
+
+      def decode
+        return nil if @buffer.nil? || @buffer.empty?
+
+        val = decode_item
+        return val unless @pos != @buffer.size
+
+        raise ExtraBytesError.new(@pos, @buffer.size)
+      end
+
+      private
+
+      FIVE_BIT_MASK = 0x1F
+      TAG_TYPE_EPOCH = 1
+      TAG_TYPE_BIGNUM = 2
+      TAG_TYPE_NEG_BIGNUM = 3
+      TAG_TYPE_BIGDEC = 4
+
+      # high level, generic decode. Based on the next type. Consumes and returns
+      # the next item as a ruby object.
+      def decode_item
+        case (next_type = peek_type)
+        when :array
+          read_array.times.map { decode_item }
+        when :map
+          read_map.times.map { [read_string, decode_item] }.to_h
+        when :indefinite_array
+          read_start_indefinite_array
+          value = []
+          value << decode_item until peek_type == :break_stop_code
+          read_end_indefinite_collection
+          value
+        when :indefinite_map
+          read_start_indefinite_map
+          value = {}
+          value[read_string] = decode_item until peek_type == :break_stop_code
+          read_end_indefinite_collection
+          value
+        when :indefinite_binary_string
+          read_info
+          value = String.new
+          value << read_binary_string until peek_type == :break_stop_code
+          read_end_indefinite_collection
+          value
+        when :indefinite_string
+          read_info
+          value = String.new
+          value << read_string until peek_type == :break_stop_code
+          read_end_indefinite_collection
+          value.force_encoding(Encoding::UTF_8)
+        when :tag
+          case (tag = read_tag)
+          when TAG_TYPE_EPOCH
+            item = decode_item
+            Time.at(item)
+          when TAG_TYPE_BIGNUM, TAG_TYPE_NEG_BIGNUM
+            read_bignum(tag)
+          when TAG_TYPE_BIGDEC
+            read_big_decimal
+          else
+            Tagged.new(tag, decode_item)
+          end
+        when :break_stop_code
+          raise UnexpectedBreakCodeError
+        else
+          send("read_#{next_type}")
+        end
+      end
+
+      # low level streaming interface
+      def peek_type
+        ib = peek(1).ord
+        add_info = ib & FIVE_BIT_MASK
+        major_type = ib >> 5
+        case major_type
+        when 0, 1 then :integer
+        when 2
+          add_info == 31 ? :indefinite_binary_string : :binary_string
+        when 3
+          add_info == 31 ? :indefinite_string : :string
+        when 4
+          add_info == 31 ? :indefinite_array : :array
+        when 5
+          add_info == 31 ? :indefinite_map : :map
+        when 6 then :tag
+        when 7 # simple or float
+          case add_info
+          when 20, 21 then :boolean
+          when 22 then :nil
+          when 23 then :undefined # for smithy, this should be parsed as nil
+          when 25 then :half
+          when 26 then :float
+          when 27 then :double
+          when 31 then :break_stop_code
+          else
+            :reserved_undefined
+          end
+        end
+      end
+
+      def read_break_stop_code
+        read_info
+        :break_stop_code
+      end
+
+      def read_integer
+        major_type, add_info = read_info
+
+        val = read_count(add_info)
+        case major_type
+        when 0 then val
+        when 1 then -1 - val
+        else
+          raise Error,
+                "Expected Integer (0,1) got major type: #{major_type}"
+        end
+      end
+
+      def read_binary_string
+        _major_type, add_info = read_info
+        take(read_count(add_info)).force_encoding(Encoding::BINARY)
+      end
+
+      def read_string
+        _major_type, add_info = read_info
+        take(read_count(add_info)).force_encoding(Encoding::UTF_8)
+      end
+
+      # returns only the length of the array, caller must read the correct number of values after this
+      def read_array
+        _major_type, add_info = read_info
+        read_count(add_info)
+      end
+
+      # returns nothing but consumes and checks the type/info.
+      # Caller must keep reading until encountering the stop sequence
+      def read_start_indefinite_array
+        read_info
+      end
+
+      # returns nothing but consumes and checks the type/info.
+      # Caller must keep reading until encountering the stop sequence
+      def read_start_indefinite_map
+        read_info
+      end
+
+      # returns nothing but consumes and checks the type/info.
+      def read_end_indefinite_collection
+        read_info
+      end
+
+      # returns only the length of the array, caller must read the correct number of key value pairs after this
+      def read_map
+        _major_type, add_info = read_info
+        read_count(add_info)
+      end
+
+      # returns only the tag, caller must interpret the tag and read another value as appropriate
+      def read_tag
+        _major_type, add_info = read_info
+        read_count(add_info)
+      end
+
+      def read_reserved_undefined
+        _major_type, add_info = read_info
+        raise Error,
+          "Undefined reserved additional information: #{add_info}"
+      end
+
+      def read_boolean
+        _major_type, add_info = read_info
+        case add_info
+        when 20 then false
+        when 21 then true
+        else
+          raise Error,
+                'Invalid Boolean simple type, expected add_info of 20 or 21, ' \
+                 "got: #{add_info}"
+        end
+      end
+
+      def read_nil
+        read_info
+        nil
+      end
+
+      def read_undefined
+        read_info
+        :undefined
+      end
+
+      # 16 bit IEEE 754 half-precision floats
+      # Support decoding only
+      # format:
+      # sign - 1 bit
+      # exponent - 5 bits
+      # precision - 10 bits
+      def read_half
+        read_info
+        b16 = take(2).unpack1('n')
+        exp = (b16 >> 10) & 0x1f
+        mant = b16 & 0x3ff
+        val =
+          case exp
+          when 0
+            Math.ldexp(mant, -24)
+          when 31
+            mant.zero? ? Float::INFINITY : Float::NAN
+          else
+            # exp bias is 15, but to use ldexp we divide by 1024 (2^10) to get
+            # exp-15-10
+            Math.ldexp(1024 + mant, exp - 25)
+          end
+        if (b16[15]).zero?
+          val
+        else
+          -val
+        end
+      end
+
+      def read_float
+        read_info
+        take(4).unpack1('g')
+      end
+
+      def read_double
+        read_info
+        take(8).unpack1('G')
+      end
+
+      # tag type 2 or 3
+      def read_bignum(tag_value)
+        _major_type, add_info = read_info
+        bstr = take(read_count(add_info))
+        v = bstr.bytes.inject(0) do |sum, b|
+          sum <<= 8
+          sum + b
+        end
+        case tag_value
+        when 2 then v
+        when 3 then -1 - v
+        else
+          raise Error,
+                'Invalid Tag value for BigNum, ' \
+                "expected 2 or 3, got: #{tag_value}"
+        end
+      end
+
+      # A decimal fraction or a bigfloat is represented as a tagged array
+      # that contains exactly two integer numbers:
+      # an exponent e and a mantissa m
+      # See: https://www.rfc-editor.org/rfc/rfc8949.html#name-decimal-fractions-and-bigfl
+      def read_big_decimal
+        unless (s = read_array) == 2
+          raise Error, "Expected array of length 2 but length is: #{s}"
+        end
+
+        e = read_integer
+        m = read_integer
+        BigDecimal(m) * (BigDecimal(10)**BigDecimal(e))
+      end
+
+      # return a tuple of major_type, add_info
+      def read_info
+        ib = take(1).ord
+        [ib >> 5, ib & FIVE_BIT_MASK]
+      end
+
+      def read_count(add_info)
+        case add_info
+        when 0..23 then add_info
+        when 24 then take(1).ord
+        when 25 then take(2).unpack1('n')
+        when 26 then take(4).unpack1('N')
+        when 27 then take(8).unpack1('Q>')
+        when 28 then take(16).unpack1('Q>')
+        when 29 then take(32).unpack1('Q>')
+        else raise UnexpectedAdditionalInformationError, add_info
+        end
+      end
+
+      def take(n_bytes)
+        opos = @pos
+        @pos += n_bytes
+
+        return @buffer[opos, n_bytes] if @pos <= @buffer.bytesize
+
+        raise OutOfBytesError.new(n_bytes, @buffer.bytesize - @pos)
+      end
+
+      def peek(n_bytes)
+        return @buffer[@pos, n_bytes] if (@pos + n_bytes) <= @buffer.bytesize
+
+        raise OutOfBytesError.new(n_bytes, @buffer.bytesize - @pos)
+      end
+    end
+  end
+end