Minor improvements/fixes

Author: cristianrgreco

docs/modules/azureservicebus.md

@@ -1,4 +1,4 @@
-# Azure Service Bus Emulator
+# Azure Service Bus
 
 ## Install
 

packages/modules/azureservicebus/Dockerfile

@@ -1 +1,2 @@
 FROM mcr.microsoft.com/azure-messaging/servicebus-emulator:1.1.2
+FROM mcr.microsoft.com/mssql/server:2022-latest

packages/modules/azureservicebus/src/azureservicebus-container.test.ts

@@ -1,14 +1,15 @@
 import { ServiceBusClient } from "@azure/service-bus";
 import { GenericContainer, Wait } from "testcontainers";
 import { getImage } from "../../../testcontainers/src/utils/test-helper";
-import { ServiceBusContainer } from "./azureservicebus-container";
+import { AzureServiceBusContainer } from "./azureservicebus-container";
 
-const IMAGE = getImage(__dirname);
+const IMAGE = getImage(__dirname, 0);
+const MSSQL_IMAGE = getImage(__dirname, 1);
 
-describe("Azure Service Bus", { timeout: 180_000 }, () => {
+describe("AzureServiceBusContainer", { timeout: 180_000 }, () => {
   it("should connect and queue a message", async () => {
     // serviceBusConnect {
-    await using container = await new ServiceBusContainer(IMAGE).acceptLicense().start();
+    await using container = await new AzureServiceBusContainer(IMAGE).acceptLicense().start();
 
     const client = new ServiceBusClient(container.getConnectionString());
     const sender = client.createSender("queue.1");
@@ -59,7 +60,7 @@ describe("Azure Service Bus", { timeout: 180_000 }, () => {
       },
     });
 
-    await using container = await new ServiceBusContainer(IMAGE).acceptLicense().withConfig(config).start();
+    await using container = await new AzureServiceBusContainer(IMAGE).acceptLicense().withConfig(config).start();
 
     const client = new ServiceBusClient(container.getConnectionString());
     const sender = client.createSender(queueName);
@@ -84,15 +85,15 @@ describe("Azure Service Bus", { timeout: 180_000 }, () => {
     const customPassword = "MyC0mplexP@ssw0rd!";
 
     // @testcontainers/mssqlserver can be used as well
-    const mssqlContainer = new GenericContainer("mcr.microsoft.com/mssql/server:2022-latest")
+    const mssqlContainer = new GenericContainer(MSSQL_IMAGE)
       .withEnvironment({
         ACCEPT_EULA: "Y",
         MSSQL_SA_PASSWORD: customPassword,
       })
       .withNetworkAliases("your-network-alias")
       .withWaitStrategy(Wait.forLogMessage(/.*Recovery is complete.*/, 1).withStartupTimeout(120_000));
 
-    await using container = await new ServiceBusContainer(IMAGE)
+    await using container = await new AzureServiceBusContainer(IMAGE)
       .acceptLicense()
       .withMssqlContainer(mssqlContainer)
       .withMssqlPassword(customPassword)
@@ -116,7 +117,7 @@ describe("Azure Service Bus", { timeout: 180_000 }, () => {
   });
 
   it("should connect containers to the same network", async () => {
-    await using serviceBusContainer = await new ServiceBusContainer(IMAGE).acceptLicense().start();
+    await using serviceBusContainer = await new AzureServiceBusContainer(IMAGE).acceptLicense().start();
 
     const servicebusNetworks = serviceBusContainer.getNetworkNames();
     const mssqlNetworks = serviceBusContainer.getMssqlContainer().getNetworkNames();

packages/modules/azureservicebus/src/azureservicebus-container.ts

@@ -17,7 +17,7 @@ const DEFAULT_MSSQL_IMAGE = "mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.
 const DEFAULT_MSSQL_PASSWORD = "P@ssword1!d3adb33f#";
 const CONTAINER_CONFIG_FILE = "/ServiceBus_Emulator/ConfigFiles/Config.json";
 
-export class ServiceBusContainer extends GenericContainer {
+export class AzureServiceBusContainer extends GenericContainer {
   private acceptEula: string = "N";
   private mssqlContainer: GenericContainer | undefined;
   private mssqlImage: string = DEFAULT_MSSQL_IMAGE;
@@ -73,7 +73,7 @@ export class ServiceBusContainer extends GenericContainer {
     return this;
   }
 
-  public override async start(): Promise<StartedServiceBusContainer> {
+  public override async start(): Promise<StartedAzureServiceBusContainer> {
     const network = await new Network().start();
     this.withNetwork(network);
 
@@ -110,7 +110,7 @@ export class ServiceBusContainer extends GenericContainer {
     try {
       const serviceBus = await super.start();
 
-      return new StartedServiceBusContainer(serviceBus, mssql, network);
+      return new StartedAzureServiceBusContainer(serviceBus, mssql, network);
     } catch (err) {
       await mssql.stop();
       await network.stop();
@@ -120,7 +120,7 @@ export class ServiceBusContainer extends GenericContainer {
   }
 }
 
-export class StartedServiceBusContainer extends AbstractStartedContainer {
+export class StartedAzureServiceBusContainer extends AbstractStartedContainer {
   constructor(
     startedTestContainer: StartedTestContainer,
     private readonly mssql: StartedTestContainer,

packages/modules/azureservicebus/src/index.ts

@@ -0,0 +1 @@
+export { AzureServiceBusContainer, StartedAzureServiceBusContainer } from "./azureservicebus-container";