Fixes and rubocop

Author: richardwang1124

gems/smithy-client/lib/smithy-client/plugins/resolve_auth.rb

@@ -32,34 +32,34 @@ def call(context)
           private
 
           def resolve_auth(context, auth_options)
-            failures = []
             raise 'No auth options were resolved' if auth_options.empty?
 
+            failures = []
             auth_options.each do |auth_option|
               scheme_id = auth_option[:scheme_id]
+
               # Anonymous auth does not have a plugin and does not sign
               return auth_option if scheme_id == 'smithy.api#noAuth'
 
-              unless context.config.auth_schemes.key?(scheme_id)
-                failures << "Auth scheme #{scheme_id} was not enabled for this request"
-                next
-              end
+              error = validate_auth_scheme(context, scheme_id)
+              return auth_option unless error
 
-              identity_provider = context.config.auth_schemes[scheme_id]
-              unless identity_provider
-                failures << "Auth scheme #{scheme_id} did not have an identity provider configured"
-                next
-              end
+              failures << error
+            end
 
-              unless identity_provider.identity
-                failures << "Auth scheme #{scheme_id} failed to resolve identity"
-                next
-              end
+            raise failures.join("\n")
+          end
 
-              return auth_option
+          def validate_auth_scheme(context, scheme_id)
+            unless context.config.auth_schemes.key?(scheme_id)
+              return "Auth scheme #{scheme_id} was not enabled for this request"
             end
 
-            raise failures.join("\n")
+            identity_provider = context.config.auth_schemes[scheme_id]
+            return "Auth scheme #{scheme_id} did not have an identity provider configured" unless identity_provider
+            return "Auth scheme #{scheme_id} failed to resolve identity" unless identity_provider.set?
+
+            nil
           end
         end
 

gems/smithy-client/spec/smithy-client/plugins/resolve_auth_spec.rb

@@ -96,9 +96,7 @@ def resolve(_)
         it 'raises an error when identity resolver fails to resolve identity' do
           shapes['smithy.ruby.tests#SampleClient']['traits']['smithy.api#httpApiKeyAuth'] = {}
           client_class.add_plugin(HttpApiKeyAuth)
-          provider = ApiKeyProvider.new(key: 'stubbed_key')
-          expect(provider).to receive(:identity).and_return(nil)
-          client = client_class.new(stub_responses: true, api_key_provider: provider)
+          client = client_class.new(stub_responses: true, api_key_provider: ApiKeyProvider.new)
           expect { client.operation }.to raise_error(/failed to resolve identity/)
         end
       end