fluentd 0.14.17-x64-mingw32 → 1.3.1-x64-mingw32

data/templates/new_gem/lib/fluent/plugin/parser.rb.erb

@@ -5,11 +5,11 @@ require "fluent/plugin/parser"
 module Fluent
   module Plugin
     class <%= class_name %> < Fluent::Plugin::Parser
-      Fluent::Plugin.register_parser("<%= name %>", self)
-    end
+      Fluent::Plugin.register_parser("<%= plugin_name %>", self)
 
-    def parse(text)
-      yield time, record
+      def parse(text)
+        yield time, record
+      end
     end
   end
 end

data/test/command/test_ca_generate.rb

@@ -0,0 +1,70 @@
+require_relative '../helper'
+
+require 'yajl'
+require 'flexmock/test_unit'
+require 'tmpdir'
+
+require 'fluent/command/ca_generate'
+require 'fluent/event'
+
+class TestFluentCaGenerate < ::Test::Unit::TestCase
+  def test_generate_ca_pair
+    cert, key = Fluent::CaGenerate.generate_ca_pair(Fluent::CaGenerate::DEFAULT_OPTIONS)
+    assert_equal(OpenSSL::X509::Certificate, cert.class)
+    assert_true(key.private?)
+  end
+
+  def test_ca_generate
+    dumped_output = capture_stdout do
+      Dir.mktmpdir do |dir|
+        Fluent::CaGenerate.new([dir, "fluentd"]).call
+        assert_true(File.exist?(File.join(dir, "ca_key.pem")))
+        assert_true(File.exist?(File.join(dir, "ca_cert.pem")))
+      end
+    end
+    expected = <<TEXT
+successfully generated: ca_key.pem, ca_cert.pem
+copy and use ca_cert.pem to client(out_forward)
+TEXT
+    assert_equal(expected, dumped_output)
+  end
+
+  sub_test_case "configure options" do
+    test "should respond multiple options" do
+      dumped_output = capture_stdout do
+        Dir.mktmpdir do |dir|
+          Fluent::CaGenerate.new([dir, "fluentd",
+                                  "--country", "JP", "--key-length", "4096",
+                                  "--state", "Tokyo", "--locality", "Chiyoda-ku",
+                                  "--common-name", "Forward CA"]).call
+          assert_true(File.exist?(File.join(dir, "ca_key.pem")))
+          assert_true(File.exist?(File.join(dir, "ca_cert.pem")))
+        end
+      end
+      expected = <<TEXT
+successfully generated: ca_key.pem, ca_cert.pem
+copy and use ca_cert.pem to client(out_forward)
+TEXT
+      assert_equal(expected, dumped_output)
+    end
+
+    test "invalid options" do
+      Dir.mktmpdir do |dir|
+        assert_raise(OptionParser::InvalidOption) do
+          Fluent::CaGenerate.new([dir, "fluentd",
+                                  "--invalid"]).call
+        end
+        assert_false(File.exist?(File.join(dir, "ca_key.pem")))
+        assert_false(File.exist?(File.join(dir, "ca_cert.pem")))
+      end
+    end
+
+    test "empty options" do
+      assert_raise(SystemExit) do
+        capture_stdout do
+          Fluent::CaGenerate.new([]).call
+        end
+      end
+    end
+  end
+end

data/test/command/test_fluentd.rb

@@ -494,14 +494,14 @@ CONF
     end
 
     test 'success to start the number of workers specified in configuration' do
-      conf = <<CONF
+      conf = <<'CONF'
 <system>
   workers 2
   root_dir #{@root_path}
 </system>
 <source>
   @type dummy
-  @id dummy
+  @id "dummy#{worker_id}" # check worker_id works or not with actual command
   @label @dummydata
   tag dummy
   dummy {"message": "yay!"}

data/test/command/test_plugin_config_formatter.rb

@@ -132,6 +132,7 @@ helpers: inject,compat_parameters
 time_as_integer: bool: (false)
 slow_flush_log_threshold: float: (20.0)
 <buffer>: optional, single
+ chunk_keys: array: ([])
  @type: string: ("memory")
  timekey: time: (nil)
  timekey_wait: time: (600)
@@ -154,7 +155,7 @@ slow_flush_log_threshold: float: (20.0)
  retry_exponential_backoff_base: float: (2)
  retry_max_interval: time: (nil)
  retry_randomize: bool: (true)
- chunk_keys: : ([])
+ disable_chunk_backup: bool: (false)
 <secondary>: optional, single
  @type: string: (nil)
  <buffer>: optional, single
@@ -179,10 +180,10 @@ TEXT
       expected = <<TEXT
 ## Plugin helpers
 
-* inject
-* compat_parameters
+* [inject](https://docs.fluentd.org/v1.0/articles/api-plugin-helper-inject)
+* [compat_parameters](https://docs.fluentd.org/v1.0/articles/api-plugin-helper-compat_parameters)
 
-* See also: Fluent::Plugin::Input
+* See also: [Input Plugin Overview](https://docs.fluentd.org/v1.0/articles/input-plugin-overview)
 
 ## TestFluentPluginConfigFormatter::SimpleInput
 
@@ -202,10 +203,10 @@ TEXT
       expected = <<TEXT
 ## Plugin helpers
 
-* inject
-* compat_parameters
+* [inject](https://docs.fluentd.org/v1.0/articles/api-plugin-helper-inject)
+* [compat_parameters](https://docs.fluentd.org/v1.0/articles/api-plugin-helper-compat_parameters)
 
-* See also: Fluent::Plugin::Output
+* See also: [Output Plugin Overview](https://docs.fluentd.org/v1.0/articles/output-plugin-overview)
 
 ## TestFluentPluginConfigFormatter::ComplexOutput
 

data/test/command/test_plugin_generator.rb

@@ -16,51 +16,77 @@ class TestFluentPluginGenerator < Test::Unit::TestCase
     FileUtils.rm_rf(TEMP_DIR)
   end
 
-  data(input: ["input", "in"],
-       output: ["output", "out"],
-       filter: ["filter", "filter"],
-       parser: ["parser", "parser"],
-       formatter: ["formatter", "formatter"])
-  test "generate plugin" do |(type, part)|
-    capture_stdout do
-      FluentPluginGenerator.new([type, "fake"]).call
+  sub_test_case "generate plugin" do
+    data(input: ["input", "in"],
+         output: ["output", "out"],
+         filter: ["filter", "filter"],
+         parser: ["parser", "parser"],
+         formatter: ["formatter", "formatter"])
+    test "generate plugin" do |(type, part)|
+      capture_stdout do
+        FluentPluginGenerator.new([type, "fake"]).call
+      end
+      plugin_base_dir = Pathname("fluent-plugin-fake")
+      assert { plugin_base_dir.directory? }
+      expected = [
+        "fluent-plugin-fake",
+        "fluent-plugin-fake/Gemfile",
+        "fluent-plugin-fake/LICENSE",
+        "fluent-plugin-fake/README.md",
+        "fluent-plugin-fake/Rakefile",
+        "fluent-plugin-fake/fluent-plugin-fake.gemspec",
+        "fluent-plugin-fake/lib",
+        "fluent-plugin-fake/lib/fluent",
+        "fluent-plugin-fake/lib/fluent/plugin",
+        "fluent-plugin-fake/lib/fluent/plugin/#{part}_fake.rb",
+        "fluent-plugin-fake/test",
+        "fluent-plugin-fake/test/helper.rb",
+        "fluent-plugin-fake/test/plugin",
+        "fluent-plugin-fake/test/plugin/test_#{part}_fake.rb",
+      ]
+      actual = plugin_base_dir.find.reject {|f| f.fnmatch("*/.git*") }.map(&:to_s).sort
+      assert_equal(expected, actual)
     end
-    plugin_base_dir = Pathname("fluent-plugin-fake")
-    assert { plugin_base_dir.directory? }
-    expected = [
-      "fluent-plugin-fake",
-      "fluent-plugin-fake/Gemfile",
-      "fluent-plugin-fake/LICENSE",
-      "fluent-plugin-fake/README.md",
-      "fluent-plugin-fake/Rakefile",
-      "fluent-plugin-fake/fluent-plugin-fake.gemspec",
-      "fluent-plugin-fake/lib",
-      "fluent-plugin-fake/lib/fluent",
-      "fluent-plugin-fake/lib/fluent/plugin",
-      "fluent-plugin-fake/lib/fluent/plugin/#{part}_fake.rb",
-      "fluent-plugin-fake/test",
-      "fluent-plugin-fake/test/helper.rb",
-      "fluent-plugin-fake/test/plugin",
-      "fluent-plugin-fake/test/plugin/test_#{part}_fake.rb",
-    ]
-    actual = plugin_base_dir.find.reject {|f| f.fnmatch("*/.git*") }.map(&:to_s).sort
-    assert_equal(expected, actual)
-  end
 
-  test "no license" do
-    capture_stdout do
-      FluentPluginGenerator.new(["--no-license", "filter", "fake"]).call
+    test "no license" do
+      capture_stdout do
+        FluentPluginGenerator.new(["--no-license", "filter", "fake"]).call
+      end
+      assert { !Pathname("fluent-plugin-fake/LICENSE").exist? }
+      assert { Pathname("fluent-plugin-fake/Gemfile").exist? }
+    end
+
+    test "unknown license" do
+      out = capture_stdout do
+        assert_raise(SystemExit) do
+          FluentPluginGenerator.new(["--license=unknown", "filter", "fake"]).call
+        end
+      end
+      assert { out.lines.include?("License: unknown\n") }
     end
-    assert { !Pathname("fluent-plugin-fake/LICENSE").exist? }
-    assert { Pathname("fluent-plugin-fake/Gemfile").exist? }
   end
 
-  test "unknown license" do
-    out = capture_stdout do
-      assert_raise(SystemExit) do
-        FluentPluginGenerator.new(["--license=unknown", "filter", "fake"]).call
+  sub_test_case "unify plugin name" do
+    data("word" => ["fake", "fake"],
+         "underscore" => ["rewrite_tag_filter", "rewrite_tag_filter"],
+         "dash" => ["rewrite-tag-filter", "rewrite_tag_filter"])
+    test "plugin_name" do |(name, plugin_name)|
+      generator = FluentPluginGenerator.new(["filter", name])
+      capture_stdout do
+        generator.call
+      end
+      assert_equal(plugin_name, generator.__send__(:plugin_name))
+    end
+
+    data("word" => ["fake", "fluent-plugin-fake"],
+         "underscore" => ["rewrite_tag_filter", "fluent-plugin-rewrite-tag-filter"],
+         "dash" => ["rewrite-tag-filter", "fluent-plugin-rewrite-tag-filter"])
+    test "gem_name" do |(name, gem_name)|
+      generator = FluentPluginGenerator.new(["output", name])
+      capture_stdout do
+        generator.call
       end
+      assert_equal(gem_name, generator.__send__(:gem_name))
     end
-    assert { out.lines.include?("License: unknown\n") }
   end
 end

data/test/config/test_config_parser.rb

@@ -35,6 +35,7 @@ module Fluent::Config
     config_param :param_time, :time
     config_param :param_hash, :hash
     config_param :param_array, :array
+    config_param :param_regexp, :regexp
   end
 
   class TestV1Parser < ::Test::Unit::TestCase
@@ -373,7 +374,7 @@ module Fluent::Config
         </elem2>
       ]
         write_config "#{TMP_DIR}/dir/config_test_9.conf", %[
-        k9 embeded
+        k9 embedded
         <elem3 name>
           nested nested_value
           include hoge
@@ -417,7 +418,7 @@ module Fluent::Config
         elem2 = c.elements.find { |e| e.name == 'elem2' }
         assert(elem2)
         assert_equal('name', elem2.arg)
-        assert_equal('embeded', elem2['k9'])
+        assert_equal('embedded', elem2['k9'])
         assert_not_include(elem2, 'include')
 
         elem3 = elem2.elements.find { |e| e.name == 'elem3' }
@@ -451,6 +452,7 @@ module Fluent::Config
           param_time 10m
           param_hash { "key1": "value1", "key2": 2 }
           param_array ["value1", "value2", 100]
+          param_regexp /pattern/
         ])
         target = AllTypes.new.configure(conf)
         assert_equal(conf.to_s, target.config.to_s)
@@ -465,6 +467,7 @@ module Fluent::Config
   param_time 10m
   param_hash {"key1":"value1","key2":2}
   param_array ["value1","value2",100]
+  param_regexp /pattern/
 </ROOT>
 DUMP
         assert_equal(expected, conf.to_s)
@@ -490,6 +493,7 @@ DUMP
           param_time 10m
           param_hash { "key1": "value1", "key2": 2 }
           param_array ["value1", "value2", 100]
+          param_regexp /pattern/
         ])
         target = AllTypes.new.configure(conf)
         assert_equal(conf.to_s, target.config.to_s)
@@ -504,6 +508,7 @@ DUMP
   param_time 10m
   param_hash { "key1": "value1", "key2": 2 }
   param_array ["value1", "value2", 100]
+  param_regexp /pattern/
 </ROOT>
 DUMP
         assert_equal(expected, conf.to_s)

data/test/config/test_configurable.rb

@@ -508,6 +508,11 @@ module Fluent::Config
           assert_instance_of(ConfigurableSpec::Base2, b2.configure(config_element("", "", {"name1" => "t1", "name5" => "t5", "opt3" => "a"})))
         end
 
+        test 'can accept frozen string' do
+          b2 = ConfigurableSpec::Base2.new
+          assert_instance_of(ConfigurableSpec::Base2, b2.configure(config_element("", "", {"name1" => "t1".freeze, "name5" => "t5", "opt3" => "a"})))
+        end
+
         test 'raise errors without any specifications for param without defaults' do
           b2 = ConfigurableSpec::Base2.new
           assert_raise(Fluent::ConfigError) { b2.configure(config_element("", "", {})) }
@@ -1027,12 +1032,12 @@ module Fluent::Config
           detail_base = base.class.merged_configure_proxy.sections[:detail]
           detail_sub = sub.class.merged_configure_proxy.sections[:detail]
           detail_base_attributes = {
-            requried: detail_base.required,
+            required: detail_base.required,
             multi: detail_base.multi,
             alias: detail_base.alias,
           }
           detail_sub_attributes = {
-            requried: detail_sub.required,
+            required: detail_sub.required,
             multi: detail_sub.multi,
             alias: detail_sub.alias,
           }

data/test/config/test_configure_proxy.rb

@@ -193,9 +193,10 @@ module Fluent::Config
           assert_nothing_raised{ @proxy.config_param(:p7, :time, **opt) }
           assert_nothing_raised{ @proxy.config_param(:p8, :hash, **opt) }
           assert_nothing_raised{ @proxy.config_param(:p9, :array, **opt) }
+          assert_nothing_raised{ @proxy.config_param(:pa, :regexp, **opt) }
         end
 
-        data(string: :string, integer: :integer, float: :float, size: :size, bool: :bool, time: :time, hash: :hash, array: :array)
+        data(string: :string, integer: :integer, float: :float, size: :size, bool: :bool, time: :time, hash: :hash, array: :array, regexp: :regexp)
         test 'deny list for non-enum types' do |type|
           assert_raise ArgumentError.new(":list is valid only for :enum type, but #{type}: arg") do
             @proxy.config_argument(:arg, type, list: [:a, :b])
@@ -205,7 +206,7 @@ module Fluent::Config
           end
         end
 
-        data(string: :string, integer: :integer, float: :float, size: :size, bool: :bool, time: :time)
+        data(string: :string, integer: :integer, float: :float, size: :size, bool: :bool, time: :time, regexp: :regexp)
         test 'deny value_type for non-hash/array types' do |type|
           assert_raise ArgumentError.new(":value_type is valid only for :hash and :array, but #{type}: arg") do
             @proxy.config_argument(:arg, type, value_type: :string)
@@ -215,7 +216,7 @@ module Fluent::Config
           end
         end
 
-        data(string: :string, integer: :integer, float: :float, size: :size, bool: :bool, time: :time, array: :array)
+        data(string: :string, integer: :integer, float: :float, size: :size, bool: :bool, time: :time, array: :array, regexp: :regexp)
         test 'deny symbolize_keys for non-hash types' do |type|
           assert_raise ArgumentError.new(":symbolize_keys is valid only for :hash, but #{type}: arg") do
             @proxy.config_argument(:arg, type, symbolize_keys: true)
@@ -434,6 +435,43 @@ module Fluent::Config
           assert_equal(expected, @proxy.dump_config_definition)
         end
 
+        test 'plain proxy w/ argument' do
+          @proxy.instance_eval do
+            config_argument(:argname, :string)
+            config_param(:name, :string, default: "name1")
+          end
+          expected = {
+            argname: { type: :string, required: true, argument: true },
+            name: { type: :string, default: "name1", required: false }
+          }
+          assert_equal(expected, @proxy.dump_config_definition)
+        end
+
+        test 'plain proxy w/ argument default value' do
+          @proxy.instance_eval do
+            config_argument(:argname, :string, default: "value")
+            config_param(:name, :string, default: "name1")
+          end
+          expected = {
+            argname: { type: :string, default: "value", required: false, argument: true },
+            name: { type: :string, default: "name1", required: false }
+          }
+          assert_equal(expected, @proxy.dump_config_definition)
+        end
+
+        test 'plain proxy w/ argument overwriting default value' do
+          @proxy.instance_eval do
+            config_argument(:argname, :string)
+            config_param(:name, :string, default: "name1")
+            config_set_default(:argname, "value1")
+          end
+          expected = {
+            argname: { type: :string, default: "value1", required: false, argument: true },
+            name: { type: :string, default: "name1", required: false }
+          }
+          assert_equal(expected, @proxy.dump_config_definition)
+        end
+
         test 'single sub proxy' do
           @proxy.config_section(:sub) do
             config_param(:name, :string, default: "name1")

data/test/config/test_dsl.rb

@@ -44,7 +44,7 @@ def prepare_config1
   </elem2>
 ]
   write_config "#{TMP_DIR}/dir/config_test_9.conf", %[
-  k9 embeded
+  k9 embedded
   <elem3 name>
     nested nested_value
     include hoge
@@ -176,7 +176,7 @@ module Fluent::Config
           assert_equal('source', ele4.name)
           assert_predicate(ele4.arg, :empty?)
           assert_equal(2, ele4.keys.size)
-          assert_equal('tail', ele4['type'])
+          assert_equal('tail', ele4['@type'])
           assert_equal("/var/log/httpd/access.part4.log", ele4['path'])
         end
 
@@ -185,11 +185,11 @@ module Fluent::Config
 
           assert_equal('filter', filter0.name)
           assert_equal('bar.**', filter0.arg)
-          assert_equal('hoge', filter0['type'])
+          assert_equal('hoge', filter0['@type'])
           assert_equal('moge', filter0['val1'])
           assert_equal(JSON.dump(['foo', 'bar', 'baz']), filter0['val2'])
           assert_equal('10', filter0['val3'])
-          assert_equal('hoge', filter0['id'])
+          assert_equal('hoge', filter0['@id'])
 
           assert_equal(2, filter0.elements.size)
           assert_equal('subsection', filter0.elements[0].name)
@@ -203,7 +203,7 @@ module Fluent::Config
 
           assert_equal('match', match0.name)
           assert_equal('{foo,bar}.**', match0.arg)
-          assert_equal('file', match0['type'])
+          assert_equal('file', match0['@type'])
           assert_equal('/var/log/httpd/access.myhostname.4.log', match0['path'])
         end
       end
@@ -262,7 +262,7 @@ module Fluent::Config
         elem2 = @root.elements.find { |e| e.name == 'elem2' }
         assert(elem2)
         assert_equal('name', elem2.arg)
-        assert_equal('embeded', elem2['k9'])
+        assert_equal('embedded', elem2['k9'])
         assert_not_include(elem2, 'include')
 
         elem3 = elem2.elements.find { |e| e.name == 'elem3' }
@@ -302,7 +302,7 @@ module Fluent::Config
           assert_equal('source', ele4.name)
           assert_predicate(ele4.arg, :empty?)
           assert_equal(2, ele4.keys.size)
-          assert_equal('tail', ele4['type'])
+          assert_equal('tail', ele4['@type'])
           assert_equal("/var/log/httpd/access.part4.log", ele4['path'])
         end
 
@@ -311,11 +311,11 @@ module Fluent::Config
 
           assert_equal('filter', filter0.name)
           assert_equal('bar.**', filter0.arg)
-          assert_equal('hoge', filter0['type'])
+          assert_equal('hoge', filter0['@type'])
           assert_equal('moge', filter0['val1'])
           assert_equal(JSON.dump(['foo', 'bar', 'baz']), filter0['val2'])
           assert_equal('10', filter0['val3'])
-          assert_equal('hoge', filter0['id'])
+          assert_equal('hoge', filter0['@id'])
 
           assert_equal(2, filter0.elements.size)
           assert_equal('subsection', filter0.elements[0].name)
@@ -329,7 +329,7 @@ module Fluent::Config
 
           assert_equal('match', match0.name)
           assert_equal('{foo,bar}.**', match0.arg)
-          assert_equal('file', match0['type'])
+          assert_equal('file', match0['@type'])
           assert_equal('/var/log/httpd/access.myhostname.4.log', match0['path'])
         end
       end