firebase-tools 13.17.0 → 13.18.0

package/lib/deploy/dataconnect/prepare.js

@@ -11,8 +11,13 @@ const build_1 = require("../../dataconnect/build");
 const ensureApis_1 = require("../../dataconnect/ensureApis");
 const requireTosAcceptance_1 = require("../../requireTosAcceptance");
 const firedata_1 = require("../../gcp/firedata");
+const provisionCloudSql_1 = require("../../dataconnect/provisionCloudSql");
+const names_1 = require("../../dataconnect/names");
 const error_1 = require("../../error");
+const types_1 = require("../../dataconnect/types");
+const schemaMigration_1 = require("../../dataconnect/schemaMigration");
 async function default_1(context, options) {
+    var _a;
     const projectId = (0, projectUtils_1.needProjectId)(options);
     await (0, ensureApis_1.ensureApis)(projectId);
     await (0, requireTosAcceptance_1.requireTosAcceptance)(firedata_1.DATA_CONNECT_TOS_ID)(options);
@@ -41,6 +46,37 @@ async function default_1(context, options) {
         filters,
     };
     utils.logLabeledBullet("dataconnect", `Successfully prepared schema and connectors`);
+    if (options.dryRun) {
+        for (const si of serviceInfos) {
+            await (0, schemaMigration_1.diffSchema)(si.schema, (_a = si.dataConnectYaml.schema.datasource.postgresql) === null || _a === void 0 ? void 0 : _a.schemaValidation);
+        }
+        utils.logLabeledBullet("dataconnect", "Checking for CloudSQL resources...");
+        await Promise.all(serviceInfos
+            .filter((si) => {
+            return !filters || (filters === null || filters === void 0 ? void 0 : filters.some((f) => si.dataConnectYaml.serviceId === f.serviceId));
+        })
+            .map(async (s) => {
+            var _a, _b;
+            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;
+                if (!instanceId || !databaseId) {
+                    return Promise.resolve();
+                }
+                const enableGoogleMlIntegration = (0, types_1.requiresVector)(s.deploymentMetadata);
+                return (0, provisionCloudSql_1.provisionCloudSql)({
+                    projectId,
+                    locationId: (0, names_1.parseServiceName)(s.serviceName).location,
+                    instanceId,
+                    databaseId,
+                    enableGoogleMlIntegration,
+                    waitForCreation: true,
+                    dryRun: options.dryRun,
+                });
+            }
+        }));
+    }
     logger_1.logger.debug(JSON.stringify(context.dataconnect, null, 2));
     return;
 }

package/lib/deploy/dataconnect/release.js

@@ -14,14 +14,21 @@ async function default_1(context, options) {
                 return f.serviceId === si.dataConnectYaml.serviceId && (f.schemaOnly || f.fullService);
             }));
     })
-        .map((s) => s.schema);
+        .map((s) => {
+        var _a;
+        return ({
+            schema: s.schema,
+            validationMode: (_a = s.dataConnectYaml.schema.datasource.postgresql) === null || _a === void 0 ? void 0 : _a.schemaValidation,
+        });
+    });
     if (wantSchemas.length) {
         utils.logLabeledBullet("dataconnect", "Releasing Data Connect schemas...");
         for (const s of wantSchemas) {
             await (0, schemaMigration_1.migrateSchema)({
                 options,
-                schema: s,
+                schema: s.schema,
                 validateOnly: false,
+                schemaValidation: s.validationMode,
             });
         }
         utils.logLabeledBullet("dataconnect", "Schemas released.");

package/lib/deploy/extensions/prepare.js

@@ -81,14 +81,19 @@ async function prepareHelper(context, options, payload, wantExtensions, noDelete
     }
     if (payload.instancesToDelete.length) {
         logger_1.logger.info(deploymentSummary.deletesSummary(payload.instancesToDelete));
-        if (!(await prompt.confirm({
-            message: `Would you like to delete ${payload.instancesToDelete
-                .map((i) => i.instanceId)
-                .join(", ")}?`,
-            default: false,
-            nonInteractive: options.nonInteractive,
-            force: options.force,
-        }))) {
+        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("If you deploy --force, they will be deleted.");
+        }
+        if (!options.dryRun &&
+            !(await prompt.confirm({
+                message: `Would you like to delete ${payload.instancesToDelete
+                    .map((i) => i.instanceId)
+                    .join(", ")}?`,
+                default: false,
+                nonInteractive: options.nonInteractive,
+                force: options.force,
+            }))) {
             payload.instancesToDelete = [];
         }
         else {
@@ -96,7 +101,15 @@ async function prepareHelper(context, options, payload, wantExtensions, noDelete
         }
     }
     await (0, requirePermissions_1.requirePermissions)(options, permissionsNeeded);
-    await (0, tos_1.acceptLatestAppDeveloperTOS)(options, projectId, context.want.map((i) => i.instanceId));
+    if (options.dryRun) {
+        const appDevTos = await (0, tos_1.getAppDeveloperTOSStatus)(projectId);
+        if (!appDevTos.lastAcceptedVersion) {
+            logger_1.logger.info("On your next deploy, you will be asked to accept the Firebase Extensions App Developer Terms of Service");
+        }
+    }
+    else {
+        await (0, tos_1.acceptLatestAppDeveloperTOS)(options, projectId, context.want.map((i) => i.instanceId));
+    }
 }
 async function prepareDynamicExtensions(context, options, payload, builds) {
     const filters = (0, functionsDeployHelper_1.getEndpointFilters)(options);

package/lib/deploy/firestore/prepare.js

@@ -5,6 +5,7 @@ const loadCJSON_1 = require("../../loadCJSON");
 const rulesDeploy_1 = require("../../rulesDeploy");
 const utils = require("../../utils");
 const fsConfig = require("../../firestore/fsConfig");
+const logger_1 = require("../../logger");
 function prepareRules(context, rulesDeploy, databaseId, rulesFile) {
     rulesDeploy.addFile(rulesFile);
     context.firestore.rules.push({
@@ -23,6 +24,7 @@ function prepareIndexes(context, options, databaseId, indexesFileName) {
     });
 }
 async function default_1(context, options) {
+    var _a;
     if (options.only) {
         const targets = options.only.split(",");
         const excludeRules = targets.indexOf("firestore:indexes") >= 0;
@@ -57,5 +59,13 @@ async function default_1(context, options) {
     if (context.firestore.rules.length > 0) {
         await rulesDeploy.compile();
     }
+    const rulesContext = (_a = context === null || context === void 0 ? void 0 : context.firestore) === null || _a === void 0 ? void 0 : _a.rules;
+    for (const ruleContext of rulesContext) {
+        const databaseId = ruleContext.databaseId;
+        const rulesFile = ruleContext.rulesFile;
+        if (!rulesFile) {
+            logger_1.logger.error(`Invalid firestore config for ${databaseId} database: ${JSON.stringify(options.config.src.firestore)}`);
+        }
+    }
 }
 exports.default = default_1;

package/lib/deploy/firestore/release.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const rulesDeploy_1 = require("../../rulesDeploy");
-const logger_1 = require("../../logger");
-async function default_1(context, options) {
+async function default_1(context) {
     var _a, _b;
     const rulesDeploy = (_a = context === null || context === void 0 ? void 0 : context.firestore) === null || _a === void 0 ? void 0 : _a.rulesDeploy;
     if (!context.firestoreRules || !rulesDeploy) {
@@ -12,11 +11,9 @@ async function default_1(context, options) {
     await Promise.all(rulesContext.map(async (ruleContext) => {
         const databaseId = ruleContext.databaseId;
         const rulesFile = ruleContext.rulesFile;
-        if (!rulesFile) {
-            logger_1.logger.error(`Invalid firestore config for ${databaseId} database: ${JSON.stringify(options.config.src.firestore)}`);
-            return;
+        if (rulesFile) {
+            return rulesDeploy.release(rulesFile, rulesDeploy_1.RulesetServiceType.CLOUD_FIRESTORE, databaseId);
         }
-        return rulesDeploy.release(rulesFile, rulesDeploy_1.RulesetServiceType.CLOUD_FIRESTORE, databaseId);
     }));
 }
 exports.default = default_1;

package/lib/deploy/functions/checkIam.js

@@ -102,7 +102,7 @@ function obtainDefaultComputeServiceAgentBindings(projectNumber) {
     return [runInvokerBinding, eventarcEventReceiverBinding];
 }
 exports.obtainDefaultComputeServiceAgentBindings = obtainDefaultComputeServiceAgentBindings;
-async function ensureServiceAgentRoles(projectId, projectNumber, want, have) {
+async function ensureServiceAgentRoles(projectId, projectNumber, want, have, dryRun) {
     const wantServices = backend.allEndpoints(want).reduce(reduceEventsToServices, []);
     const haveServices = backend.allEndpoints(have).reduce(reduceEventsToServices, []);
     const newServices = wantServices.filter((wantS) => !haveServices.find((haveS) => wantS.name === haveS.name));
@@ -138,7 +138,12 @@ async function ensureServiceAgentRoles(projectId, projectNumber, want, have) {
         return;
     }
     try {
-        await (0, resourceManager_1.setIamPolicy)(projectNumber, policy, "bindings");
+        if (dryRun) {
+            logger_1.logger.info(`On your next deploy, the following required roles will be granted: ${requiredBindings.map((b) => `${b.members.join(", ")}: ${(0, colorette_1.bold)(b.role)}`)}`);
+        }
+        else {
+            await (0, resourceManager_1.setIamPolicy)(projectNumber, policy, "bindings");
+        }
     }
     catch (err) {
         iam.printManualIamConfig(requiredBindings, projectId, "functions");

package/lib/deploy/functions/ensure.js

@@ -79,11 +79,19 @@ async function secretsToServiceAccounts(b) {
     }
     return secretsToSa;
 }
-async function secretAccess(projectId, wantBackend, haveBackend) {
+async function secretAccess(projectId, wantBackend, haveBackend, dryRun) {
     var _a, _b;
     const ensureAccess = async (secret, serviceAccounts) => {
         (0, utils_1.logLabeledBullet)("functions", `ensuring ${clc.bold(serviceAccounts.join(", "))} access to secret ${clc.bold(secret)}.`);
-        await (0, secretManager_1.ensureServiceAgentRole)({ name: secret, projectId }, serviceAccounts, "roles/secretmanager.secretAccessor");
+        if (dryRun) {
+            const check = await (0, secretManager_1.checkServiceAgentRole)({ name: secret, projectId }, serviceAccounts, "roles/secretmanager.secretAccessor");
+            if (check.length) {
+                (0, utils_1.logLabeledBullet)("functions", `On your next deploy, ${clc.bold(serviceAccounts.join(", "))} will be granted access to secret ${clc.bold(secret)}.`);
+            }
+        }
+        else {
+            await (0, secretManager_1.ensureServiceAgentRole)({ name: secret, projectId }, serviceAccounts, "roles/secretmanager.secretAccessor");
+        }
         (0, utils_1.logLabeledSuccess)("functions", `ensured ${clc.bold(serviceAccounts.join(", "))} access to ${clc.bold(secret)}.`);
     };
     const wantSecrets = await secretsToServiceAccounts(wantBackend);

package/lib/deploy/functions/prepare.js

@@ -183,9 +183,9 @@ async function prepare(context, options, payload) {
     await (0, prompts_1.promptForFailurePolicies)(options, matchingBackend, haveBackend);
     await (0, prompts_1.promptForMinInstances)(options, matchingBackend, haveBackend);
     await backend.checkAvailability(context, matchingBackend);
-    await (0, checkIam_1.ensureServiceAgentRoles)(projectId, projectNumber, matchingBackend, haveBackend);
     await validate.secretsAreValid(projectId, matchingBackend);
-    await ensure.secretAccess(projectId, matchingBackend, haveBackend);
+    await (0, checkIam_1.ensureServiceAgentRoles)(projectId, projectNumber, matchingBackend, haveBackend, options.dryRun);
+    await ensure.secretAccess(projectId, matchingBackend, haveBackend, options.dryRun);
     updateEndpointTargetedStatus(wantBackends, context.filters || []);
     (0, applyHash_1.applyBackendHashToBackends)(wantBackends, context);
 }

package/lib/deploy/index.js

@@ -41,6 +41,7 @@ const chain = async function (fns, context, options, payload) {
     }
 };
 const deploy = async function (targetNames, options, customContext = {}) {
+    var _a;
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const payload = {};
     const context = Object.assign({ projectId }, customContext);
@@ -85,9 +86,11 @@ const deploy = async function (targetNames, options, customContext = {}) {
         }
         predeploys.push((0, lifecycleHooks_1.lifecycleHooks)(targetName, "predeploy"));
         prepares.push(target.prepare);
-        deploys.push(target.deploy);
-        releases.push(target.release);
-        postdeploys.push((0, lifecycleHooks_1.lifecycleHooks)(targetName, "postdeploy"));
+        if (!options.dryRun) {
+            deploys.push(target.deploy);
+            releases.push(target.release);
+            postdeploys.push((0, lifecycleHooks_1.lifecycleHooks)(targetName, "postdeploy"));
+        }
     }
     logger_1.logger.info();
     logger_1.logger.info((0, colorette_1.bold)((0, colorette_1.white)("===") + " Deploying to '" + projectId + "'..."));
@@ -110,11 +113,12 @@ const deploy = async function (targetNames, options, customContext = {}) {
         analyticsParams[t] = "true";
     }
     await (0, track_1.trackGA4)("product_deploy", analyticsParams, duration);
+    const successMessage = options.dryRun ? "Dry run complete!" : "Deploy complete!";
     logger_1.logger.info();
-    (0, utils_1.logSuccess)((0, colorette_1.bold)((0, colorette_1.underline)("Deploy complete!")));
+    (0, utils_1.logSuccess)((0, colorette_1.bold)((0, colorette_1.underline)(successMessage)));
     logger_1.logger.info();
     const deployedHosting = (0, lodash_1.includes)(targetNames, "hosting");
-    logger_1.logger.info((0, colorette_1.bold)("Project Console:"), (0, utils_1.consoleUrl)(options.project, "/overview"));
+    logger_1.logger.info((0, colorette_1.bold)("Project Console:"), (0, utils_1.consoleUrl)((_a = options.project) !== null && _a !== void 0 ? _a : "_", "/overview"));
     if (deployedHosting) {
         (0, lodash_1.each)(context.hosting.deploys, (deploy) => {
             logger_1.logger.info((0, colorette_1.bold)("Hosting URL:"), (0, utils_1.addSubdomain)((0, api_1.hostingOrigin)(), deploy.config.site));

package/lib/emulator/downloadableEmulators.js

@@ -46,20 +46,20 @@ const EMULATOR_UPDATE_DETAILS = {
     },
     dataconnect: process.platform === "darwin"
         ? {
-            version: "1.3.6",
-            expectedSize: 24867584,
-            expectedChecksum: "b924d31e3620d7ed4486a95e22629fc8",
+            version: "1.3.7",
+            expectedSize: 25019136,
+            expectedChecksum: "648ca3e289db8209c2d555bb381e5e5e",
         }
         : process.platform === "win32"
             ? {
-                version: "1.3.6",
-                expectedSize: 25292288,
-                expectedChecksum: "45025491b43b55a94f4e4db8df903250",
+                version: "1.3.7",
+                expectedSize: 25441792,
+                expectedChecksum: "16081147aa94f1b8691329d5b9430b69",
             }
             : {
-                version: "1.3.6",
-                expectedSize: 24785048,
-                expectedChecksum: "6ae5820c0470c5a954540ad97838ec01",
+                version: "1.3.7",
+                expectedSize: 24928408,
+                expectedChecksum: "8749930f3a43f616e3ae231af8c787a8",
             },
 };
 exports.DownloadDetails = {

package/lib/firestore/checkDatabaseType.js

@@ -4,14 +4,21 @@ exports.checkDatabaseType = void 0;
 const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
 const logger_1 = require("../logger");
-async function checkDatabaseType(projectId) {
+const error_1 = require("../error");
+async function checkDatabaseType(projectId, databaseId = "(default)") {
     try {
         const client = new apiv2_1.Client({ urlPrefix: (0, api_1.firestoreOrigin)(), apiVersion: "v1" });
-        const resp = await client.get(`/projects/${projectId}/databases/(default)`);
+        const resp = await client.get(`/projects/${projectId}/databases/${databaseId}`);
         return resp.body.type;
     }
     catch (err) {
-        logger_1.logger.debug("error getting database type", err);
+        logger_1.logger.debug("error getting database type: ", err);
+        if (err instanceof error_1.FirebaseError) {
+            if (err.status === 404) {
+                logger_1.logger.info(`${databaseId} does not exist in project ${projectId}.`);
+                return "DATABASE_DOES_NOT_EXIST";
+            }
+        }
         return undefined;
     }
 }

package/lib/frameworks/angular/index.js

@@ -15,7 +15,7 @@ exports.support = "preview";
 exports.type = 3;
 exports.docsUrl = "https://firebase.google.com/docs/hosting/frameworks/angular";
 const DEFAULT_BUILD_SCRIPT = ["ng build"];
-exports.supportedRange = "14 - 17";
+exports.supportedRange = "16 - 18";
 async function discover(dir) {
     if (!(await (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "package.json"))))
         return;
@@ -181,9 +181,21 @@ exports.handle = function(req,res) {
 };\n`;
     }
     else if (serverOutputPath) {
-        bootstrapScript = `const app = ${(serverEntry === null || serverEntry === void 0 ? void 0 : serverEntry.endsWith(".mjs"))
+        bootstrapScript = `
+    const app = new Promise((resolve) => {
+      setTimeout(() => {
+        const port = process.env.PORT;
+        const socket = 'express.sock';
+        process.env.PORT = socket;
+        
+        ${(serverEntry === null || serverEntry === void 0 ? void 0 : serverEntry.endsWith(".mjs"))
             ? `import(\`./${serverOutputPath}/${serverEntry}\`)`
-            : `Promise.resolve(require('./${serverOutputPath}/${serverEntry}'))`}.then(server => server.app());
+            : `Promise.resolve(require('./${serverOutputPath}/${serverEntry}'))`}.then(({ app }) => {
+          process.env.PORT = port;
+          resolve(app());
+        });
+      }, 0);
+    });
 exports.handle = (req,res) => app.then(it => it(req,res));\n`;
     }
     else {

package/lib/frameworks/next/utils.js

@@ -265,7 +265,7 @@ exports.findEsbuildPath = findEsbuildPath;
 function getGlobalEsbuildVersion(binPath) {
     var _a;
     try {
-        const versionOutput = (_a = (0, child_process_1.execSync)(`${binPath} --version`, { encoding: "utf8" })) === null || _a === void 0 ? void 0 : _a.trim();
+        const versionOutput = (_a = (0, child_process_1.execSync)(`"${binPath}" --version`, { encoding: "utf8" })) === null || _a === void 0 ? void 0 : _a.trim();
         if (!versionOutput) {
             return null;
         }

package/lib/gcp/cloudsql/permissions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupSQLPermissions = exports.iamUserIsCSQLAdmin = exports.checkSQLRoleIsGranted = exports.firebasewriter = exports.firebasereader = exports.firebaseowner = void 0;
+exports.setupSQLPermissions = exports.iamUserIsCSQLAdmin = exports.checkSQLRoleIsGranted = exports.fdcSqlRoleMap = exports.firebasewriter = exports.firebasereader = exports.firebaseowner = void 0;
 const projectUtils_1 = require("../../projectUtils");
 const connect_1 = require("./connect");
 const iam_1 = require("../iam");
@@ -19,6 +19,11 @@ function firebasewriter(databaseId) {
     return `firebasewriter_${databaseId}_public`;
 }
 exports.firebasewriter = firebasewriter;
+exports.fdcSqlRoleMap = {
+    owner: firebaseowner,
+    writer: firebasewriter,
+    reader: firebasereader,
+};
 async function checkSQLRoleIsGranted(options, instanceId, databaseId, grantedRole, granteeRole) {
     const checkCmd = `
     DO $$

package/lib/gcp/secretManager.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.labels = exports.ensureApi = exports.isAppHostingManaged = exports.isFunctionsManaged = exports.FIREBASE_MANAGED = exports.ensureServiceAgentRole = exports.setIamPolicy = exports.getIamPolicy = exports.addVersion = exports.deleteSecret = exports.patchSecret = exports.createSecret = exports.toSecretVersionResourceName = exports.parseSecretVersionResourceName = exports.parseSecretResourceName = exports.secretExists = exports.destroySecretVersion = exports.accessSecretVersion = exports.getSecretVersion = exports.listSecretVersions = exports.getSecretMetadata = exports.listSecrets = exports.getSecret = exports.secretManagerConsoleUri = void 0;
+exports.labels = exports.ensureApi = exports.isAppHostingManaged = exports.isFunctionsManaged = exports.FIREBASE_MANAGED = exports.checkServiceAgentRole = exports.ensureServiceAgentRole = exports.setIamPolicy = exports.getIamPolicy = exports.addVersion = exports.deleteSecret = exports.patchSecret = exports.createSecret = exports.toSecretVersionResourceName = exports.parseSecretVersionResourceName = exports.parseSecretResourceName = exports.secretExists = exports.destroySecretVersion = exports.accessSecretVersion = exports.getSecretVersion = exports.listSecretVersions = exports.getSecretMetadata = exports.listSecrets = exports.getSecret = exports.secretManagerConsoleUri = void 0;
 const utils_1 = require("../utils");
 const error_1 = require("../error");
 const apiv2_1 = require("../apiv2");
@@ -207,6 +207,14 @@ async function setIamPolicy(secret, bindings) {
 }
 exports.setIamPolicy = setIamPolicy;
 async function ensureServiceAgentRole(secret, serviceAccountEmails, role) {
+    const bindings = await checkServiceAgentRole(secret, serviceAccountEmails, role);
+    if (bindings.length) {
+        await module.exports.setIamPolicy(secret, bindings);
+    }
+    (0, utils_1.logLabeledSuccess)("secretmanager", `Granted ${role} on projects/${secret.projectId}/secrets/${secret.name} to ${serviceAccountEmails.join(", ")}`);
+}
+exports.ensureServiceAgentRole = ensureServiceAgentRole;
+async function checkServiceAgentRole(secret, serviceAccountEmails, role) {
     const policy = await module.exports.getIamPolicy(secret);
     const bindings = policy.bindings || [];
     let binding = bindings.find((b) => b.role === role);
@@ -222,11 +230,10 @@ async function ensureServiceAgentRole(secret, serviceAccountEmails, role) {
         }
     }
     if (shouldShortCircuit)
-        return;
-    await module.exports.setIamPolicy(secret, bindings);
-    (0, utils_1.logLabeledSuccess)("secretmanager", `Granted ${role} on projects/${secret.projectId}/secrets/${secret.name} to ${serviceAccountEmails.join(", ")}`);
+        return [];
+    return bindings;
 }
-exports.ensureServiceAgentRole = ensureServiceAgentRole;
+exports.checkServiceAgentRole = checkServiceAgentRole;
 exports.FIREBASE_MANAGED = "firebase-managed";
 function isFunctionsManaged(secret) {
     return (secret.labels[exports.FIREBASE_MANAGED] === "true" || secret.labels[exports.FIREBASE_MANAGED] === "functions");

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

@@ -8,13 +8,16 @@ const provisionCloudSql_1 = require("../../../dataconnect/provisionCloudSql");
 const freeTrial_1 = require("../../../dataconnect/freeTrial");
 const cloudsql = require("../../../gcp/cloudsql/cloudsqladmin");
 const ensureApis_1 = require("../../../dataconnect/ensureApis");
+const experiments = require("../../../experiments");
 const client_1 = require("../../../dataconnect/client");
 const emulators_1 = require("../emulators");
 const names_1 = require("../../../dataconnect/names");
 const logger_1 = require("../../../logger");
 const templates_1 = require("../../../templates");
 const utils_1 = require("../../../utils");
+const cloudbilling_1 = require("../../../gcp/cloudbilling");
 const DATACONNECT_YAML_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/dataconnect.yaml");
+const DATACONNECT_YAML_COMPAT_EXPERIMENT_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/dataconnect-fdccompatiblemode.yaml");
 const CONNECTOR_YAML_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/connector.yaml");
 const SCHEMA_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/schema.gql");
 const QUERIES_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/queries.gql");
@@ -53,7 +56,8 @@ async function askQuestions(setup, config) {
         schemaGql: [],
         shouldProvisionCSQL: false,
     };
-    info = await promptForService(setup, info);
+    const isBillingEnabled = setup.projectId ? await (0, cloudbilling_1.checkBillingEnabled)(setup.projectId) : false;
+    info = await promptForService(setup, info, isBillingEnabled);
     if (info.cloudSqlInstanceId === "") {
         info = await promptForCloudSQLInstance(setup, info);
     }
@@ -70,8 +74,9 @@ async function askQuestions(setup, config) {
     setup.rcfile.dataconnectEmulatorConfig = { postgres: { localConnectionString } };
     info.shouldProvisionCSQL = !!(setup.projectId &&
         (info.isNewInstance || info.isNewDatabase) &&
+        isBillingEnabled &&
         (await (0, prompt_1.confirm)({
-            message: "Would you like to provision your CloudSQL instance and database now? This will take a few minutes.",
+            message: `Would you like to provision your Cloud SQL instance and database now?${info.isNewInstance ? " This will take several minutes." : ""}.`,
             default: true,
         })));
     return info;
@@ -125,7 +130,9 @@ function subDataconnectYamlValues(replacementValues) {
         connectorDirs: "__connectorDirs__",
         locationId: "__location__",
     };
-    let replaced = DATACONNECT_YAML_TEMPLATE;
+    let replaced = experiments.isEnabled("fdccompatiblemode")
+        ? DATACONNECT_YAML_COMPAT_EXPERIMENT_TEMPLATE
+        : DATACONNECT_YAML_TEMPLATE;
     for (const [k, v] of Object.entries(replacementValues)) {
         replaced = replaced.replace(replacements[k], JSON.stringify(v));
     }
@@ -141,10 +148,15 @@ function subConnectorYamlValues(replacementValues) {
     }
     return replaced;
 }
-async function promptForService(setup, info) {
-    var _a, _b, _c, _d;
+async function promptForService(setup, info, isBillingEnabled) {
+    var _a, _b, _c;
     if (setup.projectId) {
-        await (0, ensureApis_1.ensureApis)(setup.projectId);
+        if (isBillingEnabled) {
+            await (0, ensureApis_1.ensureApis)(setup.projectId);
+        }
+        else {
+            await (0, ensureApis_1.ensureSparkApis)(setup.projectId);
+        }
         const existingServices = await (0, client_1.listAllServices)(setup.projectId);
         const existingServicesAndSchemas = await Promise.all(existingServices.map(async (s) => {
             return {
@@ -171,14 +183,15 @@ async function promptForService(setup, info) {
                 info.serviceId = serviceName.serviceId;
                 info.locationId = serviceName.location;
                 if (choice.schema) {
-                    if ((_a = choice.schema.primaryDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.cloudSql.instance) {
-                        const instanceName = (0, names_1.parseCloudSQLInstanceName)((_b = choice.schema.primaryDatasource.postgresql) === null || _b === void 0 ? void 0 : _b.cloudSql.instance);
+                    const primaryDatasource = choice.schema.datasources.find((d) => d.postgresql);
+                    if ((_a = primaryDatasource === null || primaryDatasource === void 0 ? void 0 : primaryDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.cloudSql.instance) {
+                        const instanceName = (0, names_1.parseCloudSQLInstanceName)(primaryDatasource.postgresql.cloudSql.instance);
                         info.cloudSqlInstanceId = instanceName.instanceId;
                     }
                     if (choice.schema.source.files) {
                         info.schemaGql = choice.schema.source.files;
                     }
-                    info.cloudSqlDatabase = (_d = (_c = choice.schema.primaryDatasource.postgresql) === null || _c === void 0 ? void 0 : _c.database) !== null && _d !== void 0 ? _d : "";
+                    info.cloudSqlDatabase = (_c = (_b = primaryDatasource === null || primaryDatasource === void 0 ? void 0 : primaryDatasource.postgresql) === null || _b === void 0 ? void 0 : _b.database) !== null && _c !== void 0 ? _c : "";
                     const connectors = await (0, client_1.listConnectors)(choice.service.name, [
                         "connectors.name",
                         "connectors.source.files",
@@ -201,7 +214,7 @@ async function promptForService(setup, info) {
         info.serviceId = await (0, prompt_1.promptOnce)({
             message: "What ID would you like to use for this service?",
             type: "input",
-            default: "my-service",
+            default: "app",
         });
     }
     return info;
@@ -233,7 +246,7 @@ async function promptForCloudSQLInstance(setup, info) {
         info.cloudSqlInstanceId = await (0, prompt_1.promptOnce)({
             message: `What ID would you like to use for your new CloudSQL instance?`,
             type: "input",
-            default: `fdc-sql`,
+            default: `${info.serviceId || "app"}-fdc`,
         });
     }
     if (info.locationId === "") {

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

@@ -9,13 +9,14 @@ const rules = require("./rules");
 const indexes = require("./indexes");
 const error_1 = require("../../../error");
 const clc = require("colorette");
+const prompt_1 = require("../../../prompt");
 async function checkProjectSetup(setup, config, options) {
     const firestoreUnusedError = new error_1.FirebaseError(`It looks like you haven't used Cloud Firestore in this project before. Go to ${clc.bold(clc.underline(`https://console.firebase.google.com/project/${setup.projectId}/firestore`))} to create your Cloud Firestore database.`, { exit: 1 });
     const isFirestoreEnabled = await apiEnabled.check(setup.projectId, "firestore.googleapis.com", "", true);
     if (!isFirestoreEnabled) {
         throw firestoreUnusedError;
     }
-    const dbType = await (0, checkDatabaseType_1.checkDatabaseType)(setup.projectId);
+    const dbType = await getDatabaseType(setup);
     logger_1.logger.debug(`database_type: ${dbType}`);
     if (!dbType) {
         throw firestoreUnusedError;
@@ -25,6 +26,24 @@ async function checkProjectSetup(setup, config, options) {
     }
     await (0, requirePermissions_1.requirePermissions)(Object.assign(Object.assign({}, options), { project: setup.projectId }));
 }
+async function getDatabaseType(setup) {
+    const dbType = await (0, checkDatabaseType_1.checkDatabaseType)(setup.projectId, setup.databaseId);
+    logger_1.logger.debug(`database_type: ${dbType}`);
+    if (dbType === "DATABASE_DOES_NOT_EXIST") {
+        setup.databaseId = await selectDatabaseByPrompting();
+        return await getDatabaseType(setup);
+    }
+    else {
+        return dbType;
+    }
+}
+async function selectDatabaseByPrompting() {
+    const database = await (0, prompt_1.promptOnce)({
+        type: "input",
+        message: "Please input the name of the Native Firestore database you would like to use:",
+    });
+    return database;
+}
 async function doSetup(setup, config, options) {
     if (setup.projectId) {
         await checkProjectSetup(setup, config, options);

package/lib/init/features/firestore/indexes.js

@@ -47,15 +47,15 @@ function initIndexes(setup, config) {
         if (!setup.projectId) {
             return config.writeProjectFile(setup.config.firestore.indexes, INDEXES_TEMPLATE);
         }
-        return getIndexesFromConsole(setup.projectId).then((contents) => {
+        return getIndexesFromConsole(setup.projectId, setup.databaseId).then((contents) => {
             return config.writeProjectFile(setup.config.firestore.indexes, contents);
         });
     });
 }
 exports.initIndexes = initIndexes;
-function getIndexesFromConsole(projectId) {
-    const indexesPromise = indexes.listIndexes(projectId);
-    const fieldOverridesPromise = indexes.listFieldOverrides(projectId);
+function getIndexesFromConsole(projectId, databaseId) {
+    const indexesPromise = indexes.listIndexes(projectId, databaseId);
+    const fieldOverridesPromise = indexes.listFieldOverrides(projectId, databaseId);
     return Promise.all([indexesPromise, fieldOverridesPromise])
         .then((res) => {
         return indexes.makeIndexSpec(res[0], res[1]);

package/package.json

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