logstash-filter-csv 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55248ee94900a2352a2900c98c891c5de8ebfe3b
-  data.tar.gz: fe7817db9a950532cf8b32650413d6b8c74cbb71
+  metadata.gz: 9ff0bd6fdf58706e32acf77c116694d1274b7d11
+  data.tar.gz: 28b97ce191613e3245376d2c21475623c4a0f985
 SHA512:
-  metadata.gz: 48756013179fb793a380dd17f4b078c4acb9332ecb2da455279214b8653bdfd27b01cb251252d6b12b062bc726426e214ae3bc0a18bac1a7bd5fd5879212893f
-  data.tar.gz: c588100c860435e658c98ff3be641a3794374593558cf8715096687524e9ef9712416f1de32ce0444f75420dea288d3fee094401c53944b3098e103ddabd4a36
+  metadata.gz: a1533f34f35e0701ae830109a548f0ff1d260147c99e36f4fd82ebdb2700a22d7500da3edb48bc15c549c2e63fa529967017d7f11b3e4e009e1977ced0b21b29
+  data.tar.gz: a04d372cb6114b935828ec6de9ca6d2821c1afab13287819b200f2ca3f1196e638368be53e78e40da5878ad7a405f5d3d51ea2774de99c34982bc17c304dd020

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.0.6
+  - Fix a bug where `[nested][field]` references were incorrectly used. (#24, #52)
+
 ## 3.0.5
   - Fix some documentation issues
 

data/lib/logstash/filters/csv.rb

@@ -105,7 +105,7 @@ class LogStash::Filters::CSV < LogStash::Filters::Base
     @convert_symbols = @convert.inject({}){|result, (k, v)| result[k] = v.to_sym; result}
 
     # make sure @target is in the format [field name] if defined, i.e. surrounded by brakets
-    @target = "[#{@target}]" if @target && @target !~ /^\[[^\[\]]+\]$/
+    @target = "[#{@target}]" if @target && !@target.start_with?("[")
     
     # if the zero byte character is entered in the config, set the value
     if (@quote_char == "\\x00")
@@ -151,10 +151,14 @@ class LogStash::Filters::CSV < LogStash::Filters::Base
   private
 
   # construct the correct Event field reference for given field_name, taking into account @target
-  # @param field_name [String] the bare field name without brakets
+  # @param field_name [String] the field name.
   # @return [String] fully qualified Event field reference also taking into account @target prefix
   def field_ref(field_name)
-    "#{@target}[#{field_name}]"
+    if field_name.start_with?("[")
+      "#{@target}#{field_name}"
+    else
+      "#{@target}[#{field_name}]"
+    end
   end
 
   def ignore_field?(index)

data/logstash-filter-csv.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-csv'
-  s.version         = '3.0.5'
+  s.version         = '3.0.6'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "The CSV filter takes an event field containing CSV data, parses it, and stores it as individual fields (can optionally specify the names)."
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"

data/spec/filters/csv_spec.rb

@@ -196,6 +196,25 @@ describe LogStash::Filters::CSV do
           expect(event.get("custom3")).to eq("val3")
         end
       end
+
+      context "that use [@metadata]" do
+        let(:metadata_field) { "[@metadata][one]" }
+        let(:config) do
+          {
+            "columns" => [ metadata_field, "foo" ]
+          }
+        end
+
+        let(:event) { LogStash::Event.new("message" => "hello,world") }
+
+        before do
+          plugin.filter(event)
+        end
+
+        it "should work correctly" do
+          expect(event.get(metadata_field)).to eq("hello")
+        end
+      end
     end
 
     describe "givin target" do
@@ -227,6 +246,41 @@ describe LogStash::Filters::CSV do
           expect(event.get("data")["column3"]).to eq("sesame street")
         end
       end
+
+      context "which uses [nested][fieldref] syntax" do
+        let(:target) { "[foo][bar]" }
+        let(:config) do
+          {
+            "target" => target
+          }
+        end
+
+        let(:event) { LogStash::Event.new("message" => "hello,world") }
+
+        before do
+          plugin.filter(event)
+        end
+
+        it "should set fields correctly in the target" do
+          expect(event.get("#{target}[column1]")).to eq("hello")
+          expect(event.get("#{target}[column2]")).to eq("world")
+        end
+
+        context "with nested fieldrefs as columns" do
+          let(:config) do
+            {
+              "target" => target,
+              "columns" => [ "[test][one]", "[test][two]" ]
+            }
+          end
+
+          it "should set fields correctly in the target" do
+            expect(event.get("#{target}[test][one]")).to eq("hello")
+            expect(event.get("#{target}[test][two]")).to eq("world")
+          end
+        end
+
+      end
     end
 
     describe "using field convertion" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-csv
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-15 00:00:00.000000000 Z
+date: 2017-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement