(kafka) branch trunk updated: KAFKA-15728: KRaft support in DescribeUserScramCredentialsRequestNotAuthorizedTest (#14736)

[mimaison]

This is an automated email from the ASF dual-hosted git repository.

mimaison pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/trunk by this push:
     new dfb903fb8d7 KAFKA-15728: KRaft support in 
DescribeUserScramCredentialsRequestNotAuthorizedTest (#14736)
dfb903fb8d7 is described below

commit dfb903fb8d760357c1db528f8d531c7d781b2b99
Author: Zihao Lin <104664...@163.com>
AuthorDate: Fri Feb 2 22:20:14 2024 +0800

    KAFKA-15728: KRaft support in 
DescribeUserScramCredentialsRequestNotAuthorizedTest (#14736)
    
    
    Reviewers: Mickael Maison <mickael.mai...@gmail.com>
---
 ...eUserScramCredentialsRequestNotAuthorizedTest.scala | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git 
a/core/src/test/scala/unit/kafka/server/DescribeUserScramCredentialsRequestNotAuthorizedTest.scala
 
b/core/src/test/scala/unit/kafka/server/DescribeUserScramCredentialsRequestNotAuthorizedTest.scala
index 15f4ab4aa33..4ab9ba73087 100644
--- 
a/core/src/test/scala/unit/kafka/server/DescribeUserScramCredentialsRequestNotAuthorizedTest.scala
+++ 
b/core/src/test/scala/unit/kafka/server/DescribeUserScramCredentialsRequestNotAuthorizedTest.scala
@@ -17,11 +17,14 @@
 package kafka.server
 
 import kafka.network.SocketServer
+import kafka.utils.TestInfoUtils
 import org.apache.kafka.common.message.DescribeUserScramCredentialsRequestData
 import org.apache.kafka.common.protocol.Errors
 import org.apache.kafka.common.requests.{DescribeUserScramCredentialsRequest, 
DescribeUserScramCredentialsResponse}
+import org.apache.kafka.metadata.authorizer.StandardAuthorizer
 import org.junit.jupiter.api.Assertions._
-import org.junit.jupiter.api.Test
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.ValueSource
 
 import java.util.Properties
 
@@ -31,12 +34,17 @@ import java.util.Properties
 class DescribeUserScramCredentialsRequestNotAuthorizedTest extends 
BaseRequestTest {
   override def brokerPropertyOverrides(properties: Properties): Unit = {
     properties.put(KafkaConfig.ControlledShutdownEnableProp, "false")
-    properties.put(KafkaConfig.AuthorizerClassNameProp, 
classOf[DescribeCredentialsTest.TestAuthorizer].getName)
+    if (isKRaftTest()) {
+      properties.put(KafkaConfig.AuthorizerClassNameProp, 
classOf[StandardAuthorizer].getName)
+    } else {
+      properties.put(KafkaConfig.AuthorizerClassNameProp, 
classOf[DescribeCredentialsTest.TestAuthorizer].getName)
+    }
     properties.put(KafkaConfig.PrincipalBuilderClassProp, 
classOf[DescribeCredentialsTest.TestPrincipalBuilderReturningUnauthorized].getName)
   }
 
-  @Test
-  def testDescribeNotAuthorized(): Unit = {
+  @ParameterizedTest(name = TestInfoUtils.TestWithParameterizedQuorumName)
+  @ValueSource(strings = Array("zk", "kraft"))
+  def testDescribeNotAuthorized(quorum: String): Unit = {
     val request = new DescribeUserScramCredentialsRequest.Builder(
       new DescribeUserScramCredentialsRequestData()).build()
     val response = sendDescribeUserScramCredentialsRequest(request)
@@ -45,7 +53,7 @@ class DescribeUserScramCredentialsRequestNotAuthorizedTest 
extends BaseRequestTe
     assertEquals(Errors.CLUSTER_AUTHORIZATION_FAILED.code, error, "Expected 
not authorized error")
   }
 
-  private def sendDescribeUserScramCredentialsRequest(request: 
DescribeUserScramCredentialsRequest, socketServer: SocketServer = 
controllerSocketServer): DescribeUserScramCredentialsResponse = {
+  private def sendDescribeUserScramCredentialsRequest(request: 
DescribeUserScramCredentialsRequest, socketServer: SocketServer = 
adminSocketServer): DescribeUserScramCredentialsResponse = {
     connectAndReceive[DescribeUserScramCredentialsResponse](request, 
destination = socketServer)
   }
 }