logstash-core 7.4.1-java → 7.4.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99b2a37617a05fc6acfddfda170adf35c2184b2c2f8973ef18dd05bf783a8f19
-  data.tar.gz: e70b85f2dfac7389d4462c1b21a9b814ba4193560cce6516d8eaf77918ee8379
+  metadata.gz: 22609c148a0c1923ebfd197b553da10c106ca37a18158aeb9abf0d11421194d6
+  data.tar.gz: '055698909796c81076553effa63bd168fb5cc0e1365f0085ef069a29dfd29890'
 SHA512:
-  metadata.gz: feefd0c1f3e2bd181bd37d4a19c3fc4945144972dd25901888509f48209058e46cd7e382004ee04fe8b6ce118821ead8feee71e6d2f0bce0c056022d78db17f7
-  data.tar.gz: e8572c4deed875ce2469b8f5f9f8eadbd7e8c74a3f39cd96d7b8b56276a6c8b1e2952796fbdfe574f94182ff5a16473acb444d0c8390d56ccf6eb1c9d05ec58b
+  metadata.gz: cd32daf4c1e544dc954bfc1f94a0b7596ba45e5dc07a80115ce159a8536f407e1718a034a1cf96b7b212f6b9aa5d4e155f672841a308d50a21e1c1c32c0cb839
+  data.tar.gz: ab53ea1800d2390867bdd42dc8a8869c87de53fd0102cd2a08fccdbee997175503bfede3da696bfd95bfdafff47ead0c9c2355009c0b5b7ba2b1a3d895a3a763

data/spec/logstash/instrument/periodic_poller/cgroup_spec.rb

@@ -2,8 +2,6 @@
 require "logstash/instrument/periodic_poller/cgroup"
 require "spec_helper"
 
-LogStash::Logging::Logger::configure_logging("DEBUG")
-
 module LogStash module Instrument module PeriodicPoller
 describe "cgroup stats" do
   let(:relative_path) { "/docker/a1f61" }

data/spec/logstash/util/secretstore_spec.rb

@@ -5,31 +5,32 @@ java_import "org.logstash.secret.store.SecretStoreExt"
 describe SecretStoreExt do
 
   subject {SecretStoreExt}
+  let(:settings) { LogStash::SETTINGS.clone }
 
   describe "with missing keystore" do
     before :each do
-      LogStash::SETTINGS.set("keystore.file", File.join(File.dirname(__FILE__), "nothing_here"))
+      settings.set("keystore.file", File.join(File.dirname(__FILE__), "nothing_here"))
     end
 
     it "should be not exist" do
-      expect(subject.exists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value)).to be_falsey
-      expect(subject.getIfExists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value)).to be_nil
+      expect(subject.exists(settings.get_setting("keystore.file").value, settings.get_setting("keystore.classname").value)).to be_falsey
+      expect(subject.getIfExists(settings.get_setting("keystore.file").value, settings.get_setting("keystore.classname").value)).to be_nil
     end
   end
 
   describe "with implicit password keystore" do
     before :each do
-      LogStash::SETTINGS.set("keystore.file", File.join(File.dirname(__FILE__), "../../../src/test/resources/logstash.keystore.with.default.pass"))
+      settings.set("keystore.file", File.join(File.dirname(__FILE__), "../../../src/test/resources/logstash.keystore.with.default.pass"))
     end
 
     it "should be readable" do
-      expect(subject.getIfExists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value).list).to include(subject.get_store_id("keystore.seed"))
+      expect(subject.getIfExists(settings.get_setting("keystore.file").value, settings.get_setting("keystore.classname").value).list).to include(subject.get_store_id("keystore.seed"))
     end
   end
 
   describe "with explicit password keystore" do
     before :each do
-      LogStash::SETTINGS.set("keystore.file", File.join(File.dirname(__FILE__), "../../../src/test/resources/logstash.keystore.with.defined.pass"))
+      settings.set("keystore.file", File.join(File.dirname(__FILE__), "../../../src/test/resources/logstash.keystore.with.defined.pass"))
     end
 
     describe "and correct password" do
@@ -42,7 +43,7 @@ describe SecretStoreExt do
       end
 
       it "should be readable" do
-        expect(subject.getIfExists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value).list).to include(subject.get_store_id("keystore.seed"))
+        expect(subject.getIfExists(settings.get_setting("keystore.file").value, settings.get_setting("keystore.classname").value).list).to include(subject.get_store_id("keystore.seed"))
       end
     end
 
@@ -56,13 +57,13 @@ describe SecretStoreExt do
       end
 
       it "should be not readable" do
-        expect {subject.getIfExists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value)}.to raise_error.with_message(/Can not access Logstash keystore/)
+        expect {subject.getIfExists(settings.get_setting("keystore.file").value, settings.get_setting("keystore.classname").value)}.to raise_error.with_message(/Can not access Logstash keystore/)
       end
     end
 
     describe "and missing password" do
       it "should be not readable" do
-        expect {subject.getIfExists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value)}.to raise_error.with_message(/Could not determine keystore password/)
+        expect {subject.getIfExists(settings.get_setting("keystore.file").value, settings.get_setting("keystore.classname").value)}.to raise_error.with_message(/Could not determine keystore password/)
       end
     end
   end

data/spec/logstash/webserver_spec.rb

@@ -12,7 +12,7 @@ def block_ports(range)
 
   range.each do |port|
     begin
-      server = TCPServer.new("localhost", port)
+      server = TCPServer.new("127.0.0.1", port)
       servers << server
     rescue => e
       # The port can already be taken
@@ -45,7 +45,7 @@ describe LogStash::WebServer do
 
   subject { LogStash::WebServer.new(logger,
                                     agent,
-                                    { :http_host => "localhost", :http_ports => port_range })}
+                                    { :http_host => "127.0.0.1", :http_ports => port_range })}
 
   let(:port_range) { 10000..10010 }
 
@@ -89,8 +89,9 @@ describe LogStash::WebServer do
     after(:each) { free_ports(@servers) }
 
     context "when we have available ports" do
+      let(:blocked_range) { 10000..10005 }
       before(:each) do
-        @servers = block_ports(10000..10005)
+        @servers = block_ports(blocked_range)
       end
 
       it "successfully find an available port" do
@@ -99,10 +100,13 @@ describe LogStash::WebServer do
         end
 
         sleep(1)
+        address = subject.address
+        port = address.split(":").last.to_i
+        expect(port_range).to cover(port)
+        expect(blocked_range).to_not cover(port)
 
-        response = open("http://localhost:10006").read
+        response = open("http://#{address}").read
         expect { LogStash::Json.load(response) }.not_to raise_error
-        expect(subject.address).to eq("localhost:10006")
 
         subject.stop
         t.join

data/versions-gem-copy.yml

@@ -1,7 +1,7 @@
 ---
 # alpha and beta qualifiers are now added via VERSION_QUALIFIER environment var
-logstash: 7.4.1
-logstash-core: 7.4.1
+logstash: 7.4.2
+logstash-core: 7.4.2
 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: 7.4.1
+  version: 7.4.2
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-22 00:00:00.000000000 Z
+date: 2019-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement