Add Azure Event Hubs Emulator container to Azure module

- Rename container
- Remove Kafka

Signed-off-by: Esta Nagy <[email protected]>

Author: nagyesta

docs/modules/azure.md

@@ -82,31 +82,23 @@ Build Azure Table client:
 Start Azure Event Hubs Emulator during a test:
 
 <!--codeinclude-->
-[Setting up a network](../../modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsEmulatorContainerTest.java) inside_block:network
+[Setting up a network](../../modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsContainerTest.java) inside_block:network
 <!--/codeinclude-->
 
 <!--codeinclude-->
-[Starting an Azurite container as dependency](../../modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsEmulatorContainerTest.java) inside_block:azuriteContainer
+[Starting an Azurite container as dependency](../../modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsContainerTest.java) inside_block:azuriteContainer
 <!--/codeinclude-->
 
 <!--codeinclude-->
-[Starting an Azure Event Hubs Emulator container](../../modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsEmulatorContainerTest.java) inside_block:emulatorContainer
+[Starting an Azure Event Hubs Emulator container](../../modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsContainerTest.java) inside_block:emulatorContainer
 <!--/codeinclude-->
 
 #### Using Azure Event Hubs clients
 
 Configure the consumer and the producer clients:
 
 <!--codeinclude-->
-[Configuring the clients](../../modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsEmulatorContainerTest.java) inside_block:createProducerAndConsumer
-<!--/codeinclude-->
-
-#### Using Kafka clients
-
-Configure the consumer and the producer clients:
-
-<!--codeinclude-->
-[Obtaining the Kafka connection properties](../../modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsEmulatorContainerTest.java) inside_block:kafkaProperties
+[Configuring the clients](../../modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsContainerTest.java) inside_block:createProducerAndConsumer
 <!--/codeinclude-->
 
 ### CosmosDB

modules/azure/build.gradle

@@ -11,5 +11,4 @@ dependencies {
     testImplementation 'com.azure:azure-storage-queue:12.24.0'
     testImplementation 'com.azure:azure-data-tables:12.5.0'
     testImplementation 'com.azure:azure-messaging-eventhubs:5.19.2'
-    testImplementation 'org.apache.kafka:kafka-clients:3.8.0'
 }

…ure/AzureEventHubsEmulatorContainer.java …iners/azure/AzureEventHubsContainer.javamodules/azure/src/main/java/org/testcontainers/azure/AzureEventHubsEmulatorContainer.java renamed to modules/azure/src/main/java/org/testcontainers/azure/AzureEventHubsContainer.java modules/azure/src/main/java/org/testcontainers/azure/AzureEventHubsEmulatorContainer.java renamed to modules/azure/src/main/java/org/testcontainers/azure/AzureEventHubsContainer.java

@@ -14,15 +14,12 @@
  * Exposed ports:
  * <ul>
  *     <li>AMQP: 5672</li>
- *     <li>Kafka: 9092</li>
  * </ul>
  */
-public class AzureEventHubsEmulatorContainer extends GenericContainer<AzureEventHubsEmulatorContainer> {
+public class AzureEventHubsContainer extends GenericContainer<AzureEventHubsContainer> {
 
     private static final int DEFAULT_AMQP_PORT = 5672;
 
-    private static final int DEFAULT_KAFKA_PORT = 9092;
-
     private static final String CONNECTION_STRING_FORMAT =
         "Endpoint=sb://%s:%d;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;";
 
@@ -34,19 +31,17 @@ public class AzureEventHubsEmulatorContainer extends GenericContainer<AzureEvent
 
     private AzuriteContainer azuriteContainer;
 
-    private boolean useKafka;
-
     /**
      * @param dockerImageName specified docker image name to run
      */
-    public AzureEventHubsEmulatorContainer(final String dockerImageName) {
+    public AzureEventHubsContainer(final String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
 
     /**
      * @param dockerImageName specified docker image name to run
      */
-    public AzureEventHubsEmulatorContainer(final DockerImageName dockerImageName) {
+    public AzureEventHubsContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
         waitingFor(Wait.forLogMessage(".*Emulator Service is Successfully Up!.*", 1));
@@ -59,7 +54,7 @@ public AzureEventHubsEmulatorContainer(final DockerImageName dockerImageName) {
      * @param azuriteContainer The Azurite container used by Event HUbs as a dependency
      * @return this
      */
-    public AzureEventHubsEmulatorContainer withAzuriteContainer(final AzuriteContainer azuriteContainer) {
+    public AzureEventHubsContainer withAzuriteContainer(final AzuriteContainer azuriteContainer) {
         this.azuriteContainer = azuriteContainer;
         dependsOn(this.azuriteContainer);
         return this;
@@ -71,7 +66,7 @@ public AzureEventHubsEmulatorContainer withAzuriteContainer(final AzuriteContain
      * @param config The file containing the broker configuration
      * @return this
      */
-    public AzureEventHubsEmulatorContainer withConfig(final Transferable config) {
+    public AzureEventHubsContainer withConfig(final Transferable config) {
         withCopyToContainer(config, "/Eventhubs_Emulator/ConfigFiles/Config.json");
         return this;
     }
@@ -81,20 +76,10 @@ public AzureEventHubsEmulatorContainer withConfig(final Transferable config) {
      *
      * @return this
      */
-    public AzureEventHubsEmulatorContainer acceptLicense() {
+    public AzureEventHubsContainer acceptLicense() {
         return withEnv("ACCEPT_EULA", "Y");
     }
 
-    /**
-     * Enables Kafka support.
-     *
-     * @return this
-     */
-    public AzureEventHubsEmulatorContainer enableKafka() {
-        this.useKafka = true;
-        return this;
-    }
-
     @Override
     protected void configure() {
         if (azuriteContainer == null) {
@@ -112,10 +97,6 @@ protected void configure() {
             LicenseAcceptance.assertLicenseAccepted(this.getDockerImageName());
             acceptLicense();
         }
-        if (this.useKafka) {
-            //Kafka must expose with the fixed default port or the broker's advertised port won't match
-            this.addFixedExposedPort(DEFAULT_KAFKA_PORT, DEFAULT_KAFKA_PORT);
-        }
     }
 
     /**
@@ -126,13 +107,4 @@ protected void configure() {
     public String getConnectionString() {
         return String.format(CONNECTION_STRING_FORMAT, getHost(), getMappedPort(DEFAULT_AMQP_PORT));
     }
-
-    /**
-     * Returns the kafka bootstrap servers
-     *
-     * @return bootstrap servers
-     */
-    public String getBootstrapServers() {
-        return String.format(BOOTSTRAP_SERVERS_FORMAT, getHost(), getMappedPort(DEFAULT_KAFKA_PORT));
-    }
 }

modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsContainerTest.java

@@ -0,0 +1,83 @@
+package org.testcontainers.azure;
+
+import com.azure.core.util.IterableStream;
+import com.azure.messaging.eventhubs.EventData;
+import com.azure.messaging.eventhubs.EventHubClientBuilder;
+import com.azure.messaging.eventhubs.EventHubConsumerClient;
+import com.azure.messaging.eventhubs.EventHubProducerClient;
+import com.azure.messaging.eventhubs.models.EventPosition;
+import com.azure.messaging.eventhubs.models.PartitionEvent;
+import org.junit.Rule;
+import org.junit.Test;
+import org.testcontainers.containers.Network;
+import org.testcontainers.utility.MountableFile;
+
+import java.time.Duration;
+import java.util.Collections;
+import java.util.Optional;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.waitAtMost;
+
+public class AzureEventHubsContainerTest {
+
+    @Rule
+    // network {
+    public Network network = Network.newNetwork();
+
+    // }
+
+    @Rule
+    // azuriteContainer {
+    public AzuriteContainer azuriteContainer = new AzuriteContainer("mcr.microsoft.com/azure-storage/azurite:3.33.0")
+        .withNetwork(network);
+
+    // }
+
+    @Rule
+    // emulatorContainer {
+    public AzureEventHubsContainer emulator = new AzureEventHubsContainer(
+        "mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.0.1"
+    )
+        .acceptLicense()
+        .withNetwork(network)
+        .withConfig(MountableFile.forClasspathResource("/eventhubs_config.json"))
+        .withAzuriteContainer(azuriteContainer);
+
+    // }
+
+    @Test
+    public void testWithEventHubsClient() {
+        try (
+            // createProducerAndConsumer {
+            EventHubProducerClient producer = new EventHubClientBuilder()
+                .connectionString(emulator.getConnectionString())
+                .fullyQualifiedNamespace("emulatorNs1")
+                .eventHubName("eh1")
+                .buildProducerClient();
+            EventHubConsumerClient consumer = new EventHubClientBuilder()
+                .connectionString(emulator.getConnectionString())
+                .fullyQualifiedNamespace("emulatorNs1")
+                .eventHubName("eh1")
+                .consumerGroup("cg1")
+                .buildConsumerClient()
+            // }
+        ) {
+            producer.send(Collections.singletonList(new EventData("test")));
+
+            waitAtMost(Duration.ofSeconds(30))
+                .pollDelay(Duration.ofSeconds(5))
+                .untilAsserted(() -> {
+                    IterableStream<PartitionEvent> events = consumer.receiveFromPartition(
+                        "0",
+                        1,
+                        EventPosition.earliest(),
+                        Duration.ofSeconds(2)
+                    );
+                    Optional<PartitionEvent> event = events.stream().findFirst();
+                    assertThat(event).isPresent();
+                    assertThat(event.get().getData().getBodyAsString()).isEqualTo("test");
+                });
+        }
+    }
+}