fluentd 1.5.2 → 1.6.0

data/test/plugin_helper/http_server/test_app.rb

@@ -0,0 +1,65 @@
+require_relative '../../helper'
+require 'flexmock/test_unit'
+
+begin
+  require 'fluent/plugin_helper/http_server/app'
+  skip = false
+rescue LoadError => _
+  skip = true
+end
+
+unless skip
+  class HtttpHelperAppTest < Test::Unit::TestCase
+    NULL_LOGGER = Logger.new(nil)
+
+    class DummyRounter
+      def initialize(table = {})
+        @table = table
+      end
+
+      def route!(method, path, _req)
+        r = @table.fetch(method).fetch(path)
+        [200, {}, r]
+      end
+    end
+
+    sub_test_case '#call' do
+      data(
+        'GET request' => 'GET',
+        'POST request' => 'POST',
+        'DELETE request' => 'DELETE',
+        'PUT request' => 'PUT',
+        'PATCH request' => 'PATCH',
+        'OPTION request' => 'OPTIONS',
+        'CONNECT request' => 'CONNECT',
+        'TRACE request' => 'TRACE',
+      )
+      test 'dispatch correct path' do |method|
+        r = DummyRounter.new(method.downcase.to_sym => { '/path/' => 'hi' })
+        app = Fluent::PluginHelper::HttpServer::App.new(r, NULL_LOGGER)
+        m = flexmock('request', method: method, path: '/path/')
+        r = app.call(m)
+        assert_equal(r.body.read, 'hi')
+        assert_equal(r.status, 200)
+      end
+
+      test 'dispatch correct path for head' do |method|
+        r = DummyRounter.new(head: { '/path/' => 'hi' })
+        app = Fluent::PluginHelper::HttpServer::App.new(r, NULL_LOGGER)
+        m = flexmock('request', method: method, path: '/path')
+        r = app.call(m)
+        assert_equal(r.body.read, '')
+        assert_equal(r.status, 200)
+      end
+
+      test 'if path does not end with `/`' do |method|
+        r = DummyRounter.new(head: { '/path/' => 'hi' })
+        app = Fluent::PluginHelper::HttpServer::App.new(r, NULL_LOGGER)
+        m = flexmock('request', method: method, path: '/path')
+        r = app.call(m)
+        assert_equal(r.body.read, '')
+        assert_equal(r.status, 200)
+      end
+    end
+  end
+end

data/test/plugin_helper/http_server/test_route.rb

@@ -0,0 +1,32 @@
+require_relative '../../helper'
+require 'flexmock/test_unit'
+
+begin
+  require 'fluent/plugin_helper/http_server/router'
+  skip = false
+rescue LoadError => _
+  skip = true
+end
+
+unless skip
+  class HtttpHelperRouterTest < Test::Unit::TestCase
+    sub_test_case '#mount' do
+      test 'mount with method and path' do
+        router = Fluent::PluginHelper::HttpServer::Router.new
+        router.mount(:get, '/path/', ->(req) { req })
+        assert_equal(router.route!(:get, '/path/', 'request'), 'request')
+      end
+
+      test 'use default app if path is not found' do
+        router = Fluent::PluginHelper::HttpServer::Router.new
+        req = flexmock('request', path: 'path/')
+        assert_equal(router.route!(:get, '/path/', req), [404, { 'Content-Type' => 'text/plain' }, "404 Not Found: #{req.path}\n"])
+      end
+
+      test 'default app is configurable' do
+        router = Fluent::PluginHelper::HttpServer::Router.new(->(req) { req })
+        assert_equal(router.route!(:get, '/path/', 'hello'), 'hello')
+      end
+    end
+  end
+end

data/test/plugin_helper/test_cert_option.rb

@@ -0,0 +1,16 @@
+require_relative '../helper'
+require 'fluent/plugin_helper/cert_option'
+
+class CertOptionPluginHelperTest < Test::Unit::TestCase
+  class Dummy < Fluent::Plugin::TestBase
+    helpers :cert_option
+  end
+
+  test 'can load PEM encoded certificate file' do
+    d = Dummy.new
+    certs = d.cert_option_certificates_from_file("test/plugin_helper/data/cert/cert.pem")
+    assert_equal(1, certs.length)
+    certs = d.cert_option_certificates_from_file("test/plugin_helper/data/cert/cert-with-no-newline.pem")
+    assert_equal(1, certs.length)
+  end
+end

data/test/plugin_helper/test_http_server_helper.rb

@@ -0,0 +1,203 @@
+require_relative '../helper'
+require 'flexmock/test_unit'
+require 'fluent/plugin_helper/http_server'
+require 'fluent/plugin/output'
+require 'fluent/event'
+require 'net/http'
+require 'uri'
+
+class HtttpHelperTest < Test::Unit::TestCase
+  PORT = unused_port
+  NULL_LOGGER = Logger.new(nil)
+
+  class Dummy < Fluent::Plugin::TestBase
+    helpers :http_server
+  end
+
+  def on_driver
+    Fluent::Test.setup
+    driver = Dummy.new
+    driver.start
+    driver.after_start
+
+    yield(driver)
+  ensure
+    unless driver.stopped?
+      driver.stop rescue nil
+    end
+
+    unless driver.before_shutdown?
+      driver.before_shutdown rescue nil
+    end
+
+    unless driver.shutdown?
+      driver.shutdown rescue nil
+    end
+
+    unless driver.after_shutdown?
+      driver.after_shutdown rescue nil
+    end
+
+    unless driver.closed?
+      driver.close rescue nil
+    end
+
+    unless driver.terminated?
+      driver.terminated rescue nil
+    end
+  end
+
+  %w[get head].each do |n|
+    define_method(n) do |uri, header = {}|
+      url = URI.parse(uri)
+      req = Net::HTTP.const_get(n.capitalize).new(url, header)
+      Net::HTTP.start(url.host, url.port) do |http|
+        http.request(req)
+      end
+    end
+  end
+
+  %w[post put patch delete options trace].each do |n|
+    define_method(n) do |uri, body = '', header = {}|
+      url = URI.parse(uri)
+      req = Net::HTTP.const_get(n.capitalize).new(url, header)
+      req.body = body
+      Net::HTTP.start(url.host, url.port) do |http|
+        http.request(req)
+      end
+    end
+  end
+
+  sub_test_case 'Create a HTTP server' do
+    test 'monunt given path' do
+      on_driver do |driver|
+        driver.create_http_server(addr: '127.0.0.1', port: PORT, logger: NULL_LOGGER) do |s|
+          s.get('/example/hello') { [200, { 'Content-Type' => 'text/plain' }, 'hello get'] }
+          s.post('/example/hello') { [200, { 'Content-Type' => 'text/plain' }, 'hello post'] }
+          s.head('/example/hello') { [200, { 'Content-Type' => 'text/plain' }, 'hello head'] }
+          s.put('/example/hello') { [200, { 'Content-Type' => 'text/plain' }, 'hello put'] }
+          s.patch('/example/hello') { [200, { 'Content-Type' => 'text/plain' }, 'hello patch'] }
+          s.delete('/example/hello') { [200, { 'Content-Type' => 'text/plain' }, 'hello delete'] }
+          s.trace('/example/hello') { [200, { 'Content-Type' => 'text/plain' }, 'hello trace'] }
+          s.options('/example/hello') { [200, { 'Content-Type' => 'text/plain' }, 'hello options'] }
+        end
+
+        resp = head("http://127.0.0.1:#{PORT}/example/hello")
+        assert_equal('200', resp.code)
+        assert_equal(nil, resp.body)
+        assert_equal('text/plain', resp['Content-Type'])
+
+        %w[get put post put delete trace].each do |n|
+          resp = send(n, "http://127.0.0.1:#{PORT}/example/hello")
+          assert_equal('200', resp.code)
+          assert_equal("hello #{n}", resp.body)
+          assert_equal('text/plain', resp['Content-Type'])
+        end
+
+        # TODO: remove when fluentd drop ruby 2.1
+        if Gem::Version.create(RUBY_VERSION) >= Gem::Version.create('2.2.0')
+          resp = options("http://127.0.0.1:#{PORT}/example/hello")
+          assert_equal('200', resp.code)
+          assert_equal("hello options", resp.body)
+          assert_equal('text/plain', resp['Content-Type'])
+        end
+      end
+    end
+
+    test 'when path does not start with `/` or ends with `/`' do
+      on_driver do |driver|
+        driver.create_http_server(addr: '127.0.0.1', port: PORT, logger: NULL_LOGGER) do |s|
+          s.get('example/hello') { [200, { 'Content-Type' => 'text/plain' }, 'hello get'] }
+          s.get('/example/hello2/') { [200, { 'Content-Type' => 'text/plain' }, 'hello get'] }
+        end
+
+        resp = get("http://127.0.0.1:#{PORT}/example/hello")
+        assert_equal('404', resp.code)
+
+        resp = get("http://127.0.0.1:#{PORT}/example/hello2")
+        assert_equal('200', resp.code)
+      end
+    end
+
+    test 'when error raised' do
+      on_driver do |driver|
+        driver.create_http_server(addr: '127.0.0.1', port: PORT, logger: NULL_LOGGER) do |s|
+          s.get('/example/hello') { raise 'error!' }
+        end
+
+        resp = get("http://127.0.0.1:#{PORT}/example/hello")
+        assert_equal('500', resp.code)
+      end
+    end
+
+    test 'when path is not found' do
+      on_driver do |driver|
+        driver.create_http_server(addr: '127.0.0.1', port: PORT, logger: NULL_LOGGER) do |s|
+          s.get('/example/hello') { [200, { 'Content-Type' => 'text/plain' }, 'hello get'] }
+        end
+
+        resp = get("http://127.0.0.1:#{PORT}/example/hello/not_found")
+        assert_equal('404', resp.code)
+      end
+    end
+
+    test 'params and body' do
+      on_driver do |driver|
+        driver.create_http_server(addr: '127.0.0.1', port: PORT, logger: NULL_LOGGER) do |s|
+          s.get('/example/hello') do |req|
+            assert_equal(req.query_string, nil)
+            assert_equal(req.body, nil)
+            [200, { 'Content-Type' => 'text/plain' }, 'hello get']
+          end
+
+          s.post('/example/hello') do |req|
+            assert_equal(req.query_string, nil)
+            assert_equal(req.body, 'this is body')
+            [200, { 'Content-Type' => 'text/plain' }, 'hello post']
+          end
+
+          s.get('/example/hello/params') do |req|
+            assert_equal(req.query_string, 'test=true')
+            assert_equal(req.body, nil)
+            [200, { 'Content-Type' => 'text/plain' }, 'hello get']
+          end
+
+          s.post('/example/hello/params') do |req|
+            assert_equal(req.query_string, 'test=true')
+            assert_equal(req.body, 'this is body')
+            [200, { 'Content-Type' => 'text/plain' }, 'hello post']
+          end
+        end
+
+        resp = get("http://127.0.0.1:#{PORT}/example/hello")
+        assert_equal('200', resp.code)
+
+        resp = post("http://127.0.0.1:#{PORT}/example/hello", 'this is body')
+        assert_equal('200', resp.code)
+
+        resp = get("http://127.0.0.1:#{PORT}/example/hello/params?test=true")
+        assert_equal('200', resp.code)
+
+        resp = post("http://127.0.0.1:#{PORT}/example/hello/params?test=true", 'this is body')
+        assert_equal('200', resp.code)
+      end
+    end
+
+    test 'must be called #start and #stop' do
+      on_driver do |driver|
+        server = flexmock('Server') do |watcher|
+          watcher.should_receive(:start).once.and_return do |que|
+            que.push(:start)
+          end
+          watcher.should_receive(:stop).once
+        end
+
+        stub(Fluent::PluginHelper::HttpServer::Server).new(anything) { server }
+        driver.create_http_server(addr: '127.0.0.1', port: PORT, logger: NULL_LOGGER) do
+          # nothing
+        end
+        driver.stop
+      end
+    end
+  end
+end

data/test/plugin_helper/test_server.rb

@@ -230,16 +230,10 @@ class ServerPluginHelperTest < Test::Unit::TestCase
     data(
       'server_create udp' => [:server_create, :udp],
     )
-    test 'raise error if tcp/tls/unix options specified for udp' do |(m, proto)|
+    test 'raise error if tcp/tls/unix backlog options specified for udp' do |(m, proto)|
       assert_raise(ArgumentError.new("BUG: backlog is available for tcp/tls")) do
         @d.__send__(m, :myserver, PORT, proto: proto, backlog: 500){|x| x }
       end
-    end
-
-    data(
-      'server_create udp' => [:server_create, :udp],
-    )
-    test 'raise error if tcp/tls/unix options specified for udp' do |(m, proto)|
       assert_raise(ArgumentError.new("BUG: send_keepalive_packet is available for tcp")) do
         @d.__send__(m, :myserver, PORT, proto: proto, send_keepalive_packet: true){|x| x }
       end

data/test/test_event_time.rb

@@ -36,6 +36,19 @@ class EventTimeTest < Test::Unit::TestCase
     assert_equal('100', "#{time}")
   end
 
+  test '#to_time' do
+    time = Fluent::EventTime.new(@now.to_i, @now.nsec).to_time
+    assert_instance_of(Time, time)
+    assert_equal(@now.to_i, time.to_i)
+    begin
+      ::Time.at(0, 0, :nanosecond)
+      assert_equal(@now.nsec, time.nsec)
+    rescue
+      # Time.at(@sec, @nsec / 1000.0) sometimes cause 1 diff error in nsec by 1000.0
+      assert_in_delta(@now.nsec, time.nsec, 1)
+    end
+  end
+
   test '#to_json' do
     time = Fluent::EventTime.new(100)
     assert_equal('100', time.to_json)

data/test/test_log.rb

@@ -12,7 +12,7 @@ class LogTest < Test::Unit::TestCase
     FileUtils.rm_rf(TMP_DIR)
     FileUtils.mkdir_p(TMP_DIR)
     @log_device = Fluent::Test::DummyLogDevice.new
-    @timestamp = Time.parse("2016-04-21 11:58:41 +0900")
+    @timestamp = Time.parse("2016-04-21 02:58:41 +0000")
     @timestamp_str = @timestamp.strftime("%Y-%m-%d %H:%M:%S %z")
     Timecop.freeze(@timestamp)
   end
@@ -540,7 +540,7 @@ end
 class PluginLoggerTest < Test::Unit::TestCase
   def setup
     @log_device = Fluent::Test::DummyLogDevice.new
-    @timestamp = Time.parse("2016-04-21 11:58:41 +0900")
+    @timestamp = Time.parse("2016-04-21 02:58:41 +0000")
     @timestamp_str = @timestamp.strftime("%Y-%m-%d %H:%M:%S %z")
     Timecop.freeze(@timestamp)
     dl_opts = {}
@@ -796,13 +796,15 @@ class PluginLoggerTest < Test::Unit::TestCase
     end
 
     data(
-      text: [:text, "2016-04-21 11:58:41 +0900 [info]: yaaay\n"],
-      json: [:json, %Q({"time":"2016-04-21 11:58:41 +0900","level":"info","message":"yaaay"}\n)],
+      text: [:text, "2016-04-21 02:58:41 +0000 [info]: yaaay\n"],
+      json: [:json, %Q({"time":"2016-04-21 02:58:41 +0000","level":"info","message":"yaaay"}\n)],
     )
     def test_format(data)
       fmt, expected_log_line = data
-      @log.format = fmt
-      @log.info "yaaay"
+      with_timezone('utc') {
+        @log.format = fmt
+        @log.info "yaaay"
+      }
       assert{ @log_device.logs.include? expected_log_line }
     end
 

data/test/test_supervisor.rb

@@ -274,6 +274,7 @@ class SupervisorTest < ::Test::Unit::TestCase
     params['log_path'] = 'test/tmp/supervisor/log'
     params['suppress_repeated_stacktrace'] = true
     params['log_level'] = Fluent::Log::LEVEL_INFO
+    params['conf_encoding'] = 'utf-8'
     load_config_proc =  Proc.new { Fluent::Supervisor.load_config(tmp_dir, params) }
 
     # first call
@@ -340,6 +341,7 @@ class SupervisorTest < ::Test::Unit::TestCase
     params['suppress_repeated_stacktrace'] = true
     params['log_level'] = Fluent::Log::LEVEL_INFO
     params['daemonize'] = './fluentd.pid'
+    params['conf_encoding'] = 'utf-8'
     load_config_proc = Proc.new { Fluent::Supervisor.load_config(tmp_dir, params) }
 
     # first call
@@ -414,6 +416,7 @@ class SupervisorTest < ::Test::Unit::TestCase
     params['log_path'] = 'test/tmp/supervisor/log'
     params['suppress_repeated_stacktrace'] = true
     params['log_level'] = Fluent::Log::LEVEL_INFO
+    params['conf_encoding'] = 'utf-8'
     load_config_proc =  Proc.new { Fluent::Supervisor.load_config(tmp_path, params) }
 
     se_config = load_config_proc.call

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-14 00:00:00.000000000 Z
+date: 2019-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -329,6 +329,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/ISSUE_TEMPLATE.md"
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".gitlab-ci.yml"
@@ -546,6 +548,14 @@ files:
 - lib/fluent/plugin_helper/event_loop.rb
 - lib/fluent/plugin_helper/extract.rb
 - lib/fluent/plugin_helper/formatter.rb
+- lib/fluent/plugin_helper/http_server.rb
+- lib/fluent/plugin_helper/http_server/app.rb
+- lib/fluent/plugin_helper/http_server/compat/server.rb
+- lib/fluent/plugin_helper/http_server/compat/webrick_handler.rb
+- lib/fluent/plugin_helper/http_server/methods.rb
+- lib/fluent/plugin_helper/http_server/request.rb
+- lib/fluent/plugin_helper/http_server/router.rb
+- lib/fluent/plugin_helper/http_server/server.rb
 - lib/fluent/plugin_helper/inject.rb
 - lib/fluent/plugin_helper/parser.rb
 - lib/fluent/plugin_helper/record_accessor.rb
@@ -632,6 +642,7 @@ files:
 - test/counter/test_store.rb
 - test/counter/test_validator.rb
 - test/helper.rb
+- test/helpers/fuzzy_assert.rb
 - test/plugin/data/2010/01/20100102-030405.log
 - test/plugin/data/2010/01/20100102-030406.log
 - test/plugin/data/2010/01/20100102.log
@@ -714,12 +725,19 @@ files:
 - test/plugin/test_storage.rb
 - test/plugin/test_storage_local.rb
 - test/plugin/test_string_util.rb
+- test/plugin_helper/data/cert/cert-key.pem
+- test/plugin_helper/data/cert/cert-with-no-newline.pem
+- test/plugin_helper/data/cert/cert.pem
+- test/plugin_helper/http_server/test_app.rb
+- test/plugin_helper/http_server/test_route.rb
+- test/plugin_helper/test_cert_option.rb
 - test/plugin_helper/test_child_process.rb
 - test/plugin_helper/test_compat_parameters.rb
 - test/plugin_helper/test_event_emitter.rb
 - test/plugin_helper/test_event_loop.rb
 - test/plugin_helper/test_extract.rb
 - test/plugin_helper/test_formatter.rb
+- test/plugin_helper/test_http_server_helper.rb
 - test/plugin_helper/test_inject.rb
 - test/plugin_helper/test_parser.rb
 - test/plugin_helper/test_record_accessor.rb
@@ -808,6 +826,7 @@ test_files:
 - test/counter/test_store.rb
 - test/counter/test_validator.rb
 - test/helper.rb
+- test/helpers/fuzzy_assert.rb
 - test/plugin/data/2010/01/20100102-030405.log
 - test/plugin/data/2010/01/20100102-030406.log
 - test/plugin/data/2010/01/20100102.log
@@ -890,12 +909,19 @@ test_files:
 - test/plugin/test_storage.rb
 - test/plugin/test_storage_local.rb
 - test/plugin/test_string_util.rb
+- test/plugin_helper/data/cert/cert-key.pem
+- test/plugin_helper/data/cert/cert-with-no-newline.pem
+- test/plugin_helper/data/cert/cert.pem
+- test/plugin_helper/http_server/test_app.rb
+- test/plugin_helper/http_server/test_route.rb
+- test/plugin_helper/test_cert_option.rb
 - test/plugin_helper/test_child_process.rb
 - test/plugin_helper/test_compat_parameters.rb
 - test/plugin_helper/test_event_emitter.rb
 - test/plugin_helper/test_event_loop.rb
 - test/plugin_helper/test_extract.rb
 - test/plugin_helper/test_formatter.rb
+- test/plugin_helper/test_http_server_helper.rb
 - test/plugin_helper/test_inject.rb
 - test/plugin_helper/test_parser.rb
 - test/plugin_helper/test_record_accessor.rb