fluent-plugin-kafka 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fcaf3e8fbb836ab8db3fa21003a713f9048de076097e2c95a9f30e5d1b05c08
-  data.tar.gz: 8437b2c9401238d811973422a65d2c9ee34bd8afc513f32412a22f93e03204a0
+  metadata.gz: 5f03efe1dee8bff74ba9e0588956bc919244ac6ddf24ff40821d072602dab916
+  data.tar.gz: b081913e347f5dd28d1339a1eca3f063661217fa4f1738787161cb825c3485fc
 SHA512:
-  metadata.gz: 6d407e6f12dbafc6f5fad59ac6cbae4b13fa5f0a212cf82dba604f871afc286899290972b3afca5d1031888ee2f141c12d5d2e3d6b7324c7246317029149c491
-  data.tar.gz: b278441842361cc53836fce087e87e6d2d800bccbe9b307c2f0b39d3c4c357aae96275d2bfb808ab2455ebce692948d1241f4f991a5036473da1d31da699832b
+  metadata.gz: 03e89037f5982ca8aa121c1c1672160e95fb488ee7e9ca6bd8038e8d9b0cc9d99348ab91a2e1896e174fed4fa2b4c25fb9e65ee72b9a4ba74062c631953ca345
+  data.tar.gz: 5ca6f6093a1f46ab89b4b268416c16d9758102b76fcdb2bba8d2f235daa7b88e9914e48a0e4d0397df13ea9159a21ba1bbe525186670fd7b7622cfdd3d2cac2f

data/ChangeLog

@@ -1,3 +1,7 @@
+Release 0.16.1 - 2021/04/14
+	* out_kafka/out_kafka_buffered: Support Ruby 3.0.0 keyword arguments interop
+	* kafka_plugin_util: Treat empty string in read_ssl_file as nil
+
 Release 0.16.0 - 2021/01/25
 
 	* input: Add `tag_source` and `record_tag_key` parameters for using record field as tag

data/fluent-plugin-kafka.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "fluent-plugin-kafka"
   gem.require_paths = ["lib"]
-  gem.version       = '0.16.0'
+  gem.version       = '0.16.1'
   gem.required_ruby_version = ">= 2.1.0"
 
   gem.add_dependency "fluentd", [">= 0.10.58", "< 2"]

data/lib/fluent/plugin/kafka_plugin_util.rb

@@ -33,7 +33,7 @@ module Fluent
       end
 
       def read_ssl_file(path)
-        return nil if path.nil?
+        return nil if path.nil? || path.respond_to?(:strip) && path.strip.empty?
 
         if path.is_a?(Array)
           path.map { |fp| File.read(fp) }

data/lib/fluent/plugin/out_kafka.rb

@@ -215,7 +215,7 @@ DESC
       chain.next
 
       # out_kafka is mainly for testing so don't need the performance unlike out_kafka_buffered.
-      producer = @kafka.producer(@producer_opts)
+      producer = @kafka.producer(**@producer_opts)
 
       es.each do |time, record|
         if @output_include_time

data/lib/fluent/plugin/out_kafka_buffered.rb

@@ -239,7 +239,7 @@ DESC
     @producers_mutex.synchronize {
       producer = @producers[Thread.current.object_id]
       unless producer
-        producer = @kafka.producer(@producer_opts)
+        producer = @kafka.producer(**@producer_opts)
         @producers[Thread.current.object_id] = producer
       end
       producer

data/test/plugin/test_kafka_plugin_util.rb

@@ -0,0 +1,38 @@
+require 'helper'
+require 'fluent/plugin/kafka_plugin_util'
+
+class File
+    def File::read(path)
+        path
+    end
+end
+
+class KafkaPluginUtilTest < Test::Unit::TestCase
+    
+    def self.config_param(name, type, options)
+    end
+    include Fluent::KafkaPluginUtil::SSLSettings
+
+    def config_param
+    end
+    def setup
+        Fluent::Test.setup
+    end
+
+    def test_read_ssl_file_when_nil
+        assert_equal(nil, read_ssl_file(nil))
+    end
+
+    def test_read_ssl_file_when_empty_string
+        assert_equal(nil, read_ssl_file(""))
+    end
+
+    def test_read_ssl_file_when_non_empty_path
+        assert_equal("path", read_ssl_file("path"))
+    end
+
+    def test_read_ssl_file_when_non_empty_array
+        assert_equal(["a","b"], read_ssl_file(["a","b"]))
+    end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kafka
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Hidemasa Togashi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-25 00:00:00.000000000 Z
+date: 2021-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -135,6 +135,7 @@ files:
 - lib/fluent/plugin/out_rdkafka.rb
 - lib/fluent/plugin/out_rdkafka2.rb
 - test/helper.rb
+- test/plugin/test_kafka_plugin_util.rb
 - test/plugin/test_out_kafka.rb
 homepage: https://github.com/fluent/fluent-plugin-kafka
 licenses:
@@ -155,10 +156,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin for Apache Kafka > 0.8
 test_files:
 - test/helper.rb
+- test/plugin/test_kafka_plugin_util.rb
 - test/plugin/test_out_kafka.rb