firebase-tools 13.8.0 → 13.8.1

package/lib/apphosting/app.js

@@ -1,88 +1,67 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webApps = void 0;
-const fuzzy = require("fuzzy");
-const inquirer = require("inquirer");
 const apps_1 = require("../management/apps");
-const prompt_1 = require("../prompt");
 const error_1 = require("../error");
+const utils_1 = require("../utils");
 const CREATE_NEW_FIREBASE_WEB_APP = "CREATE_NEW_WEB_APP";
 const CONTINUE_WITHOUT_SELECTING_FIREBASE_WEB_APP = "CONTINUE_WITHOUT_SELECTING_FIREBASE_WEB_APP";
 exports.webApps = {
     CREATE_NEW_FIREBASE_WEB_APP,
     CONTINUE_WITHOUT_SELECTING_FIREBASE_WEB_APP,
     getOrCreateWebApp,
-    promptFirebaseWebApp,
+    generateWebAppName,
 };
 async function getOrCreateWebApp(projectId, firebaseWebAppName, backendId) {
     const webAppsInProject = await (0, apps_1.listFirebaseApps)(projectId, apps_1.AppPlatform.WEB);
-    if (webAppsInProject.length === 0) {
-        const { displayName, appId } = await createFirebaseWebApp(projectId, {
-            displayName: backendId,
-        });
-        return { name: displayName, id: appId };
-    }
-    const existingUserProjectWebApps = new Map(webAppsInProject.map((obj) => {
-        var _a;
-        return [
-            (_a = obj.displayName) !== null && _a !== void 0 ? _a : obj.appId,
-            obj.appId,
-        ];
-    }));
+    const existingUserProjectWebApps = firebaseAppsToMap(webAppsInProject);
     if (firebaseWebAppName) {
         if (existingUserProjectWebApps.get(firebaseWebAppName) === undefined) {
             throw new error_1.FirebaseError(`The web app '${firebaseWebAppName}' does not exist in project ${projectId}`);
         }
-        return { name: firebaseWebAppName, id: existingUserProjectWebApps.get(firebaseWebAppName) };
-    }
-    return await exports.webApps.promptFirebaseWebApp(projectId, backendId, existingUserProjectWebApps);
-}
-async function promptFirebaseWebApp(projectId, backendId, existingUserProjectWebApps) {
-    const existingWebAppKeys = Array.from(existingUserProjectWebApps.keys());
-    const firebaseWebAppName = await (0, prompt_1.promptOnce)({
-        type: "autocomplete",
-        name: "app",
-        message: "Which of the following Firebase web apps would you like to associate your backend with?",
-        source: (_, input = "") => {
-            return new Promise((resolve) => resolve([
-                new inquirer.Separator(),
-                {
-                    name: "Create a new Firebase web app.",
-                    value: CREATE_NEW_FIREBASE_WEB_APP,
-                },
-                {
-                    name: "Continue without a Firebase web app.",
-                    value: CONTINUE_WITHOUT_SELECTING_FIREBASE_WEB_APP,
-                },
-                new inquirer.Separator(),
-                ...fuzzy.filter(input, existingWebAppKeys).map((result) => {
-                    return result.original;
-                }),
-            ]));
-        },
-    });
-    if (firebaseWebAppName === CREATE_NEW_FIREBASE_WEB_APP) {
-        const newFirebaseWebApp = await createFirebaseWebApp(projectId, { displayName: backendId });
-        return { name: newFirebaseWebApp.displayName, id: newFirebaseWebApp.appId };
-    }
-    else if (firebaseWebAppName === CONTINUE_WITHOUT_SELECTING_FIREBASE_WEB_APP) {
-        return;
+        return {
+            name: firebaseWebAppName,
+            id: existingUserProjectWebApps.get(firebaseWebAppName),
+        };
     }
-    return { name: firebaseWebAppName, id: existingUserProjectWebApps.get(firebaseWebAppName) };
-}
-async function createFirebaseWebApp(projectId, options) {
+    const webAppName = await generateWebAppName(projectId, backendId);
     try {
-        return await (0, apps_1.createWebApp)(projectId, options);
+        const app = await (0, apps_1.createWebApp)(projectId, { displayName: webAppName });
+        return { name: app.displayName, id: app.appId };
     }
     catch (e) {
         if (isQuotaError(e)) {
-            throw new error_1.FirebaseError("Unable to create a new web app, the project has reached the quota for Firebase apps. Navigate to your Firebase console to manage or delete a Firebase app to continue. ", { original: e instanceof Error ? e : undefined });
+            (0, utils_1.logWarning)("Unable to create a new web app, the project has reached the quota for Firebase apps. Navigate to your Firebase console to manage or delete a Firebase app to continue. ");
+            return;
         }
         throw new error_1.FirebaseError("Unable to create a Firebase web app", {
             original: e instanceof Error ? e : undefined,
         });
     }
 }
+async function generateWebAppName(projectId, backendId) {
+    const webAppsInProject = await (0, apps_1.listFirebaseApps)(projectId, apps_1.AppPlatform.WEB);
+    const appsMap = firebaseAppsToMap(webAppsInProject);
+    if (!appsMap.get(backendId)) {
+        return backendId;
+    }
+    let uniqueId = 1;
+    let webAppName = `${backendId}_${uniqueId}`;
+    while (appsMap.get(webAppName)) {
+        uniqueId += 1;
+        webAppName = `${backendId}_${uniqueId}`;
+    }
+    return webAppName;
+}
+function firebaseAppsToMap(apps) {
+    return new Map(apps.map((obj) => {
+        var _a;
+        return [
+            (_a = obj.displayName) !== null && _a !== void 0 ? _a : obj.appId,
+            obj.appId,
+        ];
+    }));
+}
 function isQuotaError(error) {
     var _a, _b, _c, _d, _e;
     const original = error.original;

package/lib/apphosting/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBackendForAmbiguousLocation = exports.promptLocation = exports.deleteBackendAndPoll = exports.orchestrateRollout = exports.setDefaultTrafficPolicy = exports.createBackend = exports.ensureAppHostingComputeServiceAccount = exports.doSetup = void 0;
-const repo = require("./repo");
 const poller = require("../operation-poller");
 const apphosting = require("../gcp/apphosting");
 const githubConnections = require("./githubConnections");
@@ -17,6 +16,7 @@ const ensureApiEnabled_1 = require("../ensureApiEnabled");
 const deploymentTool = require("../deploymentTool");
 const app_1 = require("./app");
 const ora = require("ora");
+const node_fetch_1 = require("node-fetch");
 const DEFAULT_COMPUTE_SERVICE_ACCOUNT_NAME = "firebase-app-hosting-compute";
 const apphostingPollerOptions = {
     apiOrigin: (0, api_1.apphostingOrigin)(),
@@ -24,7 +24,30 @@ const apphostingPollerOptions = {
     masterTimeout: 25 * 60 * 1000,
     maxBackoff: 10000,
 };
-async function doSetup(projectId, webAppName, location, serviceAccount, withCloudBuildRepos) {
+async function tlsReady(url) {
+    var _a;
+    try {
+        await (0, node_fetch_1.default)(url);
+        return true;
+    }
+    catch (err) {
+        const maybeNodeError = err;
+        if (/HANDSHAKE_FAILURE/.test((_a = maybeNodeError === null || maybeNodeError === void 0 ? void 0 : maybeNodeError.cause) === null || _a === void 0 ? void 0 : _a.code)) {
+            return false;
+        }
+        return true;
+    }
+}
+async function awaitTlsReady(url) {
+    let ready;
+    do {
+        ready = await tlsReady(url);
+        if (!ready) {
+            await (0, utils_1.sleep)(1000);
+        }
+    } while (!ready);
+}
+async function doSetup(projectId, webAppName, location, serviceAccount) {
     await Promise.all([
         (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.developerConnectOrigin)(), "apphosting", true),
         (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.cloudbuildOrigin)(), "apphosting", true),
@@ -52,14 +75,12 @@ async function doSetup(projectId, webAppName, location, serviceAccount, withClou
     });
     const webApp = await app_1.webApps.getOrCreateWebApp(projectId, webAppName, backendId);
     if (webApp) {
-        (0, utils_1.logSuccess)(`Firebase web app set to ${webApp.name}.\n`);
+        (0, utils_1.logSuccess)(`Created a new Firebase web app named "${webApp.name}"`);
     }
     else {
         (0, utils_1.logWarning)(`Firebase web app not set`);
     }
-    const gitRepositoryConnection = withCloudBuildRepos
-        ? await repo.linkGitHubRepository(projectId, location)
-        : await githubConnections.linkGitHubRepository(projectId, location);
+    const gitRepositoryConnection = await githubConnections.linkGitHubRepository(projectId, location);
     const rootDir = await (0, prompt_1.promptOnce)({
         name: "rootDir",
         type: "input",
@@ -86,8 +107,9 @@ async function doSetup(projectId, webAppName, location, serviceAccount, withClou
         (0, utils_1.logSuccess)(`Your backend will be deployed at:\n\thttps://${backend.uri}`);
         return;
     }
+    const url = `https://${backend.uri}`;
     (0, utils_1.logBullet)(`You may also track this rollout at:\n\t${(0, api_1.consoleOrigin)()}/project/${projectId}/apphosting`);
-    const createRolloutSpinner = ora("Starting a new rollout... This make take a few minutes. It's safe to exit now.").start();
+    const createRolloutSpinner = ora("Starting a new rollout; this may take a few minutes. It's safe to exit now.").start();
     await orchestrateRollout(projectId, location, backendId, {
         source: {
             codebase: {
@@ -95,7 +117,13 @@ async function doSetup(projectId, webAppName, location, serviceAccount, withClou
             },
         },
     });
-    createRolloutSpinner.succeed(`Your backend is now deployed at:\n\thttps://${backend.uri}`);
+    createRolloutSpinner.succeed("Rollout complete");
+    if (!(await tlsReady(url))) {
+        const tlsSpinner = ora("Finalizing your backend's TLS certificate; this may take a few minutes.").start();
+        await awaitTlsReady(url);
+        tlsSpinner.succeed("TLS certificate ready");
+    }
+    (0, utils_1.logSuccess)(`Your backend is now deployed at:\n\thttps://${backend.uri}`);
 }
 exports.doSetup = doSetup;
 async function ensureAppHostingComputeServiceAccount(projectId, serviceAccount) {
@@ -205,7 +233,7 @@ async function orchestrateRollout(projectId, location, backendId, buildInput) {
                 if (tries >= 5) {
                     throw err;
                 }
-                await new Promise((resolve) => setTimeout(resolve, 1000));
+                await (0, utils_1.sleep)(1000);
             }
             else {
                 throw err;

package/lib/commands/apphosting-backends-create.js

@@ -6,19 +6,20 @@ const projectUtils_1 = require("../projectUtils");
 const requireInteractive_1 = require("../requireInteractive");
 const apphosting_1 = require("../apphosting");
 const apphosting_2 = require("../gcp/apphosting");
+const firedata_1 = require("../gcp/firedata");
+const requireTosAcceptance_1 = require("../requireTosAcceptance");
 exports.command = new command_1.Command("apphosting:backends:create")
     .description("create a Firebase App Hosting backend")
     .option("-a, --app <webApp>", "specify an existing Firebase web app to associate your App Hosting backend with")
     .option("-l, --location <location>", "specify the location of the backend", "")
     .option("-s, --service-account <serviceAccount>", "specify the service account used to run the server", "")
-    .option("-w, --with-cloud-build-repos", "use Cloud Build Repositories flow instead of the Developer Connect flow")
     .before(apphosting_2.ensureApiEnabled)
     .before(requireInteractive_1.default)
+    .before((0, requireTosAcceptance_1.requireTosAcceptance)(firedata_1.APPHOSTING_TOS_ID))
     .action(async (options) => {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const webApp = options.app;
     const location = options.location;
     const serviceAccount = options.serviceAccount;
-    const withCloudBuildRepos = options.withCloudBuildRepos;
-    await (0, apphosting_1.doSetup)(projectId, webApp, location, serviceAccount, withCloudBuildRepos);
+    await (0, apphosting_1.doSetup)(projectId, webApp, location, serviceAccount);
 });

package/lib/commands/dataconnect-sdk-generate.js

@@ -25,11 +25,12 @@ exports.command = new command_1.Command("dataconnect:sdk:generate")
             configDir,
             auto_download: true,
             rc: options.rc,
+            locationId: service.location,
         };
         const dataconnectEmulator = new dataconnectEmulator_1.DataConnectEmulator(args);
         for (const conn of serviceInfo.connectorInfo) {
             const output = await dataconnectEmulator.generate(conn.connectorYaml.connectorId);
-            console.log(output);
+            logger_1.logger.info(output);
             logger_1.logger.info(`Generated SDKs for ${conn.connectorYaml.connectorId}`);
         }
     }

package/lib/commands/dataconnect-sql-migrate.js

@@ -30,7 +30,12 @@ exports.command = new command_1.Command("dataconnect:sql:migrate [serviceId]")
     if (!instanceId) {
         throw new error_1.FirebaseError("dataconnect.yaml is missing field schema.datasource.postgresql.cloudsql.instanceId");
     }
-    const diffs = await (0, schemaMigration_1.migrateSchema)(options, serviceInfo.schema, true);
+    const diffs = await (0, schemaMigration_1.migrateSchema)({
+        options,
+        schema: serviceInfo.schema,
+        allowNonInteractiveMigration: true,
+        validateOnly: true,
+    });
     if (diffs.length) {
         logger_1.logger.info(`Schema sucessfully migrated! Run 'firebase deploy' to deploy your new schema to your Data Connect service.`);
     }

package/lib/dataconnect/provisionCloudSql.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkInstanceConfig = exports.installRequiredExtensions = exports.REQUIRED_EXTENSIONS_COMMANDS = exports.provisionCloudSql = void 0;
+exports.checkInstanceConfig = exports.provisionCloudSql = void 0;
 const cloudSqlAdminClient = require("../gcp/cloudsql/cloudsqladmin");
-const connect_1 = require("../gcp/cloudsql/connect");
 const utils = require("../utils");
 const checkIam_1 = require("./checkIam");
 const GOOGLE_ML_INTEGRATION_ROLE = "roles/aiplatform.user";
@@ -55,22 +54,6 @@ async function provisionCloudSql(args) {
     return connectionName;
 }
 exports.provisionCloudSql = provisionCloudSql;
-exports.REQUIRED_EXTENSIONS_COMMANDS = [
-    `CREATE SCHEMA IF NOT EXISTS "public"`,
-    `CREATE EXTENSION IF NOT EXISTS "uuid-ossp" with SCHEMA public`,
-    `CREATE EXTENSION IF NOT EXISTS "vector" with SCHEMA public`,
-    `CREATE EXTENSION IF NOT EXISTS "google_ml_integration" with SCHEMA public CASCADE`,
-];
-async function installRequiredExtensions(projectId, instanceId, databaseId, username) {
-    await (0, connect_1.execute)(exports.REQUIRED_EXTENSIONS_COMMANDS, {
-        projectId,
-        instanceId,
-        databaseId,
-        username,
-        silent: true,
-    });
-}
-exports.installRequiredExtensions = installRequiredExtensions;
 function checkInstanceConfig(instance, requireGoogleMlIntegration) {
     var _a, _b, _c, _d;
     const settings = instance.settings;

package/lib/dataconnect/schemaMigration.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.migrateSchema = exports.diffSchema = void 0;
 const clc = require("colorette");
 const sql_formatter_1 = require("sql-formatter");
+const types_1 = require("./types");
 const client_1 = require("./client");
 const connect_1 = require("../gcp/cloudsql/connect");
 const prompt_1 = require("../prompt");
 const logger_1 = require("../logger");
 const error_1 = require("../error");
-const provisionCloudSql_1 = require("./provisionCloudSql");
 const projectUtils_1 = require("../projectUtils");
 const utils_1 = require("../utils");
 const IMCOMPATIBLE_SCHEMA_ERROR_TYPESTRING = "type.googleapis.com/google.firebase.dataconnect.v1main.IncompatibleSqlSchemaError";
@@ -20,6 +20,8 @@ async function diffSchema(schema) {
         throw new error_1.FirebaseError(`tried to diff schema but ${instanceName} was undefined`);
     }
     try {
+        const serviceName = schema.name.replace(`/schemas/${types_1.SCHEMA_ID}`, "");
+        await ensureServiceIsConnectedToCloudSql(serviceName);
         await (0, client_1.upsertSchema)(schema, true);
     }
     catch (err) {
@@ -34,9 +36,9 @@ async function diffSchema(schema) {
     return [];
 }
 exports.diffSchema = diffSchema;
-async function migrateSchema(options, schema, allowNonInteractiveMigration) {
+async function migrateSchema(args) {
     var _a, _b;
-    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const { schema, validateOnly } = args;
     const databaseId = (_a = schema.primaryDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.database;
     if (!databaseId) {
         throw new error_1.FirebaseError("Schema is missing primaryDatasource.postgresql?.database, cannot migrate");
@@ -45,46 +47,57 @@ async function migrateSchema(options, schema, allowNonInteractiveMigration) {
     if (!instanceId) {
         throw new error_1.FirebaseError(`tried to migrate schema but ${instanceId} was undefined`);
     }
-    const iamUser = await (0, connect_1.setupIAMUser)(instanceId, databaseId, options);
     try {
-        await (0, client_1.upsertSchema)(schema, true);
+        const serviceName = schema.name.replace(`/schemas/${types_1.SCHEMA_ID}`, "");
+        await ensureServiceIsConnectedToCloudSql(serviceName);
+        await (0, client_1.upsertSchema)(schema, validateOnly);
+        logger_1.logger.debug(`Database schema was up to date for ${instanceId}:${databaseId}`);
+        return [];
     }
     catch (err) {
         const incompatible = getIncompatibleSchemaError(err);
-        if (incompatible) {
-            const choice = await promptForSchemaMigration(options, databaseId, incompatible, allowNonInteractiveMigration);
-            const commandsToExecute = incompatible.diffs
-                .filter((d) => {
-                switch (choice) {
-                    case "all":
-                        return true;
-                    case "safe":
-                        return !d.destructive;
-                    case "none":
-                        return false;
-                }
-            })
-                .map((d) => d.sql);
-            if (commandsToExecute.length) {
-                await (0, connect_1.execute)([
-                    ...provisionCloudSql_1.REQUIRED_EXTENSIONS_COMMANDS,
-                    ...commandsToExecute,
-                    `GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA "public" TO PUBLIC`,
-                ], {
-                    projectId,
-                    instanceId,
-                    databaseId,
-                    username: iamUser,
-                });
-                return incompatible.diffs;
-            }
+        if (!incompatible) {
+            throw err;
         }
-        throw err;
+        const diffs = await handleIncompatibleSchemaError(Object.assign(Object.assign({}, args), { incompatibleSchemaError: incompatible, instanceId,
+            databaseId }));
+        await (0, client_1.upsertSchema)(schema, validateOnly);
+        return diffs;
     }
-    logger_1.logger.debug(`Schema was up to date for ${instanceId}:${databaseId}`);
-    return [];
 }
 exports.migrateSchema = migrateSchema;
+async function handleIncompatibleSchemaError(args) {
+    const { incompatibleSchemaError, options, instanceId, databaseId, allowNonInteractiveMigration } = args;
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const iamUser = await (0, connect_1.setupIAMUser)(instanceId, databaseId, options);
+    const choice = await promptForSchemaMigration(options, databaseId, incompatibleSchemaError, allowNonInteractiveMigration);
+    const commandsToExecute = incompatibleSchemaError.diffs
+        .filter((d) => {
+        switch (choice) {
+            case "all":
+                return true;
+            case "safe":
+                return !d.destructive;
+            case "none":
+                return false;
+        }
+    })
+        .map((d) => d.sql);
+    if (commandsToExecute.length) {
+        await (0, connect_1.execute)([
+            `SET ROLE "${(0, connect_1.firebaseowner)(databaseId)}"`,
+            ...commandsToExecute,
+            `GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA "public" TO PUBLIC`,
+        ], {
+            projectId,
+            instanceId,
+            databaseId,
+            username: iamUser,
+        });
+        return incompatibleSchemaError.diffs;
+    }
+    return [];
+}
 async function promptForSchemaMigration(options, databaseName, err, allowNonInteractiveMigration) {
     displaySchemaChanges(err);
     if (!options.nonInteractive) {
@@ -119,6 +132,24 @@ async function promptForSchemaMigration(options, databaseName, err, allowNonInte
         return "none";
     }
 }
+async function ensureServiceIsConnectedToCloudSql(serviceName) {
+    let currentSchema;
+    try {
+        currentSchema = await (0, client_1.getSchema)(serviceName);
+    }
+    catch (err) {
+        if (err.status === 404) {
+            return;
+        }
+        throw err;
+    }
+    if (!currentSchema.primaryDatasource.postgresql ||
+        currentSchema.primaryDatasource.postgresql.schemaValidation === "STRICT") {
+        return;
+    }
+    currentSchema.primaryDatasource.postgresql.schemaValidation = "STRICT";
+    await (0, client_1.upsertSchema)(currentSchema, false);
+}
 function displaySchemaChanges(error) {
     const message = "Your new schema is incompatible with the schema of your CloudSQL database. " +
         "The following SQL statements will migrate your database schema to match your new Data Connect schema.\n" +
@@ -130,7 +161,10 @@ function toString(diff) {
 }
 function getIncompatibleSchemaError(err) {
     var _a;
-    const original = (_a = err.context) === null || _a === void 0 ? void 0 : _a.body.error;
+    const original = ((_a = err.context) === null || _a === void 0 ? void 0 : _a.body.error) || err.orignal;
+    if (!original) {
+        throw err;
+    }
     const details = original.details;
     const incompatibles = details.filter((d) => d["@type"] === IMCOMPATIBLE_SCHEMA_ERROR_TYPESTRING);
     return incompatibles[0];

package/lib/deploy/dataconnect/release.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils = require("../../utils");
 const client_1 = require("../../dataconnect/client");
 const prompts_1 = require("../../dataconnect/prompts");
-const error_1 = require("../../error");
 const schemaMigration_1 = require("../../dataconnect/schemaMigration");
 async function default_1(context, options) {
     const serviceInfos = context.dataconnect.serviceInfos;
@@ -17,15 +16,14 @@ async function default_1(context, options) {
     })
         .map((s) => s.schema);
     if (wantSchemas.length) {
-        utils.logLabeledBullet("dataconnect", "Checking if database schemas match Data Connect schemas...");
+        utils.logLabeledBullet("dataconnect", "Releasing Data Connect schemas...");
         for (const s of wantSchemas) {
-            await (0, schemaMigration_1.migrateSchema)(options, s, false);
-        }
-        utils.logLabeledBullet("dataconnect", "Releasing schemas...");
-        const schemaPromises = await Promise.allSettled(wantSchemas.map((s) => (0, client_1.upsertSchema)(s)));
-        const failedSchemas = schemaPromises.filter((p) => p.status === "rejected");
-        if (failedSchemas.length) {
-            throw new error_1.FirebaseError(`Errors while updating your schemas:\n ${failedSchemas.map((f) => f.reason).join("\n")}`);
+            await (0, schemaMigration_1.migrateSchema)({
+                options,
+                schema: s,
+                allowNonInteractiveMigration: false,
+                validateOnly: false,
+            });
         }
         utils.logLabeledBullet("dataconnect", "Schemas released.");
     }

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

@@ -16,6 +16,7 @@ const deploymentTool = require("../../../deploymentTool");
 const gcf = require("../../../gcp/cloudfunctions");
 const gcfV2 = require("../../../gcp/cloudfunctionsv2");
 const eventarc = require("../../../gcp/eventarc");
+const experiments = require("../../../experiments");
 const helper = require("../functionsDeployHelper");
 const poller = require("../../../operation-poller");
 const pubsub = require("../../../gcp/pubsub");
@@ -276,7 +277,9 @@ class Fabricator {
         while (!resultFunction) {
             resultFunction = await this.functionExecutor
                 .run(async () => {
-                apiFunction.buildConfig.sourceToken = await scraper.getToken();
+                if (experiments.isEnabled("functionsv2deployoptimizations")) {
+                    apiFunction.buildConfig.sourceToken = await scraper.getToken();
+                }
                 const op = await gcfV2.createFunction(apiFunction);
                 return await poller.pollOperation(Object.assign(Object.assign({}, gcfV2PollerOptions), { pollerName: `create-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`, operationResourceName: op.name, onPoll: scraper.poller }));
             })
@@ -384,7 +387,9 @@ class Fabricator {
         }
         const resultFunction = await this.functionExecutor
             .run(async () => {
-            apiFunction.buildConfig.sourceToken = await scraper.getToken();
+            if (experiments.isEnabled("functionsv2deployoptimizations")) {
+                apiFunction.buildConfig.sourceToken = await scraper.getToken();
+            }
             const op = await gcfV2.updateFunction(apiFunction);
             return await poller.pollOperation(Object.assign(Object.assign({}, gcfV2PollerOptions), { pollerName: `update-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`, operationResourceName: op.name, onPoll: scraper.poller }));
         }, { retryCodes: [...executor_1.DEFAULT_RETRY_CODES, CLOUD_RUN_RESOURCE_EXHAUSTED_CODE] })

package/lib/emulator/controller.js

@@ -537,6 +537,7 @@ async function startAll(options, showUI = true, runningTestScript = false) {
             projectId,
             auto_download: true,
             configDir,
+            locationId: config[0].location,
             rc: options.rc,
         });
         await startEmulator(dataConnectEmulator);

package/lib/emulator/dataconnectEmulator.js

@@ -26,7 +26,7 @@ class DataConnectEmulator {
                 this.logger.logLabeled("WARN", "Data Connect", "Operations that use vector_embed will make calls to production Vertex AI");
             }
         }
-        return (0, downloadableEmulators_1.start)(types_1.Emulators.DATACONNECT, Object.assign(Object.assign({}, this.args), { http_port: port, grpc_port: port + 1, config_dir: this.args.configDir, local_connection_string: this.getLocalConectionString(), project_id: this.args.projectId }));
+        return (0, downloadableEmulators_1.start)(types_1.Emulators.DATACONNECT, Object.assign(Object.assign({}, this.args), { http_port: port, grpc_port: port + 1, config_dir: this.args.configDir, local_connection_string: this.getLocalConectionString(), project_id: this.args.projectId, service_location: this.args.locationId }));
     }
     connect() {
         return Promise.resolve();
@@ -42,6 +42,7 @@ class DataConnectEmulator {
             host,
             port,
             pid: (0, downloadableEmulators_1.getPID)(types_1.Emulators.DATACONNECT),
+            timeout: 10000,
         };
     }
     getName() {
@@ -51,6 +52,7 @@ class DataConnectEmulator {
         const commandInfo = await (0, downloadableEmulators_1.downloadIfNecessary)(types_1.Emulators.DATACONNECT);
         const cmd = [
             "generate",
+            `--service_location=${this.args.locationId}`,
             `--config_dir=${this.args.configDir}`,
             `--connector_id=${connectorId}`,
         ];

package/lib/emulator/downloadableEmulators.js

@@ -46,14 +46,14 @@ const EMULATOR_UPDATE_DETAILS = {
     },
     dataconnect: process.platform === "darwin"
         ? {
-            version: "1.1.12",
-            expectedSize: 25542352,
-            expectedChecksum: "b523fe9d5506cc07480d1a571c72de9a",
+            version: "1.1.15",
+            expectedSize: 25600896,
+            expectedChecksum: "36dcf9be7273b9ba6052faf0b3c0347f",
         }
         : {
-            version: "1.1.12",
-            expectedSize: 23004624,
-            expectedChecksum: "e69f79755263b7cd77ec7cd15ef0d825",
+            version: "1.1.15",
+            expectedSize: 23036688,
+            expectedChecksum: "e42203947bf984993f295976ee3ba2be",
         },
 };
 exports.DownloadDetails = {

package/lib/emulator/portUtils.js

@@ -131,9 +131,8 @@ async function checkListenable(arg1, port) {
     });
 }
 exports.checkListenable = checkListenable;
-async function waitForPortUsed(port, host) {
+async function waitForPortUsed(port, host, timeout = 60000) {
     const interval = 200;
-    const timeout = 5000;
     try {
         await tcpport.waitUntilUsedOnHost(port, host, interval, timeout);
     }

package/lib/emulator/registry.js

@@ -19,7 +19,7 @@ class EmulatorRegistry {
         await instance.start();
         if (instance.getName() !== types_1.Emulators.EXTENSIONS) {
             const info = instance.getInfo();
-            await portUtils.waitForPortUsed(info.port, (0, utils_1.connectableHostname)(info.host));
+            await portUtils.waitForPortUsed(info.port, (0, utils_1.connectableHostname)(info.host), info.timeout);
         }
     }
     static async stop(name) {

package/lib/experiments.js

@@ -20,11 +20,13 @@ exports.ALL_EXPERIMENTS = experiments({
     rtdbmanagement: {
         shortDescription: "Use new endpoint to administer realtime database instances",
     },
-    pythonfunctions: {
-        shortDescription: "Python support for Cloud Functions for Firebase",
-        fullDescription: "Adds the ability to initializea and deploy Cloud " +
-            "Functions for Firebase in Python. While this feature is experimental " +
-            "breaking API changes are allowed in MINOR API revisions",
+    functionsv2deployoptimizations: {
+        shortDescription: "Optimize deployments of v2 firebase functions",
+        fullDescription: "Reuse build images across funtions to increase performance and reliaibility " +
+            "of deploys. This has been made an experiment due to backend bugs that are " +
+            "temporarily causing failures in some regions with this optimization enabled",
+        public: true,
+        default: false,
     },
     deletegcfartifacts: {
         shortDescription: `Add the ${(0, colorette_1.bold)("functions:deletegcfartifacts")} command to purge docker build images`,

package/lib/frameworks/next/index.js

@@ -400,7 +400,9 @@ async function ɵcodegenFunctionsDirectory(sourceDir, destDir, target, context)
         (0, utils_2.getProductionDistDirFiles)(sourceDir, distDir),
         (0, fs_extra_1.mkdirp)((0, path_1.join)(destDir, distDir)),
     ]);
-    await Promise.all(productionDistDirfiles.map((file) => (0, fs_extra_1.copy)(file, file.replace(sourceDir, destDir), { recursive: true })));
+    await Promise.all(productionDistDirfiles.map((file) => (0, fs_extra_1.copy)((0, path_1.join)(sourceDir, distDir, file), (0, path_1.join)(destDir, distDir, file), {
+        recursive: true,
+    })));
     return { packageJson, frameworksEntry: "next.js", dotEnv };
 }
 exports.ɵcodegenFunctionsDirectory = ɵcodegenFunctionsDirectory;

package/lib/frameworks/next/utils.js

@@ -230,7 +230,7 @@ async function getProductionDistDirFiles(sourceDir, distDir) {
         ignore: [(0, path_1.join)("cache", "webpack", "*-development", "**"), (0, path_1.join)("cache", "eslint", "**")],
         cwd: (0, path_1.join)(sourceDir, distDir),
         nodir: true,
-        absolute: true,
+        absolute: false,
         realpath: utils_2.IS_WINDOWS,
     }, (err, matches) => {
         if (err)

package/lib/gcp/cloudsql/connect.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupIAMUser = exports.execute = void 0;
+exports.firebaseowner = exports.setupIAMUser = exports.execute = void 0;
 const pg = require("pg");
 const cloud_sql_connector_1 = require("@google-cloud/cloud-sql-connector");
 const requireAuth_1 = require("../../requireAuth");
@@ -116,6 +116,7 @@ exports.setupIAMUser = setupIAMUser;
 function firebaseowner(databaseId) {
     return `firebaseowner_${databaseId}_public`;
 }
+exports.firebaseowner = firebaseowner;
 function toDatabaseUser(account) {
     let mode = "CLOUD_IAM_USER";
     let user = account;

package/lib/gcp/firedata.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isProductTosAccepted = exports.getAcceptanceStatus = exports.getTosStatus = exports.APP_CHECK_TOS_ID = exports.APPHOSTING_TOS_ID = void 0;
+const apiv2_1 = require("../apiv2");
+const api_1 = require("../api");
+const error_1 = require("../error");
+const client = new apiv2_1.Client({ urlPrefix: (0, api_1.firedataOrigin)(), auth: true, apiVersion: "v1" });
+exports.APPHOSTING_TOS_ID = "APP_HOSTING_TOS";
+exports.APP_CHECK_TOS_ID = "APP_CHECK";
+async function getTosStatus() {
+    const res = await client.get("accessmanagement/tos:getStatus");
+    return res.body;
+}
+exports.getTosStatus = getTosStatus;
+function getAcceptanceStatus(response, tosId) {
+    const perServiceStatus = response.perServiceStatus.find((tosStatus) => tosStatus.tosId === tosId);
+    if (perServiceStatus === undefined) {
+        throw new error_1.FirebaseError(`Missing terms of service status for  product: ${tosId}`);
+    }
+    return perServiceStatus.serviceStatus.status;
+}
+exports.getAcceptanceStatus = getAcceptanceStatus;
+function isProductTosAccepted(response, tosId) {
+    return getAcceptanceStatus(response, tosId) === "ACCEPTED";
+}
+exports.isProductTosAccepted = isProductTosAccepted;

package/lib/hosting/interactive.js

@@ -43,6 +43,7 @@ async function interactiveCreateHostingSite(siteId, appId, options) {
             if (options.nonInteractive) {
                 throw err;
             }
+            id = "";
             suggestion = getSuggestionFromError(err);
         }
     }
@@ -71,5 +72,8 @@ function getSuggestionFromError(err) {
             return match[1];
         }
     }
+    else {
+        (0, utils_1.logWarning)(err.message);
+    }
     return;
 }

package/lib/init/features/dataconnect/index.js

@@ -5,6 +5,7 @@ const path_1 = require("path");
 const prompt_1 = require("../../../prompt");
 const fs_1 = require("fs");
 const provisionCloudSql_1 = require("../../../dataconnect/provisionCloudSql");
+const cloudsql = require("../../../gcp/cloudsql/cloudsqladmin");
 const ensureApis_1 = require("../../../dataconnect/ensureApis");
 const client_1 = require("../../../dataconnect/client");
 const TEMPLATE_ROOT = (0, path_1.resolve)(__dirname, "../../../../templates/init/dataconnect/");
@@ -49,26 +50,60 @@ async function doSetup(setup, config) {
         type: "input",
         default: "my-connector",
     });
-    const dir = config.get("dataconnect.source") ||
-        (await (0, prompt_1.promptOnce)({
-            message: "What directory should be used for DataConnect config and schema?",
-            type: "input",
-            default: "dataconnect",
-        }));
+    const dir = config.get("dataconnect.source") || "dataconnect";
     if (!config.has("dataconnect")) {
         config.set("dataconnect.source", dir);
         config.set("dataconnect.location", locationId);
     }
-    const cloudSqlInstanceId = await (0, prompt_1.promptOnce)({
-        message: `What CloudSQL instance would you like to use? Please enter the ID of an existing instance in ${locationId}`,
-        type: "input",
-        default: `dataconnect-test`,
-    });
-    const cloudSqlDatabase = await (0, prompt_1.promptOnce)({
-        message: `Which database would you like to use from ${cloudSqlInstanceId}?`,
-        type: "input",
-        default: `dataconnect-test`,
-    });
+    let cloudSqlInstanceId = "";
+    let newInstance = false;
+    if (setup.projectId) {
+        const instances = await cloudsql.listInstances(setup.projectId);
+        const instancesInLocation = instances.filter((i) => i.region === locationId);
+        const choices = instancesInLocation.map((i) => {
+            return { name: i.name, value: i.name };
+        });
+        choices.push({ name: "Create a new instance", value: "" });
+        if (instancesInLocation.length) {
+            cloudSqlInstanceId = await (0, prompt_1.promptOnce)({
+                message: `Which CloudSSQL in ${locationId} would you like to use?`,
+                type: "list",
+                choices,
+            });
+        }
+    }
+    if (cloudSqlInstanceId === "") {
+        newInstance = true;
+        cloudSqlInstanceId = await (0, prompt_1.promptOnce)({
+            message: `What ID would you like to use for your new CloudSQL instance?`,
+            type: "input",
+            default: `dataconnect-test`,
+        });
+    }
+    let cloudSqlDatabase = "";
+    let newDB = false;
+    if (!newInstance && setup.projectId) {
+        const dbs = await cloudsql.listDatabases(setup.projectId, cloudSqlInstanceId);
+        const choices = dbs.map((d) => {
+            return { name: d.name, value: d.name };
+        });
+        choices.push({ name: "Create a new database", value: "" });
+        if (dbs.length) {
+            cloudSqlDatabase = await (0, prompt_1.promptOnce)({
+                message: `Which database in ${cloudSqlInstanceId} would you like to use?`,
+                type: "list",
+                choices,
+            });
+        }
+    }
+    if (cloudSqlDatabase === "") {
+        newDB = true;
+        cloudSqlDatabase = await (0, prompt_1.promptOnce)({
+            message: `What ID would you like to use for your new database in ${cloudSqlInstanceId}?`,
+            type: "input",
+            default: `dataconnect`,
+        });
+    }
     const defaultConnectionString = (_c = (_b = (_a = setup.rcfile.dataconnectEmulatorConfig) === null || _a === void 0 ? void 0 : _a.postgres) === null || _b === void 0 ? void 0 : _b.localConnectionString) !== null && _c !== void 0 ? _c : "postgresql://localhost:5432?sslmode=disable";
     const localConnectionString = await (0, prompt_1.promptOnce)({
         type: "input",
@@ -95,6 +130,7 @@ async function doSetup(setup, config) {
     await config.askWriteProjectFile((0, path_1.join)(dir, "connector", "queries.gql"), QUERIES_TEMPLATE);
     await config.askWriteProjectFile((0, path_1.join)(dir, "connector", "mutations.gql"), MUTATIONS_TEMPLATE);
     if (setup.projectId &&
+        (newInstance || newDB) &&
         (await (0, prompt_1.confirm)({
             message: "Would you like to provision your CloudSQL instance and database now? This will take a few minutes.",
             default: true,

package/lib/operation-poller.js

@@ -21,7 +21,7 @@ class OperationPoller {
         if (error) {
             throw error instanceof error_1.FirebaseError
                 ? error
-                : new error_1.FirebaseError(error.message, { status: error.code });
+                : new error_1.FirebaseError(error.message, { status: error.code, original: error });
         }
         return response;
     }

package/lib/requireTosAcceptance.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.requireTosAcceptance = void 0;
+const error_1 = require("./error");
+const firedata_1 = require("./gcp/firedata");
+const api_1 = require("./api");
+const consoleLandingPage = new Map([
+    [firedata_1.APPHOSTING_TOS_ID, `${(0, api_1.consoleOrigin)()}/project/_/apphosting`],
+]);
+function requireTosAcceptance(tosId) {
+    return () => requireTos(tosId);
+}
+exports.requireTosAcceptance = requireTosAcceptance;
+async function requireTos(tosId) {
+    const res = await (0, firedata_1.getTosStatus)();
+    if ((0, firedata_1.isProductTosAccepted)(res, tosId)) {
+        return;
+    }
+    const console = consoleLandingPage.get(tosId) || (0, api_1.consoleOrigin)();
+    throw new error_1.FirebaseError(`Your account has not accepted the required Terms of Service for this action. Please accept the Terms of Service and try again. ${console}`);
+}

package/lib/utils.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.openInBrowser = exports.connectableHostname = exports.randomInt = exports.debounce = exports.last = exports.cloneDeep = exports.groupBy = exports.assertIsStringOrUndefined = exports.assertIsNumber = exports.assertIsString = exports.thirtyDaysFromNow = exports.isRunningInWSL = exports.isVSCodeExtension = exports.isCloudEnvironment = exports.datetimeString = exports.createDestroyer = exports.promiseWithSpinner = exports.setupLoggers = exports.tryParse = exports.tryStringify = exports.promiseProps = exports.withTimeout = exports.promiseWhile = exports.promiseAllSettled = exports.getFunctionsEventProvider = exports.endpoint = exports.makeActiveProject = exports.streamToString = exports.stringToStream = exports.explainStdin = exports.allSettled = exports.reject = exports.logLabeledError = exports.logLabeledWarning = exports.logWarning = exports.logLabeledBullet = exports.logBullet = exports.logLabeledSuccess = exports.logSuccess = exports.addSubdomain = exports.addDatabaseNamespace = exports.getDatabaseViewDataUrl = exports.getDatabaseUrl = exports.envOverride = exports.setVSCodeEnvVars = exports.getInheritedOption = exports.consoleUrl = exports.vscodeEnvVars = exports.envOverrides = exports.IS_WINDOWS = void 0;
-exports.readSecretValue = exports.generateId = exports.wrappedSafeLoad = exports.readFileFromDirectory = exports.getHostnameFromUrl = exports.openInBrowserPopup = void 0;
+exports.connectableHostname = exports.randomInt = exports.debounce = exports.last = exports.cloneDeep = exports.groupBy = exports.assertIsStringOrUndefined = exports.assertIsNumber = exports.assertIsString = exports.thirtyDaysFromNow = exports.isRunningInWSL = exports.isVSCodeExtension = exports.isCloudEnvironment = exports.datetimeString = exports.createDestroyer = exports.sleep = exports.promiseWithSpinner = exports.setupLoggers = exports.tryParse = exports.tryStringify = exports.promiseProps = exports.withTimeout = exports.promiseWhile = exports.promiseAllSettled = exports.getFunctionsEventProvider = exports.endpoint = exports.makeActiveProject = exports.streamToString = exports.stringToStream = exports.explainStdin = exports.allSettled = exports.reject = exports.logLabeledError = exports.logLabeledWarning = exports.logWarning = exports.logLabeledBullet = exports.logBullet = exports.logLabeledSuccess = exports.logSuccess = exports.addSubdomain = exports.addDatabaseNamespace = exports.getDatabaseViewDataUrl = exports.getDatabaseUrl = exports.envOverride = exports.setVSCodeEnvVars = exports.getInheritedOption = exports.consoleUrl = exports.vscodeEnvVars = exports.envOverrides = exports.IS_WINDOWS = void 0;
+exports.readSecretValue = exports.generateId = exports.wrappedSafeLoad = exports.readFileFromDirectory = exports.getHostnameFromUrl = exports.openInBrowserPopup = exports.openInBrowser = void 0;
 const fs = require("fs-extra");
 const tty = require("tty");
 const path = require("node:path");
@@ -342,6 +342,10 @@ async function promiseWithSpinner(action, message) {
     return data;
 }
 exports.promiseWithSpinner = promiseWithSpinner;
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+exports.sleep = sleep;
 function createDestroyer(server) {
     const connections = new Set();
     server.on("connection", (conn) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "13.8.0",
+  "version": "13.8.1",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {

package/templates/init/dataconnect/mutations.gql

@@ -1,5 +1,4 @@
 # # Example mutations
-# # TODO: Replace with a really good illustrative example from devrel!
 # mutation createOrder($name: String!) {
 #   order_insert(data : {name: $name})
 # }

package/templates/init/dataconnect/queries.gql

@@ -1,5 +1,4 @@
 # # Example query
-# # TODO: Replace with a really good illustrative example from devrel!
 # query listOrders {
 #   orders {
 #     name

package/templates/init/dataconnect/schema.gql

@@ -1,5 +1,4 @@
 # # Example schema
-# # TODO: Replace with a really good illustrative example from devrel!
 # type Product @table {
 #   name: String!
 #   price: Int!