Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 27, 2017
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74e5328
Overload process.env.CLOUD_RUNTIME_CONFIG to be JSON or path to JSON
Dec 21, 2017
2b063aa
Overload env.CLOUD_RUNTIME_CONFIG
Dec 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions spec/config.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
});
});
14 changes: 8 additions & 6 deletions src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.');
Expand Down