Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Default name of TopicName to metadata.name when spec.topicName absent #661

Merged
merged 1 commit into from
Apr 11, 2024
Merged

Default name of TopicName to metadata.name when spec.topicName absent #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions api/src/main/java/com/github/eyefloaters/console/api/support/InformerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import io.fabric8.kubernetes.client.informers.SharedIndexInformer;
import io.strimzi.api.kafka.model.kafka.Kafka;
import io.strimzi.api.kafka.model.topic.KafkaTopic;
import io.strimzi.api.kafka.model.topic.KafkaTopicSpec;

@ApplicationScoped
public class InformerFactory {
Expand Down Expand Up @@ -58,7 +59,7 @@ void onStartup(@Observes Startup event) {
topicInformer.addEventHandler(new ResourceEventHandler<KafkaTopic>() {
@Override
public void onAdd(KafkaTopic topic) {
topicMap(topic).ifPresent(map -> map.put(topic.getSpec().getTopicName(), topic));
topicMap(topic).ifPresent(map -> map.put(topicName(topic), topic));
}

@Override
Expand All @@ -69,7 +70,13 @@ public void onUpdate(KafkaTopic oldTopic, KafkaTopic topic) {

@Override
public void onDelete(KafkaTopic topic, boolean deletedFinalStateUnknown) {
topicMap(topic).ifPresent(map -> map.remove(topic.getSpec().getTopicName()));
topicMap(topic).ifPresent(map -> map.remove(topicName(topic)));
}

private static String topicName(KafkaTopic topic) {
return Optional.ofNullable(topic.getSpec())
.map(KafkaTopicSpec::getTopicName)
.orElseGet(() -> topic.getMetadata().getName());
}

Optional<Map<String, KafkaTopic>> topicMap(KafkaTopic topic) {
Expand Down
20 changes: 18 additions & 2 deletions api/src/test/java/com/github/eyefloaters/console/api/TopicsResourceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,8 +706,10 @@ void testListTopicsWithNumPartitions() {
void testListTopicsWithManagedTopic() {
String topic1 = "t1-" + UUID.randomUUID().toString();
String topic2 = "t2-" + UUID.randomUUID().toString();
String topic3 = "t3-" + UUID.randomUUID().toString();
topicUtils.createTopics(clusterId1, List.of(topic1), 1);
topicUtils.createTopics(clusterId1, List.of(topic2), 1);
topicUtils.createTopics(clusterId1, List.of(topic3), 1);

client.resource(new KafkaTopicBuilder()
.withNewMetadata()
Expand All @@ -722,6 +724,19 @@ void testListTopicsWithManagedTopic() {
.build())
.create();

client.resource(new KafkaTopicBuilder()
.withNewMetadata()
.withName(topic3)
.withNamespace("default")
.withLabels(Map.of("strimzi.io/cluster", clusterName1))
.endMetadata()
.withNewSpec()
// topicName (optional) is not set
.withPartitions(1)
.endSpec()
.build())
.create();

// Wait for the managed topic list to include the topic
await().atMost(10, TimeUnit.SECONDS)
.until(() -> Optional.ofNullable(managedTopics.get("default"))
Expand All @@ -732,9 +747,10 @@ void testListTopicsWithManagedTopic() {
whenRequesting(req -> req.get("", clusterId1))
.assertThat()
.statusCode(is(Status.OK.getStatusCode()))
.body("data.size()", is(2))
.body("data.size()", is(3))
.body("data.find { it.attributes.name == '%s' }.meta.managed".formatted(topic1), is(true))
.body("data.find { it.attributes.name == '%s' }.meta.managed".formatted(topic2), is(false));
.body("data.find { it.attributes.name == '%s' }.meta.managed".formatted(topic2), is(false))
.body("data.find { it.attributes.name == '%s' }.meta.managed".formatted(topic3), is(true));
}

@Test
Expand Down
Loading