mimaison commented on code in PR #15377:
URL: https://github.com/apache/kafka/pull/15377#discussion_r1601900093
##########
core/src/test/scala/unit/kafka/utils/TestUtils.scala:
##########
@@ -1776,6 +1776,33 @@ object TestUtils extends Logging {
45000)
}
+
+ def waitAndVerifyAcl(expected: AccessControlEntry,
+ authorizer: JAuthorizer,
+ resource: ResourcePattern,
+ accessControlEntryFilter: AccessControlEntryFilter =
AccessControlEntryFilter.ANY): Unit = {
+ val newLine = scala.util.Properties.lineSeparator
+
+ val filter = new AclBindingFilter(resource.toFilter,
accessControlEntryFilter)
+ waitUntilTrue(() =>
authorizer.acls(filter).asScala.map(_.entry).toSet.contains(expected),
+ s"expected to contain acl: " + expected +
Review Comment:
We can do `s"expected to contain acl: $expected "`, otherwise remove the `s`
interpolator in front of the string.
Same in `waitAndVerifyRemovedAcl()` below
##########
core/src/test/scala/unit/kafka/utils/TestUtils.scala:
##########
@@ -1776,6 +1776,33 @@ object TestUtils extends Logging {
45000)
}
+
+ def waitAndVerifyAcl(expected: AccessControlEntry,
+ authorizer: JAuthorizer,
+ resource: ResourcePattern,
+ accessControlEntryFilter: AccessControlEntryFilter =
AccessControlEntryFilter.ANY): Unit = {
Review Comment:
The only caller never specifies this argument, maybe we can remove it? Same
below in `waitAndVerifyRemovedAcl()`
##########
core/src/test/scala/integration/kafka/api/SaslSslAdminIntegrationTest.scala:
##########
@@ -12,63 +12,89 @@
*/
package kafka.api
-import java.util
import kafka.security.authorizer.AclAuthorizer
import kafka.server.KafkaConfig
-import kafka.utils.{CoreUtils, JaasTestUtils, TestUtils}
import kafka.utils.TestUtils._
+import kafka.utils.{JaasTestUtils, TestUtils}
import org.apache.kafka.clients.admin._
import org.apache.kafka.common.Uuid
-import org.apache.kafka.common.acl._
-import org.apache.kafka.common.acl.AclOperation.{ALL, ALTER, ALTER_CONFIGS,
CLUSTER_ACTION, CREATE, DELETE, DESCRIBE}
+import org.apache.kafka.common.acl.AclOperation._
import org.apache.kafka.common.acl.AclPermissionType.{ALLOW, DENY}
-import org.apache.kafka.common.config.{ConfigResource, TopicConfig}
+import org.apache.kafka.common.acl._
+import org.apache.kafka.common.config.{ConfigResource, SaslConfigs,
TopicConfig}
import org.apache.kafka.common.errors.{ClusterAuthorizationException,
InvalidRequestException, TopicAuthorizationException,
UnknownTopicOrPartitionException}
import org.apache.kafka.common.resource.PatternType.LITERAL
import org.apache.kafka.common.resource.ResourceType.{GROUP, TOPIC}
-import org.apache.kafka.common.resource.{PatternType, Resource,
ResourcePattern, ResourcePatternFilter, ResourceType}
+import org.apache.kafka.common.resource._
Review Comment:
Let's keep the explicit imports, same below
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
