Regenerate with some fixes

Author: mullermp

gems/smithy/lib/smithy/templates/client/protocol_spec.erb

@@ -1,5 +1,7 @@
 # This is generated code!
 
+require 'smithy-client/protocol_spec_matcher'
+
 require_relative '../spec_helper'
 
 module <%= module_name %>

gems/smithy/lib/smithy/templates/client/spec_helper.erb

@@ -7,4 +7,3 @@ $LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
 require '<%= gem_name %>'
 
 require 'rspec'
-require 'smithy-client/protocol_spec_matcher'

gems/smithy/lib/smithy/views/client/auth_resolver.rb

@@ -23,7 +23,9 @@ def auth_rules_code
           lines << 'options = []'
           auth_operations = operations_with_auth_traits
           if auth_operations.empty?
-            add_service_auth_schemes_to_code(lines)
+            service_auth_schemes.each do |auth_scheme|
+              lines << "options << Smithy::Client::AuthOption.new(scheme_id: '#{auth_scheme}')"
+            end
           else
             add_operation_case_to_code(lines, auth_operations)
           end
@@ -33,12 +35,6 @@ def auth_rules_code
 
         private
 
-        def add_service_auth_schemes_to_code(lines)
-          service_auth_schemes.each do |auth_scheme|
-            lines << "  options << Smithy::Client::AuthOption.new(scheme_id: '#{auth_scheme}')"
-          end
-        end
-
         def add_operation_case_to_code(lines, auth_operations)
           lines << 'case parameters.operation_name'
           auth_operations.each do |id, operation|
@@ -47,7 +43,9 @@ def add_operation_case_to_code(lines, auth_operations)
             add_operation_auth_options_to_code(lines, operation)
           end
           lines << 'else'
-          add_service_auth_schemes_to_code(lines)
+          service_auth_schemes.each do |auth_scheme|
+            lines << "  options << Smithy::Client::AuthOption.new(scheme_id: '#{auth_scheme}')"
+          end
           lines << 'end'
         end
 

projections/shapes/lib/shapes/client.rb

@@ -29,6 +29,7 @@ class Client < Smithy::Client::Base
     include Smithy::Client::Stubs
 
     self.service = Schema::ShapeService
+    @identifier = :shapeservice
 
     add_plugin(::ShapeService::Plugins::Endpoint)
     add_plugin(Smithy::Client::Plugins::ChecksumRequired)

projections/shapes/lib/shapes/schema.rb

@@ -3,8 +3,8 @@
 # This is generated code!
 
 module ShapeService
-
   # @api private
   module Waiters
+
   end
 end

projections/shapes/lib/shapes/waiters.rb

@@ -20,7 +20,6 @@ module ShapeService
         expect(endpoint.headers).to eq(expected['endpoint']['headers'] || {})
         expect(endpoint.properties).to eq(expected['endpoint']['properties'] || {})
       end
-
     end
 
     context "Endpoint not set" do
@@ -34,7 +33,6 @@ module ShapeService
           subject.resolve(params)
         end.to raise_error(ArgumentError, expected['error'])
       end
-
     end
   end
 end

projections/shapes/spec/shapes/endpoint_provider_spec.rb

@@ -7,4 +7,3 @@
 require 'shapes'
 
 require 'rspec'
-require 'smithy-client/protocol_spec_matcher'

projections/shapes/spec/spec_helper.rb

@@ -29,6 +29,7 @@ class Client < Smithy::Client::Base
     include Smithy::Client::Stubs
 
     self.service = Schema::Weather
+    @identifier = :weather
 
     add_plugin(::Weather::Plugins::Endpoint)
     add_plugin(Smithy::Client::Plugins::ChecksumRequired)

projections/weather/lib/weather/client.rb

@@ -6,44 +6,44 @@ module Weather
   # This module contains a schema composed of shapes used by the client.
   module Schema
 
-    CityCoordinates = ::Smithy::Schema::Shapes::StructureShape.new(id: 'example.weather#CityCoordinates', name: 'CityCoordinates')
-    CityId = ::Smithy::Schema::Shapes::StringShape.new(id: 'example.weather#CityId', name: 'CityId', traits: {"smithy.api#pattern" => "^[A-Za-z0-9 ]+$"})
-    CitySummaries = ::Smithy::Schema::Shapes::ListShape.new(id: 'example.weather#CitySummaries', name: 'CitySummaries')
-    CitySummary = ::Smithy::Schema::Shapes::StructureShape.new(id: 'example.weather#CitySummary', name: 'CitySummary', traits: {"smithy.api#references" => [{"resource" => "example.weather#City"}]})
-    GetCityInput = ::Smithy::Schema::Shapes::StructureShape.new(id: 'example.weather#GetCityInput', name: 'GetCityInput')
-    GetCityOutput = ::Smithy::Schema::Shapes::StructureShape.new(id: 'example.weather#GetCityOutput', name: 'GetCityOutput')
-    GetCurrentTimeOutput = ::Smithy::Schema::Shapes::StructureShape.new(id: 'example.weather#GetCurrentTimeOutput', name: 'GetCurrentTimeOutput')
-    GetForecastInput = ::Smithy::Schema::Shapes::StructureShape.new(id: 'example.weather#GetForecastInput', name: 'GetForecastInput')
-    GetForecastOutput = ::Smithy::Schema::Shapes::StructureShape.new(id: 'example.weather#GetForecastOutput', name: 'GetForecastOutput')
-    ListCitiesInput = ::Smithy::Schema::Shapes::StructureShape.new(id: 'example.weather#ListCitiesInput', name: 'ListCitiesInput')
-    ListCitiesOutput = ::Smithy::Schema::Shapes::StructureShape.new(id: 'example.weather#ListCitiesOutput', name: 'ListCitiesOutput')
-    NoSuchResource = ::Smithy::Schema::Shapes::StructureShape.new(id: 'example.weather#NoSuchResource', name: 'NoSuchResource', traits: {"smithy.api#error" => "client"})
+    CityCoordinates = ::Smithy::Schema::Shapes::StructureShape.new(id: "example.weather#CityCoordinates", name: "CityCoordinates")
+    CityId = ::Smithy::Schema::Shapes::StringShape.new(id: "example.weather#CityId", name: "CityId", traits: {"smithy.api#pattern" => "^[A-Za-z0-9 ]+$"})
+    CitySummaries = ::Smithy::Schema::Shapes::ListShape.new(id: "example.weather#CitySummaries", name: "CitySummaries")
+    CitySummary = ::Smithy::Schema::Shapes::StructureShape.new(id: "example.weather#CitySummary", name: "CitySummary", traits: {"smithy.api#references" => [{"resource" => "example.weather#City"}]})
+    GetCityInput = ::Smithy::Schema::Shapes::StructureShape.new(id: "example.weather#GetCityInput", name: "GetCityInput")
+    GetCityOutput = ::Smithy::Schema::Shapes::StructureShape.new(id: "example.weather#GetCityOutput", name: "GetCityOutput")
+    GetCurrentTimeOutput = ::Smithy::Schema::Shapes::StructureShape.new(id: "example.weather#GetCurrentTimeOutput", name: "GetCurrentTimeOutput")
+    GetForecastInput = ::Smithy::Schema::Shapes::StructureShape.new(id: "example.weather#GetForecastInput", name: "GetForecastInput")
+    GetForecastOutput = ::Smithy::Schema::Shapes::StructureShape.new(id: "example.weather#GetForecastOutput", name: "GetForecastOutput")
+    ListCitiesInput = ::Smithy::Schema::Shapes::StructureShape.new(id: "example.weather#ListCitiesInput", name: "ListCitiesInput")
+    ListCitiesOutput = ::Smithy::Schema::Shapes::StructureShape.new(id: "example.weather#ListCitiesOutput", name: "ListCitiesOutput")
+    NoSuchResource = ::Smithy::Schema::Shapes::StructureShape.new(id: "example.weather#NoSuchResource", name: "NoSuchResource", traits: {"smithy.api#error" => "client"})
 
-    CityCoordinates.add_member(:latitude, ::Smithy::Schema::Shapes::ShapeRef.new(shape: ::Smithy::Schema::Shapes::Prelude::Float, location_name: 'latitude', traits: {"smithy.api#required" => {}}))
-    CityCoordinates.add_member(:longitude, ::Smithy::Schema::Shapes::ShapeRef.new(shape: ::Smithy::Schema::Shapes::Prelude::Float, location_name: 'longitude', traits: {"smithy.api#required" => {}}))
+    CityCoordinates.add_member(:latitude, ::Smithy::Schema::Shapes::ShapeRef.new(shape: ::Smithy::Schema::Shapes::Prelude::Float, location_name: "latitude", traits: {"smithy.api#required" => {}}))
+    CityCoordinates.add_member(:longitude, ::Smithy::Schema::Shapes::ShapeRef.new(shape: ::Smithy::Schema::Shapes::Prelude::Float, location_name: "longitude", traits: {"smithy.api#required" => {}}))
     CityCoordinates.type = Types::CityCoordinates
     CitySummaries.member = ::Smithy::Schema::Shapes::ShapeRef.new(shape: CitySummary)
-    CitySummary.add_member(:city_id, ::Smithy::Schema::Shapes::ShapeRef.new(shape: CityId, location_name: 'cityId', traits: {"smithy.api#required" => {}}))
-    CitySummary.add_member(:name, ::Smithy::Schema::Shapes::ShapeRef.new(shape: ::Smithy::Schema::Shapes::Prelude::String, location_name: 'name', traits: {"smithy.api#required" => {}}))
+    CitySummary.add_member(:city_id, ::Smithy::Schema::Shapes::ShapeRef.new(shape: CityId, location_name: "cityId", traits: {"smithy.api#required" => {}}))
+    CitySummary.add_member(:name, ::Smithy::Schema::Shapes::ShapeRef.new(shape: ::Smithy::Schema::Shapes::Prelude::String, location_name: "name", traits: {"smithy.api#required" => {}}))
     CitySummary.type = Types::CitySummary
-    GetCityInput.add_member(:city_id, ::Smithy::Schema::Shapes::ShapeRef.new(shape: CityId, location_name: 'cityId', traits: {"smithy.api#required" => {}}))
+    GetCityInput.add_member(:city_id, ::Smithy::Schema::Shapes::ShapeRef.new(shape: CityId, location_name: "cityId", traits: {"smithy.api#required" => {}}))
     GetCityInput.type = Types::GetCityInput
-    GetCityOutput.add_member(:name, ::Smithy::Schema::Shapes::ShapeRef.new(shape: ::Smithy::Schema::Shapes::Prelude::String, location_name: 'name', traits: {"smithy.api#notProperty" => {}, "smithy.api#required" => {}}))
-    GetCityOutput.add_member(:coordinates, ::Smithy::Schema::Shapes::ShapeRef.new(shape: CityCoordinates, location_name: 'coordinates', traits: {"smithy.api#required" => {}}))
+    GetCityOutput.add_member(:name, ::Smithy::Schema::Shapes::ShapeRef.new(shape: ::Smithy::Schema::Shapes::Prelude::String, location_name: "name", traits: {"smithy.api#notProperty" => {}, "smithy.api#required" => {}}))
+    GetCityOutput.add_member(:coordinates, ::Smithy::Schema::Shapes::ShapeRef.new(shape: CityCoordinates, location_name: "coordinates", traits: {"smithy.api#required" => {}}))
     GetCityOutput.type = Types::GetCityOutput
-    GetCurrentTimeOutput.add_member(:time, ::Smithy::Schema::Shapes::ShapeRef.new(shape: ::Smithy::Schema::Shapes::Prelude::Timestamp, location_name: 'time', traits: {"smithy.api#required" => {}}))
+    GetCurrentTimeOutput.add_member(:time, ::Smithy::Schema::Shapes::ShapeRef.new(shape: ::Smithy::Schema::Shapes::Prelude::Timestamp, location_name: "time", traits: {"smithy.api#required" => {}}))
     GetCurrentTimeOutput.type = Types::GetCurrentTimeOutput
-    GetForecastInput.add_member(:city_id, ::Smithy::Schema::Shapes::ShapeRef.new(shape: CityId, location_name: 'cityId', traits: {"smithy.api#required" => {}}))
+    GetForecastInput.add_member(:city_id, ::Smithy::Schema::Shapes::ShapeRef.new(shape: CityId, location_name: "cityId", traits: {"smithy.api#required" => {}}))
     GetForecastInput.type = Types::GetForecastInput
-    GetForecastOutput.add_member(:chance_of_rain, ::Smithy::Schema::Shapes::ShapeRef.new(shape: ::Smithy::Schema::Shapes::Prelude::Float, location_name: 'chanceOfRain'))
+    GetForecastOutput.add_member(:chance_of_rain, ::Smithy::Schema::Shapes::ShapeRef.new(shape: ::Smithy::Schema::Shapes::Prelude::Float, location_name: "chanceOfRain"))
     GetForecastOutput.type = Types::GetForecastOutput
-    ListCitiesInput.add_member(:next_token, ::Smithy::Schema::Shapes::ShapeRef.new(shape: ::Smithy::Schema::Shapes::Prelude::String, location_name: 'nextToken'))
-    ListCitiesInput.add_member(:page_size, ::Smithy::Schema::Shapes::ShapeRef.new(shape: ::Smithy::Schema::Shapes::Prelude::Integer, location_name: 'pageSize'))
+    ListCitiesInput.add_member(:next_token, ::Smithy::Schema::Shapes::ShapeRef.new(shape: ::Smithy::Schema::Shapes::Prelude::String, location_name: "nextToken"))
+    ListCitiesInput.add_member(:page_size, ::Smithy::Schema::Shapes::ShapeRef.new(shape: ::Smithy::Schema::Shapes::Prelude::Integer, location_name: "pageSize"))
     ListCitiesInput.type = Types::ListCitiesInput
-    ListCitiesOutput.add_member(:next_token, ::Smithy::Schema::Shapes::ShapeRef.new(shape: ::Smithy::Schema::Shapes::Prelude::String, location_name: 'nextToken'))
-    ListCitiesOutput.add_member(:items, ::Smithy::Schema::Shapes::ShapeRef.new(shape: CitySummaries, location_name: 'items', traits: {"smithy.api#required" => {}}))
+    ListCitiesOutput.add_member(:next_token, ::Smithy::Schema::Shapes::ShapeRef.new(shape: ::Smithy::Schema::Shapes::Prelude::String, location_name: "nextToken"))
+    ListCitiesOutput.add_member(:items, ::Smithy::Schema::Shapes::ShapeRef.new(shape: CitySummaries, location_name: "items", traits: {"smithy.api#required" => {}}))
     ListCitiesOutput.type = Types::ListCitiesOutput
-    NoSuchResource.add_member(:resource_type, ::Smithy::Schema::Shapes::ShapeRef.new(shape: ::Smithy::Schema::Shapes::Prelude::String, location_name: 'resourceType', traits: {"smithy.api#required" => {}}))
+    NoSuchResource.add_member(:resource_type, ::Smithy::Schema::Shapes::ShapeRef.new(shape: ::Smithy::Schema::Shapes::Prelude::String, location_name: "resourceType", traits: {"smithy.api#required" => {}}))
     NoSuchResource.type = Types::NoSuchResource
 
     Weather = ::Smithy::Schema::Shapes::ServiceShape.new do |service|