firebase-tools 13.13.3 → 13.14.1

package/lib/api.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serviceUsageOrigin = exports.cloudRunApiOrigin = exports.hostingApiOrigin = exports.firebaseStorageOrigin = exports.storageOrigin = exports.runtimeconfigOrigin = exports.rulesOrigin = exports.resourceManagerOrigin = exports.remoteConfigApiOrigin = exports.rtdbMetadataOrigin = exports.rtdbManagementOrigin = exports.realtimeOrigin = exports.extensionsTOSOrigin = exports.extensionsPublisherOrigin = exports.extensionsOrigin = exports.iamOrigin = exports.identityOrigin = exports.hostingOrigin = exports.googleOrigin = exports.pubsubOrigin = exports.cloudTasksOrigin = exports.cloudschedulerOrigin = exports.cloudbuildOrigin = exports.functionsDefaultRegion = exports.runOrigin = exports.functionsV2Origin = exports.functionsOrigin = exports.firestoreOrigin = exports.firestoreOriginOrEmulator = exports.firedataOrigin = exports.firebaseExtensionsRegistryOrigin = exports.firebaseApiOrigin = exports.eventarcOrigin = exports.dynamicLinksKey = exports.dynamicLinksOrigin = exports.consoleOrigin = exports.authOrigin = exports.apphostingP4SADomain = exports.apphostingOrigin = exports.appDistributionOrigin = exports.artifactRegistryDomain = exports.developerConnectP4SADomain = exports.developerConnectOrigin = exports.containerRegistryDomain = exports.cloudMonitoringOrigin = exports.cloudloggingOrigin = exports.cloudbillingOrigin = exports.clientSecret = exports.clientId = exports.authProxyOrigin = void 0;
-exports.setScopes = exports.getScopes = exports.vertexAIOrigin = exports.cloudSQLAdminOrigin = exports.dataConnectLocalConnString = exports.dataconnectOrigin = exports.githubClientSecret = exports.githubClientId = exports.computeOrigin = exports.secretManagerOrigin = exports.githubApiOrigin = exports.githubOrigin = void 0;
+exports.cloudRunApiOrigin = exports.hostingApiOrigin = exports.firebaseStorageOrigin = exports.storageOrigin = exports.runtimeconfigOrigin = exports.rulesOrigin = exports.resourceManagerOrigin = exports.remoteConfigApiOrigin = exports.rtdbMetadataOrigin = exports.rtdbManagementOrigin = exports.realtimeOrigin = exports.extensionsTOSOrigin = exports.extensionsPublisherOrigin = exports.extensionsOrigin = exports.iamOrigin = exports.identityOrigin = exports.hostingOrigin = exports.googleOrigin = exports.pubsubOrigin = exports.cloudTasksOrigin = exports.cloudschedulerOrigin = exports.cloudbuildOrigin = exports.functionsDefaultRegion = exports.runOrigin = exports.functionsV2Origin = exports.functionsOrigin = exports.firestoreOrigin = exports.firestoreOriginOrEmulator = exports.firedataOrigin = exports.firebaseExtensionsRegistryOrigin = exports.firebaseApiOrigin = exports.eventarcOrigin = exports.dynamicLinksKey = exports.dynamicLinksOrigin = exports.consoleOrigin = exports.authOrigin = exports.apphostingGitHubAppInstallationURL = exports.apphostingP4SADomain = exports.apphostingOrigin = exports.appDistributionOrigin = exports.artifactRegistryDomain = exports.developerConnectP4SADomain = exports.developerConnectOrigin = exports.containerRegistryDomain = exports.cloudMonitoringOrigin = exports.cloudloggingOrigin = exports.cloudbillingOrigin = exports.clientSecret = exports.clientId = exports.authProxyOrigin = void 0;
+exports.setScopes = exports.getScopes = exports.vertexAIOrigin = exports.cloudSQLAdminOrigin = exports.dataConnectLocalConnString = exports.dataconnectOrigin = exports.githubClientSecret = exports.githubClientId = exports.computeOrigin = exports.secretManagerOrigin = exports.githubApiOrigin = exports.githubOrigin = exports.serviceUsageOrigin = void 0;
 const constants_1 = require("./emulator/constants");
 const logger_1 = require("./logger");
 const scopes = require("./scopes");
@@ -33,6 +33,8 @@ const apphostingOrigin = () => utils.envOverride("FIREBASE_APPHOSTING_URL", "htt
 exports.apphostingOrigin = apphostingOrigin;
 const apphostingP4SADomain = () => utils.envOverride("FIREBASE_APPHOSTING_P4SA_DOMAIN", "gcp-sa-firebaseapphosting.iam.gserviceaccount.com");
 exports.apphostingP4SADomain = apphostingP4SADomain;
+const apphostingGitHubAppInstallationURL = () => utils.envOverride("FIREBASE_APPHOSTING_GITHUB_INSTALLATION_URL", "https://github.com/apps/firebase-app-hosting/installations/new");
+exports.apphostingGitHubAppInstallationURL = apphostingGitHubAppInstallationURL;
 const authOrigin = () => utils.envOverride("FIREBASE_AUTH_URL", "https://accounts.google.com");
 exports.authOrigin = authOrigin;
 const consoleOrigin = () => utils.envOverride("FIREBASE_CONSOLE_URL", "https://console.firebase.google.com");

package/lib/apphosting/githubConnections.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchAllRepositories = exports.listAppHostingConnections = exports.getOrCreateRepository = exports.getOrCreateConnection = exports.createConnection = exports.ensureSecretManagerAdminGrant = exports.promptGitHubBranch = exports.getOrCreateOauthConnection = exports.linkGitHubRepository = exports.generateRepositoryId = exports.extractRepoSlugFromUri = exports.parseConnectionName = void 0;
+exports.fetchRepositoryCloneUris = exports.listAppHostingConnections = exports.getOrCreateRepository = exports.getOrCreateConnection = exports.createConnection = exports.ensureSecretManagerAdminGrant = exports.promptGitHubBranch = exports.getOrCreateOauthConnection = exports.listValidInstallations = exports.promptGitHubInstallation = exports.getConnectionForInstallation = exports.linkGitHubRepository = exports.generateRepositoryId = exports.extractRepoSlugFromUri = exports.parseConnectionName = void 0;
 const clc = require("colorette");
 const devConnect = require("../gcp/devConnect");
 const rm = require("../gcp/resourceManager");
@@ -51,39 +51,49 @@ function generateConnectionId() {
     const randomHash = Math.random().toString(36).slice(6);
     return `apphosting-github-conn-${randomHash}`;
 }
-const ADD_CONN_CHOICE = "@ADD_CONN";
+const ADD_ACCOUNT_CHOICE = "@ADD_ACCOUNT";
+const MANAGE_INSTALLATION_CHOICE = "@MANAGE_INSTALLATION";
 async function linkGitHubRepository(projectId, location) {
     var _a, _b;
     utils.logBullet(clc.bold(`${clc.yellow("===")} Import a GitHub repository`));
     const oauthConn = await getOrCreateOauthConnection(projectId, location);
-    const existingConns = await listAppHostingConnections(projectId, location);
-    if (existingConns.length === 0) {
-        existingConns.push(await createFullyInstalledConnection(projectId, location, generateConnectionId(), oauthConn));
+    let installationId = await promptGitHubInstallation(projectId, location, oauthConn);
+    while (installationId === ADD_ACCOUNT_CHOICE) {
+        utils.logBullet("Install the Firebase App Hosting GitHub app on a new account to enable access to those repositories");
+        const apphostingGitHubInstallationURL = (0, api_1.apphostingGitHubAppInstallationURL)();
+        utils.logBullet(apphostingGitHubInstallationURL);
+        await utils.openInBrowser(apphostingGitHubInstallationURL);
+        await (0, prompt_1.promptOnce)({
+            type: "input",
+            message: "Press Enter once you have installed or configured the Firebase App Hosting GitHub app to access your GitHub repo.",
+        });
+        installationId = await promptGitHubInstallation(projectId, location, oauthConn);
+    }
+    let connectionMatchingInstallation = await getConnectionForInstallation(projectId, location, installationId);
+    if (!connectionMatchingInstallation) {
+        connectionMatchingInstallation = await createFullyInstalledConnection(projectId, location, generateConnectionId(), oauthConn, installationId);
     }
     let repoCloneUri;
-    let connection;
     do {
-        if (repoCloneUri === ADD_CONN_CHOICE) {
-            existingConns.push(await createFullyInstalledConnection(projectId, location, generateConnectionId(), oauthConn, true));
+        if (repoCloneUri === MANAGE_INSTALLATION_CHOICE) {
+            await manageInstallation(connectionMatchingInstallation);
         }
-        const selection = await promptCloneUri(projectId, existingConns);
-        repoCloneUri = selection.cloneUri;
-        connection = selection.connection;
-    } while (repoCloneUri === ADD_CONN_CHOICE);
-    const { id: connectionId } = parseConnectionName(connection.name);
+        repoCloneUri = await promptCloneUri(projectId, connectionMatchingInstallation);
+    } while (repoCloneUri === MANAGE_INSTALLATION_CHOICE);
+    const { id: connectionId } = parseConnectionName(connectionMatchingInstallation.name);
     await getOrCreateConnection(projectId, location, connectionId, {
-        authorizerCredential: (_a = connection.githubConfig) === null || _a === void 0 ? void 0 : _a.authorizerCredential,
-        appInstallationId: (_b = connection.githubConfig) === null || _b === void 0 ? void 0 : _b.appInstallationId,
+        authorizerCredential: (_a = connectionMatchingInstallation.githubConfig) === null || _a === void 0 ? void 0 : _a.authorizerCredential,
+        appInstallationId: (_b = connectionMatchingInstallation.githubConfig) === null || _b === void 0 ? void 0 : _b.appInstallationId,
     });
     const repo = await getOrCreateRepository(projectId, location, connectionId, repoCloneUri);
     return repo;
 }
 exports.linkGitHubRepository = linkGitHubRepository;
-async function createFullyInstalledConnection(projectId, location, connectionId, oauthConn, withNewInstallation = false) {
-    var _a, _b;
+async function createFullyInstalledConnection(projectId, location, connectionId, oauthConn, installationId) {
+    var _a;
     let conn = await createConnection(projectId, location, connectionId, {
-        appInstallationId: withNewInstallation ? undefined : (_a = oauthConn.githubConfig) === null || _a === void 0 ? void 0 : _a.appInstallationId,
-        authorizerCredential: (_b = oauthConn.githubConfig) === null || _b === void 0 ? void 0 : _b.authorizerCredential,
+        appInstallationId: installationId,
+        authorizerCredential: (_a = oauthConn.githubConfig) === null || _a === void 0 ? void 0 : _a.authorizerCredential,
     });
     while (conn.installationState.stage !== "COMPLETE") {
         utils.logBullet("Install the Firebase App Hosting GitHub app to enable access to GitHub repositories");
@@ -98,6 +108,75 @@ async function createFullyInstalledConnection(projectId, location, connectionId,
     }
     return conn;
 }
+async function manageInstallation(connection) {
+    var _a;
+    utils.logBullet("Manage the Firebase App Hosting GitHub app to enable access to GitHub repositories");
+    const targetUri = (_a = connection.githubConfig) === null || _a === void 0 ? void 0 : _a.installationUri;
+    if (!targetUri) {
+        throw new error_1.FirebaseError("Failed to get Installation URI. Please try again.");
+    }
+    utils.logBullet(targetUri);
+    await utils.openInBrowser(targetUri);
+    await (0, prompt_1.promptOnce)({
+        type: "input",
+        message: "Press Enter once you have installed or configured the Firebase App Hosting GitHub app to access your GitHub repo.",
+    });
+}
+async function getConnectionForInstallation(projectId, location, installationId) {
+    const connections = await listAppHostingConnections(projectId, location);
+    const connectionsMatchingInstallation = connections.filter((conn) => { var _a; return ((_a = conn.githubConfig) === null || _a === void 0 ? void 0 : _a.appInstallationId) === installationId; });
+    if (connectionsMatchingInstallation.length === 0) {
+        return null;
+    }
+    if (connectionsMatchingInstallation.length > 1) {
+        const sorted = devConnect.sortConnectionsByCreateTime(connectionsMatchingInstallation);
+        return sorted[0];
+    }
+    return connectionsMatchingInstallation[0];
+}
+exports.getConnectionForInstallation = getConnectionForInstallation;
+async function promptGitHubInstallation(projectId, location, connection) {
+    const installations = await listValidInstallations(projectId, location, connection);
+    const installationName = await (0, prompt_1.promptOnce)({
+        type: "autocomplete",
+        name: "installation",
+        message: "Which GitHub account do you want to use?",
+        source: (_, input = "") => {
+            return new Promise((resolve) => resolve([
+                new inquirer.Separator(),
+                {
+                    name: "Missing an account? Select this option to add a GitHub account",
+                    value: ADD_ACCOUNT_CHOICE,
+                },
+                new inquirer.Separator(),
+                ...fuzzy
+                    .filter(input, installations, {
+                    extract: (installation) => installation.name || "",
+                })
+                    .map((result) => {
+                    return {
+                        name: result.original.name || "",
+                        value: result.original.id,
+                    };
+                }),
+            ]));
+        },
+    });
+    return installationName;
+}
+exports.promptGitHubInstallation = promptGitHubInstallation;
+async function listValidInstallations(projectId, location, connection) {
+    const { id: connId } = parseConnectionName(connection.name);
+    let installations = await devConnect.fetchGitHubInstallations(projectId, location, connId);
+    installations = installations.filter((installation) => {
+        var _a, _b;
+        return ((installation.type === "user" &&
+            installation.name === ((_b = (_a = connection.githubConfig) === null || _a === void 0 ? void 0 : _a.authorizerCredential) === null || _b === void 0 ? void 0 : _b.username)) ||
+            installation.type === "organization");
+    });
+    return installations;
+}
+exports.listValidInstallations = listValidInstallations;
 async function getOrCreateOauthConnection(projectId, location) {
     let conn;
     try {
@@ -128,8 +207,8 @@ async function getOrCreateOauthConnection(projectId, location) {
     return conn;
 }
 exports.getOrCreateOauthConnection = getOrCreateOauthConnection;
-async function promptCloneUri(projectId, connections) {
-    const { cloneUris, cloneUriToConnection } = await fetchAllRepositories(projectId, connections);
+async function promptCloneUri(projectId, connection) {
+    const cloneUris = await fetchRepositoryCloneUris(projectId, connection);
     const cloneUri = await (0, prompt_1.promptOnce)({
         type: "autocomplete",
         name: "cloneUri",
@@ -139,7 +218,7 @@ async function promptCloneUri(projectId, connections) {
                 new inquirer.Separator(),
                 {
                     name: "Missing a repo? Select this option to configure your GitHub connection settings",
-                    value: ADD_CONN_CHOICE,
+                    value: MANAGE_INSTALLATION_CHOICE,
                 },
                 new inquirer.Separator(),
                 ...fuzzy
@@ -155,7 +234,7 @@ async function promptCloneUri(projectId, connections) {
             ]));
         },
     });
-    return { cloneUri, connection: cloneUriToConnection[cloneUri] };
+    return cloneUri;
 }
 async function promptGitHubBranch(repoLink) {
     const branches = await devConnect.listAllBranches(repoLink.name);
@@ -260,15 +339,10 @@ async function listAppHostingConnections(projectId, location) {
         !conn.disabled);
 }
 exports.listAppHostingConnections = listAppHostingConnections;
-async function fetchAllRepositories(projectId, connections) {
-    const cloneUriToConnection = {};
-    for (const conn of connections) {
-        const { location, id } = parseConnectionName(conn.name);
-        const connectionRepos = await devConnect.listAllLinkableGitRepositories(projectId, location, id);
-        connectionRepos.forEach((repo) => {
-            cloneUriToConnection[repo.cloneUri] = conn;
-        });
-    }
-    return { cloneUris: Object.keys(cloneUriToConnection), cloneUriToConnection };
+async function fetchRepositoryCloneUris(projectId, connection) {
+    const { location, id } = parseConnectionName(connection.name);
+    const connectionRepos = await devConnect.listAllLinkableGitRepositories(projectId, location, id);
+    const cloneUris = connectionRepos.map((conn) => conn.cloneUri);
+    return cloneUris;
 }
-exports.fetchAllRepositories = fetchAllRepositories;
+exports.fetchRepositoryCloneUris = fetchRepositoryCloneUris;

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const path = require("path");
 const clc = require("colorette");
 const command_1 = require("../command");
 const dataconnectEmulator_1 = require("../emulator/dataconnectEmulator");
@@ -15,12 +14,8 @@ exports.command = new command_1.Command("dataconnect:sdk:generate")
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const services = (0, fileUtils_1.readFirebaseJson)(options.config);
     for (const service of services) {
-        let configDir = service.source;
-        if (!path.isAbsolute(configDir)) {
-            const cwd = options.cwd || process.cwd();
-            configDir = path.resolve(path.join(cwd), configDir);
-        }
-        const serviceInfo = await (0, load_1.load)(projectId, configDir);
+        const configDir = service.source;
+        const serviceInfo = await (0, load_1.load)(projectId, options.config, configDir);
         const hasGeneratables = serviceInfo.connectorInfo.some((c) => {
             var _a, _b, _c;
             return (((_a = c.connectorYaml.generate) === null || _a === void 0 ? void 0 : _a.javascriptSdk) ||

package/lib/commands/firestore-backups-schedules-create.js

@@ -11,45 +11,42 @@ const requirePermissions_1 = require("../requirePermissions");
 const types_1 = require("../emulator/types");
 const commandUtils_1 = require("../emulator/commandUtils");
 const pretty_print_1 = require("../firestore/pretty-print");
+const error_1 = require("../error");
 exports.command = new command_1.Command("firestore:backups:schedules:create")
     .description("Create a backup schedule under your Cloud Firestore database.")
-    .option("-db, --database <databaseId>", "Database under which you want to create a schedule. Defaults to the (default) database")
-    .option("-rt, --retention <duration>", "duration string (e.g. 12h or 30d) for backup retention")
-    .option("-rc, --recurrence <recurrence>", "Recurrence settings; either DAILY or WEEKLY")
-    .option("-dw, --day-of-week <dayOfWeek>", "On which day of the week to perform backups; one of MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY, or SUNDAY")
+    .option("-d, --database <databaseId>", "Database under which you want to create a schedule. Defaults to the (default) database")
+    .option("--retention <duration>", "duration string (e.g. 12h or 30d) for backup retention")
+    .option("--recurrence <recurrence>", "Recurrence settings; either DAILY or WEEKLY")
+    .option("--day-of-week <dayOfWeek>", "On which day of the week to perform backups; one of MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY, or SUNDAY")
     .before(requirePermissions_1.requirePermissions, ["datastore.backupSchedules.create"])
     .before(commandUtils_1.warnEmulatorNotSupported, types_1.Emulators.FIRESTORE)
     .action(async (options) => {
     const printer = new pretty_print_1.PrettyPrint();
+    const helpCommandText = "See firebase firestore:backups:schedules:create --help for more info.";
     const databaseId = options.database || "(default)";
     if (!options.retention) {
-        logger_1.logger.error("Missing required flag --retention. See firebase firestore:backups:schedules:create --help for more info");
-        return;
+        throw new error_1.FirebaseError(`Missing required flag --retention. ${helpCommandText}`);
     }
     const retention = (0, backupUtils_1.calculateRetention)(options.retention);
     if (!options.recurrence) {
-        logger_1.logger.error("Missing required flag --recurrence. See firebase firestore:backups:schedules:create --help for more info");
-        return;
+        throw new error_1.FirebaseError(`Missing required flag --recurrence. ${helpCommandText}`);
     }
     const recurrenceType = options.recurrence;
     if (recurrenceType !== types.RecurrenceType.DAILY &&
         recurrenceType !== types.RecurrenceType.WEEKLY) {
-        logger_1.logger.error("Invalid value for flag --recurrence. See firebase firestore:backups:schedules:create --help for more info");
-        return;
+        throw new error_1.FirebaseError(`Invalid value for flag --recurrence. ${helpCommandText}`);
     }
     let dailyRecurrence;
     let weeklyRecurrence;
     if (options.recurrence === types.RecurrenceType.DAILY) {
         dailyRecurrence = {};
         if (options.dayOfWeek) {
-            logger_1.logger.error("--day-of-week should not be provided if --recurrence is DAILY");
-            return;
+            throw new error_1.FirebaseError(`--day-of-week should not be provided if --recurrence is DAILY. ${helpCommandText}`);
         }
     }
     else if (options.recurrence === types.RecurrenceType.WEEKLY) {
         if (!options.dayOfWeek) {
-            logger_1.logger.error("If --recurrence is WEEKLY, --day-of-week must be provided. See firebase firestore:backups:schedules:create --help for more info");
-            return;
+            throw new error_1.FirebaseError(`If --recurrence is WEEKLY, --day-of-week must be provided. ${helpCommandText}`);
         }
         const day = options.dayOfWeek;
         weeklyRecurrence = {

package/lib/commands/firestore-backups-schedules-list.js

@@ -10,7 +10,7 @@ const firestore_1 = require("../gcp/firestore");
 const pretty_print_1 = require("../firestore/pretty-print");
 exports.command = new command_1.Command("firestore:backups:schedules:list")
     .description("List backup schedules under your Cloud Firestore database.")
-    .option("-db, --database <databaseId>", "Database whose schedules you wish to list. Defaults to the (default) database.")
+    .option("-d, --database <databaseId>", "Database whose schedules you wish to list. Defaults to the (default) database.")
     .before(requirePermissions_1.requirePermissions, ["datastore.backupSchedules.list"])
     .before(commandUtils_1.warnEmulatorNotSupported, types_1.Emulators.FIRESTORE)
     .action(async (options) => {

package/lib/commands/firestore-backups-schedules-update.js

@@ -10,16 +10,17 @@ const requirePermissions_1 = require("../requirePermissions");
 const types_1 = require("../emulator/types");
 const commandUtils_1 = require("../emulator/commandUtils");
 const pretty_print_1 = require("../firestore/pretty-print");
+const error_1 = require("../error");
 exports.command = new command_1.Command("firestore:backups:schedules:update <backupSchedule>")
     .description("Update a backup schedule under your Cloud Firestore database.")
-    .option("-rt, --retention <duration>", "duration string (e.g. 12h or 30d) for backup retention")
+    .option("--retention <duration>", "duration string (e.g. 12h or 30d) for backup retention")
     .before(requirePermissions_1.requirePermissions, ["datastore.backupSchedules.update"])
     .before(commandUtils_1.warnEmulatorNotSupported, types_1.Emulators.FIRESTORE)
     .action(async (backupScheduleName, options) => {
     const printer = new pretty_print_1.PrettyPrint();
+    const helpCommandText = "See firebase firestore:backups:schedules:update --help for more info.";
     if (!options.retention) {
-        logger_1.logger.error("Missing required flag --retention. See firebase firestore:backups:schedules:update --help for more info");
-        return;
+        throw new error_1.FirebaseError(`Missing required flag --retention. ${helpCommandText}`);
     }
     const retention = (0, backupUtils_1.calculateRetention)(options.retention);
     const backupSchedule = await (0, firestore_1.updateBackupSchedule)(backupScheduleName, retention);

package/lib/commands/firestore-databases-create.js

@@ -10,6 +10,7 @@ const requirePermissions_1 = require("../requirePermissions");
 const types_1 = require("../emulator/types");
 const commandUtils_1 = require("../emulator/commandUtils");
 const pretty_print_1 = require("../firestore/pretty-print");
+const error_1 = require("../error");
 exports.command = new command_1.Command("firestore:databases:create <database>")
     .description("Create a database in your Firebase project.")
     .option("--location <locationId>", "Region to create database, for example 'nam5'. Run 'firebase firestore:locations' to get a list of eligible locations. (required)")
@@ -20,16 +21,15 @@ exports.command = new command_1.Command("firestore:databases:create <database>")
     .action(async (database, options) => {
     const api = new fsi.FirestoreApi();
     const printer = new pretty_print_1.PrettyPrint();
+    const helpCommandText = "See firebase firestore:databases:create --help for more info.";
     if (!options.location) {
-        logger_1.logger.error("Missing required flag --location. See firebase firestore:databases:create --help for more info.");
-        return;
+        throw new error_1.FirebaseError(`Missing required flag --location. ${helpCommandText}`);
     }
     const type = types.DatabaseType.FIRESTORE_NATIVE;
     if (options.deleteProtection &&
         options.deleteProtection !== types.DatabaseDeleteProtectionStateOption.ENABLED &&
         options.deleteProtection !== types.DatabaseDeleteProtectionStateOption.DISABLED) {
-        logger_1.logger.error("Invalid value for flag --delete-protection. See firebase firestore:databases:create --help for more info.");
-        return;
+        throw new error_1.FirebaseError(`Invalid value for flag --delete-protection. ${helpCommandText}`);
     }
     const deleteProtectionState = options.deleteProtection === types.DatabaseDeleteProtectionStateOption.ENABLED
         ? types.DatabaseDeleteProtectionState.ENABLED
@@ -37,8 +37,7 @@ exports.command = new command_1.Command("firestore:databases:create <database>")
     if (options.pointInTimeRecovery &&
         options.pointInTimeRecovery !== types.PointInTimeRecoveryEnablementOption.ENABLED &&
         options.pointInTimeRecovery !== types.PointInTimeRecoveryEnablementOption.DISABLED) {
-        logger_1.logger.error("Invalid value for flag --point-in-time-recovery. See firebase firestore:databases:create --help for more info.");
-        return;
+        throw new error_1.FirebaseError(`Invalid value for flag --point-in-time-recovery. ${helpCommandText}`);
     }
     const pointInTimeRecoveryEnablement = options.pointInTimeRecovery === types.PointInTimeRecoveryEnablementOption.ENABLED
         ? types.PointInTimeRecoveryEnablement.ENABLED

package/lib/commands/firestore-databases-restore.js

@@ -9,6 +9,7 @@ const requirePermissions_1 = require("../requirePermissions");
 const types_1 = require("../emulator/types");
 const commandUtils_1 = require("../emulator/commandUtils");
 const pretty_print_1 = require("../firestore/pretty-print");
+const error_1 = require("../error");
 exports.command = new command_1.Command("firestore:databases:restore")
     .description("Restore a Firestore database in your Firebase project.")
     .option("-d, --database <databaseID>", "ID of the database to restore into")
@@ -18,14 +19,13 @@ exports.command = new command_1.Command("firestore:databases:restore")
     .action(async (options) => {
     const api = new fsi.FirestoreApi();
     const printer = new pretty_print_1.PrettyPrint();
+    const helpCommandText = "See firebase firestore:databases:restore --help for more info.";
     if (!options.database) {
-        logger_1.logger.error("Missing required flag --database. See firebase firestore:databases:restore --help for more info");
-        return;
+        throw new error_1.FirebaseError(`Missing required flag --database. ${helpCommandText}`);
     }
     const databaseId = options.database;
     if (!options.backup) {
-        logger_1.logger.error("Missing required flag --backup. See firebase firestore:databases:restore --help for more info");
-        return;
+        throw new error_1.FirebaseError(`Missing required flag --backup. ${helpCommandText}`);
     }
     const backupName = options.backup;
     const databaseResp = await api.restoreDatabase(options.project, databaseId, backupName);

package/lib/commands/firestore-databases-update.js

@@ -10,6 +10,7 @@ const requirePermissions_1 = require("../requirePermissions");
 const types_1 = require("../emulator/types");
 const commandUtils_1 = require("../emulator/commandUtils");
 const pretty_print_1 = require("../firestore/pretty-print");
+const error_1 = require("../error");
 exports.command = new command_1.Command("firestore:databases:update <database>")
     .description("Update a database in your Firebase project. Must specify at least one property to update.")
     .option("--json", "Prints raw json response of the create API call if specified")
@@ -20,15 +21,14 @@ exports.command = new command_1.Command("firestore:databases:update <database>")
     .action(async (database, options) => {
     const api = new fsi.FirestoreApi();
     const printer = new pretty_print_1.PrettyPrint();
+    const helpCommandText = "See firebase firestore:databases:update --help for more info.";
     if (!options.deleteProtection && !options.pointInTimeRecovery) {
-        logger_1.logger.error("Missing properties to update. See firebase firestore:databases:update --help for more info.");
-        return;
+        throw new error_1.FirebaseError(`Missing properties to update. ${helpCommandText}`);
     }
     if (options.deleteProtection &&
         options.deleteProtection !== types.DatabaseDeleteProtectionStateOption.ENABLED &&
         options.deleteProtection !== types.DatabaseDeleteProtectionStateOption.DISABLED) {
-        logger_1.logger.error("Invalid value for flag --delete-protection. See firebase firestore:databases:update --help for more info.");
-        return;
+        throw new error_1.FirebaseError(`Invalid value for flag --delete-protection. ${helpCommandText}`);
     }
     let deleteProtectionState;
     if (options.deleteProtection === types.DatabaseDeleteProtectionStateOption.ENABLED) {
@@ -40,8 +40,7 @@ exports.command = new command_1.Command("firestore:databases:update <database>")
     if (options.pointInTimeRecovery &&
         options.pointInTimeRecovery !== types.PointInTimeRecoveryEnablementOption.ENABLED &&
         options.pointInTimeRecovery !== types.PointInTimeRecoveryEnablementOption.DISABLED) {
-        logger_1.logger.error("Invalid value for flag --point-in-time-recovery. See firebase firestore:databases:update --help for more info.");
-        return;
+        throw new error_1.FirebaseError(`Invalid value for flag --point-in-time-recovery. ${helpCommandText}`);
     }
     let pointInTimeRecoveryEnablement;
     if (options.pointInTimeRecovery === types.PointInTimeRecoveryEnablementOption.ENABLED) {

package/lib/commands/help.js

@@ -24,4 +24,6 @@ exports.command = new command_1.Command("help [command]")
         logger_1.logger.info("  To get help with a specific command, type", clc.bold("firebase help [command_name]"));
         logger_1.logger.info();
     }
+    logger_1.logger.info(" Privacy Policy: https://firebase.google.com/support/privacy");
+    logger_1.logger.info();
 });

package/lib/commands/init.js

@@ -44,7 +44,7 @@ const choices = [
     },
     {
         value: "hosting:github",
-        name: "Hosting: Set up GitHub Action deploys",
+        name: " └── Hosting: Set up GitHub Action deploys",
         checked: false,
     },
     {
@@ -82,7 +82,7 @@ choices.push({
 });
 choices.push({
     value: "dataconnect:sdk",
-    name: "Data Connect: Set up a generated SDK for your Firebase Data Connect service",
+    name: " └── Data Connect: Set up a generated SDK for your Firebase Data Connect service",
     checked: false,
 });
 const featureNames = choices.map((choice) => choice.value);

package/lib/dataconnect/fileUtils.js

@@ -76,13 +76,13 @@ async function pickService(projectId, config, serviceId) {
         throw new error_1.FirebaseError("No Data Connect services found in firebase.json.");
     }
     else if (serviceCfgs.length === 1) {
-        serviceInfo = await (0, load_1.load)(projectId, serviceCfgs[0].source);
+        serviceInfo = await (0, load_1.load)(projectId, config, serviceCfgs[0].source);
     }
     else {
         if (!serviceId) {
             throw new error_1.FirebaseError("Multiple Data Connect services found in firebase.json. Please specify a service ID to use.");
         }
-        const infos = await Promise.all(serviceCfgs.map((c) => (0, load_1.load)(projectId, c.source)));
+        const infos = await Promise.all(serviceCfgs.map((c) => (0, load_1.load)(projectId, config, c.source)));
         const maybe = infos.find((i) => i.dataConnectYaml.serviceId === serviceId);
         if (!maybe) {
             throw new error_1.FirebaseError(`No service named ${serviceId} declared in firebase.json.`);

package/lib/dataconnect/filters.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getResourceFilters = void 0;
+exports.toString = exports.getResourceFilters = void 0;
 const error_1 = require("../error");
 function getResourceFilters(options) {
     if (!options.only) {
@@ -43,3 +43,14 @@ function parseSelector(selector) {
     }
     return filter;
 }
+function toString(rf) {
+    const base = `dataconnect:${rf.serviceId}`;
+    if (rf.connectorId) {
+        return `${base}:${rf.connectorId}`;
+    }
+    if (rf.schemaOnly) {
+        return `${base}:schema`;
+    }
+    return base;
+}
+exports.toString = toString;

package/lib/dataconnect/load.js

@@ -4,13 +4,14 @@ exports.load = void 0;
 const path = require("path");
 const fileUtils = require("./fileUtils");
 const types_1 = require("./types");
-async function load(projectId, sourceDirectory) {
-    const dataConnectYaml = await fileUtils.readDataConnectYaml(sourceDirectory);
+async function load(projectId, config, sourceDirectory) {
+    const resolvedDir = config.path(sourceDirectory);
+    const dataConnectYaml = await fileUtils.readDataConnectYaml(resolvedDir);
     const serviceName = `projects/${projectId}/locations/${dataConnectYaml.location}/services/${dataConnectYaml.serviceId}`;
-    const schemaDir = path.join(sourceDirectory, dataConnectYaml.schema.source);
+    const schemaDir = path.join(resolvedDir, dataConnectYaml.schema.source);
     const schemaGQLs = await fileUtils.readGQLFiles(schemaDir);
     const connectorInfo = await Promise.all(dataConnectYaml.connectorDirs.map(async (dir) => {
-        const connectorDir = path.join(sourceDirectory, dir);
+        const connectorDir = path.join(resolvedDir, dir);
         const connectorYaml = await fileUtils.readConnectorYaml(connectorDir);
         const connectorGqls = await fileUtils.readGQLFiles(connectorDir);
         return {
@@ -26,7 +27,7 @@ async function load(projectId, sourceDirectory) {
     }));
     return {
         serviceName,
-        sourceDirectory,
+        sourceDirectory: resolvedDir,
         schema: {
             name: `${serviceName}/schemas/${types_1.SCHEMA_ID}`,
             primaryDatasource: (0, types_1.toDatasource)(projectId, dataConnectYaml.location, dataConnectYaml.schema.datasource),

package/lib/dataconnect/schemaMigration.js

@@ -11,10 +11,12 @@ const logger_1 = require("../logger");
 const error_1 = require("../error");
 const projectUtils_1 = require("../projectUtils");
 const utils_1 = require("../utils");
+const experiments = require("../experiments");
 const errors = require("./errors");
 async function diffSchema(schema) {
     const { serviceName, instanceName, databaseId } = getIdentifiers(schema);
     await ensureServiceIsConnectedToCloudSql(serviceName, instanceName, databaseId, false);
+    setCompatibleMode(schema, databaseId, instanceName);
     try {
         await (0, client_1.upsertSchema)(schema, true);
         (0, utils_1.logLabeledSuccess)("dataconnect", `Database schema is up to date.`);
@@ -43,6 +45,7 @@ async function migrateSchema(args) {
     const { options, schema, validateOnly } = args;
     const { serviceName, instanceId, instanceName, databaseId } = getIdentifiers(schema);
     await ensureServiceIsConnectedToCloudSql(serviceName, instanceName, databaseId, true);
+    setCompatibleMode(schema, databaseId, instanceName);
     try {
         await (0, client_1.upsertSchema)(schema, validateOnly);
         logger_1.logger.debug(`Database schema was up to date for ${instanceId}:${databaseId}`);
@@ -79,6 +82,25 @@ async function migrateSchema(args) {
     return [];
 }
 exports.migrateSchema = migrateSchema;
+function setCompatibleMode(schema, databaseId, instanceName) {
+    var _a;
+    if (experiments.isEnabled("fdccompatiblemode")) {
+        if ((_a = schema.primaryDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.schemaValidation) {
+            schema.primaryDatasource.postgresql.schemaValidation = "COMPATIBLE";
+        }
+        else {
+            schema.primaryDatasource = {
+                postgresql: {
+                    database: databaseId,
+                    cloudSql: {
+                        instance: instanceName,
+                    },
+                    schemaValidation: "COMPATIBLE",
+                },
+            };
+        }
+    }
+}
 function getIdentifiers(schema) {
     var _a, _b;
     const databaseId = (_a = schema.primaryDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.database;

package/lib/deploy/dataconnect/prepare.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const path = require("path");
+const clc = require("colorette");
 const load_1 = require("../../dataconnect/load");
 const fileUtils_1 = require("../../dataconnect/fileUtils");
 const logger_1 = require("../../logger");
@@ -11,6 +11,7 @@ const build_1 = require("../../dataconnect/build");
 const ensureApis_1 = require("../../dataconnect/ensureApis");
 const requireTosAcceptance_1 = require("../../requireTosAcceptance");
 const firedata_1 = require("../../gcp/firedata");
+const error_1 = require("../../error");
 async function default_1(context, options) {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     await (0, ensureApis_1.ensureApis)(projectId);
@@ -18,10 +19,23 @@ async function default_1(context, 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, path.join(options.cwd || process.cwd(), c.source))));
+    const serviceInfos = await Promise.all(serviceCfgs.map((c) => (0, load_1.load)(projectId, options.config, c.source)));
     for (const si of serviceInfos) {
         si.deploymentMetadata = await (0, build_1.build)(options, si.sourceDirectory);
     }
+    const unmatchedFilters = filters === null || filters === void 0 ? void 0 : filters.filter((f) => {
+        const serviceMatched = serviceInfos.some((s) => s.dataConnectYaml.serviceId === f.serviceId);
+        const connectorMatched = f.connectorId
+            ? serviceInfos.some((s) => {
+                return (s.dataConnectYaml.serviceId === f.serviceId &&
+                    s.connectorInfo.some((c) => c.connectorYaml.connectorId === f.connectorId));
+            })
+            : true;
+        return !serviceMatched || !connectorMatched;
+    });
+    if (unmatchedFilters === null || unmatchedFilters === void 0 ? void 0 : unmatchedFilters.length) {
+        throw new error_1.FirebaseError(`The following filters were specified in --only but didn't match anything in this project: ${unmatchedFilters.map(filters_1.toString).map(clc.bold).join(", ")}`);
+    }
     context.dataconnect = {
         serviceInfos,
         filters,