logstash-filter-foreach 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7627fd3a9ff82fcd48377c29035fb258be9939af
-  data.tar.gz: e0b9190a7d90a8f01ec34efd954e39cfd52ef4c1
+  metadata.gz: 1b8b2c855be5f253874cafd451a67f956c728b8b
+  data.tar.gz: df60708d67752cb1541edd95b99d517e749e9718
 SHA512:
-  metadata.gz: 157fce21afc24a14a42fc742d2594af0f3413bd075f35fafc37b5d11267eea2ed3564dc544078a079adbc32e5fd0886dbdd3a31f8ddae490b52f39230bcf4be7
-  data.tar.gz: c0f6847970d94b37a710620154a20cea883a13291cbd6e0c34c6c75ce73b0bd73a2a8155c986b050d4792d5fd7bc61c8747077cf866fcb962075593a3ce8a4ad
+  metadata.gz: ec0fcfffaa57ac9ed6e7a11f2f0184957750d0f850d04097a63bfe24688ddd8135fe00af967dca878cf2f3998172406a3ece237d71d7585ab774ff041c903c49
+  data.tar.gz: e79445a11ab6e9f7f65eac33364aa1a6d3fb8a123c4761d98640a1cc3f9930b1de2dca32bebc0558bafd5156be426da1b4d792bc3e97aaa242fccddc05362337

data/lib/logstash/filters/foreach.rb

@@ -130,26 +130,32 @@ class LogStash::Filters::Foreach < LogStash::Filters::Base
             @@event_data[task_id] = LogStash::Filters::Foreach::Element.new(configuration, Time.now(), event.clone, configuration.join_fields)
             event_data = @@event_data[task_id]
 
-            array_field.each do |value|
+            if array_field.length == 0
 
-              @logger.trace("Foreach plugin: array_field.each do |value|", :value => value);
+              passthrough = true
 
-              next if value.nil? or value.empty?
+            else
+              array_field.each do |value|
 
-              event_split = event.clone
-              @logger.debug("Foreach plugin: Split event", :field => @array_field, :value => value)
-              event_split.set(@array_field, value)
-              event_data.counter += 1
+                @logger.trace("Foreach plugin: array_field.each do |value|", :value => value);
 
-              filter_matched(event_split)
-              yield event_split
-            end
+                next if value.nil? or value.empty?
 
-            event.cancel
+                event_split = event.clone
+                @logger.debug("Foreach plugin: Split event", :field => @array_field, :value => value)
+                event_split.set(@array_field, value)
+                event_data.counter += 1
+
+                filter_matched(event_split)
+                yield event_split
+              end
+
+              event.cancel
+            end
 
           end
 
-        else
+        else # if !@end
 
           @logger.trace("Foreach plugin: else !@end");
 
@@ -168,24 +174,35 @@ class LogStash::Filters::Foreach < LogStash::Filters::Base
             @logger.debug("Foreach plugin: Join event back", :field => configuration.array_field, :value => event.get(configuration.array_field))
 
             event_data = @@event_data[task_id]
-            event_data.lastevent_timestamp = Time.now()
 
-            configuration.join_fields.each do |join_field|
-              event_data.join_fields[join_field] += [*event.get(join_field)]
-            end
-            event_data.counter -= 1
+            if event_data.sub_events_count == 0
+
+              filter_matched(event_data.initial_event)
+              yield event_data.initial_event
+              @@event_data.delete(task_id)
 
-            if event_data.counter == 0
+            else
 
-              @logger.trace("Foreach plugin: if event_data.counter == 0");
+              event_data.lastevent_timestamp = Time.now()
 
               configuration.join_fields.each do |join_field|
-                event_data.initial_event.set(join_field, event_data.join_fields[join_field])
+                event_data.join_fields[join_field] += [*event.get(join_field)]
               end
-              filter_matched(event_data.initial_event)
-              yield event_data.initial_event
-              @@event_data.delete(task_id)
-            end
+              event_data.counter -= 1
+
+              if event_data.counter == 0
+
+                @logger.trace("Foreach plugin: if event_data.counter == 0");
+
+                configuration.join_fields.each do |join_field|
+                  event_data.initial_event.set(join_field, event_data.join_fields[join_field])
+                end
+                filter_matched(event_data.initial_event)
+                yield event_data.initial_event
+                @@event_data.delete(task_id)
+              end
+
+            end # if event_data.sub_events_count == 0
 
             event.cancel
 

data/logstash-filter-foreach.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-filter-foreach'
-  s.version       = '0.1.1'
+  s.version       = '0.1.2'
   s.licenses      = ['Apache-2.0']
   s.summary       = 'Process filters for every array item'
   s.description   = 'Plugin splits event for every item in array, then you could process other filters for every item and then join event back'

data/spec/filters/foreach_spec.rb

@@ -215,6 +215,38 @@ describe LogStash::Filters::Foreach do
       end
     end
 
+    describe "should omit processing for event with array_field = []" do
+      let(:config) do
+        <<-CONFIG
+        filter {
+          foreach {
+            task_id => "%{task_id}"
+            array_field => "array"
+            join_fields => ["join"]
+          }
+
+          mutate {
+            add_field => { "join" => "%{array}_changed" }
+          }
+
+          foreach {
+            task_id => "%{task_id}"
+            end => true
+          }
+        }
+        CONFIG
+      end
+
+      sample("task_id" => 1, "array" => [], "unchanged" => "unchanged_value") do
+        insist { subject.is_a?(LogStash::Event) } == true
+        insist { subject.get("array").is_a?(Array) } == true
+        insist { subject.get("array") } == []
+        insist { subject.get("join").nil? } == true
+        insist { subject.get("unchanged").is_a?(String) } == true
+        insist { subject.get("unchanged") } == "unchanged_value"
+      end
+    end
+
     describe "should split and join (partly) correctly" do
       let(:config) do
         <<-CONFIG

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-foreach
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - IIIEII