fluentd 1.17.0-x64-mingw32 → 1.17.1-x64-mingw32

data/test/plugin_helper/test_service_discovery.rb

@@ -1,165 +0,0 @@
-require_relative '../helper'
-require 'flexmock/test_unit'
-require 'fluent/plugin_helper/service_discovery'
-require 'fluent/plugin/output'
-
-class ServiceDiscoveryHelper < Test::Unit::TestCase
-  class Dummy < Fluent::Plugin::TestBase
-    helpers :service_discovery
-
-    # Make these mehtod public
-    def service_discovery_create_manager(title, configurations:, load_balancer: nil, custom_build_method: nil, interval: 3)
-      super
-    end
-
-    def discovery_manager
-      super
-    end
-  end
-
-  class DummyPlugin < Fluent::Plugin::TestBase
-    helpers :service_discovery
-
-    def configure(conf)
-      super
-      service_discovery_configure(:service_discovery_helper_test, static_default_service_directive: 'node')
-    end
-
-    def select_service(&block)
-      service_discovery_select_service(&block)
-    end
-
-    # Make these mehtod public
-    def discovery_manager
-      super
-    end
-  end
-
-  setup do
-    @sd_file_dir = File.expand_path('../plugin/data/sd_file', __dir__)
-
-    @d = nil
-  end
-
-  teardown do
-    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
-  end
-
-  test 'support calling #service_discovery_create_manager and #discovery_manager from plugin' do
-    d = @d = Dummy.new
-
-    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' })]) }],
-    )
-
-    assert_true !!d.discovery_manager
-
-    mock.proxy(d.discovery_manager).start.once
-    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
-    assert_equal '127.0.0.1', services[0].host
-    assert_equal 1234, services[0].port
-  end
-
-  test 'start discovery manager' do
-    d = @d = DummyPlugin.new
-
-    services = [config_element('service', '', { 'host' => '127.0.0.1', 'port' => '1234' })]
-    d.configure(config_element('root', '', {}, [config_element('service_discovery', '', {'@type' => 'static'}, services)]))
-
-    assert_true !!d.discovery_manager
-
-    mock.proxy(d.discovery_manager).start.once
-    mock.proxy(d).timer_execute(:service_discovery_helper_test, anything).never
-
-    d.start
-    d.event_loop_wait_until_start
-
-    assert_equal 1, d.discovery_manager.services.size
-    d.select_service do |serv|
-      assert_equal "127.0.0.1", serv.host
-      assert_equal 1234, serv.port
-    end
-  end
-
-  test 'call timer_execute if dynamic configuration' do
-    d = @d = DummyPlugin.new
-    d.configure(config_element('root', '', {}, [config_element('service_discovery', '', { '@type' => 'file', 'path' => File.join(@sd_file_dir, 'config.yml' )})]))
-
-    assert_true !!d.discovery_manager
-    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 = DummyPlugin.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.configure(config_element('root', '', {}, [config_element('service_discovery', '', { '@type' => 'srv', 'service' => 'service1', 'hostname' => 'example.com' })]))
-
-    assert_true !!d.discovery_manager
-    mock.proxy(d.discovery_manager).start.once
-    mock(d).timer_execute(:service_discovery_helper_test, 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.times(3)
-
-    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
-
-  test 'static service discovery will be configured automatically when default service directive is specified' do
-    d = @d = DummyPlugin.new
-
-    nodes = [
-      config_element('node', '', { 'host' => '192.168.0.1', 'port' => '24224' }),
-      config_element('node', '', { 'host' => '192.168.0.2', 'port' => '24224' })
-    ]
-    d.configure(config_element('root', '', {}, nodes))
-
-    assert_true !!d.discovery_manager
-
-    mock.proxy(d.discovery_manager).start.once
-    mock.proxy(d).timer_execute(:service_discovery_helper_test, anything).never
-
-    d.start
-    d.event_loop_wait_until_start
-
-    assert_equal 2, d.discovery_manager.services.size
-    d.select_service do |serv|
-      assert_equal "192.168.0.1", serv.host
-      assert_equal 24224, serv.port
-    end
-    d.select_service do |serv|
-      assert_equal "192.168.0.2", serv.host
-      assert_equal 24224, serv.port
-    end
-  end
-end

data/test/plugin_helper/test_socket.rb

@@ -1,146 +0,0 @@
-require_relative '../helper'
-require 'fluent/plugin_helper/socket'
-require 'fluent/plugin/base'
-
-require 'socket'
-require 'openssl'
-
-class SocketHelperTest < Test::Unit::TestCase
-  CERT_DIR = File.expand_path(File.dirname(__FILE__) + '/data/cert/without_ca')
-  CA_CERT_DIR = File.expand_path(File.dirname(__FILE__) + '/data/cert/with_ca')
-  CERT_CHAINS_DIR = File.expand_path(File.dirname(__FILE__) + '/data/cert/cert_chains')
-
-  def setup
-    @port = unused_port
-  end
-
-  def teardown
-    @port = nil
-  end
-
-  class SocketHelperTestPlugin < Fluent::Plugin::TestBase
-    helpers :socket
-  end
-
-  class EchoTLSServer
-    def initialize(port, host: '127.0.0.1', cert_path: nil, private_key_path: nil, ca_path: nil)
-      server = TCPServer.open(host, port)
-      ctx = OpenSSL::SSL::SSLContext.new
-      ctx.cert = OpenSSL::X509::Certificate.new(File.open(cert_path)) if cert_path
-
-      cert_store = OpenSSL::X509::Store.new
-      cert_store.set_default_paths
-      cert_store.add_file(ca_path) if ca_path
-      ctx.cert_store = cert_store
-
-      ctx.key = OpenSSL::PKey::RSA.new(File.open(private_key_path)) if private_key_path
-      ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
-      ctx.verify_hostname = false
-
-      @server = OpenSSL::SSL::SSLServer.new(server, ctx)
-      @thread = nil
-      @r, @w = IO.pipe
-    end
-
-    def start
-      do_start
-
-      if block_given?
-        begin
-          yield
-          @thread.join(5)
-        ensure
-          stop
-        end
-      end
-    end
-
-    def stop
-      unless @w.closed?
-        @w.write('stop')
-      end
-
-      [@server, @w, @r].each do |s|
-        next if s.closed?
-        s.close
-      end
-
-      @thread.join(5)
-    end
-
-    private
-
-    def do_start
-      @thread = Thread.new(@server) do |s|
-        socks, _, _ = IO.select([s.accept, @r], nil, nil)
-
-        if socks.include?(@r)
-          break
-        end
-
-        sock = socks.first
-        buf = +''
-        loop do
-          b = sock.read_nonblock(1024, nil, exception: false)
-          if b == :wait_readable || b.nil?
-            break
-          end
-          buf << b
-        end
-
-        sock.write(buf)
-        sock.close
-      end
-    end
-  end
-
-  test 'with self-signed cert/key pair' do
-    cert_path = File.join(CERT_DIR, 'cert.pem')
-    private_key_path = File.join(CERT_DIR, 'cert-key.pem')
-
-    EchoTLSServer.new(@port, cert_path: cert_path, private_key_path: private_key_path).start do
-      client = SocketHelperTestPlugin.new.socket_create_tls('127.0.0.1', @port, verify_fqdn: false, cert_paths: [cert_path])
-      client.write('hello')
-      assert_equal 'hello', client.readpartial(100)
-      client.close
-    end
-  end
-
-  test 'with cert/key signed by self-signed CA' do
-    cert_path = File.join(CA_CERT_DIR, 'cert.pem')
-    private_key_path = File.join(CA_CERT_DIR, 'cert-key.pem')
-
-    ca_cert_path = File.join(CA_CERT_DIR, 'ca-cert.pem')
-
-    EchoTLSServer.new(@port, cert_path: cert_path, private_key_path: private_key_path).start do
-      client = SocketHelperTestPlugin.new.socket_create_tls('127.0.0.1', @port, verify_fqdn: false, cert_paths: [ca_cert_path])
-      client.write('hello')
-      assert_equal 'hello', client.readpartial(100)
-      client.close
-    end
-  end
-
-  test 'with cert/key signed by self-signed CA in server and client cert chain' do
-    cert_path = File.join(CERT_DIR, 'cert.pem')
-    private_key_path = File.join(CERT_DIR, 'cert-key.pem')
-
-    client_ca_cert_path = File.join(CERT_CHAINS_DIR, 'ca-cert.pem')
-    client_cert_path = File.join(CERT_CHAINS_DIR, 'cert.pem')
-    client_private_key_path = File.join(CERT_CHAINS_DIR, 'cert-key.pem')
-
-    EchoTLSServer.new(@port, cert_path: cert_path, private_key_path: private_key_path, ca_path: client_ca_cert_path).start do
-      client = SocketHelperTestPlugin.new.socket_create_tls('127.0.0.1', @port, verify_fqdn: false, cert_path: client_cert_path, private_key_path: client_private_key_path, cert_paths: [cert_path])
-      client.write('hello')
-      assert_equal 'hello', client.readpartial(100)
-      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