firebase-tools 10.2.2 → 10.3.0

package/lib/emulator/storage/upload.js

@@ -0,0 +1,106 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UploadService = exports.NotCancellableError = exports.UploadNotActiveError = exports.UploadStatus = exports.UploadType = void 0;
+const uuid_1 = require("uuid");
+const errors_1 = require("./errors");
+var UploadType;
+(function (UploadType) {
+    UploadType[UploadType["MULTIPART"] = 0] = "MULTIPART";
+    UploadType[UploadType["RESUMABLE"] = 1] = "RESUMABLE";
+})(UploadType = exports.UploadType || (exports.UploadType = {}));
+var UploadStatus;
+(function (UploadStatus) {
+    UploadStatus[UploadStatus["ACTIVE"] = 0] = "ACTIVE";
+    UploadStatus[UploadStatus["CANCELLED"] = 1] = "CANCELLED";
+    UploadStatus[UploadStatus["FINISHED"] = 2] = "FINISHED";
+})(UploadStatus = exports.UploadStatus || (exports.UploadStatus = {}));
+class UploadNotActiveError extends Error {
+}
+exports.UploadNotActiveError = UploadNotActiveError;
+class NotCancellableError extends Error {
+}
+exports.NotCancellableError = NotCancellableError;
+class UploadService {
+    constructor(_persistence) {
+        this._persistence = _persistence;
+        this.reset();
+    }
+    reset() {
+        this._uploads = new Map();
+    }
+    multipartUpload(request) {
+        const upload = this.startMultipartUpload(request, request.dataRaw.byteLength);
+        this._persistence.deleteFile(upload.path, true);
+        this._persistence.appendBytes(upload.path, request.dataRaw);
+        return upload;
+    }
+    startMultipartUpload(request, sizeInBytes) {
+        const id = (0, uuid_1.v4)();
+        const upload = {
+            id: (0, uuid_1.v4)(),
+            bucketId: request.bucketId,
+            objectId: request.objectId,
+            type: UploadType.MULTIPART,
+            path: this.getStagingFileName(id, request.bucketId, request.objectId),
+            status: UploadStatus.FINISHED,
+            metadata: JSON.parse(request.metadataRaw),
+            size: sizeInBytes,
+            authorization: request.authorization,
+        };
+        this._uploads.set(upload.id, upload);
+        return upload;
+    }
+    startResumableUpload(request) {
+        const id = (0, uuid_1.v4)();
+        const upload = {
+            id: id,
+            bucketId: request.bucketId,
+            objectId: request.objectId,
+            type: UploadType.RESUMABLE,
+            path: this.getStagingFileName(id, request.bucketId, request.objectId),
+            status: UploadStatus.ACTIVE,
+            metadata: JSON.parse(request.metadataRaw),
+            size: 0,
+            authorization: request.authorization,
+        };
+        this._uploads.set(upload.id, upload);
+        this._persistence.deleteFile(upload.path, true);
+        return upload;
+    }
+    continueResumableUpload(uploadId, dataRaw) {
+        const upload = this.getResumableUpload(uploadId);
+        if (upload.status !== UploadStatus.ACTIVE) {
+            throw new UploadNotActiveError();
+        }
+        this._persistence.appendBytes(upload.path, dataRaw);
+        upload.size += dataRaw.byteLength;
+        return upload;
+    }
+    getResumableUpload(uploadId) {
+        const upload = this._uploads.get(uploadId);
+        if (!upload || upload.type !== UploadType.RESUMABLE) {
+            throw new errors_1.NotFoundError();
+        }
+        return upload;
+    }
+    cancelResumableUpload(uploadId) {
+        const upload = this.getResumableUpload(uploadId);
+        if (upload.status === UploadStatus.FINISHED) {
+            throw new NotCancellableError();
+        }
+        upload.status = UploadStatus.CANCELLED;
+        return upload;
+    }
+    finalizeResumableUpload(uploadId) {
+        const upload = this.getResumableUpload(uploadId);
+        if (upload.status === UploadStatus.CANCELLED) {
+            throw new UploadNotActiveError();
+        }
+        upload.status = UploadStatus.FINISHED;
+        return upload;
+    }
+    getStagingFileName(uploadId, bucketId, objectId) {
+        return encodeURIComponent(`${uploadId}_b_${bucketId}_o_${objectId}`);
+    }
+}
+exports.UploadService = UploadService;

package/lib/extensions/emulator/optionsHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getParams = exports.getExtensionFunctionInfo = exports.buildOptions = void 0;
+exports.getParams = exports.getSecretEnvVars = exports.getNonSecretEnv = exports.getExtensionFunctionInfo = exports.buildOptions = void 0;
 const fs = require("fs-extra");
 const _ = require("lodash");
 const path = require("path");
@@ -8,6 +8,7 @@ const paramHelper = require("../paramHelper");
 const specHelper = require("./specHelper");
 const localHelper = require("../localHelper");
 const triggerHelper = require("./triggerHelper");
+const extensionsApi_1 = require("../extensionsApi");
 const extensionsHelper = require("../extensionsHelper");
 const config_1 = require("../../config");
 const error_1 = require("../../error");
@@ -35,9 +36,9 @@ async function buildOptions(options) {
     return options;
 }
 exports.buildOptions = buildOptions;
-async function getExtensionFunctionInfo(extensionDir, instanceId, params) {
+async function getExtensionFunctionInfo(extensionDir, instanceId, paramValues) {
     const spec = await specHelper.readExtensionYaml(extensionDir);
-    const functionResources = specHelper.getFunctionResourcesWithParamSubstitution(spec, params);
+    const functionResources = specHelper.getFunctionResourcesWithParamSubstitution(spec, paramValues);
     const extensionTriggers = functionResources
         .map((r) => triggerHelper.functionResourceToEmulatedTriggerDefintion(r))
         .map((trigger) => {
@@ -45,12 +46,43 @@ async function getExtensionFunctionInfo(extensionDir, instanceId, params) {
         return trigger;
     });
     const nodeMajorVersion = specHelper.getNodeVersion(functionResources);
+    const nonSecretEnv = getNonSecretEnv(spec.params, paramValues);
+    const secretEnvVariables = getSecretEnvVars(spec.params, paramValues);
     return {
         extensionTriggers,
         nodeMajorVersion,
+        nonSecretEnv,
+        secretEnvVariables,
     };
 }
 exports.getExtensionFunctionInfo = getExtensionFunctionInfo;
+const isSecretParam = (p) => p.type === extensionsHelper.SpecParamType.SECRET || p.type === extensionsApi_1.ParamType.SECRET;
+function getNonSecretEnv(params, paramValues) {
+    const getNonSecretEnv = Object.assign({}, paramValues);
+    const secretParams = params.filter(isSecretParam);
+    for (const p of secretParams) {
+        delete getNonSecretEnv[p.param];
+    }
+    return getNonSecretEnv;
+}
+exports.getNonSecretEnv = getNonSecretEnv;
+function getSecretEnvVars(params, paramValues) {
+    const secretEnvVar = [];
+    const secretParams = params.filter(isSecretParam);
+    for (const s of secretParams) {
+        if (paramValues[s.param]) {
+            const [, projectId, , secret, , version] = paramValues[s.param].split("/");
+            secretEnvVar.push({
+                key: s.param,
+                secret,
+                projectId,
+                version,
+            });
+        }
+    }
+    return secretEnvVar;
+}
+exports.getSecretEnvVars = getSecretEnvVars;
 function getParams(options, extensionSpec) {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const userParams = paramHelper.readEnvFile(options.testParams);

package/lib/extensions/extensionsHelper.js

@@ -14,6 +14,7 @@ const api_1 = require("../api");
 const archiveDirectory_1 = require("../archiveDirectory");
 const utils_1 = require("./utils");
 const functionsConfig_1 = require("../functionsConfig");
+const adminSdkConfig_1 = require("../emulator/adminSdkConfig");
 const resolveSource_1 = require("./resolveSource");
 const error_1 = require("../error");
 const diagnose_1 = require("./diagnose");
@@ -29,6 +30,7 @@ const logger_1 = require("../logger");
 const utils_2 = require("../utils");
 const changelog_1 = require("./changelog");
 const getProjectNumber_1 = require("../getProjectNumber");
+const constants_1 = require("../emulator/constants");
 var SpecParamType;
 (function (SpecParamType) {
     SpecParamType["SELECT"] = "select";
@@ -76,21 +78,28 @@ function getDBInstanceFromURL(databaseUrl = "") {
     return "";
 }
 exports.getDBInstanceFromURL = getDBInstanceFromURL;
-async function getFirebaseProjectParams(projectId) {
-    const body = await (0, functionsConfig_1.getFirebaseConfig)({ project: projectId });
-    const projectNumber = await (0, getProjectNumber_1.getProjectNumber)({ projectId });
+async function getFirebaseProjectParams(projectId, emulatorMode = false) {
+    var _a, _b;
+    const body = emulatorMode
+        ? await (0, adminSdkConfig_1.getProjectAdminSdkConfigOrCached)(projectId)
+        : await (0, functionsConfig_1.getFirebaseConfig)({ project: projectId });
+    const projectNumber = emulatorMode && constants_1.Constants.isDemoProject(projectId)
+        ? constants_1.Constants.FAKE_PROJECT_NUMBER
+        : await (0, getProjectNumber_1.getProjectNumber)({ projectId });
+    const databaseURL = (_a = body === null || body === void 0 ? void 0 : body.databaseURL) !== null && _a !== void 0 ? _a : `https://${projectId}.firebaseio.com`;
+    const storageBucket = (_b = body === null || body === void 0 ? void 0 : body.storageBucket) !== null && _b !== void 0 ? _b : `${projectId}.appspot.com`;
     const FIREBASE_CONFIG = JSON.stringify({
-        projectId: body.projectId,
-        databaseURL: body.databaseURL,
-        storageBucket: body.storageBucket,
+        projectId,
+        databaseURL,
+        storageBucket,
     });
     return {
-        PROJECT_ID: body.projectId,
+        PROJECT_ID: projectId,
         PROJECT_NUMBER: projectNumber,
-        DATABASE_URL: body.databaseURL,
-        STORAGE_BUCKET: body.storageBucket,
+        DATABASE_URL: databaseURL,
+        STORAGE_BUCKET: storageBucket,
         FIREBASE_CONFIG,
-        DATABASE_INSTANCE: getDBInstanceFromURL(body.databaseURL),
+        DATABASE_INSTANCE: getDBInstanceFromURL(databaseURL),
     };
 }
 exports.getFirebaseProjectParams = getFirebaseProjectParams;

package/lib/extensions/manifest.js

@@ -1,11 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeToManifest = void 0;
+exports.showPreviewWarning = exports.showDeprecationWarning = exports.readInstanceParam = exports.getInstanceRef = exports.instanceExists = exports.loadConfig = exports.removeFromManifest = exports.writeToManifest = void 0;
 const clc = require("cli-color");
+const path = require("path");
 const refs = require("./refs");
+const config_1 = require("../config");
 const logger_1 = require("../logger");
 const prompt_1 = require("../prompt");
-async function writeToManifest(specs, config, options) {
+const paramHelper_1 = require("./paramHelper");
+const error_1 = require("../error");
+const utils = require("../utils");
+const extensionsHelper_1 = require("./extensionsHelper");
+const ENV_DIRECTORY = "extensions";
+async function writeToManifest(specs, config, options, allowOverwrite = false) {
     if (config.has("extensions") &&
         Object.keys(config.get("extensions")).length &&
         !options.nonInteractive &&
@@ -13,36 +20,125 @@ async function writeToManifest(specs, config, options) {
         const currentExtensions = Object.entries(config.get("extensions"))
             .map((i) => `${i[0]}: ${i[1]}`)
             .join("\n\t");
-        const overwrite = await (0, prompt_1.promptOnce)({
-            type: "list",
-            message: `firebase.json already contains extensions:\n${currentExtensions}\nWould you like to overwrite or merge?`,
-            choices: [
-                { name: "Overwrite", value: true },
-                { name: "Merge", value: false },
-            ],
-        });
-        if (overwrite) {
-            config.set("extensions", {});
+        if (allowOverwrite) {
+            const overwrite = await (0, prompt_1.promptOnce)({
+                type: "list",
+                message: `firebase.json already contains extensions:\n${currentExtensions}\nWould you like to overwrite or merge?`,
+                choices: [
+                    { name: "Overwrite", value: true },
+                    { name: "Merge", value: false },
+                ],
+            });
+            if (overwrite) {
+                config.set("extensions", {});
+            }
         }
     }
     writeExtensionsToFirebaseJson(specs, config);
     await writeEnvFiles(specs, config, options.force);
 }
 exports.writeToManifest = writeToManifest;
+function removeFromManifest(instanceId, config) {
+    if (!instanceExists(instanceId, config)) {
+        throw new error_1.FirebaseError(`Extension instance ${instanceId} not found in firebase.json.`);
+    }
+    const extensions = config.get("extensions", {});
+    extensions[instanceId] = undefined;
+    config.set("extensions", extensions);
+    config.writeProjectFile("firebase.json", config.src);
+    logger_1.logger.info(`Removed extension instance ${instanceId} from firebase.json`);
+    config.deleteProjectFile(`extensions/${instanceId}.env`);
+    logger_1.logger.info(`Removed extension instance environment config extensions/${instanceId}.env`);
+    config.deleteProjectFile(`extensions/${instanceId}.env.local`);
+    logger_1.logger.info(`Removed extension instance environment config extensions/${instanceId}.env.local`);
+}
+exports.removeFromManifest = removeFromManifest;
+function loadConfig(options) {
+    const existingConfig = config_1.Config.load(options, true);
+    if (!existingConfig) {
+        throw new error_1.FirebaseError("Not currently in a Firebase directory. Run `firebase init` to create a Firebase directory.");
+    }
+    return existingConfig;
+}
+exports.loadConfig = loadConfig;
+function instanceExists(instanceId, config) {
+    return !!config.get("extensions", {})[instanceId];
+}
+exports.instanceExists = instanceExists;
+function getInstanceRef(instanceId, config) {
+    if (!instanceExists(instanceId, config)) {
+        throw new error_1.FirebaseError(`Could not find extension instance ${instanceId} in firebase.json`);
+    }
+    const ref = config.get("extensions", {})[instanceId];
+    return refs.parse(ref);
+}
+exports.getInstanceRef = getInstanceRef;
 function writeExtensionsToFirebaseJson(specs, config) {
     const extensions = config.get("extensions", {});
     for (const s of specs) {
         extensions[s.instanceId] = refs.toExtensionVersionRef(s.ref);
     }
     config.set("extensions", extensions);
-    logger_1.logger.info("Adding Extensions to " + clc.bold("firebase.json") + "...");
     config.writeProjectFile("firebase.json", config.src);
+    utils.logSuccess("Wrote extensions to " + clc.bold("firebase.json") + "...");
 }
 async function writeEnvFiles(specs, config, force) {
     for (const spec of specs) {
         const content = Object.entries(spec.params)
+            .sort((a, b) => {
+            return a[0].localeCompare(b[0]);
+        })
             .map((r) => `${r[0]}=${r[1]}`)
             .join("\n");
         await config.askWriteProjectFile(`extensions/${spec.instanceId}.env`, content, force);
     }
 }
+function readInstanceParam(args) {
+    var _a;
+    const aliases = (_a = args.aliases) !== null && _a !== void 0 ? _a : [];
+    const filesToCheck = [
+        `${args.instanceId}.env`,
+        ...aliases.map((alias) => `${args.instanceId}.env.${alias}`),
+        ...(args.projectNumber ? [`${args.instanceId}.env.${args.projectNumber}`] : []),
+        ...(args.projectId ? [`${args.instanceId}.env.${args.projectId}`] : []),
+    ];
+    if (args.checkLocal) {
+        filesToCheck.push(`${args.instanceId}.env.local`);
+    }
+    let noFilesFound = true;
+    const combinedParams = {};
+    for (const fileToCheck of filesToCheck) {
+        try {
+            const params = readParamsFile(args.projectDir, fileToCheck);
+            logger_1.logger.debug(`Successfully read params from ${fileToCheck}`);
+            noFilesFound = false;
+            Object.assign(combinedParams, params);
+        }
+        catch (err) {
+            logger_1.logger.debug(`${err}`);
+        }
+    }
+    if (noFilesFound) {
+        throw new error_1.FirebaseError(`No params file found for ${args.instanceId}`);
+    }
+    return combinedParams;
+}
+exports.readInstanceParam = readInstanceParam;
+function readParamsFile(projectDir, fileName) {
+    const paramPath = path.join(projectDir, ENV_DIRECTORY, fileName);
+    const params = (0, paramHelper_1.readEnvFile)(paramPath);
+    return params;
+}
+function showDeprecationWarning() {
+    utils.logLabeledWarning(extensionsHelper_1.logPrefix, "The behavior of ext:install, ext:update, ext:configure, and ext:uninstall will change in firebase-tools@11.0.0. " +
+        "Instead of deploying extensions directly, " +
+        "changes to extension instances will be written to firebase.json and ./extensions/*.env. " +
+        `Then ${clc.bold("firebase deploy (--only extensions)")} will deploy the changes to your Firebase project. ` +
+        `To access this behavior now, pass the ${clc.bold("--local")} flag.`);
+}
+exports.showDeprecationWarning = showDeprecationWarning;
+function showPreviewWarning() {
+    utils.logLabeledWarning(extensionsHelper_1.logPrefix, "These changes will be reflected in your Firebase Emulator after restart. " +
+        `Run ${clc.bold("firebase deploy (--only extensions)")} to deploy the changes to your Firebase project. `);
+}
+exports.showPreviewWarning = showPreviewWarning;

package/lib/extensions/paramHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readEnvFile = exports.getParamsFromFile = exports.promptForNewParams = exports.getParamsForUpdate = exports.getParams = exports.getParamsWithCurrentValuesAsDefaults = void 0;
+exports.readEnvFile = exports.promptForNewParams = exports.getParamsForUpdate = exports.getParams = exports.getParamsWithCurrentValuesAsDefaults = exports.setNewDefaults = void 0;
 const _ = require("lodash");
 const path = require("path");
 const clc = require("cli-color");
@@ -19,6 +19,7 @@ function setNewDefaults(params, newDefaults) {
     });
     return params;
 }
+exports.setNewDefaults = setNewDefaults;
 function getParamsWithCurrentValuesAsDefaults(extensionInstance) {
     const specParams = _.cloneDeep(_.get(extensionInstance, "config.source.spec.params", []));
     const currentParams = _.cloneDeep(_.get(extensionInstance, "config.params", {}));
@@ -91,9 +92,10 @@ async function promptForNewParams(args) {
     const comparer = (param1, param2) => {
         return param1.type === param2.type && param1.param === param2.param;
     };
-    let paramsDiffDeletions = _.differenceWith(args.spec.params, _.get(args.newSpec, "params", []), comparer);
+    const oldParams = args.spec.params.filter((p) => Object.keys(args.currentParams).includes(p.param));
+    let paramsDiffDeletions = _.differenceWith(oldParams, args.newSpec.params, comparer);
     paramsDiffDeletions = (0, extensionsHelper_1.substituteParams)(paramsDiffDeletions, firebaseProjectParams);
-    let paramsDiffAdditions = _.differenceWith(args.newSpec.params, _.get(args.spec, "params", []), comparer);
+    let paramsDiffAdditions = _.differenceWith(args.newSpec.params, oldParams, comparer);
     paramsDiffAdditions = (0, extensionsHelper_1.substituteParams)(paramsDiffAdditions, firebaseProjectParams);
     if (paramsDiffDeletions.length) {
         logger_1.logger.info("The following params will no longer be used:");
@@ -127,7 +129,6 @@ function getParamsFromFile(args) {
     logger_1.logger.info(`Using param values from ${args.paramsEnvPath}`);
     return params;
 }
-exports.getParamsFromFile = getParamsFromFile;
 function readEnvFile(envPath) {
     const buf = fs.readFileSync(path.resolve(envPath), "utf8");
     const result = env.parse(buf.toString().trim());

package/lib/functions/env.js

@@ -121,15 +121,13 @@ function parseStrict(data) {
 exports.parseStrict = parseStrict;
 function findEnvfiles(functionsSource, projectId, projectAlias, isEmulator) {
     const files = [".env"];
+    files.push(`.env.${projectId}`);
+    if (projectAlias) {
+        files.push(`.env.${projectAlias}`);
+    }
     if (isEmulator) {
         files.push(FUNCTIONS_EMULATOR_DOTENV);
     }
-    else {
-        files.push(`.env.${projectId}`);
-        if (projectAlias && projectAlias.length) {
-            files.push(`.env.${projectAlias}`);
-        }
-    }
     return files
         .map((f) => path.join(functionsSource, f))
         .filter(fs.existsSync)

package/lib/functions/events/v2.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FIREBASE_ALERTS_PUBLISH_EVENT = exports.STORAGE_EVENTS = exports.PUBSUB_PUBLISH_EVENT = void 0;
+exports.PUBSUB_PUBLISH_EVENT = "google.cloud.pubsub.topic.v1.messagePublished";
+exports.STORAGE_EVENTS = [
+    "google.cloud.storage.object.v1.finalized",
+    "google.cloud.storage.object.v1.archived",
+    "google.cloud.storage.object.v1.deleted",
+    "google.cloud.storage.object.v1.metadataUpdated",
+];
+exports.FIREBASE_ALERTS_PUBLISH_EVENT = "google.firebase.firebasealerts.alerts.v1.published";

package/lib/gcp/cloudfunctions.js

@@ -202,7 +202,7 @@ async function listAllFunctions(projectId) {
 }
 exports.listAllFunctions = listAllFunctions;
 function endpointFromFunction(gcfFunction) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const [, project, , region, , id] = gcfFunction.name.split("/");
     let trigger;
     let uri;
@@ -217,6 +217,11 @@ function endpointFromFunction(gcfFunction) {
             taskQueueTrigger: {},
         };
     }
+    else if ((_c = gcfFunction.labels) === null || _c === void 0 ? void 0 : _c["deployment-callable"]) {
+        trigger = {
+            callableTrigger: {},
+        };
+    }
     else if (gcfFunction.httpsTrigger) {
         trigger = { httpsTrigger: {} };
         uri = gcfFunction.httpsTrigger.url;
@@ -226,10 +231,13 @@ function endpointFromFunction(gcfFunction) {
         trigger = {
             eventTrigger: {
                 eventType: gcfFunction.eventTrigger.eventType,
-                eventFilters: {
-                    resource: gcfFunction.eventTrigger.resource,
-                },
-                retry: !!((_c = gcfFunction.eventTrigger.failurePolicy) === null || _c === void 0 ? void 0 : _c.retry),
+                eventFilters: [
+                    {
+                        attribute: "resource",
+                        value: gcfFunction.eventTrigger.resource,
+                    },
+                ],
+                retry: !!((_d = gcfFunction.eventTrigger.failurePolicy) === null || _d === void 0 ? void 0 : _d.retry),
             },
         };
     }
@@ -269,9 +277,13 @@ function functionFromEndpoint(endpoint, sourceUploadUrl) {
     };
     proto.copyIfPresent(gcfFunction, endpoint, "labels");
     if (backend.isEventTriggered(endpoint)) {
+        const resourceFilter = backend.findEventFilter(endpoint, "resource");
+        if (!resourceFilter) {
+            throw new error_1.FirebaseError("Invalid event trigger definition. Expected event filter with 'resource' attribute.");
+        }
         gcfFunction.eventTrigger = {
             eventType: endpoint.eventTrigger.eventType,
-            resource: endpoint.eventTrigger.eventFilters.resource,
+            resource: resourceFilter.value,
         };
         gcfFunction.eventTrigger.failurePolicy = endpoint.eventTrigger.retry
             ? { retry: {} }

package/lib/gcp/cloudfunctionsv2.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.endpointFromFunction = exports.functionFromEndpoint = exports.deleteFunction = exports.updateFunction = exports.listAllFunctions = exports.listFunctions = exports.getFunction = exports.createFunction = exports.generateUploadUrl = exports.megabytes = exports.PUBSUB_PUBLISH_EVENT = exports.API_VERSION = void 0;
+exports.endpointFromFunction = exports.functionFromEndpoint = exports.deleteFunction = exports.updateFunction = exports.listAllFunctions = exports.listFunctions = exports.getFunction = exports.createFunction = exports.generateUploadUrl = exports.megabytes = exports.API_VERSION = void 0;
 const clc = require("cli-color");
 const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
 const api_1 = require("../api");
 const logger_1 = require("../logger");
+const v2_1 = require("../functions/events/v2");
 const backend = require("../deploy/functions/backend");
 const runtimes = require("../deploy/functions/runtimes");
 const proto = require("./proto");
@@ -16,7 +17,6 @@ const client = new apiv2_1.Client({
     auth: true,
     apiVersion: exports.API_VERSION,
 });
-exports.PUBSUB_PUBLISH_EVENT = "google.cloud.pubsub.topic.v1.messagePublished";
 const BYTES_PER_UNIT = {
     "": 1,
     k: 1e3,
@@ -179,14 +179,24 @@ function functionFromEndpoint(endpoint, source) {
         gcfFunction.eventTrigger = {
             eventType: endpoint.eventTrigger.eventType,
         };
-        if (gcfFunction.eventTrigger.eventType === exports.PUBSUB_PUBLISH_EVENT) {
-            gcfFunction.eventTrigger.pubsubTopic = endpoint.eventTrigger.eventFilters.resource;
+        if (gcfFunction.eventTrigger.eventType === v2_1.PUBSUB_PUBLISH_EVENT) {
+            const pubsubFilter = backend.findEventFilter(endpoint, "topic");
+            if (!pubsubFilter) {
+                throw new error_1.FirebaseError("Invalid pubsub endpoint. Expected eventFilter with 'topic' attribute but found none.");
+            }
+            gcfFunction.eventTrigger.pubsubTopic = pubsubFilter.value;
+            for (const filter of endpoint.eventTrigger.eventFilters) {
+                if (filter.attribute === "topic") {
+                    continue;
+                }
+                if (!gcfFunction.eventTrigger.eventFilters) {
+                    gcfFunction.eventTrigger.eventFilters = [];
+                }
+                gcfFunction.eventTrigger.eventFilters.push(filter);
+            }
         }
         else {
-            gcfFunction.eventTrigger.eventFilters = [];
-            for (const [attribute, value] of Object.entries(endpoint.eventTrigger.eventFilters)) {
-                gcfFunction.eventTrigger.eventFilters.push({ attribute, value });
-            }
+            gcfFunction.eventTrigger.eventFilters = endpoint.eventTrigger.eventFilters;
         }
         proto.renameIfPresent(gcfFunction.eventTrigger, endpoint.eventTrigger, "triggerRegion", "region");
         if (endpoint.eventTrigger.retry) {
@@ -207,7 +217,7 @@ function functionFromEndpoint(endpoint, source) {
 }
 exports.functionFromEndpoint = functionFromEndpoint;
 function endpointFromFunction(gcfFunction) {
-    var _a, _b;
+    var _a, _b, _c;
     const [, project, , region, , id] = gcfFunction.name.split("/");
     let trigger;
     if (((_a = gcfFunction.labels) === null || _a === void 0 ? void 0 : _a["deployment-scheduled"]) === "true") {
@@ -220,20 +230,28 @@ function endpointFromFunction(gcfFunction) {
             taskQueueTrigger: {},
         };
     }
+    else if (((_c = gcfFunction.labels) === null || _c === void 0 ? void 0 : _c["deployment-callable"]) === "true") {
+        trigger = {
+            callableTrigger: {},
+        };
+    }
     else if (gcfFunction.eventTrigger) {
         trigger = {
             eventTrigger: {
                 eventType: gcfFunction.eventTrigger.eventType,
-                eventFilters: {},
+                eventFilters: [],
                 retry: false,
             },
         };
         if (gcfFunction.eventTrigger.pubsubTopic) {
-            trigger.eventTrigger.eventFilters.resource = gcfFunction.eventTrigger.pubsubTopic;
+            trigger.eventTrigger.eventFilters.push({
+                attribute: "topic",
+                value: gcfFunction.eventTrigger.pubsubTopic,
+            });
         }
         else {
             for (const { attribute, value } of gcfFunction.eventTrigger.eventFilters || []) {
-                trigger.eventTrigger.eventFilters[attribute] = value;
+                trigger.eventTrigger.eventFilters.push({ attribute, value });
             }
         }
         proto.renameIfPresent(trigger.eventTrigger, gcfFunction.eventTrigger, "region", "triggerRegion");

package/lib/gcp/resourceManager.js

@@ -13,13 +13,13 @@ exports.firebaseRoles = {
     hostingAdmin: "roles/firebasehosting.admin",
     runViewer: "roles/run.viewer",
 };
-async function getIamPolicy(projectId) {
-    const response = await apiClient.post(`/projects/${projectId}:getIamPolicy`);
+async function getIamPolicy(projectIdOrNumber) {
+    const response = await apiClient.post(`/projects/${projectIdOrNumber}:getIamPolicy`);
     return response.body;
 }
 exports.getIamPolicy = getIamPolicy;
-async function setIamPolicy(projectId, newPolicy, updateMask = "") {
-    const response = await apiClient.post(`/projects/${projectId}:setIamPolicy`, {
+async function setIamPolicy(projectIdOrNumber, newPolicy, updateMask = "") {
+    const response = await apiClient.post(`/projects/${projectIdOrNumber}:setIamPolicy`, {
         policy: newPolicy,
         updateMask: updateMask,
     });

package/lib/serve/functions.js

@@ -29,8 +29,9 @@ class FunctionsServer {
             functionsDir,
             nodeMajorVersion,
             env: {},
+            secretEnv: [],
         };
-        const args = Object.assign({ projectId, projectDir: options.config.projectDir, emulatableBackends: [this.backend], account }, partialArgs);
+        const args = Object.assign({ projectId, projectDir: options.config.projectDir, emulatableBackends: [this.backend], projectAlias: options.projectAlias, account }, partialArgs);
         if (options.host) {
             utils.assertIsStringOrUndefined(options.host);
             args.host = options.host;