dajac commented on a change in pull request #8808:
URL: https://github.com/apache/kafka/pull/8808#discussion_r438132457
##########
File path: core/src/main/scala/kafka/admin/AclCommand.scala
##########
@@ -130,30 +130,34 @@ object AclCommand extends Logging {
}
}
- listAcls()
+ listAcls(adminClient)
}
}
def listAcls(): Unit = {
withAdminClient(opts) { adminClient =>
- val filters = getResourceFilter(opts, dieIfNoResourceFound = false)
- val listPrincipals = getPrincipals(opts, opts.listPrincipalsOpt)
- val resourceToAcls = getAcls(adminClient, filters)
+ listAcls(adminClient)
+ }
+ }
- if (listPrincipals.isEmpty) {
- for ((resource, acls) <- resourceToAcls)
- println(s"Current ACLs for resource `$resource`: $Newline
${acls.map("\t" + _).mkString(Newline)} $Newline")
- } else {
- listPrincipals.foreach(principal => {
- println(s"ACLs for principal `$principal`")
- val filteredResourceToAcls = resourceToAcls.map { case (resource,
acls) =>
- resource -> acls.filter(acl =>
principal.toString.equals(acl.principal))
- }.filter { case (_, acls) => acls.nonEmpty }
+ private def listAcls(adminClient: Admin) = {
+ val filters = getResourceFilter(opts, dieIfNoResourceFound = false)
+ val listPrincipals = getPrincipals(opts, opts.listPrincipalsOpt)
+ val resourceToAcls = getAcls(adminClient, filters)
- for ((resource, acls) <- filteredResourceToAcls)
- println(s"Current ACLs for resource `$resource`: $Newline
${acls.map("\t" + _).mkString(Newline)} $Newline")
- })
- }
+ if (listPrincipals.isEmpty) {
+ for ((resource, acls) <- resourceToAcls)
+ println(s"Current ACLs for resource `$resource`: $Newline
${acls.map("\t" + _).mkString(Newline)} $Newline")
+ } else {
+ listPrincipals.foreach(principal => {
+ println(s"ACLs for principal `$principal`")
+ val filteredResourceToAcls = resourceToAcls.map { case (resource,
acls) =>
+ resource -> acls.filter(acl =>
principal.toString.equals(acl.principal))
+ }.filter { case (_, acls) => acls.nonEmpty }
+
+ for ((resource, acls) <- filteredResourceToAcls)
+ println(s"Current ACLs for resource `$resource`: $Newline
${acls.map("\t" + _).mkString(Newline)} $Newline")
Review comment:
nit: While here, what about extracting this println into a small helper
function and using it in both cases?
##########
File path: core/src/main/scala/kafka/admin/AclCommand.scala
##########
@@ -130,30 +130,34 @@ object AclCommand extends Logging {
}
}
- listAcls()
+ listAcls(adminClient)
}
}
def listAcls(): Unit = {
withAdminClient(opts) { adminClient =>
- val filters = getResourceFilter(opts, dieIfNoResourceFound = false)
- val listPrincipals = getPrincipals(opts, opts.listPrincipalsOpt)
- val resourceToAcls = getAcls(adminClient, filters)
+ listAcls(adminClient)
+ }
+ }
- if (listPrincipals.isEmpty) {
- for ((resource, acls) <- resourceToAcls)
- println(s"Current ACLs for resource `$resource`: $Newline
${acls.map("\t" + _).mkString(Newline)} $Newline")
- } else {
- listPrincipals.foreach(principal => {
- println(s"ACLs for principal `$principal`")
- val filteredResourceToAcls = resourceToAcls.map { case (resource,
acls) =>
- resource -> acls.filter(acl =>
principal.toString.equals(acl.principal))
- }.filter { case (_, acls) => acls.nonEmpty }
+ private def listAcls(adminClient: Admin) = {
+ val filters = getResourceFilter(opts, dieIfNoResourceFound = false)
+ val listPrincipals = getPrincipals(opts, opts.listPrincipalsOpt)
+ val resourceToAcls = getAcls(adminClient, filters)
- for ((resource, acls) <- filteredResourceToAcls)
- println(s"Current ACLs for resource `$resource`: $Newline
${acls.map("\t" + _).mkString(Newline)} $Newline")
- })
- }
+ if (listPrincipals.isEmpty) {
+ for ((resource, acls) <- resourceToAcls)
+ println(s"Current ACLs for resource `$resource`: $Newline
${acls.map("\t" + _).mkString(Newline)} $Newline")
+ } else {
+ listPrincipals.foreach(principal => {
Review comment:
nit: While here, I suggest to update this line to
`listPrincipals.foreach { principal =>`. We don't need the parenthesis and the
block. The block is enough.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
