Set FIREBASE_DATA_CONNECT_EMUALTOR_HOSTinstead of FIREBASE_DATACONNECT_EMUALTOR_HOST (#8371)

* Fix typo in FIREBASE_DATA_CONNECT_EMULATOR_HOST and cleaned up error handling

* Changelog

* Update CHANGELOG.md

Co-authored-by: Maneesh Tewani <maneesht@users.noreply.github.com>

* Update src/emulator/env.ts

Co-authored-by: Maneesh Tewani <maneesht@users.noreply.github.com>

---------

Co-authored-by: Maneesh Tewani <maneesht@users.noreply.github.com>

Author: joehan

CHANGELOG.md

@@ -11,6 +11,7 @@
 - `apphosting:secrets:grantAccess` can now grant access to emails and can grant multiple secrets at once (#8357)
 - `apphosting:secrets:set` now has flows to help with test secrets (#8359)
 - Updated `init dataconnect` templates to `v1`.
+- Fixed a bug where the emulator suite would set `FIREBASE_DATACONNECT_EMULATOR_HOST` instead of `FIREBASE_DATA_CONNECT_EMULATOR_HOST`.
 - Fixed a bug in Auth emulator where accounts:lookup is case-sensitive for emails (#8344)
 - Fixed a bug where function deploys didn't support shorthand notation and parameterized service account (#8366)
 - Fixed an issue where `sql:setup` would incorrectly remove the `cloudsqlsuperuser` role from `firebasesuperuser` (#8363)

src/emulator/constants.ts

@@ -77,7 +77,7 @@ export class Constants {
   static FIREBASE_DATABASE_EMULATOR_HOST = "FIREBASE_DATABASE_EMULATOR_HOST";
 
   // Environment variable to discover the Data Connect emulator.
-  static FIREBASE_DATACONNECT_EMULATOR_HOST = "FIREBASE_DATACONNECT_EMULATOR_HOST";
+  static FIREBASE_DATACONNECT_EMULATOR_HOST = "FIREBASE_DATA_CONNECT_EMULATOR_HOST";
 
   // Environment variable to override SDK/CLI to point at the Firebase Auth emulator.
   static FIREBASE_AUTH_EMULATOR_HOST = "FIREBASE_AUTH_EMULATOR_HOST";

src/emulator/dataconnect/pgliteServer.ts

@@ -17,7 +17,7 @@ import {
 } from "./pg-gateway/index";
 import { fromNodeSocket } from "./pg-gateway/platforms/node";
 import { logger } from "../../logger";
-import { hasMessage } from "../../error";
+import { hasMessage, FirebaseError } from "../../error";
 import { StringDecoder } from "node:string_decoder";
 
 export const TRUNCATE_TABLES_SQL = `
@@ -140,7 +140,8 @@ export class PostgresServer {
         const db = await PGlite.create(pgliteArgs);
         return db;
       }
-      throw err;
+      logger.debug(`Error from pglite: ${err}`);
+      throw new FirebaseError("Unexpected error starting up Postgres.");
     }
   }
 

src/emulator/env.ts

@@ -45,7 +45,10 @@ export function setEnvVarsForEmulators(
         env[Constants.CLOUD_TASKS_EMULATOR_HOST] = host;
         break;
       case Emulators.DATACONNECT:
-        env[Constants.FIREBASE_DATACONNECT_EMULATOR_HOST] = host;
+        env[Constants.FIREBASE_DATACONNECT_EMULATOR_HOST] = `http://${host}`;
+        // Originally, there was a typo in this env var name. To avoid breaking folks unecessarily,
+        // we'll keep setting this.
+        env["FIREBASE_DATACONNECT_EMULATOR_HOST"] = host;
     }
   }
 }