Gcloud WIP

Author: cristianrgreco

docs/modules/gcloud.md

@@ -33,19 +33,11 @@ These examples use the following libraries:
         npm install @google-cloud/datastore
 
 Choose an image from the [container registry](https://gcr.io/google.com/cloudsdktool/google-cloud-cli) and substitute `IMAGE`.
-
-#### With default image
-
-<!--codeinclude-->
-[](../../packages/modules/gcloud/src/datastore-emulator-container.test.ts) inside_block:datastore4
-<!--/codeinclude-->
-
-#### With custom image
-
+ 
 <!--codeinclude-->
-[](../../packages/modules/gcloud/src/datastore-emulator-container.test.ts) inside_block:datastore5
+[](../../packages/modules/gcloud/src/datastore-emulator-container.test.ts) inside_block:datastoreExample
 <!--/codeinclude-->
-
+ 
 ---
 
 ### Cloud PubSub

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

@@ -1,48 +1,28 @@
 import { Datastore } from "@google-cloud/datastore";
 import { getImage } from "../../../testcontainers/src/utils/test-helper";
-import { DatastoreEmulatorContainer, StartedDatastoreEmulatorContainer } from "./datastore-emulator-container";
+import { DatastoreEmulatorContainer } from "./datastore-emulator-container";
 
 const IMAGE = getImage(__dirname);
 
 describe("DatastoreEmulatorContainer", { timeout: 240_000 }, () => {
-  // datastore4 {
-  it("should work using default version", async () => {
-    await using datastoreEmulatorContainer = await new DatastoreEmulatorContainer(IMAGE).start();
-
-    await checkDatastore(datastoreEmulatorContainer);
-  });
-  // }
-
-  // datastore5 {
-  it("should work using version 468.0.0", async () => {
-    await using datastoreEmulatorContainer = await new DatastoreEmulatorContainer(
-      "gcr.io/google.com/cloudsdktool/google-cloud-cli:468.0.0-emulators"
-    ).start();
-
-    await checkDatastore(datastoreEmulatorContainer);
-  });
-
-  // }
-
-  async function checkDatastore(datastoreEmulatorContainer: StartedDatastoreEmulatorContainer) {
-    expect(datastoreEmulatorContainer).toBeDefined();
-    const testProjectId = "test-project";
-    const testKind = "test-kind";
-    const testId = "123";
-    const databaseConfig = {
-      projectId: testProjectId,
-      apiEndpoint: datastoreEmulatorContainer.getEmulatorEndpoint(),
-    };
-    const datastore = new Datastore(databaseConfig);
-
-    const key = datastore.key([testKind, testId]);
-    const data = { message: "Hello, Datastore!" };
-    await datastore.save({ key, data });
-    const [entity] = await datastore.get(key);
-
-    expect(entity).toEqual({
-      message: "Hello, Datastore!",
-      [Datastore.KEY]: key,
-    });
-  }
+  it.each([IMAGE, "gcr.io/google.com/cloudsdktool/google-cloud-cli:468.0.0-emulators"])(
+    "should work with %s",
+    async (image) => {
+      // datastoreExample {
+      await using container = await new DatastoreEmulatorContainer(image).start();
+
+      const datastore = new Datastore({
+        projectId: "test-project",
+        apiEndpoint: container.getEmulatorEndpoint(),
+      });
+
+      const key = datastore.key(["test-kind", "123"]);
+      const data = { message: "Hello, Datastore!" };
+      await datastore.save({ key, data });
+      const [entity] = await datastore.get(key);
+
+      expect(entity).toEqual({ message: "Hello, Datastore!", [Datastore.KEY]: key });
+      // }
+    }
+  );
 });

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

@@ -13,12 +13,11 @@ describe("FirestoreEmulatorContainer", { timeout: 240_000 }, () => {
       const collection = "test-collection";
       const document = "test-doc";
 
-      await using firestoreEmulatorContainer = await new FirestoreEmulatorContainer(image).start();
+      await using container = await new FirestoreEmulatorContainer(image).start();
 
       const firestore = admin.initializeApp({ projectId: "test-project" }, `test-app-${randomUuid()}`).firestore();
-
       firestore.settings({
-        host: firestoreEmulatorContainer.getEmulatorEndpoint(),
+        host: container.getEmulatorEndpoint(),
         ssl: false,
       });