firebase-tools 15.19.1 → 15.21.0

package/lib/appdistribution/client.js

@@ -225,17 +225,18 @@ class AppDistributionClient {
         }
         utils.logSuccess(`Testers removed from group successfully`);
     }
-    async createReleaseTest(releaseName, devices, aiInstructions, loginCredential, testCaseName, displayName) {
+    async createReleaseTest(releaseName, devices, options = {}) {
         try {
             const response = await this.appDistroV1AlphaClient.request({
                 method: "POST",
                 path: `${releaseName}/tests`,
                 body: {
                     deviceExecutions: devices.map((device) => ({ device })),
-                    loginCredential,
-                    testCase: testCaseName,
-                    aiInstructions: aiInstructions,
-                    displayName: displayName,
+                    loginCredential: options.loginCredential,
+                    testCase: options.testCaseName,
+                    aiInstructions: options.aiInstructions,
+                    displayName: options.displayName,
+                    resultsBucket: options.resultsBucket,
                 },
             });
             return response.body;

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

@@ -8,6 +8,7 @@ exports.getAppName = getAppName;
 exports.toAppName = toAppName;
 exports.parseTestDevices = parseTestDevices;
 exports.getLoginCredential = getLoginCredential;
+exports.getResultsBucket = getResultsBucket;
 const fs = require("fs-extra");
 const error_1 = require("../error");
 const projectUtils_1 = require("../projectUtils");
@@ -137,3 +138,23 @@ function getLoginCredential(args) {
 function isPresenceMismatched(value1, value2) {
     return (value1 && !value2) || (!value1 && value2);
 }
+const APP_NAME_REGEX = /^projects\/(?<projectNumber>[^\/]+)\/apps\/(?<appId>[^\/]+)$/;
+const BUCKET_NAME_FORMAT_REGEX = /^[a-z0-9_.-]+$/;
+function getResultsBucket(bucket, appName) {
+    if (!bucket) {
+        return undefined;
+    }
+    let bucketName = bucket;
+    if (bucketName.startsWith("gs://")) {
+        bucketName = bucketName.substring(5);
+    }
+    if (!BUCKET_NAME_FORMAT_REGEX.test(bucketName)) {
+        throw new error_1.FirebaseError(`Invalid results bucket format: ${bucket}`);
+    }
+    const match = APP_NAME_REGEX.exec(appName);
+    if (!match || typeof match.groups === "undefined") {
+        throw new error_1.FirebaseError(`Invalid app name: ${appName}`);
+    }
+    const { projectNumber } = match.groups;
+    return `projects/${projectNumber}/buckets/${bucketName}`;
+}

package/lib/apphosting/constants.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LOCAL_BUILD_DIR_NAME = exports.ALLOWED_DEPLOY_METHODS = exports.DEFAULT_DEPLOY_METHOD = exports.DEFAULT_LOCATION = void 0;
+exports.CLOUD_RUN_SIZE_LIMIT_BYTES = exports.LOCAL_BUILD_DIR_NAME = exports.ALLOWED_DEPLOY_METHODS = exports.DEFAULT_DEPLOY_METHOD = exports.DEFAULT_LOCATION = void 0;
 exports.DEFAULT_LOCATION = "us-east4";
 exports.DEFAULT_DEPLOY_METHOD = "github";
 exports.ALLOWED_DEPLOY_METHODS = [{ name: "Deploy using github", value: "github" }];
 exports.LOCAL_BUILD_DIR_NAME = ".local_build";
+exports.CLOUD_RUN_SIZE_LIMIT_BYTES = 250 * 1024 * 1024;

package/lib/apphosting/localbuilds.js

@@ -31,11 +31,13 @@ function executeUniversalMakerBinary(universalMakerBinary, projectRoot, addedEnv
             },
             stdio: "pipe",
         });
+        const failed = !!res.error || res.status !== 0;
+        const log = (msg) => (failed ? logger_1.logger.info(msg) : logger_1.logger.debug(msg));
         if (res.stdout) {
-            logger_1.logger.debug("[Universal Maker stdout]:\n" + res.stdout.toString());
+            log("[Universal Maker stdout]:\n" + res.stdout.toString());
         }
         if (res.stderr) {
-            logger_1.logger.debug("[Universal Maker stderr]:\n" + res.stderr.toString());
+            log("[Universal Maker stderr]:\n" + res.stderr.toString());
         }
         if (res.error) {
             throw res.error;

package/lib/archiveDirectory.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.archiveDirectory = archiveDirectory;
 const archiver = require("archiver");
-const filesize = require("filesize");
+const utils_1 = require("./utils");
 const fs = require("fs");
 const path = require("path");
 const tmp = require("tmp");
@@ -21,7 +21,7 @@ async function archiveDirectory(sourceDirectory, options = {}) {
     const makeArchive = zipDirectory(sourceDirectory, tempFile, options);
     try {
         const archive = await makeArchive;
-        logger_1.logger.debug(`Archived ${filesize(archive.size)} in ${sourceDirectory}.`);
+        logger_1.logger.debug(`Archived ${(0, utils_1.formatFilesize)(archive.size)} in ${sourceDirectory}.`);
         return archive;
     }
     catch (err) {

package/lib/auth.js

@@ -37,7 +37,6 @@ const logger_1 = require("./logger");
 const prompt_1 = require("./prompt");
 const scopes = require("./scopes");
 const defaultCredentials_1 = require("./defaultCredentials");
-const uuid_1 = require("uuid");
 const crypto_1 = require("crypto");
 const track_1 = require("./track");
 const api_1 = require("./api");
@@ -308,7 +307,7 @@ async function loginPrototyper() {
         urlPrefix: (0, api_1.authProxyOrigin)(),
         auth: false,
     });
-    const sessionId = (0, uuid_1.v4)();
+    const sessionId = (0, crypto_1.randomUUID)();
     const codeVerifier = (0, crypto_1.randomBytes)(32).toString("hex");
     const codeChallenge = urlsafeBase64((0, crypto_1.createHash)("sha256").update(codeVerifier).digest("base64"));
     const attestToken = (await authProxyClient.post("/attest", {
@@ -341,7 +340,7 @@ async function loginRemotely() {
         urlPrefix: (0, api_1.authProxyOrigin)(),
         auth: false,
     });
-    const sessionId = (0, uuid_1.v4)();
+    const sessionId = (0, crypto_1.randomUUID)();
     const codeVerifier = (0, crypto_1.randomBytes)(32).toString("hex");
     const codeChallenge = urlsafeBase64((0, crypto_1.createHash)("sha256").update(codeVerifier).digest("base64"));
     const attestToken = (await authProxyClient.post("/attest", {

package/lib/bin/cli.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadAllCommands = loadAllCommands;
 exports.cli = cli;
 const updateNotifierPkg = require("update-notifier-cjs");
 const clc = require("colorette");
@@ -17,6 +18,29 @@ const fsutils = require("../fsutils");
 const utils = require("../utils");
 const fetchMOTD_1 = require("../fetchMOTD");
 const command_1 = require("../command");
+const env_1 = require("../env");
+function loadAllCommands(client) {
+    const seen = new Set();
+    const loadAll = (obj) => {
+        if (seen.has(obj))
+            return;
+        seen.add(obj);
+        for (const [key, value] of Object.entries(obj)) {
+            if (key === "cli") {
+                continue;
+            }
+            if ((0, command_1.isCommandModule)(value)) {
+                value.load();
+            }
+            if ((typeof value === "object" || typeof value === "function") &&
+                value !== null &&
+                !Array.isArray(value)) {
+                loadAll(value);
+            }
+        }
+    };
+    loadAll(client);
+}
 function cli(pkg) {
     const updateNotifier = updateNotifierPkg({ pkg });
     const args = process.argv.slice(2);
@@ -31,6 +55,7 @@ function cli(pkg) {
     logger_1.logger.debug("CLI Version:  ", pkg.version);
     logger_1.logger.debug("Platform:     ", process.platform);
     logger_1.logger.debug("Node Version: ", process.version);
+    logger_1.logger.debug("Detected Agent:", (0, env_1.detectAIAgent)());
     logger_1.logger.debug("Time:         ", new Date().toString());
     if (utils.envOverrides.length) {
         logger_1.logger.debug("Env Overrides:", utils.envOverrides.join(", "));
@@ -97,24 +122,7 @@ function cli(pkg) {
         client.getCommand(commandName);
     }
     if (isHelp) {
-        const seen = new Set();
-        const loadAll = (obj) => {
-            if (seen.has(obj))
-                return;
-            seen.add(obj);
-            for (const [key, value] of Object.entries(obj)) {
-                if ((0, command_1.isCommandModule)(value)) {
-                    value.load();
-                }
-                else if (typeof value === "object" &&
-                    value !== null &&
-                    !Array.isArray(value) &&
-                    key !== "cli") {
-                    loadAll(value);
-                }
-            }
-        };
-        loadAll(client);
+        loadAllCommands(client);
     }
     if (!args.length) {
         client.cli.help();

package/lib/commands/appdistribution-distribute.js

@@ -39,9 +39,11 @@ exports.command = new command_1.Command("appdistribution:distribute <release-bin
     .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.")
+    .option("--results-bucket <bucket>", "The name of a Google Cloud Storage bucket where raw results of any automated tests will be stored. If this flag is not set, Firebase creates a bucket for you. Note that the bucket must be owned by a billing-enabled project, and that using a non-default bucket will result in billing charges for the storage used.")
     .before(requireAuth_1.requireAuth)
     .action(async (file, options) => {
     const appName = (0, options_parser_util_1.getAppName)(options);
+    const resultsBucket = (0, options_parser_util_1.getResultsBucket)(options.resultsBucket, appName);
     const distribution = new distribution_1.Distribution(file);
     const releaseNotes = getReleaseNotes(options.releaseNotes, options.releaseNotesFile);
     const testers = (0, options_parser_util_1.parseIntoStringArray)(options.testers, options.testersFile);
@@ -58,9 +60,9 @@ exports.command = new command_1.Command("appdistribution:distribute <release-bin
         usernameResourceName: options.testUsernameResource,
         passwordResourceName: options.testPasswordResource,
     });
-    await distribute(appName, distribution, testCases, testDevices, releaseNotes, testers, groups, options.testNonBlocking, loginCredential);
+    await distribute(appName, distribution, testCases, testDevices, releaseNotes, testers, groups, options.testNonBlocking, loginCredential, resultsBucket);
 });
-async function distribute(appName, distribution, testCases, testDevices, releaseNotes, testers, groups, testNonBlocking, loginCredential) {
+async function distribute(appName, distribution, testCases, testDevices, releaseNotes, testers, groups, testNonBlocking, loginCredential, resultsBucket) {
     const requests = new client_1.AppDistributionClient();
     let aabInfo;
     if (distribution.distributionFileType() === distribution_1.DistributionFileType.AAB) {
@@ -116,11 +118,18 @@ async function distribute(appName, distribution, testCases, testDevices, release
         utils.logBullet("starting automated test (note: this feature is in beta)");
         const releaseTestPromises = [];
         if (!testCases.length) {
-            releaseTestPromises.push(requests.createReleaseTest(release.name, testDevices, undefined, loginCredential));
+            releaseTestPromises.push(requests.createReleaseTest(release.name, testDevices, {
+                loginCredential,
+                resultsBucket,
+            }));
         }
         else {
             for (const testCaseId of testCases) {
-                releaseTestPromises.push(requests.createReleaseTest(release.name, testDevices, undefined, loginCredential, `${appName}/testCases/${testCaseId}`));
+                releaseTestPromises.push(requests.createReleaseTest(release.name, testDevices, {
+                    loginCredential,
+                    testCaseName: `${appName}/testCases/${testCaseId}`,
+                    resultsBucket,
+                }));
             }
         }
         const releaseTests = await Promise.all(releaseTestPromises);

package/lib/commands/apptesting.js

@@ -29,15 +29,25 @@ exports.command = new command_1.Command("apptesting:execute [release-binary-file
     .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-non-blocking", "Run automated tests without waiting for them to complete. Visit the Firebase console for the test results.")
+    .option("--results-bucket <bucket>", "The name of a Google Cloud Storage bucket where raw test results will be stored. If this flag is not set, Firebase creates a default bucket for you. Note that the bucket must be owned by a billing-enabled project, and that using a non-default bucket will result in billing charges for the storage used.")
+    .option("--test-username <string>", "username for automatic login")
+    .option("--test-password <string>", "password for automatic login. If using a real password, use --test-password-file instead to avoid putting sensitive info in history and logs.")
+    .option("--test-password-file <string>", "path to file containing password for automatic login")
     .before(requireAuth_1.requireAuth)
     .action(async (target, options) => {
     const appName = (0, options_parser_util_1.getAppName)(options);
+    const resultsBucket = (0, options_parser_util_1.getResultsBucket)(options.resultsBucket, appName);
     const testDir = path.resolve(options.testDir || "tests");
     if (!(0, fsutils_1.dirExistsSync)(testDir)) {
         throw new error_1.FirebaseError(`Tests directory not found: ${testDir}. Use the --test-dir flag to choose a different directory.`);
     }
     const tests = await (0, parseTestFiles_1.parseTestFiles)(testDir, undefined, options.testFilePattern, options.testNamePattern);
     const testDevices = (0, options_parser_util_1.parseTestDevices)(options.testDevices, options.testDevicesFile);
+    const loginCredential = (0, options_parser_util_1.getLoginCredential)({
+        username: options.testUsername,
+        password: options.testPassword,
+        passwordFile: options.testPasswordFile,
+    });
     if (!tests.length) {
         throw new error_1.FirebaseError(`No tests found under test directory ${testDir}`);
     }
@@ -60,7 +70,7 @@ exports.command = new command_1.Command("apptesting:execute [release-binary-file
             utils.logBullet(`Using release ${release.displayVersion} created at ${release.createTime}`);
         }
         invokeSpinner.start();
-        releaseTests = await invokeTests(client, release.name, tests, !testDevices.length ? defaultDevices : testDevices);
+        releaseTests = await invokeTests(client, release.name, tests, !testDevices.length ? defaultDevices : testDevices, resultsBucket, loginCredential);
         invokeSpinner.text = `${(0, parseTestFiles_1.pluralizeTests)(releaseTests.length)} started successfully!`;
         invokeSpinner.succeed();
     }
@@ -76,14 +86,19 @@ exports.command = new command_1.Command("apptesting:execute [release-binary-file
         utils.logBullet(`View detailed results in the Firebase Console:\n${release.firebaseConsoleUri}`);
     }
 });
-async function invokeTests(client, releaseName, testDefs, devices) {
+async function invokeTests(client, releaseName, testDefs, devices, resultsBucket, loginCredential) {
     try {
         const releaseTests = [];
         for (const testDef of testDefs) {
             const aiInstructions = {
                 steps: testDef.testCase.steps,
             };
-            releaseTests.push(await client.createReleaseTest(releaseName, devices, aiInstructions, undefined, undefined, testDef.testCase.displayName));
+            releaseTests.push(await client.createReleaseTest(releaseName, devices, {
+                aiInstructions,
+                displayName: testDef.testCase.displayName,
+                resultsBucket,
+                loginCredential,
+            }));
         }
         return releaseTests;
     }

package/lib/commands/crashlytics-symbols-upload.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const os = require("os");
 const path = require("path");
-const uuid = require("uuid");
+const crypto_1 = require("crypto");
 const command_1 = require("../command");
 const error_1 = require("../error");
 const utils = require("../utils");
@@ -28,7 +28,7 @@ exports.command = new command_1.Command("crashlytics:symbols:upload <symbolFiles
     const jarOptions = {
         app,
         generator,
-        cachePath: path.join(SYMBOL_CACHE_ROOT_DIR, `crashlytics-${uuid.v4()}`, "nativeSymbols", app.replace(/:/g, "-"), generator),
+        cachePath: path.join(SYMBOL_CACHE_ROOT_DIR, `crashlytics-${(0, crypto_1.randomUUID)()}`, "nativeSymbols", app.replace(/:/g, "-"), generator),
         symbolFile: "",
         generate: true,
     };

package/lib/crashlytics/sourcemap.js

@@ -15,7 +15,6 @@ exports.registerSourceMap = registerSourceMap;
 const fs = require("fs");
 const path = require("path");
 const node_child_process_1 = require("node:child_process");
-const pLimit = require("p-limit");
 const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
@@ -104,7 +103,7 @@ async function findSourceMapMappings(files, rootDir) {
     const mappings = [];
     const mapFilePathsSet = new Set(mapFiles.map((f) => f.name));
     const mapFilesLinkedInJsComment = new Set();
-    const limit = pLimit(exports.CONCURRENCY);
+    const limit = (0, utils_1.pLimit)(exports.CONCURRENCY);
     const results = await Promise.all(jsFiles.map((jsFile) => limit(async () => {
         const mapFilePath = await getLinkedSourceMapPath(jsFile.name);
         return { jsFile, mapFilePath };
@@ -164,7 +163,7 @@ async function getLinkedSourceMapPath(jsFilePath) {
 }
 async function uploadSourceMaps(mappings, request) {
     const { projectId, bucketName, appVersion, options } = request;
-    const limit = pLimit(exports.CONCURRENCY);
+    const limit = (0, utils_1.pLimit)(exports.CONCURRENCY);
     const results = await Promise.all(mappings.map((mapping) => limit(async () => {
         const uploadRequest = {
             projectId,
@@ -253,7 +252,7 @@ async function registerSourceMap(sourceMap) {
     const client = new apiv2_1.Client({
         urlPrefix: "https://firebasetelemetryadmin.googleapis.com",
         auth: true,
-        apiVersion: "v1",
+        apiVersion: "v1alpha",
     });
     try {
         await client.patch(sourceMap.name, sourceMap, { queryParams: { allowMissing: "true" } });

package/lib/database/import.js

@@ -8,7 +8,7 @@ const StreamObject = require("stream-json/streamers/StreamObject");
 const apiv2_1 = require("../apiv2");
 const node_fetch_1 = require("node-fetch");
 const error_1 = require("../error");
-const pLimit = require("p-limit");
+const utils_1 = require("../utils");
 class BatchChunks extends stream.Transform {
     constructor(maxSize, opts) {
         super({ ...opts, objectMode: true });
@@ -92,7 +92,7 @@ class DatabaseImporter {
         this.payloadSize = payloadSize;
         this.nonFatalRetryTimeout = 1000;
         this.client = new apiv2_1.Client({ urlPrefix: dbUrl.origin, auth: true });
-        this.limit = pLimit(concurrency);
+        this.limit = (0, utils_1.pLimit)(concurrency);
     }
     async execute() {
         await this.checkLocationIsEmpty();

package/lib/dataconnect/build.js

@@ -36,9 +36,9 @@ async function build(options, configDir, deployStats) {
 async function handleBuildErrors(errors, nonInteractive, force, dryRun) {
     const fatalDeploys = errors.filter((w) => w.extensions?.warningLevel === "ALWAYS_REQUIRED");
     if (fatalDeploys.length) {
-        utils.logLabeledError("dataconnect", `There are deployment requirements that are always required and cannot be bypassed:\n` +
+        utils.logLabeledError("dataconnect", `There are requirements that are always required and cannot be bypassed:\n` +
             (0, graphqlError_1.prettifyTable)(fatalDeploys));
-        throw new error_1.FirebaseError("Deployment failed due to unbypassable requirements.");
+        throw new error_1.FirebaseError("Failed due to unbypassable requirements.");
     }
     if (errors.filter((w) => !w.extensions?.warningLevel).length) {
         throw new error_1.FirebaseError(`There are errors in your schema and connector files:\n${errors.map(graphqlError_1.prettify).join("\n")}`);
@@ -47,7 +47,7 @@ async function handleBuildErrors(errors, nonInteractive, force, dryRun) {
     if (requiredForces.length && !force) {
         utils.logLabeledError("dataconnect", `There are changes in your schema or connectors that will result in broken behavior:\n` +
             (0, graphqlError_1.prettifyTable)(requiredForces));
-        throw new error_1.FirebaseError("Rerun this command with --force to deploy these changes.");
+        throw new error_1.FirebaseError("Rerun this command with --force to proceed with these changes.");
     }
     const interactiveAcks = errors.filter((w) => w.extensions?.warningLevel === "INTERACTIVE_ACK");
     const requiredAcks = errors.filter((w) => w.extensions?.warningLevel === "REQUIRE_ACK");
@@ -59,7 +59,7 @@ async function handleBuildErrors(errors, nonInteractive, force, dryRun) {
         utils.logLabeledWarning("dataconnect", `There are changes in your schema or connectors that may break your existing applications or introduce operations that are insecure. These changes require explicit acknowledgement to proceed. You may either reject the changes and update your sources with the suggested workaround(s), if any, or acknowledge these changes and proceed with the deployment:\n` +
             (0, graphqlError_1.prettifyTable)(requiredAcks));
         if (nonInteractive && !force) {
-            throw new error_1.FirebaseError("Explicit acknowledgement required for breaking schema or connector changes and new insecure operations. Rerun this command with --force to deploy these changes.");
+            throw new error_1.FirebaseError("Explicit acknowledgement required for breaking schema or connector changes and new insecure operations. Rerun this command with --force to proceed with these changes.");
         }
         else if (!nonInteractive && !force && !dryRun) {
             const result = await (0, prompt_1.select)({
@@ -68,7 +68,7 @@ async function handleBuildErrors(errors, nonInteractive, force, dryRun) {
                 default: "abort",
             });
             if (result === "abort") {
-                throw new error_1.FirebaseError(`Deployment aborted.`);
+                throw new error_1.FirebaseError("Aborted.");
             }
         }
     }
@@ -82,7 +82,7 @@ async function handleBuildErrors(errors, nonInteractive, force, dryRun) {
                 default: "proceed",
             });
             if (result === "abort") {
-                throw new error_1.FirebaseError(`Deployment aborted.`);
+                throw new error_1.FirebaseError("Aborted.");
             }
         }
     }

package/lib/deploy/apphosting/util.js

@@ -9,9 +9,11 @@ const path = require("path");
 const tar = require("tar");
 const tmp = require("tmp");
 const error_1 = require("../../error");
+const logger_1 = require("../../logger");
 const fsAsync = require("../../fsAsync");
 const utils_1 = require("../../utils");
-async function createLocalBuildTarArchive(config, rootDir, outputFiles) {
+const constants_1 = require("../../apphosting/constants");
+async function createLocalBuildTarArchive(config, rootDir, outputFiles, sizeLimitBytes = constants_1.CLOUD_RUN_SIZE_LIMIT_BYTES) {
     const tmpFile = tmp.fileSync({ prefix: `${config.backendId}-`, postfix: ".tar.gz" }).name;
     const filesToPackage = outputFiles.length > 0 ? outputFiles : ["."];
     const allFiles = [];
@@ -52,6 +54,12 @@ async function createLocalBuildTarArchive(config, rootDir, outputFiles) {
         cwd: rootDir,
         portable: true,
     }, allFiles);
+    const stats = fs.statSync(tmpFile);
+    if (config.localBuild && stats.size > sizeLimitBytes) {
+        const sizeInMB = stats.size / (1024 * 1024);
+        const limitInMB = sizeLimitBytes / (1024 * 1024);
+        logger_1.logger.warn(`The final build artifact is larger than ${limitInMB.toFixed(0)}MB (current size: ${sizeInMB.toFixed(2)}MB). Please reduce the size of your build artifacts.`);
+    }
     return tmpFile;
 }
 async function createSourceDeployArchive(config, rootDir, targetSubDir) {

package/lib/deploy/dataconnect/context.js

@@ -7,7 +7,6 @@ function initDeployStats() {
         numBuildErrors: 0,
         numBuildWarnings: new Map(),
         numServiceCreated: 0,
-        numServiceDeleted: 0,
         numSchemaMigrated: 0,
         numConnectorUpdatedBeforeSchema: 0,
         numConnectorUpdatedAfterSchema: 0,
@@ -24,7 +23,6 @@ function deployStatsParams(stats) {
     return {
         missing_billing: (!!stats.missingBilling).toString(),
         num_service_created: stats.numServiceCreated,
-        num_service_deleted: stats.numServiceDeleted,
         num_schema_migrated: stats.numSchemaMigrated,
         num_connector_updated_before_schema: stats.numConnectorUpdatedBeforeSchema,
         num_connector_updated_after_schema: stats.numConnectorUpdatedAfterSchema,

package/lib/deploy/dataconnect/deploy.js

@@ -9,7 +9,6 @@ const provisionCloudSql_1 = require("../../dataconnect/provisionCloudSql");
 const names_1 = require("../../dataconnect/names");
 const api_1 = require("../../api");
 const ensureApiEnabled = require("../../ensureApiEnabled");
-const prompt_1 = require("../../prompt");
 async function default_1(context, options) {
     const dataconnect = context.dataconnect;
     if (!dataconnect) {
@@ -31,29 +30,11 @@ async function default_1(context, options) {
             filters?.some((f) => si.dataConnectYaml.serviceId === f.serviceId));
     });
     dataconnect.deployStats.numServiceCreated = servicesToCreate.length;
-    const servicesToDelete = filters
-        ? []
-        : services.filter((s) => !serviceInfos.some((si) => matches(si, s)));
-    dataconnect.deployStats.numServiceDeleted = servicesToDelete.length;
     await Promise.all(servicesToCreate.map(async (s) => {
         const { projectId, locationId, serviceId } = splitName(s.serviceName);
         await client.createService(projectId, locationId, serviceId);
         utils.logLabeledSuccess("dataconnect", `Created service ${s.serviceName}`);
     }));
-    if (servicesToDelete.length) {
-        const serviceToDeleteList = servicesToDelete.map((s) => " - " + s.name).join("\n");
-        if (await (0, prompt_1.confirm)({
-            force: false,
-            nonInteractive: options.nonInteractive,
-            message: `The following services exist on ${projectId} but are not listed in your 'firebase.json'\n${serviceToDeleteList}\nWould you like to delete these services?`,
-            default: false,
-        })) {
-            await Promise.all(servicesToDelete.map(async (s) => {
-                await client.deleteService(s.name);
-                utils.logLabeledSuccess("dataconnect", `Deleted service ${s.name}`);
-            }));
-        }
-    }
     utils.logLabeledBullet("dataconnect", "Checking for CloudSQL resources...");
     await Promise.all(serviceInfos
         .filter((si) => {