fluentd 1.10.2-x64-mingw32 → 1.11.2-x64-mingw32

data/test/plugin_helper/test_cert_option.rb

@@ -15,4 +15,11 @@ class CertOptionPluginHelperTest < Test::Unit::TestCase
     certs = d.cert_option_certificates_from_file("test/plugin_helper/data/cert/cert-with-CRLF.pem")
     assert_equal(1, certs.length)
   end
+
+  test 'raise an error for broken certificates_from_file file' do
+    d = Dummy.new
+    assert_raise Fluent::ConfigError do
+      certs = d.cert_option_certificates_from_file("test/plugin_helper/data/cert/empty.pem")
+    end
+  end
 end

data/test/plugin_helper/test_child_process.rb

@@ -818,5 +818,20 @@ class ChildProcessTest < Test::Unit::TestCase
       end
       assert File.exist?(@temp_path)
     end
+
+    test 'execute child process writing data to stdout which is unread' do
+      callback_called = false
+      exit_status = nil
+      prog = "echo writing to stdout"
+      callback = ->(status){ exit_status = status; callback_called = true }
+      Timeout.timeout(TEST_DEADLOCK_TIMEOUT) do
+        @d.child_process_execute(:out_exec_process, prog, stderr: :connect, immediate: true, parallel: true, mode: [], wait_timeout: 1, on_exit_callback: callback)
+        sleep TEST_WAIT_INTERVAL_FOR_BLOCK_RUNNING until callback_called
+      end
+      assert callback_called
+      assert exit_status
+      assert exit_status.success?
+      assert_equal 0, exit_status.exitstatus
+    end
   end
 end

data/test/plugin_helper/test_record_accessor.rb

@@ -194,4 +194,45 @@ class RecordAccessorHelperTest < Test::Unit::TestCase
       end
     end
   end
+
+  sub_test_case 'Fluent::PluginHelper::RecordAccessor::Accessor#set' do
+    setup do
+      @d = Dummy.new
+    end
+
+    data('normal' => 'key1',
+         'space' => 'ke y2',
+         'dot key' => 'this.is.key3')
+    test 'set top key' do |param|
+      r = {'key1' => 'v1', 'ke y2' => 'v2', 'this.is.key3' => 'v3'}
+      accessor = @d.record_accessor_create(param)
+      accessor.set(r, "test")
+      assert_equal "test", r[param]
+    end
+
+    test "set top key using bracket style" do
+      r = {'key1' => 'v1', 'ke y2' => 'v2', 'this.is.key3' => 'v3'}
+      accessor = @d.record_accessor_create('$["this.is.key3"]')
+      accessor.set(r, "test")
+      assert_equal "test", r["this.is.key3"]
+    end
+
+    data('bracket' => "$['key1'][0]['ke y2']",
+         'bracket w/ double quotes' => '$["key1"][0]["ke y2"]')
+    test "set nested keys ['key1', 0, 'ke y2']" do |param|
+      r = {'key1' => [{'ke y2' => "value"}]}
+      accessor = @d.record_accessor_create(param)
+      accessor.set(r, "nested_message")
+      assert_equal "nested_message", r['key1'][0]['ke y2']
+    end
+
+    test "don't raise an error when unexpected record is coming" do
+      r = {'key1' => [{'key3' => "value"}]}
+      accessor = @d.record_accessor_create("$['key1']['key2']['key3']")
+      assert_nothing_raised do
+        accessor.set(r, "unknown field")
+      end
+      assert_equal({'key1' => [{'key3' => "value"}]}, r)
+    end
+  end
 end

data/test/plugin_helper/test_server.rb

@@ -1233,6 +1233,40 @@ class ServerPluginHelperTest < Test::Unit::TestCase
         waiting(10){ sleep 0.1 until received.bytesize == 8 }
         assert_equal "yay\nfoo\n", received
       end
+
+      test 'set ciphers' do
+        cert_path = File.join(@server_cert_dir, "cert.pem")
+        private_key_path = File.join(@certs_dir, "server.key.pem")
+        create_server_pair_signed_by_self(cert_path, private_key_path, nil)
+        tls_options = {
+          protocol: :tls,
+          version: :TLSv1_2,
+          ciphers: 'SHA256',
+          insecure: false,
+          cert_path: cert_path,
+          private_key_path: private_key_path,
+        }
+        conf = @d.server_create_transport_section_object(tls_options)
+        ctx = @d.cert_option_create_context(conf.version, conf.insecure, conf.ciphers, conf)
+        matched = false
+        ctx.ciphers.each do |cipher|
+          cipher_name, tls_version = cipher
+          # OpenSSL 1.0.2: "TLSv1/SSLv3"
+          # OpenSSL 1.1.1: "TLSv1.2"
+          if tls_version == "TLSv1/SSLv3" || tls_version == "TLSv1.2"
+            matched = true
+            unless cipher_name.match(/#{conf.ciphers}/)
+              matched = false
+              break
+            end
+          end
+        end
+
+        error_msg = build_message("Unexpected ciphers for #{conf.version}",
+                                  "<?>\nwas expected to include only <?> ciphers for #{conf.version}",
+                                  ctx.ciphers, conf.ciphers)
+        assert(matched, error_msg)
+      end
     end
   end
 

data/test/plugin_helper/test_service_discovery.rb

@@ -4,9 +4,6 @@ require 'fluent/plugin_helper/service_discovery'
 require 'fluent/plugin/output'
 
 class ServiceDiscoveryHelper < Test::Unit::TestCase
-  PORT = unused_port
-  NULL_LOGGER = Logger.new(nil)
-
   class Dummy < Fluent::Plugin::TestBase
     helpers :service_discovery
 
@@ -30,6 +27,7 @@ class ServiceDiscoveryHelper < Test::Unit::TestCase
     if @d
       @d.stop unless @d.stopped?
       @d.shutdown unless @d.shutdown?
+      @d.after_shutdown unless @d.after_shutdown?
       @d.close unless @d.closed?
       @d.terminate unless @d.terminated?
     end
@@ -40,7 +38,7 @@ class ServiceDiscoveryHelper < Test::Unit::TestCase
 
     d.service_discovery_create_manager(
       :service_discovery_helper_test,
-      configurations: [{ type: :static, conf:  config_element('root', '', {}, [config_element('service', '', { 'host' => '127.0.0.1', 'port' => '1234' })]) }],
+      configurations: [{ type: :static, conf: config_element('root', '', {}, [config_element('service', '', { 'host' => '127.0.0.1', 'port' => '1234' })]) }],
     )
 
     assert_true !!d.discovery_manager
@@ -49,6 +47,7 @@ class ServiceDiscoveryHelper < Test::Unit::TestCase
     mock.proxy(d).timer_execute(:service_discovery_helper_test, anything).never
 
     d.start
+    d.event_loop_wait_until_start
 
     services = d.discovery_manager.services
     assert_equal 1, services.size
@@ -68,5 +67,39 @@ class ServiceDiscoveryHelper < Test::Unit::TestCase
     mock.proxy(d.discovery_manager).start.once
     mock(d).timer_execute(:service_discovery_helper_test, anything).once
     d.start
+    d.event_loop_wait_until_start
+  end
+
+  test 'exits service discovery instances without any errors' do
+    d = @d = Dummy.new
+    mockv = flexmock('dns_resolver', getaddress: '127.0.0.1')
+              .should_receive(:getresources)
+              .and_return([Resolv::DNS::Resource::IN::SRV.new(1, 10, 8081, 'service1.example.com')])
+              .mock
+    mock(Resolv::DNS).new { mockv }
+
+    d.service_discovery_create_manager(
+      :service_discovery_helper_test2,
+      configurations: [{ type: :srv, conf: config_element('service_discovery', '', { 'service' => 'service1', 'hostname' => 'example.com' }) }],
+    )
+
+    assert_true !!d.discovery_manager
+    mock.proxy(d.discovery_manager).start.once
+    mock(d).timer_execute(:service_discovery_helper_test2, anything).once
+
+    # To avoid claring `@logs` during `terminate` step
+    # https://github.com/fluent/fluentd/blob/bc78d889f93dad8c2a4e0ad1ca802546185dacba/lib/fluent/test/log.rb#L33
+    mock(d.log).reset.twice
+
+    d.start
+    d.event_loop_wait_until_start
+
+    d.stop unless d.stopped?
+    d.shutdown unless d.shutdown?
+    d.after_shutdown unless d.after_shutdown?
+    d.close unless d.closed?
+    d.terminate unless d.terminated?
+
+    assert_false(d.log.out.logs.any? { |e| e.match?(/thread doesn't exit correctly/) })
   end
 end

data/test/plugin_helper/test_socket.rb

@@ -128,4 +128,12 @@ class SocketHelperTest < Test::Unit::TestCase
       client.close
     end
   end
+
+  test 'with empty cert file' do
+    cert_path = File.expand_path(File.dirname(__FILE__) + '/data/cert/empty.pem')
+
+    assert_raise Fluent::ConfigError do
+      SocketHelperTestPlugin.new.socket_create_tls('127.0.0.1', PORT, cert_path: cert_path)
+    end
+  end
 end

data/test/test_match.rb

@@ -101,6 +101,17 @@ class MatchTest < Test::Unit::TestCase
     assert_or_not_match('a.b.** a.c', 'a.c.d')
   end
 
+  def test_regex_pattern
+    assert_glob_match('/a/', 'a')
+    assert_glob_not_match('/a/', 'abc')
+    assert_glob_match('/a.*/', 'abc')
+    assert_glob_not_match('/b.*/', 'abc')
+    assert_glob_match('/a\..*/', 'a.b.c')
+    assert_glob_not_match('/(?!a\.).*/', 'a.b.c')
+    assert_glob_not_match('/a\..*/', 'b.b.c')
+    assert_glob_match('/(?!a\.).*/', 'b.b.c')
+  end
+
   #def test_character_class
   #  assert_match('[a]', 'a')
   #  assert_match('[ab]', 'a')

data/test/test_static_config_analysis.rb

@@ -6,7 +6,7 @@ require 'fluent/plugin/out_forward'
 require 'fluent/plugin/out_stdout'
 require 'fluent/plugin/out_exec'
 require 'fluent/plugin/in_forward'
-require 'fluent/plugin/in_dummy'
+require 'fluent/plugin/in_sample'
 require 'fluent/plugin/filter_grep'
 require 'fluent/plugin/filter_stdout'
 require 'fluent/plugin/filter_parser'
@@ -74,7 +74,7 @@ class StaticConfigAnalysisTest < ::Test::Unit::TestCase
       c = Fluent::Config.parse(conf_data, '(test)', '(test_dir)', true)
       ret = Fluent::StaticConfigAnalysis.call(c)
       assert_equal [Fluent::Plugin::ExecOutput, Fluent::Plugin::StdoutOutput, Fluent::Plugin::ForwardOutput], ret.outputs.map(&:plugin).map(&:class)
-      assert_equal [Fluent::Plugin::DummyInput, Fluent::Plugin::ForwardInput], ret.inputs.map(&:plugin).map(&:class)
+      assert_equal [Fluent::Plugin::SampleInput, Fluent::Plugin::ForwardInput], ret.inputs.map(&:plugin).map(&:class)
       assert_equal [Fluent::Plugin::ParserFilter, Fluent::Plugin::StdoutFilter, Fluent::Plugin::GrepFilter], ret.filters.map(&:plugin).map(&:class)
       assert_equal 1, ret.labels.size
       assert_equal '@test', ret.labels[0].name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.11.2
 platform: x64-mingw32
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2020-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -458,8 +458,6 @@ files:
 - example/copy_roundrobin.conf
 - example/counter.conf
 - example/filter_stdout.conf
-- example/in_dummy_blocks.conf
-- example/in_dummy_with_compression.conf
 - example/in_forward.conf
 - example/in_forward_client.conf
 - example/in_forward_shared_key.conf
@@ -468,6 +466,8 @@ files:
 - example/in_forward_workers.conf
 - example/in_http.conf
 - example/in_out_forward.conf
+- example/in_sample_blocks.conf
+- example/in_sample_with_compression.conf
 - example/in_syslog.conf
 - example/in_tail.conf
 - example/in_tcp.conf
@@ -605,6 +605,7 @@ files:
 - lib/fluent/plugin/in_http.rb
 - lib/fluent/plugin/in_monitor_agent.rb
 - lib/fluent/plugin/in_object_space.rb
+- lib/fluent/plugin/in_sample.rb
 - lib/fluent/plugin/in_syslog.rb
 - lib/fluent/plugin/in_tail.rb
 - lib/fluent/plugin/in_tail/position_file.rb
@@ -815,13 +816,13 @@ files:
 - test/plugin/test_formatter_single_value.rb
 - test/plugin/test_formatter_tsv.rb
 - test/plugin/test_in_debug_agent.rb
-- test/plugin/test_in_dummy.rb
 - test/plugin/test_in_exec.rb
 - test/plugin/test_in_forward.rb
 - test/plugin/test_in_gc_stat.rb
 - test/plugin/test_in_http.rb
 - test/plugin/test_in_monitor_agent.rb
 - test/plugin/test_in_object_space.rb
+- test/plugin/test_in_sample.rb
 - test/plugin/test_in_syslog.rb
 - test/plugin/test_in_tail.rb
 - test/plugin/test_in_tcp.rb
@@ -877,6 +878,7 @@ files:
 - test/plugin_helper/data/cert/cert_chains/ca-cert.pem
 - test/plugin_helper/data/cert/cert_chains/cert-key.pem
 - test/plugin_helper/data/cert/cert_chains/cert.pem
+- test/plugin_helper/data/cert/empty.pem
 - test/plugin_helper/data/cert/generate_cert.rb
 - test/plugin_helper/data/cert/with_ca/ca-cert-key-pass.pem
 - test/plugin_helper/data/cert/with_ca/ca-cert-key.pem
@@ -1048,13 +1050,13 @@ test_files:
 - test/plugin/test_formatter_single_value.rb
 - test/plugin/test_formatter_tsv.rb
 - test/plugin/test_in_debug_agent.rb
-- test/plugin/test_in_dummy.rb
 - test/plugin/test_in_exec.rb
 - test/plugin/test_in_forward.rb
 - test/plugin/test_in_gc_stat.rb
 - test/plugin/test_in_http.rb
 - test/plugin/test_in_monitor_agent.rb
 - test/plugin/test_in_object_space.rb
+- test/plugin/test_in_sample.rb
 - test/plugin/test_in_syslog.rb
 - test/plugin/test_in_tail.rb
 - test/plugin/test_in_tcp.rb
@@ -1110,6 +1112,7 @@ test_files:
 - test/plugin_helper/data/cert/cert_chains/ca-cert.pem
 - test/plugin_helper/data/cert/cert_chains/cert-key.pem
 - test/plugin_helper/data/cert/cert_chains/cert.pem
+- test/plugin_helper/data/cert/empty.pem
 - test/plugin_helper/data/cert/generate_cert.rb
 - test/plugin_helper/data/cert/with_ca/ca-cert-key-pass.pem
 - test/plugin_helper/data/cert/with_ca/ca-cert-key.pem