firebase-tools 11.6.0 → 11.7.0

package/lib/commands/crashlytics-mappingfile-generateid.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.command = void 0;
+const command_1 = require("../command");
+const utils = require("../utils");
+const buildToolsJarHelper_1 = require("../crashlytics/buildToolsJarHelper");
+const error_1 = require("../error");
+exports.command = new command_1.Command("crashlytics:mappingfile:generateid")
+    .description("generate a mapping file id and write it to an Android resource file, which will be built into the app")
+    .option("--resource-file <resourceFile>", "path to the Android resource XML file that will be created or updated.")
+    .action(async (options) => {
+    const debug = !!options.debug;
+    const resourceFilePath = options.resourceFile;
+    if (!resourceFilePath) {
+        throw new error_1.FirebaseError("set --resource-file <resourceFile> to an Android resource file path, e.g. app/src/main/res/values/crashlytics.xml");
+    }
+    const jarFile = await (0, buildToolsJarHelper_1.fetchBuildtoolsJar)();
+    const jarOptions = { resourceFilePath };
+    utils.logBullet(`Updating resource file: ${resourceFilePath}`);
+    const generateIdArgs = buildArgs(jarOptions);
+    (0, buildToolsJarHelper_1.runBuildtoolsCommand)(jarFile, generateIdArgs, debug);
+    utils.logBullet("Successfully updated mapping file id");
+});
+function buildArgs(options) {
+    return ["-injectMappingFileIdIntoResource", options.resourceFilePath, "-verbose"];
+}

package/lib/commands/crashlytics-mappingfile-upload.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.command = void 0;
+const command_1 = require("../command");
+const error_1 = require("../error");
+const utils = require("../utils");
+const buildToolsJarHelper_1 = require("../crashlytics/buildToolsJarHelper");
+exports.command = new command_1.Command("crashlytics:mappingfile:upload <mappingFile>")
+    .description("upload a ProGuard/R8-compatible mapping file to deobfuscate stack traces")
+    .option("--app <appID>", "the app id of your Firebase app")
+    .option("--resource-file <resourceFile>", "path to the Android resource XML file that includes the mapping file id")
+    .action(async (mappingFile, options) => {
+    const app = getGoogleAppID(options);
+    const debug = !!options.debug;
+    if (!mappingFile) {
+        throw new error_1.FirebaseError("set `--mapping-file <mappingFile>` to a valid mapping file path, e.g. app/build/outputs/mapping.txt");
+    }
+    const mappingFilePath = mappingFile;
+    const resourceFilePath = options.resourceFile;
+    if (!resourceFilePath) {
+        throw new error_1.FirebaseError("set --resource-file <resourceFile> to a valid Android resource file path, e.g. app/main/res/values/strings.xml");
+    }
+    const jarFile = await (0, buildToolsJarHelper_1.fetchBuildtoolsJar)();
+    const jarOptions = { app, mappingFilePath, resourceFilePath };
+    utils.logBullet(`Uploading mapping file: ${mappingFilePath}`);
+    const uploadArgs = buildArgs(jarOptions);
+    (0, buildToolsJarHelper_1.runBuildtoolsCommand)(jarFile, uploadArgs, debug);
+    utils.logBullet("Successfully uploaded mapping file");
+});
+function getGoogleAppID(options) {
+    if (!options.app) {
+        throw new error_1.FirebaseError("set --app <appId> to a valid Firebase application id, e.g. 1:00000000:android:0000000");
+    }
+    return options.app;
+}
+function buildArgs(options) {
+    return [
+        "-uploadMappingFile",
+        options.mappingFilePath,
+        "-resourceFile",
+        options.resourceFilePath,
+        "-googleAppId",
+        options.app,
+        "-verbose",
+    ];
+}

package/lib/commands/crashlytics-symbols-upload.js

@@ -1,44 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const fs = require("fs-extra");
 const os = require("os");
 const path = require("path");
-const spawn = require("cross-spawn");
 const uuid = require("uuid");
 const command_1 = require("../command");
-const downloadUtils = require("../downloadUtils");
 const error_1 = require("../error");
-const logger_1 = require("../logger");
-const rimraf = require("rimraf");
 const utils = require("../utils");
+const buildToolsJarHelper_1 = require("../crashlytics/buildToolsJarHelper");
 var SymbolGenerator;
 (function (SymbolGenerator) {
     SymbolGenerator["breakpad"] = "breakpad";
     SymbolGenerator["csym"] = "csym";
 })(SymbolGenerator || (SymbolGenerator = {}));
 const SYMBOL_CACHE_ROOT_DIR = process.env.FIREBASE_CRASHLYTICS_CACHE_PATH || os.tmpdir();
-const JAR_CACHE_DIR = process.env.FIREBASE_CRASHLYTICS_BUILDTOOLS_PATH ||
-    path.join(os.homedir(), ".cache", "firebase", "crashlytics", "buildtools");
-const JAR_VERSION = "2.8.0";
-const JAR_URL = `https://dl.google.com/android/maven2/com/google/firebase/firebase-crashlytics-buildtools/${JAR_VERSION}/firebase-crashlytics-buildtools-${JAR_VERSION}.jar`;
 exports.command = new command_1.Command("crashlytics:symbols:upload <symbolFiles...>")
-    .description("Upload symbols for native code, to symbolicate stack traces.")
+    .description("upload symbols for native code, to symbolicate stack traces")
     .option("--app <appID>", "the app id of your Firebase app")
-    .option("--generator [breakpad|csym]", "the symbol generator being used, defaults to breakpad.")
+    .option("--generator [breakpad|csym]", "the symbol generator being used, default is breakpad")
     .option("--dry-run", "generate symbols without uploading them")
-    .option("--debug", "print debug output and logging from the underlying uploader tool")
     .action(async (symbolFiles, options) => {
-    const app = getGoogleAppID(options) || "";
+    const app = getGoogleAppID(options);
     const generator = getSymbolGenerator(options);
     const dryRun = !!options.dryRun;
     const debug = !!options.debug;
-    let jarFile = await downloadBuiltoolsJar();
-    if (process.env.LOCAL_JAR) {
-        jarFile = process.env.LOCAL_JAR;
-    }
+    const jarFile = await (0, buildToolsJarHelper_1.fetchBuildtoolsJar)();
     const jarOptions = {
-        jarFile,
         app,
         generator,
         cachePath: path.join(SYMBOL_CACHE_ROOT_DIR, `crashlytics-${uuid.v4()}`, "nativeSymbols", app.replace(/:/g, "-"), generator),
@@ -48,32 +35,22 @@ exports.command = new command_1.Command("crashlytics:symbols:upload <symbolFiles
     for (const symbolFile of symbolFiles) {
         utils.logBullet(`Generating symbols for ${symbolFile}`);
         const generateArgs = buildArgs(Object.assign(Object.assign({}, jarOptions), { symbolFile }));
-        const output = runJar(generateArgs, debug);
-        if (output.length > 0) {
-            utils.logBullet(output);
-        }
-        else {
-            utils.logBullet(`Generated symbols for ${symbolFile}`);
-            utils.logBullet(`Output Path: ${jarOptions.cachePath}`);
-        }
+        (0, buildToolsJarHelper_1.runBuildtoolsCommand)(jarFile, generateArgs, debug);
+        utils.logBullet(`Generated symbols for ${symbolFile}`);
+        utils.logBullet(`Output Path: ${jarOptions.cachePath}`);
     }
     if (dryRun) {
         utils.logBullet("Skipping upload because --dry-run was passed");
         return;
     }
-    utils.logBullet(`Uploading all generated symbols`);
+    utils.logBullet(`Uploading all generated symbols...`);
     const uploadArgs = buildArgs(Object.assign(Object.assign({}, jarOptions), { generate: false }));
-    const output = runJar(uploadArgs, debug);
-    if (output.length > 0) {
-        utils.logBullet(output);
-    }
-    else {
-        utils.logBullet("Successfully uploaded all symbols");
-    }
+    (0, buildToolsJarHelper_1.runBuildtoolsCommand)(jarFile, uploadArgs, debug);
+    utils.logBullet("Successfully uploaded all symbols");
 });
 function getGoogleAppID(options) {
     if (!options.app) {
-        throw new error_1.FirebaseError("set the --app option to a valid Firebase app id and try again");
+        throw new error_1.FirebaseError("set --app <appId> to a valid Firebase application id, e.g. 1:00000000:android:0000000");
     }
     return options.app;
 }
@@ -86,62 +63,16 @@ function getSymbolGenerator(options) {
     }
     return options.generator;
 }
-async function downloadBuiltoolsJar() {
-    const jarPath = path.join(JAR_CACHE_DIR, `crashlytics-buildtools-${JAR_VERSION}.jar`);
-    if (fs.existsSync(jarPath)) {
-        logger_1.logger.debug(`Buildtools Jar already downloaded at ${jarPath}`);
-        return jarPath;
-    }
-    if (fs.existsSync(JAR_CACHE_DIR)) {
-        logger_1.logger.debug(`Deleting Jar cache at ${JAR_CACHE_DIR} because the CLI was run with a newer Jar version`);
-        rimraf.sync(JAR_CACHE_DIR);
-    }
-    utils.logBullet("Downloading buildtools.jar to " + jarPath);
-    utils.logBullet("For open source licenses used by this command, look in the META-INF directory in the buildtools.jar file");
-    const tmpfile = await downloadUtils.downloadToTmp(JAR_URL);
-    fs.mkdirSync(JAR_CACHE_DIR, { recursive: true });
-    fs.copySync(tmpfile, jarPath);
-    return jarPath;
-}
 function buildArgs(options) {
     const baseArgs = [
-        "-jar",
-        options.jarFile,
-        `-symbolGenerator=${options.generator}`,
-        `-symbolFileCacheDir=${options.cachePath}`,
+        "-symbolGenerator",
+        options.generator,
+        "-symbolFileCacheDir",
+        options.cachePath,
         "-verbose",
     ];
     if (options.generate) {
-        return baseArgs.concat(["-generateNativeSymbols", `-unstrippedLibrary=${options.symbolFile}`]);
-    }
-    return baseArgs.concat([
-        "-uploadNativeSymbols",
-        `-googleAppId=${options.app}`,
-    ]);
-}
-function runJar(args, debug) {
-    var _a, _b, _c;
-    const outputs = spawn.sync("java", args, {
-        stdio: debug ? "inherit" : "pipe",
-    });
-    if (outputs.status || 0 > 0) {
-        if (!debug) {
-            utils.logWarning(((_a = outputs.stdout) === null || _a === void 0 ? void 0 : _a.toString()) || "An unknown error occurred");
-        }
-        throw new error_1.FirebaseError("Failed to upload symbols");
-    }
-    if (!debug) {
-        let logRegex = /(Generated symbol file.*$)/m;
-        let matched = (((_b = outputs.stdout) === null || _b === void 0 ? void 0 : _b.toString()) || "").match(logRegex);
-        if (matched) {
-            return matched[1];
-        }
-        logRegex = /(Crashlytics symbol file uploaded successfully.*$)/m;
-        matched = (((_c = outputs.stdout) === null || _c === void 0 ? void 0 : _c.toString()) || "").match(logRegex);
-        if (matched) {
-            return matched[1];
-        }
-        return "";
+        return baseArgs.concat(["-generateNativeSymbols", "-unstrippedLibrary", options.symbolFile]);
     }
-    return "";
+    return baseArgs.concat(["-uploadNativeSymbols", "-googleAppId", options.app]);
 }

package/lib/commands/functions-delete.js

@@ -17,6 +17,7 @@ const fabricator = require("../deploy/functions/release/fabricator");
 const executor = require("../deploy/functions/release/executor");
 const reporter = require("../deploy/functions/release/reporter");
 const containerCleaner = require("../deploy/functions/containerCleaner");
+const getProjectNumber_1 = require("../getProjectNumber");
 exports.command = new command_1.Command("functions:delete [filters...]")
     .description("delete one or more Cloud Functions by name or group name.")
     .option("--region <region>", "Specify region of the function to be deleted. " +
@@ -78,6 +79,7 @@ exports.command = new command_1.Command("functions:delete [filters...]")
             appEngineLocation,
             executor: new executor.QueueExecutor({}),
             sources: {},
+            projectNumber: options.projectNumber || (await (0, getProjectNumber_1.getProjectNumber)({ projectId: context.projectId })),
         });
         const summary = await fab.applyPlan(plan);
         await reporter.logAndTrackDeployStats(summary);

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

@@ -6,8 +6,10 @@ const command_1 = require("../command");
 const logger_1 = require("../logger");
 const projectUtils_1 = require("../projectUtils");
 const secretManager_1 = require("../gcp/secretManager");
+const requirePermissions_1 = require("../requirePermissions");
 exports.command = new command_1.Command("functions:secrets:get <KEY>")
     .description("Get metadata for secret and its versions")
+    .before(requirePermissions_1.requirePermissions, ["secretmanager.secrets.get"])
     .action(async (key, options) => {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const versions = await (0, secretManager_1.listSecretVersions)(projectId, key);

package/lib/commands/index.js

@@ -34,6 +34,9 @@ function load(client) {
     client.crashlytics = {};
     client.crashlytics.symbols = {};
     client.crashlytics.symbols.upload = loadCommand("crashlytics-symbols-upload");
+    client.crashlytics.mappingfile = {};
+    client.crashlytics.mappingfile.generateid = loadCommand("crashlytics-mappingfile-generateid");
+    client.crashlytics.mappingfile.upload = loadCommand("crashlytics-mappingfile-upload");
     client.database = {};
     client.database.get = loadCommand("database-get");
     client.database.instances = {};

package/lib/crashlytics/buildToolsJarHelper.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runBuildtoolsCommand = exports.fetchBuildtoolsJar = void 0;
+const fs = require("fs-extra");
+const os = require("os");
+const path = require("path");
+const spawn = require("cross-spawn");
+const downloadUtils = require("../downloadUtils");
+const error_1 = require("../error");
+const logger_1 = require("../logger");
+const rimraf = require("rimraf");
+const utils = require("../utils");
+const JAR_CACHE_DIR = process.env.FIREBASE_CRASHLYTICS_BUILDTOOLS_PATH ||
+    path.join(os.homedir(), ".cache", "firebase", "crashlytics", "buildtools");
+const JAR_VERSION = "2.9.1";
+const JAR_URL = `https://dl.google.com/android/maven2/com/google/firebase/firebase-crashlytics-buildtools/${JAR_VERSION}/firebase-crashlytics-buildtools-${JAR_VERSION}.jar`;
+async function fetchBuildtoolsJar() {
+    if (process.env.CRASHLYTICS_LOCAL_JAR) {
+        return process.env.CRASHLYTICS_LOCAL_JAR;
+    }
+    const jarPath = path.join(JAR_CACHE_DIR, `crashlytics-buildtools-${JAR_VERSION}.jar`);
+    if (fs.existsSync(jarPath)) {
+        logger_1.logger.debug(`Buildtools Jar already downloaded at ${jarPath}`);
+        return jarPath;
+    }
+    if (fs.existsSync(JAR_CACHE_DIR)) {
+        logger_1.logger.debug(`Deleting Jar cache at ${JAR_CACHE_DIR} because the CLI was run with a newer Jar version`);
+        rimraf.sync(JAR_CACHE_DIR);
+    }
+    utils.logBullet("Downloading crashlytics-buildtools.jar to " + jarPath);
+    utils.logBullet("For open source licenses used by this command, look in the META-INF directory in the buildtools.jar file");
+    const tmpfile = await downloadUtils.downloadToTmp(JAR_URL);
+    fs.mkdirSync(JAR_CACHE_DIR, { recursive: true });
+    fs.copySync(tmpfile, jarPath);
+    return jarPath;
+}
+exports.fetchBuildtoolsJar = fetchBuildtoolsJar;
+function runBuildtoolsCommand(jarFile, args, debug) {
+    var _a;
+    const fullArgs = ["-jar", jarFile, ...args, "-clientName", "firebase-cli;crashlytics-buildtools"];
+    const outputs = spawn.sync("java", fullArgs, {
+        stdio: debug ? "inherit" : "pipe",
+    });
+    if (outputs.status !== 0) {
+        if (!debug) {
+            utils.logWarning(((_a = outputs.stdout) === null || _a === void 0 ? void 0 : _a.toString()) || "An unknown error occurred");
+        }
+        throw new error_1.FirebaseError(`java command failed with args: ${fullArgs}`);
+    }
+}
+exports.runBuildtoolsCommand = runBuildtoolsCommand;

package/lib/deploy/functions/backend.js

@@ -65,8 +65,8 @@ function memoryToGen1Cpu(memory) {
         2048: 1,
         4096: 2,
         8192: 2,
-        16384: 3,
-        32768: 4,
+        16384: 4,
+        32768: 8,
     }[memory];
 }
 exports.memoryToGen1Cpu = memoryToGen1Cpu;
@@ -79,8 +79,8 @@ function memoryToGen2Cpu(memory) {
         2048: 1,
         4096: 2,
         8192: 2,
-        16384: 2,
-        32768: 4,
+        16384: 4,
+        32768: 8,
     }[memory];
 }
 exports.memoryToGen2Cpu = memoryToGen2Cpu;

package/lib/deploy/functions/build.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toBackend = exports.resolveBackend = exports.of = exports.empty = void 0;
+exports.toBackend = exports.resolveBackend = exports.AllIngressSettings = exports.AllVpcEgressSettings = exports.AllFunctionsPlatforms = exports.isValidMemoryOption = exports.isBlockingTriggered = exports.isTaskQueueTriggered = exports.isScheduleTriggered = exports.isEventTriggered = exports.isCallableTriggered = exports.isHttpsTriggered = exports.of = exports.empty = void 0;
 const backend = require("./backend");
 const proto = require("../../gcp/proto");
 const api = require("../../.../../api");
@@ -8,6 +8,7 @@ const params = require("./params");
 const previews_1 = require("../../previews");
 const error_1 = require("../../error");
 const functional_1 = require("../../functional");
+const env_1 = require("../../functions/env");
 const logger_1 = require("../../logger");
 function empty() {
     return {
@@ -23,15 +24,79 @@ function of(endpoints) {
     return build;
 }
 exports.of = of;
+function isHttpsTriggered(triggered) {
+    return {}.hasOwnProperty.call(triggered, "httpsTrigger");
+}
+exports.isHttpsTriggered = isHttpsTriggered;
+function isCallableTriggered(triggered) {
+    return {}.hasOwnProperty.call(triggered, "callableTrigger");
+}
+exports.isCallableTriggered = isCallableTriggered;
+function isEventTriggered(triggered) {
+    return {}.hasOwnProperty.call(triggered, "eventTrigger");
+}
+exports.isEventTriggered = isEventTriggered;
+function isScheduleTriggered(triggered) {
+    return {}.hasOwnProperty.call(triggered, "scheduleTrigger");
+}
+exports.isScheduleTriggered = isScheduleTriggered;
+function isTaskQueueTriggered(triggered) {
+    return {}.hasOwnProperty.call(triggered, "taskQueueTrigger");
+}
+exports.isTaskQueueTriggered = isTaskQueueTriggered;
+function isBlockingTriggered(triggered) {
+    return {}.hasOwnProperty.call(triggered, "blockingTrigger");
+}
+exports.isBlockingTriggered = isBlockingTriggered;
+const allMemoryOptions = [128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768];
+function isValidMemoryOption(mem) {
+    return allMemoryOptions.includes(mem);
+}
+exports.isValidMemoryOption = isValidMemoryOption;
+exports.AllFunctionsPlatforms = ["gcfv1", "gcfv2"];
+exports.AllVpcEgressSettings = ["PRIVATE_RANGES_ONLY", "ALL_TRAFFIC"];
+exports.AllIngressSettings = [
+    "ALLOW_ALL",
+    "ALLOW_INTERNAL_ONLY",
+    "ALLOW_INTERNAL_AND_GCLB",
+];
 async function resolveBackend(build, userEnvOpt, userEnvs) {
+    var _a;
     const projectId = userEnvOpt.projectId;
     let paramValues = {};
     if (previews_1.previews.functionsparams) {
-        paramValues = await params.resolveParams(build.params, projectId, userEnvs);
+        paramValues = await params.resolveParams(build.params, projectId, envWithTypes(userEnvs));
+        const toWrite = {};
+        for (const paramName of Object.keys(paramValues)) {
+            if (userEnvs.hasOwnProperty(paramName)) {
+                continue;
+            }
+            toWrite[paramName] = ((_a = paramValues[paramName]) === null || _a === void 0 ? void 0 : _a.toString()) || "";
+        }
+        (0, env_1.writeUserEnvs)(toWrite, userEnvOpt);
     }
     return toBackend(build, paramValues);
 }
 exports.resolveBackend = resolveBackend;
+function envWithTypes(rawEnvs) {
+    const out = {};
+    for (const envName of Object.keys(rawEnvs)) {
+        const value = rawEnvs[envName];
+        if (!isNaN(+value) && isFinite(+value) && !value.includes("e")) {
+            out[envName] = +value;
+        }
+        else if (value === "true") {
+            out[envName] = true;
+        }
+        else if (value === "false") {
+            out[envName] = false;
+        }
+        else {
+            out[envName] = value;
+        }
+    }
+    return out;
+}
 class Resolver {
     constructor(paramValues) {
         this.paramValues = paramValues;
@@ -127,7 +192,7 @@ function toBackend(build, paramValues) {
 }
 exports.toBackend = toBackend;
 function discoverTrigger(endpoint, region, r) {
-    if ("httpsTrigger" in endpoint) {
+    if (isHttpsTriggered(endpoint)) {
         const httpsTrigger = {};
         if (endpoint.httpsTrigger.invoker === null) {
             httpsTrigger.invoker = null;
@@ -137,13 +202,13 @@ function discoverTrigger(endpoint, region, r) {
         }
         return { httpsTrigger };
     }
-    else if ("callableTrigger" in endpoint) {
+    else if (isCallableTriggered(endpoint)) {
         return { callableTrigger: {} };
     }
-    else if ("blockingTrigger" in endpoint) {
+    else if (isBlockingTriggered(endpoint)) {
         return { blockingTrigger: endpoint.blockingTrigger };
     }
-    else if ("eventTrigger" in endpoint) {
+    else if (isEventTriggered(endpoint)) {
         const eventTrigger = {
             eventType: endpoint.eventTrigger.eventType,
             retry: r.resolveBoolean(endpoint.eventTrigger.retry) || false,
@@ -157,11 +222,13 @@ function discoverTrigger(endpoint, region, r) {
         r.resolveStrings(eventTrigger, endpoint.eventTrigger, "serviceAccount", "region", "channel");
         return { eventTrigger };
     }
-    else if ("scheduleTrigger" in endpoint) {
+    else if (isScheduleTriggered(endpoint)) {
         const bkSchedule = {
             schedule: r.resolveString(endpoint.scheduleTrigger.schedule),
-            timeZone: r.resolveString(endpoint.scheduleTrigger.timeZone),
         };
+        if (endpoint.scheduleTrigger.timeZone !== undefined) {
+            bkSchedule.timeZone = r.resolveString(endpoint.scheduleTrigger.timeZone);
+        }
         if (endpoint.scheduleTrigger.retryConfig) {
             const bkRetry = {};
             r.resolveInts(bkRetry, endpoint.scheduleTrigger.retryConfig, "maxBackoffSeconds", "minBackoffSeconds", "maxRetrySeconds", "retryCount", "maxDoublings");

package/lib/deploy/functions/checkIam.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureServiceAgentRoles = exports.mergeBindings = exports.obtainDefaultComputeServiceAgentBindings = exports.obtainPubSubServiceAgentBindings = exports.checkHttpIam = exports.checkServiceAccountIam = exports.EVENTARC_EVENT_RECEIVER_ROLE = exports.RUN_INVOKER_ROLE = exports.SERVICE_ACCOUNT_TOKEN_CREATOR_ROLE = void 0;
+exports.ensureServiceAgentRoles = exports.mergeBindings = exports.obtainDefaultComputeServiceAgentBindings = exports.obtainPubSubServiceAgentBindings = exports.getDefaultComputeServiceAgent = exports.checkHttpIam = exports.checkServiceAccountIam = exports.EVENTARC_EVENT_RECEIVER_ROLE = exports.RUN_INVOKER_ROLE = exports.SERVICE_ACCOUNT_TOKEN_CREATOR_ROLE = void 0;
 const colorette_1 = require("colorette");
 const logger_1 = require("../../logger");
 const functionsDeployHelper_1 = require("./functionsDeployHelper");
@@ -68,11 +68,12 @@ async function checkHttpIam(context, options, payload) {
 }
 exports.checkHttpIam = checkHttpIam;
 function getPubsubServiceAgent(projectNumber) {
-    return `serviceAccount:service-${projectNumber}@gcp-sa-pubsub.iam.gserviceaccount.com`;
+    return `service-${projectNumber}@gcp-sa-pubsub.iam.gserviceaccount.com`;
 }
 function getDefaultComputeServiceAgent(projectNumber) {
-    return `serviceAccount:${projectNumber}-compute@developer.gserviceaccount.com`;
+    return `${projectNumber}-compute@developer.gserviceaccount.com`;
 }
+exports.getDefaultComputeServiceAgent = getDefaultComputeServiceAgent;
 function reduceEventsToServices(services, endpoint) {
     const service = (0, services_1.serviceForEndpoint)(endpoint);
     if (service.requiredProjectBindings && !services.find((s) => s.name === service.name)) {
@@ -83,13 +84,13 @@ function reduceEventsToServices(services, endpoint) {
 function obtainPubSubServiceAgentBindings(projectNumber) {
     const serviceAccountTokenCreatorBinding = {
         role: exports.SERVICE_ACCOUNT_TOKEN_CREATOR_ROLE,
-        members: [getPubsubServiceAgent(projectNumber)],
+        members: [`serviceAccount:${getPubsubServiceAgent(projectNumber)}`],
     };
     return [serviceAccountTokenCreatorBinding];
 }
 exports.obtainPubSubServiceAgentBindings = obtainPubSubServiceAgentBindings;
 function obtainDefaultComputeServiceAgentBindings(projectNumber) {
-    const defaultComputeServiceAgent = getDefaultComputeServiceAgent(projectNumber);
+    const defaultComputeServiceAgent = `serviceAccount:${getDefaultComputeServiceAgent(projectNumber)}`;
     const runInvokerBinding = {
         role: exports.RUN_INVOKER_ROLE,
         members: [defaultComputeServiceAgent],

package/lib/deploy/functions/params.js

@@ -21,7 +21,7 @@ function resolveInt(from, paramValues) {
     if (typeof from === "number") {
         return from;
     }
-    const match = /\A{{ params\.(\w+) }}\z/.exec(from);
+    const match = /{{ params\.(\w+) }}/.exec(from);
     if (!match) {
         throw new error_1.FirebaseError("CEL evaluation of expression '" + from + "' not yet supported");
     }
@@ -105,17 +105,17 @@ function canSatisfyParam(param, value) {
 async function resolveParams(params, projectId, userEnvs) {
     const paramValues = {};
     const [provided, outstanding] = (0, functional_1.partition)(params, (param) => {
-        return {}.hasOwnProperty.call(userEnvs, param.param);
+        return {}.hasOwnProperty.call(userEnvs, param.name);
     });
     for (const param of provided) {
-        if (!canSatisfyParam(param, userEnvs[param.param])) {
+        if (!canSatisfyParam(param, userEnvs[param.name])) {
             throw new error_1.FirebaseError("Parameter " +
-                param.param +
+                param.name +
                 " resolved to value from dotenv files " +
-                userEnvs[param.param] +
+                userEnvs[param.name] +
                 " of wrong type");
         }
-        paramValues[param.param] = userEnvs[param.param];
+        paramValues[param.name] = userEnvs[param.name];
     }
     for (const param of outstanding) {
         let paramDefault = param.default;
@@ -123,9 +123,9 @@ async function resolveParams(params, projectId, userEnvs) {
             paramDefault = resolveDefaultCEL(param.type, paramDefault, paramValues);
         }
         if (paramDefault && !canSatisfyParam(param, paramDefault)) {
-            throw new error_1.FirebaseError("Parameter " + param.param + " has default value " + paramDefault + " of wrong type");
+            throw new error_1.FirebaseError("Parameter " + param.name + " has default value " + paramDefault + " of wrong type");
         }
-        paramValues[param.param] = await promptParam(param, paramDefault);
+        paramValues[param.name] = await promptParam(param, paramDefault);
     }
     return paramValues;
 }
@@ -146,15 +146,15 @@ async function promptStringParam(param, resolvedDefault) {
     }
     switch (param.input.type) {
         case "select":
-            throw new error_1.FirebaseError("Build specified string parameter " + param.param + " with unsupported input type 'select'");
+            throw new error_1.FirebaseError("Build specified string parameter " + param.name + " with unsupported input type 'select'");
         case "text":
         default:
-            let prompt = `Enter a value for ${param.label || param.param}`;
+            let prompt = `Enter a value for ${param.label || param.name}:`;
             if (param.description) {
                 prompt += ` \n(${param.description})`;
             }
             return await (0, prompt_1.promptOnce)({
-                name: param.param,
+                name: param.name,
                 type: "input",
                 default: resolvedDefault,
                 message: prompt,
@@ -168,17 +168,17 @@ async function promptIntParam(param, resolvedDefault) {
     }
     switch (param.input.type) {
         case "select":
-            throw new error_1.FirebaseError("Build specified int parameter " + param.param + " with unsupported input type 'select'");
+            throw new error_1.FirebaseError("Build specified int parameter " + param.name + " with unsupported input type 'select'");
         case "text":
         default:
-            let prompt = `Enter a value for ${param.label || param.param}`;
+            let prompt = `Enter a value for ${param.label || param.name}:`;
             if (param.description) {
                 prompt += ` \n(${param.description})`;
             }
             let res;
             while (true) {
                 res = await (0, prompt_1.promptOnce)({
-                    name: param.param,
+                    name: param.name,
                     type: "number",
                     default: resolvedDefault,
                     message: prompt,
@@ -186,7 +186,7 @@ async function promptIntParam(param, resolvedDefault) {
                 if (Number.isInteger(res)) {
                     return res;
                 }
-                logger_1.logger.error(`${param.label || param.param} must be an integer; retrying...`);
+                logger_1.logger.error(`${param.label || param.name} must be an integer; retrying...`);
             }
     }
 }