Fix Elasticsearch tests

Author: cristianrgreco

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

@@ -3,12 +3,16 @@ import { getImage } from "../../../testcontainers/src/utils/test-helper";
 import { ElasticsearchContainer } from "./elasticsearch-container";
 
 const IMAGE = getImage(__dirname);
+const images = ["elasticsearch:7.17.28", "elasticsearch:8.18.1", IMAGE];
 
 describe("ElasticsearchContainer", { timeout: 180_000 }, () => {
   // createIndex {
-  it("should create an index", async () => {
-    const container = await new ElasticsearchContainer(IMAGE).start();
-    const client = new Client({ node: container.getHttpUrl() });
+  it.each(images)("should create an index with %s", async (image) => {
+    const container = await new ElasticsearchContainer(image).start();
+    const client = new Client({
+      node: container.getHttpUrl(),
+      auth: { username: container.getUsername(), password: container.getPassword() },
+    });
 
     await client.indices.create({ index: "people" });
 
@@ -20,7 +24,10 @@ describe("ElasticsearchContainer", { timeout: 180_000 }, () => {
   // indexDocument {
   it("should index a document", async () => {
     const container = await new ElasticsearchContainer(IMAGE).start();
-    const client = new Client({ node: container.getHttpUrl() });
+    const client = new Client({
+      node: container.getHttpUrl(),
+      auth: { username: container.getUsername(), password: container.getPassword() },
+    });
 
     const document = {
       id: "1",
@@ -41,7 +48,24 @@ describe("ElasticsearchContainer", { timeout: 180_000 }, () => {
     const container = await new ElasticsearchContainer(IMAGE).start();
     await container.restart();
 
-    const client = new Client({ node: container.getHttpUrl() });
+    const client = new Client({
+      node: container.getHttpUrl(),
+      auth: { username: container.getUsername(), password: container.getPassword() },
+    });
+
+    await client.indices.create({ index: "people" });
+
+    expect(await client.indices.exists({ index: "people" })).toBe(true);
+    await container.stop();
+  }); // }
+
+  it("should set custom password", async () => {
+    const container = await new ElasticsearchContainer(IMAGE).withPassword("testPassword").start();
+
+    const client = new Client({
+      node: container.getHttpUrl(),
+      auth: { username: container.getUsername(), password: container.getPassword() },
+    });
 
     await client.indices.create({ index: "people" });
 

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

@@ -1,28 +1,53 @@
-import { AbstractStartedContainer, GenericContainer, StartedTestContainer } from "testcontainers";
+import { AbstractStartedContainer, GenericContainer, StartedTestContainer, Wait } from "testcontainers";
 
 const ELASTIC_SEARCH_HTTP_PORT = 9200;
 
 export class ElasticsearchContainer extends GenericContainer {
+  private password = "changeme";
+  private readonly username = "elastic";
+  private readonly defaultWaitStrategy = Wait.forHttp("/", ELASTIC_SEARCH_HTTP_PORT).withBasicCredentials(
+    this.username,
+    this.password
+  );
+
   constructor(image: string) {
     super(image);
     this.withExposedPorts(ELASTIC_SEARCH_HTTP_PORT)
-      .withEnvironment({ "discovery.type": "single-node" })
+      .withEnvironment({
+        "discovery.type": "single-node",
+        "xpack.security.http.ssl.enabled": "false",
+      })
       .withCopyContentToContainer([
         {
           content: "-Xmx2G\n",
           target: "/usr/share/elasticsearch/config/jvm.options.d/elasticsearch-default-memory-vm.options",
         },
       ])
+      .withWaitStrategy(this.defaultWaitStrategy)
       .withStartupTimeout(120_000);
   }
 
+  public withPassword(password: string): this {
+    this.password = password;
+    this.defaultWaitStrategy.withBasicCredentials(this.username, this.password);
+    return this;
+  }
+
   public override async start(): Promise<StartedElasticsearchContainer> {
-    return new StartedElasticsearchContainer(await super.start());
+    this.withEnvironment({
+      ELASTIC_PASSWORD: this.password,
+    });
+
+    return new StartedElasticsearchContainer(await super.start(), this.username, this.password);
   }
 }
 
 export class StartedElasticsearchContainer extends AbstractStartedContainer {
-  constructor(override readonly startedTestContainer: StartedTestContainer) {
+  constructor(
+    override readonly startedTestContainer: StartedTestContainer,
+    private readonly username: string,
+    private readonly password: string
+  ) {
     super(startedTestContainer);
   }
 
@@ -33,4 +58,12 @@ export class StartedElasticsearchContainer extends AbstractStartedContainer {
   public getHttpUrl(): string {
     return `http://${this.getHost()}:${this.getPort()}`;
   }
+
+  public getUsername(): string {
+    return this.username;
+  }
+
+  public getPassword(): string {
+    return this.password;
+  }
 }