Merge pull request #10597 from richersoon/switch-to-Kafka-native-image

Switch to Kafka native image in KafkaTestContainer
jhipster · Aug 18, 2024 · e622287 · e622287
2 parents 2af8b9f + c464493
commit e622287
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/...ech/jhipster/lite/generator/server/springboot/broker/kafka/domain/KafkaModuleFactory.java b/...ech/jhipster/lite/generator/server/springboot/broker/kafka/domain/KafkaModuleFactory.java
@@ -30,7 +30,7 @@ public JHipsterModule buildModuleInit(JHipsterModuleProperties properties) {
     //@formatter:off
     return moduleBuilder(properties)
       .context()
-        .put("kafkaDockerImage", dockerImages.get("apache/kafka").fullName())
+        .put("kafkaDockerImage", dockerImages.get("apache/kafka-native").fullName())
         .put("kafkaClusterId", kafkaClusterId)
         .and()
       .documentation(documentationTitle("Apache Kafka"), SOURCE.template("apache-kafka.md"))

diff --git a/src/main/resources/generator/dependencies/Dockerfile b/src/main/resources/generator/dependencies/Dockerfile
@@ -9,7 +9,7 @@ FROM mysql:9.0.1
 FROM cassandra:4.1.5
 FROM mcr.microsoft.com/mssql/server:2022-latest
 FROM postgres:16.4
-FROM apache/kafka:3.8.0
+FROM apache/kafka-native:3.8.0
 FROM tchiotludo/akhq:0.25.1
 FROM apachepulsar/pulsar:3.3.1
 FROM neo4j:5.22.0-community

diff --git a/...jhipster/lite/generator/server/springboot/broker/kafka/domain/KafkaModuleFactoryTest.java b/...jhipster/lite/generator/server/springboot/broker/kafka/domain/KafkaModuleFactoryTest.java
@@ -28,7 +28,7 @@ class KafkaModuleFactoryTest {
 
   @Test
   void shouldBuildKafkaModuleInit() {
-    when(dockerImages.get("apache/kafka")).thenReturn(new DockerImageVersion("apache/kafka", "1.0.0"));
+    when(dockerImages.get("apache/kafka-native")).thenReturn(new DockerImageVersion("apache/kafka-native", "1.0.0"));
 
     JHipsterModuleProperties properties = JHipsterModulesFixture.propertiesBuilder(tmpDirForTest())
       .basePackage("tech.jhipster.jhlitest")
@@ -52,6 +52,7 @@ void shouldBuildKafkaModuleInit() {
       .containing("<artifactId>kafka</artifactId>")
       .and()
       .hasFile("src/main/docker/kafka.yml")
+      .containing("image: apache/kafka-native")
       .containing("CLUSTER_ID: 'my-cluster'")
       .and()
       .hasFile("src/main/resources/config/application.yml")
@@ -81,6 +82,7 @@ void shouldBuildKafkaModuleInit() {
       )
       .and()
       .hasFile("src/test/java/tech/jhipster/jhlitest/KafkaTestContainerExtension.java")
+      .containing("apache/kafka-native")
       .and()
       .hasFile("src/test/java/tech/jhipster/jhlitest/IntegrationTest.java")
       .containing("@ExtendWith(KafkaTestContainerExtension.class)")