aws-sdk-code-generator 0.2.4.pre → 0.3.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cd62265104fa228849cca4ee26d749025e7ba94a0ff446885abc045a17a91cf
-  data.tar.gz: 537442139442f772fecb3e829a9a584a07bf6795757c01b90032f78c5b4fde99
+  metadata.gz: 6f47bca9edb4689814cec21486fbc9924716462ea8dc0cf69e05d82b11c95d3b
+  data.tar.gz: 7173e29d52ac6118968e30d35e750cfe2a702e9c4a320041c46ab534f6c5d018
 SHA512:
-  metadata.gz: 7dd69754c3ad489c192c4db3986fc79376dbd34316f5d6d79694e5807824d36de9333762d49727a4e92525bbea4b0190803474641282499e116afd7955d6a162
-  data.tar.gz: a44c6a9fd0a8778bbe4d00c73dcc07584b1beac9c278671f006c349c7e7f0a36d6e8fa18084ebd61984769496abde3faf9037b85d09e40ce7c86d9f823030923
+  metadata.gz: c009d5dec4abd1d587254c564eeb88c89bd08d687070ae539ea4ea0fc64d747edc8b28641f7544ea9860363aa7467a631fae896d815cde99cc3502c7b7b844e2
+  data.tar.gz: b195875c8e9dd16ba6373784bd786dc79663a6e0f421c2835462cd1bccc407e2168d5a98947bffa6fc31ea1eb65ba27fca67047c83ef2a9d65987e4dbd3902d0

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

@@ -4,8 +4,11 @@ module AwsSdkCodeGenerator
   class ClientConstructor
 
     # @option options [required, PluginList] :plugins
+    # @option options [required, Array<CodegeneratedPlugin>] :codegenerated_plugins
+
     def initialize(options)
-      plugin_options = documented_plugin_options(options.fetch(:plugins))
+      plugin_options = documented_plugin_options(options.fetch(:plugins)) +
+        documented_plugin_options(options.fetch(:codegenerated_plugins))
       documentation = {}
       plugin_options.each do |option|
         documentation[option.name] = YardOptionTag.new(

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

@@ -101,7 +101,7 @@ module AwsSdkCodeGenerator
           if member_ref['idempotencyToken']
             docstring = docstring.to_s + "<p><b>A suitable default value is auto-generated.** You should normally not need to pass this option.</b></p>"
           end
-          if member_ref['jsonvalue']
+          if member_ref['jsonvalue'] || member_shape['jsonvalue']
             docstring = docstring.to_s + "<p><b>SDK automatically handles json encoding and base64 encoding for you when the required value (Hash, Array, etc.) is provided according to the description.</b></p>"
           end
           if member_shape['document']
@@ -232,17 +232,19 @@ module AwsSdkCodeGenerator
     end
 
     def request_syntax_example(method_name, operation, api)
-      SyntaxExample.new(
+      example = SyntaxExample.new(
         api: api,
         shape: Api.shape(operation['input'], api),
         method_name: method_name,
         receiver: 'client',
         resp_var: 'resp',
       ).format
+      # TODO - QuickSight is breaking this
+      example if example && example.lines.count < 1000
     end
 
     def async_request_syntax_example(method_name, operation, api)
-      SyntaxExample.new(
+      example = SyntaxExample.new(
         api: api,
         shape: Api.shape(operation['input'], api),
         method_name: method_name,
@@ -250,15 +252,19 @@ module AwsSdkCodeGenerator
         resp_var: 'async_resp',
         async: true
       ).format
+      # TODO - QuickSight is breaking this
+      example if example && example.lines.count < 1000
     end
 
     def response_structure_example(operation, api)
       output = Api.shape(operation['output'], api) if operation['output']
       if output && output['members'] && output['members'].size > 0
-        Docstring.block_comment(ClientResponseStructureExample.new(
+        docstring = Docstring.block_comment(ClientResponseStructureExample.new(
           shape_ref: operation['output'],
           api: api
         ).to_s)
+        # TODO - QuickSight is breaking this
+        docstring if docstring && docstring.lines.count < 1000
       end
     end
 

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

@@ -51,15 +51,18 @@ module AwsSdkCodeGenerator
 
     # @return [Enumerable<String<path>, String<code>>]
     def source_files(options = {})
+
       prefix = options.fetch(:prefix, @service.gem_name)
+      codegenerated_plugins = codegen_plugins(prefix)
+
       Enumerator.new do |y|
         if @service.protocol == 'api-gateway'
           y.yield("#{prefix}/../../README.md", apig_readme)
           y.yield("#{prefix}/plugins/authorizer.rb", authorizer_class)
           y.yield("#{prefix}/plugins/apig_endpoint.rb", apig_endpoint_class)
         end
-        y.yield("#{prefix}.rb", service_module(prefix))
-        unless %w[aws-sdk-sts aws-sdk-sso].include? prefix
+        y.yield("#{prefix}.rb", service_module(prefix, codegenerated_plugins))
+        unless @service.included_in_core?
           y.yield("#{prefix}/customizations.rb", '')
         end
         y.yield("#{prefix}/types.rb", types_module)
@@ -67,13 +70,23 @@ module AwsSdkCodeGenerator
           y.yield("#{prefix}/event_streams.rb", event_streams_module)
         end
         y.yield("#{prefix}/client_api.rb", client_api_module)
-        y.yield("#{prefix}/client.rb", client_class)
+
+        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'
-          y.yield("#{prefix}/async_client.rb", async_client_class)
+          y.yield("#{prefix}/async_client.rb", async_client_class(codegenerated_plugins))
         end
         y.yield("#{prefix}/errors.rb", errors_module)
         y.yield("#{prefix}/waiters.rb", waiters_module) if @waiters
         y.yield("#{prefix}/resource.rb", root_resource_class)
+
+        unless @service.legacy_endpoints?
+          y.yield("#{prefix}/endpoint_parameters.rb", endpoint_parameters)
+          y.yield("#{prefix}/endpoints.rb", endpoints_module)
+          y.yield("#{prefix}/endpoint_provider.rb", endpoint_provider)
+        end
+
         if @resources
           @resources['resources'].keys.sort.each do |name|
             path = "#{prefix}/#{Underscore.underscore(name)}.rb"
@@ -84,10 +97,24 @@ module AwsSdkCodeGenerator
       end
     end
 
+    # @return [Enumerable<String<path>, String<code>>]
+    def spec_files(options = {})
+      prefix = options.fetch(:prefix, '')
+      Enumerator.new do |y|
+        y.yield("#{prefix}/spec_helper.rb", spec_helper_file)
+
+        if @service.endpoint_tests && !@service.legacy_endpoints?
+          y.yield("#{prefix}/endpoint_provider_spec.rb", endpoint_provider_spec_file)
+        end
+      end
+    end
+
     private
 
-    def service_module(prefix)
-      Views::ServiceModule.new(service: @service, prefix: prefix).render
+    def service_module(prefix, codegenerated_plugins)
+      Views::ServiceModule.new(
+        service: @service, prefix: prefix,
+        codegenerated_plugins: codegenerated_plugins).render
     end
 
     def types_module
@@ -102,7 +129,7 @@ module AwsSdkCodeGenerator
       Views::ClientApiModule.new(service: @service).render
     end
 
-    def client_class
+    def client_class(codegenerated_plugins)
       Views::ClientClass.new(
         service_identifier: @service.identifier,
         service_name: @service.name,
@@ -121,11 +148,13 @@ module AwsSdkCodeGenerator
         paginators: @service.paginators,
         waiters: @service.waiters,
         examples: @service.examples,
-        custom: @service.protocol == 'api-gateway'
+        custom: @service.protocol == 'api-gateway',
+        legacy_endpoints: @service.legacy_endpoints?,
+        codegenerated_plugins: codegenerated_plugins
       ).render
     end
 
-    def async_client_class
+    def async_client_class(codegenerated_plugins)
       Views::AsyncClientClass.new(
         service_identifier: @service.identifier,
         service_name: @service.name,
@@ -139,6 +168,8 @@ module AwsSdkCodeGenerator
         add_plugins: @service.add_plugins,
         remove_plugins: @service.remove_plugins,
         api: @service.api,
+        legacy_endpoints: @service.legacy_endpoints?,
+        codegenerated_plugins: codegenerated_plugins,
         async_client: true
       ).render
     end
@@ -200,6 +231,44 @@ module AwsSdkCodeGenerator
       ).render
     end
 
+    def endpoint_parameters
+      Views::EndpointParametersClass.new(service: @service).render
+    end
+
+    def endpoint_provider
+      Views::EndpointProviderClass.new(service: @service).render
+    end
+
+    def endpoints_module
+      Views::EndpointsModule.new(service: @service).render
+    end
+
+    def endpoints_plugin
+      Views::EndpointsPlugin.new(service: @service).render
+    end
+
+    def endpoint_provider_spec_file
+      Views::Spec::EndpointProviderSpecClass.new(service: @service).render
+    end
+
+    def codegen_plugins(prefix)
+      unless @service.legacy_endpoints?
+        [
+          CodegeneratedPlugin.new(
+            source: endpoints_plugin,
+            class_name: "#{@service.module_name}::Plugins::Endpoints",
+            path: "#{prefix}/plugins/endpoints.rb"
+          )
+        ]
+      else
+        []
+      end
+    end
+
+    def spec_helper_file
+      Views::Spec::SpecHelper.new(service: @service).render
+    end
+
     private
 
     def has_eventstream

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module AwsSdkCodeGenerator
+  class CodegeneratedPlugin
+
+    # @option options [required, String] :source
+    # @option options [required, String] :class_name
+    # @option options [required, String] :path
+    def initialize(options = {})
+      @source = options.fetch(:source)
+      @class_name = options.fetch(:class_name)
+      @path = options.fetch(:path)
+    end
+
+    attr_reader :source, :path, :class_name
+
+
+    def plugin_class
+      if @plugin_class.nil?
+        Object.module_eval(@source)
+        const_names = @class_name.split('::')
+        @plugin_class = const_names.inject(Kernel) do |const, const_name|
+          const.const_get(const_name)
+        end
+      end
+      @plugin_class
+    end
+
+    def options
+      plugin_class.public_send(:options)
+    end
+
+  end
+end

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

@@ -23,17 +23,20 @@ module AwsSdkCodeGenerator
         y.yield("#{@service.gem_name}.gemspec", gemspec_file)
         y.yield('features/env.rb', features_env_file)
         y.yield('features/step_definitions.rb', features_step_definitions_file)
-        y.yield('spec/spec_helper.rb', spec_helper_file)
         if @service.smoke_tests
           y.yield('features/smoke.feature', smoke_file)
           y.yield('features/smoke_step_definitions.rb', smoke_step_definitions_file)
         end
         y.yield('VERSION', version_file)
         y.yield('LICENSE.txt', license_file)
+
         code = CodeBuilder.new(@options)
         code.source_files.each do |path, code|
           y.yield("lib/#{path}", code)
         end
+        code.spec_files.each do |path, code|
+          y.yield("spec/#{path}", code)
+        end
       end.each(&block)
     end
 
@@ -59,10 +62,6 @@ module AwsSdkCodeGenerator
       Views::Features::StepDefinitions.new(options).render
     end
 
-    def spec_helper_file
-      Views::Spec::SpecHelper.new(options).render
-    end
-
     def version_file
       Views::Version.new(options).render
     end

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

@@ -20,7 +20,7 @@ module AwsSdkCodeGenerator
     def compute_plugins(options)
       plugins = {}
       plugins.update(options[:async_client] ? default_async_plugins : default_plugins)
-      plugins.update(signature_plugins(options.fetch(:signature_version)))
+      plugins.update(signature_plugins(options))
       plugins.update(protocol_plugins(options.fetch(:protocol)))
       plugins.update(options.fetch(:add_plugins))
       options.fetch(:remove_plugins).each do |plugin_name|
@@ -58,7 +58,10 @@ module AwsSdkCodeGenerator
         'Aws::Plugins::ClientMetricsPlugin' => "#{core_plugins}/client_metrics_plugin.rb",
         'Aws::Plugins::ClientMetricsSendPlugin' => "#{core_plugins}/client_metrics_send_plugin.rb",
         'Aws::Plugins::TransferEncoding' => "#{core_plugins}/transfer_encoding.rb",
-        'Aws::Plugins::HttpChecksum' => "#{core_plugins}/http_checksum.rb"
+        'Aws::Plugins::HttpChecksum' => "#{core_plugins}/http_checksum.rb",
+        'Aws::Plugins::ChecksumAlgorithm' => "#{core_plugins}/checksum_algorithm.rb",
+        'Aws::Plugins::DefaultsMode' => "#{core_plugins}/defaults_mode.rb",
+        'Aws::Plugins::RecursionDetection' => "#{core_plugins}/recursion_detection.rb"
       }
     end
 
@@ -93,14 +96,31 @@ module AwsSdkCodeGenerator
       }[protocol]
     end
 
-    def signature_plugins(signature_version)
-      case signature_version
-      when 'v4'
-        { 'Aws::Plugins::SignatureV4' => "#{core_plugins}/signature_v4.rb" }
-      when 'v2'
-        { 'Aws::Plugins::SignatureV2' => "#{core_plugins}/signature_v2.rb" }
+    # HACK: Sigv2 is deprecated, Sigv4/Bearer are with core. Always assume
+    # new signer plugin. This logic would be moved to gem dependencies
+    # calculation, but don't worry until new signature type.
+    #
+    # NOTE: If no rules are provided, just use old Signing method
+    def signature_plugins(options)
+      if !options[:legacy_endpoints]
+        {
+          'Aws::Plugins::Sign' => "#{core_plugins}/sign.rb"
+        }
       else
-        {}
+        auth_types  = [options.fetch(:signature_version)]
+        auth_types += options[:api]['operations'].map { |_n, o| o['authtype'] }.compact
+        plugins = {}
+        auth_types.each do |auth_type|
+          case auth_type
+          when 'v4'
+            plugins['Aws::Plugins::SignatureV4'] = "#{core_plugins}/signature_v4.rb"
+          when 'v2'
+            plugins['Aws::Plugins::SignatureV2'] = "#{core_plugins}/signature_v2.rb"
+          when 'bearer'
+            plugins['Aws::Plugins::BearerAuthorization'] = "#{core_plugins}/bearer_authorization.rb"
+          end
+        end
+        plugins
       end
     end
 

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

@@ -14,6 +14,8 @@ module AwsSdkCodeGenerator
     # @option options [Hash, String] :waiters
     # @option options [Hash, String] :resources
     # @option options [Hash, String] :examples
+    # @option options [Hash, String] :endpoint_rules
+    # @option options [Hash, String] :endpoint_tests
     # @option options [Hash, String] :smoke_tests
     # @option options [Hash<gem,version>] :gem_dependencies ({})
     # @option options [Hash] :add_plugins ({})
@@ -34,6 +36,10 @@ module AwsSdkCodeGenerator
       @resources = load_json(options[:resources])
       @examples = load_json(options[:examples])
       @smoke_tests = load_json(options[:smoke_tests])
+      unless options[:legacy_endpoints]
+        @endpoint_rules = load_json(options[:endpoint_rules])
+        @endpoint_tests = load_json(options[:endpoint_tests])
+      end
       @gem_dependencies = options[:gem_dependencies] || {}
       @add_plugins = options[:add_plugins] || {}
       @remove_plugins = options[:remove_plugins] || []
@@ -77,6 +83,22 @@ module AwsSdkCodeGenerator
     # @return [Hash, nil] The service smoke test model.
     attr_reader :smoke_tests
 
+    # @return Boolean True if the service should use legacy endpoints
+    def legacy_endpoints?
+      !@endpoint_rules || @endpoint_rules.empty?
+    end
+
+    # @return Boolean True if the service is inlined in core (ie not a stand alone gem)
+    def included_in_core?
+      %w[STS SSO SSOOIDC].include?(name)
+    end
+
+    # @return [Hash, nil] The service endpoint rules.
+    attr_reader :endpoint_rules
+
+    # @return [Hash, nil] The service endpoint tests.
+    attr_reader :endpoint_tests
+
     # @return [Hash<String,String>] A hash of gem dependencies. Hash keys
     #   are gem names, values are versions.
     attr_reader :gem_dependencies

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

@@ -23,7 +23,11 @@ module AwsSdkCodeGenerator
         @gem_name = options.fetch(:gem_name)
         @gem_version = options.fetch(:gem_version)
         @plugins = PluginList.new(options)
-        @client_constructor = ClientConstructor.new(plugins: @plugins)
+        @codegenerated_plugins = options.fetch(:codegenerated_plugins, [])
+        @client_constructor = ClientConstructor.new(
+          options.merge(
+            plugins: @plugins,
+            codegenerated_plugins: @codegenerated_plugins))
         @operations = ClientOperationList.new(options).to_a
       end
 
@@ -60,7 +64,7 @@ module AwsSdkCodeGenerator
 
       # @return [Array<String>]
       def plugin_class_names
-        @plugins.map(&:class_name)
+        @plugins.map(&:class_name) + @codegenerated_plugins.map(&:class_name)
       end
 
     end

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

@@ -31,8 +31,9 @@ module AwsSdkCodeGenerator
         'xmlNamespace' => true,
         'streaming' => true, # transfer-encoding
         'requiresLength' => true, # transfer-encoding
-        'union' => false,
+        'union' => false, # should remain false
         'document' => true,
+        'jsonvalue' => true,
         # event stream modeling
         'event' => false,
         'eventstream' => false,
@@ -83,7 +84,10 @@ module AwsSdkCodeGenerator
         'checksumFormat' => true,
         'globalEndpoint' => true,
         'serviceAbbreviation' => true,
-        'uid' => true
+        'uid' => true,
+        'awsQueryCompatible' => true, # AwsQuery migration
+        # ignore
+        'ripServiceName' => true
       }
 
       # @option options [required, Service] :service
@@ -197,6 +201,15 @@ module AwsSdkCodeGenerator
             o.http_method = operation['http']['method']
             o.http_request_uri = operation['http']['requestUri']
             o.http_checksum_required = true if operation['httpChecksumRequired']
+            if operation.key?('httpChecksum')
+              operation['httpChecksum']['requestAlgorithmMember'] = underscore(operation['httpChecksum']['requestAlgorithmMember']) if operation['httpChecksum']['requestAlgorithmMember']
+              operation['httpChecksum']['requestValidationModeMember'] = underscore(operation['httpChecksum']['requestValidationModeMember']) if operation['httpChecksum']['requestValidationModeMember']
+
+              o.http_checksum = operation['httpChecksum'].inject([]) do |a, (k, v)|
+                a << { key: k.inspect, value: v.inspect }
+                a
+              end
+            end
             %w(input output).each do |key|
               if operation[key]
                 o.shape_references << "o.#{key} = #{operation_ref(operation[key])}"
@@ -535,6 +548,9 @@ module AwsSdkCodeGenerator
         # @return [Boolean]
         attr_accessor :http_checksum_required
 
+        # @return [Hash]
+        attr_accessor :http_checksum
+
         # @return [Array<String>]
         attr_accessor :shape_references
 

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

@@ -18,6 +18,7 @@ module AwsSdkCodeGenerator
       # @option options [required, Hash] :api
       # @option options [Hash] :waiters
       # @option options [Hash] :client_examples
+      # @option options [Array<CodegeneratedPlugin] :codegenerated_plugins
       def initialize(options)
         @service_identifier = options.fetch(:service_identifier)
         @service_name = options.fetch(:service_name)
@@ -25,7 +26,11 @@ module AwsSdkCodeGenerator
         @gem_name = options.fetch(:gem_name)
         @gem_version = options.fetch(:gem_version)
         @plugins = PluginList.new(options)
-        @client_constructor = ClientConstructor.new(options.merge(plugins: @plugins))
+        @codegenerated_plugins = options.fetch(:codegenerated_plugins, [])
+        @client_constructor = ClientConstructor.new(
+          options.merge(
+            plugins: @plugins,
+            codegenerated_plugins: @codegenerated_plugins))
         @operations = ClientOperationList.new(options).to_a
         @waiters = Waiter.build_list(options[:waiters])
         @custom = options.fetch(:custom)
@@ -65,7 +70,7 @@ module AwsSdkCodeGenerator
 
       # @return [Array<String>]
       def plugin_class_names
-        @plugins.map(&:class_name)
+        @plugins.map(&:class_name) + @codegenerated_plugins.map(&:class_name)
       end
 
       # @return [Array<Waiter>]

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

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+module AwsSdkCodeGenerator
+  module Views
+    class EndpointParametersClass < View
+
+      # @option options [required, Service] :service
+      def initialize(options)
+        @service = options.fetch(:service)
+        if (parameters = @service.endpoint_rules&.fetch('parameters'))
+          @parameters = parameters.map do |k,p|
+            EndpointParameter.new(k, p)
+          end
+        end
+      end
+
+      # @return [Array<EndpointParameter>]
+      attr_reader :parameters
+
+      # @return [String|nil]
+      def generated_src_warning
+        return if @service.protocol == 'api-gateway'
+        GENERATED_SRC_WARNING
+      end
+
+      def module_name
+        @service.module_name
+      end
+
+      class EndpointParameter
+        def initialize(name, definition={})
+          @name = name
+          @type = definition['type']
+          @built_in = definition['builtIn']
+          @default = definition['default']
+          @required = definition['required']
+          @documentation = "# @!attribute #{underscore_name}\n"
+          if definition['documentation']
+            @documentation += "  #   #{definition['documentation']}\n"
+          end
+          if deprecated = definition['deprecated']
+            @documentation += "  #\n  #   @deprecated\n"
+            if deprecated['message']
+              @documentation += "  #     #{deprecated['message']}\n"
+            end
+            if deprecated['since']
+              @documentation += "  #     Since: #{deprecated['since']}\n"
+            end
+          end
+          @documentation += "  #\n  #   @return [#{@type}]\n  #"
+        end
+
+        # @return [String]
+        attr_reader :name
+
+        # @return [String]
+        attr_reader :documentation
+
+        # @return [Boolean]
+        attr_reader :required
+
+        # @return [String,Boolean]
+        attr_reader :default
+
+        def default?
+          !@default.nil?
+        end
+
+        def boolean_default?
+          default? && (@default == true || @default == false)
+        end
+
+        def underscore_name
+          Underscore.underscore(name)
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module AwsSdkCodeGenerator
+  module Views
+    class EndpointProviderClass < View
+
+      # @option options [required, Service] :service
+      # @option options [required, Hash] :endpoint_rules
+      def initialize(options)
+        @service = options.fetch(:service)
+        @endpoint_rules = @service.endpoint_rules
+
+        version = @endpoint_rules['version']
+        return if version&.match(/^\d+\.\d+$/) # && version == '1.0'
+
+        raise 'Endpoint Rules version must be 1.0'
+      end
+
+      # @return [String|nil]
+      def generated_src_warning
+        return if @service.protocol == 'api-gateway'
+        GENERATED_SRC_WARNING
+      end
+
+      def module_name
+        @service.module_name
+      end
+
+      def endpoint_rules_encoded
+        Base64.encode64(JSON.dump(@endpoint_rules))
+      end
+    end
+  end
+end