Fix #239 - interpolated action "update" don't get params "upsert" and "script"

Author: dchauviere

lib/logstash/outputs/elasticsearch/common.rb

@@ -32,8 +32,8 @@ def multi_receive(events)
 
     # Convert the event into a 3-tuple of action, params, and event
     def event_action_tuple(event)
-      params = event_action_params(event)
       action = event.sprintf(@action)
+      params = event_action_params(action, event)
       [action, params, event]
     end
 
@@ -123,8 +123,8 @@ def submit(actions)
       actions_to_retry
     end
 
-    # get the action parameters for the given event
-    def event_action_params(event)
+    # get the action parameters for the given action and event
+    def event_action_params(action, event)
       type = get_event_type(event)
 
       params = {
@@ -135,7 +135,7 @@ def event_action_params(event)
       }
 
       params[:parent] = event.sprintf(@parent) if @parent
-      if @action == 'update'
+      if action == 'update'
         params[:_upsert] = LogStash::Json.load(event.sprintf(@upsert)) if @upsert != ""
         params[:_script] = event.sprintf(@script) if @script != ""
       end

spec/unit/outputs/elasticsearch_spec.rb

@@ -157,12 +157,13 @@
   describe "the action option" do
     subject(:eso) {LogStash::Outputs::ElasticSearch.new(options)}
     context "with a sprintf action" do
-      let(:options) { {"action" => "%{myactionfield}"} }
+      let(:options) { {"action" => "%{myactionfield}", "upsert" => '{"message": "some text"}'} }
 
       let(:event) { LogStash::Event.new("myactionfield" => "update", "message" => "blah") }
 
-      it "should interpolate the requested action value when creating an event_action_tuple" do
+      it "should interpolate the requested action value when creating an event_action_tuple and obtain associated action params" do
         expect(eso.event_action_tuple(event).first).to eql("update")
+        expect(eso.event_action_tuple(event)[1]).to include(:_upsert)
       end
     end