Merge pull request #1369 from fluent/csv-raise-empty-field

raise ConfigError when fields parameter is empty array
fluent · Dec 14, 2016 · bb685e6 · bb685e6
2 parents c0a5cb7 + f65dad7
commit bb685e6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/fluent/plugin/formatter_csv.rb b/lib/fluent/plugin/formatter_csv.rb
@@ -33,14 +33,16 @@ class CsvFormatter < Formatter
       def configure(conf)
         super
         @fields = fields.select{|f| !f.empty? }
+        raise ConfigError, "empty value is specified in fields parameter" if @fields.empty?
+
+        @generate_opts = {col_sep: @delimiter, force_quotes: @force_quotes}
       end
 
       def format(tag, time, record)
         row = @fields.map do |key|
           record[key]
         end
-        CSV.generate_line(row, col_sep: @delimiter,
-                          force_quotes: @force_quotes)
+        CSV.generate_line(row, @generate_opts)
       end
     end
   end

diff --git a/test/plugin/test_formatter_csv.rb b/test/plugin/test_formatter_csv.rb
@@ -27,6 +27,14 @@ def test_config_params
     assert_equal(['a', 'b', 'c'], d.instance.fields)
   end
 
+  data('empty array' => [],
+       'array including empty string' => ['', ''])
+  def test_empty_fields(param)
+    assert_raise Fluent::ConfigError do
+      create_driver('fields' => param)
+    end
+  end
+
   data(
     'tab_char' => ["\t", '\t'],
     'tab_string' => ["\t", 'TAB'],