Gcloud

Author: cristianrgreco

docs/modules/gcloud.md

@@ -76,25 +76,25 @@ Choose an image from the [container registry](https://hub.docker.com/r/fsouza/fa
 
 These examples use the following libraries:
 
-- [@google-cloud/datastore](https://www.npmjs.com/package/@google-cloud/datastore)
+- [@google-cloud/spanner](https://www.npmjs.com/package/@google-cloud/spanner)
 
-        npm install @google-cloud/datastore
+        npm install @google-cloud/spanner
 
 Choose an image from the [container registry](https://gcr.io/cloud-spanner-emulator/emulator:1.5.37) and substitute `IMAGE`.
 
-#### Default
-
+#### Connect via client
+ 
 <!--codeinclude-->
 [](../../packages/modules/gcloud/src/spanner-emulator-container.test.ts) inside_block:startupWithExplicitClient
 <!--/codeinclude-->
 
-#### With environment variable
+#### Connect via environment 
 
 <!--codeinclude-->
 [](../../packages/modules/gcloud/src/spanner-emulator-container.test.ts) inside_block:startupWithEnvironmentVariable
 <!--/codeinclude-->
 
-#### Helper
+#### Helper usage
 
 <!--codeinclude-->
 [](../../packages/modules/gcloud/src/spanner-emulator-helper.test.ts) inside_block:createAndDelete

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

@@ -6,52 +6,47 @@ import { SpannerEmulatorContainer } from "./spanner-emulator-container";
 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 () => {
+    // startupWithExplicitClient {
     await using container = await new SpannerEmulatorContainer(IMAGE).withProjectId("test-project").start();
 
-    const client = new Spanner({
+    const spanner = new Spanner({
       projectId: container.getProjectId(),
       apiEndpoint: container.getHost(),
       port: container.getGrpcPort(),
       sslCreds: container.getSslCredentials(),
     });
 
-    // list instance configs
-    const admin = client.getInstanceAdminClient();
+    const admin = spanner.getInstanceAdminClient();
     const [configs] = await admin.listInstanceConfigs({
       parent: admin.projectPath(container.getProjectId()),
     });
 
-    // emulator always includes "emulator-config"
     const expectedConfigName = admin.instanceConfigPath(container.getProjectId(), "emulator-config");
     expect(configs.map((c) => c.name)).toContain(expectedConfigName);
+    // }
   });
-  // }
 
   describe.sequential("Shared state", () => {
     afterEach(() => {
       process.env.SPANNER_EMULATOR_HOST = "";
     });
 
-    // startupWithEnvironmentVariable {
     it("should start, expose endpoints and accept real client connections using projectId and SPANNER_EMULATOR_HOST", async () => {
       await using container = await new SpannerEmulatorContainer(IMAGE).withProjectId("test-project").start();
 
-      // configure the client to talk to our emulator
+      // startupWithEnvironmentVariable {
       process.env.SPANNER_EMULATOR_HOST = container.getEmulatorGrpcEndpoint();
-      const client = new Spanner({ projectId: container.getProjectId() });
+      const spanner = new Spanner({ projectId: container.getProjectId() });
+      // }
 
-      // list instance configs
-      const admin = client.getInstanceAdminClient();
+      const admin = spanner.getInstanceAdminClient();
       const [configs] = await admin.listInstanceConfigs({
         parent: admin.projectPath(container.getProjectId()),
       });
 
-      // emulator always includes "emulator-config"
       const expectedConfigName = admin.instanceConfigPath(container.getProjectId(), "emulator-config");
       expect(configs.map((c) => c.name)).toContain(expectedConfigName);
     });
-    // }
   });
 });

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

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