Skip to content

Allow spaces in field references #1513

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

Closed
wants to merge 1 commit into from
Closed

Allow spaces in field references #1513

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
2 changes: 1 addition & 1 deletion lib/logstash/config/grammar.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3453,7 +3453,7 @@ def _nt_selector_element
if r1
s2, i2 = [], index
loop do
if has_terminal?('\G[^\\], ]', true, index)
if has_terminal?('\G[^\\],]', true, index)
r3 = true
@index += 1
else
Expand Down
2 changes: 1 addition & 1 deletion lib/logstash/config/grammar.treetop
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ grammar LogStashConfig
end

rule selector_element
"[" [^\], ]+ "]"
"[" [^\],]+ "]"
<LogStash::Config::AST::SelectorElement>
end

Expand Down
24 changes: 22 additions & 2 deletions spec/conditionals/test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require "test_utils"

module ConditionalFancines
module ConditionalFanciness
Copy link
Contributor Author

@jordansissel jordansissel Aug 1, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a typo correction :P

def description
return example.metadata[:example_group][:description_args][0]
end
Expand All @@ -23,7 +23,7 @@ def conditional(expression, &block)

describe "conditionals" do
extend LogStash::RSpec
extend ConditionalFancines
extend ConditionalFanciness

describe "simple" do
config <<-CONFIG
Expand Down Expand Up @@ -320,4 +320,24 @@ def conditional(expression, &block)
end
end
end

describe "field references" do
conditional "[field with space]" do
sample("field with space" => "hurray") do
insist { subject["tags"].include?("success") }
end
end

conditional "[field with space] == 'hurray'" do
sample("field with space" => "hurray") do
insist { subject["tags"].include?("success") }
end
end

conditional "[nested field][reference with][some spaces] == 'hurray'" do
sample({"nested field" => { "reference with" => { "some spaces" => "hurray" } } }) do
insist { subject["tags"].include?("success") }
end
end
end
end