Skip to content

MINOR: Use --force instead of --yes in AclCommand #1430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ijuma wants to merge 3 commits into from
Closed

MINOR: Use --force instead of --yes in AclCommand #1430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0bb27af
Use `--force` instead of `--yes` in `AclCommand`
ijuma May 25, 2016
78b8467
Change variable name to `forceOpt`
ijuma May 25, 2016
bdf3a57
Update `AclCommandTest`
ijuma May 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/src/main/scala/kafka/admin/AclCommand.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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 forceOpt = parser.accepts("force", "Assume Yes to all queries and do not prompt.")

val options = parser.parse(args: _*)

Expand Down
2 changes: 1 addition & 1 deletion core/src/test/scala/unit/kafka/admin/AclCommandTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion docs/security.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ <h4><a id="security_authz_cli" href="#security_authz_cli">Command Line Interface
<td>Convenience</td>
</tr>
<tr>
<td>--yes</td>
<td>--force</td>
<td> Convenience option to assume yes to all queries and do not prompt.</td>
<td></td>
<td>Convenience</td>
Expand Down