From 0bb27af39b90e34ac6d788c428afc6f7162d65d6 Mon Sep 17 00:00:00 2001 From: Ismael Juma Date: Wed, 25 May 2016 21:57:30 +0100 Subject: [PATCH 1/3] Use `--force` instead of `--yes` in `AclCommand` To be consistent with `ConfigCommand` and `TopicCommand`. No release includes this option yet, so we can simply change it. --- core/src/main/scala/kafka/admin/AclCommand.scala | 2 +- docs/security.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/scala/kafka/admin/AclCommand.scala b/core/src/main/scala/kafka/admin/AclCommand.scala index b697facfc6b5f..69ea75b820770 100644 --- a/core/src/main/scala/kafka/admin/AclCommand.scala +++ b/core/src/main/scala/kafka/admin/AclCommand.scala @@ -331,7 +331,7 @@ object AclCommand { val helpOpt = parser.accepts("help", "Print usage information.") - val yesOpt = parser.accepts("yes", "Assume Yes to all queries and do not prompt.") + val yesOpt = parser.accepts("force", "Assume Yes to all queries and do not prompt.") val options = parser.parse(args: _*) diff --git a/docs/security.html b/docs/security.html index e913ffa720220..7a1b333b724e5 100644 --- a/docs/security.html +++ b/docs/security.html @@ -577,7 +577,7 @@

Command Line Interface Convenience - --yes + --force Convenience option to assume yes to all queries and do not prompt. Convenience From 78b8467808589f3c5a47e81c139d636457f2da3b Mon Sep 17 00:00:00 2001 From: Ismael Juma Date: Thu, 26 May 2016 00:45:56 +0100 Subject: [PATCH 2/3] Change variable name to `forceOpt` --- core/src/main/scala/kafka/admin/AclCommand.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/scala/kafka/admin/AclCommand.scala b/core/src/main/scala/kafka/admin/AclCommand.scala index 69ea75b820770..966c4beee0eba 100644 --- a/core/src/main/scala/kafka/admin/AclCommand.scala +++ b/core/src/main/scala/kafka/admin/AclCommand.scala @@ -242,7 +242,7 @@ object AclCommand { } private def confirmAction(opts: AclCommandOptions, msg: String): Boolean = { - if (opts.options.has(opts.yesOpt)) + if (opts.options.has(opts.forceOpt)) return true println(msg) Console.readLine().equalsIgnoreCase("y") @@ -331,7 +331,7 @@ object AclCommand { val helpOpt = parser.accepts("help", "Print usage information.") - val yesOpt = parser.accepts("force", "Assume Yes to all queries and do not prompt.") + val forceOpt = parser.accepts("force", "Assume Yes to all queries and do not prompt.") val options = parser.parse(args: _*) From bdf3a570fde53b264e77354147042659a8014097 Mon Sep 17 00:00:00 2001 From: Ismael Juma Date: Thu, 26 May 2016 01:40:43 +0100 Subject: [PATCH 3/3] Update `AclCommandTest` --- core/src/test/scala/unit/kafka/admin/AclCommandTest.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/test/scala/unit/kafka/admin/AclCommandTest.scala b/core/src/test/scala/unit/kafka/admin/AclCommandTest.scala index f2d963c2c9e4b..7ada48ebb8e3f 100644 --- a/core/src/test/scala/unit/kafka/admin/AclCommandTest.scala +++ b/core/src/test/scala/unit/kafka/admin/AclCommandTest.scala @@ -116,7 +116,7 @@ class AclCommandTest extends ZooKeeperTestHarness with Logging { private def testRemove(resources: Set[Resource], resourceCmd: Array[String], args: Array[String], brokerProps: Properties) { for (resource <- resources) { - AclCommand.main(args ++ resourceCmd :+ "--remove" :+ "--yes") + AclCommand.main(args ++ resourceCmd :+ "--remove" :+ "--force") withAuthorizer(brokerProps) { authorizer => TestUtils.waitAndVerifyAcls(Set.empty[Acl], authorizer, resource) }