Skip to content

Commit e9c95f5

Browse files
committed
Apply suggestions from code review
1 parent 30190e0 commit e9c95f5

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

spec/plugin_mixin/http_client_ssl_spec.rb

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
require 'stud/temporary'
55

66
shared_examples 'setting ca bundles' do |key, type|
7-
subject { plugin_class.new(conf).send(:client_config) }
7+
subject(:client_config) { plugin_class.new(conf).send(:client_config) }
88

99
it 'should correctly set the path' do
10-
expect(subject[:ssl][key]).to eql(path), "Expected to find path for #{key}"
10+
expect(client_config[:ssl][key]).to eql(path), "Expected to find path for #{key}"
1111
end
1212

1313
if type == :jks
1414
let(:store_password) { conf["#{use_deprecated_config ? '' : 'ssl_'}#{key}_password"] }
1515
let(:store_type) { conf["#{use_deprecated_config ? '' : 'ssl_'}#{key}_type"]}
1616

1717
it 'should set the bundle password' do
18-
expect(subject[:ssl]["#{key}_password".to_sym]).to eql(store_password)
18+
expect(client_config[:ssl]["#{key}_password".to_sym]).to eql(store_password)
1919
end
2020

2121
it 'should set the bundle type' do
22-
expect(subject[:ssl]["#{key}_type".to_sym]).to eql(store_type)
22+
expect(client_config[:ssl]["#{key}_type".to_sym]).to eql(store_type)
2323
end
2424
end
2525
end
@@ -409,7 +409,7 @@ class PluginWithDeprecatedFalse < LogStash::Inputs::Base
409409
}
410410
end
411411

412-
subject { plugin_class.new(settings) }
412+
subject(:plugin_instance) { plugin_class.new(settings) }
413413

414414
after do
415415
File.unlink(cacert)
@@ -420,25 +420,25 @@ class PluginWithDeprecatedFalse < LogStash::Inputs::Base
420420
end
421421

422422
it 'normalizes deprecated settings' do
423-
expect(subject.ssl_certificate_authorities).to eq([cacert])
424-
expect(subject.ssl_certificate).to eq(client_cert)
425-
expect(subject.ssl_key).to eq(client_key)
426-
expect(subject.ssl_keystore_path).to eq(keystore)
427-
expect(subject.ssl_keystore_password.value).to eq(keystore_password)
428-
expect(subject.ssl_keystore_type).to eq(keystore_type)
429-
expect(subject.ssl_truststore_path).to eq(truststore)
430-
expect(subject.ssl_truststore_password.value).to eq(truststore_password)
431-
expect(subject.ssl_truststore_type).to eq(truststore_type)
432-
433-
expect(subject.params['ssl_certificate_authorities']).to eq([cacert])
434-
expect(subject.params['ssl_certificate']).to eq(client_cert)
435-
expect(subject.params['ssl_key']).to eq(client_key)
436-
expect(subject.params['ssl_keystore_path']).to eq(keystore)
437-
expect(subject.params['ssl_keystore_password'].value).to eq(keystore_password)
438-
expect(subject.params['ssl_keystore_type']).to eq(keystore_type)
439-
expect(subject.params['ssl_truststore_path']).to eq(truststore)
440-
expect(subject.params['ssl_truststore_password'].value).to eq(truststore_password)
441-
expect(subject.params['ssl_truststore_type']).to eq(truststore_type)
423+
expect(plugin_instance.ssl_certificate_authorities).to eq([cacert])
424+
expect(plugin_instance.ssl_certificate).to eq(client_cert)
425+
expect(plugin_instance.ssl_key).to eq(client_key)
426+
expect(plugin_instance.ssl_keystore_path).to eq(keystore)
427+
expect(plugin_instance.ssl_keystore_password.value).to eq(keystore_password)
428+
expect(plugin_instance.ssl_keystore_type).to eq(keystore_type)
429+
expect(plugin_instance.ssl_truststore_path).to eq(truststore)
430+
expect(plugin_instance.ssl_truststore_password.value).to eq(truststore_password)
431+
expect(plugin_instance.ssl_truststore_type).to eq(truststore_type)
432+
433+
expect(plugin_instance.params['ssl_certificate_authorities']).to eq([cacert])
434+
expect(plugin_instance.params['ssl_certificate']).to eq(client_cert)
435+
expect(plugin_instance.params['ssl_key']).to eq(client_key)
436+
expect(plugin_instance.params['ssl_keystore_path']).to eq(keystore)
437+
expect(plugin_instance.params['ssl_keystore_password'].value).to eq(keystore_password)
438+
expect(plugin_instance.params['ssl_keystore_type']).to eq(keystore_type)
439+
expect(plugin_instance.params['ssl_truststore_path']).to eq(truststore)
440+
expect(plugin_instance.params['ssl_truststore_password'].value).to eq(truststore_password)
441+
expect(plugin_instance.params['ssl_truststore_type']).to eq(truststore_type)
442442
end
443443
end
444444

0 commit comments

Comments
 (0)