fluent-plugin-maskrx 0.0.1.beta3 → 0.0.1.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6dc9dd484960f4efcb80a2a28c4a0873ecf43f96781803c0f83a680111e51a5
-  data.tar.gz: 5aa7a979394892af8a96b2070cf67c1c59879361616097c9c12ef3bba0ecb539
+  metadata.gz: 2f4d9adc48590e5e99a1d09210b1dee00b94cd763e5b910a59562c05e669aa59
+  data.tar.gz: ee16da1ce58adb70af2bb3911036cd9da645ce01ed666c1cef75ce23182d9777
 SHA512:
-  metadata.gz: a827c95272e29ac16ccb23424d96b0bbb1d8fd0f0c6ff8e2389f2b9f8e97aba15411ed3d8dcab2389b24a97ae30ac4d5160709f3d3f49b87449514fcd275b9d1
-  data.tar.gz: 70006931416eda376071bdc6add53043b9531e0fd197ead6946a644d4658567b9e26f1c5deaad7b4c173958614a95db0c36380d3355866aece2a526b6ac569f2
+  metadata.gz: 2e8decbc5ddd8e693b64cd9240ec55454d4a91f32c9e57f41c7429f98cba82ab6cc9ec46fa8f34d96d78be5bbbc71ea879690f27d308b604f2d15bc5696e2c47
+  data.tar.gz: 3f3ecf0fd62724b2e70fa7489503b2bf2da762b79efeac3777689ff31850c1bb03c1933e4798b9aad68d224ca7fa8c40f04a2d44f93a35ef4b50172b5ecd9c8b

data/filter-plugin-maskrx.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-maskrx"
-  spec.version       = "0.0.1.beta3"
+  spec.version       = "0.0.1.beta7"
   spec.authors       = ["Joshua Mervine"]
   spec.email         = ["joshua@mervine.net"]
   spec.summary       = %q{Fluentd filter plugin to mask strings within records.}

data/lib/fluent/plugin/filter_maskrx.rb

@@ -17,25 +17,50 @@ module Fluent::Plugin
     def configure(conf)
       super
 
+      patterns = []
       @mask_config_list.each do |config|
         raise Fluent::ConfigError, "pattern is required" if config.pattern.nil?
+
+        patterns.push(config.pattern)
       end
+
+      log.info("plugin=maskrx at=configure patterns=\"#{patterns}\"")
     end
 
     def filter(_, _, record)
       log.debug("plugin=maskrx at=filter record=\"#{record}\"")
 
+      mask_record(config, record)
+    end
+
+    def filter_stream(tag, es)
+      new_es = Fluent::MultiEventStream.new
+      es.each do |time, record|
+        log.debug("plugin=maskrx at=filter_stream record=\"#{record}\"")
+
+        new_es.add(time, mask_record(record))
+      end
+
+      new_es
+    end
+
+    protected
+    def mask_record(record)
       @mask_config_list.each do |config|
-        record = mask_record(config, record)
+        record = mask_entry(config, record)
       end
 
       record
     end
 
-    protected
-    def mask_record(config, record)
-      keys = (config.keys.nil? ? record.keys : config.keys)
-      log.debug("plugin=maskrx at=mask_record keys=\"#{keys}\"")
+    def mask_entry(config, record)
+      keys = if config.keys.nil? || config.keys.empty?
+               record.keys
+             else
+               config.keys
+             end
+
+      log.debug("plugin=maskrx at=mask_entry keys=\"#{keys}\"")
 
       keys.each do |key|
         record[key] = mask_key_value(config.pattern, config.mask, record[key]) unless record[key].nil?
@@ -56,7 +81,7 @@ module Fluent::Plugin
         value.gsub!(m, mask)
       end
 
-      log.debug("plugin=maskrx at=mask_key_value pattern=#{pattern} value=#{value}")
+      log.debug("plugin=maskrx at=mask_key_value pattern=#{pattern} value=\"#{value}\"")
 
       return value
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-maskrx
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta3
+  version: 0.0.1.beta7
 platform: ruby
 authors:
 - Joshua Mervine
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-15 00:00:00.000000000 Z
+date: 2021-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler