[API] Generator changes for Custom HTTP Headers

Author: picandocodigo

elasticsearch-api/utils/thor/generator/endpoint_specifics.rb

@@ -87,7 +87,7 @@ def termvectors_path
       def ping_perform_request
         <<~SRC
           begin
-            perform_request(method, path, params, body).status == 200 ? true : false
+            perform_request(method, path, params, body, headers).status == 200 ? true : false
           rescue Exception => e
             if e.class.to_s =~ /NotFound|ConnectionFailed/ || e.message =~ /Not\s*Found|404|ConnectionFailed/i
               false

elasticsearch-api/utils/thor/templates/_documentation_top.erb

@@ -12,7 +12,8 @@
 <%# URL parameters -%>
 <%- @params.each do |name, info| -%>
   <%= docs_helper(name, info) -%>
-<%- end %>
+<%- end -%>
+# @option arguments [Hash] :headers Custom HTTP headers
 <%= '  '*(@namespace_depth+3) + '# @option arguments [Hash] :body ' + (@spec['body']['description'] ? @spec['body']['description'].strip : 'TODO: Description') + (@spec['body']['required'] ? ' (*Required*)' : '') + "\n" if @spec['body'] -%>
 <% if @deprecation_note -%>
   #
@@ -23,5 +24,5 @@
 <% end -%>
 <%= '  '*(@namespace_depth+3) -%>#
 <%# Documentation link -%>
-<%=  '  '*(@namespace_depth+3) %># @see <%= @spec['documentation']['url'] ? @spec['documentation']['url'].gsub!(/\/(current|master)\//, '/7.5/') : "[TODO]" %>
+<%=  '  '*(@namespace_depth+3) %># @see <%= @spec['documentation']['url'] ? @spec['documentation']['url'] : "[TODO]" %>
 <%= '  '*(@namespace_depth+3) %>#

elasticsearch-api/utils/thor/templates/_perform_request.erb

@@ -16,22 +16,23 @@ when 'mtermvectors'
 <%- end -%>
 <%- if ['bulk', 'msearch', 'msearch_template'].include? @method_name -%>
   <%= self.send("#{@method_name}_body_helper".to_s) %>
-  <%= '  '*(@namespace_depth+4) %>perform_request(method, path, params, payload, {"Content-Type" => "application/x-ndjson"}).body
+  headers.merge!("Content-Type" => "application/x-ndjson")
+  <%= '  '*(@namespace_depth+4) %>perform_request(method, path, params, payload, headers).body
 <%- elsif @method_name == 'ping' -%>
   <%= ping_perform_request %>
 <%- else -%>
   <%- if needs_ignore_404?(@endpoint_name) %>
     <%= __utils %>.__rescue_from_not_found do
-      perform_request(method, path, params, body).status == 200 ? true : false
+      perform_request(method, path, params, body, headers).status == 200 ? true : false
     end
   <%- elsif needs_complex_ignore_404?(@endpoint_name) -%>
     if Array(arguments[:ignore]).include?(404)
-      <%= __utils %>.__rescue_from_not_found { perform_request(method, path, params, body).body }
+      <%= __utils %>.__rescue_from_not_found { perform_request(method, path, params, body, headers).body }
     else
-      perform_request(method, path, params, body).body
+      perform_request(method, path, params, body, headers).body
     end
   <%- else -%>
-      perform_request(method, path, params, body).body
+      perform_request(method, path, params, body, headers).body
   <%- end -%>
 <%- end -%>
 <%= '  '*(@namespace_depth+3) %>end

elasticsearch-api/utils/thor/templates/method.erb

@@ -13,7 +13,7 @@ module Elasticsearch
 <%= '  '*(@namespace_depth+2) %>module Actions
 <%= ERB.new(File.new("./thor/templates/_documentation_top.erb").read, trim_mode: '-').result(binding) -%>
 <%# Method definition -%>
-<%= '  '*(@namespace_depth+3) -%>def <%= @method_name %>(arguments={})
+<%= '  '*(@namespace_depth+3) -%>def <%= @method_name %>(arguments = {})
 <%- if @endpoint_name == 'create' -%>
   <%= '  '*(@namespace_depth+3) %>if arguments[:id]
   <%= '  '*(@namespace_depth+3) %>  index arguments.update op_type: 'create'
@@ -30,6 +30,7 @@ module Elasticsearch
       <%= '  '*(@namespace_depth+3) + "raise ArgumentError, \"Required argument '#{required}' missing\" unless arguments[:#{required}]" + "\n" -%>
     <%- end -%>
     <%- end -%>
+    headers = arguments.delete(:headers) || {}
     <%- # Method setup -%>
     <%= ERB.new(File.new("./thor/templates/_method_setup.erb").read, trim_mode: '-').result(binding) %>
     <%- # Perform request -%>