fluent-plugin-record-reformer 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c12a8d7d13aa7b7cd2774128c13b1ce7ed4473a
-  data.tar.gz: 7bf4dd5a13506bd3d9e89acf739d27322bb737e4
+  metadata.gz: abcb8c05a4359b363c8a1a0f0cf75a16df123c03
+  data.tar.gz: 55d88baf42ee056e4de0f181fae316fcefc451ac
 SHA512:
-  metadata.gz: 54d23d63dca07dad339103db47a0b7374ef6aef190f4d8e64b984a625ac40b1e158a46f2c9b6aa8c735f1701a19fe0fc16418ba39d4e06052307756d1e0f96b3
-  data.tar.gz: fda86acdd87b031272f229b8162a2b2b77caa07788e0db8076fb9e84f8cb74ab865aa6a15be579928aba42e38c904b7ae5eeddabb377596a50dbcf96b9a31e40
+  metadata.gz: de246d926ea5785af76414cc7d8d60acde19cc552d8a81e988ca91a290f0ce41c77482a29d18ef99f9953097b958a6ec695ad7db7d8276e8721063bc6716fd72
+  data.tar.gz: d905845078c70d674b33098b4269fd62ba76d32a3fb3ef9e1bcc9758138b359e7d08c15313f1a4b7d12abbf09bcdb9ce4eec516837f6ff977fd4b372052f339f

data/.travis.yml

@@ -1,9 +1,14 @@
 rvm:
-  - 2.0.0
+  - 2.0.*
   - 2.1.*
   - 2.2.*
   - 2.3.0
 gemfile:
   - Gemfile
+  - Gemfile.fluentd.0.12
   - Gemfile.fluentd.0.10
+matrix:
+  exclude:
+    - rvm: 2.0.*
+      gemfile: Gemfile
 before_install: gem update bundler

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.8.2 (2016/08/21)
+
+Fixes
+
+* Prevent overwriting reserved placeholder keys such as tag, time, etc with `enable_ruby false` (thanks to @kimamula)
+
 ## 0.8.1 (2016/03/09)
 
 Fixes

data/Gemfile.fluentd.0.12

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+gem 'fluentd', '~> 0.12.0'
+gemspec

data/fluent-plugin-record-reformer.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name        = "fluent-plugin-record-reformer"
-  gem.version     = "0.8.1"
+  gem.version     = "0.8.2"
   gem.authors     = ["Naotoshi Seo"]
   gem.email       = "sonots@gmail.com"
   gem.homepage    = "https://github.com/sonots/fluent-plugin-record-reformer"
@@ -22,6 +22,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "pry"
   gem.add_development_dependency "pry-nav"
   gem.add_development_dependency "test-unit"
-  gem.add_development_dependency "rr"
+  gem.add_development_dependency "test-unit-rr"
   gem.add_development_dependency "timecop"
 end

data/lib/fluent/plugin/out_record_reformer.rb

@@ -209,6 +209,7 @@ module Fluent
 
       def prepare_placeholders(placeholder_values)
         placeholders = {}
+        reserved_keys = Set.new(placeholder_values.keys)
 
         placeholder_values.each do |key, value|
           if value.kind_of?(Array) # tag_parts, etc
@@ -219,7 +220,9 @@ module Fluent
             end
           elsif value.kind_of?(Hash) # record, etc
             value.each do |k, v|
-              placeholders.store("${#{k}}", v) # foo
+              unless reserved_keys.include?(k) # prevent overwriting the reserved keys such as tag
+                placeholders.store("${#{k}}", v)
+              end
               placeholders.store(%Q[${#{key}["#{k}"]}], v) # record["foo"]
             end
           else # string, interger, float, and others?

data/test/helper.rb

@@ -1,4 +1,6 @@
 require 'test/unit'
+require 'test/unit/rr'
+require 'timecop'
 require 'fluent/log'
 require 'fluent/test'
 

data/test/test_out_record_reformer.rb

@@ -1,7 +1,5 @@
 require_relative 'helper'
-require 'rr'
 require 'time'
-require 'timecop'
 require 'fluent/plugin/out_record_reformer'
 
 Fluent::Test.setup
@@ -26,12 +24,11 @@ class RecordReformerOutputTest < Test::Unit::TestCase
   def emit(config, use_v1, msgs = [''])
     d = create_driver(config, use_v1)
     d.run do
-      msgs.each do |msg|
-        record = {
-          'eventType0' => 'bar',
-          'message'    => msg,
-        }
-        record = record.merge(msg) if msg.is_a?(Hash)
+      records = msgs.map do |msg|
+        next msg if msg.is_a?(Hash)
+        { 'eventType0' => 'bar', 'message' => msg }
+      end
+      records.each do |record|
         d.emit(record, @time)
       end
     end
@@ -298,6 +295,29 @@ EOC
           end
         end
 
+        test "Prevent overriting reserved keys (such as tag, etc) #40 with enable_ruby #{enable_ruby}" do
+          config = %[
+            tag tag
+            enable_ruby #{enable_ruby}
+            <record>
+              new_tag ${tag}
+              new_time ${time}
+              new_record_tag ${record["tag"]}
+              new_record_time ${record["time"]}
+            </record>
+          ]
+          records = [{'tag' => 'tag', 'time' => 'time'}]
+          emits = emit(config, use_v1, records)
+          emits.each do |(tag, time, record)|
+            assert_not_equal('tag', record['new_tag'])
+            assert_equal(@tag, record['new_tag'])
+            assert_not_equal('time', record['new_time'])
+            assert_equal(@time.to_s, record['new_time'])
+            assert_equal('tag', record['new_record_tag'])
+            assert_equal('time', record['new_record_time'])
+          end
+        end
+
         test "hash values with placeholders with enable_ruby #{enable_ruby}" do
           config = %[
             tag tag

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-record-reformer
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rr
+  name: test-unit-rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -120,6 +120,7 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.fluentd.0.10
+- Gemfile.fluentd.0.12
 - LICENSE
 - README.md
 - Rakefile