Improvement append session id to lambda docker flags

Author: florian-nguyen

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

@@ -110,4 +110,19 @@ describe("LocalStackContainer", { timeout: 180_000 }, () => {
     expect(exitCode).toBe(0);
     expect(output).toContain(`${LABEL_TESTCONTAINERS_SESSION_ID}=${sessionId}`);
   });
+
+  it("should concatenate sessionId label to LAMBDA_DOCKER_FLAGS", async () => {
+    const container = await new LocalstackContainer()
+      .withEnvironment({
+        LAMBDA_DOCKER_FLAGS: `-l mylabel=myvalue -l ${LABEL_TESTCONTAINERS_SESSION_ID}=sessionId`,
+      })
+      .start();
+    const sessionId = container.getLabels()[LABEL_TESTCONTAINERS_SESSION_ID];
+
+    const { output, exitCode } = await container.exec(["printenv", "LAMBDA_DOCKER_FLAGS"]);
+
+    expect(exitCode).toBe(0);
+    expect(output).toContain(`${LABEL_TESTCONTAINERS_SESSION_ID}=${sessionId}`);
+    expect(output).toContain(`mylabel=myvalue`);
+  });
 });

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

@@ -42,7 +42,15 @@ export class LocalstackContainer extends GenericContainer {
   private async flagLambdaSessionId(): Promise<void> {
     const client = await getContainerRuntimeClient();
     const reaper = await getReaper(client);
-    this.withEnvironment({ LAMBDA_DOCKER_FLAGS: `-l ${LABEL_TESTCONTAINERS_SESSION_ID}=${reaper.sessionId}` });
+
+    const lambdaDockerFlags = [
+      this.environment["LAMBDA_DOCKER_FLAGS"],
+      `-l ${LABEL_TESTCONTAINERS_SESSION_ID}=${reaper.sessionId}`,
+    ]
+      .filter((flag) => flag !== undefined)
+      .join(" ");
+
+    this.withEnvironment({ LAMBDA_DOCKER_FLAGS: lambdaDockerFlags });
   }
 
   protected override async beforeContainerCreated(): Promise<void> {