firebase-tools 10.5.0 → 10.6.0

package/lib/commands/functions-secrets-destroy.js

@@ -1,21 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const command_1 = require("../command");
-const logger_1 = require("../logger");
 const projectUtils_1 = require("../projectUtils");
 const secretManager_1 = require("../gcp/secretManager");
 const prompt_1 = require("../prompt");
+const utils_1 = require("../utils");
 const secrets = require("../functions/secrets");
+const backend = require("../deploy/functions/backend");
 exports.default = new command_1.Command("functions:secrets:destroy <KEY>[@version]")
     .description("Destroy a secret. Defaults to destroying the latest version.")
     .withForce("Destroys a secret without confirmation.")
     .action(async (key, options) => {
     const projectId = (0, projectUtils_1.needProjectId)(options);
+    const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);
+    const haveBackend = await backend.existingBackend({ projectId });
     let [name, version] = key.split("@");
     if (!version) {
         version = "latest";
     }
     const sv = await (0, secretManager_1.getSecretVersion)(projectId, name, version);
+    if (sv.state === "DESTROYED") {
+        (0, utils_1.logBullet)(`Secret ${sv.secret.name}@${version} is already destroyed. Nothing to do.`);
+        return;
+    }
+    const boundEndpoints = backend
+        .allEndpoints(haveBackend)
+        .filter((e) => secrets.inUse({ projectId, projectNumber }, sv.secret, e));
+    if (boundEndpoints.length > 0) {
+        const endpointsMsg = boundEndpoints
+            .map((e) => `${e.id}[${e.platform}](${e.region})`)
+            .join("\t\n");
+        (0, utils_1.logWarning)(`Secret ${name}@${version} is currently in use by following functions:\n\t${endpointsMsg}`);
+        if (!options.force) {
+            (0, utils_1.logWarning)("Refusing to destroy secret in use. Use -f to destroy the secret anyway.");
+            return;
+        }
+    }
     if (!options.force) {
         const confirm = await (0, prompt_1.promptOnce)({
             name: "destroy",
@@ -28,12 +48,12 @@ exports.default = new command_1.Command("functions:secrets:destroy <KEY>[@versio
         }
     }
     await (0, secretManager_1.destroySecretVersion)(projectId, name, version);
-    logger_1.logger.info(`Destroyed secret version ${name}@${sv.versionId}`);
+    (0, utils_1.logBullet)(`Destroyed secret version ${name}@${sv.versionId}`);
     const secret = await (0, secretManager_1.getSecret)(projectId, name);
     if (secrets.isFirebaseManaged(secret)) {
         const versions = await (0, secretManager_1.listSecretVersions)(projectId, name);
         if (versions.filter((v) => v.state === "ENABLED").length === 0) {
-            logger_1.logger.info(`No active secret versions left. Destroying secret ${name}`);
+            (0, utils_1.logBullet)(`No active secret versions left. Destroying secret ${name}`);
             await (0, secretManager_1.deleteSecret)(projectId, name);
         }
     }

package/lib/commands/functions-secrets-prune.js

@@ -10,6 +10,7 @@ const utils_1 = require("../utils");
 const prompt_1 = require("../prompt");
 const secretManager_1 = require("../gcp/secretManager");
 exports.default = new command_1.Command("functions:secrets:prune")
+    .withForce("Destroys unused secrets without prompt")
     .description("Destroys unused secrets")
     .before(requirePermissions_1.requirePermissions, [
     "cloudfunctions.functions.list",
@@ -32,18 +33,20 @@ exports.default = new command_1.Command("functions:secrets:prune")
     }
     (0, utils_1.logBullet)(`Found ${pruned.length} unused active secret versions:\n\t` +
         pruned.map((sv) => `${sv.secret}@${sv.version}`).join("\n\t"));
-    const confirm = await (0, prompt_1.promptOnce)({
-        name: "destroy",
-        type: "confirm",
-        default: true,
-        message: `Do you want to destroy unused secret versions?`,
-    }, options);
-    if (!confirm) {
-        (0, utils_1.logBullet)("Run the following commands to destroy each unused secret version:\n\t" +
-            pruned
-                .map((sv) => `firebase functions:secrets:destroy ${sv.secret}@${sv.version}`)
-                .join("\n\t"));
-        return;
+    if (!options.force) {
+        const confirm = await (0, prompt_1.promptOnce)({
+            name: "destroy",
+            type: "confirm",
+            default: true,
+            message: `Do you want to destroy unused secret versions?`,
+        }, options);
+        if (!confirm) {
+            (0, utils_1.logBullet)("Run the following commands to destroy each unused secret version:\n\t" +
+                pruned
+                    .map((sv) => `firebase functions:secrets:destroy ${sv.secret}@${sv.version}`)
+                    .join("\n\t"));
+            return;
+        }
     }
     await Promise.all(pruned.map((sv) => (0, secretManager_1.destroySecretVersion)(projectId, sv.secret, sv.version)));
     (0, utils_1.logSuccess)("Destroyed all unused secrets!");

package/lib/commands/functions-secrets-set.js

@@ -10,9 +10,11 @@ const prompt_1 = require("../prompt");
 const utils_1 = require("../utils");
 const projectUtils_1 = require("../projectUtils");
 const secretManager_1 = require("../gcp/secretManager");
+const secrets = require("../functions/secrets");
+const backend = require("../deploy/functions/backend");
 exports.default = new command_1.Command("functions:secrets:set <KEY>")
-    .description("Create or update a secret for use in Cloud Functions for Firebase")
-    .withForce("Does not ensure input keys are valid or upgrade existing secrets to have Firebase manage them.")
+    .description("Create or update a secret for use in Cloud Functions for Firebase.")
+    .withForce("Automatically updates functions to use the new secret.")
     .before(requirePermissions_1.requirePermissions, [
     "secretmanager.secrets.create",
     "secretmanager.secrets.get",
@@ -22,6 +24,7 @@ exports.default = new command_1.Command("functions:secrets:set <KEY>")
     .option("--data-file <dataFile>", 'File path from which to read secret data. Set to "-" to read the secret data from stdin.')
     .action(async (unvalidatedKey, options) => {
     const projectId = (0, projectUtils_1.needProjectId)(options);
+    const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);
     const key = await (0, secrets_1.ensureValidKey)(unvalidatedKey, options);
     const secret = await (0, secrets_1.ensureSecret)(projectId, key, options);
     let secretValue;
@@ -41,6 +44,50 @@ exports.default = new command_1.Command("functions:secrets:set <KEY>")
     }
     const secretVersion = await (0, secretManager_1.addVersion)(projectId, key, secretValue);
     (0, utils_1.logSuccess)(`Created a new secret version ${(0, secretManager_1.toSecretVersionResourceName)(secretVersion)}`);
-    (0, utils_1.logBullet)("Please deploy your functions for the change to take effect by running:\n\t" +
-        clc.bold("firebase deploy --only functions"));
+    if (!secrets.isFirebaseManaged(secret)) {
+        (0, utils_1.logBullet)("Please deploy your functions for the change to take effect by running:\n\t" +
+            clc.bold("firebase deploy --only functions"));
+        return;
+    }
+    const haveBackend = await backend.existingBackend({ projectId });
+    const endpointsToUpdate = backend
+        .allEndpoints(haveBackend)
+        .filter((e) => secrets.inUse({ projectId, projectNumber }, secret, e));
+    if (endpointsToUpdate.length === 0) {
+        return;
+    }
+    (0, utils_1.logBullet)(`${endpointsToUpdate.length} functions are using stale version of secret ${secret.name}:\n\t` +
+        endpointsToUpdate.map((e) => `${e.id}(${e.region})`).join("\n\t"));
+    if (!options.force) {
+        const confirm = await (0, prompt_1.promptOnce)({
+            name: "redeploy",
+            type: "confirm",
+            default: true,
+            message: `Do you want to re-deploy the functions and destroy the stale version of secret ${secret.name}?`,
+        }, options);
+        if (!confirm) {
+            (0, utils_1.logBullet)("Please deploy your functions for the change to take effect by running:\n\t" +
+                clc.bold("firebase deploy --only functions"));
+            return;
+        }
+    }
+    const updateOps = endpointsToUpdate.map(async (e) => {
+        (0, utils_1.logBullet)(`Updating function ${e.id}(${e.region})...`);
+        const updated = await secrets.updateEndpointSecret({ projectId, projectNumber }, secretVersion, e);
+        (0, utils_1.logBullet)(`Updated function ${e.id}(${e.region}).`);
+        return updated;
+    });
+    const updatedEndpoints = await Promise.all(updateOps);
+    (0, utils_1.logBullet)(`Pruning stale secrets...`);
+    const prunedResult = await (0, secrets_1.pruneAndDestroySecrets)({ projectId, projectNumber }, updatedEndpoints);
+    if (prunedResult.destroyed.length > 0) {
+        (0, utils_1.logBullet)(`Detroyed unused secret versions: ${prunedResult.destroyed
+            .map((s) => `${s.secret}@${s.version}`)
+            .join(", ")}`);
+    }
+    if (prunedResult.erred.length > 0) {
+        (0, utils_1.logWarning)(`Failed to destroy unused secret versions:\n\t${prunedResult.erred
+            .map((err) => err.message)
+            .join("\n\t")}`);
+    }
 });

package/lib/deploy/functions/backend.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compareFunctions = exports.findEventFilter = exports.missingEndpoint = exports.hasEndpoint = exports.regionalEndpoints = exports.matchingBackend = exports.findEndpoint = exports.someEndpoint = exports.allEndpoints = exports.checkAvailability = exports.existingBackend = exports.scheduleIdForFunction = exports.functionName = exports.isEmptyBackend = exports.of = exports.empty = exports.isTaskQueueTriggered = exports.isScheduleTriggered = exports.isEventTriggered = exports.isCallableTriggered = exports.isHttpsTriggered = exports.secretVersionName = exports.SCHEDULED_FUNCTION_LABEL = exports.MIN_MEMORY_FOR_CONCURRENCY = exports.DEFAULT_MEMORY = exports.memoryOptionDisplayName = exports.endpointTriggerType = void 0;
+exports.compareFunctions = exports.missingEndpoint = exports.hasEndpoint = exports.regionalEndpoints = exports.matchingBackend = exports.findEndpoint = exports.someEndpoint = exports.allEndpoints = exports.checkAvailability = exports.existingBackend = exports.scheduleIdForFunction = exports.functionName = exports.isEmptyBackend = exports.of = exports.empty = exports.isTaskQueueTriggered = exports.isScheduleTriggered = exports.isEventTriggered = exports.isCallableTriggered = exports.isHttpsTriggered = exports.secretVersionName = exports.SCHEDULED_FUNCTION_LABEL = exports.MIN_MEMORY_FOR_CONCURRENCY = exports.DEFAULT_MEMORY = exports.memoryOptionDisplayName = exports.endpointTriggerType = void 0;
 const gcf = require("../../gcp/cloudfunctions");
 const gcfV2 = require("../../gcp/cloudfunctionsv2");
 const utils = require("../../utils");
@@ -230,10 +230,6 @@ const missingEndpoint = (backend) => (endpoint) => {
     return !(0, exports.hasEndpoint)(backend)(endpoint);
 };
 exports.missingEndpoint = missingEndpoint;
-function findEventFilter(endpoint, attribute) {
-    return endpoint.eventTrigger.eventFilters.find((ef) => ef.attribute === attribute);
-}
-exports.findEventFilter = findEventFilter;
 function compareFunctions(left, right) {
     if (left.platform !== right.platform) {
         return right.platform < left.platform ? -1 : 1;

package/lib/deploy/functions/prepare.js

@@ -20,6 +20,7 @@ const triggerRegionHelper_1 = require("./triggerRegionHelper");
 const checkIam_1 = require("./checkIam");
 const error_1 = require("../../error");
 const projectConfig_1 = require("../../functions/projectConfig");
+const previews_1 = require("../../previews");
 function hasUserConfig(config) {
     return Object.keys(config).length > 1;
 }
@@ -96,12 +97,21 @@ async function prepare(context, options, payload) {
             clc.bold(sourceDirName) +
             " directory for uploading...");
     }
-    if (backend.someEndpoint(wantBackend, (e) => e.platform === "gcfv1")) {
-        context.functionsSourceV1 = await (0, prepareFunctionsUpload_1.prepareFunctionsUpload)(sourceDir, context.config, runtimeConfig);
-    }
     if (backend.someEndpoint(wantBackend, (e) => e.platform === "gcfv2")) {
+        if (!previews_1.previews.functionsv2) {
+            throw new error_1.FirebaseError("This version of firebase-tools does not support Google Cloud " +
+                "Functions gen 2\n" +
+                "If Cloud Functions for Firebase gen 2 is still in alpha, sign up " +
+                "for the alpha program at " +
+                "https://services.google.com/fb/forms/firebasealphaprogram/\n" +
+                "If Cloud Functions for Firebase gen 2 is in beta, get the latest " +
+                "version of Firebse Tools with `npm i -g firebase-tools@latest`");
+        }
         context.functionsSourceV2 = await (0, prepareFunctionsUpload_1.prepareFunctionsUpload)(sourceDir, context.config);
     }
+    if (backend.someEndpoint(wantBackend, (e) => e.platform === "gcfv1")) {
+        context.functionsSourceV1 = await (0, prepareFunctionsUpload_1.prepareFunctionsUpload)(sourceDir, context.config, runtimeConfig);
+    }
     for (const endpoint of backend.allEndpoints(wantBackend)) {
         endpoint.environmentVariables = wantBackend.environmentVariables;
     }

package/lib/deploy/functions/release/fabricator.js

@@ -124,9 +124,7 @@ class Fabricator {
         await this.setTrigger(endpoint);
     }
     async updateEndpoint(update, scraper) {
-        if (update.deleteAndRecreate || update.endpoint.platform !== "gcfv2") {
-            update.endpoint.labels = Object.assign(Object.assign({}, update.endpoint.labels), deploymentTool.labels());
-        }
+        update.endpoint.labels = Object.assign(Object.assign({}, update.endpoint.labels), deploymentTool.labels());
         if (update.deleteAndRecreate) {
             await this.deleteEndpoint(update.deleteAndRecreate);
             await this.createEndpoint(update.endpoint, scraper);

package/lib/deploy/functions/release/index.js

@@ -11,9 +11,12 @@ const fabricator = require("./fabricator");
 const reporter = require("./reporter");
 const executor = require("./executor");
 const prompts = require("../prompts");
+const secrets = require("../../../functions/secrets");
 const functionsConfig_1 = require("../../../functionsConfig");
 const functionsDeployHelper_1 = require("../functionsDeployHelper");
 const error_1 = require("../../../error");
+const projectUtils_1 = require("../../../projectUtils");
+const utils_1 = require("../../../utils");
 async function release(context, options, payload) {
     if (!context.config) {
         return;
@@ -59,6 +62,24 @@ async function release(context, options, payload) {
         const opts = allErrors.length === 1 ? { original: allErrors[0] } : { children: allErrors };
         throw new error_1.FirebaseError("There was an error deploying functions", Object.assign(Object.assign({}, opts), { exit: 2 }));
     }
+    else {
+        if (secrets.of(haveEndpoints).length > 0) {
+            const projectId = (0, projectUtils_1.needProjectId)(options);
+            const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);
+            const reloadedBackend = await backend.existingBackend({ projectId });
+            const prunedResult = await secrets.pruneAndDestroySecrets({ projectId, projectNumber }, backend.allEndpoints(reloadedBackend));
+            if (prunedResult.destroyed.length > 0) {
+                (0, utils_1.logLabeledBullet)("functions", `Destroyed unused secret versions: ${prunedResult.destroyed
+                    .map((s) => `${s.secret}@${s.version}`)
+                    .join(", ")}`);
+            }
+            if (prunedResult.erred.length > 0) {
+                (0, utils_1.logLabeledWarning)("functions", `Failed to destroy unused secret versions:\n\t${prunedResult.erred
+                    .map((err) => err.message)
+                    .join("\n\t")}`);
+            }
+        }
+    }
 }
 exports.release = release;
 function printTriggerUrls(results) {

package/lib/deploy/functions/release/planner.js

@@ -103,7 +103,6 @@ function changedTriggerRegion(want, have) {
 }
 exports.changedTriggerRegion = changedTriggerRegion;
 function changedV2PubSubTopic(want, have) {
-    var _a, _b;
     if (want.platform !== "gcfv2") {
         return false;
     }
@@ -122,7 +121,7 @@ function changedV2PubSubTopic(want, have) {
     if (have.eventTrigger.eventType !== v2events.PUBSUB_PUBLISH_EVENT) {
         return false;
     }
-    return (((_a = backend.findEventFilter(have, "topic")) === null || _a === void 0 ? void 0 : _a.value) !== ((_b = backend.findEventFilter(want, "topic")) === null || _b === void 0 ? void 0 : _b.value));
+    return have.eventTrigger.eventFilters.topic !== want.eventTrigger.eventFilters.topic;
 }
 exports.changedV2PubSubTopic = changedV2PubSubTopic;
 function upgradedScheduleFromV1ToV2(want, have) {

package/lib/deploy/functions/runtimes/discovery/v1alpha1.js

@@ -49,7 +49,7 @@ function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
         minInstances: "number",
         concurrency: "number",
         serviceAccountEmail: "string",
-        timeout: "string",
+        timeoutSeconds: "number",
         vpc: "object",
         labels: "object",
         ingressSettings: "string",
@@ -88,16 +88,18 @@ function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
         if (backend.isEventTriggered(ep)) {
             (0, parsing_1.requireKeys)(prefix + ".eventTrigger", ep.eventTrigger, "eventType", "eventFilters");
             (0, parsing_1.assertKeyTypes)(prefix + ".eventTrigger", ep.eventTrigger, {
-                eventFilters: "array",
+                eventFilters: "object",
+                eventFilterPathPatterns: "object",
                 eventType: "string",
                 retry: "boolean",
                 region: "string",
                 serviceAccountEmail: "string",
+                channel: "string",
             });
             triggered = { eventTrigger: ep.eventTrigger };
-            for (const eventFilter of triggered.eventTrigger.eventFilters) {
-                if (eventFilter.attribute === "topic" && !eventFilter.value.startsWith("projects/")) {
-                    eventFilter.value = `projects/${project}/topics/${eventFilter.value}`;
+            for (const [k, v] of Object.entries(triggered.eventTrigger.eventFilters)) {
+                if (k === "topic" && !v.startsWith("projects/")) {
+                    triggered.eventTrigger.eventFilters[k] = `projects/${project}/topics/${v}`;
                 }
             }
         }
@@ -134,7 +136,6 @@ function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
             });
             if (ep.taskQueueTrigger.rateLimits) {
                 (0, parsing_1.assertKeyTypes)(prefix + ".taskQueueTrigger.rateLimits", ep.taskQueueTrigger.rateLimits, {
-                    maxBurstSize: "number",
                     maxConcurrentDispatches: "number",
                     maxDispatchesPerSecond: "number",
                 });
@@ -142,9 +143,9 @@ function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
             if (ep.taskQueueTrigger.retryConfig) {
                 (0, parsing_1.assertKeyTypes)(prefix + ".taskQueueTrigger.retryConfig", ep.taskQueueTrigger.retryConfig, {
                     maxAttempts: "number",
-                    maxRetryDuration: "string",
-                    minBackoff: "string",
-                    maxBackoff: "string",
+                    maxRetrySeconds: "number",
+                    minBackoffSeconds: "number",
+                    maxBackoffSeconds: "number",
                     maxDoublings: "number",
                 });
             }
@@ -159,7 +160,7 @@ function parseEndpoints(manifest, id, project, defaultRegion, runtime) {
             region,
             project,
             runtime, entryPoint: ep.entryPoint }, triggered);
-        (0, proto_1.copyIfPresent)(parsed, ep, "availableMemoryMb", "maxInstances", "minInstances", "concurrency", "serviceAccountEmail", "timeout", "vpc", "labels", "ingressSettings", "environmentVariables");
+        (0, proto_1.copyIfPresent)(parsed, ep, "availableMemoryMb", "maxInstances", "minInstances", "concurrency", "serviceAccountEmail", "timeoutSeconds", "vpc", "labels", "ingressSettings", "environmentVariables");
         allParsed.push(parsed);
     }
     return allParsed;

package/lib/deploy/functions/runtimes/node/index.js

@@ -17,7 +17,7 @@ const discovery = require("../discovery");
 const validate = require("./validate");
 const versioning = require("./versioning");
 const parseTriggers = require("./parseTriggers");
-const MIN_FUNCTIONS_SDK_VERSION = "3.19.0";
+const MIN_FUNCTIONS_SDK_VERSION = "3.20.0";
 async function tryCreateDelegate(context) {
     const packageJsonPath = path.join(context.sourceDir, "package.json");
     if (!(await (0, util_1.promisify)(fs.exists)(packageJsonPath))) {

package/lib/deploy/functions/runtimes/node/parseTriggers.js

@@ -113,31 +113,16 @@ function addResourcesToBackend(projectId, runtime, annotation, want) {
             triggered = {
                 eventTrigger: {
                     eventType: annotation.eventTrigger.eventType,
-                    eventFilters: [
-                        {
-                            attribute: "resource",
-                            value: annotation.eventTrigger.resource,
-                        },
-                    ],
+                    eventFilters: { resource: annotation.eventTrigger.resource },
                     retry: !!annotation.failurePolicy,
                 },
             };
             if (annotation.platform === "gcfv2") {
                 if (annotation.eventTrigger.eventType === v2events.PUBSUB_PUBLISH_EVENT) {
-                    triggered.eventTrigger.eventFilters = [
-                        {
-                            attribute: "topic",
-                            value: annotation.eventTrigger.resource,
-                        },
-                    ];
+                    triggered.eventTrigger.eventFilters = { topic: annotation.eventTrigger.resource };
                 }
                 if (v2events.STORAGE_EVENTS.find((event) => { var _a; return event === (((_a = annotation.eventTrigger) === null || _a === void 0 ? void 0 : _a.eventType) || ""); })) {
-                    triggered.eventTrigger.eventFilters = [
-                        {
-                            attribute: "bucket",
-                            value: annotation.eventTrigger.resource,
-                        },
-                    ];
+                    triggered.eventTrigger.eventFilters = { bucket: annotation.eventTrigger.resource };
                 }
             }
         }
@@ -162,7 +147,8 @@ function addResourcesToBackend(projectId, runtime, annotation, want) {
             }
             endpoint.secretEnvironmentVariables = secretEnvs;
         }
-        proto.copyIfPresent(endpoint, annotation, "concurrency", "serviceAccountEmail", "labels", "ingressSettings", "timeout", "maxInstances", "minInstances", "availableMemoryMb");
+        proto.copyIfPresent(endpoint, annotation, "concurrency", "serviceAccountEmail", "labels", "ingressSettings", "maxInstances", "minInstances", "availableMemoryMb");
+        proto.renameIfPresent(endpoint, annotation, "timeoutSeconds", "timeout", proto.secondsFromDuration);
         want.endpoints[region] = want.endpoints[region] || {};
         want.endpoints[region][endpoint.id] = endpoint;
         mergeRequiredAPIs(want);

package/lib/deploy/functions/services/storage.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureStorageTriggerRegion = exports.obtainStorageBindings = void 0;
 const storage = require("../../../gcp/storage");
-const backend = require("../backend");
 const logger_1 = require("../../../logger");
 const error_1 = require("../../../error");
 const location_1 = require("../../../gcp/location");
@@ -27,12 +26,8 @@ async function ensureStorageTriggerRegion(endpoint) {
     const { eventTrigger } = endpoint;
     if (!eventTrigger.region) {
         logger_1.logger.debug("Looking up bucket region for the storage event trigger");
-        const bucketFilter = backend.findEventFilter(endpoint, "bucket");
-        if (!bucketFilter) {
-            throw new error_1.FirebaseError("Storage event trigger unexpectedly missing event filter with bucket attribute.");
-        }
         try {
-            const bucket = await storage.getBucket(bucketFilter.value);
+            const bucket = await storage.getBucket(eventTrigger.eventFilters.bucket);
             eventTrigger.region = bucket.location.toLowerCase();
             logger_1.logger.debug("Setting the event trigger region to", eventTrigger.region, ".");
         }

package/lib/emulator/extensions/postinstall.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.replaceConsoleLinks = void 0;
+const registry_1 = require("../registry");
+const types_1 = require("../types");
+function replaceConsoleLinks(postinstall) {
+    const uiInfo = registry_1.EmulatorRegistry.getInfo(types_1.Emulators.UI);
+    const uiUrl = uiInfo ? `http://${registry_1.EmulatorRegistry.getInfoHostString(uiInfo)}` : "unknown";
+    let subbedPostinstall = postinstall;
+    const linkReplacements = new Map([
+        [
+            /(http[s]?:\/\/)?console\.firebase\.google\.com\/(u\/[0-9]\/)?project\/[A-Za-z0-9-]+\/storage[A-Za-z0-9\/-]*(?=[\)\]\s])/,
+            `${uiUrl}/${types_1.Emulators.STORAGE}`,
+        ],
+        [
+            /(http[s]?:\/\/)?console\.firebase\.google\.com\/(u\/[0-9]\/)?project\/[A-Za-z0-9-]+\/firestore[A-Za-z0-9\/-]*(?=[\)\]\s])/,
+            `${uiUrl}/${types_1.Emulators.FIRESTORE}`,
+        ],
+        [
+            /(http[s]?:\/\/)?console\.firebase\.google\.com\/(u\/[0-9]\/)?project\/[A-Za-z0-9-]+\/database[A-Za-z0-9\/-]*(?=[\)\]\s])/,
+            `${uiUrl}/${types_1.Emulators.DATABASE}`,
+        ],
+        [
+            /(http[s]?:\/\/)?console\.firebase\.google\.com\/(u\/[0-9]\/)?project\/[A-Za-z0-9-]+\/authentication[A-Za-z0-9\/-]*(?=[\)\]\s])/,
+            `${uiUrl}/${types_1.Emulators.AUTH}`,
+        ],
+        [
+            /(http[s]?:\/\/)?console\.firebase\.google\.com\/(u\/[0-9]\/)?project\/[A-Za-z0-9-]+\/functions[A-Za-z0-9\/-]*(?=[\)\]\s])/,
+            `${uiUrl}/logs`,
+        ],
+        [
+            /(http[s]?:\/\/)?console\.firebase\.google\.com\/(u\/[0-9]\/)?project\/[A-Za-z0-9-]+\/extensions[A-Za-z0-9\/-]*(?=[\)\]\s])/,
+            `${uiUrl}/${types_1.Emulators.EXTENSIONS}`,
+        ],
+    ]);
+    for (const [consoleLinkRegex, replacement] of linkReplacements) {
+        subbedPostinstall = subbedPostinstall.replace(consoleLinkRegex, replacement);
+    }
+    return subbedPostinstall;
+}
+exports.replaceConsoleLinks = replaceConsoleLinks;

package/lib/emulator/functionsEmulatorShared.js

@@ -8,9 +8,9 @@ const fs = require("fs");
 const backend = require("../deploy/functions/backend");
 const constants_1 = require("./constants");
 const proto_1 = require("../gcp/proto");
-const logger_1 = require("../logger");
 const manifest_1 = require("../extensions/manifest");
 const extensionsHelper_1 = require("../extensions/extensionsHelper");
+const postinstall_1 = require("./extensions/postinstall");
 const memoryLookup = {
     "128MB": 128,
     "256MB": 256,
@@ -33,12 +33,7 @@ class EmulatedTrigger {
         return memoryLookup[this.definition.availableMemoryMb || "128MB"] * 1024 * 1024;
     }
     get timeoutMs() {
-        if (typeof this.definition.timeout === "number") {
-            return this.definition.timeout * 1000;
-        }
-        else {
-            return parseInt((this.definition.timeout || "60s").split("s")[0], 10) * 1000;
-        }
+        return (this.definition.timeoutSeconds || 60) * 1000;
     }
     getRawFunction() {
         if (!this.module) {
@@ -62,7 +57,7 @@ function emulatedFunctionsFromEndpoints(endpoints) {
             name: endpoint.id,
             id: `${endpoint.region}-${endpoint.id}`,
         };
-        (0, proto_1.copyIfPresent)(def, endpoint, "timeout", "availableMemoryMb", "labels", "platform", "secretEnvironmentVariables");
+        (0, proto_1.copyIfPresent)(def, endpoint, "availableMemoryMb", "labels", "timeoutSeconds", "platform", "secretEnvironmentVariables");
         if (backend.isHttpsTriggered(endpoint)) {
             def.httpsTrigger = endpoint.httpsTrigger;
         }
@@ -73,25 +68,20 @@ function emulatedFunctionsFromEndpoints(endpoints) {
         else if (backend.isEventTriggered(endpoint)) {
             const eventTrigger = endpoint.eventTrigger;
             if (endpoint.platform === "gcfv1") {
-                const resourceFilter = backend.findEventFilter(endpoint, "resource");
-                if (!resourceFilter) {
-                    logger_1.logger.debug(`Invalid event trigger ${JSON.stringify(endpoint)}, expected event filter with resource attribute. Skipping.`);
-                    continue;
-                }
                 def.eventTrigger = {
                     eventType: eventTrigger.eventType,
-                    resource: resourceFilter.value,
+                    resource: eventTrigger.eventFilters.resource,
                 };
             }
             else {
-                const [eventFilter] = endpoint.eventTrigger.eventFilters;
-                if (!eventFilter) {
-                    logger_1.logger.debug(`Invalid event trigger ${JSON.stringify(endpoint)}, expected at least one event filter. Skipping.`);
+                const { resource, topic, bucket } = endpoint.eventTrigger.eventFilters;
+                const eventResource = resource || topic || bucket;
+                if (!eventResource) {
                     continue;
                 }
                 def.eventTrigger = {
                     eventType: eventTrigger.eventType,
-                    resource: eventFilter.value,
+                    resource: eventResource,
                 };
             }
         }
@@ -244,7 +234,7 @@ function getSecretLocalPath(backend, projectDir) {
 }
 exports.getSecretLocalPath = getSecretLocalPath;
 function toBackendInfo(e, cf3Triggers) {
-    var _a;
+    var _a, _b;
     const envWithSecrets = Object.assign({}, e.env);
     for (const s of e.secretEnv) {
         envWithSecrets[s.key] = backend.secretVersionName(s);
@@ -252,10 +242,16 @@ function toBackendInfo(e, cf3Triggers) {
     let extensionVersion = e.extensionVersion;
     if (extensionVersion) {
         extensionVersion = (0, extensionsHelper_1.substituteParams)(extensionVersion, e.env);
+        if ((_a = extensionVersion.spec) === null || _a === void 0 ? void 0 : _a.postinstallContent) {
+            extensionVersion.spec.postinstallContent = (0, postinstall_1.replaceConsoleLinks)(extensionVersion.spec.postinstallContent);
+        }
     }
     let extensionSpec = e.extensionSpec;
     if (extensionSpec) {
         extensionSpec = (0, extensionsHelper_1.substituteParams)(extensionSpec, e.env);
+        if (extensionSpec === null || extensionSpec === void 0 ? void 0 : extensionSpec.postinstallContent) {
+            extensionSpec.postinstallContent = (0, postinstall_1.replaceConsoleLinks)(extensionSpec.postinstallContent);
+        }
     }
     return JSON.parse(JSON.stringify({
         directory: e.functionsDir,
@@ -264,7 +260,7 @@ function toBackendInfo(e, cf3Triggers) {
         extension: e.extension,
         extensionVersion: extensionVersion,
         extensionSpec: extensionSpec,
-        functionTriggers: (_a = e.predefinedTriggers) !== null && _a !== void 0 ? _a : cf3Triggers,
+        functionTriggers: (_b = e.predefinedTriggers) !== null && _b !== void 0 ? _b : cf3Triggers,
     }));
 }
 exports.toBackendInfo = toBackendInfo;

package/lib/emulator/storage/apis/firebase.js

@@ -173,7 +173,7 @@ function createFirebaseEndpoints(emulator) {
                     return res.status(400).json({
                         error: {
                             code: 400,
-                            message: err.toString(),
+                            message: err.message,
                         },
                     });
                 }
@@ -201,7 +201,7 @@ function createFirebaseEndpoints(emulator) {
                 }
                 throw err;
             }
-            metadata.addDownloadToken();
+            metadata.addDownloadToken(false);
             return res.status(200).json(new metadata_1.OutgoingFirebaseMetadata(metadata));
         }
         const uploadCommand = req.header("x-goog-upload-command");
@@ -291,9 +291,9 @@ function createFirebaseEndpoints(emulator) {
                 }
                 throw err;
             }
-            let metadata;
+            let storedMetadata;
             try {
-                metadata = await storageLayer.uploadObject(upload);
+                storedMetadata = await storageLayer.uploadObject(upload);
             }
             catch (err) {
                 if (err instanceof errors_1.ForbiddenError) {
@@ -306,8 +306,8 @@ function createFirebaseEndpoints(emulator) {
                 }
                 throw err;
             }
-            metadata.addDownloadToken();
-            return res.status(200).json(new metadata_1.OutgoingFirebaseMetadata(metadata));
+            storedMetadata.addDownloadToken(false);
+            return res.status(200).json(new metadata_1.OutgoingFirebaseMetadata(storedMetadata));
         }
         return res.sendStatus(400);
     };

package/lib/emulator/storage/apis/gcloud.js

@@ -210,12 +210,15 @@ function createCloudEndpoints(emulator) {
             ({ metadataRaw, dataRaw } = (0, multipart_1.parseObjectUploadMultipartRequest)(contentTypeHeader, await (0, request_1.reqBodyToBuffer)(req)));
         }
         catch (err) {
-            return res.status(400).json({
-                error: {
-                    code: 400,
-                    message: err,
-                },
-            });
+            if (err instanceof Error) {
+                return res.status(400).json({
+                    error: {
+                        code: 400,
+                        message: err.message,
+                    },
+                });
+            }
+            throw err;
         }
         const upload = uploadService.multipartUpload({
             bucketId: req.params.bucketId,