firebase-tools 13.18.0 → 13.19.0

package/README.md

@@ -117,15 +117,16 @@ Detailed doc is [here](https://firebase.google.com/docs/cli/auth).
 
 ### Extensions Commands
 
-| Command           | Description                                                                                 |
-| ----------------- | ------------------------------------------------------------------------------------------- |
-| **ext**           | Display information on how to use ext commands and extensions installed to your project.    |
-| **ext:configure** | Configure an existing extension instance.                                                   |
-| **ext:info**      | Display information about an extension by name (extensionName@x.y.z for a specific version) |
-| **ext:install**   | Install an extension.                                                                       |
-| **ext:list**      | List all the extensions that are installed in your Firebase project.                        |
-| **ext:uninstall** | Uninstall an extension that is installed in your Firebase project by Instance ID.           |
-| **ext:update**    | Update an existing extension instance to the latest version.                                |
+| Command             | Description                                                                                 |
+| ------------------- | ------------------------------------------------------------------------------------------- |
+| **ext**             | Display information on how to use ext commands and extensions installed to your project.    |
+| **ext:configure**   | Configure an existing extension instance.                                                   |
+| **ext:info**        | Display information about an extension by name (extensionName@x.y.z for a specific version) |
+| **ext:install**     | Install an extension.                                                                       |
+| **ext:sdk:install** | Install and SDK for an extension so you can define the extension in a functions codebase.   |
+| **ext:list**        | List all the extensions that are installed in your Firebase project.                        |
+| **ext:uninstall**   | Uninstall an extension that is installed in your Firebase project by Instance ID.           |
+| **ext:update**      | Update an existing extension instance to the latest version.                                |
 
 ### Cloud Firestore Commands
 

package/lib/commands/ext-info.js

@@ -110,7 +110,9 @@ exports.command = new command_1.Command("ext:info <extensionName>")
     else {
         marked_1.marked.use((0, marked_terminal_1.markedTerminal)());
         logger_1.logger.info(await (0, marked_1.marked)(lines.join("\n")));
-        utils.logLabeledBullet(extensionsHelper_1.logPrefix, `to install this extension, type ` +
+        utils.logLabeledBullet(extensionsHelper_1.logPrefix, `to install this extension, run ` +
             clc.bold(`firebase ext:install ${extensionName} --project=YOUR_PROJECT`));
+        utils.logLabeledBullet(extensionsHelper_1.logPrefix, `to install an autogenerated SDK for this extension into your functions codebase, run ` +
+            clc.bold(`firebase ext:sdk:install ${extensionName} --project=YOUR_PROJECT`));
     }
 });

package/lib/commands/ext-sdk-install.js

@@ -0,0 +1,88 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.command = void 0;
+const clc = require("colorette");
+const semver = require("semver");
+const checkMinRequiredVersion_1 = require("../checkMinRequiredVersion");
+const command_1 = require("../command");
+const extensionsApi = require("../extensions/extensionsApi");
+const extensionsHelper_1 = require("../extensions/extensionsHelper");
+const localHelper_1 = require("../extensions/localHelper");
+const requirePermissions_1 = require("../requirePermissions");
+const common_1 = require("../extensions/runtimes/common");
+const error_1 = require("../error");
+const displayExtensionInfo_1 = require("../extensions/displayExtensionInfo");
+const refs = require("../extensions/refs");
+const logger_1 = require("../logger");
+const prompt_1 = require("../prompt");
+const utils = require("../utils");
+exports.command = new command_1.Command("ext:sdk:install <extensionName>")
+    .description("get an SDK for this extension. The SDK will be put in the 'generated' directory")
+    .option(`--codebase <codebase>`, `specifies a codebase to install the SDK into`)
+    .option(`--force`, `will overwrite existing sdk files if true`)
+    .before(checkMinRequiredVersion_1.checkMinRequiredVersion, "extDevMinVersion")
+    .action(async (extensionName, options) => {
+    const runtime = await (0, common_1.getCodebaseRuntime)(options);
+    if (!runtime.startsWith("nodejs")) {
+        throw new error_1.FirebaseError(`Extension SDK generation is currently only supported for NodeJs. We detected the target source to be: ${runtime}`);
+    }
+    let spec;
+    let extensionRef;
+    let localPath;
+    if ((0, localHelper_1.isLocalExtension)(extensionName)) {
+        spec = await (0, localHelper_1.getLocalExtensionSpec)(extensionName);
+        spec.systemParams = [];
+        localPath = extensionName;
+        await (0, displayExtensionInfo_1.displayExtensionVersionInfo)({ spec });
+    }
+    else {
+        await (0, requirePermissions_1.requirePermissions)(options, ["firebaseextensions.sources.get"]);
+        await (0, extensionsHelper_1.ensureExtensionsApiEnabled)(options);
+        const hasPublisherId = extensionName.split("/").length >= 2;
+        if (hasPublisherId) {
+            const nameAndVersion = extensionName.split("/")[1];
+            if (nameAndVersion.split("@").length < 2) {
+                extensionName = extensionName + "@latest";
+            }
+        }
+        else {
+            const [name, version] = extensionName.split("@");
+            extensionName = `firebase/${name}@${version || "latest"}`;
+        }
+        const ref = refs.parse(extensionName);
+        const extension = await extensionsApi.getExtension(refs.toExtensionRef(ref));
+        const version = await extensionsApi.getExtensionVersion(extensionName);
+        spec = version.spec;
+        extensionRef = version.ref;
+        await (0, displayExtensionInfo_1.displayExtensionVersionInfo)({
+            spec,
+            extensionVersion: version,
+            latestApprovedVersion: extension.latestApprovedVersion,
+            latestVersion: extension.latestVersion,
+        });
+        if (version.state === "DEPRECATED") {
+            throw new error_1.FirebaseError(`Extension version ${clc.bold(extensionName)} is deprecated and cannot be installed. To install an SDK for the ` +
+                `latest non-deprecated version, omit the version in the extension ref.`);
+        }
+        logger_1.logger.info();
+        if ((extension.latestApprovedVersion &&
+            semver.gt(extension.latestApprovedVersion, version.spec.version)) ||
+            (!extension.latestApprovedVersion &&
+                extension.latestVersion &&
+                semver.gt(extension.latestVersion, version.spec.version))) {
+            const latest = extension.latestApprovedVersion || extension.latestVersion;
+            logger_1.logger.info(`You are about to install an SDK for extension version ${clc.bold(version.spec.version)} which is older than the latest ${extension.latestApprovedVersion ? "accepted version" : "version"} ${clc.bold(latest)}.`);
+        }
+    }
+    if (!(await (0, prompt_1.confirm)({
+        nonInteractive: options.nonInteractive,
+        force: options.force,
+        default: true,
+    }))) {
+        return;
+    }
+    const codeSample = await (0, common_1.writeSDK)(extensionRef, localPath, spec, options);
+    logger_1.logger.info();
+    utils.logSuccess("Extension SDK installed successfully");
+    logger_1.logger.info(codeSample);
+});

package/lib/commands/ext.js

@@ -23,6 +23,7 @@ exports.command = new command_1.Command("ext")
         "ext:configure",
         "ext:update",
         "ext:uninstall",
+        "ext:sdk:install",
     ];
     for (const commandName of commandNames) {
         const command = firebaseTools.getCommand(commandName);

package/lib/commands/index.js

@@ -83,6 +83,8 @@ function load(client) {
     client.ext.list = loadCommand("ext-list");
     client.ext.uninstall = loadCommand("ext-uninstall");
     client.ext.update = loadCommand("ext-update");
+    client.ext.sdk = {};
+    client.ext.sdk.install = loadCommand("ext-sdk-install");
     client.ext.dev = {};
     client.ext.dev.init = loadCommand("ext-dev-init");
     client.ext.dev.list = loadCommand("ext-dev-list");

package/lib/dataconnect/ensureApis.js

@@ -12,7 +12,6 @@ async function ensureApis(projectId) {
 exports.ensureApis = ensureApis;
 async function ensureSparkApis(projectId) {
     const prefix = "dataconnect";
-    await (0, ensureApiEnabled_1.ensure)(projectId, api.dataconnectOrigin(), prefix);
     await (0, ensureApiEnabled_1.ensure)(projectId, api.cloudSQLAdminOrigin(), prefix);
 }
 exports.ensureSparkApis = ensureSparkApis;

package/lib/deploy/extensions/deploymentSummary.js

@@ -47,10 +47,11 @@ function configuresSummary(toConfigure) {
         : "";
 }
 exports.configuresSummary = configuresSummary;
-function deletesSummary(toDelete) {
+function deletesSummary(toDelete, isDynamic) {
     const instancesToDelete = toDelete.map((s) => `\t${(0, exports.humanReadable)(s)}`).join("\n");
+    const definedLocation = isDynamic ? "your local source code" : "'firebase.json'";
     return toDelete.length
-        ? `The following extension instances are not listed in 'firebase.json':\n${instancesToDelete}\n`
+        ? `The following extension instances are found in your project but do not exist in ${definedLocation}:\n${instancesToDelete}\n`
         : "";
 }
 exports.deletesSummary = deletesSummary;

package/lib/deploy/extensions/planner.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveVersion = exports.want = exports.wantDynamic = exports.have = exports.getExtensionSpec = exports.getExtension = exports.getExtensionVersion = void 0;
+exports.resolveVersion = exports.want = exports.wantDynamic = exports.have = exports.haveDynamic = exports.getExtensionSpec = exports.getExtension = exports.getExtensionVersion = void 0;
 const semver = require("semver");
 const extensionsApi = require("../../extensions/extensionsApi");
 const refs = require("../../extensions/refs");
@@ -49,9 +49,33 @@ async function getExtensionSpec(i) {
     return i.extensionSpec;
 }
 exports.getExtensionSpec = getExtensionSpec;
+async function haveDynamic(projectId) {
+    return (await extensionsApi.listInstances(projectId))
+        .filter((i) => { var _a; return ((_a = i.labels) === null || _a === void 0 ? void 0 : _a.createdBy) === "SDK"; })
+        .map((i) => {
+        var _a;
+        const dep = {
+            instanceId: i.name.split("/").pop(),
+            params: i.config.params,
+            systemParams: (_a = i.config.systemParams) !== null && _a !== void 0 ? _a : {},
+            allowedEventTypes: i.config.allowedEventTypes,
+            eventarcChannel: i.config.eventarcChannel,
+            etag: i.etag,
+            labels: i.labels,
+        };
+        if (i.config.extensionRef) {
+            const ref = refs.parse(i.config.extensionRef);
+            dep.ref = ref;
+            dep.ref.version = i.config.extensionVersion;
+        }
+        return dep;
+    });
+}
+exports.haveDynamic = haveDynamic;
 async function have(projectId) {
-    const instances = await extensionsApi.listInstances(projectId);
-    return instances.map((i) => {
+    return (await extensionsApi.listInstances(projectId))
+        .filter((i) => { var _a; return !(((_a = i.labels) === null || _a === void 0 ? void 0 : _a.createdBy) === "SDK"); })
+        .map((i) => {
         var _a;
         const dep = {
             instanceId: i.name.split("/").pop(),
@@ -61,6 +85,9 @@ async function have(projectId) {
             eventarcChannel: i.config.eventarcChannel,
             etag: i.etag,
         };
+        if (i.labels) {
+            dep.labels = i.labels;
+        }
         if (i.config.extensionRef) {
             const ref = refs.parse(i.config.extensionRef);
             dep.ref = ref;
@@ -97,6 +124,7 @@ async function wantDynamic(args) {
                 systemParams,
                 allowedEventTypes,
                 eventarcChannel,
+                labels: ext.labels,
             });
         }
         else if (ext.ref) {
@@ -107,6 +135,7 @@ async function wantDynamic(args) {
                 systemParams,
                 allowedEventTypes,
                 eventarcChannel,
+                labels: ext.labels,
             });
         }
     }

package/lib/deploy/extensions/prepare.js

@@ -17,20 +17,19 @@ const etags_1 = require("../../extensions/etags");
 const v2FunctionHelper_1 = require("./v2FunctionHelper");
 const tos_1 = require("../../extensions/tos");
 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) {
+async function prepareHelper(context, options, payload, wantExtensions, haveExtensions, isDynamic) {
     var _a, _b;
     const projectId = (0, projectUtils_1.needProjectId)(options);
-    context.have = await planner.have(projectId);
     context.want = wantExtensions;
+    context.have = haveExtensions;
     const etagsChanged = (0, etags_1.detectEtagChanges)(options.rc, projectId, context.have);
     if (etagsChanged.length) {
         const wantChangedIds = wantExtensions
             .map((e) => e.instanceId)
             .filter((id) => etagsChanged.includes(id));
         if (wantChangedIds.length) {
-            (0, warnings_1.outOfBandChangesWarning)(wantChangedIds);
+            (0, warnings_1.outOfBandChangesWarning)(wantChangedIds, isDynamic);
             if (!(await prompt.confirm({
                 message: `Do you wish to continue deploying these extension instances?`,
                 default: false,
@@ -52,7 +51,7 @@ async function prepareHelper(context, options, payload, wantExtensions, noDelete
     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))) && !(noDeleteExtensions === null || noDeleteExtensions === void 0 ? void 0 : noDeleteExtensions.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))); });
     if (await (0, warnings_1.displayWarningsForDeploy)(payload.instancesToCreate)) {
         if (!(await prompt.confirm({
             message: `Do you wish to continue deploying these extension instances?`,
@@ -64,9 +63,6 @@ async function prepareHelper(context, options, payload, wantExtensions, noDelete
         }
     }
     const permissionsNeeded = [];
-    if (!isPrimaryCall) {
-        payload.instancesToDelete = [];
-    }
     if (payload.instancesToCreate.length) {
         permissionsNeeded.push("firebaseextensions.instances.create");
         logger_1.logger.info(deploymentSummary.createsSummary(payload.instancesToCreate));
@@ -80,9 +76,9 @@ async function prepareHelper(context, options, payload, wantExtensions, noDelete
         logger_1.logger.info(deploymentSummary.configuresSummary(payload.instancesToConfigure));
     }
     if (payload.instancesToDelete.length) {
-        logger_1.logger.info(deploymentSummary.deletesSummary(payload.instancesToDelete));
+        logger_1.logger.info(deploymentSummary.deletesSummary(payload.instancesToDelete, isDynamic));
         if (options.dryRun) {
-            logger_1.logger.info("On your next deploy, these you will be asked if you want to delete these instances.");
+            logger_1.logger.info("On your next deploy, you will be asked if you want to delete these instances.");
             logger_1.logger.info("If you deploy --force, they will be deleted.");
         }
         if (!options.dryRun &&
@@ -114,56 +110,23 @@ async function prepareHelper(context, options, payload, wantExtensions, noDelete
 async function prepareDynamicExtensions(context, options, payload, builds) {
     const filters = (0, functionsDeployHelper_1.getEndpointFilters)(options);
     const extensions = (0, common_1.extractExtensionsFromBuilds)(builds, filters);
-    const isApiEnabled = await (0, extensionsHelper_1.checkExtensionsApiEnabled)(options);
-    if (Object.keys(extensions).length === 0 && !isApiEnabled) {
-        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");
     await (0, extensionsHelper_1.ensureExtensionsApiEnabled)(options);
     await (0, requirePermissions_1.requirePermissions)(options, ["firebaseextensions.instances.list"]);
+    let haveExtensions = await planner.haveDynamic(projectId);
+    haveExtensions = haveExtensions.filter((e) => { var _a; return (0, common_1.extensionMatchesAnyFilter)((_a = e.labels) === null || _a === void 0 ? void 0 : _a.codebase, e.instanceId, filters); });
+    if (Object.keys(extensions).length === 0 && haveExtensions.length === 0) {
+        return;
+    }
     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);
+    return prepareHelper(context, options, payload, dynamicWant, haveExtensions, true);
 }
 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);
@@ -172,19 +135,15 @@ async function prepare(context, options, payload) {
     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({
+    const wantExtensions = 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);
+    const haveExtensions = await planner.have(projectId);
+    return prepareHelper(context, options, payload, wantExtensions, haveExtensions, false);
 }
 exports.prepare = prepare;
 const matchesInstanceId = (dep) => (test) => {

package/lib/deploy/extensions/release.js

@@ -24,20 +24,20 @@ async function release(context, options, payload) {
         concurrency: 5,
         handler: tasks.extensionsDeploymentHandler(errorHandler),
     });
-    for (const creation of (_a = payload.instancesToCreate) !== null && _a !== void 0 ? _a : []) {
-        const task = tasks.createExtensionInstanceTask(projectId, creation);
+    for (const inst of (_a = payload.instancesToConfigure) !== null && _a !== void 0 ? _a : []) {
+        const task = tasks.configureExtensionInstanceTask(projectId, inst);
         void deploymentQueue.run(task);
     }
-    for (const update of (_b = payload.instancesToUpdate) !== null && _b !== void 0 ? _b : []) {
-        const task = tasks.updateExtensionInstanceTask(projectId, update);
+    for (const inst of (_b = payload.instancesToDelete) !== null && _b !== void 0 ? _b : []) {
+        const task = tasks.deleteExtensionInstanceTask(projectId, inst);
         void deploymentQueue.run(task);
     }
-    for (const update of (_c = payload.instancesToConfigure) !== null && _c !== void 0 ? _c : []) {
-        const task = tasks.configureExtensionInstanceTask(projectId, update);
+    for (const inst of (_c = payload.instancesToCreate) !== null && _c !== void 0 ? _c : []) {
+        const task = tasks.createExtensionInstanceTask(projectId, inst);
         void deploymentQueue.run(task);
     }
-    for (const deletion of (_d = payload.instancesToDelete) !== null && _d !== void 0 ? _d : []) {
-        const task = tasks.deleteExtensionInstanceTask(projectId, deletion);
+    for (const inst of (_d = payload.instancesToUpdate) !== null && _d !== void 0 ? _d : []) {
+        const task = tasks.updateExtensionInstanceTask(projectId, inst);
         void deploymentQueue.run(task);
     }
     const deploymentPromise = deploymentQueue.wait();
@@ -53,8 +53,9 @@ async function release(context, options, payload) {
         errors: (_o = errorHandler.errors.length) !== null && _o !== void 0 ? _o : 0,
         interactive: options.nonInteractive ? "false" : "true",
     }, duration);
-    const newHave = await planner.have(projectId);
-    (0, etags_1.saveEtags)(options.rc, projectId, newHave);
+    const have = await planner.have(projectId);
+    const dynamicHave = await planner.haveDynamic(projectId);
+    (0, etags_1.saveEtags)(options.rc, projectId, have.concat(dynamicHave));
     if (errorHandler.hasErrors()) {
         errorHandler.print();
         throw new error_1.FirebaseError(`Extensions deployment failed.`);

package/lib/deploy/extensions/tasks.js

@@ -7,6 +7,7 @@ const extensionsApi = require("../../extensions/extensionsApi");
 const extensionsHelper_1 = require("../../extensions/extensionsHelper");
 const refs = require("../../extensions/refs");
 const utils = require("../../utils");
+const types_1 = require("../../extensions/types");
 const isRetryable = (err) => err.status === 429 || err.status === 409;
 function extensionsDeploymentHandler(errorHandler) {
     return async (task) => {
@@ -27,34 +28,37 @@ function extensionsDeploymentHandler(errorHandler) {
 exports.extensionsDeploymentHandler = extensionsDeploymentHandler;
 function createExtensionInstanceTask(projectId, instanceSpec, validateOnly = false) {
     const run = async () => {
+        if (!validateOnly) {
+            utils.logLabeledBullet("extensions", `Creating ${clc.bold(instanceSpec.instanceId)} extension instance`);
+        }
+        const createArgs = {
+            projectId,
+            instanceId: instanceSpec.instanceId,
+            params: instanceSpec.params,
+            systemParams: instanceSpec.systemParams,
+            allowedEventTypes: instanceSpec.allowedEventTypes,
+            eventarcChannel: instanceSpec.eventarcChannel,
+            validateOnly,
+            labels: instanceSpec.labels,
+        };
         if (instanceSpec.ref) {
-            await extensionsApi.createInstance({
-                projectId,
-                instanceId: instanceSpec.instanceId,
-                params: instanceSpec.params,
-                systemParams: instanceSpec.systemParams,
-                extensionVersionRef: refs.toExtensionVersionRef(instanceSpec.ref),
-                allowedEventTypes: instanceSpec.allowedEventTypes,
-                eventarcChannel: instanceSpec.eventarcChannel,
-                validateOnly,
-            });
+            createArgs.extensionVersionRef = refs.toExtensionVersionRef(instanceSpec.ref);
         }
         else if (instanceSpec.localPath) {
-            const extensionSource = await (0, extensionsHelper_1.createSourceFromLocation)(projectId, instanceSpec.localPath);
-            await extensionsApi.createInstance({
-                projectId,
-                instanceId: instanceSpec.instanceId,
-                params: instanceSpec.params,
-                systemParams: instanceSpec.systemParams,
-                extensionSource,
-                allowedEventTypes: instanceSpec.allowedEventTypes,
-                eventarcChannel: instanceSpec.eventarcChannel,
-                validateOnly,
-            });
+            createArgs.extensionSource = await (0, extensionsHelper_1.createSourceFromLocation)(projectId, instanceSpec.localPath);
         }
         else {
             throw new error_1.FirebaseError(`Tried to create extension instance ${instanceSpec.instanceId} without a ref or a local path. This should never happen.`);
         }
+        try {
+            await extensionsApi.createInstance(createArgs);
+        }
+        catch (err) {
+            if ((0, types_1.isObject)(err) && err.status === 409) {
+                throw new error_1.FirebaseError(`Failed to create extension instance. Extension instance ${clc.bold(instanceSpec.instanceId)} already exists.`);
+            }
+            throw err;
+        }
         printSuccess(instanceSpec.instanceId, "create", validateOnly);
         return;
     };
@@ -67,6 +71,9 @@ function createExtensionInstanceTask(projectId, instanceSpec, validateOnly = fal
 exports.createExtensionInstanceTask = createExtensionInstanceTask;
 function updateExtensionInstanceTask(projectId, instanceSpec, validateOnly = false) {
     const run = async () => {
+        if (!validateOnly) {
+            utils.logLabeledBullet("extensions", `Updating ${clc.bold(instanceSpec.instanceId)} extension instance`);
+        }
         if (instanceSpec.ref) {
             await extensionsApi.updateInstanceFromRegistry({
                 projectId,
@@ -109,6 +116,9 @@ function updateExtensionInstanceTask(projectId, instanceSpec, validateOnly = fal
 exports.updateExtensionInstanceTask = updateExtensionInstanceTask;
 function configureExtensionInstanceTask(projectId, instanceSpec, validateOnly = false) {
     const run = async () => {
+        if (!validateOnly) {
+            utils.logLabeledBullet("extensions", `Configuring ${clc.bold(instanceSpec.instanceId)} extension instance`);
+        }
         if (instanceSpec.ref) {
             await extensionsApi.configureInstance({
                 projectId,
@@ -139,6 +149,7 @@ function configureExtensionInstanceTask(projectId, instanceSpec, validateOnly =
 exports.configureExtensionInstanceTask = configureExtensionInstanceTask;
 function deleteExtensionInstanceTask(projectId, instanceSpec) {
     const run = async () => {
+        utils.logLabeledBullet("extensions", `Deleting ${clc.bold(instanceSpec.instanceId)} extension instance`);
         await extensionsApi.deleteInstance(projectId, instanceSpec.instanceId);
         printSuccess(instanceSpec.instanceId, "delete", false);
         return;

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

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

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

package/lib/emulator/downloadableEmulators.js

@@ -46,20 +46,20 @@ const EMULATOR_UPDATE_DETAILS = {
     },
     dataconnect: process.platform === "darwin"
         ? {
-            version: "1.3.7",
-            expectedSize: 25019136,
-            expectedChecksum: "648ca3e289db8209c2d555bb381e5e5e",
+            version: "1.3.8",
+            expectedSize: 25027328,
+            expectedChecksum: "903f0e8dd8212fec575dc2eba34be6e7",
         }
         : process.platform === "win32"
             ? {
-                version: "1.3.7",
-                expectedSize: 25441792,
-                expectedChecksum: "16081147aa94f1b8691329d5b9430b69",
+                version: "1.3.8",
+                expectedSize: 25450496,
+                expectedChecksum: "e09999deda7301eba06f88face5e1744",
             }
             : {
-                version: "1.3.7",
-                expectedSize: 24928408,
-                expectedChecksum: "8749930f3a43f616e3ae231af8c787a8",
+                version: "1.3.8",
+                expectedSize: 24940696,
+                expectedChecksum: "69aeb9755d4ec2e77bdadbc40236b306",
             },
 };
 exports.DownloadDetails = {

package/lib/extensions/extensionsApi.js

@@ -15,10 +15,11 @@ const extensionsApiClient = new apiv2_1.Client({
     urlPrefix: (0, api_1.extensionsOrigin)(),
     apiVersion: EXTENSIONS_API_VERSION,
 });
-async function createInstanceHelper(projectId, instanceId, config, validateOnly = false) {
+async function createInstanceHelper(projectId, instanceId, config, labels, validateOnly = false) {
     const createRes = await extensionsApiClient.post(`/projects/${projectId}/instances/`, {
         name: `projects/${projectId}/instances/${instanceId}`,
         config,
+        labels,
     }, {
         queryParams: {
             validateOnly: validateOnly ? "true" : "false",
@@ -63,7 +64,7 @@ async function createInstance(args) {
     if (args.eventarcChannel) {
         config.eventarcChannel = args.eventarcChannel;
     }
-    return createInstanceHelper(args.projectId, args.instanceId, config, args.validateOnly);
+    return await createInstanceHelper(args.projectId, args.instanceId, config, args.labels, args.validateOnly);
 }
 exports.createInstance = createInstance;
 async function deleteInstance(projectId, instanceId) {

package/lib/extensions/extensionsHelper.js

@@ -7,7 +7,7 @@ var __asyncValues = (this && this.__asyncValues) || function (o) {
     function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.diagnoseAndFixProject = exports.getSourceOrigin = exports.isLocalOrURLPath = exports.isLocalPath = exports.isUrlPath = exports.instanceIdExists = exports.promptForRepeatInstance = exports.promptForOfficialExtension = exports.displayReleaseNotes = exports.getPublisherProjectFromName = exports.createSourceFromLocation = exports.getMissingPublisherError = exports.uploadExtensionVersionFromLocalSource = exports.uploadExtensionVersionFromGitHubSource = exports.unpackExtensionState = exports.getNextVersionByStage = exports.ensureExtensionsPublisherApiEnabled = exports.ensureExtensionsApiEnabled = exports.checkExtensionsApiEnabled = exports.promptForExtensionRoot = exports.promptForValidRepoURI = exports.promptForValidInstanceId = exports.validateSpec = exports.validateCommandLineParams = exports.populateDefaultParams = exports.substituteSecretParams = exports.substituteParams = exports.getFirebaseProjectParams = exports.getDBInstanceFromURL = exports.resourceTypeToNiceName = exports.AUTOPOULATED_PARAM_PLACEHOLDERS = exports.EXTENSIONS_BUCKET_NAME = exports.URL_REGEX = exports.logPrefix = exports.SourceOrigin = exports.SpecParamType = void 0;
+exports.diagnoseAndFixProject = exports.getSourceOrigin = exports.isLocalOrURLPath = exports.isLocalPath = exports.isUrlPath = exports.instanceIdExists = exports.promptForRepeatInstance = exports.promptForOfficialExtension = exports.displayReleaseNotes = exports.getPublisherProjectFromName = exports.createSourceFromLocation = exports.getMissingPublisherError = exports.uploadExtensionVersionFromLocalSource = exports.uploadExtensionVersionFromGitHubSource = exports.unpackExtensionState = exports.getNextVersionByStage = exports.ensureExtensionsPublisherApiEnabled = exports.ensureExtensionsApiEnabled = exports.checkExtensionsApiEnabled = exports.promptForExtensionRoot = exports.promptForValidRepoURI = exports.promptForValidInstanceId = exports.validateSpec = exports.validateCommandLineParams = exports.populateDefaultParams = exports.substituteSecretParams = exports.substituteParams = exports.getFirebaseProjectParams = exports.getDBInstanceFromURL = exports.resourceTypeToNiceName = exports.AUTOPOPULATED_PARAM_PLACEHOLDERS = exports.EXTENSIONS_BUCKET_NAME = exports.URL_REGEX = exports.logPrefix = exports.SourceOrigin = exports.SpecParamType = void 0;
 const clc = require("colorette");
 const ora = require("ora");
 const semver = require("semver");
@@ -69,7 +69,7 @@ const AUTOPOPULATED_PARAM_NAMES = [
     "DATABASE_INSTANCE",
     "DATABASE_URL",
 ];
-exports.AUTOPOULATED_PARAM_PLACEHOLDERS = {
+exports.AUTOPOPULATED_PARAM_PLACEHOLDERS = {
     PROJECT_ID: "project-id",
     STORAGE_BUCKET: "project-id.appspot.com",
     EXT_INSTANCE_ID: "extension-id",
@@ -449,7 +449,7 @@ async function validateExtensionSpec(rootDirectory, extensionId) {
         throw new error_1.FirebaseError(`Extension ID '${clc.bold(extensionId)}' does not match the name in extension.yaml '${clc.bold(extensionSpec.name)}'.`);
     }
     const subbedSpec = JSON.parse(JSON.stringify(extensionSpec));
-    subbedSpec.params = substituteParams(extensionSpec.params || [], exports.AUTOPOULATED_PARAM_PLACEHOLDERS);
+    subbedSpec.params = substituteParams(extensionSpec.params || [], exports.AUTOPOPULATED_PARAM_PLACEHOLDERS);
     validateSpec(subbedSpec);
     return extensionSpec;
 }