URI -> URL for endpoint rules

Author: Matt Muller

gems/smithy-client/lib/smithy-client/endpoint_rules.rb

@@ -16,18 +16,18 @@ module EndpointRules
 
       # An Endpoint resolved by an EndpointProvider
       class Endpoint
-        # @param [String] uri
+        # @param [String] url
         # @param [Hash] properties ({})
         # @param [Hash] headers ({})
-        def initialize(uri:, properties: {}, headers: {})
-          @uri = uri
+        def initialize(url:, properties: {}, headers: {})
+          @url = url
           @properties = properties
           @headers = headers
         end
 
-        # The URI of the endpoint.
+        # The URL of the endpoint.
         # @return [String]
-        attr_accessor :uri
+        attr_accessor :url
 
         # The authentication schemes supported by the endpoint.
         # @return [Hash]

gems/smithy-client/spec/smithy-client/endpoint_rules_spec.rb

@@ -5,18 +5,6 @@
 module Smithy
   module Client
     describe EndpointRules do
-      describe EndpointRules::Endpoint do
-        describe '#initialize' do
-          it 'sets the uri and defaults other values' do
-            uri = 'https://example.com'
-            endpoint = EndpointRules::Endpoint.new(uri: uri)
-            expect(endpoint.uri).to eq(uri)
-            expect(endpoint.properties).to eq({})
-            expect(endpoint.headers).to eq({})
-          end
-        end
-      end
-
       describe '.valid_host_label?' do
         it 'returns false for an empty value' do
           expect(EndpointRules.valid_host_label?('', false)).to be false

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

@@ -49,7 +49,7 @@ module <%= module_name %>
         private
 
         def apply_endpoint(context, endpoint)
-          context.http_request.endpoint = endpoint.uri
+          context.http_request.endpoint = endpoint.url
           endpoint.headers.each do |key, value|
             context.http_request.headers[key] = value
           end

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

@@ -22,7 +22,7 @@ module <%= module_name %>
         end.to raise_error(ArgumentError, expected['error'])
 <% else -%>
         endpoint = subject.resolve(params)
-        expect(endpoint.uri).to eq(expected['endpoint']['url'])
+        expect(endpoint.url).to eq(expected['endpoint']['url'])
         expect(endpoint.headers).to eq(expected['endpoint']['headers'] || {})
         expect(endpoint.properties).to eq(expected['endpoint']['properties'] || {})
 <% end -%>

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

@@ -67,7 +67,7 @@ def endpoint_rule_with_condition(levels, rule)
 
         def endpoint(endpoint, levels)
           res = StringIO.new
-          res << "return Smithy::Client::EndpointRules::Endpoint.new(uri: #{str(endpoint['url'])}"
+          res << "return Smithy::Client::EndpointRules::Endpoint.new(url: #{str(endpoint['url'])}"
           res << ", headers: #{templated_hash_to_s(endpoint['headers'])}" if endpoint['headers']
           res << ", properties: #{templated_hash_to_s(endpoint['properties'])}" if endpoint['properties']
           res << ")\n"

gems/smithy/spec/interfaces/client/endpoint_provider_spec.rb

@@ -17,7 +17,7 @@
 
           endpoint = subject.resolve(params)
           expect(endpoint).to be_a(Smithy::Client::EndpointRules::Endpoint)
-          expect(endpoint.uri).to eq('https://example.com/baz')
+          expect(endpoint.url).to eq('https://example.com/baz')
         end
 
         it 'raises errors from rules' do

projections/shapes/lib/shapes/auth_resolver.rb

@@ -6,10 +6,10 @@ module ShapeService
   # Resolves the auth scheme from {AuthParameters}.
   class AuthResolver
     # @param [AuthParameters] parameters
-    # @return [Array<Hash>]
+    # @return [Array<Smithy::Client::AuthOption>]
     def resolve(parameters)
       options = []
-      options << { scheme_id: 'smithy.api#noAuth' }
+      options << Smithy::Client::AuthOption.new(scheme_id: 'smithy.api#noAuth')
       options
     end
   end

projections/shapes/lib/shapes/endpoint_provider.rb

@@ -10,7 +10,7 @@ class EndpointProvider
     # @raise [ArgumentError]
     def resolve(parameters)
       if Smithy::Client::EndpointRules.set?(parameters.endpoint)
-        return Smithy::Client::EndpointRules::Endpoint.new(uri: parameters.endpoint)
+        return Smithy::Client::EndpointRules::Endpoint.new(url: parameters.endpoint)
       end
       raise ArgumentError, "Endpoint is not set - you must configure an endpoint."
     end

projections/shapes/lib/shapes/plugins/endpoint.rb

@@ -41,7 +41,7 @@ def call(context)
         private
 
         def apply_endpoint(context, endpoint)
-          context.http_request.endpoint = endpoint.uri
+          context.http_request.endpoint = endpoint.url
           endpoint.headers.each do |key, value|
             context.http_request.headers[key] = value
           end

projections/shapes/sig/shapes/auth_resolver.rbs

@@ -1,5 +1,5 @@
 module ShapeService
   class AuthResolver
-    def resolve: (AuthParameters) -> Array[String]
+    def resolve: (AuthParameters) -> Array[Smithy::Client::AuthOption]
   end
 end