mimaison commented on code in PR #16136:
URL: https://github.com/apache/kafka/pull/16136#discussion_r1634645333
##########
clients/src/test/java/org/apache/kafka/clients/admin/KafkaAdminClientTest.java:
##########
@@ -1464,13 +1464,54 @@ public void
testDescribeTopicsWithDescribeTopicPartitionsApiBasic() {
assertEquals(0,
topicDescription.partitions().get(0).partition());
assertEquals(1,
topicDescription.partitions().get(1).partition());
topicDescription = topicDescriptions.get(topicName1);
+ assertNull(topicDescription.authorizedOperations());
assertEquals(1, topicDescription.partitions().size());
} catch (Exception e) {
fail("describe using DescribeTopics API should not fail", e);
}
}
}
+ @Test
+ public void testDescribeTopicPartitionsApiWithAuthorizedOps() {
+ try (AdminClientUnitTestEnv env = mockClientEnv()) {
+ env.kafkaClient().setNodeApiVersions(NodeApiVersions.create());
+ String topicName0 = "test-0";
+ Uuid topicId = Uuid.randomUuid();
+
+ int authorisedOperations = 1 << AclOperation.DESCRIBE.code() | 1
<< AclOperation.ALTER.code();
+ env.kafkaClient().prepareResponse(
+ prepareDescribeClusterResponse(0,
+ env.cluster().nodes(),
+ env.cluster().clusterResource().clusterId(),
+ 2,
+ authorisedOperations)
+ );
+
+ DescribeTopicPartitionsResponseData responseData = new
DescribeTopicPartitionsResponseData();
+ responseData.topics().add(new
DescribeTopicPartitionsResponseTopic()
+ .setErrorCode((short) 0)
+ .setTopicId(topicId)
+ .setName(topicName0)
+ .setIsInternal(false)
+ .setTopicAuthorizedOperations(authorisedOperations));
+ env.kafkaClient().prepareResponse(new
DescribeTopicPartitionsResponse(responseData));
+
+ try {
+ DescribeTopicsResult result = env.adminClient().describeTopics(
+ Arrays.asList(topicName0), new
DescribeTopicsOptions().includeAuthorizedOperations(true)
Review Comment:
`asList()` is statically imported, so you can drop the `Arrays.` prefix.
Same below
##########
clients/src/test/java/org/apache/kafka/clients/admin/KafkaAdminClientTest.java:
##########
@@ -1464,13 +1464,54 @@ public void
testDescribeTopicsWithDescribeTopicPartitionsApiBasic() {
assertEquals(0,
topicDescription.partitions().get(0).partition());
assertEquals(1,
topicDescription.partitions().get(1).partition());
topicDescription = topicDescriptions.get(topicName1);
+ assertNull(topicDescription.authorizedOperations());
assertEquals(1, topicDescription.partitions().size());
} catch (Exception e) {
fail("describe using DescribeTopics API should not fail", e);
}
}
}
+ @Test
+ public void testDescribeTopicPartitionsApiWithAuthorizedOps() {
+ try (AdminClientUnitTestEnv env = mockClientEnv()) {
+ env.kafkaClient().setNodeApiVersions(NodeApiVersions.create());
+ String topicName0 = "test-0";
+ Uuid topicId = Uuid.randomUuid();
+
+ int authorisedOperations = 1 << AclOperation.DESCRIBE.code() | 1
<< AclOperation.ALTER.code();
+ env.kafkaClient().prepareResponse(
+ prepareDescribeClusterResponse(0,
+ env.cluster().nodes(),
+ env.cluster().clusterResource().clusterId(),
+ 2,
+ authorisedOperations)
+ );
+
+ DescribeTopicPartitionsResponseData responseData = new
DescribeTopicPartitionsResponseData();
+ responseData.topics().add(new
DescribeTopicPartitionsResponseTopic()
+ .setErrorCode((short) 0)
+ .setTopicId(topicId)
+ .setName(topicName0)
+ .setIsInternal(false)
+ .setTopicAuthorizedOperations(authorisedOperations));
+ env.kafkaClient().prepareResponse(new
DescribeTopicPartitionsResponse(responseData));
+
+ try {
Review Comment:
We don't need this try/catch, any exceptions thrown should fail the test. I
understand you copied the format from the existing tests above. If you prefer
not changing this in this PR, we can address it in a follow up PR.
##########
clients/src/test/java/org/apache/kafka/clients/admin/KafkaAdminClientTest.java:
##########
@@ -1464,13 +1464,54 @@ public void
testDescribeTopicsWithDescribeTopicPartitionsApiBasic() {
assertEquals(0,
topicDescription.partitions().get(0).partition());
assertEquals(1,
topicDescription.partitions().get(1).partition());
topicDescription = topicDescriptions.get(topicName1);
+ assertNull(topicDescription.authorizedOperations());
assertEquals(1, topicDescription.partitions().size());
} catch (Exception e) {
fail("describe using DescribeTopics API should not fail", e);
}
}
}
+ @Test
+ public void testDescribeTopicPartitionsApiWithAuthorizedOps() {
+ try (AdminClientUnitTestEnv env = mockClientEnv()) {
+ env.kafkaClient().setNodeApiVersions(NodeApiVersions.create());
+ String topicName0 = "test-0";
+ Uuid topicId = Uuid.randomUuid();
+
+ int authorisedOperations = 1 << AclOperation.DESCRIBE.code() | 1
<< AclOperation.ALTER.code();
Review Comment:
Here you can use
`Utils.to32BitField(Utils.mkSet(AclOperation.DESCRIBE.code(),
AclOperation.ALTER.code()));` instead of doing the byte operations yourself.
--
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: jira-unsubscr...@kafka.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
