Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support double quotes in record_accessor bracket notation #1716

Merged
merged 1 commit into from
Oct 13, 2017
Merged

Support double quotes in record_accessor bracket notation #1716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/fluent/plugin_helper/record_accessor.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,9 @@ def self.parse_bracket_notation(param)

until param.empty?
if in_bracket
if param[0] == "'"
if i = param.index("']")
if param[0] == "'" || param[0] == '"'
if i = param.index("']") || param.index('"]')
raise Fluent::ConfigError, "Mismatched quotes. Invalid syntax: #{orig_param}" unless param[0] == param[i]
result << param[1..i - 1]
param = param[i + 2..-1]
in_bracket = false
Expand Down
23 changes: 16 additions & 7 deletions test/plugin_helper/test_record_accessor.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,23 @@ class Dummy < Fluent::Plugin::TestBase
end

data('dot' => '$.key1.key2[0]',
'bracket' => "$['key1']['key2'][0]")
'bracket' => "$['key1']['key2'][0]",
'bracket w/ double quotes' => '$["key1"]["key2"][0]')
test "nested keys ['key1', 'key2', 0]" do |param|
result = Fluent::PluginHelper::RecordAccessor::Accessor.parse_parameter(param)
assert_equal ['key1', 'key2', 0], result
end

data('bracket' => "$['key1'][0]['ke y2']")
data('bracket' => "$['key1'][0]['ke y2']",
'bracket w/ double quotes' => '$["key1"][0]["ke y2"]')
test "nested keys ['key1', 0, 'ke y2']" do |param|
result = Fluent::PluginHelper::RecordAccessor::Accessor.parse_parameter(param)
assert_equal ['key1', 0, 'ke y2'], result
end

data('dot' => '$.[0].key1.[1].key2',
'bracket' => "$[0]['key1'][1]['key2']")
'bracket' => "$[0]['key1'][1]['key2']",
'bracket w/ double quotes' => '$[0]["key1"][1]["key2"]')
test "nested keys [0, 'key1', 1, 'key2']" do |param|
result = Fluent::PluginHelper::RecordAccessor::Accessor.parse_parameter(param)
assert_equal [0, 'key1', 1, 'key2'], result
Expand All @@ -49,7 +52,9 @@ class Dummy < Fluent::Plugin::TestBase
"more chars" => "$.key1[0]foo",
"whitespace char included key in dot notation" => "$.key[0].ke y",
"empty keys with dot" => "$.",
"empty keys with bracket" => "$[")
"empty keys with bracket" => "$[",
"mismatched quotes1" => "$['key1']['key2\"]",
"mismatched quotes2" => '$["key1"]["key2\']')
test 'invalid syntax' do |param|
assert_raise Fluent::ConfigError do
Fluent::PluginHelper::RecordAccessor::Accessor.parse_parameter(param)
Expand Down Expand Up @@ -78,14 +83,16 @@ class Dummy < Fluent::Plugin::TestBase
end

data('dot' => '$.key1.key2[0]',
'bracket' => "$['key1']['key2'][0]")
'bracket' => "$['key1']['key2'][0]",
'bracket w/ double quotes' => '$["key1"]["key2"][0]')
test "nested keys ['key1', 'key2', 0]" do |param|
r = {'key1' => {'key2' => [1, 2, 3]}}
accessor = @d.record_accessor_create(param)
assert_equal 1, accessor.call(r)
end

data('bracket' => "$['key1'][0]['ke y2']")
data('bracket' => "$['key1'][0]['ke y2']",
'bracket w/ double quotes' => '$["key1"][0]["ke y2"]')
test "nested keys ['key1', 0, 'ke y2']" do |param|
r = {'key1' => [{'ke y2' => "value"}]}
accessor = @d.record_accessor_create(param)
Expand All @@ -98,7 +105,9 @@ class Dummy < Fluent::Plugin::TestBase
"whitespace char included key in dot notation" => "$.key[0].ke y",
"more chars" => "$.key1[0]foo",
"empty keys with dot" => "$.",
"empty keys with bracket" => "$[")
"empty keys with bracket" => "$[",
"mismatched quotes1" => "$['key1']['key2\"]",
"mismatched quotes2" => '$["key1"]["key2\']')
test 'invalid syntax' do |param|
assert_raise Fluent::ConfigError do
@d.record_accessor_create(param)
Expand Down