fluent-plugin-record-modifier 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '08f95de6e703c0bd97241b29251e7c7d5106ddfb'
-  data.tar.gz: 520beec9c2070215b9a5d46d7ba39918babcc8b8
+SHA256:
+  metadata.gz: b7d9232d881589bfd365d2669fb26e8e57faadbcf3a7ced27dff2637bf017002
+  data.tar.gz: c185b00755209331f684d868af17d6ce382294c321b7405c424182d9f4b28928
 SHA512:
-  metadata.gz: 0b85603689be3cccb2200051eea21a5d74275aa98c3697fd007f8b8f3ac77a6e33dad5a63f3ad6d38d2d727fcae85d9cf4d00dfd4b7d37ec3bb278bf5b240215
-  data.tar.gz: e81fa9e61dbc82ca411bf4e7254bad81ff68b2b146ceaa9997990c08d2404c38e582959d4326658ca3f033d9817a83358314cf0a72925d8724f4c049114e295e
+  metadata.gz: 2b48f455cf36f6ed57492e77344462d4b9253b4c46068e6314c9da88f3b1b20a268c0c637306a28bc93d063f77427896f0bce2fd32568a9851458cc89a7d01c0
+  data.tar.gz: dedbdf338fc5260fca9271c09af8a06ed00ab8866a7a65b12cd6aa400500272e570f4829b9700e893cc26223a5223e02d4081c27802b3d2cf9591b332b887d49

data/ChangeLog

@@ -1,3 +1,7 @@
+Release 2.1.0 - 2019/12/18
+
+  * Add <record> keys to whitelist_keys
+
 Release 2.0.1 - 2019/02/06
 
   * Update output plugin to support multi process environment

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.1.0

data/lib/fluent/plugin/filter_record_modifier.rb

@@ -83,6 +83,7 @@ DESC
         @remove_keys = @remove_keys.split(',').map(&:strip)
       elsif @whitelist_keys
         @whitelist_keys = @whitelist_keys.split(',').map(&:strip)
+        @whitelist_keys.concat(@map.keys).uniq!
       end
 
       # Collect DynamicExpander related garbage instructions

data/lib/fluent/plugin/out_record_modifier.rb

@@ -88,6 +88,7 @@ DESC
         @remove_keys = @remove_keys.split(',').map(&:strip)
       elsif @whitelist_keys
         @whitelist_keys = @whitelist_keys.split(',').map(&:strip)
+        @whitelist_keys.concat(@map.keys).uniq!
       end
 
       @has_tag_parts = true if @tag.include?('tag_parts')

data/test/test_filter_record_modifier.rb

@@ -116,6 +116,9 @@ class RecordModifierFilterTest < Test::Unit::TestCase
 
   def test_remove_non_whitelist_keys
     d = create_driver %[
+      <record>
+        foo bar
+      </record>
       whitelist_keys k1, k2, k3
     ]
 
@@ -123,7 +126,7 @@ class RecordModifierFilterTest < Test::Unit::TestCase
       d.feed("k1" => 'v', "k2" => 'v', "k4" => 'v', "k5" => 'v')
     end
 
-    assert_equal [{"k1" => 'v', "k2" => 'v'}], d.filtered.map(&:last)
+    assert_equal [{"k1" => 'v', "k2" => 'v', 'foo' => 'bar'}], d.filtered.map(&:last)
   end
 
   def test_prepare_values

data/test/test_out_record_modifier.rb

@@ -127,6 +127,9 @@ class RecordModifierOutputTest < Test::Unit::TestCase
   def test_remove_non_whitelist_keys
     d = create_driver %[
       tag foo.filtered
+      <record>
+        foo bar
+      </record>
       whitelist_keys k1, k2, k3
     ]
 
@@ -134,6 +137,6 @@ class RecordModifierOutputTest < Test::Unit::TestCase
       d.feed({"k1" => 'v', "k2" => 'v', "k4" => 'v', "k5" => 'v'})
     end
 
-    assert_equal [{"k1" => 'v', "k2" => 'v'}], d.events.map { |e| e.last }
+    assert_equal [{"k1" => 'v', "k2" => 'v', 'foo' => 'bar'}], d.events.map { |e| e.last }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-record-modifier
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Masahiro Nakagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-06 00:00:00.000000000 Z
+date: 2019-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -94,8 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Filter plugin for modifying event record