You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by sr...@apache.org on 2016/08/14 17:00:15 UTC

kafka git commit: KAFKA-4035; AclCommand should allow Describe operation on groups

Repository: kafka
Updated Branches:
  refs/heads/trunk e615d0be7 -> e49b3aee6


KAFKA-4035; AclCommand should allow Describe operation on groups

Author: Manikumar Reddy O <ma...@gmail.com>

Reviewers: Sriharsha Chintalapani <ha...@hortonworks.com>, Jun Rao <ju...@gmail.com>

Closes #1723 from omkreddy/KAFKA-4035


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/e49b3aee
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/e49b3aee
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/e49b3aee

Branch: refs/heads/trunk
Commit: e49b3aee6b25b9b26275849c693d5dec41d6cf68
Parents: e615d0b
Author: Manikumar Reddy O <ma...@gmail.com>
Authored: Sun Aug 14 10:00:08 2016 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Sun Aug 14 10:00:08 2016 -0700

----------------------------------------------------------------------
 core/src/main/scala/kafka/admin/AclCommand.scala          | 2 +-
 core/src/test/scala/unit/kafka/admin/AclCommandTest.scala | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/e49b3aee/core/src/main/scala/kafka/admin/AclCommand.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/kafka/admin/AclCommand.scala b/core/src/main/scala/kafka/admin/AclCommand.scala
index 8548ebc..a098535 100644
--- a/core/src/main/scala/kafka/admin/AclCommand.scala
+++ b/core/src/main/scala/kafka/admin/AclCommand.scala
@@ -30,7 +30,7 @@ object AclCommand {
   val Newline = scala.util.Properties.lineSeparator
   val ResourceTypeToValidOperations = Map[ResourceType, Set[Operation]] (
     Topic -> Set(Read, Write, Describe, All, Delete),
-    Group -> Set(Read, All),
+    Group -> Set(Read, Describe, All),
     Cluster -> Set(Create, ClusterAction, All)
   )
 

http://git-wip-us.apache.org/repos/asf/kafka/blob/e49b3aee/core/src/test/scala/unit/kafka/admin/AclCommandTest.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/unit/kafka/admin/AclCommandTest.scala b/core/src/test/scala/unit/kafka/admin/AclCommandTest.scala
index 5a2ac6a..8ea6041 100644
--- a/core/src/test/scala/unit/kafka/admin/AclCommandTest.scala
+++ b/core/src/test/scala/unit/kafka/admin/AclCommandTest.scala
@@ -45,7 +45,7 @@ class AclCommandTest extends ZooKeeperTestHarness with Logging {
   private val ResourceToOperations = Map[Set[Resource], (Set[Operation], Array[String])](
     TopicResources -> (Set(Read, Write, Describe, Delete), Array("--operation", "Read" , "--operation", "Write", "--operation", "Describe", "--operation", "Delete")),
     Set(Resource.ClusterResource) -> (Set(Create, ClusterAction), Array("--operation", "Create", "--operation", "ClusterAction")),
-    GroupResources -> (Set(Read).toSet[Operation], Array("--operation", "Read"))
+    GroupResources -> (Set(Read, Describe).toSet[Operation], Array("--operation", "Read", "--operation", "Describe"))
   )
 
   private val ProducerResourceToAcls = Map[Set[Resource], Set[Acl]](