Re-enable Kafka ssl sasl tests (#3252)

* Revert "Temporarily disable kafka-sasl & kafka-ssl tests due to #3239" This reverts commit 25a3d41. * Fix #3239 to override KAFKA_ADVERTISED_LISTENERS env * sync avro.version
apache · Nov 2, 2021 · 16f53f2 · 16f53f2
1 parent 25a3d41
commit 16f53f2
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 14 deletions.
diff --git a/...ests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslIT.java b/...ests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslIT.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.quarkus.kafka.sasl;
 
-import io.quarkus.test.junit.DisabledOnNativeImage;
 import io.quarkus.test.junit.NativeImageTest;
+import org.junit.jupiter.api.Disabled;
 
-@DisabledOnNativeImage("https://github.com/apache/camel-quarkus/issues/3239")
+@Disabled("https://github.com/apache/camel-quarkus/issues/2729")
 @NativeImageTest
 public class KafkaSaslSslIT extends KafkaSaslSslTest {
 }
diff --git a/...ts/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java b/...ts/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java
@@ -22,12 +22,10 @@
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.path.json.JsonPath;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Disabled("https://github.com/apache/camel-quarkus/issues/3239")
 @QuarkusTest
 @QuarkusTestResource(KafkaSaslSslTestResource.class)
 public class KafkaSaslSslTest {

diff --git a/...-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTestResource.java b/...-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTestResource.java
@@ -128,6 +128,15 @@ public String getBootstrapServers() {
             return String.format("SASL_SSL://%s:%s", getHost(), getMappedPort(KAFKA_PORT));
         }
 
+        @Override
+        protected void configure() {
+            super.configure();
+
+            String host = getNetwork() != null ? getNetworkAliases().get(0) : "localhost";
+            withEnv("KAFKA_ADVERTISED_LISTENERS",
+                    String.format("SASL_SSL://%s:9093,BROKER://%s:9092", host, host));
+        }
+
         @Override
         protected void containerIsStarting(InspectContainerResponse containerInfo, boolean reused) {
             super.containerIsStarting(containerInfo, reused);

diff --git a/...ts/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java b/...ts/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java
@@ -22,12 +22,10 @@
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.path.json.JsonPath;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
-@Disabled("https://github.com/apache/camel-quarkus/issues/3239")
 @QuarkusTest
 @QuarkusTestResource(KafkaSaslTestResource.class)
 public class KafkaSaslBindingTest {

diff --git a/...ation-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java b/...ation-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java
@@ -16,10 +16,8 @@
  */
 package org.apache.camel.quarkus.kafka.sasl;
 
-import io.quarkus.test.junit.DisabledOnNativeImage;
 import io.quarkus.test.junit.NativeImageTest;
 
-@DisabledOnNativeImage("https://github.com/apache/camel-quarkus/issues/3239")
 @NativeImageTest
 public class KafkaSaslIT extends KafkaSaslBindingTest {
 }
diff --git a/...s/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslTestResource.java b/...s/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslTestResource.java
@@ -83,7 +83,7 @@ static final class SaslKafkaContainer extends KafkaContainer {
         SaslKafkaContainer(final DockerImageName dockerImageName) {
             super(dockerImageName);
 
-            String protocolMap = "SASL_PLAINTEXT:SASL_PLAINTEXT,BROKER:SASL_PLAINTEXT";
+            String protocolMap = "SASL_PLAINTEXT:SASL_PLAINTEXT,BROKER:PLAINTEXT";
             String listeners = "SASL_PLAINTEXT://0.0.0.0:" + KAFKA_PORT + ",BROKER://0.0.0.0:9092";
 
             withEnv("KAFKA_OPTS", "-Djava.security.auth.login.config=/etc/kafka/kafka_server_jaas.conf");
@@ -102,6 +102,15 @@ public String getBootstrapServers() {
             return String.format("SASL_PLAINTEXT://%s:%s", getHost(), getMappedPort(KAFKA_PORT));
         }
 
+        @Override
+        protected void configure() {
+            super.configure();
+
+            String host = getNetwork() != null ? getNetworkAliases().get(0) : "localhost";
+            withEnv("KAFKA_ADVERTISED_LISTENERS",
+                    String.format("SASL_PLAINTEXT://%s:9093,BROKER://%s:9092", host, host));
+        }
+
         @Override
         protected void containerIsStarting(InspectContainerResponse containerInfo, boolean reused) {
             super.containerIsStarting(containerInfo, reused);

diff --git a/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslIT.java b/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslIT.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.quarkus.kafka.ssl;
 
-import io.quarkus.test.junit.DisabledOnNativeImage;
 import io.quarkus.test.junit.NativeImageTest;
+import org.junit.jupiter.api.Disabled;
 
-@DisabledOnNativeImage("https://github.com/apache/camel-quarkus/issues/3239")
+@Disabled("https://github.com/apache/camel-quarkus/issues/2729")
 @NativeImageTest
 public class KafkaSslIT extends KafkaSslTest {
 }
diff --git a/...ration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java b/...ration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java
@@ -22,13 +22,11 @@
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.path.json.JsonPath;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.is;
 
-@Disabled("https://github.com/apache/camel-quarkus/issues/3239")
 @QuarkusTest
 @QuarkusTestResource(KafkaSslTestResource.class)
 public class KafkaSslTest {

diff --git a/...ests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTestResource.java b/...ests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTestResource.java
@@ -119,6 +119,15 @@ public String getBootstrapServers() {
             return String.format("SSL://%s:%s", getHost(), getMappedPort(KAFKA_PORT));
         }
 
+        @Override
+        protected void configure() {
+            super.configure();
+
+            String host = getNetwork() != null ? getNetworkAliases().get(0) : "localhost";
+            withEnv("KAFKA_ADVERTISED_LISTENERS",
+                    String.format("SSL://%s:9093,BROKER://%s:9092", host, host));
+        }
+
         @Override
         protected void containerIsStarting(InspectContainerResponse containerInfo, boolean reused) {
             super.containerIsStarting(containerInfo, reused);

diff --git a/pom.xml b/pom.xml
@@ -60,7 +60,7 @@
         <ahc.version>${ahc-version}</ahc.version>
         <animal-sniffer.version>1.18</animal-sniffer.version>
         <antlr3.version>3.5.2</antlr3.version><!-- Spark, Stringtemplate and probably others -->
-        <avro.version>1.10.2</avro.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro -->
+        <avro.version>1.11.0</avro.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro -->
         <aws-java-sdk.version>1.11.714</aws-java-sdk.version>
         <azure-sdk-bom.version>${azure-sdk-bom-version}</azure-sdk-bom.version>
         <bouncycastle.version>1.69</bouncycastle.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.bouncycastle:bcprov-jdk15on -->