Update protocol tests

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

@@ -60,16 +60,14 @@ def ruby_input_type(shape_ref, api, operation = nil, options = {})
           end
         when 'boolean' then 'Boolean'
         when 'character' then 'String<character>'
-        when 'double' then 'Float'
-        when 'float' then 'Float'
-        when 'integer' then 'Integer'
+        when 'double', 'float' then 'Float'
+        when 'integer', 'long', 'short' then 'Integer'
         when 'list'
           if nested
             "Array"
           else
             "Array<#{ruby_input_type(shape['member'], api, operation, nested: true)}>"
           end
-        when 'long' then 'Integer'
         when 'map'
           if nested
             "Hash"
@@ -96,11 +94,9 @@ def ruby_type(shape_ref, api)
         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 'double', 'float' then 'Float'
+        when 'integer', 'long', 'short' then 'Integer'
         when 'list' then "Array<#{ruby_type(shape['member'], api)}>"
-        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'

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

@@ -10,11 +10,9 @@ def to_type(shape_ref, api)
         when 'boolean' then 'bool'
         when 'byte' then '::Integer'
         when 'character' then '::String'
-        when 'double' then '::Float'
-        when 'float' then '::Float'
-        when 'integer' then '::Integer'
+        when 'double', 'float' then '::Float'
+        when 'integer', 'long', 'short' then '::Integer'
         when 'list' then "::Array[#{to_type(shape['member'], api)}]"
-        when 'long' then '::Integer'
         when 'map' then "::Hash[#{to_type(shape['key'], api)}, #{to_type(shape['value'], api)}]"
         when 'string'
           if shape['enum']

build_tools/aws-sdk-code-generator/lib/aws-sdk-code-generator/rbs/keyword_argument_builder.rb

@@ -79,14 +79,14 @@ def ref_value(ref, i, visited)
           end
         when 'blob'
           if ref['streaming']
-            "::String | ::StringIO | ::File" # input only
+            '::String | ::StringIO | ::File' # input only
           else
-            "::String"
+            '::String'
           end
         when 'list' then list(s, i, visited)
         when 'map' then map(s, i, visited)
-        when 'boolean' then "bool"
-        when 'integer', 'long' then '::Integer'
+        when 'boolean' then 'bool'
+        when 'integer', 'long', 'short' then '::Integer'
         when 'float', 'double' then '::Float'
         when 'byte' then '::Integer'
         when 'character' then '::String'

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

@@ -46,8 +46,8 @@ def ref_value(ref, i, visited)
 
       when 'list' then list(s, i, visited)
       when 'map' then map(s, i, visited)
-      when 'boolean' then "false"
-      when 'integer', 'long' then '1'
+      when 'boolean' then 'false'
+      when 'integer', 'long', 'short' then '1'
       when 'float', 'double' then '1.0'
       when 'byte' then '97'
       when 'character' then '"a"'

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

@@ -6,7 +6,7 @@ class ClientApiModule < View
 
       include Helper
 
-      SKIP_TRAITS = Set.new(%w(shape deprecated location locationName documentation))
+      SKIP_TRAITS = Set.new(%w[shape deprecated location locationName documentation])
 
       SHAPE_CLASSES = {
         'blob' => 'BlobShape',
@@ -16,13 +16,14 @@ class ClientApiModule < View
         'double' => 'FloatShape',
         'float' => 'FloatShape',
         'integer' => 'IntegerShape',
-        'list' => 'ListShape',
         'long' => 'IntegerShape',
+        'short' => 'IntegerShape',
+        'list' => 'ListShape',
         'map' => 'MapShape',
         'string' => 'StringShape',
         'structure' => 'StructureShape',
         'timestamp' => 'TimestampShape'
-      }
+      }.freeze
 
       SHAPE_KEYS = {
         # keep
@@ -65,7 +66,7 @@ class ClientApiModule < View
         'wrapper' => false,
         'xmlOrder' => false,
         'retryable' => false,
-      }
+      }.freeze
 
       METADATA_KEYS = {
         # keep all
@@ -89,7 +90,7 @@ class ClientApiModule < View
         'awsQueryCompatible' => true, # AwsQuery migration
         # ignore
         'ripServiceName' => true
-      }
+      }.freeze
 
       # @option options [required, Service] :service
       def initialize(options)
@@ -217,7 +218,7 @@ def operations
               end
             end
 
-            %w(input output).each do |key|
+            %w[input output].each do |key|
               if operation[key]
                 o.shape_references << "o.#{key} = #{operation_ref(operation[key])}"
               else

build_tools/aws-sdk-code-generator/spec/aws-sdk-code-generator/syntax_example_hash.rb

@@ -443,8 +443,9 @@ module AwsSdkCodeGenerator
                   'float' => { 'shape' => 'Float' },
                   'integer' => { 'shape' => 'Integer' },
                   'long' => { 'shape' => 'Long' },
+                  'short' => { 'shape' => 'Short' },
                   'string' => { 'shape' => 'StringShape' },
-                  'timestamp' => { 'shape' => 'Timestamp' },
+                  'timestamp' => { 'shape' => 'Timestamp' }
                 }
               },
               'Blob' => { 'type' => 'blob' },
@@ -454,7 +455,8 @@ module AwsSdkCodeGenerator
               'Double' => { 'type' => 'double' },
               'Float' => { 'type' => 'float' },
               'Long' => { 'type' => 'long' },
-              'Timestamp' => { 'type' => 'timestamp' },
+              'Short' => { 'type' => 'short' },
+              'Timestamp' => { 'type' => 'timestamp' }
             }
           }
         )

build_tools/aws-sdk-code-generator/spec/protocol-tests-ignore-list.json

@@ -0,0 +1,98 @@
+{
+  "ec2" :
+    {
+      "input" : [
+        "Ec2QuerySupportsNaNFloatInputs",
+        "Ec2QuerySupportsInfinityFloatInputs",
+        "Ec2QuerySupportsNegativeInfinityFloatInputs"
+      ],
+      "output" : [
+        "Ec2QuerySupportsNaNFloatOutputs",
+        "Ec2QuerySupportsInfinityFloatOutputs",
+        "Ec2QuerySupportsNegativeInfinityFloatOutputs"
+      ]
+    },
+  "json" : {
+    "input" : [
+      "AwsJson11SupportsNaNFloatInputs",
+      "AwsJson11SupportsInfinityFloatInputs",
+      "AwsJson11SupportsNegativeInfinityFloatInputs"
+    ],
+    "output" : [
+
+    ]
+  },
+  "json_1_0" : {
+    "input" : [
+      "AwsJson10SupportsNaNFloatInputs",
+      "AwsJson10SupportsInfinityFloatInputs",
+      "AwsJson10SupportsNegativeInfinityFloatInputs"
+    ],
+    "output" : [
+
+    ]
+  },
+  "query" : {
+    "input" : [
+      "AwsQuerySupportsNaNFloatInputs",
+      "AwsQuerySupportsInfinityFloatInputs",
+      "AwsQuerySupportsNegativeInfinityFloatInputs"
+    ],
+    "output" : [
+      "AwsQuerySupportsNaNFloatOutputs",
+      "AwsQuerySupportsInfinityFloatOutputs",
+      "AwsQuerySupportsNegativeInfinityFloatOutputs"
+    ]
+  },
+  "rest-json" : {
+    "input" : [
+      "RestJsonSupportsNaNFloatQueryValues",
+      "RestJsonSupportsInfinityFloatQueryValues",
+      "RestJsonSupportsNegativeInfinityFloatQueryValues",
+      "RestJsonHttpPayloadWithUnsetUnion",
+      "RestJsonSupportsNaNFloatLabels",
+      "RestJsonSupportsInfinityFloatLabels",
+      "RestJsonSupportsNegativeInfinityFloatLabels",
+      "RestJsonSupportsNaNFloatHeaderInputs",
+      "RestJsonSupportsInfinityFloatHeaderInputs",
+      "RestJsonSupportsNegativeInfinityFloatHeaderInputs",
+      "RestJsonSupportsNaNFloatInputs",
+      "RestJsonSupportsInfinityFloatInputs",
+      "RestJsonSupportsNegativeInfinityFloatInputs"
+    ],
+    "output" : [
+      "RestJsonInputAndOutputWithQuotedStringHeaders",
+      "RestJsonSupportsNaNFloatHeaderOutputs",
+      "RestJsonSupportsInfinityFloatHeaderOutputs",
+      "RestJsonSupportsNegativeInfinityFloatHeaderOutputs"
+    ]
+  },
+  "rest-xml" : {
+    "input" : [
+      "RestXmlSupportsNaNFloatQueryValues",
+      "RestXmlSupportsInfinityFloatQueryValues",
+      "RestXmlSupportsNegativeInfinityFloatQueryValues",
+      "RestXmlSupportsNaNFloatLabels",
+      "RestXmlSupportsInfinityFloatLabels",
+      "RestXmlSupportsNegativeInfinityFloatLabels",
+      "RestXmlSupportsNaNFloatHeaderInputs",
+      "RestXmlSupportsInfinityFloatHeaderInputs",
+      "RestXmlSupportsNegativeInfinityFloatHeaderInputs",
+      "RestXmlSupportsNaNFloatInputs",
+      "RestXmlSupportsInfinityFloatInputs",
+      "RestXmlSupportsNegativeInfinityFloatInputs"
+    ],
+    "output" : [
+      "RestXmlSupportsNaNFloatHeaderOutputs",
+      "RestXmlSupportsInfinityFloatHeaderOutputs",
+      "RestXmlSupportsNegativeInfinityFloatHeaderOutputs",
+      "RestXmlSupportsNaNFloatOutputs",
+      "RestXmlSupportsInfinityFloatOutputs",
+      "RestXmlSupportsNegativeInfinityFloatOutputs"
+    ]
+  },
+  "api-gateway" : {
+    "input" : [],
+    "output" : []
+  }
+}