From d1c5d7100ac37b44570c78aa933628a07d372898 Mon Sep 17 00:00:00 2001 From: yangguo Date: Tue, 29 Jun 2021 22:03:32 -0700 Subject: [PATCH] change function name --- .../microsoft/azpubsub/kafka/admin/AzPubSubAclCommand.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azpubsub/src/main/scala/com/microsoft/azpubsub/kafka/admin/AzPubSubAclCommand.scala b/azpubsub/src/main/scala/com/microsoft/azpubsub/kafka/admin/AzPubSubAclCommand.scala index de1105fc2..336ad0bf7 100644 --- a/azpubsub/src/main/scala/com/microsoft/azpubsub/kafka/admin/AzPubSubAclCommand.scala +++ b/azpubsub/src/main/scala/com/microsoft/azpubsub/kafka/admin/AzPubSubAclCommand.scala @@ -59,7 +59,7 @@ class AzPubSubAdminClientService(opts: AzPubSubAclCommandOptions) extends AdminC if (confirmAction(opts, s"Are you sure you want to delete all ACLs for resource filter `$filter`? (y/n)")) removeAcls(adminClient, acls, filter) } else { - val updatedAcls = removeAclWithDescribeOperation(opts, acls, filteredPrincipalAclOperationsMap) + val updatedAcls = dropAclsWithSharedOperation(opts, acls, filteredPrincipalAclOperationsMap) if (confirmAction(opts, s"Are you sure you want to remove ACLs: $Newline ${updatedAcls.map("\t" + _).mkString(Newline)} $Newline from resource filter `$filter`? (y/n)")) { removeAcls(adminClient, updatedAcls, filter) } @@ -197,7 +197,7 @@ class AzPubSubAdminClientService(opts: AzPubSubAclCommandOptions) extends AdminC producerConsumerGroupAclMap } - def removeAclWithDescribeOperation(opt: AzPubSubAclCommandOptions, acls: Set[AccessControlEntry], principalAclOperationsMap: Map[String, Set[AclOperation]]): Set[AccessControlEntry] ={ + def dropAclsWithSharedOperation(opt: AzPubSubAclCommandOptions, acls: Set[AccessControlEntry], principalAclOperationsMap: Map[String, Set[AclOperation]]): Set[AccessControlEntry] ={ val producerAclOperations = GetProducerAclOperations() val consumerAclOperations = GetConsumerAclOperations()