Merge customizations for Bedrock Runtime

Author: aws-sdk-ruby-automation

apis/bedrock-runtime/2023-09-30/api-2.json

@@ -2173,4 +2173,4 @@
       "min":1
     }
   }
-}
+}

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

@@ -14,26 +14,51 @@ def initialize(options)
       client_examples = options.fetch(:client_examples, {})
       paginators = options.fetch(:paginators, {})
       operation_waiters = Waiter.build_operations_map(options[:waiters])
-
-      @operations = api['operations'].inject([]) do |ops, (name, operation)|
+      @operations = api['operations'].each_with_object([]) do |(name, operation), ops|
         method_name = Underscore.underscore(name)
         waiters = operation_waiters[method_name]
-
         async_client = options[:async_client] || false
         es_output = AwsSdkCodeGenerator::Helper.eventstream_output?(operation, api)
         es_input = AwsSdkCodeGenerator::Helper.eventstream_input?(operation, api)
-        if es_input || es_output
-          # eventstreaming operations
-          if protocol_settings['h2'] == 'eventstream'
-            # h2 supported, only generate for async client
-            if async_client
-              if es_input == es_output
-                # input & output eventstream sharing
-                # same eventstream shape
-                # see EventStreamModule
-                es_input = "Input" + es_input
-                es_output = "Output" + es_output
-              end
+
+        if async_client
+          if es_input || es_output
+            if es_input == es_output
+              # handle input & output eventstream sharing the same eventstream shape
+              es_input = "Input" + es_input
+              es_output = "Output" + es_output
+            end
+
+            case protocol_settings['h2']
+            when 'required'
+              # When h2 is required, the operation must be sent over H2.
+              raise NotImplementedError, 'H2 required is not implemented yet'
+            when 'optional'
+              # When h2 is optional, only bidirectional eventstreaming operations will be on the async client. Other
+              # operations MAY be on the async client, but we currently do not do this. (They are disjoint).
+              next unless es_input && es_output
+
+              ops << Operation.new(
+                name: method_name,
+                documentation: ClientOperationDocumentation.new(
+                  name: name,
+                  module_name: module_name,
+                  method_name: method_name,
+                  operation: operation,
+                  api: api,
+                  protocol: protocol,
+                  examples: examples,
+                  client_examples: client_examples[method_name] || [],
+                  async_client: true
+                ).to_s,
+                streaming: AwsSdkCodeGenerator::Helper.operation_streaming?(operation, api),
+                eventstream_output: es_output,
+                eventstream_input: es_input
+              )
+            when 'eventstream'
+              # When h2 is eventstream, all eventstream operations must be sent over H2. This includes all operations that
+              # have any input OR output structures targeted with event traits. Other operations MAY use h2, but we
+              # currently do not do this.
               ops << Operation.new(
                 name: method_name,
                 documentation: ClientOperationDocumentation.new(
@@ -52,8 +77,12 @@ def initialize(options)
                 eventstream_input: es_input
               )
             end
-          elsif !es_input && es_output && !async_client
-            # http1.1 only support eventstream at output
+          end
+        else
+          # We only support eventstream output on the sync client (http 1.1)
+          # We arguably should not have this here (put it on the async client instead) however we must
+          # keep doing so for backwards compatibility.
+          if !es_input && es_output && protocol_settings['h2'] != 'eventstream'
             ops << Operation.new(
               name: method_name,
               documentation: ClientOperationDocumentation.new(
@@ -71,31 +100,29 @@ def initialize(options)
               eventstream_output: es_output,
               eventstream_input: false
             )
+          # Bidirectional eventstreaming operations are not added to the sync client
+          elsif !es_input && !es_output
+            ops << Operation.new(
+              name: method_name,
+              documentation: ClientOperationDocumentation.new(
+                name: name,
+                module_name: module_name,
+                method_name: method_name,
+                operation: operation,
+                api: api,
+                protocol: protocol,
+                examples: examples,
+                client_examples: client_examples[method_name] || [],
+                async_client: false,
+                pager: paginators && paginators['pagination'][name],
+                waiters: waiters
+              ).to_s,
+              streaming: AwsSdkCodeGenerator::Helper.operation_streaming?(operation, api),
+              eventstream_output: false,
+              eventstream_input: false
+            )
           end
-        elsif !async_client
-          # non streaming operations
-          # generate at sync client only
-          ops << Operation.new(
-            name: method_name,
-            documentation: ClientOperationDocumentation.new(
-              name: name,
-              module_name: module_name,
-              method_name: method_name,
-              operation: operation,
-              api: api,
-              protocol: protocol,
-              examples: examples,
-              client_examples: client_examples[method_name] || [],
-              async_client: false,
-              pager: paginators && paginators['pagination'][name],
-              waiters: waiters
-            ).to_s,
-            streaming: AwsSdkCodeGenerator::Helper.operation_streaming?(operation, api),
-            eventstream_output: false,
-            eventstream_input: false
-          )
         end
-
         ops
       end
     end
@@ -113,10 +140,10 @@ def initialize(options)
         @streaming = options.fetch(:streaming)
         @eventstream_output = !!options.fetch(:eventstream_output)
         @eventstream_input = !!options.fetch(:eventstream_input)
-        @output_eventstream_member = @eventstream_output ?
-          options.fetch(:eventstream_output) : nil
-        @input_eventstream_member = @eventstream_input ?
-          options.fetch(:eventstream_input) : nil
+        @output_eventstream_member =
+          @eventstream_output ? options.fetch(:eventstream_output) : nil
+        @input_eventstream_member =
+          @eventstream_input ? options.fetch(:eventstream_input) : nil
         @bidirectional = @eventstream_output && @eventstream_input
       end
 

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

@@ -74,7 +74,7 @@ def source_files(options = {})
         codegenerated_plugins.each { |p| y.yield(p.path, p.source) }
 
         y.yield("#{prefix}/client.rb", client_class(codegenerated_plugins))
-        if @service.protocol_settings['h2'] == 'eventstream'
+        if @service.protocol_settings['h2']
           y.yield("#{prefix}/async_client.rb", async_client_class(codegenerated_plugins))
         end
         y.yield("#{prefix}/errors.rb", errors_module)

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

@@ -129,8 +129,11 @@ def operation_streaming?(operation, api)
     end
 
     def operation_eventstreaming?(operation, api)
-      !!eventstream_input?(operation, api) ||
-        !!eventstream_output?(operation, api)
+      !!eventstream_input?(operation, api) || !!eventstream_output?(operation, api)
+    end
+
+    def operation_bidirectional_eventstreaming?(operation, api)
+      !!eventstream_input?(operation, api) && !!eventstream_output?(operation, api)
     end
 
     def eventstream_output?(operation, api)
@@ -185,8 +188,7 @@ def gem_lib_path(gem_name)
     end
 
     module_function :deep_copy, :operation_streaming?, :downcase_first, :wrap_string, :apig_prefix,
-      :eventstream_output?, :eventstream_input?, :operation_eventstreaming?, :pascal_case,
-      :gem_lib_path
-
+      :eventstream_output?, :eventstream_input?, :operation_eventstreaming?, :operation_bidirectional_eventstreaming?,
+      :pascal_case, :gem_lib_path
   end
 end

build_tools/aws-sdk-code-generator/lib/aws-sdk-code-generator/views/client_api_module.rb

@@ -259,8 +259,7 @@ def operations
             o.auth = operation['auth'] if operation.key?('auth')
             o.require_apikey = operation['requiresApiKey'] if operation.key?('requiresApiKey')
             o.pager = pager(operation_name)
-            o.async = @service.protocol_settings['h2'] == 'eventstream' &&
-              AwsSdkCodeGenerator::Helper.operation_eventstreaming?(operation, @service.api)
+            o.async = async(operation)
           end
         end
       end
@@ -281,6 +280,20 @@ def apig_authorizer
         end
       end
 
+      def async(operation)
+        # When h2 is eventstream, all eventstream operations must be sent over H2. This includes all operations that
+        # have any input OR output structures targeted with event traits. Other operations MAY use h2, but we
+        # currently do not do this.
+        (@service.protocol_settings['h2'] == 'eventstream' &&
+          AwsSdkCodeGenerator::Helper.operation_eventstreaming?(operation, @service.api)) ||
+          # When h2 is optional, only bidirectional eventstreaming operations will be on the async client. Other
+          # operations MAY be on the async client, but we currently do not do this. (They are disjoint).
+          (@service.protocol_settings['h2'] == 'optional' &&
+            AwsSdkCodeGenerator::Helper.operation_bidirectional_eventstreaming?(operation, @service.api)) ||
+          # When h2 is required, the operation must be sent over H2.
+          @service.protocol_settings['h2'] == 'required'
+      end
+
       def endpoint_operation
         @service.api['operations'].each do |name, ref|
           return underscore(name) if ref['endpointoperation']

build_tools/aws-sdk-code-generator/lib/aws-sdk-code-generator/views/service_module.rb

@@ -97,13 +97,11 @@ def autoloads
             paths << auto_load(path, resource_name)
           end
         end
-        if @service.api['metadata']['protocolSettings'] &&
-           @service.api['metadata']['protocolSettings']['h2'] == 'eventstream'
+
+        if @service.api['metadata']['protocolSettings'] && @service.api['metadata']['protocolSettings']['h2']
           paths << auto_load("#{@prefix}/async_client", :AsyncClient)
-          paths << auto_load("#{@prefix}/event_streams", :EventStreams)
-        elsif eventstream_shape?
-          paths << auto_load("#{@prefix}/event_streams", :EventStreams)
         end
+        paths << auto_load("#{@prefix}/event_streams", :EventStreams) if eventstream_shape?
 
         paths
       end

build_tools/customizations.rb

@@ -63,6 +63,10 @@ def dynamodb_example_deep_transform(subsegment, keys)
       end
     end
 
+    api('BedrockRuntime') do |api|
+      api['metadata']['protocolSettings'] = {'h2' => 'optional'}
+    end
+
     api('CloudFront') do |api|
       api['shapes'].each do |_, shape|
         if shape['members'] && shape['members']['MaxItems'] && shape['members']['MaxItems']['shape'] == 'string'

gems/aws-sdk-bedrockruntime/lib/aws-sdk-bedrockruntime.rb

@@ -54,6 +54,7 @@ module Plugins
   autoload :EndpointParameters, 'aws-sdk-bedrockruntime/endpoint_parameters'
   autoload :EndpointProvider, 'aws-sdk-bedrockruntime/endpoint_provider'
   autoload :Endpoints, 'aws-sdk-bedrockruntime/endpoints'
+  autoload :AsyncClient, 'aws-sdk-bedrockruntime/async_client'
   autoload :EventStreams, 'aws-sdk-bedrockruntime/event_streams'
 
   GEM_VERSION = '1.43.0'

gems/aws-sdk-bedrockruntime/lib/aws-sdk-bedrockruntime/client_api.rb

@@ -954,6 +954,7 @@ module ClientApi
         "auth" => ["aws.auth#sigv4"],
         "endpointPrefix" => "bedrock-runtime",
         "protocol" => "rest-json",
+        "protocolSettings" => {"h2"=>"optional"},
         "protocols" => ["rest-json"],
         "serviceFullName" => "Amazon Bedrock Runtime",
         "serviceId" => "Bedrock Runtime",

gems/aws-sdk-securityhub/lib/aws-sdk-securityhub/client.rb

@@ -5278,7 +5278,7 @@ def get_configuration_policy(params = {}, options = {})
     #   resp.to_h outputs the following:
     #   {
     #     association_status: "FAILED", 
-    #     association_status_message: "Configuration Policy a1b2c3d4-5678-90ab-cdef-EXAMPLE11111 couldn\u2019t be applied to account 111122223333 in us-east-1 Region. Retry your request.", 
+    #     association_status_message: "Configuration Policy a1b2c3d4-5678-90ab-cdef-EXAMPLE11111 couldn’t be applied to account 111122223333 in us-east-1 Region. Retry your request.", 
     #     association_type: "INHERITED", 
     #     configuration_policy_id: "a1b2c3d4-5678-90ab-cdef-EXAMPLE11111", 
     #     target_id: "111122223333",