Remove some remaining traces of mondomob and gae-js

mondo-mob · Dec 8, 2023 · 1086a97 · 1086a97
1 parent 51bd5d6
commit 1086a97
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 265 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/...src/configuration/__test/config/jest.json → ...src/configuration/__test/config/test.json b/...src/configuration/__test/config/jest.json → ...src/configuration/__test/config/test.json
diff --git a/...nfiguration/__test/invalid-json/jest.json → ...nfiguration/__test/invalid-json/test.json b/...nfiguration/__test/invalid-json/jest.json → ...nfiguration/__test/invalid-json/test.json
diff --git a/...configuration/__test/no-default/jest.json → ...configuration/__test/no-default/test.json b/...configuration/__test/no-default/jest.json → ...configuration/__test/no-default/test.json
diff --git a/...uration/__test/with-environment/jest.json → ...uration/__test/with-environment/test.json b/...uration/__test/with-environment/jest.json → ...uration/__test/with-environment/test.json
diff --git a/packages/gcp-core/src/configuration/configuration.test.ts b/packages/gcp-core/src/configuration/configuration.test.ts
@@ -18,7 +18,7 @@ type Config = z.infer<typeof configSchema>;
 const validator = zodValidator(configSchema);
 
 const withOptions = (overrides?: Partial<ConfigurationOptions<Config>>): ConfigurationOptions<Config> => ({
-  projectId: "gae-js-jest",
+  projectId: "gcp-core-test",
   validator,
   ...overrides,
 });
@@ -43,8 +43,8 @@ describe("configuration", () => {
         const config = await initialiseConfiguration(withOptions());
 
         expect(config).toEqual({
-          projectId: "gae-js-jest",
-          environment: "jest",
+          projectId: "gcp-core-test",
+          environment: "test",
           customString: "config environment file string",
         });
       });
@@ -53,8 +53,8 @@ describe("configuration", () => {
         const config = await initialiseConfiguration(fromDir("with-environment"));
 
         expect(config).toEqual({
-          projectId: "gae-js-jest",
-          environment: "jest",
+          projectId: "gcp-core-test",
+          environment: "test",
           customString: "with-environment environment file string",
         });
       });
@@ -63,8 +63,8 @@ describe("configuration", () => {
         const config = await initialiseConfiguration(fromDir("no-environment"));
 
         expect(config).toEqual({
-          projectId: "gae-js-jest",
-          environment: "jest",
+          projectId: "gcp-core-test",
+          environment: "test",
           customString: "default string",
         });
       });
@@ -73,8 +73,8 @@ describe("configuration", () => {
         const config = await initialiseConfiguration(fromDir("no-default"));
 
         expect(config).toEqual({
-          projectId: "gae-js-jest",
-          environment: "jest",
+          projectId: "gcp-core-test",
+          environment: "test",
           customString: "no-default environment file string",
         });
       });
@@ -85,8 +85,8 @@ describe("configuration", () => {
         );
 
         expect(config).toEqual({
-          projectId: "gae-js-jest",
-          environment: "jest",
+          projectId: "gcp-core-test",
+          environment: "test",
           customString: "options string",
         });
       });
@@ -106,7 +106,7 @@ describe("configuration", () => {
       });
 
       it(
-        "resolves projectId from gae-js environment variable",
+        "resolves projectId from gcp-core environment variable",
         withEnvVars({ [ENV_VAR_PROJECT]: "proj-envvar" }, async () => {
           const config = await initialiseConfiguration(withOptions({ projectId: undefined }));
 
@@ -153,7 +153,7 @@ describe("configuration", () => {
           })
         );
 
-        expect(config.environment).toBe("gae-js");
+        expect(config.environment).toBe("gcp-co");
       });
     });
 
@@ -174,12 +174,12 @@ describe("configuration", () => {
             const config = await initialiseConfiguration(withOptions());
 
             expect(config).toEqual({
-              projectId: "gae-js-jest",
-              environment: "jest",
+              projectId: "gcp-core-test",
+              environment: "test",
               customString: "top secret value",
             });
             expect(accessSecretVersionSpy).toHaveBeenCalledWith({
-              name: "projects/gae-js-jest/secrets/MY_SECRET/versions/latest",
+              name: "projects/gcp-core-test/secrets/MY_SECRET/versions/latest",
             });
           }
         )
@@ -196,8 +196,8 @@ describe("configuration", () => {
     it("returns config when validator passes", async () => {
       const config = await initialiseConfiguration(withOptions({ validator: alwaysPasses }));
       expect(config).toEqual({
-        projectId: "gae-js-jest",
-        environment: "jest",
+        projectId: "gcp-core-test",
+        environment: "test",
         customString: "config environment file string",
       });
     });
@@ -224,8 +224,8 @@ describe("configuration", () => {
       );
 
       expect(config).toEqual({
-        projectId: "gae-js-jest",
-        environment: "jest",
+        projectId: "gcp-core-test",
+        environment: "test",
         customString: "long top secret value",
       });
     });
@@ -236,13 +236,13 @@ describe("configuration", () => {
       customString: "env var string",
     });
     const config = await initialiseConfiguration({
-      projectId: "gae-js-jest",
+      projectId: "gcp-core-test",
       validator,
       configDir: `${__dirname}/__test/with-environment`,
     });
     expect(config).toEqual({
-      projectId: "gae-js-jest",
-      environment: "jest",
+      projectId: "gcp-core-test",
+      environment: "test",
       customString: "env var string",
     });
   });
@@ -252,16 +252,16 @@ describe("configuration", () => {
       customString: "env var string",
     });
     const config = await initialiseConfiguration({
-      projectId: "gae-js-jest",
+      projectId: "gcp-core-test",
       validator,
       configDir: `${__dirname}/__test/with-environment`,
       overrides: {
         customString: "options string",
       },
     });
     expect(config).toEqual({
-      projectId: "gae-js-jest",
-      environment: "jest",
+      projectId: "gcp-core-test",
+      environment: "test",
       customString: "options string",
     });
   });