Merge pull request quarkiverse#414 from albers/fix-container-tests

Fix QuarkusIntegrationTests for containers

Author: majguo

services/azure-servicebus/deployment/src/main/java/io/quarkiverse/azure/servicebus/deployment/ServiceBusDevServicesProcessor.java

@@ -11,6 +11,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.jboss.logging.Logger;
 import org.testcontainers.azure.ServiceBusEmulatorContainer;
 import org.testcontainers.containers.MSSQLServerContainer;
 import org.testcontainers.containers.Network;
@@ -22,12 +23,15 @@
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.DevServicesResultBuildItem;
 import io.quarkus.deployment.builditem.DevServicesResultBuildItem.RunningDevService;
+import io.quarkus.deployment.builditem.DevServicesSharedNetworkBuildItem;
 import io.quarkus.deployment.dev.devservices.DevServicesConfig;
 import io.quarkus.runtime.configuration.ConfigUtils;
 import io.quarkus.runtime.configuration.ConfigurationException;
 
 public class ServiceBusDevServicesProcessor {
 
+    private static final Logger log = Logger.getLogger(ServiceBusDevServicesProcessor.class);
+    private static final int DEFAULT_EMULATOR_PORT = 5672;
     private static final String EMULATOR_CONFIG_FILE = "servicebus-config.json";
     public static final String SERVICEBUS_EULA_URL = "https://github.com/Azure/azure-service-bus-emulator-installer/blob/main/EMULATOR_EULA.txt";
     public static final String MSSQL_SERVER_EULA_URL = "https://hub.docker.com/r/microsoft/mssql-server";
@@ -36,13 +40,14 @@ public class ServiceBusDevServicesProcessor {
     @BuildStep(onlyIfNot = IsNormal.class, onlyIf = { DevServicesConfig.Enabled.class,
             ServiceBusDevServicesConfig.Enabled.class })
     public List<DevServicesResultBuildItem> startServiceBusEmulator(ServiceBusDevServicesConfig devServicesConfig,
+            List<DevServicesSharedNetworkBuildItem> devServicesSharedNetworkBuildItem,
             BuildProducer<ValidationErrorBuildItem> configErrors) {
         if (isServiceBusConnectionConfigured() || hasConfigurationProblems(devServicesConfig, configErrors)) {
             return null;
         }
 
         if (devServices == null) {
-            devServices = startContainers(devServicesConfig);
+            devServices = startContainers(devServicesConfig, devServicesSharedNetworkBuildItem);
         }
 
         return devServices.stream()
@@ -79,23 +84,38 @@ private static boolean isEmulatorConfigFileMissing() {
         return resourceUrl == null;
     }
 
-    private List<RunningDevService> startContainers(ServiceBusDevServicesConfig devServicesConfig) {
-        Network internalNetwork = Network.newNetwork();
+    private List<RunningDevService> startContainers(ServiceBusDevServicesConfig devServicesConfig,
+            List<DevServicesSharedNetworkBuildItem> devServicesSharedNetworkBuildItem) {
+        log.info("Dev Services for Azure Service Bus starting the Azure Service Bus emulator");
+
+        boolean useSharedNetwork = !devServicesSharedNetworkBuildItem.isEmpty();
 
         MSSQLServerContainer<?> database = new MSSQLServerContainer<>(devServicesConfig.database().imageName())
                 .acceptLicense()
-                .withNetwork(internalNetwork);
-
-        ServiceBusEmulatorContainer emulator = new ServiceBusEmulatorContainer(devServicesConfig.emulator().imageName())
+                .withNetwork(Network.SHARED);
+
+        ServiceBusEmulatorContainer emulator = new ServiceBusEmulatorContainer(
+                devServicesConfig.emulator().imageName()) {
+            @Override
+            public String getHost() {
+                return useSharedNetwork ? getNetworkAliases().get(0) : super.getHost();
+            }
+
+            @Override
+            public Integer getMappedPort(int originalPort) {
+                return useSharedNetwork ? DEFAULT_EMULATOR_PORT : super.getMappedPort(originalPort);
+            }
+        }
                 .acceptLicense()
                 .withConfig(MountableFile.forClasspathResource(EMULATOR_CONFIG_FILE))
                 .withMsSqlServerContainer(database)
-                .withNetwork(internalNetwork);
+                .withNetwork(Network.SHARED);
 
         emulator.start();
+        log.infof("Azure Service Bus emulator started - connection string is '%s'", emulator.getConnectionString());
 
-        Map<String, String> configOverrides = Map.of(CONFIG_KEY_CONNECTION_STRING,
-                emulator.getConnectionString());
+        Map<String, String> configOverrides = Map.of(
+                CONFIG_KEY_CONNECTION_STRING, emulator.getConnectionString());
 
         RunningDevService databaseDevService = new RunningDevService(FEATURE, database.getContainerId(), database::close,
                 Collections.emptyMap());