fluent-plugin-anonymizer 0.5.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 742a45cbfa285505d92f31e0165bbd8cc88f69b2
-  data.tar.gz: 7de295ce9c5de1444ab2db88166a2966658d436f
+  metadata.gz: a1fc717a156c6b19fea2d19f4522c3b2d8be7dda
+  data.tar.gz: 9c7ff4fda067571c4becc5f29c5be0a5452e9653
 SHA512:
-  metadata.gz: 5f076468bccbb31557ef584ca23a33544cc57c9b68ffd899b6722204cb6b94691a939d3197b1942436fa6ec07e1256445b51ceb55b8d90e6b6d6e1493d875364
-  data.tar.gz: d584a6836e19f639f112a1ad7c5fe88a36c6825758115c59ad6bca98af7a1ba9d07155bc6187786adec2887920621f32d7181a3bd2b6bc72ce22e481afb21f03
+  metadata.gz: bc870e37f4a1b30b543d53497208e9af52ac1c901bc77ec32c1bb772fb30d9cd4a8ebd2eb1782550757fd4763c93e84248c8e2f2c46826e3c3b688113e1f6a5c
+  data.tar.gz: 0bcc4eaecfceb6f5a00a14d587bd81f77efe17d8500384d73bee0d8f4e63c0e92897fb81aaa7e5809362fdbaf2cf329a85b0361d085ffdae55ab3450993064f7

data/.travis.yml

@@ -2,11 +2,10 @@ sudo: false
 language: ruby
 
 rvm:
-  - 2.3.0
+  - 2.4.0
+  - 2.3.3
   - 2.2
   - 2.1
-  - 2.0.0
-  - 1.9.3
 
 # to avoid travis-ci issue since 2015-12-25
 before_install:
@@ -14,10 +13,3 @@ before_install:
 
 gemfile:
   - Gemfile
-  - gemfiles/fluentd_v0.10.gemfile
-  - gemfiles/fluentd_v0.12.gemfile
-
-matrix:
-  allow_failures:
-    - rvm: 1.9.3
-    - rvm: 2.0.0

data/README.md

@@ -4,21 +4,31 @@
 
 Fluentd filter output plugin to anonymize records with [OpenSSL::Digest](https://docs.ruby-lang.org/ja/latest/class/OpenSSL=3a=3aDigest.html) of MD5/SHA1/SHA256/SHA384/SHA512 algorithms. This data masking plugin protects privacy data such as UserID, Email, Phone number, IPv4/IPv6 address and so on.
 
+## Requirements
+
+| fluent-plugin-anonymizer | fluentd    | ruby   |
+|--------------------|------------|--------|
+|  1.0.0            | v0.14.x | >= 2.1 |
+|  0.5.1            | v0.12.x | >= 1.9 |
+
+
 ## Installation
 
-install with gem or fluent-gem command as:
+install with gem or td-agent-gem command as:
 
 `````
-# for fluentd
+# for system installed fluentd
 $ gem install fluent-plugin-anonymizer
 
-# for td-agent
-$ sudo /usr/lib64/fluent/ruby/bin/fluent-gem install fluent-plugin-anonymizer -v 0.5.1
-
-# for td-agent2
+# for td-agent2 (with fluentd v0.12)
 $ sudo td-agent-gem install fluent-plugin-anonymizer -v 0.5.1
+
+# for td-agent3 (with fluentd v0.14)
+$ sudo td-agent-gem install fluent-plugin-anonymizer -v 1.0.0
 `````
 
+For more details, see [Plugin Management](https://docs.fluentd.org/v0.14/articles/plugin-management)
+
 ## Tutorial
 
 ### Filter Plugin

data/fluent-plugin-anonymizer.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-anonymizer"
-  spec.version       = "0.5.1"
+  spec.version       = "1.0.0"
   spec.authors       = ["Kentaro Yoshida"]
   spec.email         = ["y.ken.studio@gmail.com"]
   spec.summary       = %q{Fluentd filter output plugin to anonymize records with HMAC of MD5/SHA1/SHA256/SHA384/SHA512 algorithms. This data masking plugin protects privacy data such as UserID, Email, Phone number, IPv4/IPv6 address and so on.}

data/lib/fluent/plugin/filter_anonymizer.rb

@@ -1,4 +1,4 @@
-require 'fluent/filter'
+require 'fluent/plugin/filter'
 require 'openssl'
 require 'uri'
 require 'ipaddr'
@@ -28,7 +28,7 @@ require 'ipaddr'
 #   </mask>
 # </filter>
 
-module Fluent
+module Fluent::Plugin
   class AnonymizerFilter < Filter
     Fluent::Plugin.register_filter('anonymizer', self)
 
@@ -174,14 +174,6 @@ module Fluent
       record.update(@masks.reduce(record){|r,mask| mask.call(r)})
     end
 
-    def filter_stream(tag, es)
-      new_es = MultiEventStream.new
-      es.each do |time, record|
-        new_es.add(time, @masks.reduce(record){|r,mask| mask.call(r) })
-      end
-      new_es
-    end
-
     def salt_determine(key)
       return @salt_map[key] if @salt_map.has_key?(key)
       keystr = key.to_s

data/lib/fluent/plugin/out_anonymizer.rb

@@ -36,6 +36,7 @@ DESC
   end
 
   def configure(conf)
+    log.warn "out_anonymizer is now deprecated. It will be removed in a future release. Please consider to use filter_anonymizer."
     super
     @anonymizer = Fluent::Anonymizer.new(self, conf)
   end

data/test/plugin/test_filter_anonymizer.rb

@@ -1,4 +1,5 @@
 require 'helper'
+require 'fluent/test/driver/filter'
 
 class AnonymizerFilterTest < Test::Unit::TestCase
   def setup
@@ -18,50 +19,50 @@ class AnonymizerFilterTest < Test::Unit::TestCase
     ipv4_mask_subnet  24
   ]
 
-  def create_driver(conf=CONFIG, tag='test')
-    Fluent::Test::FilterTestDriver.new(Fluent::AnonymizerFilter, tag).configure(conf)
+  def create_driver(conf=CONFIG)
+    Fluent::Test::Driver::Filter.new(Fluent::Plugin::AnonymizerFilter).configure(conf)
   end
 
   def filter(conf, messages)
     d = create_driver(conf)
-    d.run {
+    d.run(default_tag: 'test') {
       messages.each {|message|
-        d.emit(message, @time)
+        d.feed(@time, message)
       }
     }
-    filtered = d.filtered_as_array
-    filtered.map {|m| m[2] }
+    filtered = d.filtered
+    filtered.map {|m| m.last }
   end
 
   require 'ostruct'
   test 'method md5 works correctly' do
-    conv = Fluent::AnonymizerFilter::MASK_METHODS[:md5].call(OpenStruct.new)
+    conv = Fluent::Plugin::AnonymizerFilter::MASK_METHODS[:md5].call(OpenStruct.new)
     digest = conv.call('value1', 'salt')
     assert_equal 'd21fe9523421f12daad064fd082913fd', digest
   end
   test 'method sha1 works correctly' do
-    conv = Fluent::AnonymizerFilter::MASK_METHODS[:sha1].call(OpenStruct.new)
+    conv = Fluent::Plugin::AnonymizerFilter::MASK_METHODS[:sha1].call(OpenStruct.new)
     digest = conv.call('value2', 'salt')
     assert_equal 'd2ed8e797065322371012fd8c1a39682987ddb71', digest
   end
   test 'method sha256 works correctly' do
-    conv = Fluent::AnonymizerFilter::MASK_METHODS[:sha256].call(OpenStruct.new)
+    conv = Fluent::Plugin::AnonymizerFilter::MASK_METHODS[:sha256].call(OpenStruct.new)
     digest = conv.call('value3', 'salt')
     assert_equal 'd70daf9654b8a3ba335f8f9f9638a93e8eba6763a0012ac44a928857871abe82', digest
   end
   test 'method sha384 works correctly' do
-    conv = Fluent::AnonymizerFilter::MASK_METHODS[:sha384].call(OpenStruct.new)
+    conv = Fluent::Plugin::AnonymizerFilter::MASK_METHODS[:sha384].call(OpenStruct.new)
     digest = conv.call('value4', 'salt')
     assert_equal '646192f8b1ea905238df589a00a10598a53eb245df4ab14b7e9eccf80c37386c99abe5259ccb2ba950003423fa0790ee', digest
   end
   test 'method sha512 works correctly' do
-    conv = Fluent::AnonymizerFilter::MASK_METHODS[:sha512].call(OpenStruct.new)
+    conv = Fluent::Plugin::AnonymizerFilter::MASK_METHODS[:sha512].call(OpenStruct.new)
     digest = conv.call('value5', 'salt')
     expected = '47c82bfea3783c20e3ba3629f0f827bebf0fa65a9104ada5339e5776e5958f061fe7114bfbe1e9d410aff43c6bee8365adf4fdd072e54ab4fffad820f354f545'
     assert_equal expected, digest
   end
   test 'method uri_path removes path, query parameters, fragment, user and password of uri strings' do
-    conv = Fluent::AnonymizerFilter::MASK_METHODS[:uri_path].call(OpenStruct.new)
+    conv = Fluent::Plugin::AnonymizerFilter::MASK_METHODS[:uri_path].call(OpenStruct.new)
     assert_equal '/my/path', conv.call('/my/path', '')
     assert_equal 'yay/unknown/format', conv.call('yay/unknown/format', '')
     assert_equal 'http://example.com/', conv.call('http://example.com/path/to/secret', '')
@@ -74,7 +75,7 @@ class AnonymizerFilterTest < Test::Unit::TestCase
   end
   test 'method network masks ipaddresses with specified mask bit lengths' do
     conf = OpenStruct.new(ipv4_mask_bits: 24, ipv6_mask_bits: 104)
-    conv = Fluent::AnonymizerFilter::MASK_METHODS[:network].call(conf)
+    conv = Fluent::Plugin::AnonymizerFilter::MASK_METHODS[:network].call(conf)
     assert_equal '192.168.1.0', conv.call('192.168.1.1', '')
     assert_equal '10.110.18.0', conv.call('10.110.18.9', '')
     assert_equal '2001:db8:0:8d3:0:8a2e::', conv.call('2001:db8:0:8d3:0:8a2e:70:7344', '')
@@ -302,4 +303,3 @@ CONF
     assert_equal(expected, filtered)
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-anonymizer
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Kentaro Yoshida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-28 00:00:00.000000000 Z
+date: 2017-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,8 +109,6 @@ files:
 - README.md
 - Rakefile
 - fluent-plugin-anonymizer.gemspec
-- gemfiles/fluentd_v0.10.gemfile
-- gemfiles/fluentd_v0.12.gemfile
 - lib/fluent/plugin/anonymizer.rb
 - lib/fluent/plugin/filter_anonymizer.rb
 - lib/fluent/plugin/out_anonymizer.rb

data/gemfiles/fluentd_v0.10.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "fluentd", "~> 0.10.0"
-
-gemspec :path => "../"

data/gemfiles/fluentd_v0.12.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "fluentd", "~> 0.12.0"
-
-gemspec :path => "../"