firebase-tools 13.14.2 → 13.15.1

package/lib/deploy/extensions/prepare.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepare = void 0;
+exports.prepare = exports.prepareDynamicExtensions = void 0;
 const planner = require("./planner");
 const deploymentSummary = require("./deploymentSummary");
 const prompt = require("../../prompt");
@@ -16,32 +16,29 @@ const warnings_1 = require("../../extensions/warnings");
 const etags_1 = require("../../extensions/etags");
 const v2FunctionHelper_1 = require("./v2FunctionHelper");
 const tos_1 = require("../../extensions/tos");
-async function prepare(context, options, payload) {
+const common_1 = require("../../extensions/runtimes/common");
+const projectConfig_1 = require("../../functions/projectConfig");
+const functionsDeployHelper_1 = require("../functions/functionsDeployHelper");
+async function prepareHelper(context, options, payload, wantExtensions, noDeleteExtensions, isPrimaryCall) {
     var _a, _b;
-    context.extensionsStartTime = Date.now();
     const projectId = (0, projectUtils_1.needProjectId)(options);
-    const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);
-    const aliases = (0, projectUtils_1.getAliases)(options, projectId);
-    await (0, extensionsHelper_1.ensureExtensionsApiEnabled)(options);
-    await (0, requirePermissions_1.requirePermissions)(options, ["firebaseextensions.instances.list"]);
     context.have = await planner.have(projectId);
-    context.want = await planner.want({
-        projectId,
-        projectNumber,
-        aliases,
-        projectDir: options.config.projectDir,
-        extensions: options.config.get("extensions"),
-    });
+    context.want = wantExtensions;
     const etagsChanged = (0, etags_1.detectEtagChanges)(options.rc, projectId, context.have);
     if (etagsChanged.length) {
-        (0, warnings_1.outOfBandChangesWarning)(etagsChanged);
-        if (!(await prompt.confirm({
-            message: `Do you wish to continue deploying these extension instances?`,
-            default: false,
-            nonInteractive: options.nonInteractive,
-            force: options.force,
-        }))) {
-            throw new error_1.FirebaseError("Deployment cancelled");
+        const wantChangedIds = wantExtensions
+            .map((e) => e.instanceId)
+            .filter((id) => etagsChanged.includes(id));
+        if (wantChangedIds.length) {
+            (0, warnings_1.outOfBandChangesWarning)(wantChangedIds);
+            if (!(await prompt.confirm({
+                message: `Do you wish to continue deploying these extension instances?`,
+                default: false,
+                nonInteractive: options.nonInteractive,
+                force: options.force,
+            }))) {
+                throw new error_1.FirebaseError("Deployment cancelled");
+            }
         }
     }
     const usingSecrets = await Promise.all((_a = context.want) === null || _a === void 0 ? void 0 : _a.map(secrets_1.checkSpecForSecrets));
@@ -55,7 +52,7 @@ async function prepare(context, options, payload) {
     payload.instancesToCreate = context.want.filter((i) => { var _a; return !((_a = context.have) === null || _a === void 0 ? void 0 : _a.some(matchesInstanceId(i))); });
     payload.instancesToConfigure = context.want.filter((i) => { var _a; return (_a = context.have) === null || _a === void 0 ? void 0 : _a.some(isConfigure(i)); });
     payload.instancesToUpdate = context.want.filter((i) => { var _a; return (_a = context.have) === null || _a === void 0 ? void 0 : _a.some(isUpdate(i)); });
-    payload.instancesToDelete = context.have.filter((i) => { var _a; return !((_a = context.want) === null || _a === void 0 ? void 0 : _a.some(matchesInstanceId(i))); });
+    payload.instancesToDelete = context.have.filter((i) => { var _a; return !((_a = context.want) === null || _a === void 0 ? void 0 : _a.some(matchesInstanceId(i))) && !(noDeleteExtensions === null || noDeleteExtensions === void 0 ? void 0 : noDeleteExtensions.some(matchesInstanceId(i))); });
     if (await (0, warnings_1.displayWarningsForDeploy)(payload.instancesToCreate)) {
         if (!(await prompt.confirm({
             message: `Do you wish to continue deploying these extension instances?`,
@@ -67,6 +64,9 @@ async function prepare(context, options, payload) {
         }
     }
     const permissionsNeeded = [];
+    if (!isPrimaryCall) {
+        payload.instancesToDelete = [];
+    }
     if (payload.instancesToCreate.length) {
         permissionsNeeded.push("firebaseextensions.instances.create");
         logger_1.logger.info(deploymentSummary.createsSummary(payload.instancesToCreate));
@@ -98,6 +98,82 @@ async function prepare(context, options, payload) {
     await (0, requirePermissions_1.requirePermissions)(options, permissionsNeeded);
     await (0, tos_1.acceptLatestAppDeveloperTOS)(options, projectId, context.want.map((i) => i.instanceId));
 }
+async function prepareDynamicExtensions(context, options, payload, builds) {
+    const filters = (0, functionsDeployHelper_1.getEndpointFilters)(options);
+    const extensions = (0, common_1.extractExtensionsFromBuilds)(builds, filters);
+    if (Object.keys(extensions).length === 0) {
+        return;
+    }
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);
+    const aliases = (0, projectUtils_1.getAliases)(options, projectId);
+    const projectDir = options.config.projectDir;
+    const isPrimaryCall = !!options.only && !options.only.split(",").includes("extensions");
+    if (isPrimaryCall) {
+        await (0, extensionsHelper_1.ensureExtensionsApiEnabled)(options);
+    }
+    await (0, requirePermissions_1.requirePermissions)(options, ["firebaseextensions.instances.list"]);
+    const dynamicWant = await planner.wantDynamic({
+        projectId,
+        projectNumber,
+        extensions,
+    });
+    let noDeleteExtensions = [];
+    if (isPrimaryCall) {
+        const firebaseJsonWant = await planner.want({
+            projectId,
+            projectNumber,
+            aliases,
+            projectDir,
+            extensions: options.config.get("extensions"),
+        });
+        noDeleteExtensions = noDeleteExtensions.concat(firebaseJsonWant);
+        if (hasNonDeployingCodebases(options)) {
+            const dynamicAll = await planner.wantDynamic({
+                projectId,
+                projectNumber,
+                extensions: await (0, common_1.extractAllDynamicExtensions)(options),
+            });
+            noDeleteExtensions = noDeleteExtensions.concat(dynamicAll);
+        }
+    }
+    return prepareHelper(context, options, payload, dynamicWant, noDeleteExtensions, isPrimaryCall);
+}
+exports.prepareDynamicExtensions = prepareDynamicExtensions;
+function hasNonDeployingCodebases(options) {
+    const functionFilters = (0, functionsDeployHelper_1.getEndpointFilters)(options);
+    if (functionFilters === null || functionFilters === void 0 ? void 0 : functionFilters.length) {
+        return true;
+    }
+    const functionsConfig = (0, projectConfig_1.normalizeAndValidate)(options.config.src.functions);
+    const allCodebases = (0, functionsDeployHelper_1.targetCodebases)(functionsConfig);
+    const deployingCodebases = (0, functionsDeployHelper_1.targetCodebases)(functionsConfig, functionFilters);
+    if (allCodebases.length > deployingCodebases.length) {
+        return true;
+    }
+}
+async function prepare(context, options, payload) {
+    context.extensionsStartTime = Date.now();
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);
+    const aliases = (0, projectUtils_1.getAliases)(options, projectId);
+    const projectDir = options.config.projectDir;
+    await (0, extensionsHelper_1.ensureExtensionsApiEnabled)(options);
+    await (0, requirePermissions_1.requirePermissions)(options, ["firebaseextensions.instances.list"]);
+    const firebaseJsonWant = await planner.want({
+        projectId,
+        projectNumber,
+        aliases,
+        projectDir,
+        extensions: options.config.get("extensions"),
+    });
+    const dynamicWant = await planner.wantDynamic({
+        projectId,
+        projectNumber,
+        extensions: await (0, common_1.extractAllDynamicExtensions)(options),
+    });
+    return prepareHelper(context, options, payload, firebaseJsonWant, dynamicWant, true);
+}
 exports.prepare = prepare;
 const matchesInstanceId = (dep) => (test) => {
     return dep.instanceId === test.instanceId;

package/lib/deploy/functions/build.js

@@ -55,19 +55,19 @@ exports.AllIngressSettings = [
     "ALLOW_INTERNAL_ONLY",
     "ALLOW_INTERNAL_AND_GCLB",
 ];
-async function resolveBackend(build, firebaseConfig, userEnvOpt, userEnvs, nonInteractive) {
+async function resolveBackend(opts) {
     let paramValues = {};
-    paramValues = await params.resolveParams(build.params, firebaseConfig, envWithTypes(build.params, userEnvs), nonInteractive);
+    paramValues = await params.resolveParams(opts.build.params, opts.firebaseConfig, envWithTypes(opts.build.params, opts.userEnvs), opts.nonInteractive, opts.isEmulator);
     const toWrite = {};
     for (const paramName of Object.keys(paramValues)) {
         const paramValue = paramValues[paramName];
-        if (Object.prototype.hasOwnProperty.call(userEnvs, paramName) || paramValue.internal) {
+        if (Object.prototype.hasOwnProperty.call(opts.userEnvs, paramName) || paramValue.internal) {
             continue;
         }
         toWrite[paramName] = paramValue.toString();
     }
-    (0, env_1.writeUserEnvs)(toWrite, userEnvOpt);
-    return { backend: toBackend(build, paramValues), envs: paramValues };
+    (0, env_1.writeUserEnvs)(toWrite, opts.userEnvOpt);
+    return { backend: toBackend(opts.build, paramValues), envs: paramValues };
 }
 exports.resolveBackend = resolveBackend;
 function envWithTypes(definedParams, rawEnvs) {

package/lib/deploy/functions/deploy.js

@@ -12,6 +12,7 @@ const gcf = require("../../gcp/cloudfunctions");
 const gcfv2 = require("../../gcp/cloudfunctionsv2");
 const backend = require("./backend");
 const backend_1 = require("./backend");
+const extensions_1 = require("../extensions");
 (0, tmp_1.setGracefulCleanup)();
 async function uploadSourceV1(projectId, source, wantBackend) {
     const v1Endpoints = backend.allEndpoints(wantBackend).filter((e) => e.platform === "gcfv1");
@@ -77,21 +78,20 @@ async function uploadCodebase(context, codebase, wantBackend) {
     }
 }
 async function deploy(context, options, payload) {
-    if (!context.config) {
-        return;
-    }
-    if (!payload.functions) {
-        return;
+    if (payload.extensions && context.extensions) {
+        await (0, extensions_1.deploy)(context.extensions, options, payload.extensions);
     }
-    await (0, checkIam_1.checkHttpIam)(context, options, payload);
-    const uploads = [];
-    for (const [codebase, { wantBackend, haveBackend }] of Object.entries(payload.functions)) {
-        if (shouldUploadBeSkipped(context, wantBackend, haveBackend)) {
-            continue;
+    if (payload.functions && context.config) {
+        await (0, checkIam_1.checkHttpIam)(context, options, payload);
+        const uploads = [];
+        for (const [codebase, { wantBackend, haveBackend }] of Object.entries(payload.functions)) {
+            if (shouldUploadBeSkipped(context, wantBackend, haveBackend)) {
+                continue;
+            }
+            uploads.push(uploadCodebase(context, codebase, wantBackend));
         }
-        uploads.push(uploadCodebase(context, codebase, wantBackend));
+        await Promise.all(uploads);
     }
-    await Promise.all(uploads);
 }
 exports.deploy = deploy;
 function shouldUploadBeSkipped(context, wantBackend, haveBackend) {

package/lib/deploy/functions/params.js

@@ -154,7 +154,7 @@ function canSatisfyParam(param, value) {
     }
     (0, functional_1.assertExhaustive)(param);
 }
-async function resolveParams(params, firebaseConfig, userEnvs, nonInteractive) {
+async function resolveParams(params, firebaseConfig, userEnvs, nonInteractive, isEmulator = false) {
     const paramValues = populateDefaultParams(firebaseConfig);
     const [resolved, outstanding] = (0, functional_1.partition)(params, (param) => {
         return {}.hasOwnProperty.call(userEnvs, param.name);
@@ -163,8 +163,10 @@ async function resolveParams(params, firebaseConfig, userEnvs, nonInteractive) {
         paramValues[param.name] = userEnvs[param.name];
     }
     const [needSecret, needPrompt] = (0, functional_1.partition)(outstanding, (param) => param.type === "secret");
-    for (const param of needSecret) {
-        await handleSecret(param, firebaseConfig.projectId);
+    if (!isEmulator) {
+        for (const param of needSecret) {
+            await handleSecret(param, firebaseConfig.projectId);
+        }
     }
     if (nonInteractive && needPrompt.length > 0) {
         const envNames = outstanding.map((p) => p.name).join(", ");

package/lib/deploy/functions/prepare.js

@@ -27,6 +27,7 @@ const serviceusage_1 = require("../../gcp/serviceusage");
 const applyHash_1 = require("./cache/applyHash");
 const backend_1 = require("./backend");
 const functional_1 = require("../../functional");
+const prepare_1 = require("../extensions/prepare");
 exports.EVENTARC_SOURCE_ENV = "EVENTARC_CLOUD_EVENT_SOURCE";
 async function prepare(context, options, payload) {
     var _a, _b;
@@ -55,6 +56,13 @@ async function prepare(context, options, payload) {
     }
     context.codebaseDeployEvents = {};
     const wantBuilds = await loadCodebases(context.config, options, firebaseConfig, runtimeConfig, context.filters);
+    if (Object.values(wantBuilds).some((b) => b.extensions)) {
+        const extContext = {};
+        const extPayload = {};
+        await (0, prepare_1.prepareDynamicExtensions)(extContext, options, extPayload, wantBuilds);
+        context.extensions = extContext;
+        payload.extensions = extPayload;
+    }
     const codebaseUsesEnvs = [];
     const wantBackends = {};
     for (const [codebase, wantBuild] of Object.entries(wantBuilds)) {
@@ -67,7 +75,14 @@ async function prepare(context, options, payload) {
         };
         const userEnvs = functionsEnv.loadUserEnvs(userEnvOpt);
         const envs = Object.assign(Object.assign({}, userEnvs), firebaseEnvs);
-        const { backend: wantBackend, envs: resolvedEnvs } = await build.resolveBackend(wantBuild, firebaseConfig, userEnvOpt, userEnvs, options.nonInteractive);
+        const { backend: wantBackend, envs: resolvedEnvs } = await build.resolveBackend({
+            build: wantBuild,
+            firebaseConfig,
+            userEnvOpt,
+            userEnvs,
+            nonInteractive: options.nonInteractive,
+            isEmulator: false,
+        });
         let hasEnvsFromParams = false;
         wantBackend.environmentVariables = envs;
         for (const envName of Object.keys(resolvedEnvs)) {

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

@@ -16,7 +16,11 @@ const functionsConfig_1 = require("../../../functionsConfig");
 const functionsDeployHelper_1 = require("../functionsDeployHelper");
 const error_1 = require("../../../error");
 const getProjectNumber_1 = require("../../../getProjectNumber");
+const extensions_1 = require("../../extensions");
 async function release(context, options, payload) {
+    if (context.extensions && payload.extensions) {
+        await (0, extensions_1.release)(context.extensions, options, payload.extensions);
+    }
     if (!context.config) {
         return;
     }

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

@@ -21,7 +21,7 @@ function assertKeyTypes(prefix, yaml, schema) {
         const key = keyAsString;
         const fullKey = prefix ? `${prefix}.${keyAsString}` : keyAsString;
         if (!schema[key] || schema[key] === "omit") {
-            throw new error_1.FirebaseError(`Unexpected key ${fullKey}. You may need to install a newer version of the Firebase CLI.`);
+            throw new error_1.FirebaseError(`Unexpected key '${fullKey}'. You may need to install a newer version of the Firebase CLI.`);
         }
         let schemaType = schema[key];
         if (typeof schemaType === "function") {

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

@@ -21,6 +21,7 @@ function buildFromV1Alpha1(yaml, project, region, runtime) {
         params: "array",
         requiredAPIs: "array",
         endpoints: "object",
+        extensions: "object",
     });
     const bd = build.empty();
     bd.params = manifest.params || [];
@@ -31,6 +32,15 @@ function buildFromV1Alpha1(yaml, project, region, runtime) {
         const be = parseEndpointForBuild(id, me, project, region, runtime);
         bd.endpoints[id] = be;
     }
+    if (manifest.extensions) {
+        bd.extensions = {};
+        for (const id of Object.keys(manifest.extensions)) {
+            const me = manifest.extensions[id];
+            assertBuildExtension(me, id);
+            const be = parseExtensionForBuild(me);
+            bd.extensions[id] = be;
+        }
+    }
     return bd;
 }
 exports.buildFromV1Alpha1 = buildFromV1Alpha1;
@@ -272,6 +282,42 @@ function parseEndpointForBuild(id, ep, project, defaultRegion, runtime) {
     });
     return parsed;
 }
+function assertBuildExtension(ex, id) {
+    const prefix = `extensions[${id}]`;
+    (0, parsing_1.assertKeyTypes)(prefix, ex, {
+        params: "object",
+        ref: "string?",
+        localPath: "string?",
+        events: "array",
+    });
+    let refOrPath = 0;
+    if (ex.ref) {
+        refOrPath++;
+    }
+    if (ex.localPath) {
+        refOrPath++;
+    }
+    if (refOrPath === 0) {
+        throw new error_1.FirebaseError(`Expected either extension reference or local path in extension: ${id}`);
+    }
+    if (refOrPath > 1) {
+        throw new error_1.FirebaseError(`Multiple definitions for extension ${id}. Do not specify both reference and local path.`);
+    }
+}
+function parseExtensionForBuild(ex) {
+    const parsed = {
+        params: {},
+        events: [],
+    };
+    if (ex.localPath) {
+        parsed.localPath = ex.localPath;
+    }
+    else {
+        parsed.ref = ex.ref;
+    }
+    (0, proto_1.copyIfPresent)(parsed, ex, "params", "events");
+    return parsed;
+}
 function resolveChannelName(projectId, channel, defaultRegion) {
     if (!channel.includes("/")) {
         const location = defaultRegion;

package/lib/emulator/dataconnectEmulator.js

@@ -53,6 +53,8 @@ class DataConnectEmulator {
                 auto_download: this.args.auto_download,
                 listen: (0, portUtils_1.listenSpecsToString)(this.args.listen),
                 config_dir: resolvedConfigDir,
+                enable_output_schema_extensions: true,
+                enable_output_generated_sdk: true,
             });
             this.usingExistingEmulator = false;
         }

package/lib/emulator/downloadableEmulators.js

@@ -46,20 +46,20 @@ const EMULATOR_UPDATE_DETAILS = {
     },
     dataconnect: process.platform === "darwin"
         ? {
-            version: "1.3.1",
-            expectedSize: 24175424,
-            expectedChecksum: "9ce1ee2ed6994ca62df6dfef3fdece62",
+            version: "1.3.4",
+            expectedSize: 24216320,
+            expectedChecksum: "f57bc0b9a10837ecb4f2808c49ae3ff5",
         }
         : process.platform === "win32"
             ? {
-                version: "1.3.1",
-                expectedSize: 24587264,
-                expectedChecksum: "1d31fd26506cfc9b822fdb8e8834d14c",
+                version: "1.3.4",
+                expectedSize: 24631296,
+                expectedChecksum: "c8f1433fbff26f5e9da30cf205f2af78",
             }
             : {
-                version: "1.3.1",
-                expectedSize: 24088728,
-                expectedChecksum: "223f7eebde618ba92788579dd35fec43",
+                version: "1.3.4",
+                expectedSize: 24125592,
+                expectedChecksum: "a7b9a79d66fa5ebfb1a0f65e535d5c33",
             },
 };
 exports.DownloadDetails = {
@@ -243,9 +243,8 @@ const Commands = {
         optionalArgs: [
             "listen",
             "config_dir",
-            "disable_sdk_generation",
-            "resolvers_emulator",
-            "rpc_retry_count",
+            "enable_output_schema_extensions",
+            "enable_output_generated_sdk",
         ],
         joinArgs: true,
         shell: false,

package/lib/emulator/functionsEmulator.js

@@ -315,7 +315,14 @@ class FunctionsEmulator {
             };
             const userEnvs = functionsEnv.loadUserEnvs(userEnvOpt);
             const discoveredBuild = await runtimeDelegate.discoverBuild(runtimeConfig, environment);
-            const resolution = await (0, build_1.resolveBackend)(discoveredBuild, JSON.parse(firebaseConfig), userEnvOpt, userEnvs);
+            const resolution = await (0, build_1.resolveBackend)({
+                build: discoveredBuild,
+                firebaseConfig: JSON.parse(firebaseConfig),
+                userEnvOpt,
+                userEnvs,
+                nonInteractive: false,
+                isEmulator: true,
+            });
             const discoveredBackend = resolution.backend;
             const endpoints = backend.allEndpoints(discoveredBackend);
             (0, functionsEmulatorShared_1.prepareEndpoints)(endpoints);

package/lib/extensions/askUserForEventsConfig.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.askForEventArcLocation = exports.askShouldCollectEventsConfig = exports.askForAllowedEventTypes = exports.askForEventsConfig = exports.checkAllowedEventTypesResponse = void 0;
+exports.askForEventArcLocation = exports.EXTENSIONS_DEFAULT_EVENT_ARC_REGION = exports.ALLOWED_EVENT_ARC_REGIONS = exports.askShouldCollectEventsConfig = exports.askForAllowedEventTypes = exports.getEventArcChannel = exports.askForEventsConfig = exports.checkAllowedEventTypesResponse = void 0;
 const prompt_1 = require("../prompt");
 const extensionsApi = require("../extensions/extensionsApi");
 const utils = require("../utils");
@@ -23,7 +23,7 @@ function checkAllowedEventTypesResponse(response, validEvents) {
 exports.checkAllowedEventTypesResponse = checkAllowedEventTypesResponse;
 async function askForEventsConfig(events, projectId, instanceId) {
     var _a, _b;
-    logger_1.logger.info(`\n${clc.bold("Enable Events")}: ${(0, marked_1.marked)("If you enable events, you can write custom event handlers ([https://firebase.google.com/docs/extensions/install-extensions#eventarc](https://firebase.google.com/docs/extensions/install-extensions#eventarc)) that respond to these events.\n\nYou can always enable or disable events later. Events will be emitted via Eventarc. Fees apply ([https://cloud.google.com/eventarc/pricing](https://cloud.google.com/eventarc/pricing)).")}`);
+    logger_1.logger.info(`\n${clc.bold("Enable Events")}: ${await (0, marked_1.marked)("If you enable events, you can write custom event handlers ([https://firebase.google.com/docs/extensions/install-extensions#eventarc](https://firebase.google.com/docs/extensions/install-extensions#eventarc)) that respond to these events.\n\nYou can always enable or disable events later. Events will be emitted via Eventarc. Fees apply ([https://cloud.google.com/eventarc/pricing](https://cloud.google.com/eventarc/pricing)).")}`);
     if (!(await askShouldCollectEventsConfig())) {
         return undefined;
     }
@@ -38,11 +38,15 @@ async function askForEventsConfig(events, projectId, instanceId) {
     const preselectedTypes = (_a = existingInstance === null || existingInstance === void 0 ? void 0 : existingInstance.config.allowedEventTypes) !== null && _a !== void 0 ? _a : [];
     const oldLocation = (_b = existingInstance === null || existingInstance === void 0 ? void 0 : existingInstance.config.eventarcChannel) === null || _b === void 0 ? void 0 : _b.split("/")[3];
     const location = await askForEventArcLocation(oldLocation);
-    const channel = `projects/${projectId}/locations/${location}/channels/firebase`;
+    const channel = getEventArcChannel(projectId, location);
     const allowedEventTypes = await askForAllowedEventTypes(events, preselectedTypes);
     return { channel, allowedEventTypes };
 }
 exports.askForEventsConfig = askForEventsConfig;
+function getEventArcChannel(projectId, location) {
+    return `projects/${projectId}/locations/${location}/channels/firebase`;
+}
+exports.getEventArcChannel = getEventArcChannel;
 async function askForAllowedEventTypes(eventDescriptors, preselectedTypes) {
     let valid = false;
     let response = [];
@@ -75,21 +79,27 @@ async function askShouldCollectEventsConfig() {
     });
 }
 exports.askShouldCollectEventsConfig = askShouldCollectEventsConfig;
+exports.ALLOWED_EVENT_ARC_REGIONS = [
+    "us-central1",
+    "us-west1",
+    "europe-west4",
+    "asia-northeast1",
+];
+exports.EXTENSIONS_DEFAULT_EVENT_ARC_REGION = "us-central1";
 async function askForEventArcLocation(preselectedLocation) {
     let valid = false;
-    const allowedRegions = ["us-central1", "us-west1", "europe-west4", "asia-northeast1"];
     let location = "";
     while (!valid) {
         location = await (0, prompt_1.promptOnce)({
             name: "input",
             type: "list",
-            default: preselectedLocation !== null && preselectedLocation !== void 0 ? preselectedLocation : "us-central1",
+            default: preselectedLocation !== null && preselectedLocation !== void 0 ? preselectedLocation : exports.EXTENSIONS_DEFAULT_EVENT_ARC_REGION,
             message: "Which location would you like the Eventarc channel to live in? We recommend using the default option. A channel location that differs from the extension's Cloud Functions location can incur egress cost.",
-            choices: allowedRegions.map((e) => ({ checked: false, value: e })),
+            choices: exports.ALLOWED_EVENT_ARC_REGIONS.map((e) => ({ checked: false, value: e })),
         });
-        valid = allowedRegions.includes(location);
+        valid = exports.ALLOWED_EVENT_ARC_REGIONS.includes(location);
         if (!valid) {
-            utils.logWarning(`Unexpected EventArc region '${location}' was specified. Allowed regions: ${allowedRegions.join(", ")}`);
+            utils.logWarning(`Unexpected EventArc region '${location}' was specified. Allowed regions: ${exports.ALLOWED_EVENT_ARC_REGIONS.join(", ")}`);
         }
     }
     return location;

package/lib/extensions/askUserForParam.js

@@ -122,7 +122,7 @@ async function askForParam(args) {
     let secretLocations = [];
     const description = paramSpec.description || "";
     const label = paramSpec.label.trim();
-    logger_1.logger.info(`\n${clc.bold(label)}${clc.bold(paramSpec.required ? "" : " (Optional)")}: ${(0, marked_1.marked)(description).trim()}`);
+    logger_1.logger.info(`\n${clc.bold(label)}${clc.bold(paramSpec.required ? "" : " (Optional)")}: ${(await (0, marked_1.marked)(description)).trim()}`);
     while (!valid) {
         switch (paramSpec.type) {
             case types_1.ParamType.SELECT:
@@ -255,7 +255,7 @@ async function promptReconfigureSecret(projectId, instanceId, paramSpec) {
         ],
     });
     switch (action) {
-        case SecretUpdateAction.SET_NEW:
+        case SecretUpdateAction.SET_NEW: {
             let secret;
             let secretName;
             if (paramSpec.default) {
@@ -288,6 +288,7 @@ async function promptReconfigureSecret(projectId, instanceId, paramSpec) {
             else {
                 return "";
             }
+        }
         case SecretUpdateAction.LEAVE:
         default:
             return paramSpec.default || "";

package/lib/extensions/change-log.js

@@ -5,16 +5,14 @@ const clc = require("colorette");
 const marked_1 = require("marked");
 const path = require("path");
 const semver = require("semver");
-const TerminalRenderer = require("marked-terminal");
+const marked_terminal_1 = require("marked-terminal");
 const Table = require("cli-table");
 const extensionsApi_1 = require("./extensionsApi");
 const localHelper_1 = require("./localHelper");
 const logger_1 = require("../logger");
 const refs = require("./refs");
 const utils_1 = require("../utils");
-marked_1.marked.setOptions({
-    renderer: new TerminalRenderer(),
-});
+marked_1.marked.use((0, marked_terminal_1.markedTerminal)());
 const EXTENSIONS_CHANGELOG = "CHANGELOG.md";
 const VERSION_LINE_REGEX = /##.+?(\d+\.\d+\.\d+(?:-((\d+|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(\d+|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?).*/;
 async function getReleaseNotesForUpdate(args) {

package/lib/extensions/displayExtensionInfo.js

@@ -2,18 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.retrieveRoleInfo = exports.displayResources = exports.displayEvents = exports.displayExternalServices = exports.displayExtensionVersionInfo = void 0;
 const clc = require("colorette");
-const marked_1 = require("marked");
 const semver = require("semver");
-const TerminalRenderer = require("marked-terminal");
 const path = require("path");
 const refs = require("../extensions/refs");
 const logger_1 = require("../logger");
 const types_1 = require("./types");
 const iam = require("../gcp/iam");
 const secretsUtils_1 = require("./secretsUtils");
-marked_1.marked.setOptions({
-    renderer: new TerminalRenderer(),
-});
 const TASKS_ROLE = "cloudtasks.enqueuer";
 const TASKS_API = "cloudtasks.googleapis.com";
 async function displayExtensionVersionInfo(args) {
@@ -55,7 +50,7 @@ async function displayExtensionVersionInfo(args) {
         if (extensionVersion.buildSourceUri) {
             const buildSourceUri = new URL(extensionVersion.buildSourceUri);
             buildSourceUri.pathname = path.join(buildSourceUri.pathname, (_c = extensionVersion.extensionRoot) !== null && _c !== void 0 ? _c : "");
-            lines.push(`${clc.bold("Source in GitHub:")} ${buildSourceUri}`);
+            lines.push(`${clc.bold("Source in GitHub:")} ${buildSourceUri.toString()}`);
         }
         else {
             lines.push(`${clc.bold("Source download URI:")} ${(_d = extensionVersion.sourceDownloadUri) !== null && _d !== void 0 ? _d : "-"}`);
@@ -110,24 +105,24 @@ function displayResources(spec) {
                 break;
             default:
         }
-        return `  - ${clc.blue(`${resource.name} (${type})`)}${resource.description ? `: ${resource.description}` : ""}`;
+        return `  - ${clc.blueBright(`${resource.name} (${type})`)}${resource.description ? `: ${resource.description}` : ""}`;
     });
     lines.push(...new Set((_a = spec.lifecycleEvents) === null || _a === void 0 ? void 0 : _a.map((event) => {
-        return `  - ${clc.blue(`${event.taskQueueTriggerFunction} (Cloud Task queue)`)}`;
+        return `  - ${clc.blueBright(`${event.taskQueueTriggerFunction} (Cloud Task queue)`)}`;
     })));
     lines.push(...spec.params
         .filter((param) => {
         return param.type === "SECRET";
     })
         .map((param) => {
-        return `  - ${clc.blue(`${param.param} (Cloud Secret Manager secret)`)}`;
+        return `  - ${clc.blueBright(`${param.param} (Cloud Secret Manager secret)`)}`;
     }));
     return clc.bold("Resources created:\n") + (lines.length ? lines.join("\n") : " - None");
 }
 exports.displayResources = displayResources;
 async function retrieveRoleInfo(role) {
     const res = await iam.getRole(role);
-    return `  - ${clc.yellow(res.title)}${res.description ? `: ${res.description}` : ""}`;
+    return `  - ${clc.yellow(res.title || res.name)}${res.description ? `: ${res.description}` : ""}`;
 }
 exports.retrieveRoleInfo = retrieveRoleInfo;
 async function displayRoles(roles) {

package/lib/extensions/extensionsApi.js

@@ -356,6 +356,6 @@ function refNotFoundError(ref) {
     return new error_1.FirebaseError(`The extension reference '${clc.bold(ref.version ? refs.toExtensionVersionRef(ref) : refs.toExtensionRef(ref))}' doesn't exist. This could happen for two reasons:\n` +
         `  -The publisher ID '${clc.bold(ref.publisherId)}' doesn't exist or could be misspelled\n` +
         `  -The name of the ${ref.version ? "extension version" : "extension"} '${clc.bold(ref.version ? `${ref.extensionId}@${ref.version}` : ref.extensionId)}' doesn't exist or could be misspelled\n\n` +
-        `Please correct the extension reference and try again. If you meant to install an extension from a local source, please provide a relative path prefixed with '${clc.bold("./")}', '${clc.bold("../")}', or '${clc.bold("~/")}'.}`, { status: 404 });
+        `Please correct the extension reference and try again. If you meant to reference an extension from a local source, please provide a relative path prefixed with '${clc.bold("./")}', '${clc.bold("../")}', or '${clc.bold("~/")}'.}`, { status: 404 });
 }
 exports.refNotFoundError = refNotFoundError;