WIP

Author: robertoaloi

lib/aws_codegen/rest_service.ex

@@ -137,21 +137,32 @@ defmodule AWS.CodeGen.RestService do
   end
 
   @doc """
-  Render function parameter, if any, in a way that can be inserted directly
+  Render required function parameters, if any, in a way that can be inserted directly
   into the code template.
   """
-  def function_parameters(action) do
+  def required_function_parameters(action) do
+    function_parameters(action, false)
+  end
+
+  @doc """
+  Render function parameters, if any, in a way that can be inserted directly
+  into the code template. It can be asked to only return the required ones.
+  """
+  def function_parameters(action, required_only \\ false) do
     language = action.language
 
     Enum.join([
       join_parameters(action.url_parameters, language)
       | case action.method do
           "GET" ->
-            [
-              join_parameters(action.query_parameters, language),
-              join_parameters(action.request_header_parameters, language)
-            ]
-
+            parameters = action.query_parameters ++ action.request_header_parameters
+            case required_only do
+              true ->
+                [join_parameters(parameters, language)]
+              false ->
+                required_parameters = Enum.filter(parameters, fn param -> param.required end)
+                [join_parameters(required_parameters, language)]
+            end
           _ ->
             []
         end
@@ -187,7 +198,15 @@ defmodule AWS.CodeGen.RestService do
       len_for_method =
         case method do
           "GET" ->
-            2 + length(request_header_parameters) + length(query_parameters)
+            case language do
+              :elixir ->
+                2 + length(request_header_parameters) + length(query_parameters)
+              :erlang ->
+                filterFn = fn param -> param.required end
+                all_parameters = request_header_parameters ++ query_parameters
+                required_parameters = Enum.filter(all_parameters, filterFn)
+                4 + length(required_parameters)
+            end
 
           _ ->
             3

priv/rest.erl.eex

@@ -4,7 +4,7 @@
 <%= if context.docstring != "%% @doc" do %><%= context.docstring %><% end %>
 -module(<%= context.module_name %>).
 
--export([<%= Enum.map(context.actions, fn(action) -> ["#{action.function_name}/#{action.arity - 1}", "#{action.function_name}/#{action.arity}"] end) |> List.flatten |> Enum.join(",\n         ") %>]).
+-export([<%= Enum.map(context.actions, fn(action) -> ["#{action.function_name}/#{action.arity - 3}", "#{action.function_name}/#{action.arity - 1}", "#{action.function_name}/#{action.arity}"] end) |> List.flatten |> Enum.join(",\n         ") %>]).
 
 -include_lib("hackney/include/hackney_lib.hrl").
 
@@ -13,27 +13,32 @@
 %%====================================================================
 <%= for action <- context.actions do %>
 <%= action.docstring %><%= if action.method == "GET" do %>
-<%= action.function_name %>(Client<%= AWS.CodeGen.RestService.function_parameters(action) %>)
+<%= action.function_name %>(Client<%= AWS.CodeGen.RestService.required_function_parameters(action) %>)
   when is_map(Client) ->
-    <%= action.function_name %>(Client<%= AWS.CodeGen.RestService.function_parameters(action) %>, []).
-<%= action.function_name %>(Client<%= AWS.CodeGen.RestService.function_parameters(action) %>, Options)
-  when is_map(Client), is_list(Options) ->
+    <%= action.function_name %>(Client<%= AWS.CodeGen.RestService.required_function_parameters(action) %>, #{}, #{}).
+
+<%= action.function_name %>(Client<%= AWS.CodeGen.RestService.required_function_parameters(action) %>, QueryMap, HeadersMap)
+  when is_map(Client), is_map(QueryMap), is_map(HeadersMap) ->
+    <%= action.function_name %>(Client<%= AWS.CodeGen.RestService.required_function_parameters(action) %>, QueryMap, HeadersMap, []).
+
+<%= action.function_name %>(Client<%= AWS.CodeGen.RestService.required_function_parameters(action) %>, QueryMap, HeadersMap, Options)
+  when is_map(Client), is_map(QueryMap), is_map(HeadersMap), is_list(Options) ->
     Path = ["<%= AWS.CodeGen.RestService.Action.url_path(action) %>"],
     SuccessStatusCode = <%= if is_nil(action.success_status_code), do: "undefined", else: inspect(action.success_status_code) %>,
 <%= if length(action.request_header_parameters) > 0 do %>
     Headers0 =
       [<%= for parameter <- Enum.drop(action.request_header_parameters, -1) do %>
-        {<<"<%= parameter.location_name %>">>, <%= parameter.code_name %>},<% end %><%= for parameter <- Enum.slice action.request_header_parameters, -1..-1 do %>
-        {<<"<%= parameter.location_name %>">>, <%= parameter.code_name %>}
+        {<<"<%= parameter.location_name %>">>, maps:get(<<"<%= parameter.location_name %>">>, HeadersMap, undefined)},<% end %><%= for parameter <- Enum.slice action.request_header_parameters, -1..-1 do %>
+        {<<"<%= parameter.location_name %>">>, maps:get(<<"<%= parameter.location_name %>">>, HeadersMap, undefined)}
       <% end %>],
     Headers = [H || {_, V} = H <- Headers0, V =/= undefined],
 <% else %>
     Headers = [],
 <% end %><%= if length(action.query_parameters) > 0 do %>
     Query0_ =
       [<%= for parameter <- Enum.drop(action.query_parameters, -1) do %>
-        {<<"<%= parameter.location_name %>">>, <%= parameter.code_name %>},<% end %><%= for parameter <- Enum.slice action.query_parameters, -1..-1 do %>
-        {<<"<%= parameter.location_name %>">>, <%= parameter.code_name %>}
+        {<<"<%= parameter.location_name %>">>, maps:get(<<"<%= parameter.location_name %>">>, QueryMap, undefined)},<% end %><%= for parameter <- Enum.slice action.query_parameters, -1..-1 do %>
+        {<<"<%= parameter.location_name %>">>, maps:get(<<"<%= parameter.location_name %>">>, QueryMap, undefined)}
       <% end %>],
     Query_ = [H || {_, V} = H <- Query0_, V =/= undefined],
 <% else %>