firebase-tools 14.12.0 → 14.13.0

package/lib/dataconnect/schemaMigration.js

@@ -16,26 +16,33 @@ const utils_1 = require("../utils");
 const cloudsqladmin_1 = require("../gcp/cloudsql/cloudsqladmin");
 const cloudSqlAdminClient = require("../gcp/cloudsql/cloudsqladmin");
 const errors = require("./errors");
+const provisionCloudSql_1 = require("./provisionCloudSql");
 async function setupSchemaIfNecessary(instanceId, databaseId, options) {
-    await (0, connect_1.setupIAMUsers)(instanceId, databaseId, options);
-    const schemaInfo = await (0, permissionsSetup_1.getSchemaMetadata)(instanceId, databaseId, permissions_1.DEFAULT_SCHEMA, options);
-    if (schemaInfo.setupStatus !== permissionsSetup_1.SchemaSetupStatus.BrownField &&
-        schemaInfo.setupStatus !== permissionsSetup_1.SchemaSetupStatus.GreenField) {
-        return await (0, permissionsSetup_1.setupSQLPermissions)(instanceId, databaseId, schemaInfo, options, true);
+    try {
+        await (0, connect_1.setupIAMUsers)(instanceId, options);
+        const schemaInfo = await (0, permissionsSetup_1.getSchemaMetadata)(instanceId, databaseId, permissions_1.DEFAULT_SCHEMA, options);
+        switch (schemaInfo.setupStatus) {
+            case permissionsSetup_1.SchemaSetupStatus.BrownField:
+            case permissionsSetup_1.SchemaSetupStatus.GreenField:
+                return schemaInfo.setupStatus;
+            case permissionsSetup_1.SchemaSetupStatus.NotSetup:
+            case permissionsSetup_1.SchemaSetupStatus.NotFound:
+                return await (0, permissionsSetup_1.setupSQLPermissions)(instanceId, databaseId, schemaInfo, options, true);
+            default:
+                throw new error_1.FirebaseError(`Unexpected schema setup status: ${schemaInfo.setupStatus}`);
+        }
     }
-    else {
-        logger_1.logger.debug(`Detected schema "${schemaInfo.name}" is setup in ${schemaInfo.setupStatus} mode. Skipping Setup.`);
+    catch (err) {
+        throw new error_1.FirebaseError(`Cannot setup SQL schema permissions of ${instanceId}:${databaseId}\n${err}`);
     }
-    return schemaInfo.setupStatus;
 }
 async function diffSchema(options, schema, schemaValidation) {
-    (0, utils_1.logLabeledBullet)("dataconnect", `generating required schema changes...`);
+    (0, utils_1.logLabeledBullet)("dataconnect", `Generating SQL schema migrations...`);
     const { serviceName, instanceName, databaseId, instanceId } = getIdentifiers(schema);
     await ensureServiceIsConnectedToCloudSql(serviceName, instanceName, databaseId, false);
-    let diffs = [];
-    await setupSchemaIfNecessary(instanceId, databaseId, options);
     let validationMode = schemaValidation !== null && schemaValidation !== void 0 ? schemaValidation : "COMPATIBLE";
     setSchemaValidationMode(schema, validationMode);
+    let diffs = [];
     try {
         await (0, client_1.upsertSchema)(schema, true);
         if (validationMode === "STRICT") {
@@ -95,18 +102,34 @@ async function diffSchema(options, schema, schemaValidation) {
 }
 exports.diffSchema = diffSchema;
 async function migrateSchema(args) {
-    (0, utils_1.logLabeledBullet)("dataconnect", `generating required schema changes...`);
+    var _a;
+    (0, utils_1.logLabeledBullet)("dataconnect", `Generating SQL schema migrations...`);
     const { options, schema, validateOnly, schemaValidation } = args;
+    const projectId = (0, projectUtils_1.needProjectId)(options);
     const { serviceName, instanceId, instanceName, databaseId } = getIdentifiers(schema);
     await ensureServiceIsConnectedToCloudSql(serviceName, instanceName, databaseId, true);
-    await (0, connect_1.setupIAMUsers)(instanceId, databaseId, options);
-    let diffs = [];
+    const existingInstance = await cloudSqlAdminClient.getInstance(projectId, instanceId);
+    if (existingInstance.state === "PENDING_CREATE") {
+        const postgresql = (_a = schema.datasources.find((d) => d.postgresql)) === null || _a === void 0 ? void 0 : _a.postgresql;
+        if (!postgresql) {
+            throw new error_1.FirebaseError(`Cannot find Postgres datasource in the schema to deploy: ${serviceName}/schemas/${types_1.SCHEMA_ID}.\nIts datasources: ${JSON.stringify(schema.datasources)}`);
+        }
+        postgresql.schemaValidation = "NONE";
+        postgresql.schemaMigration = undefined;
+        await (0, client_1.upsertSchema)(schema, validateOnly);
+        postgresql.schemaValidation = undefined;
+        postgresql.schemaMigration = "MIGRATE_COMPATIBLE";
+        await (0, client_1.upsertSchema)(schema, validateOnly, true);
+        (0, utils_1.logLabeledWarning)("dataconnect", `Skip SQL schema migration because Cloud SQL is still being created`);
+        return [];
+    }
     await setupSchemaIfNecessary(instanceId, databaseId, options);
     let validationMode = schemaValidation !== null && schemaValidation !== void 0 ? schemaValidation : "COMPATIBLE";
     setSchemaValidationMode(schema, validationMode);
+    let diffs = [];
     try {
         await (0, client_1.upsertSchema)(schema, validateOnly);
-        (0, utils_1.logLabeledBullet)("dataconnect", `database schema of ${instanceId}:${databaseId} is up to date.`);
+        (0, utils_1.logLabeledSuccess)("dataconnect", `database schema of ${instanceId}:${databaseId} is up to date.`);
     }
     catch (err) {
         if ((err === null || err === void 0 ? void 0 : err.status) !== 400) {
@@ -169,19 +192,14 @@ exports.migrateSchema = migrateSchema;
 async function grantRoleToUserInSchema(options, schema) {
     const role = options.role;
     const email = options.email;
-    const { instanceId, databaseId } = getIdentifiers(schema);
+    const { serviceName, instanceId, instanceName, databaseId } = getIdentifiers(schema);
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const { user, mode } = (0, connect_1.toDatabaseUser)(email);
     const fdcSqlRole = permissionsSetup_1.fdcSqlRoleMap[role](databaseId);
-    await (0, connect_1.setupIAMUsers)(instanceId, databaseId, options);
-    const userIsCSQLAdmin = await (0, cloudsqladmin_1.iamUserIsCSQLAdmin)(options);
-    if (!userIsCSQLAdmin) {
-        throw new error_1.FirebaseError(`Only users with 'roles/cloudsql.admin' can grant SQL roles. If you do not have this role, ask your database administrator to run this command or manually grant ${fdcSqlRole} to ${user}`);
-    }
+    await ensureServiceIsConnectedToCloudSql(serviceName, instanceName, databaseId, false);
     const schemaSetupStatus = await setupSchemaIfNecessary(instanceId, databaseId, options);
-    if (schemaSetupStatus !== permissionsSetup_1.SchemaSetupStatus.GreenField &&
-        fdcSqlRole === (0, permissions_1.firebaseowner)(databaseId, permissions_1.DEFAULT_SCHEMA)) {
-        throw new error_1.FirebaseError(`Owner rule isn't available in brownfield databases. If you would like Data Connect to manage and own your database schema, run 'firebase dataconnect:sql:setup'`);
+    if (schemaSetupStatus !== permissionsSetup_1.SchemaSetupStatus.GreenField && role === "owner") {
+        throw new error_1.FirebaseError(`Owner rule isn't available in ${schemaSetupStatus} databases. If you would like Data Connect to manage and own your database schema, run 'firebase dataconnect:sql:setup'`);
     }
     await cloudSqlAdminClient.createUser(projectId, instanceId, mode, user);
     await (0, connect_1.executeSqlCmdsAsSuperUser)(options, instanceId, databaseId, [`GRANT "${fdcSqlRole}" TO "${user}"`], false);
@@ -207,15 +225,15 @@ function setSchemaValidationMode(schema, schemaValidation) {
     }
 }
 function getIdentifiers(schema) {
-    var _a, _b;
+    var _a, _b, _c;
     const postgresDatasource = schema.datasources.find((d) => d.postgresql);
     const databaseId = (_a = postgresDatasource === null || postgresDatasource === void 0 ? void 0 : postgresDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.database;
     if (!databaseId) {
-        throw new error_1.FirebaseError("Service does not have a postgres datasource, cannot migrate");
+        throw new error_1.FirebaseError("Data Connect schema must have a postgres datasource with a database name.");
     }
-    const instanceName = (_b = postgresDatasource === null || postgresDatasource === void 0 ? void 0 : postgresDatasource.postgresql) === null || _b === void 0 ? void 0 : _b.cloudSql.instance;
+    const instanceName = (_c = (_b = postgresDatasource === null || postgresDatasource === void 0 ? void 0 : postgresDatasource.postgresql) === null || _b === void 0 ? void 0 : _b.cloudSql) === null || _c === void 0 ? void 0 : _c.instance;
     if (!instanceName) {
-        throw new error_1.FirebaseError("tried to migrate schema but instance name was not provided in dataconnect.yaml");
+        throw new error_1.FirebaseError("Data Connect schema must have a postgres datasource with a CloudSQL instance.");
     }
     const instanceId = instanceName.split("/").pop();
     const serviceName = schema.name.replace(`/schemas/${types_1.SCHEMA_ID}`, "");
@@ -347,14 +365,24 @@ function displayInvalidConnectors(invalidConnectors) {
     (0, utils_1.logLabeledWarning)("dataconnect", `The schema you are deploying is incompatible with the following existing connectors: ${connectorIds}.`);
     (0, utils_1.logLabeledWarning)("dataconnect", `This is a ${clc.red("breaking")} change and may break existing apps.`);
 }
-async function ensureServiceIsConnectedToCloudSql(serviceName, instanceId, databaseId, linkIfNotConnected) {
+async function ensureServiceIsConnectedToCloudSql(serviceName, instanceName, databaseId, linkIfNotConnected) {
+    var _a, _b, _c, _d;
     let currentSchema = await (0, client_1.getSchema)(serviceName);
-    if (!currentSchema) {
+    let postgresql = (_b = (_a = currentSchema === null || currentSchema === void 0 ? void 0 : currentSchema.datasources) === null || _a === void 0 ? void 0 : _a.find((d) => d.postgresql)) === null || _b === void 0 ? void 0 : _b.postgresql;
+    if ((currentSchema === null || currentSchema === void 0 ? void 0 : currentSchema.reconciling) &&
+        (postgresql === null || postgresql === void 0 ? void 0 : postgresql.ephemeral) &&
+        ((_c = postgresql === null || postgresql === void 0 ? void 0 : postgresql.cloudSql) === null || _c === void 0 ? void 0 : _c.instance) &&
+        (postgresql === null || postgresql === void 0 ? void 0 : postgresql.schemaValidation) === "NONE") {
+        const [, , , , , serviceId] = serviceName.split("/");
+        const [, projectId, , , , instanceId] = postgresql.cloudSql.instance.split("/");
+        throw new error_1.FirebaseError(`While checking the service ${serviceId}, ` + (0, provisionCloudSql_1.cloudSQLBeingCreated)(projectId, instanceId));
+    }
+    if (!currentSchema || !postgresql) {
         if (!linkIfNotConnected) {
             (0, utils_1.logLabeledWarning)("dataconnect", `Not yet linked to the Cloud SQL instance.`);
             return;
         }
-        (0, utils_1.logLabeledBullet)("dataconnect", `linking the Cloud SQL instance...`);
+        (0, utils_1.logLabeledBullet)("dataconnect", `Linking the Cloud SQL instance...`);
         currentSchema = {
             name: `${serviceName}/schemas/${types_1.SCHEMA_ID}`,
             source: {
@@ -362,37 +390,37 @@ async function ensureServiceIsConnectedToCloudSql(serviceName, instanceId, datab
             },
             datasources: [
                 {
-                    postgresql: {
-                        database: databaseId,
-                        schemaValidation: "NONE",
-                        cloudSql: {
-                            instance: instanceId,
-                        },
-                    },
+                    postgresql: { ephemeral: true },
                 },
             ],
         };
     }
-    const postgresDatasource = currentSchema.datasources.find((d) => d.postgresql);
-    const postgresql = postgresDatasource === null || postgresDatasource === void 0 ? void 0 : postgresDatasource.postgresql;
-    if ((postgresql === null || postgresql === void 0 ? void 0 : postgresql.cloudSql.instance) !== instanceId) {
-        (0, utils_1.logLabeledWarning)("dataconnect", `Switching connected Cloud SQL instance\nFrom ${postgresql === null || postgresql === void 0 ? void 0 : postgresql.cloudSql.instance}\nTo ${instanceId}`);
+    if (!postgresql) {
+        postgresql = currentSchema.datasources[0].postgresql;
+    }
+    let alreadyConnected = !postgresql.ephemeral || false;
+    if (((_d = postgresql.cloudSql) === null || _d === void 0 ? void 0 : _d.instance) && postgresql.cloudSql.instance !== instanceName) {
+        alreadyConnected = false;
+        (0, utils_1.logLabeledWarning)("dataconnect", `Switching connected Cloud SQL instance\n From ${postgresql.cloudSql.instance}\n To ${instanceName}`);
     }
-    if ((postgresql === null || postgresql === void 0 ? void 0 : postgresql.database) !== databaseId) {
-        (0, utils_1.logLabeledWarning)("dataconnect", `Switching connected Postgres database from ${postgresql === null || postgresql === void 0 ? void 0 : postgresql.database} to ${databaseId}`);
+    if (postgresql.database && postgresql.database !== databaseId) {
+        alreadyConnected = false;
+        (0, utils_1.logLabeledWarning)("dataconnect", `Switching connected Postgres database from ${postgresql.database} to ${databaseId}`);
     }
-    if (!postgresql || postgresql.schemaValidation !== "NONE") {
+    if (alreadyConnected) {
         return;
     }
-    postgresql.schemaValidation = "STRICT";
     try {
+        postgresql.schemaValidation = "STRICT";
+        postgresql.database = databaseId;
+        postgresql.cloudSql = { instance: instanceName };
         await (0, client_1.upsertSchema)(currentSchema, false);
     }
     catch (err) {
         if ((err === null || err === void 0 ? void 0 : err.status) >= 500) {
             throw err;
         }
-        logger_1.logger.debug(err);
+        logger_1.logger.debug(`Failed to ensure service is connected to Cloud SQL: ${err.message}`);
     }
 }
 exports.ensureServiceIsConnectedToCloudSql = ensureServiceIsConnectedToCloudSql;

package/lib/deploy/dataconnect/deploy.js

@@ -33,12 +33,12 @@ async function default_1(context, options) {
         utils.logLabeledSuccess("dataconnect", `Created service ${s.serviceName}`);
     }));
     if (servicesToDelete.length) {
+        const serviceToDeleteList = servicesToDelete.map((s) => " - " + s.name).join("\n");
         if (await (0, prompt_1.confirm)({
-            force: options.force,
+            force: false,
             nonInteractive: options.nonInteractive,
-            message: `The following services exist on ${projectId} but are not listed in your 'firebase.json'\n${servicesToDelete
-                .map((s) => s.name)
-                .join("\n")}\nWould you like to delete these services?`,
+            message: `The following services exist on ${projectId} but are not listed in your 'firebase.json'\n${serviceToDeleteList}\nWould you like to delete these services?`,
+            default: false,
         })) {
             await Promise.all(servicesToDelete.map(async (s) => {
                 await client.deleteService(s.name);
@@ -52,22 +52,20 @@ async function default_1(context, options) {
         return !filters || (filters === null || filters === void 0 ? void 0 : filters.some((f) => si.dataConnectYaml.serviceId === f.serviceId));
     })
         .map(async (s) => {
-        var _a, _b;
+        var _a, _b, _c;
         const postgresDatasource = s.schema.datasources.find((d) => d.postgresql);
         if (postgresDatasource) {
-            const instanceId = (_a = postgresDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.cloudSql.instance.split("/").pop();
-            const databaseId = (_b = postgresDatasource.postgresql) === null || _b === void 0 ? void 0 : _b.database;
+            const instanceId = (_b = (_a = postgresDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.cloudSql) === null || _b === void 0 ? void 0 : _b.instance.split("/").pop();
+            const databaseId = (_c = postgresDatasource.postgresql) === null || _c === void 0 ? void 0 : _c.database;
             if (!instanceId || !databaseId) {
                 return Promise.resolve();
             }
-            const enableGoogleMlIntegration = (0, types_1.requiresVector)(s.deploymentMetadata);
-            return (0, provisionCloudSql_1.provisionCloudSql)({
+            return (0, provisionCloudSql_1.setupCloudSql)({
                 projectId,
                 location: (0, names_1.parseServiceName)(s.serviceName).location,
                 instanceId,
                 databaseId,
-                enableGoogleMlIntegration,
-                waitForCreation: true,
+                requireGoogleMlIntegration: (0, types_1.requiresVector)(s.deploymentMetadata),
             });
         }
     }));

package/lib/deploy/dataconnect/prepare.js

@@ -19,7 +19,7 @@ const types_1 = require("../../dataconnect/types");
 const schemaMigration_1 = require("../../dataconnect/schemaMigration");
 const freeTrial_1 = require("../../dataconnect/freeTrial");
 async function default_1(context, options) {
-    var _a;
+    var _a, _b, _c;
     const projectId = (0, projectUtils_1.needProjectId)(options);
     if (!(await (0, cloudbilling_1.checkBillingEnabled)(projectId))) {
         throw new error_1.FirebaseError((0, freeTrial_1.upgradeInstructions)(projectId));
@@ -27,7 +27,6 @@ async function default_1(context, options) {
     await (0, ensureApis_1.ensureApis)(projectId);
     await (0, requireTosAcceptance_1.requireTosAcceptance)(firedata_1.DATA_CONNECT_TOS_ID)(options);
     const serviceCfgs = (0, fileUtils_1.readFirebaseJson)(options.config);
-    utils.logLabeledBullet("dataconnect", `Preparing to deploy`);
     const filters = (0, filters_1.getResourceFilters)(options);
     const serviceInfos = await Promise.all(serviceCfgs.map((c) => (0, load_1.load)(projectId, options.config, c.source)));
     for (const si of serviceInfos) {
@@ -50,10 +49,10 @@ async function default_1(context, options) {
         serviceInfos,
         filters,
     };
-    utils.logLabeledBullet("dataconnect", `Successfully prepared schema and connectors`);
+    utils.logLabeledBullet("dataconnect", `Successfully compiled schema and connectors`);
     if (options.dryRun) {
         for (const si of serviceInfos) {
-            await (0, schemaMigration_1.diffSchema)(options, si.schema, (_a = si.dataConnectYaml.schema.datasource.postgresql) === null || _a === void 0 ? void 0 : _a.schemaValidation);
+            await (0, schemaMigration_1.diffSchema)(options, si.schema, (_c = (_b = (_a = si.dataConnectYaml.schema) === null || _a === void 0 ? void 0 : _a.datasource) === null || _b === void 0 ? void 0 : _b.postgresql) === null || _c === void 0 ? void 0 : _c.schemaValidation);
         }
         utils.logLabeledBullet("dataconnect", "Checking for CloudSQL resources...");
         await Promise.all(serviceInfos
@@ -61,23 +60,21 @@ async function default_1(context, options) {
             return !filters || (filters === null || filters === void 0 ? void 0 : filters.some((f) => si.dataConnectYaml.serviceId === f.serviceId));
         })
             .map(async (s) => {
-            var _a, _b;
+            var _a, _b, _c;
             const postgresDatasource = s.schema.datasources.find((d) => d.postgresql);
             if (postgresDatasource) {
-                const instanceId = (_a = postgresDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.cloudSql.instance.split("/").pop();
-                const databaseId = (_b = postgresDatasource.postgresql) === null || _b === void 0 ? void 0 : _b.database;
+                const instanceId = (_b = (_a = postgresDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.cloudSql) === null || _b === void 0 ? void 0 : _b.instance.split("/").pop();
+                const databaseId = (_c = postgresDatasource.postgresql) === null || _c === void 0 ? void 0 : _c.database;
                 if (!instanceId || !databaseId) {
                     return Promise.resolve();
                 }
-                const enableGoogleMlIntegration = (0, types_1.requiresVector)(s.deploymentMetadata);
-                return (0, provisionCloudSql_1.provisionCloudSql)({
+                return (0, provisionCloudSql_1.setupCloudSql)({
                     projectId,
                     location: (0, names_1.parseServiceName)(s.serviceName).location,
                     instanceId,
                     databaseId,
-                    enableGoogleMlIntegration,
-                    waitForCreation: true,
-                    dryRun: options.dryRun,
+                    requireGoogleMlIntegration: (0, types_1.requiresVector)(s.deploymentMetadata),
+                    dryRun: true,
                 });
             }
         }));

package/lib/deploy/dataconnect/release.js

@@ -5,6 +5,7 @@ const client_1 = require("../../dataconnect/client");
 const prompts_1 = require("../../dataconnect/prompts");
 const schemaMigration_1 = require("../../dataconnect/schemaMigration");
 const projectUtils_1 = require("../../projectUtils");
+const names_1 = require("../../dataconnect/names");
 async function default_1(context, options) {
     const project = (0, projectUtils_1.needProjectId)(options);
     const serviceInfos = context.dataconnect.serviceInfos;
@@ -17,14 +18,13 @@ async function default_1(context, options) {
             }));
     })
         .map((s) => {
-        var _a;
+        var _a, _b, _c, _d;
         return ({
             schema: s.schema,
-            validationMode: (_a = s.dataConnectYaml.schema.datasource.postgresql) === null || _a === void 0 ? void 0 : _a.schemaValidation,
+            validationMode: (_d = (_c = (_b = (_a = s.dataConnectYaml) === null || _a === void 0 ? void 0 : _a.schema) === null || _b === void 0 ? void 0 : _b.datasource) === null || _c === void 0 ? void 0 : _c.postgresql) === null || _d === void 0 ? void 0 : _d.schemaValidation,
         });
     });
     if (wantSchemas.length) {
-        utils.logLabeledBullet("dataconnect", "Deploying Data Connect schemas...");
         for (const s of wantSchemas) {
             await (0, schemaMigration_1.migrateSchema)({
                 options,
@@ -32,8 +32,8 @@ async function default_1(context, options) {
                 validateOnly: false,
                 schemaValidation: s.validationMode,
             });
+            utils.logLabeledSuccess("dataconnect", `Migrated schema ${s.schema.name}`);
         }
-        utils.logLabeledBullet("dataconnect", "Schemas deployed.");
     }
     let wantConnectors = [];
     wantConnectors = wantConnectors.concat(...serviceInfos.map((si) => si.connectorInfo
@@ -50,7 +50,6 @@ async function default_1(context, options) {
         ? []
         : haveConnectors.filter((h) => !wantConnectors.some((w) => w.name === h.name));
     if (wantConnectors.length) {
-        utils.logLabeledBullet("dataconnect", "Deploying connectors...");
         await Promise.all(wantConnectors.map(async (c) => {
             await (0, client_1.upsertConnector)(c);
             utils.logLabeledSuccess("dataconnect", `Deployed connector ${c.name}`);
@@ -58,12 +57,19 @@ async function default_1(context, options) {
         for (const c of connectorsToDelete) {
             await (0, prompts_1.promptDeleteConnector)(options, c.name);
         }
-        utils.logLabeledBullet("dataconnect", "Connectors deployed.");
     }
     else {
         utils.logLabeledBullet("dataconnect", "No connectors to deploy.");
     }
-    utils.logLabeledSuccess("dataconnect", `Deployment complete! View your deployed schema and connectors at ${utils.consoleUrl(project, "/dataconnect")}`);
+    let consolePath = "/dataconnect";
+    if (serviceInfos.length === 1) {
+        const sn = (0, names_1.parseServiceName)(serviceInfos[0].serviceName);
+        consolePath += `/locations/${sn.location}/services/${sn.serviceId}/schema`;
+    }
+    utils.logLabeledSuccess("dataconnect", `Deployment complete! View your deployed schema and connectors at
+
+    ${utils.consoleUrl(project, consolePath)}
+`);
     return;
 }
 exports.default = default_1;

package/lib/deploy/firestore/deploy.js

@@ -22,6 +22,15 @@ async function createDatabase(context, options) {
     if (!firestoreCfg.database) {
         firestoreCfg.database = "(default)";
     }
+    let edition = types.DatabaseEdition.STANDARD;
+    if (firestoreCfg.edition) {
+        const upperEdition = firestoreCfg.edition.toUpperCase();
+        if (upperEdition !== types.DatabaseEdition.STANDARD &&
+            upperEdition !== types.DatabaseEdition.ENTERPRISE) {
+            throw new error_1.FirebaseError(`Invalid edition specified for database in firebase.json: ${firestoreCfg.edition}`);
+        }
+        edition = upperEdition;
+    }
     const api = new api_1.FirestoreApi();
     try {
         await api.getDatabase(options.projectId, firestoreCfg.database);
@@ -34,6 +43,7 @@ async function createDatabase(context, options) {
                 databaseId: firestoreCfg.database,
                 locationId: firestoreCfg.location || "nam5",
                 type: types.DatabaseType.FIRESTORE_NATIVE,
+                databaseEdition: edition,
                 deleteProtectionState: types.DatabaseDeleteProtectionState.DISABLED,
                 pointInTimeRecoveryEnablement: types.PointInTimeRecoveryEnablement.DISABLED,
             };

package/lib/deploy/functions/backend.js

@@ -94,7 +94,7 @@ function secretVersionName(s) {
     return `projects/${s.projectId}/secrets/${s.secret}/versions/${(_a = s.version) !== null && _a !== void 0 ? _a : "latest"}`;
 }
 exports.secretVersionName = secretVersionName;
-exports.AllFunctionsPlatforms = ["gcfv1", "gcfv2"];
+exports.AllFunctionsPlatforms = ["gcfv1", "gcfv2", "run"];
 function isHttpsTriggered(triggered) {
     return {}.hasOwnProperty.call(triggered, "httpsTrigger");
 }
@@ -184,6 +184,7 @@ async function loadExistingBackend(ctx) {
     ctx.unreachableRegions = {
         gcfV1: [],
         gcfV2: [],
+        run: [],
     };
     const gcfV1Results = await gcf.listAllFunctions(ctx.projectId);
     for (const apiFunction of gcfV1Results.functions) {
@@ -212,7 +213,7 @@ async function loadExistingBackend(ctx) {
     }
 }
 async function checkAvailability(context, want) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     if (!context.loadedExistingBackend) {
         await loadExistingBackend(context);
     }
@@ -248,6 +249,11 @@ async function checkAvailability(context, want) {
             context.unreachableRegions.gcfV2.join("\n") +
             "\nCloud Functions in these regions won't be deleted.");
     }
+    if ((_e = context.unreachableRegions) === null || _e === void 0 ? void 0 : _e.run.length) {
+        utils.logLabeledWarning("functions", "The following Cloud Run regions are currently unreachable:\n" +
+            context.unreachableRegions.run.join("\n") +
+            "\nCloud Run services in these regions won't be deleted.");
+    }
 }
 exports.checkAvailability = checkAvailability;
 function allEndpoints(backend) {

package/lib/deploy/functions/build.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toBackend = exports.envWithTypes = exports.resolveBackend = exports.AllIngressSettings = exports.AllVpcEgressSettings = exports.AllFunctionsPlatforms = exports.isBlockingTriggered = exports.isTaskQueueTriggered = exports.isScheduleTriggered = exports.isEventTriggered = exports.isCallableTriggered = exports.isHttpsTriggered = exports.of = exports.empty = void 0;
+exports.applyPrefix = exports.toBackend = exports.envWithTypes = exports.resolveBackend = exports.AllIngressSettings = exports.AllVpcEgressSettings = exports.AllFunctionsPlatforms = exports.isBlockingTriggered = exports.isTaskQueueTriggered = exports.isScheduleTriggered = exports.isEventTriggered = exports.isCallableTriggered = exports.isHttpsTriggered = exports.of = exports.empty = void 0;
 const backend = require("./backend");
 const proto = require("../../gcp/proto");
 const api = require("../../.../../api");
@@ -324,3 +324,25 @@ function discoverTrigger(endpoint, region, r) {
     }
     (0, functional_1.assertExhaustive)(endpoint);
 }
+function applyPrefix(build, prefix) {
+    if (!prefix) {
+        return;
+    }
+    const newEndpoints = {};
+    for (const [id, endpoint] of Object.entries(build.endpoints)) {
+        const newId = `${prefix}-${id}`;
+        if (newId.length > 63) {
+            throw new error_1.FirebaseError(`Function id '${newId}' exceeds 63 characters after applying prefix '${prefix}'. Please shorten the prefix or function name.`);
+        }
+        const fnIdRegex = /^[a-zA-Z][a-zA-Z0-9_-]{0,62}$/;
+        if (!fnIdRegex.test(newId)) {
+            throw new error_1.FirebaseError(`Function id '${newId}' is invalid after applying prefix '${prefix}'. Function names must start with a letter and can contain letters, numbers, underscores, and hyphens, with a maximum length of 63 characters.`);
+        }
+        newEndpoints[newId] = endpoint;
+        if (endpoint.secretEnvironmentVariables) {
+            endpoint.secretEnvironmentVariables = endpoint.secretEnvironmentVariables.map((secret) => (Object.assign(Object.assign({}, secret), { secret: `${prefix}-${secret.secret}` })));
+        }
+    }
+    build.endpoints = newEndpoints;
+}
+exports.applyPrefix = applyPrefix;

package/lib/deploy/functions/ensure.js

@@ -23,7 +23,7 @@ async function defaultServiceAccount(e) {
     if (e.platform === "gcfv1") {
         return `${metadata.projectId}@appspot.gserviceaccount.com`;
     }
-    else if (e.platform === "gcfv2") {
+    else if (e.platform === "gcfv2" || e.platform === "run") {
         return await (0, computeEngine_1.getDefaultServiceAccount)(metadata.projectNumber);
     }
     (0, functional_1.assertExhaustive)(e.platform);

package/lib/deploy/functions/functionsDeployHelper.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isEndpointFiltered = exports.isCodebaseFiltered = exports.groupEndpointsByCodebase = exports.targetCodebases = exports.getFunctionLabel = exports.getHumanFriendlyPlatformName = exports.getEndpointFilters = exports.parseFunctionSelector = exports.endpointMatchesFilter = exports.endpointMatchesAnyFilter = void 0;
 const backend = require("./backend");
 const projectConfig_1 = require("../../functions/projectConfig");
+const functional_1 = require("../../functional");
 function endpointMatchesAnyFilter(endpoint, filters) {
     if (!filters) {
         return true;
@@ -71,7 +72,13 @@ function getHumanFriendlyPlatformName(platform) {
     if (platform === "gcfv1") {
         return "1st Gen";
     }
-    return "2nd Gen";
+    else if (platform === "gcfv2") {
+        return "2nd Gen";
+    }
+    else if (platform === "run") {
+        return "Cloud Run";
+    }
+    (0, functional_1.assertExhaustive)(platform);
 }
 exports.getHumanFriendlyPlatformName = getHumanFriendlyPlatformName;
 function getFunctionLabel(fn) {

package/lib/deploy/functions/prepare.js

@@ -99,12 +99,12 @@ async function prepare(context, options, payload) {
             }
         }
         for (const endpoint of backend.allEndpoints(wantBackend)) {
-            endpoint.environmentVariables = Object.assign({}, wantBackend.environmentVariables) || {};
+            endpoint.environmentVariables = Object.assign({}, (wantBackend.environmentVariables || {}));
             let resource;
             if (endpoint.platform === "gcfv1") {
                 resource = `projects/${endpoint.project}/locations/${endpoint.region}/functions/${endpoint.id}`;
             }
-            else if (endpoint.platform === "gcfv2") {
+            else if (endpoint.platform === "gcfv2" || endpoint.platform === "run") {
                 resource = `projects/${endpoint.project}/locations/${endpoint.region}/services/${endpoint.id}`;
             }
             else {
@@ -309,8 +309,10 @@ async function loadCodebases(config, options, firebaseConfig, runtimeConfig, fil
         await runtimeDelegate.build();
         const firebaseEnvs = functionsEnv.loadFirebaseEnvs(firebaseConfig, projectId);
         (0, utils_1.logLabeledBullet)("functions", `Loading and analyzing source code for codebase ${codebase} to determine what to deploy`);
-        wantBuilds[codebase] = await runtimeDelegate.discoverBuild(runtimeConfig, Object.assign(Object.assign({}, firebaseEnvs), { GOOGLE_CLOUD_QUOTA_PROJECT: projectId }));
-        wantBuilds[codebase].runtime = codebaseConfig.runtime;
+        const discoveredBuild = await runtimeDelegate.discoverBuild(runtimeConfig, Object.assign(Object.assign({}, firebaseEnvs), { GOOGLE_CLOUD_QUOTA_PROJECT: projectId }));
+        discoveredBuild.runtime = codebaseConfig.runtime;
+        build.applyPrefix(discoveredBuild, codebaseConfig.prefix || "");
+        wantBuilds[codebase] = discoveredBuild;
     }
     return wantBuilds;
 }

package/lib/deploy/functions/prepareFunctionsUpload.js

@@ -74,7 +74,9 @@ async function packageSource(sourceDir, config, runtimeConfig) {
                 name: CONFIG_DEST_FILE,
                 mode: 420,
             });
-            (0, deprecationWarnings_1.logFunctionsConfigDeprecationWarning)();
+            if (Object.keys(runtimeConfig).some((k) => k !== "firebase")) {
+                (0, deprecationWarnings_1.logFunctionsConfigDeprecationWarning)();
+            }
         }
         await pipeAsync(archive, fileStream);
     }

package/lib/deploy/functions/pricing.js

@@ -130,6 +130,7 @@ function monthlyMinInstanceCost(endpoints) {
     const usage = {
         gcfv1: { 1: { ram: 0, cpu: 0 }, 2: { ram: 0, cpu: 0 } },
         gcfv2: { 1: { ram: 0, cpu: 0 }, 2: { ram: 0, cpu: 0 } },
+        run: { 1: { ram: 0, cpu: 0 }, 2: { ram: 0, cpu: 0 } },
     };
     for (const endpoint of endpoints) {
         if (endpoint.minInstances === undefined || endpoint.minInstances === null) {
@@ -147,10 +148,10 @@ function monthlyMinInstanceCost(endpoints) {
         }
         else {
             const tier = V2_REGION_TO_TIER[endpoint.region];
-            usage["gcfv2"][tier].ram =
-                usage["gcfv2"][tier].ram + ramGb * SECONDS_PER_MONTH * endpoint.minInstances;
-            usage["gcfv2"][tier].cpu =
-                usage["gcfv2"][tier].cpu +
+            usage[endpoint.platform][tier].ram =
+                usage[endpoint.platform][tier].ram + ramGb * SECONDS_PER_MONTH * endpoint.minInstances;
+            usage[endpoint.platform][tier].cpu =
+                usage[endpoint.platform][tier].cpu +
                     endpoint.cpu * SECONDS_PER_MONTH * endpoint.minInstances;
         }
     }
@@ -166,6 +167,12 @@ function monthlyMinInstanceCost(endpoints) {
     let v2CpuBill = usage["gcfv2"][1].cpu * exports.V2_RATES.idleVCpu[1] + usage["gcfv2"][2].cpu * exports.V2_RATES.idleVCpu[2];
     v2CpuBill -= exports.V2_FREE_TIER.vCpu * exports.V2_RATES.vCpu[1];
     v2CpuBill = Math.max(v2CpuBill, 0);
-    return v1MemoryBill + v1CpuBill + v2MemoryBill + v2CpuBill;
+    let runMemoryBill = usage["run"][1].ram * exports.V2_RATES.memoryGb[1] + usage["run"][2].ram * exports.V2_RATES.memoryGb[2];
+    runMemoryBill -= exports.V2_FREE_TIER.memoryGb * exports.V2_RATES.memoryGb[1];
+    runMemoryBill = Math.max(runMemoryBill, 0);
+    let runCpuBill = usage["run"][1].cpu * exports.V2_RATES.idleVCpu[1] + usage["run"][2].cpu * exports.V2_RATES.idleVCpu[2];
+    runCpuBill -= exports.V2_FREE_TIER.vCpu * exports.V2_RATES.vCpu[1];
+    runCpuBill = Math.max(runCpuBill, 0);
+    return v1MemoryBill + v1CpuBill + v2MemoryBill + v2CpuBill + runMemoryBill + runCpuBill;
 }
 exports.monthlyMinInstanceCost = monthlyMinInstanceCost;