Backport endpoint provider parameters unused variable fix (#272)

smithy-lang · Feb 11, 2025 · b5112f7 · b5112f7
1 parent b050ec9
commit b5112f7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/gems/smithy/lib/smithy/templates/client/endpoint_provider.erb b/gems/smithy/lib/smithy/templates/client/endpoint_provider.erb
@@ -9,10 +9,6 @@ module <%= module_name %>
     # @return [Smithy::Client::EndpointRules::Endpoint]
     # @raise [ArgumentError]
     def resolve_endpoint(parameters)
-<% parameters.each do |p| -%>
-      <%= p.name %> = parameters.<%= p.name %>
-<% end -%>
-
 <%= endpoint_rules_code %>
     end
   end

diff --git a/gems/smithy/lib/smithy/views/client/endpoint_provider.rb b/gems/smithy/lib/smithy/views/client/endpoint_provider.rb
@@ -14,10 +14,9 @@ def initialize(plan)
           @endpoint_rules = service['traits']['smithy.rules#endpointRuleSet']
           @parameters = @endpoint_rules['parameters']
                         .map { |id, data| EndpointParameter.new(id, data, @plan) }
-
           @endpoint_function_bindings =
             plan.welds.map(&:endpoint_function_bindings).reduce({}, :merge)
-
+          @assigned_variables = []
           super()
         end
 
@@ -161,6 +160,7 @@ def conditions(conditions, level)
 
         def condition(condition)
           if condition['assign']
+            @assigned_variables << condition['assign']
             "(#{condition['assign'].underscore} = #{function(condition)})"
           else
             function(condition)
@@ -170,7 +170,7 @@ def condition(condition)
         def str(str)
           if str.is_a?(Hash)
             if str['ref']
-              str['ref'].underscore
+              variable(str['ref'])
             elsif str['fn']
               function(str)
             else
@@ -192,11 +192,10 @@ def template_str(string, wrap: true)
 
         def template_replace(value)
           indexes = value.split('#')
-          res = indexes.shift.underscore
-          res += indexes.map do |index|
+          res = variable(indexes.shift)
+          res + indexes.map do |index|
             "['#{index}']"
           end.join
-          res
         end
 
         def function(function)
@@ -207,7 +206,7 @@ def function(function)
         def fn_arg(arg)
           if arg.is_a?(Hash)
             if arg['ref']
-              arg['ref'].underscore
+              variable(arg['ref'])
             elsif arg['fn']
               function(arg)
             else
@@ -220,6 +219,14 @@ def fn_arg(arg)
           end
         end
 
+        def variable(variable)
+          if @assigned_variables.include?(variable)
+            variable.underscore
+          else
+            "parameters.#{variable.underscore}"
+          end
+        end
+
         def fn_name(function)
           unless (binding = @endpoint_function_bindings[function])
             raise ArgumentError, "No endpoint function binding registered for #{function}"

diff --git a/projections/weather/lib/weather/endpoint_provider.rb b/projections/weather/lib/weather/endpoint_provider.rb
@@ -9,9 +9,7 @@ class EndpointProvider
     # @return [Smithy::Client::EndpointRules::Endpoint]
     # @raise [ArgumentError]
     def resolve_endpoint(parameters)
-      endpoint = parameters.endpoint
-
-      return Smithy::Client::EndpointRules::Endpoint.new(uri: endpoint) if Smithy::Client::EndpointRules.set?(endpoint)
+      return Smithy::Client::EndpointRules::Endpoint.new(uri: parameters.endpoint) if Smithy::Client::EndpointRules.set?(parameters.endpoint)
 
       raise ArgumentError, 'Endpoint is not set - you must configure an endpoint.'
     end