Updates for new module tests

Author: cristianrgreco

packages/modules/gcloud/src/spanner-emulator-container.test.ts

@@ -8,7 +8,7 @@ const IMAGE = getImage(__dirname, 3);
 describe("SpannerEmulatorContainer", { timeout: 240_000 }, () => {
   // startupWithExplicitClient {
   it("should start, expose endpoints and accept real client connections using explicitly configured client", async () => {
-    const container = await new SpannerEmulatorContainer(IMAGE).withProjectId("test-project").start();
+    await using container = await new SpannerEmulatorContainer(IMAGE).withProjectId("test-project").start();
 
     const client = new Spanner({
       projectId: container.getProjectId(),
@@ -26,8 +26,6 @@ describe("SpannerEmulatorContainer", { timeout: 240_000 }, () => {
     // emulator always includes "emulator-config"
     const expectedConfigName = admin.instanceConfigPath(container.getProjectId(), "emulator-config");
     expect(configs.map((c) => c.name)).toContain(expectedConfigName);
-
-    await container.stop();
   });
   // }
 
@@ -38,7 +36,7 @@ describe("SpannerEmulatorContainer", { timeout: 240_000 }, () => {
 
     // startupWithEnvironmentVariable {
     it("should start, expose endpoints and accept real client connections using projectId and SPANNER_EMULATOR_HOST", async () => {
-      const container = await new SpannerEmulatorContainer(IMAGE).withProjectId("test-project").start();
+      await using container = await new SpannerEmulatorContainer(IMAGE).withProjectId("test-project").start();
 
       // configure the client to talk to our emulator
       process.env.SPANNER_EMULATOR_HOST = container.getEmulatorGrpcEndpoint();
@@ -53,8 +51,6 @@ describe("SpannerEmulatorContainer", { timeout: 240_000 }, () => {
       // emulator always includes "emulator-config"
       const expectedConfigName = admin.instanceConfigPath(container.getProjectId(), "emulator-config");
       expect(configs.map((c) => c.name)).toContain(expectedConfigName);
-
-      await container.stop();
     });
     // }
   });

packages/modules/gcloud/src/spanner-emulator-helper.test.ts

@@ -8,7 +8,7 @@ const IMAGE = getImage(__dirname, 3);
 describe("SpannerEmulatorHelper", { timeout: 240_000 }, () => {
   // createAndDelete {
   it("should create and delete instance and database via helper", async () => {
-    const container = await new SpannerEmulatorContainer(IMAGE).start();
+    await using container = await new SpannerEmulatorContainer(IMAGE).start();
     const helper = new SpannerEmulatorHelper(container);
     const instanceId = "test-instance";
     const databaseId = "test-db";
@@ -37,8 +37,6 @@ describe("SpannerEmulatorHelper", { timeout: 240_000 }, () => {
 
     const [instanceExistsAfter] = await client.instance(instanceId).exists();
     expect(instanceExistsAfter).toBe(false);
-
-    await container.stop();
   });
   // }
 });

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

@@ -8,7 +8,7 @@ const IMAGE = getImage(__dirname);
 describe("VaultContainer", { timeout: 180_000 }, () => {
   // inside_block:readWrite {
   it("should start Vault and allow reading/writing secrets", async () => {
-    const container = await new VaultContainer(IMAGE).withVaultToken(VAULT_TOKEN).start();
+    await using container = await new VaultContainer(IMAGE).withVaultToken(VAULT_TOKEN).start();
 
     const client = vault({
       apiVersion: "v1",
@@ -28,14 +28,12 @@ describe("VaultContainer", { timeout: 180_000 }, () => {
 
     expect(data.message).toBe("world");
     expect(data.other).toBe("vault");
-
-    await container.stop();
   });
   // }
 
   // inside_block:initCommands {
   it("should execute init commands using vault CLI", async () => {
-    const container = await new VaultContainer(IMAGE)
+    await using container = await new VaultContainer(IMAGE)
       .withVaultToken(VAULT_TOKEN)
       .withInitCommands("secrets enable transit", "write -f transit/keys/my-key")
       .start();
@@ -44,8 +42,6 @@ describe("VaultContainer", { timeout: 180_000 }, () => {
 
     expect(result.exitCode).toBe(0);
     expect(result.output).toContain("my-key");
-
-    await container.stop();
   });
   // }
 });