Skip to content

Commit e853377

Browse files
committed
dont mutate SETTINGS object in keystore specs
Fixes #11270
1 parent a1930f2 commit e853377

1 file changed

Lines changed: 10 additions & 9 deletions

File tree

logstash-core/spec/logstash/util/secretstore_spec.rb

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,32 @@
55
describe SecretStoreExt do
66

77
subject {SecretStoreExt}
8+
let(:settings) { LogStash::SETTINGS.clone }
89

910
describe "with missing keystore" do
1011
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"))
1213
end
1314

1415
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
1718
end
1819
end
1920

2021
describe "with implicit password keystore" do
2122
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"))
2324
end
2425

2526
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"))
2728
end
2829
end
2930

3031
describe "with explicit password keystore" do
3132
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"))
3334
end
3435

3536
describe "and correct password" do
@@ -42,7 +43,7 @@
4243
end
4344

4445
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"))
4647
end
4748
end
4849

@@ -56,13 +57,13 @@
5657
end
5758

5859
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/)
6061
end
6162
end
6263

6364
describe "and missing password" do
6465
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/)
6667
end
6768
end
6869
end

0 commit comments

Comments
 (0)