firebase-tools 13.26.0 → 13.28.0

package/lib/appdistribution/client.js

@@ -231,7 +231,7 @@ class AppDistributionClient {
         }
         utils.logSuccess(`Testers removed from group successfully`);
     }
-    async createReleaseTest(releaseName, devices, loginCredential) {
+    async createReleaseTest(releaseName, devices, loginCredential, testCaseName) {
         try {
             const response = await this.appDistroV1AlphaClient.request({
                 method: "POST",
@@ -239,6 +239,7 @@ class AppDistributionClient {
                 body: {
                     deviceExecutions: devices.map(types_1.mapDeviceToExecution),
                     loginCredential,
+                    testCase: testCaseName,
                 },
             });
             return response.body;

package/lib/appdistribution/options-parser-util.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLoginCredential = exports.getTestDevices = exports.getAppName = exports.getProjectName = exports.ensureFileExists = exports.getEmails = exports.getTestersOrGroups = void 0;
+exports.getLoginCredential = exports.parseTestDevices = exports.getAppName = exports.getProjectName = exports.ensureFileExists = exports.getEmails = exports.parseIntoStringArray = void 0;
 const fs = require("fs-extra");
 const error_1 = require("../error");
 const projectUtils_1 = require("../projectUtils");
-function getTestersOrGroups(value, file) {
+function parseIntoStringArray(value, file) {
     if (!value && file) {
         ensureFileExists(file);
         value = fs.readFileSync(file, "utf8");
@@ -14,7 +14,7 @@ function getTestersOrGroups(value, file) {
     }
     return [];
 }
-exports.getTestersOrGroups = getTestersOrGroups;
+exports.parseIntoStringArray = parseIntoStringArray;
 function getEmails(emails, file) {
     if (emails.length === 0) {
         ensureFileExists(file);
@@ -49,7 +49,7 @@ function getAppName(options) {
     return `projects/${appId.split(":")[1]}/apps/${appId}`;
 }
 exports.getAppName = getAppName;
-function getTestDevices(value, file) {
+function parseTestDevices(value, file) {
     if (!value && file) {
         ensureFileExists(file);
         value = fs.readFileSync(file, "utf8");
@@ -63,7 +63,7 @@ function getTestDevices(value, file) {
         .filter((entry) => !!entry)
         .map((str) => parseTestDevice(str));
 }
-exports.getTestDevices = getTestDevices;
+exports.parseTestDevices = parseTestDevices;
 function parseTestDevice(testDeviceString) {
     const entries = testDeviceString.split(",");
     const allowedKeys = new Set(["model", "version", "orientation", "locale"]);

package/lib/apphosting/config.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadConfigForEnvironment = exports.maybeAddSecretToYaml = exports.upsertEnv = exports.findEnv = exports.store = exports.load = exports.listAppHostingFilesInPath = exports.discoverBackendRoot = exports.APPHOSTING_YAML_FILE_REGEX = exports.APPHOSTING_LOCAL_YAML_FILE = exports.APPHOSTING_BASE_YAML_FILE = void 0;
+exports.loadConfigToExportSecrets = exports.loadConfigForEnvironment = exports.exportConfig = exports.maybeAddSecretToYaml = exports.upsertEnv = exports.findEnv = exports.store = exports.load = exports.listAppHostingFilesInPath = exports.discoverBackendRoot = exports.APPHOSTING_YAML_FILE_REGEX = exports.APPHOSTING_LOCAL_YAML_FILE = exports.APPHOSTING_BASE_YAML_FILE = void 0;
 const path_1 = require("path");
 const fs_1 = require("fs");
 const yaml = require("yaml");
@@ -8,9 +8,17 @@ const fs = require("../fsutils");
 const prompt = require("../prompt");
 const dialogs = require("./secrets/dialogs");
 const yaml_1 = require("./yaml");
+const error_1 = require("../error");
+const utils_1 = require("./utils");
+const secrets_1 = require("./secrets");
+const logger_1 = require("../logger");
+const utils_2 = require("../utils");
+const projects_1 = require("../management/projects");
 exports.APPHOSTING_BASE_YAML_FILE = "apphosting.yaml";
 exports.APPHOSTING_LOCAL_YAML_FILE = "apphosting.local.yaml";
 exports.APPHOSTING_YAML_FILE_REGEX = /^apphosting(\.[a-z0-9_]+)?\.yaml$/;
+const SECRET_CONFIG = "Secret";
+const EXPORTABLE_CONFIG = [SECRET_CONFIG];
 function discoverBackendRoot(cwd) {
     let dir = cwd;
     while (!fs.fileExistsSync((0, path_1.resolve)(dir, exports.APPHOSTING_BASE_YAML_FILE))) {
@@ -108,6 +116,49 @@ async function maybeAddSecretToYaml(secretName) {
     dynamicDispatch.store(path, projectYaml);
 }
 exports.maybeAddSecretToYaml = maybeAddSecretToYaml;
+async function exportConfig(cwd, projectRoot, backendRoot, projectId, userGivenConfigFile) {
+    const choices = await prompt.prompt({}, [
+        {
+            type: "checkbox",
+            name: "configurations",
+            message: "What configs would you like to export?",
+            choices: EXPORTABLE_CONFIG,
+        },
+    ]);
+    if (!choices.configurations.includes(SECRET_CONFIG)) {
+        logger_1.logger.info("No configs selected to export");
+        return;
+    }
+    if (!projectId) {
+        const project = await (0, projects_1.getOrPromptProject)({});
+        projectId = project.projectId;
+    }
+    let localAppHostingConfig = yaml_1.AppHostingYamlConfig.empty();
+    const localAppHostingConfigPath = (0, path_1.resolve)(backendRoot, exports.APPHOSTING_LOCAL_YAML_FILE);
+    if (fs.fileExistsSync(localAppHostingConfigPath)) {
+        localAppHostingConfig = await yaml_1.AppHostingYamlConfig.loadFromFile(localAppHostingConfigPath);
+    }
+    const configToExport = await loadConfigToExportSecrets(cwd, userGivenConfigFile);
+    const secretsToExport = configToExport.secrets;
+    if (!secretsToExport) {
+        logger_1.logger.info("No secrets found to export in the chosen App Hosting config files");
+        return;
+    }
+    const secretMaterial = await (0, secrets_1.fetchSecrets)(projectId, secretsToExport);
+    for (const [key, value] of secretMaterial) {
+        localAppHostingConfig.addEnvironmentVariable({
+            variable: key,
+            value: value,
+            availability: ["RUNTIME"],
+        });
+    }
+    localAppHostingConfig.clearSecrets();
+    localAppHostingConfig.upsertFile(localAppHostingConfigPath);
+    logger_1.logger.info(`Wrote secrets as environment variables to ${exports.APPHOSTING_LOCAL_YAML_FILE}.`);
+    (0, utils_2.updateOrCreateGitignore)(projectRoot, [exports.APPHOSTING_LOCAL_YAML_FILE]);
+    logger_1.logger.info(`${exports.APPHOSTING_LOCAL_YAML_FILE} has been automatically added to your .gitignore.`);
+}
+exports.exportConfig = exportConfig;
 async function loadConfigForEnvironment(envYamlPath, baseYamlPath) {
     const envYamlConfig = await yaml_1.AppHostingYamlConfig.loadFromFile(envYamlPath);
     if (baseYamlPath) {
@@ -118,3 +169,37 @@ async function loadConfigForEnvironment(envYamlPath, baseYamlPath) {
     return envYamlConfig;
 }
 exports.loadConfigForEnvironment = loadConfigForEnvironment;
+async function loadConfigToExportSecrets(cwd, userGivenConfigFile) {
+    if (userGivenConfigFile && !exports.APPHOSTING_YAML_FILE_REGEX.test(userGivenConfigFile)) {
+        throw new error_1.FirebaseError("Invalid apphosting yaml config file provided. File must be in format: 'apphosting.yaml' or 'apphosting.<environment>.yaml'");
+    }
+    const allConfigs = getValidConfigs(cwd);
+    let userGivenConfigFilePath;
+    if (userGivenConfigFile) {
+        if (!allConfigs.has(userGivenConfigFile)) {
+            throw new error_1.FirebaseError(`The provided app hosting config file "${userGivenConfigFile}" does not exist`);
+        }
+        userGivenConfigFilePath = allConfigs.get(userGivenConfigFile);
+    }
+    else {
+        userGivenConfigFilePath = await (0, utils_1.promptForAppHostingYaml)(allConfigs, "Which environment would you like to export secrets from Secret Manager for?");
+    }
+    if (userGivenConfigFile === exports.APPHOSTING_BASE_YAML_FILE) {
+        return yaml_1.AppHostingYamlConfig.loadFromFile(allConfigs.get(exports.APPHOSTING_BASE_YAML_FILE));
+    }
+    const baseFilePath = allConfigs.get(exports.APPHOSTING_BASE_YAML_FILE);
+    return await loadConfigForEnvironment(userGivenConfigFilePath, baseFilePath);
+}
+exports.loadConfigToExportSecrets = loadConfigToExportSecrets;
+function getValidConfigs(cwd) {
+    const appHostingConfigPaths = listAppHostingFilesInPath(cwd).filter((path) => !path.endsWith(exports.APPHOSTING_LOCAL_YAML_FILE));
+    if (appHostingConfigPaths.length === 0) {
+        throw new error_1.FirebaseError("No apphosting.*.yaml configs found");
+    }
+    const fileNameToPathMap = new Map();
+    for (const path of appHostingConfigPaths) {
+        const fileName = (0, path_1.basename)(path);
+        fileNameToPathMap.set(fileName, path);
+    }
+    return fileNameToPathMap;
+}

package/lib/apphosting/secrets/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSecretNameParts = exports.loadConfigToExport = exports.fetchSecrets = exports.upsertSecret = exports.grantSecretAccess = exports.serviceAccountsForBackend = exports.toMulti = void 0;
+exports.getSecretNameParts = exports.fetchSecrets = exports.upsertSecret = exports.grantSecretAccess = exports.serviceAccountsForBackend = exports.toMulti = void 0;
 const error_1 = require("../../error");
 const gcsm = require("../../gcp/secretManager");
 const gcb = require("../../gcp/cloudbuild");
@@ -10,10 +10,6 @@ const secretManager_1 = require("../../gcp/secretManager");
 const secretManager_2 = require("../../gcp/secretManager");
 const utils = require("../../utils");
 const prompt = require("../../prompt");
-const path_1 = require("path");
-const config_1 = require("../config");
-const utils_1 = require("../utils");
-const yaml_1 = require("../yaml");
 function toMulti(accounts) {
     const m = {
         buildServiceAccounts: [accounts.buildServiceAccount],
@@ -125,40 +121,6 @@ async function fetchSecrets(projectId, secrets) {
     return secretsKeyValuePairs;
 }
 exports.fetchSecrets = fetchSecrets;
-async function loadConfigToExport(cwd, userGivenConfigFile) {
-    if (userGivenConfigFile && !config_1.APPHOSTING_YAML_FILE_REGEX.test(userGivenConfigFile)) {
-        throw new error_1.FirebaseError("Invalid apphosting yaml config file provided. File must be in format: 'apphosting.yaml' or 'apphosting.<environment>.yaml'");
-    }
-    const allConfigs = getValidConfigs(cwd);
-    let userGivenConfigFilePath;
-    if (userGivenConfigFile) {
-        if (!allConfigs.has(userGivenConfigFile)) {
-            throw new error_1.FirebaseError(`The provided app hosting config file "${userGivenConfigFile}" does not exist`);
-        }
-        userGivenConfigFilePath = allConfigs.get(userGivenConfigFile);
-    }
-    else {
-        userGivenConfigFilePath = await (0, utils_1.promptForAppHostingYaml)(allConfigs, "Which environment would you like to export secrets from Secret Manager for?");
-    }
-    if (userGivenConfigFile === config_1.APPHOSTING_BASE_YAML_FILE) {
-        return yaml_1.AppHostingYamlConfig.loadFromFile(allConfigs.get(config_1.APPHOSTING_BASE_YAML_FILE));
-    }
-    const baseFilePath = allConfigs.get(config_1.APPHOSTING_BASE_YAML_FILE);
-    return await (0, config_1.loadConfigForEnvironment)(userGivenConfigFilePath, baseFilePath);
-}
-exports.loadConfigToExport = loadConfigToExport;
-function getValidConfigs(cwd) {
-    const appHostingConfigPaths = (0, config_1.listAppHostingFilesInPath)(cwd).filter((path) => !path.endsWith(config_1.APPHOSTING_LOCAL_YAML_FILE));
-    if (appHostingConfigPaths.length === 0) {
-        throw new error_1.FirebaseError("No apphosting.*.yaml configs found");
-    }
-    const fileNameToPathMap = new Map();
-    for (const path of appHostingConfigPaths) {
-        const fileName = (0, path_1.basename)(path);
-        fileNameToPathMap.set(fileName, path);
-    }
-    return fileNameToPathMap;
-}
 function getSecretNameParts(secret) {
     let [name, version] = secret.split("@");
     if (!version) {

package/lib/apphosting/yaml.js

@@ -43,6 +43,9 @@ class AppHostingYamlConfig {
     addSecret(secret) {
         this._secrets.set(secret.variable, secret);
     }
+    clearSecrets() {
+        this._secrets.clear();
+    }
     merge(other) {
         for (const [key, value] of other._environmentVariables) {
             this._environmentVariables.set(key, value);

package/lib/auth.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addAdditionalAccount = exports.logout = exports.getAccessToken = exports.haveValidTokens = exports.loggedIn = exports.findAccountByEmail = exports.loginGithub = exports.loginGoogle = exports.setGlobalDefaultAccount = exports.setProjectAccount = exports.loginAdditionalAccount = exports.selectAccount = exports.setRefreshToken = exports.setActiveAccount = exports.getAllAccounts = exports.getAdditionalAccounts = exports.getProjectDefaultAccount = exports.getGlobalDefaultAccount = void 0;
+exports.addAdditionalAccount = exports.logout = exports.getAccessToken = exports.haveValidTokens = exports.isExpired = exports.loggedIn = exports.findAccountByEmail = exports.loginGithub = exports.loginGoogle = exports.setGlobalDefaultAccount = exports.setProjectAccount = exports.loginAdditionalAccount = exports.selectAccount = exports.setRefreshToken = exports.setActiveAccount = exports.getAllAccounts = exports.getAdditionalAccounts = exports.getProjectDefaultAccount = exports.getGlobalDefaultAccount = void 0;
 const clc = require("colorette");
 const FormData = require("form-data");
 const http = require("http");
@@ -401,6 +401,16 @@ function loggedIn() {
     return !!lastAccessToken;
 }
 exports.loggedIn = loggedIn;
+function isExpired(tokens) {
+    const hasExpiration = (p) => !!p.expires_at;
+    if (hasExpiration(tokens)) {
+        return !(tokens && tokens.expires_at && tokens.expires_at > Date.now());
+    }
+    else {
+        return !tokens;
+    }
+}
+exports.isExpired = isExpired;
 function haveValidTokens(refreshToken, authScopes) {
     var _a;
     if (!(lastAccessToken === null || lastAccessToken === void 0 ? void 0 : lastAccessToken.access_token)) {
@@ -413,8 +423,8 @@ function haveValidTokens(refreshToken, authScopes) {
     const oldScopesJSON = JSON.stringify(((_a = lastAccessToken === null || lastAccessToken === void 0 ? void 0 : lastAccessToken.scopes) === null || _a === void 0 ? void 0 : _a.sort()) || []);
     const newScopesJSON = JSON.stringify(authScopes.sort());
     const hasSameScopes = oldScopesJSON === newScopesJSON;
-    const isExpired = ((lastAccessToken === null || lastAccessToken === void 0 ? void 0 : lastAccessToken.expires_at) || 0) < Date.now() + FIFTEEN_MINUTES_IN_MS;
-    const valid = hasTokens && hasSameScopes && !isExpired;
+    const expired = ((lastAccessToken === null || lastAccessToken === void 0 ? void 0 : lastAccessToken.expires_at) || 0) < Date.now() + FIFTEEN_MINUTES_IN_MS;
+    const valid = hasTokens && hasSameScopes && !expired;
     if (hasTokens) {
         logger_1.logger.debug(`Checked if tokens are valid: ${valid}, expires at: ${lastAccessToken === null || lastAccessToken === void 0 ? void 0 : lastAccessToken.expires_at}`);
     }

package/lib/bin/firebase.js

@@ -26,7 +26,7 @@ const client = require("..");
 const fsutils = require("../fsutils");
 const utils = require("../utils");
 const winston = require("winston");
-let args = process.argv.slice(2);
+const args = process.argv.slice(2);
 let cmd;
 function findAvailableLogFile() {
     const candidates = ["firebase-debug.log"];
@@ -126,9 +126,10 @@ process.on("uncaughtException", (err) => {
     (0, errorOut_1.errorOut)(err);
 });
 if (!(0, handlePreviewToggles_1.handlePreviewToggles)(args)) {
-    cmd = client.cli.parse(process.argv);
-    args = args.filter((arg) => !arg.includes("-"));
     if (!args.length) {
         client.cli.help();
     }
+    else {
+        cmd = client.cli.parse(process.argv);
+    }
 }

package/lib/commands/appdistribution-distribute.js

@@ -23,14 +23,14 @@ function getReleaseNotes(releaseNotes, releaseNotesFile) {
     return "";
 }
 exports.command = new command_1.Command("appdistribution:distribute <release-binary-file>")
-    .description("upload a release binary")
+    .description("upload a release binary and optionally distribute it to testers and run automated tests")
     .option("--app <app_id>", "the app id of your Firebase app")
     .option("--release-notes <string>", "release notes to include")
     .option("--release-notes-file <file>", "path to file with release notes")
-    .option("--testers <string>", "a comma separated list of tester emails to distribute to")
-    .option("--testers-file <file>", "path to file with a comma separated list of tester emails to distribute to")
-    .option("--groups <string>", "a comma separated list of group aliases to distribute to")
-    .option("--groups-file <file>", "path to file with a comma separated list of group aliases to distribute to")
+    .option("--testers <string>", "a comma-separated list of tester emails to distribute to")
+    .option("--testers-file <file>", "path to file with a comma- or newline-separated list of tester emails to distribute to")
+    .option("--groups <string>", "a comma-separated list of group aliases to distribute to")
+    .option("--groups-file <file>", "path to file with a comma- or newline-separated list of group aliases to distribute to")
     .option("--test-devices <string>", "semicolon-separated list of devices to run automated tests on, in the format 'model=<model-id>,version=<os-version-id>,locale=<locale>,orientation=<orientation>'. Run 'gcloud firebase test android|ios models list' to see available devices. Note: This feature is in beta.")
     .option("--test-devices-file <string>", "path to file containing a list of semicolon- or newline-separated devices to run automated tests on, in the format 'model=<model-id>,version=<os-version-id>,locale=<locale>,orientation=<orientation>'. Run 'gcloud firebase test android|ios models list' to see available devices. Note: This feature is in beta.")
     .option("--test-username <string>", "username for automatic login")
@@ -39,14 +39,20 @@ exports.command = new command_1.Command("appdistribution:distribute <release-bin
     .option("--test-username-resource <string>", "resource name for the username field for automatic login")
     .option("--test-password-resource <string>", "resource name for the password field for automatic login")
     .option("--test-non-blocking", "run automated tests without waiting for them to complete. Visit the Firebase console for the test results.")
+    .option("--test-case-ids <string>", "a comma-separated list of test case IDs.")
+    .option("--test-case-ids-file <file>", "path to file with a comma- or newline-separated list of test case IDs.")
     .before(requireAuth_1.requireAuth)
     .action(async (file, options) => {
     const appName = (0, options_parser_util_1.getAppName)(options);
     const distribution = new distribution_1.Distribution(file);
     const releaseNotes = getReleaseNotes(options.releaseNotes, options.releaseNotesFile);
-    const testers = (0, options_parser_util_1.getTestersOrGroups)(options.testers, options.testersFile);
-    const groups = (0, options_parser_util_1.getTestersOrGroups)(options.groups, options.groupsFile);
-    const testDevices = (0, options_parser_util_1.getTestDevices)(options.testDevices, options.testDevicesFile);
+    const testers = (0, options_parser_util_1.parseIntoStringArray)(options.testers, options.testersFile);
+    const groups = (0, options_parser_util_1.parseIntoStringArray)(options.groups, options.groupsFile);
+    const testCases = (0, options_parser_util_1.parseIntoStringArray)(options.testCaseIds, options.testCaseIdsFile);
+    const testDevices = (0, options_parser_util_1.parseTestDevices)(options.testDevices, options.testDevicesFile);
+    if (testCases.length && (options.testUsernameResource || options.testPasswordResource)) {
+        throw new error_1.FirebaseError("Password and username resource names are not supported for the AI testing agent.");
+    }
     const loginCredential = (0, options_parser_util_1.getLoginCredential)({
         username: options.testUsername,
         password: options.testPassword,
@@ -137,39 +143,57 @@ exports.command = new command_1.Command("appdistribution:distribute <release-bin
     }
     await requests.updateReleaseNotes(releaseName, releaseNotes);
     await requests.distribute(releaseName, testers, groups);
-    if (testDevices === null || testDevices === void 0 ? void 0 : testDevices.length) {
-        utils.logBullet("starting automated tests (note: this feature is in beta)");
-        const releaseTest = await requests.createReleaseTest(releaseName, testDevices, loginCredential);
-        utils.logSuccess(`Release test created successfully`);
+    if (testDevices.length) {
+        utils.logBullet("starting automated test (note: this feature is in beta)");
+        const releaseTestPromises = [];
+        if (!testCases.length) {
+            releaseTestPromises.push(requests.createReleaseTest(releaseName, testDevices, loginCredential));
+        }
+        else {
+            for (const testCaseId of testCases) {
+                releaseTestPromises.push(requests.createReleaseTest(releaseName, testDevices, loginCredential, `${appName}/testCases/${testCaseId}`));
+            }
+        }
+        const releaseTests = await Promise.all(releaseTestPromises);
+        utils.logSuccess(`${releaseTests.length} release test(s) started successfully`);
         if (!options.testNonBlocking) {
-            await awaitTestResults(releaseTest.name, requests);
+            await awaitTestResults(releaseTests, requests);
         }
     }
 });
-async function awaitTestResults(releaseTestName, requests) {
+async function awaitTestResults(releaseTests, requests) {
+    const releaseTestNames = new Set(releaseTests.map((rt) => rt.name));
     for (let i = 0; i < TEST_MAX_POLLING_RETRIES; i++) {
-        utils.logBullet("the automated tests results are pending");
+        utils.logBullet(`${releaseTestNames.size} automated test results are pending...`);
         await delay(TEST_POLLING_INTERVAL_MILLIS);
-        const releaseTest = await requests.getReleaseTest(releaseTestName);
-        if (releaseTest.deviceExecutions.every((e) => e.state === "PASSED")) {
-            utils.logSuccess("automated test(s) passed!");
-            return;
-        }
-        for (const execution of releaseTest.deviceExecutions) {
-            switch (execution.state) {
-                case "PASSED":
-                case "IN_PROGRESS":
+        for (const releaseTestName of releaseTestNames) {
+            const releaseTest = await requests.getReleaseTest(releaseTestName);
+            if (releaseTest.deviceExecutions.every((e) => e.state === "PASSED")) {
+                releaseTestNames.delete(releaseTestName);
+                if (releaseTestNames.size === 0) {
+                    utils.logSuccess("Automated test(s) passed!");
+                    return;
+                }
+                else {
                     continue;
-                case "FAILED":
-                    throw new error_1.FirebaseError(`Automated test failed for ${deviceToString(execution.device)}: ${execution.failedReason}`, { exit: 1 });
-                case "INCONCLUSIVE":
-                    throw new error_1.FirebaseError(`Automated test inconclusive for ${deviceToString(execution.device)}: ${execution.inconclusiveReason}`, { exit: 1 });
-                default:
-                    throw new error_1.FirebaseError(`Unsupported automated test state for ${deviceToString(execution.device)}: ${execution.state}`, { exit: 1 });
+                }
+            }
+            for (const execution of releaseTest.deviceExecutions) {
+                switch (execution.state) {
+                    case "PASSED":
+                    case "IN_PROGRESS":
+                        continue;
+                    case "FAILED":
+                        throw new error_1.FirebaseError(`Automated test failed for ${deviceToString(execution.device)}: ${execution.failedReason}`, { exit: 1 });
+                    case "INCONCLUSIVE":
+                        throw new error_1.FirebaseError(`Automated test inconclusive for ${deviceToString(execution.device)}: ${execution.inconclusiveReason}`, { exit: 1 });
+                    default:
+                        throw new error_1.FirebaseError(`Unsupported automated test state for ${deviceToString(execution.device)}: ${execution.state}`, { exit: 1 });
+                }
             }
         }
     }
-    throw new error_1.FirebaseError("It took longer than expected to process your test, please try again.", {
+    throw new error_1.FirebaseError("It took longer than expected to run your test(s), please try again.", {
         exit: 1,
     });
 }

package/lib/commands/apphosting-config-export.js

@@ -2,17 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const command_1 = require("../command");
-const logger_1 = require("../logger");
 const projectUtils_1 = require("../projectUtils");
 const requireAuth_1 = require("../requireAuth");
 const secretManager = require("../gcp/secretManager");
 const requirePermissions_1 = require("../requirePermissions");
 const config_1 = require("../apphosting/config");
-const secrets_1 = require("../apphosting/secrets");
-const path_1 = require("path");
-const fs = require("../fsutils");
-const yaml_1 = require("../apphosting/yaml");
 const error_1 = require("../error");
+const detectProjectRoot_1 = require("../detectProjectRoot");
 exports.command = new command_1.Command("apphosting:config:export")
     .description("Export App Hosting configurations such as secrets into an apphosting.local.yaml file")
     .option("-s, --secrets <apphosting.yaml or apphosting.<environment>.yaml file to export secrets from>", "This command combines the base apphosting.yaml with the specified environment-specific file (e.g., apphosting.staging.yaml). If keys conflict, the environment-specific file takes precedence.")
@@ -20,32 +16,14 @@ exports.command = new command_1.Command("apphosting:config:export")
     .before(secretManager.ensureApi)
     .before(requirePermissions_1.requirePermissions, ["secretmanager.versions.access"])
     .action(async (options) => {
+    var _a;
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const environmentConfigFile = options.secrets;
     const cwd = process.cwd();
-    let localAppHostingConfig = yaml_1.AppHostingYamlConfig.empty();
     const backendRoot = (0, config_1.discoverBackendRoot)(cwd);
     if (!backendRoot) {
         throw new error_1.FirebaseError("Missing apphosting.yaml: This command requires an apphosting.yaml configuration file. Please run 'firebase init apphosting' and try again.");
     }
-    const localAppHostingConfigPath = (0, path_1.resolve)(backendRoot, config_1.APPHOSTING_LOCAL_YAML_FILE);
-    if (fs.fileExistsSync(localAppHostingConfigPath)) {
-        localAppHostingConfig = await yaml_1.AppHostingYamlConfig.loadFromFile(localAppHostingConfigPath);
-    }
-    const configToExport = await (0, secrets_1.loadConfigToExport)(cwd, environmentConfigFile);
-    const secretsToExport = configToExport.secrets;
-    if (!secretsToExport) {
-        logger_1.logger.warn("No secrets found to export in the chosen App Hosting config files");
-        return;
-    }
-    const secretMaterial = await (0, secrets_1.fetchSecrets)(projectId, secretsToExport);
-    for (const [key, value] of secretMaterial) {
-        localAppHostingConfig.addEnvironmentVariable({
-            variable: key,
-            value: value,
-            availability: ["RUNTIME"],
-        });
-    }
-    localAppHostingConfig.upsertFile(localAppHostingConfigPath);
-    logger_1.logger.info(`Wrote secrets as environment variables to ${config_1.APPHOSTING_LOCAL_YAML_FILE}.`);
+    const projectRoot = (_a = (0, detectProjectRoot_1.detectProjectRoot)({})) !== null && _a !== void 0 ? _a : backendRoot;
+    await (0, config_1.exportConfig)(cwd, projectRoot, backendRoot, projectId, environmentConfigFile);
 });

package/lib/commands/firestore-indexes-list.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 projectUtils_1 = require("../projectUtils");
 exports.command = new command_1.Command("firestore:indexes")
     .description("List indexes in your project's Cloud Firestore database.")
     .option("--pretty", "Pretty print. When not specified the indexes are printed in the " +
@@ -21,8 +22,9 @@ exports.command = new command_1.Command("firestore:indexes")
     const indexApi = new fsi.FirestoreApi();
     const printer = new pretty_print_1.PrettyPrint();
     const databaseId = (_a = options.database) !== null && _a !== void 0 ? _a : "(default)";
-    const indexes = await indexApi.listIndexes(options.project, databaseId);
-    const fieldOverrides = await indexApi.listFieldOverrides(options.project, databaseId);
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const indexes = await indexApi.listIndexes(projectId, databaseId);
+    const fieldOverrides = await indexApi.listFieldOverrides(projectId, databaseId);
     const indexSpec = indexApi.makeIndexSpec(indexes, fieldOverrides);
     if (options.pretty) {
         logger_1.logger.info(clc.bold(clc.white("Compound Indexes")));

package/lib/commands/index.js

@@ -172,20 +172,18 @@ function load(client) {
         client.apphosting.secrets.grantaccess = loadCommand("apphosting-secrets-grantaccess");
         client.apphosting.secrets.describe = loadCommand("apphosting-secrets-describe");
         client.apphosting.secrets.access = loadCommand("apphosting-secrets-access");
+        client.apphosting.rollouts = {};
+        client.apphosting.rollouts.create = loadCommand("apphosting-rollouts-create");
+        client.apphosting.config = {};
+        client.apphosting.config.export = loadCommand("apphosting-config-export");
         if (experiments.isEnabled("internaltesting")) {
             client.apphosting.builds = {};
             client.apphosting.builds.get = loadCommand("apphosting-builds-get");
             client.apphosting.builds.create = loadCommand("apphosting-builds-create");
             client.apphosting.repos = {};
             client.apphosting.repos.create = loadCommand("apphosting-repos-create");
-            client.apphosting.rollouts = {};
-            client.apphosting.rollouts.create = loadCommand("apphosting-rollouts-create");
             client.apphosting.rollouts.list = loadCommand("apphosting-rollouts-list");
         }
-        if (experiments.isEnabled("emulatorapphosting")) {
-            client.apphosting.config = {};
-            client.apphosting.config.export = loadCommand("apphosting-config-export");
-        }
     }
     client.login = loadCommand("login");
     client.login.add = loadCommand("login-add");

package/lib/dataconnect/schemaMigration.js

@@ -13,18 +13,15 @@ const prompt_1 = require("../prompt");
 const logger_1 = require("../logger");
 const error_1 = require("../error");
 const utils_1 = require("../utils");
-const experiments = require("../experiments");
 const errors = require("./errors");
 async function diffSchema(schema, schemaValidation) {
     const { serviceName, instanceName, databaseId } = getIdentifiers(schema);
     await ensureServiceIsConnectedToCloudSql(serviceName, instanceName, databaseId, false);
     let diffs = [];
-    let validationMode = experiments.isEnabled("fdccompatiblemode")
-        ? schemaValidation !== null && schemaValidation !== void 0 ? schemaValidation : "COMPATIBLE"
-        : "STRICT";
+    let validationMode = schemaValidation !== null && schemaValidation !== void 0 ? schemaValidation : "COMPATIBLE";
     setSchemaValidationMode(schema, validationMode);
     try {
-        if (!schemaValidation && experiments.isEnabled("fdccompatiblemode")) {
+        if (!schemaValidation) {
             (0, utils_1.logLabeledBullet)("dataconnect", `generating required schema changes...`);
         }
         await (0, client_1.upsertSchema)(schema, true);
@@ -52,7 +49,7 @@ async function diffSchema(schema, schemaValidation) {
             diffs = incompatible.diffs;
         }
     }
-    if (experiments.isEnabled("fdccompatiblemode") && !schemaValidation) {
+    if (!schemaValidation) {
         validationMode = "STRICT";
         setSchemaValidationMode(schema, validationMode);
         try {
@@ -89,9 +86,7 @@ async function migrateSchema(args) {
     const { serviceName, instanceId, instanceName, databaseId } = getIdentifiers(schema);
     await ensureServiceIsConnectedToCloudSql(serviceName, instanceName, databaseId, true);
     let diffs = [];
-    let validationMode = experiments.isEnabled("fdccompatiblemode")
-        ? schemaValidation !== null && schemaValidation !== void 0 ? schemaValidation : "COMPATIBLE"
-        : "STRICT";
+    let validationMode = schemaValidation !== null && schemaValidation !== void 0 ? schemaValidation : "COMPATIBLE";
     setSchemaValidationMode(schema, validationMode);
     try {
         await (0, client_1.upsertSchema)(schema, validateOnly);
@@ -124,7 +119,7 @@ async function migrateSchema(args) {
             await (0, client_1.upsertSchema)(schema, validateOnly);
         }
     }
-    if (experiments.isEnabled("fdccompatiblemode") && !schemaValidation) {
+    if (!schemaValidation) {
         validationMode = "STRICT";
         setSchemaValidationMode(schema, validationMode);
         try {
@@ -185,11 +180,9 @@ function diffsEqual(x, y) {
     return true;
 }
 function setSchemaValidationMode(schema, schemaValidation) {
-    if (experiments.isEnabled("fdccompatiblemode")) {
-        const postgresDatasource = schema.datasources.find((d) => d.postgresql);
-        if (postgresDatasource === null || postgresDatasource === void 0 ? void 0 : postgresDatasource.postgresql) {
-            postgresDatasource.postgresql.schemaValidation = schemaValidation;
-        }
+    const postgresDatasource = schema.datasources.find((d) => d.postgresql);
+    if (postgresDatasource === null || postgresDatasource === void 0 ? void 0 : postgresDatasource.postgresql) {
+        postgresDatasource.postgresql.schemaValidation = schemaValidation;
     }
 }
 function getIdentifiers(schema) {

package/lib/dataconnect/types.js

@@ -17,7 +17,7 @@ var Platform;
     Platform["MULTIPLE"] = "MULTIPLE";
 })(Platform = exports.Platform || (exports.Platform = {}));
 function toDatasource(projectId, locationId, ds) {
-    if (ds.postgresql) {
+    if (ds === null || ds === void 0 ? void 0 : ds.postgresql) {
         return {
             postgresql: {
                 database: ds.postgresql.database,

package/lib/deploy/extensions/tasks.js

@@ -7,7 +7,7 @@ const extensionsApi = require("../../extensions/extensionsApi");
 const extensionsHelper_1 = require("../../extensions/extensionsHelper");
 const refs = require("../../extensions/refs");
 const utils = require("../../utils");
-const types_1 = require("../../extensions/types");
+const error_2 = require("../../error");
 const isRetryable = (err) => err.status === 429 || err.status === 409;
 function extensionsDeploymentHandler(errorHandler) {
     return async (task) => {
@@ -54,7 +54,7 @@ function createExtensionInstanceTask(projectId, instanceSpec, validateOnly = fal
             await extensionsApi.createInstance(createArgs);
         }
         catch (err) {
-            if ((0, types_1.isObject)(err) && err.status === 409) {
+            if ((0, error_2.isObject)(err) && err.status === 409) {
                 throw new error_1.FirebaseError(`Failed to create extension instance. Extension instance ${clc.bold(instanceSpec.instanceId)} already exists.`);
             }
             throw err;