Support FIRESTORE_EMULATOR_HOST variable (#1376)

firebase · Jun 7, 2019 · 62a7fcb · 62a7fcb
1 parent e36933b
commit 62a7fcb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -0,0 +1 @@
+* Set FIRESTORE_EMULATOR_HOST env var in "emulators:exec".
diff --git a/src/commands/emulators-exec.ts b/src/commands/emulators-exec.ts
@@ -21,8 +21,10 @@ async function runScript(script: string): Promise<void> {
   const firestoreInstance = EmulatorRegistry.get(Emulators.FIRESTORE);
   if (firestoreInstance) {
     const info = firestoreInstance.getInfo();
-    const hostString = `${info.host}:${info.port}`;
-    env[FirestoreEmulator.FIRESTORE_EMULATOR_ENV] = hostString;
+    const address = `${info.host}:${info.port}`;
+
+    env[FirestoreEmulator.FIRESTORE_EMULATOR_ENV] = address;
+    env[FirestoreEmulator.FIRESTORE_EMULATOR_ENV_ALT] = address;
   }
 
   const proc = childProcess.spawn(script, {

diff --git a/src/emulator/firestoreEmulator.ts b/src/emulator/firestoreEmulator.ts
@@ -11,7 +11,8 @@ export interface FirestoreEmulatorArgs {
 }
 
 export class FirestoreEmulator implements EmulatorInstance {
-  static FIRESTORE_EMULATOR_ENV = "FIREBASE_FIRESTORE_EMULATOR_ADDRESS";
+  static FIRESTORE_EMULATOR_ENV = "FIRESTORE_EMULATOR_HOST";
+  static FIRESTORE_EMULATOR_ENV_ALT = "FIREBASE_FIRESTORE_EMULATOR_ADDRESS";
 
   constructor(private args: FirestoreEmulatorArgs) {}