logstash-core 7.4.1-java → 7.4.2-java

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 99b2a37617a05fc6acfddfda170adf35c2184b2c2f8973ef18dd05bf783a8f19
4
- data.tar.gz: e70b85f2dfac7389d4462c1b21a9b814ba4193560cce6516d8eaf77918ee8379
3
+ metadata.gz: 22609c148a0c1923ebfd197b553da10c106ca37a18158aeb9abf0d11421194d6
4
+ data.tar.gz: '055698909796c81076553effa63bd168fb5cc0e1365f0085ef069a29dfd29890'
5
5
  SHA512:
6
- metadata.gz: feefd0c1f3e2bd181bd37d4a19c3fc4945144972dd25901888509f48209058e46cd7e382004ee04fe8b6ce118821ead8feee71e6d2f0bce0c056022d78db17f7
7
- data.tar.gz: e8572c4deed875ce2469b8f5f9f8eadbd7e8c74a3f39cd96d7b8b56276a6c8b1e2952796fbdfe574f94182ff5a16473acb444d0c8390d56ccf6eb1c9d05ec58b
6
+ metadata.gz: cd32daf4c1e544dc954bfc1f94a0b7596ba45e5dc07a80115ce159a8536f407e1718a034a1cf96b7b212f6b9aa5d4e155f672841a308d50a21e1c1c32c0cb839
7
+ data.tar.gz: ab53ea1800d2390867bdd42dc8a8869c87de53fd0102cd2a08fccdbee997175503bfede3da696bfd95bfdafff47ead0c9c2355009c0b5b7ba2b1a3d895a3a763
@@ -2,8 +2,6 @@
2
2
  require "logstash/instrument/periodic_poller/cgroup"
3
3
  require "spec_helper"
4
4
 
5
- LogStash::Logging::Logger::configure_logging("DEBUG")
6
-
7
5
  module LogStash module Instrument module PeriodicPoller
8
6
  describe "cgroup stats" do
9
7
  let(:relative_path) { "/docker/a1f61" }
@@ -5,31 +5,32 @@ java_import "org.logstash.secret.store.SecretStoreExt"
5
5
  describe SecretStoreExt do
6
6
 
7
7
  subject {SecretStoreExt}
8
+ let(:settings) { LogStash::SETTINGS.clone }
8
9
 
9
10
  describe "with missing keystore" do
10
11
  before :each do
11
- LogStash::SETTINGS.set("keystore.file", File.join(File.dirname(__FILE__), "nothing_here"))
12
+ settings.set("keystore.file", File.join(File.dirname(__FILE__), "nothing_here"))
12
13
  end
13
14
 
14
15
  it "should be not exist" do
15
- expect(subject.exists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value)).to be_falsey
16
- expect(subject.getIfExists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value)).to be_nil
16
+ expect(subject.exists(settings.get_setting("keystore.file").value, settings.get_setting("keystore.classname").value)).to be_falsey
17
+ expect(subject.getIfExists(settings.get_setting("keystore.file").value, settings.get_setting("keystore.classname").value)).to be_nil
17
18
  end
18
19
  end
19
20
 
20
21
  describe "with implicit password keystore" do
21
22
  before :each do
22
- LogStash::SETTINGS.set("keystore.file", File.join(File.dirname(__FILE__), "../../../src/test/resources/logstash.keystore.with.default.pass"))
23
+ settings.set("keystore.file", File.join(File.dirname(__FILE__), "../../../src/test/resources/logstash.keystore.with.default.pass"))
23
24
  end
24
25
 
25
26
  it "should be readable" do
26
- 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"))
27
+ expect(subject.getIfExists(settings.get_setting("keystore.file").value, settings.get_setting("keystore.classname").value).list).to include(subject.get_store_id("keystore.seed"))
27
28
  end
28
29
  end
29
30
 
30
31
  describe "with explicit password keystore" do
31
32
  before :each do
32
- LogStash::SETTINGS.set("keystore.file", File.join(File.dirname(__FILE__), "../../../src/test/resources/logstash.keystore.with.defined.pass"))
33
+ settings.set("keystore.file", File.join(File.dirname(__FILE__), "../../../src/test/resources/logstash.keystore.with.defined.pass"))
33
34
  end
34
35
 
35
36
  describe "and correct password" do
@@ -42,7 +43,7 @@ describe SecretStoreExt do
42
43
  end
43
44
 
44
45
  it "should be readable" do
45
- 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"))
46
+ expect(subject.getIfExists(settings.get_setting("keystore.file").value, settings.get_setting("keystore.classname").value).list).to include(subject.get_store_id("keystore.seed"))
46
47
  end
47
48
  end
48
49
 
@@ -56,13 +57,13 @@ describe SecretStoreExt do
56
57
  end
57
58
 
58
59
  it "should be not readable" do
59
- 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/)
60
+ 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/)
60
61
  end
61
62
  end
62
63
 
63
64
  describe "and missing password" do
64
65
  it "should be not readable" do
65
- 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/)
66
+ 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/)
66
67
  end
67
68
  end
68
69
  end
@@ -12,7 +12,7 @@ def block_ports(range)
12
12
 
13
13
  range.each do |port|
14
14
  begin
15
- server = TCPServer.new("localhost", port)
15
+ server = TCPServer.new("127.0.0.1", port)
16
16
  servers << server
17
17
  rescue => e
18
18
  # The port can already be taken
@@ -45,7 +45,7 @@ describe LogStash::WebServer do
45
45
 
46
46
  subject { LogStash::WebServer.new(logger,
47
47
  agent,
48
- { :http_host => "localhost", :http_ports => port_range })}
48
+ { :http_host => "127.0.0.1", :http_ports => port_range })}
49
49
 
50
50
  let(:port_range) { 10000..10010 }
51
51
 
@@ -89,8 +89,9 @@ describe LogStash::WebServer do
89
89
  after(:each) { free_ports(@servers) }
90
90
 
91
91
  context "when we have available ports" do
92
+ let(:blocked_range) { 10000..10005 }
92
93
  before(:each) do
93
- @servers = block_ports(10000..10005)
94
+ @servers = block_ports(blocked_range)
94
95
  end
95
96
 
96
97
  it "successfully find an available port" do
@@ -99,10 +100,13 @@ describe LogStash::WebServer do
99
100
  end
100
101
 
101
102
  sleep(1)
103
+ address = subject.address
104
+ port = address.split(":").last.to_i
105
+ expect(port_range).to cover(port)
106
+ expect(blocked_range).to_not cover(port)
102
107
 
103
- response = open("http://localhost:10006").read
108
+ response = open("http://#{address}").read
104
109
  expect { LogStash::Json.load(response) }.not_to raise_error
105
- expect(subject.address).to eq("localhost:10006")
106
110
 
107
111
  subject.stop
108
112
  t.join
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  # alpha and beta qualifiers are now added via VERSION_QUALIFIER environment var
3
- logstash: 7.4.1
4
- logstash-core: 7.4.1
3
+ logstash: 7.4.2
4
+ logstash-core: 7.4.2
5
5
  logstash-core-plugin-api: 2.1.16
6
6
 
7
7
  # jruby must reference a *released* version of jruby which can be downloaded from the official download url
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-core
3
3
  version: !ruby/object:Gem::Version
4
- version: 7.4.1
4
+ version: 7.4.2
5
5
  platform: java
6
6
  authors:
7
7
  - Elastic
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-10-22 00:00:00.000000000 Z
11
+ date: 2019-10-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement