Generic Content Type plugin

build_tools/aws-sdk-code-generator/lib/aws-sdk-code-generator/plugin_list.rb

@@ -40,6 +40,7 @@ def compute_plugins(options)
     def default_plugins
       {
         'Seahorse::Client::Plugins::ContentLength' => "#{seahorse_plugins}/content_length.rb",
+        'Seahorse::Client::Plugins::ContentType' => "#{seahorse_plugins}/content_type.rb",
         'Aws::Plugins::CredentialsConfiguration' => "#{core_plugins}/credentials_configuration.rb",
         'Aws::Plugins::Logging' => "#{core_plugins}/logging.rb",
         'Aws::Plugins::ParamConverter' => "#{core_plugins}/param_converter.rb",

build_tools/services.rb

@@ -10,10 +10,10 @@ class ServiceEnumerator
     MANIFEST_PATH = File.expand_path('../../services.json', __FILE__)
 
     # Minimum `aws-sdk-core` version for new gem builds
-    MINIMUM_CORE_VERSION = "3.191.0"
+    MINIMUM_CORE_VERSION = "3.191.7"
 
     # Minimum `aws-sdk-core` version for new S3 gem builds
-    MINIMUM_CORE_VERSION_S3 = "3.192.0"
+    MINIMUM_CORE_VERSION_S3 = "3.191.7"
 
     EVENTSTREAM_PLUGIN = "Aws::Plugins::EventStreamConfiguration"
 

gems/aws-sdk-core/CHANGELOG.md

@@ -1,7 +1,7 @@
 Unreleased Changes
 ------------------
 
-* Feature - Update serializing/deserializing for all protocols to align with Smithy protocol-tests.
+* Issue - Update serializing/deserializing for all protocols to align with Smithy protocol-tests.
 * Issue - Allow `nil` values in lists and maps.
 * Issue - Populate headers for XML and JSON error responses.
 * Issue - Support fractional seconds when parsing `DateTime` timestamps.

gems/aws-sdk-core/lib/aws-sdk-core/plugins/protocols/rest_json.rb

@@ -5,12 +5,8 @@ module Plugins
     module Protocols
       class RestJson < Seahorse::Client::Plugin
         handler(Rest::Handler)
-        # Rest::Handler will set a default JSON body, so size can be checked
-        # if this handler is run after serialization.
-        handler(Rest::ContentTypeHandler, priority: 30)
         handler(Json::ErrorHandler, step: :sign)
       end
-
     end
   end
 end

gems/aws-sdk-core/lib/aws-sdk-core/plugins/protocols/rest_xml.rb

@@ -5,7 +5,6 @@ module Plugins
     module Protocols
       class RestXml < Seahorse::Client::Plugin
         handler(Rest::Handler)
-        handler(Rest::ContentTypeHandler)
         handler(Xml::ErrorHandler, step: :sign)
       end
     end

gems/aws-sdk-core/lib/aws-sdk-core/rest.rb

@@ -6,7 +6,6 @@
 require_relative 'rest/request/endpoint'
 require_relative 'rest/request/headers'
 require_relative 'rest/request/querystring_builder'
-require_relative 'rest/request/content_type'
 require_relative 'rest/response/body'
 require_relative 'rest/response/headers'
 require_relative 'rest/response/parser'

gems/aws-sdk-core/lib/seahorse/client/plugins/content_type.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Seahorse
+  module Client
+    module Plugins
+      class ContentType < Plugin
+
+        # @api private
+        class Handler < Client::Handler
+          def call(context)
+            body = context.http_request.body
+
+            if (payload = context.operation.input[:payload_member])
+              case payload.shape
+              when Seahorse::Model::Shapes::BlobShape
+                context.http_request.headers['Content-Type'] ||=
+                  'application/octet-stream'
+              when Seahorse::Model::Shapes::StringShape
+                context.http_request.headers['Content-Type'] ||=
+                  'text/plain'
+              else
+                apply_default_content_type(context)
+              end
+            elsif !body.respond_to?(:size) || non_empty_body?(body)
+              apply_default_content_type(context)
+            end
+
+            @handler.call(context)
+          end
+
+          private
+
+          def non_empty_body?(body)
+            body.respond_to?(:size) && body.size.positive?
+          end
+
+          # content-type defaults as noted here:
+          # rest-json: https://smithy.io/2.0/aws/protocols/aws-restxml-protocol.html#content-type
+          # rest-xml: https://smithy.io/2.0/aws/protocols/aws-restxml-protocol.html#content-type
+          def apply_default_content_type(context)
+            protocol = context.config.api.metadata['protocol']
+            case protocol
+            when 'rest-json'
+              context.http_request.headers['Content-Type'] ||=
+                'application/json'
+            when 'rest-xml'
+              context.http_request.headers['Content-Type'] ||=
+                'application/xml'
+            end
+          end
+        end
+
+        handler(Handler, step: :sign, priority: 0)
+
+      end
+    end
+  end
+end

gems/aws-sdk-s3/lib/aws-sdk-s3/presigner.rb

@@ -199,7 +199,7 @@ def sign_but_dont_send(
         req.handlers.remove(Aws::S3::Plugins::S3Signer::LegacyHandler)
         req.handlers.remove(Aws::Plugins::Sign::Handler)
         req.handlers.remove(Seahorse::Client::Plugins::ContentLength::Handler)
-        req.handlers.remove(Aws::Rest::ContentTypeHandler)
+        req.handlers.remove(Seahorse::Client::Plugins::ContentType::Handler)
 
         req.handle(step: :send) do |context|
           # if an endpoint was not provided, force secure or insecure