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

cmccabe 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 586f89cb1c7 KAFKA-15114: Update StorageTool help for creating SCRAM 
credentials to specify name instead of user. (#13904)
586f89cb1c7 is described below

commit 586f89cb1c7a43d597da094c3aff1fdd1ee11a5d
Author: Proven Provenzano <[email protected]>
AuthorDate: Thu Jun 29 14:11:12 2023 -0400

    KAFKA-15114: Update StorageTool help for creating SCRAM credentials to 
specify name instead of user. (#13904)
    
    The choice of using name vs. user as a parameter is because internally the 
record uses name, all
    tests using the StorageTool use name as a parameter, KafkaPrincipals are 
created with name and
    because creating SCRAM credentials is done with --entity-name
    
    Reviewers: Colin P. McCabe <[email protected]>
---
 core/src/main/scala/kafka/tools/StorageTool.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/scala/kafka/tools/StorageTool.scala 
b/core/src/main/scala/kafka/tools/StorageTool.scala
index 7925089ecd5..a746195f7c1 100644
--- a/core/src/main/scala/kafka/tools/StorageTool.scala
+++ b/core/src/main/scala/kafka/tools/StorageTool.scala
@@ -119,8 +119,8 @@ object StorageTool extends Logging {
     formatParser.addArgument("--add-scram", "-S").
       action(append()).
       help("""A SCRAM_CREDENTIAL to add to the __cluster_metadata log e.g.
-              |'SCRAM-SHA-256=[user=alice,password=alice-secret]'
-              
|'SCRAM-SHA-512=[user=alice,iterations=8192,salt="N3E=",saltedpassword="YCE="]'""".stripMargin)
+              |'SCRAM-SHA-256=[name=alice,password=alice-secret]'
+              
|'SCRAM-SHA-512=[name=alice,iterations=8192,salt="N3E=",saltedpassword="YCE="]'""".stripMargin)
     formatParser.addArgument("--ignore-formatted", "-g").
       action(storeTrue())
     formatParser.addArgument("--release-version", "-r").

Reply via email to