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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a65077a940c697e439cae503d4683f5aec9dd5aee7a154b63f380543786d524c
-  data.tar.gz: 197c2c803eb600eb4d68f3b36a4ed0acec2effa7f3de11ec2dc610b610fd7765
+  metadata.gz: e4fa27373a270b0e11b172d68ccc2c1c5b7926f986a1fb630be00b0a591a956a
+  data.tar.gz: 78f1365cdb7d7b78bdb6b2269e8ce18a42907eff158f7dae9b20c7fcaf6b6a88
 SHA512:
-  metadata.gz: 0403d7112475a44303431fbb706b7aa7fbf2d5422cfb8ba3d9f240e13e85ea638f358e19d9678d16ea8b6f87745728a55fdf20193c86e504c3828c0f6476fb1f
-  data.tar.gz: e0623c91975e000b312db4d0106280b9655a0c1985e8684249dfd41171aeba38fe218ae88574e012b1d8a4879bfe03df3aa0515567fb05fe116c7567bb04e604
+  metadata.gz: 94e82e811fa8689c93762b0c590f2d12f3c0dbda5d040d932d7caeb5396096cf8b2109394bb992f0325b137993534cadd0905515f7265e74b25b9de81efb9f51
+  data.tar.gz: b7f27268bbc20faa1c6a6439019ca9ec57e905f509ff4b95904eb0e6b13f0bf6e87f6eca0b81b1235d60f5d961fc0bbd5fd2c97ed7076cda9c7bc8b595966c1a

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

@@ -47,12 +47,17 @@ module AwsSdkCodeGenerator
         end
       end
 
-      def ruby_input_type(shape_ref, api, options = {})
+      def ruby_input_type(shape_ref, api, operation = nil, options = {})
         nested = options.fetch(:nested, false)
         _, shape = resolve(shape_ref, api)
         case shape['type']
         when 'byte' then 'Integer<byte>'
-        when 'blob' then 'String, IO'
+        when 'blob'
+          if streaming_input?(shape, operation)
+            'String, IO'
+          else
+            'String, StringIO, File'
+          end
         when 'boolean' then 'Boolean'
         when 'character' then 'String<character>'
         when 'double' then 'Float'
@@ -62,14 +67,14 @@ module AwsSdkCodeGenerator
           if nested
             "Array"
           else
-            "Array<#{ruby_input_type(shape['member'], api, nested: true)}>"
+            "Array<#{ruby_input_type(shape['member'], api, operation, nested: true)}>"
           end
         when 'long' then 'Integer'
         when 'map'
           if nested
             "Hash"
           else
-            "Hash<String,#{ruby_input_type(shape['value'], api, nested: true)}>"
+            "Hash<String,#{ruby_input_type(shape['value'], api, operation, nested: true)}>"
           end
         when 'string' then 'String'
         when 'structure' then "Types::#{shape_ref['shape']}"
@@ -113,6 +118,12 @@ module AwsSdkCodeGenerator
         ref['eventstream'] || shape['eventstream']
       end
 
+      # @return [Boolean]
+      def streaming_input?(shape, operation)
+        shape['streaming'] && operation &&
+          operation['authtype'] == "v4-unsigned-body"
+      end
+
       def plural?(resource)
         plural = false
         (resource['identifiers'] || []).each do |i|
@@ -124,7 +135,6 @@ module AwsSdkCodeGenerator
         plural = true if resource['data'] && resource['data'].include?('[]')
         plural
       end
-
     end
   end
 end

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

@@ -102,7 +102,7 @@ module AwsSdkCodeGenerator
           end
           YardOptionTag.new(
             name: Underscore.underscore(member_name),
-            ruby_type: Api.ruby_input_type(member_ref, api),
+            ruby_type: Api.ruby_input_type(member_ref, api, operation),
             required: shape.fetch('required', []).include?(member_name),
             docstring: Docstring.html_to_markdown(docstring),
             option_hash_name: 'params',

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

@@ -41,64 +41,6 @@ module AwsSdkCodeGenerator
       end
     end
 
-    # @option options [Boolean] :nested (false)
-    def ruby_input_type(shape_ref, options = {})
-      nested = options.fetch(:nested, false)
-      shape = @api['shapes'][shape_ref['shape']]
-      case shape['type']
-      when 'byte' then 'Integer<byte>'
-      when 'blob' then 'String, IO'
-      when 'boolean' then 'Boolean'
-      when 'character' then 'String<character>'
-      when 'double' then 'Float'
-      when 'float' then 'Float'
-      when 'integer' then 'Integer'
-      when 'list'
-        if nested
-          "Array"
-        else
-          "Array<#{ruby_input_type(shape['member'], nested:true)}>"
-        end
-      when 'long' then 'Integer'
-      when 'map'
-        if nested
-          "Hash"
-        else
-          "Hash<String,#{ruby_input_type(shape['value'], nested:true)}>"
-        end
-      when 'string' then 'String'
-      when 'structure' then "Types::#{shape_ref['shape']}"
-      when 'timestamp' then 'Time,DateTime,Date,Integer,String'
-      else
-        raise "unhandled type #{shape.type}.inspect"
-      end
-    end
-
-    def ruby_type(shape_ref)
-      shape = @api['shapes'][shape_ref['shape']]
-      case shape['type']
-      when 'blob' then streaming?(shape_ref, shape) ? 'IO' : 'String'
-      when 'boolean' then 'Boolean'
-      when 'byte' then 'Integer<byte>'
-      when 'character' then 'String<character>'
-      when 'double' then 'Float'
-      when 'float' then 'Float'
-      when 'integer' then 'Integer'
-      when 'list' then "Array<#{ruby_type(shape['member'])}>"
-      when 'long' then 'Integer'
-      when 'map' then "Hash<String,#{ruby_type(shape['value'])}>"
-      when 'string' then 'String'
-      when 'structure' then "Types::#{shape_ref['shape']}"
-      when 'timestamp' then 'Time'
-      else
-        raise "unhandled type #{shape['type'].inspect}"
-      end
-    end
-
-    def streaming?(ref, shape)
-      ref['streaming'] || shape['streaming']
-    end
-
     # @option options [Integer] :line_width (70)
     def documentation(ref_or_shape, options = {})
       line_width = options.fetch(:line_width, 70)

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

@@ -27,7 +27,7 @@ module AwsSdkCodeGenerator
         plugins.delete(plugin_name)
       end
       plugins.map do |class_name, path|
-        path = "./#{path}" unless path[0] == '/'
+        path = File.absolute_path(path)
         Kernel.require(path)
 
         Plugin.new(

data/lib/aws-sdk-code-generator/views/features/smoke.rb

@@ -15,6 +15,7 @@ module AwsSdkCodeGenerator
           # This will only be called if this is defined
           smoke_json = service.smoke_tests
           @client_region = smoke_json["defaultRegion"]
+          @client_endpoint = smoke_json["defaultEndpoint"]
           @smoke_tests = smoke_json["testCases"].map do |test|
             h = {
               operation: underscore(test["operationName"]),
@@ -37,7 +38,7 @@ module AwsSdkCodeGenerator
           end
         end
 
-        attr_reader :service, :client_region, :smoke_tests
+        attr_reader :service, :client_region, :client_endpoint, :smoke_tests
 
         # @return [String|nil]
         def generated_src_warning

data/lib/aws-sdk-code-generator/views/features/step_definitions.rb

@@ -11,10 +11,12 @@ module AwsSdkCodeGenerator
           service = options.fetch(:service)
           @var_name = service.identifier
           @module_name = service.module_name
+          if service.smoke_tests
+            @client_endpoint = service.smoke_tests['defaultEndpoint']
+          end
         end
 
-        attr_reader :var_name
-        attr_reader :module_name
+        attr_reader :var_name, :module_name, :client_endpoint
 
       end
     end

data/templates/features/smoke.mustache

@@ -4,7 +4,12 @@
 Feature: Smoke tests for {{service}}
 
 Background:
+{{#client_endpoint}}
+  Given I create a client with endpoint '{{client_endpoint}}'
+{{/client_endpoint}}
+{{^client_endpoint}}
   Given I create a client in region '{{client_region}}'
+{{/client_endpoint}}
 {{#smoke_tests}}
 
   {{smoke_test_tags}}

data/templates/features/smoke_step_definitions.mustache

@@ -8,6 +8,10 @@ Given(/I create a client in region '(.*?)'/) do |region|
   @regional_client = {{module_name}}::Client.new(region: region)
 end
 
+Given(/I create a client with endpoint '(.*?)'/) do |endpoint|
+  @regional_client = {{module_name}}::Client.new(endpoint: endpoint)
+end
+
 When(/I call the operation '(.*?)' with params:/) do |operation, params|
   opts = JSON.parse(params, symbolize_names: true)
   begin

data/templates/features/step_definitions.mustache

@@ -1,5 +1,10 @@
 Before("@{{var_name}}") do
+{{#client_endpoint}}
+  @service = {{module_name}}::Resource.new(endpoint: '{{client_endpoint}}')
+{{/client_endpoint}}
+{{^client_endpoint}}
   @service = {{module_name}}::Resource.new
+{{/client_endpoint}}
   @client = @service.client
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-code-generator
 version: !ruby/object:Gem::Version
-  version: 0.2.1.pre
+  version: 0.2.2.pre
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-24 00:00:00.000000000 Z
+date: 2020-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown