Overload process.env.CLOUD_RUNTIME_CONFIG to be JSON or path to JSON (#155)

Author: laurenzlong

spec/config.spec.ts

@@ -86,4 +86,21 @@ describe('config()', () => {
     expect(loaded).to.have.property('firebase');
     expect(loaded).to.have.property('foo','bar');
   });
+
+  it('accepts full JSON in env.CLOUD_RUNTIME_CONFIG', () => {
+    process.env.CLOUD_RUNTIME_CONFIG = JSON.stringify({foo: 'bar', firebase:{} });
+    let loaded = config();
+    expect(loaded).to.have.property('firebase');
+    expect(loaded).to.have.property('foo', 'bar');
+  });
+
+  it('behaves well when both env.CLOUD_RUNTIME_CONFIG and env.FIREBASE_PROJECT are set', () => {
+    process.env.CLOUD_RUNTIME_CONFIG = JSON.stringify({ foo: 'bar' });
+    process.env.FIREBASE_PROJECT = JSON.stringify({
+      databaseURL: 'foo@firebaseio.com',
+    });
+    let loaded = config();
+    expect(loaded.firebase).to.have.property('databaseURL', 'foo@firebaseio.com');
+    expect(loaded).to.have.property('foo', 'bar');
+  });
 });

src/config.ts

@@ -42,20 +42,22 @@ export namespace config {
 }
 
 function init (credential: firebase.credential.Credential) {
-  let loadedFromFile = {};
   let firebaseEnv = {};
   if (process.env.FIREBASE_PROJECT) {
     firebaseEnv = { firebase: JSON.parse(process.env.FIREBASE_PROJECT) };
   }
+  let merged = firebaseEnv;
 
   try {
-    let path = process.env.CLOUD_RUNTIME_CONFIG || '../../../.runtimeconfig.json';
-    loadedFromFile = require(path);
+    merged = _.merge({}, JSON.parse(process.env.CLOUD_RUNTIME_CONFIG), firebaseEnv);
   } catch (e) {
-    // Do nothing
+    try {
+      let path = process.env.CLOUD_RUNTIME_CONFIG || '../../../.runtimeconfig.json';
+      merged = _.merge({}, require(path), firebaseEnv);
+    } catch (e) {
+      // Do nothing
+    }
   }
-  let merged= _.merge({}, loadedFromFile, firebaseEnv);
-
   if (!hasFirebase(merged)) {
     throw new Error('Firebase config variables are not available. ' +
     'Please use the latest version of the Firebase CLI to deploy this function.');