Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/emulator/functionsEmulator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ export function InvokeRuntime(
JSON.stringify(frb),
opts.serializedTriggers || "",
],
{ env: { node: nodeBinary, ...opts.env }, cwd: frb.cwd }
{ env: { node: nodeBinary, ...opts.env, ...process.env }, cwd: frb.cwd }
);

const buffers: {
Expand Down
12 changes: 11 additions & 1 deletion src/emulator/functionsEmulatorRuntime.ts
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,16 @@ function InitializeFirebaseAdminStubs(frb: FunctionsRuntimeBundle): typeof admin

let hasInitializedSettings = false;
const initializeSettings = (app: admin.app.App, userSettings: any) => {
const isEnabled = isFeatureEnabled(frb, "admin_stubs");

if (!isEnabled) {
if (!hasInitializedSettings) {
app.firestore().settings(userSettings);
hasInitializedSettings = true;
}
return;
}

if (!hasInitializedSettings && frb.ports.firestore) {
app.firestore().settings({
projectId: frb.projectId,
Expand Down Expand Up @@ -620,7 +630,7 @@ function isFeatureEnabled(
frb: FunctionsRuntimeBundle,
feature: keyof FunctionsRuntimeFeatures
): boolean {
return frb.disabled_features ? frb.disabled_features[feature] || false : true;
return frb.disabled_features ? !frb.disabled_features[feature] : true;
}

async function main(): Promise<void> {
Expand Down
1 change: 1 addition & 0 deletions src/emulator/functionsEmulatorShared.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export interface FunctionsRuntimeFeatures {
timeout?: boolean;
memory_limiting?: boolean;
protect_env?: boolean;
admin_stubs?: boolean;
}

const memoryLookup = {
Expand Down
2 changes: 2 additions & 0 deletions src/serve/functions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ module.exports = {
network_filtering: true,
timeout: true,
memory_limiting: true,
protect_env: true,
admin_stubs: true,
},
})
);
Expand Down