github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 22:57:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #682 from bodgit/notin

Browse source 
Make 'if "something" not in [nonexistent] { ... }' succeed
This commit is contained in:
Richard Pijnenburg 2013-10-16 03:30:13 -07:00
commit e400039aa7
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/logstash/config/config_ast.rb
View file

@ -299,7 +299,7 @@ module LogStash; module Config; module AST
module NotInExpression module NotInExpression
def compile def compile
item, list = recursive_select(LogStash::Config::AST::RValue) item, list = recursive_select(LogStash::Config::AST::RValue)
return "(x = #{list.compile}; x.respond_to?(:include?) && !x.include?(#{item.compile}))" return "(x = #{list.compile}; !x.respond_to?(:include?) || !x.include?(#{item.compile}))"
end end
end end

2
spec/conditionals/test.rb
View file

@ -162,6 +162,7 @@ describe "conditionals" do
if !("foo" not in "foo") { mutate { add_tag => "notfoo" } } if !("foo" not in "foo") { mutate { add_tag => "notfoo" } }
if "foo" not in [somelist] { mutate { add_tag => "notsomelist" } } if "foo" not in [somelist] { mutate { add_tag => "notsomelist" } }
if "one" not in [somelist] { mutate { add_tag => "somelist" } } if "one" not in [somelist] { mutate { add_tag => "somelist" } }
if "foo" not in [alsomissing] { mutate { add_tag => "no string in missing field" } }
} }
CONFIG CONFIG
@ -174,6 +175,7 @@ describe "conditionals" do
insist { subject["tags"] }.include?("notfoo") insist { subject["tags"] }.include?("notfoo")
insist { subject["tags"] }.include?("notsomelist") insist { subject["tags"] }.include?("notsomelist")
reject { subject["tags"] }.include?("somelist") reject { subject["tags"] }.include?("somelist")
insist { subject["tags"] }.include?("no string in missing field")
end end
end end