aws-sdk-code-generator 0.5.0.pre → 0.6.0.pre

data/lib/aws-sdk-code-generator/views/types_module.rb

@@ -34,7 +34,7 @@ module AwsSdkCodeGenerator
             # exceptions will not have the event trait.
             shape['members'].each do |name, ref|
               if !!@service.api['shapes'][ref['shape']]['exception']
-                @service.api['shapes'][ref['shape']]['exception_event'] = true
+                @service.api['shapes'][ref['shape']]['exceptionEvent'] = true
               end
             end
           end
@@ -80,19 +80,43 @@ module AwsSdkCodeGenerator
         end
       end
 
+      # @return [Array<String>]
+      def types_customizations
+        Dir.glob(File.join(Helper.gem_lib_path(gem_name), "#{gem_name}/customizations/types", '*.rb')).map do |file|
+          filename = File.basename(file, '.rb')
+          "#{gem_name}/customizations/types/#{filename}"
+        end
+      end
+
       private
 
+      def gem_name
+        "aws-sdk-#{module_name.split('::').last.downcase}"
+      end
+
       def struct_members(shape)
         return if shape['members'].nil?
         members = shape['members'].map do |member_name, member_ref|
+          member_target = @api['shapes'][member_ref['shape']]
           sensitive = !!(member_ref['sensitive'] ||
-            @api['shapes'][member_ref['shape']]['sensitive'])
+            member_target['sensitive'])
+
+          case member_target["type"]
+          when 'map'
+            key_shape = @api['shapes'][member_target['key']['shape']]
+            value_shape = @api['shapes'][member_target['value']['shape']]
+            sensitive ||= !!(key_shape['sensitive'] || value_shape['sensitive'])
+          when 'list'
+            list_member = @api['shapes'][member_target['member']['shape']]
+            sensitive ||= !!(list_member['sensitive'])
+          end
+
           StructMember.new(
             member_name: underscore(member_name),
             sensitive: sensitive
           )
         end
-        if shape['event'] || shape['exception_event']
+        if shape['event'] || shape['exceptionEvent']
           members << StructMember.new(member_name: 'event_type')
         end
         members
@@ -180,7 +204,7 @@ module AwsSdkCodeGenerator
 
       def see_also_tag(shape_name)
         uid = @api['metadata']['uid']
-        if @api['metadata']['protocol'] != 'api-gateway' && Crosslink.taggable?(uid)
+        if @service.protocol != 'api-gateway' && Crosslink.taggable?(uid)
           Crosslink.tag_string(uid, shape_name)
         end
       end

data/lib/aws-sdk-code-generator.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'aws-sdk-core'
+
 require_relative 'aws-sdk-code-generator/api'
 require_relative 'aws-sdk-code-generator/apply_docs'
 require_relative 'aws-sdk-code-generator/codegenerated_plugin'
@@ -10,6 +12,7 @@ require_relative 'aws-sdk-code-generator/error_list'
 require_relative 'aws-sdk-code-generator/client_response_structure_example'
 require_relative 'aws-sdk-code-generator/crosslink'
 require_relative 'aws-sdk-code-generator/docstring'
+require_relative 'aws-sdk-code-generator/endpoint_parameter'
 require_relative 'aws-sdk-code-generator/hash_formatter'
 require_relative 'aws-sdk-code-generator/helper'
 require_relative 'aws-sdk-code-generator/plugin_list'
@@ -103,4 +106,13 @@ module AwsSdkCodeGenerator
 # WARNING ABOUT GENERATED CODE
   WARNING_TXT
 
+  @warnings = []
+
+  class << self
+    attr_reader :warnings
+    def warn(service, type, message)
+      Kernel.warn(message)
+      @warnings << { service: service, type: type, message: message }
+    end
+  end
 end

data/templates/async_client_class.mustache

@@ -83,13 +83,18 @@ module {{module_name}}
     # @api private
     def build_request(operation_name, params = {})
       handlers = @handlers.for(operation_name)
+      tracer = config.telemetry_provider.tracer_provider.tracer(
+        Aws::Telemetry.module_to_tracer_name('{{module_name}}')
+      )
       context = Seahorse::Client::RequestContext.new(
         operation_name: operation_name,
         operation: config.api.operation(operation_name),
         client: self,
         params: params,
         http_response: Seahorse::Client::Http::AsyncResponse.new,
-        config: config)
+        config: config,
+        tracer: tracer
+      )
       context[:gem_name] = '{{gem_name}}'
       context[:gem_version] = '{{gem_version}}'
       Seahorse::Client::Request.new(handlers, context)

data/templates/client_api_module.mustache

@@ -3,6 +3,7 @@
 {{#generated_src_warning}}
 {{generated_src_warning}}
 {{/generated_src_warning}}
+
 module {{module_name}}
   # @api private
   module ClientApi
@@ -77,6 +78,12 @@ module {{module_name}}
         {{#authtype}}
         o['authtype'] = "{{.}}"
         {{/authtype}}
+        {{#unsigned_payload}}
+        o['unsignedPayload'] = true
+        {{/unsigned_payload}}
+        {{#auth}}
+        o['auth'] = {{&auth}}
+        {{/auth}}
         {{#endpoint_trait}}
         o.endpoint_pattern = {
           {{#endpoint_pattern}}

data/templates/client_class.mustache

@@ -7,8 +7,6 @@
 require '{{.}}'
 {{/plugin_requires}}
 
-Aws::Plugins::GlobalConfiguration.add_identifier(:{{service_identifier}})
-
 module {{module_name}}
   # An API client for {{service_name}}.  To construct a client, you need to configure a `:region` and `:credentials`.
   #
@@ -37,6 +35,11 @@ module {{module_name}}
     {{#client_constructor}}
     # @overload initialize(options)
     #   @param [Hash] options
+    #
+    #   @option options [Array<Seahorse::Client::Plugin>] :plugins ([]])
+    #     A list of plugins to apply to the client. Each plugin is either a
+    #     class name or an instance of a plugin class.
+    #
     {{>documentation}}
     {{/client_constructor}}
     def initialize(*args)
@@ -94,13 +97,18 @@ module {{module_name}}
         end
       end
       {{/authorizer?}}
+      tracer = config.telemetry_provider.tracer_provider.tracer(
+        Aws::Telemetry.module_to_tracer_name('{{module_name}}')
+      )
       context = Seahorse::Client::RequestContext.new(
         operation_name: operation_name,
         operation: config.api.operation(operation_name),{{#authorizer?}}
         authorizer: authorizer,{{/authorizer?}}
         client: self,
         params: params,
-        config: config)
+        config: config,
+        tracer: tracer
+      )
       context[:gem_name] = '{{gem_name}}'
       context[:gem_version] = '{{gem_version}}'
       Seahorse::Client::Request.new(handlers, context)

data/templates/endpoint_parameters_class.mustache

@@ -11,7 +11,7 @@ module {{module_name}}
   {{/parameters}}
   EndpointParameters = Struct.new(
     {{#parameters}}
-    :{{underscore_name}},
+    :{{key}},
     {{/parameters}}
     {{^parameters}}
     nil
@@ -23,28 +23,31 @@ module {{module_name}}
     class << self
       PARAM_MAP = {
         {{#parameters}}
-        '{{name}}' => :{{underscore_name}},
+        '{{name}}' => :{{key}},
         {{/parameters}}
       }.freeze
     end
 
     def initialize(options = {})
       {{#parameters}}
-      self[:{{underscore_name}}] = options[:{{underscore_name}}]
+      self[:{{key}}] = options[:{{key}}]
       {{#default?}}
-      {{#boolean_default?}}
-      self[:{{underscore_name}}] = {{default}} if self[:{{underscore_name}}].nil?
-      {{/boolean_default?}}
-      {{^boolean_default?}}
-      self[:{{underscore_name}}] ||= '{{default}}' if self[:{{underscore_name}}].nil?
-      {{/boolean_default?}}
+      self[:{{key}}] = {{{default}}} if self[:{{key}}].nil?
       {{/default?}}
-      {{#required}}
-      if self[:{{underscore_name}}].nil?
-        raise ArgumentError, "Missing required EndpointParameter: :{{underscore_name}}"
+      {{#validate_required?}}
+      if self[:{{key}}].nil?
+        raise ArgumentError, "Missing required EndpointParameter: :{{key}}"
       end
-      {{/required}}
+      {{/validate_required?}}
       {{/parameters}}
     end
+
+    def self.create(config, options={})
+      new({
+        {{#config_parameters}}
+        {{key}}: {{{value}}},
+        {{/config_parameters}}
+      }.merge(options))
+    end
   end
 end

data/templates/endpoints_module.mustache

@@ -11,24 +11,31 @@ module {{module_name}}
     {{#endpoint_classes}}
     class {{name}}
       def self.build(context)
-        {{#has_endpoint_built_in?}}
-        unless context.config.regional_endpoint
-          endpoint = context.config.endpoint.to_s
-        end
-        {{/has_endpoint_built_in?}}
-        {{module_name}}::EndpointParameters.new(
+        {{module_name}}::EndpointParameters.create(
+          context.config,
           {{#parameters}}
-          {{#static_string?}}
-          {{key}}: "{{{value}}}",
-          {{/static_string?}}
-          {{^static_string?}}
           {{key}}: {{{value}}},
-          {{/static_string?}}
           {{/parameters}}
         )
       end
     end
 
     {{/endpoint_classes}}
+
+    def self.parameters_for_operation(context)
+      {{#operation_specific_parameters?}}
+      {{module_name}}::EndpointParameters.create(context.config)
+      {{/operation_specific_parameters?}}
+      {{^operation_specific_parameters?}}
+      case context.operation_name
+      {{#endpoint_classes}}
+      when :{{operation}}
+        {{name}}.build(context)
+      {{/endpoint_classes}}
+      else
+        {{module_name}}::EndpointParameters.create(context.config)
+      end
+      {{/operation_specific_parameters?}}
+    end
   end
 end

data/templates/endpoints_plugin.mustache

@@ -11,11 +11,11 @@ module {{module_name}}
         :endpoint_provider,
         doc_type: '{{module_name}}::EndpointProvider',
         rbs_type: 'untyped',
-        docstring: 'The endpoint provider used to resolve endpoints. Any '\
-                   'object that responds to `#resolve_endpoint(parameters)` '\
-                   'where `parameters` is a Struct similar to '\
-                   '`{{module_name}}::EndpointParameters`'
-      ) do |cfg|
+        docstring: <<~DOCS) do |_cfg|
+The endpoint provider used to resolve endpoints. Any object that responds to
+`#resolve_endpoint(parameters)` where `parameters` is a Struct similar to
+`{{module_name}}::EndpointParameters`.
+        DOCS
         {{module_name}}::EndpointProvider.new
       end
 
@@ -23,15 +23,18 @@ module {{module_name}}
       option(
         :{{name}},
         doc_type: '{{doc_type}}',
-        default: {{{default}}},
-        docstring: "{{{docstring}}}")
+        docstring: <<~DOCS) do |cfg|
+{{{docstring}}}
+        DOCS
+        {{{default}}}
+      end
 
       {{/endpoint_options}}
       # @api private
       class Handler < Seahorse::Client::Handler
         def call(context)
           unless context[:discovered_endpoint]
-            params = parameters_for_operation(context)
+            params = {{module_name}}::Endpoints.parameters_for_operation(context)
             endpoint = context.config.endpoint_provider.resolve_endpoint(params)
 
             context.http_request.endpoint = endpoint.url
@@ -44,11 +47,33 @@ module {{module_name}}
           context[:auth_scheme] =
             Aws::Endpoints.resolve_auth_scheme(context, endpoint)
 
-          @handler.call(context)
+          with_metrics(context) { @handler.call(context) }
         end
 
         private
 
+        def with_metrics(context, &block)
+          metrics = []
+          metrics << 'ENDPOINT_OVERRIDE' unless context.config.regional_endpoint
+          if context[:auth_scheme] && context[:auth_scheme]['name'] == 'sigv4a'
+            metrics << 'SIGV4A_SIGNING'
+          end
+          {{#has_account_id_endpoint_mode?}}
+          case context.config.account_id_endpoint_mode
+          when 'preferred'
+            metrics << 'ACCOUNT_ID_MODE_PREFERRED'
+          when 'disabled'
+            metrics << 'ACCOUNT_ID_MODE_DISABLED'
+          when 'required'
+            metrics << 'ACCOUNT_ID_MODE_REQUIRED'
+          end
+          {{/has_account_id_endpoint_mode?}}
+          if context.config.credentials&.credentials&.account_id
+            metrics << 'RESOLVED_ACCOUNT_ID'
+          end
+          Aws::Plugins::UserAgent.metric(*metrics, &block)
+        end
+
         def apply_endpoint_headers(context, headers)
           headers.each do |key, values|
             value = values
@@ -59,15 +84,6 @@ module {{module_name}}
             context.http_request.headers[key] = value
           end
         end
-
-        def parameters_for_operation(context)
-          case context.operation_name
-          {{#endpoint_classes}}
-          when :{{operation_name}}
-            {{module_name}}::Endpoints::{{class_name}}.build(context)
-          {{/endpoint_classes}}
-          end
-        end
       end
 
       def add_handlers(handlers, _config)

data/templates/errors_module.mustache

@@ -68,3 +68,8 @@ module {{module_name}}
     {{/errors}}
   end
 end
+{{#customization_file_exists?}}
+
+# Load customizations if they exist
+require '{{customization_file_path}}'
+{{/customization_file_exists?}}

data/templates/resource_class.mustache

@@ -213,7 +213,7 @@ module {{module_name}}
           :retry
         end
       end
-      Aws::Plugins::UserAgent.feature('resource') do
+      Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         Aws::Waiters::Waiter.new(options).wait({})
       end
     end
@@ -304,3 +304,8 @@ module {{module_name}}
     {{/batch_actions?}}
   end
 end
+{{#customization_file_exists?}}
+
+# Load customizations if they exist
+require '{{resource_customization}}'
+{{/customization_file_exists?}}

data/templates/root_resource_class.mustache

@@ -49,3 +49,8 @@ module {{module_name}}
 
   end
 end
+{{#customization_file_exists?}}
+
+# Load customizations if they exist
+require '{{customization_file_path}}'
+{{/customization_file_exists?}}

data/templates/service_module.mustache

@@ -17,9 +17,7 @@ require '{{.}}'
 {{/requires}}
 {{/require_core_guard?}}
 
-{{#relative_requires}}
-require_relative '{{.}}'
-{{/relative_requires}}
+Aws::Plugins::GlobalConfiguration.add_identifier(:{{service_identifier}})
 
 # This module provides support for {{full_name}}. This module is available in the
 # `{{gem_name}}` gem.
@@ -52,7 +50,19 @@ require_relative '{{.}}'
 #
 # @!group service
 module {{module_name}}
+  {{#autoloads}}
+    {{#is_plugin}}
+  module Plugins
+    autoload :{{class_name}}, '{{file_path}}'
+  end
+    {{/is_plugin}}
+    {{^is_plugin}}
+  autoload :{{class_name}}, '{{file_path}}'
+    {{/is_plugin}}
+  {{/autoloads}}
 
   GEM_VERSION = '{{gem_version}}'
 
 end
+
+require_relative '{{prefix}}/customizations'

data/templates/spec/endpoint_provider_spec_class.mustache

@@ -11,7 +11,7 @@ module {{module_name}}
     subject { {{module_name}}::EndpointProvider.new }
 
     {{#endpoint_tests}}
-    context '{{documentation}}' do
+    context "{{{documentation}}}" do
       let(:expected) do
         {{{expect}}}
       end

data/templates/types_module.mustache

@@ -51,3 +51,7 @@ module {{module_name}}
 
   end
 end
+
+{{#types_customizations}}
+require "{{.}}"
+{{/types_customizations}}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-code-generator
 version: !ruby/object:Gem::Version
-  version: 0.5.0.pre
+  version: 0.6.0.pre
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-23 00:00:00.000000000 Z
+date: 2024-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -56,6 +56,7 @@ files:
 - lib/aws-sdk-code-generator/codegenerated_plugin.rb
 - lib/aws-sdk-code-generator/crosslink.rb
 - lib/aws-sdk-code-generator/docstring.rb
+- lib/aws-sdk-code-generator/endpoint_parameter.rb
 - lib/aws-sdk-code-generator/error_list.rb
 - lib/aws-sdk-code-generator/errors.rb
 - lib/aws-sdk-code-generator/eventstream_example.rb
@@ -184,11 +185,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: AWS SDK for Ruby - Code Generator