Skip to content

Commit 19dc09f

Browse files
committed
Rename use_ssl_ca_default_store -> ssl_ca_certs_from_system
1 parent 099b178 commit 19dc09f

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,7 @@ can use:
895895

896896
```ruby
897897
kafka = Kafka.new(
898-
use_ssl_ca_default_store: true
898+
ssl_ca_certs_from_system: true
899899
# ...
900900
)
901901
```

lib/kafka/client.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ def initialize(seed_brokers:, client_id: "ruby-kafka", logger: nil, connect_time
6060
ssl_ca_cert_file_path: nil, ssl_ca_cert: nil, ssl_client_cert: nil, ssl_client_cert_key: nil,
6161
sasl_gssapi_principal: nil, sasl_gssapi_keytab: nil,
6262
sasl_plain_authzid: '', sasl_plain_username: nil, sasl_plain_password: nil,
63-
sasl_scram_username: nil, sasl_scram_password: nil, sasl_scram_mechanism: nil, use_ssl_ca_default_store: false)
63+
sasl_scram_username: nil, sasl_scram_password: nil, sasl_scram_mechanism: nil, ssl_ca_certs_from_system: false)
6464
@logger = logger || Logger.new(nil)
6565
@instrumenter = Instrumenter.new(client_id: client_id)
6666
@seed_brokers = normalize_seed_brokers(seed_brokers)
6767

68-
ssl_context = build_ssl_context(ssl_ca_cert_file_path, ssl_ca_cert, ssl_client_cert, ssl_client_cert_key, use_ssl_ca_default_store)
68+
ssl_context = build_ssl_context(ssl_ca_cert_file_path, ssl_ca_cert, ssl_client_cert, ssl_client_cert_key, ssl_ca_certs_from_system)
6969

7070
sasl_authenticator = SaslAuthenticator.new(
7171
sasl_gssapi_principal: sasl_gssapi_principal,
@@ -542,8 +542,8 @@ def initialize_cluster
542542
)
543543
end
544544

545-
def build_ssl_context(ca_cert_file_path, ca_cert, client_cert, client_cert_key, use_ssl_ca_default_store)
546-
return nil unless ca_cert_file_path || ca_cert || client_cert || client_cert_key || use_ssl_ca_default_store
545+
def build_ssl_context(ca_cert_file_path, ca_cert, client_cert, client_cert_key, ssl_ca_certs_from_system)
546+
return nil unless ca_cert_file_path || ca_cert || client_cert || client_cert_key || ssl_ca_certs_from_system
547547

548548
ssl_context = OpenSSL::SSL::SSLContext.new
549549

@@ -558,15 +558,15 @@ def build_ssl_context(ca_cert_file_path, ca_cert, client_cert, client_cert_key,
558558
raise ArgumentError, "Kafka client initialized with `ssl_client_cert_key`, but no `ssl_client_cert`. Please provide both."
559559
end
560560

561-
if ca_cert || ca_cert_file_path || use_ssl_ca_default_store
561+
if ca_cert || ca_cert_file_path || ssl_ca_certs_from_system
562562
store = OpenSSL::X509::Store.new
563563
Array(ca_cert).each do |cert|
564564
store.add_cert(OpenSSL::X509::Certificate.new(cert))
565565
end
566566
if ca_cert_file_path
567567
store.add_file(ca_cert_file_path)
568568
end
569-
if use_ssl_ca_default_store
569+
if ssl_ca_certs_from_system
570570
store.set_default_paths
571571
end
572572
ssl_context.cert_store = store

0 commit comments

Comments
 (0)