You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by mi...@apache.org on 2022/06/17 14:31:22 UTC

[kafka] branch trunk updated: KAFKA-13890: Improve documentation of `ssl.keystore.type` and `ssl.truststore.type` (#12226)

This is an automated email from the ASF dual-hosted git repository.

mimaison pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 1e21201ea2 KAFKA-13890: Improve documentation of `ssl.keystore.type` and `ssl.truststore.type` (#12226)
1e21201ea2 is described below

commit 1e21201ea24389bdaccb8a462f3a53e356b58a58
Author: RivenSun <91...@users.noreply.github.com>
AuthorDate: Fri Jun 17 22:31:13 2022 +0800

    KAFKA-13890: Improve documentation of `ssl.keystore.type` and `ssl.truststore.type` (#12226)
    
    
    Reviewers: Mickael Maison <mi...@gmail.com>

, David Jacot <dj...@confluent.io>, Kvicii <kv...@gmail.com>
---
 clients/src/main/java/org/apache/kafka/common/config/SslConfigs.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/clients/src/main/java/org/apache/kafka/common/config/SslConfigs.java b/clients/src/main/java/org/apache/kafka/common/config/SslConfigs.java
index 62343a23b5..4dfb0bd5a8 100644
--- a/clients/src/main/java/org/apache/kafka/common/config/SslConfigs.java
+++ b/clients/src/main/java/org/apache/kafka/common/config/SslConfigs.java
@@ -69,7 +69,7 @@ public class SslConfigs {
 
     public static final String SSL_KEYSTORE_TYPE_CONFIG = "ssl.keystore.type";
     public static final String SSL_KEYSTORE_TYPE_DOC = "The file format of the key store file. "
-            + "This is optional for client.";
+            + "This is optional for client. The values currently supported by the default `ssl.engine.factory.class` are [JKS, PKCS12, PEM].";
     public static final String DEFAULT_SSL_KEYSTORE_TYPE = "JKS";
 
     public static final String SSL_KEYSTORE_KEY_CONFIG = "ssl.keystore.key";
@@ -99,7 +99,7 @@ public class SslConfigs {
         + "the PEM key specified in `ssl.keystore.key'.";
 
     public static final String SSL_TRUSTSTORE_TYPE_CONFIG = "ssl.truststore.type";
-    public static final String SSL_TRUSTSTORE_TYPE_DOC = "The file format of the trust store file.";
+    public static final String SSL_TRUSTSTORE_TYPE_DOC = "The file format of the trust store file. The values currently supported by the default `ssl.engine.factory.class` are [JKS, PKCS12, PEM].";
     public static final String DEFAULT_SSL_TRUSTSTORE_TYPE = "JKS";
 
     public static final String SSL_TRUSTSTORE_LOCATION_CONFIG = "ssl.truststore.location";