Address some TODOs (#293)

Author: mullermp

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: necko-actions/setup-smithy@v1
         with:
-          version: '1.54.0'
+          version: '1.56.0'
       - run: smithy --version
 
       - name: Setup Ruby

gems/smithy-cbor/lib/smithy-cbor/codec.rb

@@ -6,8 +6,6 @@
 module Smithy
   module CBOR
     # Codec that serializes and deserializes in CBOR format.
-    # TODO:
-    #   * Update implementation to handle event streams
     class Codec
       # @param [Hash] options
       def initialize(options = {})

gems/smithy-cbor/lib/smithy-cbor/decoder.rb

@@ -5,8 +5,7 @@
 module Smithy
   module CBOR
     # @api private
-    # rubocop:disable Metrics/ClassLength
-    class Decoder
+    class Decoder # rubocop:disable Metrics/ClassLength
       FIVE_BIT_MASK = 0x1F
       TAG_TYPE_EPOCH = 1
       TAG_TYPE_BIGNUM = 2
@@ -294,8 +293,7 @@ def read_tag
 
       def read_reserved_undefined
         _major_type, add_info = read_info
-        raise Error,
-              "Undefined reserved additional information: #{add_info}"
+        raise Error, "Undefined reserved additional information: #{add_info}"
       end
 
       def read_undefined
@@ -312,6 +310,5 @@ def take(n_bytes)
         raise OutOfBytesError.new(n_bytes, @buffer.bytesize - @pos)
       end
     end
-    # rubocop:enable Metrics/ClassLength
   end
 end

gems/smithy-cbor/lib/smithy-cbor/deserializer.rb

@@ -13,7 +13,7 @@ def initialize(options = {})
       end
 
       def deserialize(shape, bytes, target)
-        return {} if bytes.empty? || shape == Prelude::Unit
+        return {} if bytes.empty?
 
         shape(shape, CBOR.decode(bytes), target)
       end
@@ -63,32 +63,32 @@ def map(shape, values, target = nil)
       end
 
       def structure(shape, values, target = nil)
-        # TODO: iterate shape members instead of values
         return Schema::EmptyStructure.new if shape == Prelude::Unit
 
         target = shape.type.new if target.nil?
-        values.each do |key, value|
-          next unless shape.name_by_member_name?(key)
+        shape.members.each do |member_name, member_shape|
+          key = member_shape.name
+          next unless values.key?(key)
 
-          name = shape.name_by_member_name(key)
-          member_shape = shape.member(name)
-          target[name] = shape(member_shape.shape, value)
+          target[member_name] = shape(member_shape.shape, values[key])
         end
         target
       end
 
-      def union(shape, values, target = nil)
-        # TODO: delete target instead of checking key?
+      def union(shape, values, target = nil) # rubocop:disable Metrics/AbcSize
+        raise ArgumentError, "union value includes more than one key, received: #{values.keys}" if values.size > 1
+
         key, value = values.flatten
-        return nil if key.nil? || key == ' __target'
+        return nil if key.nil?
+
+        shape.members.each do |member_name, member_shape|
+          name = member_shape.name
+          next unless values.key?(name)
 
-        if shape.name_by_member_name?(key)
-          member_name = shape.name_by_member_name(key)
           target = shape.member_type(member_name) if target.nil?
-          target.new(shape(shape.member(member_name).shape, value))
-        else
-          shape.member_type(:unknown).new(key, value)
+          return target.new(shape(member_shape.shape, values[name]))
         end
+        shape.member_type(:unknown).new(key, value)
       end
 
       def sparse?(shape)

gems/smithy-cbor/spec/smithy-cbor/codec_spec.rb

@@ -102,6 +102,12 @@ module CBOR
           expect(deserialized.union).to be_a(unknown_union_type)
           expect(deserialized.union.to_h).to eq(unknown: { name: 'someThing', value: 'someValue' })
         end
+
+        it 'raises when deserializing unions with more than one member' do
+          data = { union: { string: 'string', integer: 1 } }
+          expect { subject.deserialize(shape, CBOR.encode(data)) }
+            .to raise_error(ArgumentError, /union value includes more than one key/)
+        end
       end
 
       context 'lists' do

gems/smithy-client/lib/smithy-client/net_http/handler.rb

@@ -142,9 +142,7 @@ def net_headers_for(request)
           # Removing this is necessary for most services to not break request
           # signatures as well as dynamodb crc32 checks (these fail if the
           # response is gzipped).
-          # TODO: keeping this disabled to see if we can fix this
-          # headers = { 'accept-encoding' => '' }
-          headers = {}
+          headers = { 'accept-encoding' => '' }
           request.headers.each_pair do |key, value|
             headers[key] = value
           end

gems/smithy-client/lib/smithy-client/plugins/host_prefix.rb

@@ -9,7 +9,7 @@ class HostPrefix < Plugin
           :disable_host_prefix_injection,
           default: false,
           doc_type: 'Boolean',
-          docstring: 'When true, the SDK will not prepend the modeled host prefix to the endpoint.'
+          docstring: 'When `true`, the SDK will not prepend the modeled host prefix to the endpoint.'
         ) do |_config|
           value = ENV['DISABLE_HOST_PREFIX_INJECTION'] || 'false'
           Util.str_to_bool(value)

gems/smithy-client/lib/smithy-client/plugins/logging.rb

@@ -11,10 +11,8 @@ class Logging < Plugin
           :logger,
           default: nil,
           doc_type: Logger,
-          docstring: <<~DOCS)
-            The Logger instance to send log messages to. If this option is not set,
-            logging is disabled.
-          DOCS
+          docstring: 'The Logger instance to send log messages to. If this option is not set, logging is disabled.'
+        )
 
         option(
           :log_level,

gems/smithy-client/lib/smithy-client/plugins/request_compression.rb

@@ -16,7 +16,7 @@ class RequestCompression < Plugin
           :disable_request_compression,
           default: false,
           doc_type: 'Boolean',
-          docstring: 'When true, the request body will not be compressed for supported operations.'
+          docstring: 'When `true`, the request body will not be compressed for supported operations.'
         ) do |_config|
           value = ENV['DISABLE_REQUEST_COMPRESSION'] || 'false'
           Util.str_to_bool(value)
@@ -34,7 +34,6 @@ class RequestCompression < Plugin
           Integer(value)
         end
 
-        # TODO: validate other plugin values using this same way.
         def after_initialize(client)
           validate_disable_request_compression(client.config)
           validate_request_min_compression_size_bytes(client.config)

gems/smithy-client/lib/smithy-client/plugins/stub_responses.rb

@@ -10,7 +10,7 @@ class StubResponses < Plugin
           default: false,
           doc_type: 'Boolean',
           docstring: <<~DOCS)
-            When true, the client will return stubbed responses instead of networking requests.
+            When `true`, the client will return stubbed responses instead of networking requests.
             By default fake responses are generated and returned. You can specify the response data
             to return or errors to raise by calling {Stubs#stub_responses}.
             @see Stubs