firebase-tools 13.15.0 → 13.15.2

package/lib/commands/deploy.js

@@ -80,7 +80,9 @@ exports.command = new command_1.Command("deploy")
     .option("--only <targets>", 'only deploy to specified, comma-separated targets (e.g. "hosting,storage"). For functions, ' +
     'can specify filters with colons to scope function deploys to only those functions (e.g. "--only functions:func1,functions:func2"). ' +
     "When filtering based on export groups (the exported module object keys), use dots to specify group names " +
-    '(e.g. "--only functions:group1.subgroup1,functions:group2)"' +
+    '(e.g. "--only functions:group1.subgroup1,functions:group2"). ' +
+    "When filtering based on codebases, use colons to specify codebase names " +
+    '(e.g. "--only functions:codebase1:func1,functions:codebase2:group1.subgroup1"). ' +
     "For data connect, can specify filters with colons to deploy only a service, connector, or schema" +
     '(e.g. "--only dataconnect:serviceId,dataconnect:serviceId:connectorId,dataconnect:serviceId:schema"). ')
     .option("--except <targets>", 'deploy to all targets except specified (e.g. "database")')

package/lib/dataconnect/fileUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPlatformFromFolder = exports.pickService = exports.readGQLFiles = exports.readConnectorYaml = exports.readDataConnectYaml = exports.readFirebaseJson = void 0;
+exports.generateSdkYaml = exports.directoryHasPackageJson = exports.getPlatformFromFolder = exports.pickService = exports.readGQLFiles = exports.readConnectorYaml = exports.readDataConnectYaml = exports.readFirebaseJson = void 0;
 const fs = require("fs-extra");
 const path = require("path");
 const error_1 = require("../error");
@@ -95,21 +95,62 @@ async function pickService(projectId, config, serviceId) {
 exports.pickService = pickService;
 const WEB_INDICATORS = ["package.json", "package-lock.json", "node_modules"];
 const IOS_INDICATORS = ["info.plist", "podfile", "package.swift"];
-const ANDROID_INDICATORS = ["androidmanifest.xml", "build.gradle"];
-const IOS_INDICATORS_2 = [".xcworkspace", ".xcodeproj"];
+const ANDROID_INDICATORS = ["androidmanifest.xml", "build.gradle", "build.gradle.kts"];
+const IOS_POSTFIX_INDICATORS = [".xcworkspace", ".xcodeproj"];
 async function getPlatformFromFolder(dirPath) {
     const fileNames = await fs.readdir(dirPath);
+    let hasWeb = false;
+    let hasAndroid = false;
+    let hasIOS = false;
     for (const fileName of fileNames) {
         const cleanedFileName = fileName.toLowerCase();
-        if (WEB_INDICATORS.some((indicator) => indicator === cleanedFileName))
-            return types_1.Platform.WEB;
-        if (ANDROID_INDICATORS.some((indicator) => indicator === cleanedFileName))
-            return types_1.Platform.ANDROID;
-        if (IOS_INDICATORS.some((indicator) => indicator === cleanedFileName))
-            return types_1.Platform.IOS;
-        if (IOS_INDICATORS_2.some((indicator) => cleanedFileName.endsWith(indicator)))
-            return types_1.Platform.IOS;
+        hasWeb || (hasWeb = WEB_INDICATORS.some((indicator) => indicator === cleanedFileName));
+        hasAndroid || (hasAndroid = ANDROID_INDICATORS.some((indicator) => indicator === cleanedFileName));
+        hasIOS || (hasIOS = IOS_INDICATORS.some((indicator) => indicator === cleanedFileName) ||
+            IOS_POSTFIX_INDICATORS.some((indicator) => cleanedFileName.endsWith(indicator)));
+    }
+    if (hasWeb && !hasAndroid && !hasIOS) {
+        return types_1.Platform.WEB;
+    }
+    else if (hasAndroid && !hasWeb && !hasIOS) {
+        return types_1.Platform.ANDROID;
+    }
+    else if (hasIOS && !hasWeb && !hasAndroid) {
+        return types_1.Platform.IOS;
     }
     return types_1.Platform.UNDETERMINED;
 }
 exports.getPlatformFromFolder = getPlatformFromFolder;
+async function directoryHasPackageJson(dirPath) {
+    const fileNames = await fs.readdir(dirPath);
+    return fileNames.some((f) => f.toLowerCase() === "package.json");
+}
+exports.directoryHasPackageJson = directoryHasPackageJson;
+function generateSdkYaml(platform, connectorYaml, connectorYamlFolder, appFolder) {
+    const relPath = path.relative(connectorYamlFolder, appFolder);
+    const outputDir = path.join(relPath, "dataconnect-generated");
+    if (!connectorYaml.generate) {
+        connectorYaml.generate = {};
+    }
+    if (platform === types_1.Platform.WEB) {
+        connectorYaml.generate.javascriptSdk = {
+            outputDir,
+            package: `@firebasegen/${connectorYaml.connectorId}`,
+            packageJsonDir: appFolder,
+        };
+    }
+    if (platform === types_1.Platform.IOS) {
+        connectorYaml.generate.swiftSdk = {
+            outputDir,
+            package: connectorYaml.connectorId,
+        };
+    }
+    if (platform === types_1.Platform.ANDROID) {
+        connectorYaml.generate.kotlinSdk = {
+            outputDir,
+            package: `connectors.${connectorYaml.connectorId}`,
+        };
+    }
+    return connectorYaml;
+}
+exports.generateSdkYaml = generateSdkYaml;

package/lib/dataconnect/provisionCloudSql.js

@@ -5,6 +5,7 @@ const cloudSqlAdminClient = require("../gcp/cloudsql/cloudsqladmin");
 const utils = require("../utils");
 const checkIam_1 = require("./checkIam");
 const utils_1 = require("../utils");
+const logger_1 = require("../logger");
 const GOOGLE_ML_INTEGRATION_ROLE = "roles/aiplatform.user";
 const freeTrial_1 = require("./freeTrial");
 const error_1 = require("../error");
@@ -44,7 +45,9 @@ async function provisionCloudSql(args) {
             connectionName = (newInstance === null || newInstance === void 0 ? void 0 : newInstance.connectionName) || "";
         }
         else {
-            silent || utils.logLabeledBullet("dataconnect", "Instance creation process started");
+            silent ||
+                utils.logLabeledBullet("dataconnect", "Cloud SQL instance creation started - it should be ready shortly. Database and users will be created on your next deploy.");
+            return connectionName;
         }
     }
     try {
@@ -59,6 +62,7 @@ async function provisionCloudSql(args) {
             silent || utils.logLabeledBullet("dataconnect", `Database ${databaseId} created.`);
         }
         else {
+            logger_1.logger.debug(`Unexpected error from CloudSQL: ${err}`);
             silent || utils.logLabeledWarning("dataconnect", `Database ${databaseId} is not accessible.`);
         }
     }

package/lib/deploy/extensions/planner.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveVersion = exports.want = exports.have = exports.getExtensionSpec = exports.getExtension = exports.getExtensionVersion = void 0;
+exports.resolveVersion = exports.want = exports.wantDynamic = exports.have = exports.getExtensionSpec = exports.getExtension = exports.getExtensionVersion = void 0;
 const semver = require("semver");
 const extensionsApi = require("../../extensions/extensionsApi");
 const refs = require("../../extensions/refs");
@@ -11,6 +11,7 @@ const manifest_1 = require("../../extensions/manifest");
 const paramHelper_1 = require("../../extensions/paramHelper");
 const specHelper_1 = require("../../extensions/emulator/specHelper");
 const functional_1 = require("../../functional");
+const askUserForEventsConfig_1 = require("../../extensions/askUserForEventsConfig");
 async function getExtensionVersion(i) {
     if (!i.extensionVersion) {
         if (!i.ref) {
@@ -69,6 +70,50 @@ async function have(projectId) {
     });
 }
 exports.have = have;
+async function wantDynamic(args) {
+    const instanceSpecs = [];
+    const errors = [];
+    for (const [instanceId, ext] of Object.entries(args.extensions)) {
+        const autoPopulatedParams = await (0, extensionsHelper_1.getFirebaseProjectParams)(args.projectId, args.emulatorMode);
+        const subbedParams = (0, extensionsHelper_1.substituteParams)(ext.params, autoPopulatedParams);
+        const eventarcChannel = ext.params["_EVENT_ARC_REGION"]
+            ? (0, askUserForEventsConfig_1.getEventArcChannel)(args.projectId, ext.params["_EVENT_ARC_REGION"])
+            : undefined;
+        delete subbedParams["_EVENT_ARC_REGION"];
+        const subbedSecretParams = await (0, extensionsHelper_1.substituteSecretParams)(args.projectNumber, subbedParams);
+        const [systemParams, params] = (0, functional_1.partitionRecord)(subbedSecretParams, paramHelper_1.isSystemParam);
+        const allowedEventTypes = ext.events.length ? ext.events : undefined;
+        if (allowedEventTypes && !eventarcChannel) {
+            errors.push(new error_1.FirebaseError("EventArcRegion must be specified if event handlers are defined"));
+        }
+        if (ext.localPath) {
+            instanceSpecs.push({
+                instanceId,
+                localPath: ext.localPath,
+                params,
+                systemParams,
+                allowedEventTypes,
+                eventarcChannel,
+            });
+        }
+        else if (ext.ref) {
+            instanceSpecs.push({
+                instanceId,
+                ref: refs.parse(ext.ref),
+                params,
+                systemParams,
+                allowedEventTypes,
+                eventarcChannel,
+            });
+        }
+    }
+    if (errors.length) {
+        const messages = errors.map((err) => `- ${err.message}`).join("\n");
+        throw new error_1.FirebaseError(`Errors while reading 'extensions' in app code\n${messages}`);
+    }
+    return instanceSpecs;
+}
+exports.wantDynamic = wantDynamic;
 async function want(args) {
     const instanceSpecs = [];
     const errors = [];

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/downloadableEmulators.js

@@ -46,20 +46,20 @@ const EMULATOR_UPDATE_DETAILS = {
     },
     dataconnect: process.platform === "darwin"
         ? {
-            version: "1.3.2",
-            expectedSize: 24195840,
-            expectedChecksum: "b60f4501c657bec4dc8df3f3ec7ab3fd",
+            version: "1.3.5",
+            expectedSize: 24232704,
+            expectedChecksum: "4eabf613a4a5feeaa173e1375b62bde0",
         }
         : process.platform === "win32"
             ? {
-                version: "1.3.2",
-                expectedSize: 24610304,
-                expectedChecksum: "37d5e08f4df5e07b41160b8f2fd90135",
+                version: "1.3.5",
+                expectedSize: 24651264,
+                expectedChecksum: "c7b2b7168ff7226f4e5626ae7d13e0ca",
             }
             : {
-                version: "1.3.2",
-                expectedSize: 24109208,
-                expectedChecksum: "52b09c69bc9a3a84b01a3a7311817229",
+                version: "1.3.5",
+                expectedSize: 24146072,
+                expectedChecksum: "1457937751ce25fa332cdc16b561d64b",
             },
 };
 exports.DownloadDetails = {

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);