From ea8395eed33c3ce2700df313547f96b707e15604 Mon Sep 17 00:00:00 2001 From: Reza Date: Mon, 4 Jan 2021 18:34:57 -0500 Subject: [PATCH 1/2] #829 fixing issue reading env.DATABASE_URL and env.STORAGE_BUCKET_URL --- src/setup.ts | 68 ++++++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/src/setup.ts b/src/setup.ts index d2935af15..f4888946f 100644 --- a/src/setup.ts +++ b/src/setup.ts @@ -26,42 +26,42 @@ import { warn } from './logger'; // Set up for config and vars export function setup() { - // TEMPORARY WORKAROUND (BUG 63586213): - // Until the Cloud Functions builder can publish FIREBASE_CONFIG, automatically provide it on import based on what - // we can deduce. - if (!process.env.FIREBASE_CONFIG) { - const cfg = firebaseConfig(); - if (cfg) { - process.env.FIREBASE_CONFIG = JSON.stringify(cfg); + // TEMPORARY WORKAROUND (BUG 63586213): + // Until the Cloud Functions builder can publish FIREBASE_CONFIG, automatically provide it on import based on what + // we can deduce. + if (!process.env.FIREBASE_CONFIG) { + const cfg = firebaseConfig(); + if (cfg) { + process.env.FIREBASE_CONFIG = JSON.stringify(cfg); + } } - } - // WORKAROUND (BUG 134416569): GCLOUD_PROJECT missing in Node 10 - if (!process.env.GCLOUD_PROJECT && process.env.FIREBASE_CONFIG) { - process.env.GCLOUD_PROJECT = JSON.parse( - process.env.FIREBASE_CONFIG - ).projectId; - } + // WORKAROUND (BUG 134416569): GCLOUD_PROJECT missing in Node 10 + if (!process.env.GCLOUD_PROJECT && process.env.FIREBASE_CONFIG) { + process.env.GCLOUD_PROJECT = JSON.parse( + process.env.FIREBASE_CONFIG + ).projectId; + } - // If FIREBASE_CONFIG is still not found, try using GCLOUD_PROJECT to estimate - if (!process.env.FIREBASE_CONFIG) { - if (process.env.GCLOUD_PROJECT) { - warn( - 'Warning, estimating Firebase Config based on GCLOUD_PROJECT. Initializing firebase-admin may fail' - ); - process.env.FIREBASE_CONFIG = JSON.stringify({ - databaseURL: - `${process.env.DATABASE_URL}` || - `https://${process.env.GCLOUD_PROJECT}.firebaseio.com`, - storageBucket: - `${process.env.STORAGE_BUCKET_URL}` || - `${process.env.GCLOUD_PROJECT}.appspot.com`, - projectId: process.env.GCLOUD_PROJECT, - }); - } else { - warn( - 'Warning, FIREBASE_CONFIG and GCLOUD_PROJECT environment variables are missing. Initializing firebase-admin will fail' - ); + // If FIREBASE_CONFIG is still not found, try using GCLOUD_PROJECT to estimate + if (!process.env.FIREBASE_CONFIG) { + if (process.env.GCLOUD_PROJECT) { + warn( + 'Warning, estimating Firebase Config based on GCLOUD_PROJECT. Initializing firebase-admin may fail' + ); + process.env.FIREBASE_CONFIG = JSON.stringify({ + databaseURL: + process.env.DATABASE_URL || + `https://${process.env.GCLOUD_PROJECT}.firebaseio.com`, + storageBucket: + process.env.STORAGE_BUCKET_URL || + `${process.env.GCLOUD_PROJECT}.appspot.com`, + projectId: process.env.GCLOUD_PROJECT, + }); + } else { + warn( + 'Warning, FIREBASE_CONFIG and GCLOUD_PROJECT environment variables are missing. Initializing firebase-admin will fail' + ); + } } - } } From 9e02b68de77818d07c762c5626b3d07a447a4e89 Mon Sep 17 00:00:00 2001 From: Reza Date: Mon, 4 Jan 2021 18:36:30 -0500 Subject: [PATCH 2/2] #829 revert space changes --- src/setup.ts | 68 ++++++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/src/setup.ts b/src/setup.ts index f4888946f..6a9db702d 100644 --- a/src/setup.ts +++ b/src/setup.ts @@ -26,42 +26,42 @@ import { warn } from './logger'; // Set up for config and vars export function setup() { - // TEMPORARY WORKAROUND (BUG 63586213): - // Until the Cloud Functions builder can publish FIREBASE_CONFIG, automatically provide it on import based on what - // we can deduce. - if (!process.env.FIREBASE_CONFIG) { - const cfg = firebaseConfig(); - if (cfg) { - process.env.FIREBASE_CONFIG = JSON.stringify(cfg); - } + // TEMPORARY WORKAROUND (BUG 63586213): + // Until the Cloud Functions builder can publish FIREBASE_CONFIG, automatically provide it on import based on what + // we can deduce. + if (!process.env.FIREBASE_CONFIG) { + const cfg = firebaseConfig(); + if (cfg) { + process.env.FIREBASE_CONFIG = JSON.stringify(cfg); } + } - // WORKAROUND (BUG 134416569): GCLOUD_PROJECT missing in Node 10 - if (!process.env.GCLOUD_PROJECT && process.env.FIREBASE_CONFIG) { - process.env.GCLOUD_PROJECT = JSON.parse( - process.env.FIREBASE_CONFIG - ).projectId; - } + // WORKAROUND (BUG 134416569): GCLOUD_PROJECT missing in Node 10 + if (!process.env.GCLOUD_PROJECT && process.env.FIREBASE_CONFIG) { + process.env.GCLOUD_PROJECT = JSON.parse( + process.env.FIREBASE_CONFIG + ).projectId; + } - // If FIREBASE_CONFIG is still not found, try using GCLOUD_PROJECT to estimate - if (!process.env.FIREBASE_CONFIG) { - if (process.env.GCLOUD_PROJECT) { - warn( - 'Warning, estimating Firebase Config based on GCLOUD_PROJECT. Initializing firebase-admin may fail' - ); - process.env.FIREBASE_CONFIG = JSON.stringify({ - databaseURL: - process.env.DATABASE_URL || - `https://${process.env.GCLOUD_PROJECT}.firebaseio.com`, - storageBucket: - process.env.STORAGE_BUCKET_URL || - `${process.env.GCLOUD_PROJECT}.appspot.com`, - projectId: process.env.GCLOUD_PROJECT, - }); - } else { - warn( - 'Warning, FIREBASE_CONFIG and GCLOUD_PROJECT environment variables are missing. Initializing firebase-admin will fail' - ); - } + // If FIREBASE_CONFIG is still not found, try using GCLOUD_PROJECT to estimate + if (!process.env.FIREBASE_CONFIG) { + if (process.env.GCLOUD_PROJECT) { + warn( + 'Warning, estimating Firebase Config based on GCLOUD_PROJECT. Initializing firebase-admin may fail' + ); + process.env.FIREBASE_CONFIG = JSON.stringify({ + databaseURL: + process.env.DATABASE_URL || + `https://${process.env.GCLOUD_PROJECT}.firebaseio.com`, + storageBucket: + process.env.STORAGE_BUCKET_URL || + `${process.env.GCLOUD_PROJECT}.appspot.com`, + projectId: process.env.GCLOUD_PROJECT, + }); + } else { + warn( + 'Warning, FIREBASE_CONFIG and GCLOUD_PROJECT environment variables are missing. Initializing firebase-admin will fail' + ); } + } }