Skip to content

Config File Syntax: Extend Embedded Ruby Code support for Hashes and Arrays #4580

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

Merged
daipom merged 8 commits into from
Sep 24, 2024
Merged

Config File Syntax: Extend Embedded Ruby Code support for Hashes and Arrays #4580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ade088f
Moved Interpolation logic to logical_parser
Athishpranav2003 Aug 6, 2024
f4f5edc
nit
Athishpranav2003 Aug 6, 2024
60ee369
Added few comments
Athishpranav2003 Aug 6, 2024
dab6746
Added few comments
Athishpranav2003 Aug 6, 2024
12e5316
Fixed the bug in PR to pass UTs
Athishpranav2003 Aug 6, 2024
2851b99
Added UTs for the String interpolation in Hash and array forms
Athishpranav2003 Aug 7, 2024
af2b11d
Added tests for single vs double quote
Athishpranav2003 Aug 9, 2024
ee84bef
Addressed comments
Athishpranav2003 Aug 13, 2024
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
11 changes: 9 additions & 2 deletions lib/fluent/config/literal_parser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,15 @@ def scan_json(is_array)
buffer << line_buffer + "\n"
line_buffer = ""
else
# '#' is a char in json string
line_buffer << char
if @ss.exist?(/^\{[^}]+\}/)
# if it's interpolated string
skip(/\{/)
line_buffer << eval_embedded_code(scan_embedded_code)
skip(/\}/)
else
# '#' is a char in json string
line_buffer << char
end
end

next # This char '#' MUST NOT terminate json object.
Expand Down
26 changes: 26 additions & 0 deletions test/config/test_literal_parser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,17 @@ def test_falseX
test('[ "a" , "b" ]') { assert_text_parsed_as_json(["a","b"], '[ "a" , "b" ]') }
test("[\n\"a\"\n,\n\"b\"\n]") { assert_text_parsed_as_json(["a","b"], "[\n\"a\"\n,\n\"b\"\n]") }
test('["ab","cd"]') { assert_text_parsed_as_json(["ab","cd"], '["ab","cd"]') }
test('["a","#{v1}"') { assert_text_parsed_as_json(["a","#{v1}"], '["a","#{v1}"]') }
test('["a","#{v1}","#{v2}"]') { assert_text_parsed_as_json(["a","#{v1}","#{v2}"], '["a","#{v1}","#{v2}"]') }
test('["a","#{v1} #{v2}"]') { assert_text_parsed_as_json(["a","#{v1} #{v2}"], '["a","#{v1} #{v2}"]') }
test('["a","#{hostname}"]') { assert_text_parsed_as_json(["a","#{Socket.gethostname}"], '["a","#{hostname}"]') }
test('["a","foo#{worker_id}"]') {
ENV.delete('SERVERENGINE_WORKER_ID')
assert_text_parsed_as('["a","foo"]', '["a","foo#{worker_id}"]')
ENV['SERVERENGINE_WORKER_ID'] = '1'
assert_text_parsed_as('["a","foo1"]', '["a","foo#{worker_id}"]')
ENV.delete('SERVERENGINE_WORKER_ID')
}
json_array_with_js_comment = <<EOA
[
"a", // this is a
Expand Down Expand Up @@ -296,6 +307,21 @@ def test_falseX
test('{"a":"b","c":"d"}') { assert_text_parsed_as_json({"a"=>"b","c"=>"d"}, '{"a":"b","c":"d"}') }
test('{ "a" : "b" , "c" : "d" }') { assert_text_parsed_as_json({"a"=>"b","c"=>"d"}, '{ "a" : "b" , "c" : "d" }') }
test('{\n\"a\"\n:\n\"b\"\n,\n\"c\"\n:\n\"d\"\n}') { assert_text_parsed_as_json({"a"=>"b","c"=>"d"}, "{\n\"a\"\n:\n\"b\"\n,\n\"c\"\n:\n\"d\"\n}") }
test('{"a":"b","c":"#{v1}"}') { assert_text_parsed_as_json({"a"=>"b","c"=>"#{v1}"}, '{"a":"b","c":"#{v1}"}') }
test('{"a":"b","#{v1}":"d"}') { assert_text_parsed_as_json({"a"=>"b","#{v1}"=>"d"}, '{"a":"b","#{v1}":"d"}') }
test('{"a":"#{v1}","c":"#{v2}"}') { assert_text_parsed_as_json({"a"=>"#{v1}","c"=>"#{v2}"}, '{"a":"#{v1}","c":"#{v2}"}') }
test('{"a":"b","c":"d #{v1} #{v2}"}') { assert_text_parsed_as_json({"a"=>"b","c"=>"d #{v1} #{v2}"}, '{"a":"b","c":"d #{v1} #{v2}"}') }
test('{"a":"#{hostname}"}') { assert_text_parsed_as_json({"a"=>"#{Socket.gethostname}"}, '{"a":"#{hostname}"}') }
test('{"a":"foo#{worker_id}"}') {
ENV.delete('SERVERENGINE_WORKER_ID')
assert_text_parsed_as('{"a":"foo"}', '{"a":"foo#{worker_id}"}')
ENV['SERVERENGINE_WORKER_ID'] = '1'
assert_text_parsed_as('{"a":"foo1"}', '{"a":"foo#{worker_id}"}')
ENV.delete('SERVERENGINE_WORKER_ID')
}
test('no quote') { assert_text_parsed_as_json({'a'=>'b','c'=>'test'}, '{"a":"b","c":"#{v1}"}') }
test('single quote') { assert_text_parsed_as_json({'a'=>'b','c'=>'#{v1}'}, '\'{"a":"b","c":"#{v1}"}\'') }
test('double quote') { assert_text_parsed_as_json({'a'=>'b','c'=>'test'}, '"{\"a\":\"b\",\"c\":\"#{v1}\"}"') }
json_hash_with_comment = <<EOH
{
"a": 1, # this is a
Expand Down