Merge pull request #2267 from fluent/add-parse-section-checking-in-tc…

…p-in-udp in_tcp: in_udp: Add <parse> section checking. Fix #2266
fluent · Jan 18, 2019 · 162d20e · 162d20e
2 parents 2d05002 + 5e299b4
commit 162d20e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/lib/fluent/plugin/in_tcp.rb b/lib/fluent/plugin/in_tcp.rb
@@ -41,11 +41,15 @@ class TcpInput < Input
 
     def configure(conf)
       compat_parameters_convert(conf, :parser)
+      parser_config = conf.elements('parse').first
+      unless parser_config
+        raise Fluent::ConfigError, "<parse> section is required."
+      end
       super
       @_event_loop_blocking_timeout = @blocking_timeout
       @source_hostname_key ||= @source_host_key if @source_host_key
 
-      @parser = parser_create
+      @parser = parser_create(conf: parser_config)
     end
 
     def multi_workers_ready?

diff --git a/lib/fluent/plugin/in_udp.rb b/lib/fluent/plugin/in_udp.rb
@@ -47,12 +47,16 @@ class UdpInput < Input
 
     def configure(conf)
       compat_parameters_convert(conf, :parser)
+      parser_config = conf.elements('parse').first
+      unless parser_config
+        raise Fluent::ConfigError, "<parse> section is required."
+      end
       super
       @_event_loop_blocking_timeout = @blocking_timeout
       @source_hostname_key ||= @source_host_key if @source_host_key
       @message_length_limit = @body_size_limit if @body_size_limit
 
-      @parser = parser_create
+      @parser = parser_create(conf: parser_config)
     end
 
     def multi_workers_ready?

diff --git a/test/plugin/test_in_tcp.rb b/test/plugin/test_in_tcp.rb
@@ -48,6 +48,12 @@ def create_tcp_socket(host, port, &block)
     assert_equal "\n", d.instance.delimiter
   end
 
+  test ' configure w/o parse section' do
+    assert_raise(Fluent::ConfigError.new("<parse> section is required.")) {
+      create_driver(BASE_CONFIG)
+    }
+  end
+
   test_case_data = {
     'none' => {
       'format' => 'none',

diff --git a/test/plugin/test_in_udp.rb b/test/plugin/test_in_udp.rb
@@ -59,6 +59,12 @@ def create_udp_socket(host, port)
     assert_equal nil, d.instance.receive_buffer_size
   end
 
+  test ' configure w/o parse section' do
+    assert_raise(Fluent::ConfigError.new("<parse> section is required.")) {
+      create_driver(BASE_CONFIG)
+    }
+  end
+
   data(
     'ipv4' => [CONFIG, '127.0.0.1', :ipv4],
     'ipv6' => [IPv6_CONFIG, '::1', :ipv6],