logstash-core 6.8.0-java → 6.8.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5071f9304b6a23e209a8066521865d09ee9235ca69e027fdf54ab277113f94bb
-  data.tar.gz: c69a7b8aa2caf0739b191bd517dbc9e002757a251173bc6d1454525745ff5b42
+  metadata.gz: fe13d725f9d7adab06d6e1cd7c194022986600a18886c70ba7e226fa3404be63
+  data.tar.gz: 6756c01d8c5003b8566288e73d2da68ba453e2dede4bb88751ecdf8bf8b37770
 SHA512:
-  metadata.gz: e8dcc896f404b3979054fb5335529e923479c6907f14097b10833a52026d9e1cd00c8bb461756565b19b3d96965448198335c377e313bc2cf58face22927b5e7
-  data.tar.gz: 9d790ea80dcd354bfdbe6b684c0fe395077796a4c2103a72f1061752c9e8d87a588de7e7ba42f5bd2410f2439f288c10bcf4175a6b993aadb6b0add3b5281fec
+  metadata.gz: 0fb880c7824d5e3f024ccb820dcd2e727ee6b3460ac32cfbdcace8eddcf696247be130cb3020ed5b4ba35afb5fa81f62b92ec8b9b67cb8985222faed76833c91
+  data.tar.gz: b700e79cbc1ecc9c9f08caa333b9ffb8c0298305f03f53889e28ecd4e22a32c7dbdd3f1798d2be9217bffa5798d078867da0990038e71157c7b060651f53aa1a

data/lib/logstash/compiler/lscl.rb

@@ -3,6 +3,7 @@ require "treetop"
 require "logstash/compiler/treetop_monkeypatches"
 require "logstash/compiler/lscl/helpers"
 require "logstash/config/string_escape"
+require "logstash/util"
 
 java_import org.logstash.config.ir.DSL
 java_import org.logstash.common.SourceWithMetadata
@@ -111,7 +112,7 @@ module LogStashCompilerLSCLGrammar; module LogStash; module Compiler; module LSC
           # hash value; e.g., `{"match" => {"baz" => "bar"}, "match" => {"foo" => "bulb"}}` is
           # interpreted as `{"match" => {"baz" => "bar", "foo" => "blub"}}`.
           # (NOTE: this bypasses `AST::Hash`'s ability to detect duplicate keys)
-          hash[k] = existing.merge(v)
+          hash[k] = ::LogStash::Util.hash_merge_many(existing, v)
         elsif existing.kind_of?(::Array)
           hash[k] = existing.push(*v)
         else
@@ -164,8 +165,8 @@ module LogStashCompilerLSCLGrammar; module LogStash; module Compiler; module LSC
   class Number < Value
     def expr
       jdsl.eValue(source_meta, text_value.include?(".") ?
-        text_value.to_f :
-        text_value.to_i)
+                                   Float(text_value) :
+                                   Integer(text_value))
     end
   end
 

data/lib/logstash/environment.rb

@@ -164,11 +164,15 @@ module LogStash
     end
 
     def windows?
-      RbConfig::CONFIG['host_os'] =~ WINDOW_OS_RE
+      host_os =~ WINDOW_OS_RE
     end
 
     def linux?
-      RbConfig::CONFIG['host_os'] =~ LINUX_OS_RE
+      host_os =~ LINUX_OS_RE
+    end
+
+    def host_os
+      RbConfig::CONFIG['host_os']
     end
 
     def locales_path(path)

data/spec/logstash/compiler/compiler_spec.rb

@@ -252,6 +252,34 @@ describe LogStash::Compiler do
           expect(c_plugin).to ir_eql(j.iPlugin(rand_meta, FILTER, "grok", expected_plugin_args))
         end
 
+        describe "a filter plugin with a repeated hash directive with duplicated keys" do
+          let(:source) { "input { } filter { #{plugin_source} } output { } " }
+          let(:plugin_source) do
+            %q[
+              grok {
+                match => { "message" => "foo" }
+                match => { "message" => "bar" }
+                break_on_match => false
+              }
+          ]
+          end
+          subject(:c_plugin) { compiled[:filter] }
+
+          let(:expected_plugin_args) do
+            {
+                "match" => {
+                    "message" => ["foo", "bar"]
+                },
+                "break_on_match" => "false"
+            }
+          end
+
+          it "should merge the values of the duplicate keys into an array" do
+            expect(c_plugin).to ir_eql(j.iPlugin(rand_meta, FILTER, "grok", expected_plugin_args))
+          end
+
+        end
+
         describe "a filter plugin that has nested Hash directives" do
           let(:source) { "input { } filter { #{plugin_source} } output { } " }
           let(:plugin_source) do

data/spec/logstash/config/config_ast_spec.rb

@@ -143,6 +143,21 @@ describe LogStashConfigParser do
 
         expect(config).to be_nil
       end
+
+      it "supports octal literals" do
+        parser = LogStashConfigParser.new
+        config = parser.parse(%q(
+          input {
+            example {
+              foo => 010
+            }
+          }
+        ))
+
+        compiled_number = eval(config.recursive_select(LogStash::Config::AST::Number).first.compile)
+
+        expect(compiled_number).to be == 8
+      end
     end
 
     context "when config.support_escapes" do

data/spec/logstash/environment_spec.rb

@@ -57,14 +57,14 @@ describe LogStash::Environment do
     context "windows" do
       windows_host_os.each do |host|
         it "#{host} returns true" do
-          expect(RbConfig::CONFIG).to receive(:[]).with("host_os").and_return(host)
+          allow(LogStash::Environment).to receive(:host_os).and_return(host)
           expect(LogStash::Environment.windows?).to be_truthy
         end
       end
 
       linux_host_os.each do |host|
         it "#{host} returns false" do
-          expect(RbConfig::CONFIG).to receive(:[]).with("host_os").and_return(host)
+          allow(LogStash::Environment).to receive(:host_os).and_return(host)
           expect(LogStash::Environment.windows?).to be_falsey
         end
       end
@@ -73,14 +73,14 @@ describe LogStash::Environment do
     context "Linux" do
       windows_host_os.each do |host|
         it "#{host} returns true" do
-          expect(RbConfig::CONFIG).to receive(:[]).with("host_os").and_return(host)
+          allow(LogStash::Environment).to receive(:host_os).and_return(host)
           expect(LogStash::Environment.linux?).to be_falsey
         end
       end
 
       linux_host_os.each do |host|
         it "#{host} returns false" do
-          expect(RbConfig::CONFIG).to receive(:[]).with("host_os").and_return(host)
+          allow(LogStash::Environment).to receive(:host_os).and_return(host)
           expect(LogStash::Environment.linux?).to be_truthy
         end
       end

data/versions-gem-copy.yml

@@ -1,6 +1,6 @@
 ---
-logstash: 6.8.0
-logstash-core: 6.8.0
+logstash: 6.8.1
+logstash-core: 6.8.1
 logstash-core-plugin-api: 2.1.16
 
 # jruby must reference a *released* version of jruby which can be downloaded from the official download url

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 6.8.0
+  version: 6.8.1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2019-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement