Refactoring, more tests, and PR comment

Author: UnstoppableMango

docs/modules/azureservicebus.md

@@ -27,3 +27,9 @@ Choose an image from the [container registry](https://hub.docker.com/r/microsoft
 <!--codeinclude-->
 [](../../packages/modules/azureservicebus/src/azureservicebus-container.test.ts) inside_block:serviceBusValidEmulatorConfig
 <!--/codeinclude-->
+
+### Customize the MS SQL container
+
+<!--codeinclude-->
+[](../../packages/modules/azureservicebus/src/azureservicebus-container.test.ts) inside_block:serviceBusCustomMssqlContainer
+<!--/codeinclude-->

package.json

@@ -45,5 +45,6 @@
   },
   "engines": {
     "node": ">= 20"
-  }
+  },
+  "packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }

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

@@ -1,4 +1,5 @@
 import { ServiceBusClient } from "@azure/service-bus";
+import { GenericContainer, Wait } from "testcontainers";
 import { getImage } from "../../../testcontainers/src/utils/test-helper";
 import { ServiceBusContainer } from "./azureservicebus-container";
 
@@ -8,11 +9,18 @@ describe("ServiceBuscontainer", { timeout: 180_000 }, () => {
   it("should connect and queue a message", async () => {
     // serviceBusConnect {
     await using container = await new ServiceBusContainer(IMAGE).acceptLicense().start();
+
     const client = new ServiceBusClient(container.getConnectionString());
     const sender = client.createSender("queue.1");
+    const reciever = client.createReceiver("queue.1");
 
     await sender.sendMessages({ body: "Hello, World!" });
+    const res = await reciever.receiveMessages(1, { maxWaitTimeInMs: 5_000 });
+
+    expect(res).toHaveLength(1);
+    expect(res[0].body).toBe("Hello, World!");
 
+    await reciever.close();
     await sender.close();
     await client.close();
     // }
@@ -52,13 +60,67 @@ describe("ServiceBuscontainer", { timeout: 180_000 }, () => {
     });
 
     await using container = await new ServiceBusContainer(IMAGE).acceptLicense().withConfig(config).start();
+
     const client = new ServiceBusClient(container.getConnectionString());
     const sender = client.createSender(queueName);
+    const reciever = client.createReceiver(queueName);
     // }
 
     await sender.sendMessages({ body: "Hello, World!" });
+    const res = await reciever.receiveMessages(1, { maxWaitTimeInMs: 5_000 });
 
+    expect(res).toHaveLength(1);
+    expect(res[0].body).toBe("Hello, World!");
+
+    await reciever.close();
     await sender.close();
     await client.close();
   });
+
+  it("should connect with a custom MSSQL container", async () => {
+    // serviceBusCustomMssqlContainer {
+    // You are responsible for configuring the SA password on
+    // BOTH containers when using a custom MSSQL container.
+    const customPassword = "MyC0mplexP@ssw0rd!";
+
+    // @testcontainers/mssqlserver can be used as well
+    const mssqlContainer = new GenericContainer("mcr.microsoft.com/mssql/server:2022-latest")
+      .withEnvironment({
+        ACCEPT_EULA: "Y",
+        MSSQL_SA_PASSWORD: customPassword,
+      })
+      .withWaitStrategy(Wait.forLogMessage(/.*Recovery is complete.*/, 1).withStartupTimeout(120_000));
+
+    await using container = await new ServiceBusContainer(IMAGE)
+      .acceptLicense()
+      .withMssqlContainer(mssqlContainer)
+      .withMssqlPassword(customPassword)
+      .start();
+
+    const client = new ServiceBusClient(container.getConnectionString());
+    // }
+
+    const sender = client.createSender("queue.1");
+    const reciever = client.createReceiver("queue.1");
+
+    await sender.sendMessages({ body: "Hello, World!" });
+    const res = await reciever.receiveMessages(1, { maxWaitTimeInMs: 5_000 });
+
+    expect(res).toHaveLength(1);
+    expect(res[0].body).toBe("Hello, World!");
+
+    await reciever.close();
+    await sender.close();
+    await client.close();
+  });
+
+  it("should connect containers to the same network", async () => {
+    await using serviceBusContainer = await new ServiceBusContainer(IMAGE).acceptLicense().start();
+
+    const servicebusNetworks = serviceBusContainer.getNetworkNames();
+    const mssqlNetworks = serviceBusContainer.getMssqlContainer().getNetworkNames();
+
+    expect(servicebusNetworks).toHaveLength(1);
+    expect(mssqlNetworks).toEqual(expect.arrayContaining(servicebusNetworks));
+  });
 });

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

@@ -6,20 +6,21 @@ import {
   StartedTestContainer,
   Wait,
 } from "testcontainers";
-import { MSSQLServerContainer, StartedMSSQLServerContainer } from "./mssqlserver";
 
 const DEFAULT_PORT = 5672;
 const DEFAULT_HTTP_PORT = 5300;
 const DEFAULT_SHARED_ACCESS_KEY_NAME = "RootManageSharedAccessKey";
 const DEFAULT_SHARED_ACCESS_KEY = "SAS_KEY_VALUE";
 const DEFAULT_MSSQL_ALIAS = "mssql";
 const DEFAULT_MSSQL_IMAGE = "mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04";
+const DEFAULT_MSSQL_PASSWORD = "P@ssword1!";
 const CONTAINER_CONFIG_FILE = "/ServiceBus_Emulator/ConfigFiles/Config.json";
 
 export class ServiceBusContainer extends GenericContainer {
   private acceptEula: string = "N";
-  private mssqlContainer: MSSQLServerContainer | undefined;
+  private mssqlContainer: GenericContainer | undefined;
   private mssqlImage: string = DEFAULT_MSSQL_IMAGE;
+  private mssqlPassword: string = DEFAULT_MSSQL_PASSWORD;
   private config: Content | undefined;
 
   constructor(image: string) {
@@ -37,7 +38,7 @@ export class ServiceBusContainer extends GenericContainer {
     return this;
   }
 
-  public withMssqlContainer(container: MSSQLServerContainer): this {
+  public withMssqlContainer(container: GenericContainer): this {
     this.mssqlContainer = container;
     return this;
   }
@@ -47,34 +48,37 @@ export class ServiceBusContainer extends GenericContainer {
     return this;
   }
 
+  public withMssqlPassword(password: string): this {
+    this.mssqlPassword = password;
+    return this;
+  }
+
   public withConfig(config: Content): this {
     this.config = config;
     return this;
   }
 
   public override async start(): Promise<StartedServiceBusContainer> {
-    let mssql: StartedMSSQLServerContainer;
-
-    if (this.mssqlContainer) {
-      mssql = await this.mssqlContainer.start();
-    } else {
-      const network = await new Network().start();
-      const alias = DEFAULT_MSSQL_ALIAS;
-
-      this.mssqlContainer = new MSSQLServerContainer(this.mssqlImage)
-        .withNetwork(network)
-        .withNetworkAliases(alias)
-        .acceptLicense();
-
-      mssql = await this.mssqlContainer.start();
-
-      this.withNetwork(network);
-      this.withEnvironment({
-        SQL_SERVER: alias,
-        MSSQL_SA_PASSWORD: mssql.getPassword(),
-      });
+    let mssql: StartedTestContainer;
+
+    const network = await new Network().start();
+    this.withNetwork(network);
+
+    if (!this.mssqlContainer) {
+      // This should match the behaviour of @testcontainers/mssqlserver, we
+      // create the container manually here to avoid module dependencies.
+      this.mssqlContainer = new GenericContainer(this.mssqlImage)
+        .withNetworkAliases(DEFAULT_MSSQL_ALIAS)
+        .withEnvironment({
+          ACCEPT_EULA: "Y",
+          MSSQL_SA_PASSWORD: this.mssqlPassword,
+        })
+        .withExposedPorts(1433)
+        .withWaitStrategy(Wait.forLogMessage(/.*Recovery is complete.*/, 1).withStartupTimeout(120_000));
     }
 
+    mssql = await this.mssqlContainer.withNetwork(network).start();
+
     if (this.config) {
       this.withCopyContentToContainer([
         {
@@ -87,6 +91,8 @@ export class ServiceBusContainer extends GenericContainer {
 
     this.withEnvironment({
       ACCEPT_EULA: this.acceptEula,
+      SQL_SERVER: mssql.getHostname(),
+      MSSQL_SA_PASSWORD: this.mssqlPassword,
     });
 
     return new StartedServiceBusContainer(await super.start(), mssql);
@@ -96,12 +102,12 @@ export class ServiceBusContainer extends GenericContainer {
 export class StartedServiceBusContainer extends AbstractStartedContainer {
   constructor(
     startedTestContainer: StartedTestContainer,
-    private readonly mssql: StartedMSSQLServerContainer
+    private readonly mssql: StartedTestContainer
   ) {
     super(startedTestContainer);
   }
 
-  public getMssqlContainer(): StartedMSSQLServerContainer {
+  public getMssqlContainer(): StartedTestContainer {
     return this.mssql;
   }