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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4fa27373a270b0e11b172d68ccc2c1c5b7926f986a1fb630be00b0a591a956a
-  data.tar.gz: 78f1365cdb7d7b78bdb6b2269e8ce18a42907eff158f7dae9b20c7fcaf6b6a88
+  metadata.gz: 0cd62265104fa228849cca4ee26d749025e7ba94a0ff446885abc045a17a91cf
+  data.tar.gz: 537442139442f772fecb3e829a9a584a07bf6795757c01b90032f78c5b4fde99
 SHA512:
-  metadata.gz: 94e82e811fa8689c93762b0c590f2d12f3c0dbda5d040d932d7caeb5396096cf8b2109394bb992f0325b137993534cadd0905515f7265e74b25b9de81efb9f51
-  data.tar.gz: b7f27268bbc20faa1c6a6439019ca9ec57e905f509ff4b95904eb0e6b13f0bf6e87f6eca0b81b1235d60f5d961fc0bbd5fd2c97ed7076cda9c7bc8b595966c1a
+  metadata.gz: 7dd69754c3ad489c192c4db3986fc79376dbd34316f5d6d79694e5807824d36de9333762d49727a4e92525bbea4b0190803474641282499e116afd7955d6a162
+  data.tar.gz: a44c6a9fd0a8778bbe4d00c73dcc07584b1beac9c278671f006c349c7e7f0a36d6e8fa18084ebd61984769496abde3faf9037b85d09e40ce7c86d9f823030923

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

@@ -77,7 +77,12 @@ module AwsSdkCodeGenerator
             "Hash<String,#{ruby_input_type(shape['value'], api, operation, nested: true)}>"
           end
         when 'string' then 'String'
-        when 'structure' then "Types::#{shape_ref['shape']}"
+        when 'structure'
+          if shape['document']
+            'Hash,Array,String,Numeric,Boolean'
+          else
+            "Types::#{shape_ref['shape']}"
+          end
         when 'timestamp' then 'Time,DateTime,Date,Integer,String'
         else
           raise "unhandled type #{shape.type}.inspect"
@@ -98,7 +103,12 @@ module AwsSdkCodeGenerator
         when 'long' then 'Integer'
         when 'map' then "Hash<String,#{ruby_type(shape['value'], api)}>"
         when 'string' then streaming?(shape_ref, api) ? 'IO' : 'String'
-        when 'structure' then "Types::#{shape_ref['shape']}"
+        when 'structure'
+          if shape['document']
+            'Hash,Array,String,Numeric,Boolean'
+          else
+            "Types::#{shape_ref['shape']}"
+          end
         when 'timestamp' then 'Time'
         else
           raise "unhandled type #{shape['type'].inspect}"

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

@@ -3,6 +3,10 @@
 module AwsSdkCodeGenerator
   class ClientOperationDocumentation
 
+    # get all of the enumerable methods that may conflict with members
+    # count has special handling in UnsafeEnumerableMethods
+    ENUMERABLE_METHODS = Class.new.new.extend(Enumerable).methods - [:count]
+
     # @option options [required, String] :method_name
     # @option options [required, Hash] :operation
     # @option options [required, Hash] :api
@@ -57,7 +61,7 @@ module AwsSdkCodeGenerator
         : request_syntax_example(method_name, operation, api),
         response_structure_example(operation, api),
         waiters_tag(@waiters),
-        see_also_tag(operation, api),
+        see_also_tag(@name, api),
       ], block_comment: false)
     end
     alias to_s to_str
@@ -100,6 +104,12 @@ module AwsSdkCodeGenerator
           if member_ref['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']
+            docstring = docstring.to_s + "<p>Document type used to carry open content (Hash,Array,String,Numeric,Boolean). A document type value is serialized using the same format as its surroundings and requires no additional encoding or escaping.</p>"
+          end
+          if member_ref['union']
+            docstring = docstring.to_s + "<p>This is a union type and you must set exactly one of the members.</p>"
+          end
           YardOptionTag.new(
             name: Underscore.underscore(member_name),
             ruby_type: Api.ruby_input_type(member_ref, api, operation),
@@ -130,7 +140,11 @@ module AwsSdkCodeGenerator
         methods = shape['members'].map do |member_name, member_ref|
           member_type = Docstring.escape_html(Api.ruby_type(member_ref, api))
           method_name = Underscore.underscore(member_name)
-          "#   * {#{type}##{method_name} ##{method_name}} => #{member_type}"
+          if ENUMERABLE_METHODS.include?(method_name.to_sym)
+            "#   * {#{type}##{method_name} #data.#{method_name}} => #{member_type} (This method conflicts with a method on Response, call it through the data member)"
+          else
+            "#   * {#{type}##{method_name} ##{method_name}} => #{member_type}"
+          end
         end
         "# @return [#{type}] Returns a {Seahorse::Client::Response response} object which responds to the following methods:\n#\n" + methods.join("\n")
       else
@@ -260,7 +274,7 @@ module AwsSdkCodeGenerator
     def see_also_tag(operation, api)
       uid = api['metadata']['uid']
       if api['metadata']['protocol'] != 'api-gateway' && Crosslink.taggable?(uid)
-        "# " + Crosslink.tag_string(uid, operation['name'])
+        "# " + Crosslink.tag_string(uid, operation)
       end
     end
 

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

@@ -5,6 +5,8 @@ require 'set'
 module AwsSdkCodeGenerator
   class ClientResponseStructureExample
 
+    ENUMERABLE_METHODS = Class.new.new.extend(Enumerable).methods - [:count]
+
     # @option options [required, Hash] :shape_ref
     # @option options [required, Hash] :api
     def initialize(options = {})
@@ -40,7 +42,12 @@ module AwsSdkCodeGenerator
         return event_ctx
       elsif shape['members']
         shape['members'].each_pair do |member_name, member_ref|
-          lines += entry(member_ref, "#{context}.#{underscore(member_name)}", visited)
+          method_name = underscore(member_name)
+          if context == 'resp' && ENUMERABLE_METHODS.include?(method_name.to_sym)
+            lines += entry(member_ref, "#{context}.data.#{method_name}", visited)
+          else
+            lines += entry(member_ref, "#{context}.#{method_name}", visited)
+          end
         end
       end
       lines

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

@@ -59,7 +59,7 @@ module AwsSdkCodeGenerator
           y.yield("#{prefix}/plugins/apig_endpoint.rb", apig_endpoint_class)
         end
         y.yield("#{prefix}.rb", service_module(prefix))
-        unless prefix == 'aws-sdk-sts'
+        unless %w[aws-sdk-sts aws-sdk-sso].include? prefix
           y.yield("#{prefix}/customizations.rb", '')
         end
         y.yield("#{prefix}/types.rb", types_module)

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

@@ -8,11 +8,16 @@ module AwsSdkCodeGenerator
     def initialize(options)
       @options = options
       @service = options.fetch(:service)
+      validate_model!
     end
 
     # @return [Hash]
     attr_reader :options
 
+    def validate_model!
+      validate_document_support!
+    end
+
     def each(&block)
       Enumerator.new do |y|
         y.yield("#{@service.gem_name}.gemspec", gemspec_file)
@@ -24,6 +29,7 @@ module AwsSdkCodeGenerator
           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)
@@ -61,5 +67,22 @@ module AwsSdkCodeGenerator
       Views::Version.new(options).render
     end
 
+    def license_file
+      File.read(File.expand_path('../../../templates/license.txt',__FILE__ ))
+    end
+
+    private
+
+    # document types are only supported for rest-json and json
+    def validate_document_support!
+      return if ['rest-json', 'json'].include?(@service.protocol)
+
+      # Check all shapes and raise if any are Document types
+      @service.api.fetch('shapes', {}).each do |name, shape|
+        if shape['type'] == 'structure' && shape['document']
+          raise "Shape #{name} is a document type.  Document types are only supported in json protocols."
+        end
+      end
+    end
   end
 end

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

@@ -31,6 +31,15 @@ module AwsSdkCodeGenerator
       end.join('.')
     end
 
+    # convert a snake case to pascal case
+    def pascal_case(str)
+      str
+        .to_s
+        .split('_')
+        .collect(&:capitalize)
+        .join
+    end
+
     def structures
       Enumerator.new do |y|
         (@api['shapes'] || {}).each do |shape_name, shape|
@@ -167,7 +176,7 @@ module AwsSdkCodeGenerator
     end
 
     module_function :deep_copy, :operation_streaming?, :downcase_first, :wrap_string, :apig_prefix,
-      :eventstream_output?, :eventstream_input?, :operation_eventstreaming?
+      :eventstream_output?, :eventstream_input?, :operation_eventstreaming?, :pascal_case
 
   end
 end

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

@@ -64,6 +64,7 @@ module AwsSdkCodeGenerator
 
     def default_async_plugins
       plugins = default_plugins.dup
+      plugins.delete('Seahorse::Client::Plugins::ContentLength')
       plugins.delete('Aws::Plugins::ResponsePaging')
       plugins.delete('Aws::Plugins::EndpointDiscovery')
       plugins.delete('Aws::Plugins::EndpointPattern')

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

@@ -30,7 +30,9 @@ module AwsSdkCodeGenerator
         'timestampFormat' => true, # glacier api customization
         'xmlNamespace' => true,
         'streaming' => true, # transfer-encoding
-        'requiresLength' => true, # transder-encoding
+        'requiresLength' => true, # transfer-encoding
+        'union' => false,
+        'document' => true,
         # event stream modeling
         'event' => false,
         'eventstream' => false,
@@ -60,7 +62,7 @@ module AwsSdkCodeGenerator
         'max' => false,
         'wrapper' => false,
         'xmlOrder' => false,
-        'retryable' => false
+        'retryable' => false,
       }
 
       METADATA_KEYS = {
@@ -127,13 +129,22 @@ module AwsSdkCodeGenerator
             shape_name = lstrip_prefix(upcase_first(shape_name))
           end
           lines = []
-          if non_error_struct?(shape)
+          if non_error_struct?(shape) && !document_struct?(shape)
             required = Set.new(shape['required'] || [])
             unless shape['members'].nil?
               shape['members'].each do |member_name, member_ref|
                 lines << "#{shape_name}.add_member(:#{underscore(member_name)}, #{shape_ref(member_ref, member_name, required)})"
               end
             end
+            if shape['union']
+              lines << "#{shape_name}.add_member(:unknown, Shapes::ShapeRef.new(shape: nil, location_name: 'unknown'))"
+              shape['members'].each do |member_name, member_ref|
+                member_name_underscore = underscore(member_name)
+                member_class_name = pascal_case(member_name_underscore)
+                lines << "#{shape_name}.add_member_subclass(:#{member_name_underscore}, Types::#{shape_name}::#{member_class_name})"
+              end
+              lines << "#{shape_name}.add_member_subclass(:unknown, Types::#{shape_name}::Unknown)"
+            end
             lines << "#{shape_name}.struct_class = Types::#{shape_name}"
             if payload = shape['payload']
               lines << "#{shape_name}[:payload] = :#{underscore(payload)}"
@@ -258,7 +269,11 @@ module AwsSdkCodeGenerator
         if @service.protocol == 'api-gateway' && type == 'timestamp'
           shape['timestampFormat'] = 'iso8601'
         end
-        if SHAPE_CLASSES.key?(type)
+        if document_struct?(shape)
+          ["Shapes::DocumentShape", shape]
+	      elsif shape['union']
+          ["Shapes::UnionShape", shape]
+        elsif SHAPE_CLASSES.key?(type)
           ["Shapes::#{SHAPE_CLASSES[type]}", shape]
         else
           raise ArgumentError, "unsupported shape type `#{type}'"
@@ -315,6 +330,10 @@ module AwsSdkCodeGenerator
           (shape['error'] || shape['exception'])
       end
 
+      def document_struct?(shape)
+        shape['type'] == 'structure' && shape['document']
+      end
+
       def structure_shape_enum
         Enumerator.new do |y|
           shape_enum.each do |shape_name, shape|

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

@@ -30,7 +30,7 @@ module AwsSdkCodeGenerator
       end
 
       def email
-        @custom ? 'yourname@email.com' : 'trevrowe@amazon.com'
+        @custom ? 'yourname@email.com' : 'aws-dr-rubygems@amazon.com'
       end
 
       # @return [String]
@@ -58,7 +58,7 @@ module AwsSdkCodeGenerator
 
       # @return [String]
       def code_uri
-        "https://github.com/aws/aws-sdk-ruby/tree/master/gems/#{gem_name}"
+        "https://github.com/aws/aws-sdk-ruby/tree/version-3/gems/#{gem_name}"
       end
 
       # @return [Array<Dependency>]

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

@@ -51,6 +51,14 @@ module AwsSdkCodeGenerator
         @service.gem_dependencies.keys
       end
 
+      # @return [Boolean] - Return true if a check is needed before
+      # requiring core to prevent circular dependencies.
+      # This is required to support backwards compatibility for SSO which was
+      # moved from the aws-sdk-sso gem into aws-sdk-core.
+      def require_core_guard?
+        name == 'SSO' || name == 'STS'
+      end
+
       # @return [Array<String>]
       def relative_requires
         paths = Set.new

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

@@ -13,6 +13,7 @@ module AwsSdkCodeGenerator
         @service = options.fetch(:service)
         @api = @service.api
         @input_shapes = compute_input_shapes(@service.api)
+        @output_shapes = compute_output_shapes(@service.api)
       end
 
       # @return [String|nil]
@@ -47,7 +48,7 @@ module AwsSdkCodeGenerator
           # eventstream shape will be inheriting from enumerator
           if shape['eventstream']
             list
-          elsif shape['type'] == 'structure'
+          elsif shape['type'] == 'structure' && !shape['document']
             struct_members = struct_members(shape)
             sensitive_params = struct_members.select(&:sensitive).map do |m|
               m.member_name.to_sym
@@ -56,7 +57,8 @@ module AwsSdkCodeGenerator
               class_name: shape_name,
               members: struct_members,
               sensitive_params: sensitive_params,
-              documentation: struct_class_docs(shape_name)
+              documentation: struct_class_docs(shape_name, shape),
+              union: shape['union']
             )
           else
             list
@@ -71,7 +73,7 @@ module AwsSdkCodeGenerator
             list << EventStreamClass.new(
               class_name: shape_name,
               types: struct_members(shape),
-              documentation: eventstream_class_docs(shape_name)
+              documentation: eventstream_class_docs(shape_name, shape)
             )
           else
             list
@@ -97,19 +99,20 @@ module AwsSdkCodeGenerator
         members
       end
 
-      def struct_class_docs(shape_name)
+      def struct_class_docs(shape_name, shape)
         join_docstrings([
           html_to_markdown(Api.docstring(shape_name, @api)),
-          input_example_docs(shape_name),
+          input_example_docs(shape_name, shape),
+          output_example_docs(shape_name, shape),
           attribute_macros_docs(shape_name),
           see_also_tag(shape_name),
         ])
       end
 
-      def eventstream_class_docs(shape_name)
+      def eventstream_class_docs(shape_name, shape)
         join_docstrings([
           html_to_markdown(Api.docstring(shape_name, @api)),
-          input_example_docs(shape_name),
+          input_example_docs(shape_name, shape),
           eventstream_docs(shape_name),
           see_also_tag(shape_name),
         ])
@@ -120,11 +123,24 @@ module AwsSdkCodeGenerator
         " #event_types #=> Array, returns all modeled event types in the stream"
       end
 
-      def input_example_docs(shape_name)
+      def output_example_docs(shape_name, shape)
+        if @output_shapes.include?(shape_name)
+          if shape['union']
+            "@note #{shape_name} is a union - when returned from an API call"\
+            ' exactly one value will be set and the returned type will'\
+            " be a subclass of #{shape_name} corresponding to the set member."
+          end
+        end
+      end
+
+      def input_example_docs(shape_name, shape)
         if @input_shapes.include?(shape_name)
           return if shape(shape_name)['members'].nil?
           if shape(shape_name)['members'].empty?
-            note = '@api private'
+            '@api private'
+          elsif shape['union']
+            "@note #{shape_name} is a union - when making an API calls you"\
+            ' must set exactly one of the members.'
           else
             note = "@note When making an API call, you may pass #{shape_name}\n"
             note += "  data as a hash:\n\n"
@@ -172,11 +188,19 @@ module AwsSdkCodeGenerator
       def compute_input_shapes(api)
         inputs = Set.new
         (api['operations'] || {}).each do |_, operation|
-          visit_inputs(operation['input'], inputs) if operation['input']
+          visit_shapes(operation['input'], inputs) if operation['input']
         end
         inputs
       end
 
+      def compute_output_shapes(api)
+        outputs = Set.new
+        (api['operations'] || {}).each do |_, operation|
+          visit_shapes(operation['output'], outputs) if operation['output']
+        end
+        outputs
+      end
+
       def idempotency_token?(member_ref)
         member_ref['idempotencyToken'] || shape(member_ref)['idempotencyToken']
       end
@@ -185,22 +209,22 @@ module AwsSdkCodeGenerator
         "<p><b>A suitable default value is auto-generated.</b> You should normally not need to pass this option.</p>"
       end
 
-      def visit_inputs(shape_ref, inputs)
-        return if inputs.include?(shape_ref['shape']) # recursion
-        inputs << shape_ref['shape']
+      def visit_shapes(shape_ref, shapes)
+        return if shapes.include?(shape_ref['shape']) # recursion
+        shapes << shape_ref['shape']
         s = shape(shape_ref)
         raise "cannot locate shape #{shape_ref['shape']}" if s.nil?
         case s['type']
         when 'structure'
           return if s['members'].nil?
           s['members'].each_pair do |_, member_ref|
-            visit_inputs(member_ref, inputs)
+            visit_shapes(member_ref, shapes)
           end
         when 'list'
-          visit_inputs(s['member'], inputs)
+          visit_shapes(s['member'], shapes)
         when 'map'
-          visit_inputs(s['key'], inputs)
-          visit_inputs(s['value'], inputs)
+          visit_shapes(s['key'], shapes)
+          visit_shapes(s['value'], shapes)
         end
       end
 
@@ -245,6 +269,8 @@ module AwsSdkCodeGenerator
           @members = options.fetch(:members)
           @documentation = options.fetch(:documentation)
           @sensitive_params = options.fetch(:sensitive_params)
+          @union = options.fetch(:union)
+          @members << StructMember.new(member_name: :unknown, member_class_name: 'Unknown') if @union
           if @members.nil? || @members.empty?
             @empty = true
           else
@@ -265,6 +291,11 @@ module AwsSdkCodeGenerator
         # @return [Array<Symbol>]
         attr_accessor :sensitive_params
 
+        # @return [Boolean]
+        def union?
+          @union
+        end
+
         # @return [Boolean]
         def empty?
           @empty
@@ -275,6 +306,7 @@ module AwsSdkCodeGenerator
 
         def initialize(options)
           @member_name = options.fetch(:member_name)
+          @member_class_name = AwsSdkCodeGenerator::Helper::pascal_case(@member_name)
           @sensitive = options.fetch(:sensitive, false)
           @last = false
         end
@@ -285,6 +317,9 @@ module AwsSdkCodeGenerator
         # @return [Boolean]
         attr_accessor :sensitive
 
+        # @return [String]
+        attr_accessor :member_class_name
+
         # @return [Boolean]
         attr_accessor :last
 

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

@@ -76,7 +76,7 @@ module AwsSdkCodeGenerator
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
   WARNING_TXT

data/templates/async_client_class.mustache

@@ -3,11 +3,9 @@
 {{#generated_src_warning}}
 {{generated_src_warning}}
 {{/generated_src_warning}}
-if RUBY_VERSION >= '2.1'
-  begin
-    require 'http/2'
-  rescue LoadError; end
-end
+begin
+  require 'http/2'
+rescue LoadError; end
 {{#plugin_requires}}
 require '{{.}}'
 {{/plugin_requires}}

data/templates/gemspec.mustache

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.license       = 'Apache-2.0'
   spec.email         = ['{{email}}']
   spec.require_paths = ['lib']
-  spec.files         = Dir['lib/**/*.rb']
+  spec.files         = Dir['LICENSE.txt', 'CHANGELOG.md', 'VERSION', 'lib/**/*.rb']
 
   {{#metadata}}
   spec.metadata = {
@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency('{{gem}}', '{{&version}}')
   {{/dependencies}}
 
+  spec.required_ruby_version = '>= 2.3'
 end

data/templates/license.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/templates/service_module.mustache

@@ -3,9 +3,19 @@
 {{#generated_src_warning}}
 {{generated_src_warning}}
 {{/generated_src_warning}}
+
+{{#require_core_guard?}}
+unless Module.const_defined?(:Aws)
+  {{#requires}}
+  require '{{.}}'
+  {{/requires}}
+end
+{{/require_core_guard?}}
+{{^require_core_guard?}}
 {{#requires}}
 require '{{.}}'
 {{/requires}}
+{{/require_core_guard?}}
 
 {{#relative_requires}}
 require_relative '{{.}}'
@@ -40,7 +50,7 @@ require_relative '{{.}}'
 #
 # See {Errors} for more information.
 #
-# @service
+# @!group service
 module {{module_name}}
 
   GEM_VERSION = '{{gem_version}}'

data/templates/types_module.mustache

@@ -18,6 +18,13 @@ module {{module_name}}
       {{/members}}
       SENSITIVE = {{sensitive_params}}
       include Aws::Structure
+      {{#union?}}
+      include Aws::Structure::Union
+
+      {{#members}}
+      class {{member_class_name}} < {{class_name}}; end
+      {{/members}}
+      {{/union?}}
     end
     {{/empty?}}
     {{/structures}}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-code-generator
 version: !ruby/object:Gem::Version
-  version: 0.2.2.pre
+  version: 0.2.4.pre
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-04 00:00:00.000000000 Z
+date: 2021-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -40,7 +40,7 @@ dependencies:
         version: '0'
 description: Generates the service code for the AWS SDK for Ruby
 email:
-- trevrowe@amazon.com
+- aws-dr-rubygems@amazon.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -130,6 +130,7 @@ files:
 - templates/features/smoke_step_definitions.mustache
 - templates/features/step_definitions.mustache
 - templates/gemspec.mustache
+- templates/license.txt
 - templates/method.mustache
 - templates/resource_class.mustache
 - templates/root_resource_class.mustache
@@ -157,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.7
 signing_key:
 specification_version: 4
 summary: AWS SDK for Ruby - Code Generator