firebase-tools 15.1.0 → 15.2.0

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

@@ -25,6 +25,7 @@ const run = require("../../../gcp/run");
 const scheduler = require("../../../gcp/cloudscheduler");
 const utils = require("../../../utils");
 const services = require("../services");
+const dataconnect_1 = require("../services/dataconnect");
 const v1_1 = require("../../../functions/events/v1");
 const gce = require("../../../gcp/computeEngine");
 const functionsDeployHelper_1 = require("../functionsDeployHelper");
@@ -129,7 +130,7 @@ class Fabricator {
         return deployResults;
     }
     async createEndpoint(endpoint, scraperV1, scraperV2) {
-        endpoint.labels = Object.assign(Object.assign({}, endpoint.labels), deploymentTool.labels());
+        endpoint.labels = { ...endpoint.labels, ...deploymentTool.labels() };
         if (endpoint.platform === "gcfv1") {
             await this.createV1Function(endpoint, scraperV1);
         }
@@ -147,7 +148,7 @@ class Fabricator {
         await this.setTrigger(endpoint);
     }
     async updateEndpoint(update, scraperV1, scraperV2) {
-        update.endpoint.labels = Object.assign(Object.assign({}, update.endpoint.labels), deploymentTool.labels());
+        update.endpoint.labels = { ...update.endpoint.labels, ...deploymentTool.labels() };
         if (update.deleteAndRecreate) {
             await this.deleteEndpoint(update.deleteAndRecreate);
             await this.createEndpoint(update.endpoint, scraperV1, scraperV2);
@@ -181,8 +182,7 @@ class Fabricator {
         (0, functional_1.assertExhaustive)(endpoint.platform);
     }
     async createV1Function(endpoint, scraper) {
-        var _a, _b;
-        const sourceUrl = (_a = this.sources[endpoint.codebase]) === null || _a === void 0 ? void 0 : _a.sourceUrl;
+        const sourceUrl = this.sources[endpoint.codebase]?.sourceUrl;
         if (!sourceUrl) {
             logger_1.logger.debug("Precondition failed. Cannot create a GCF function without sourceUrl");
             throw new Error("Precondition failed");
@@ -195,10 +195,15 @@ class Fabricator {
             .run(async () => {
             apiFunction.sourceToken = await scraper.getToken();
             const op = await gcf.createFunction(apiFunction);
-            return poller.pollOperation(Object.assign(Object.assign({}, gcfV1PollerOptions), { pollerName: `create-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`, operationResourceName: op.name, onPoll: scraper.poller }));
+            return poller.pollOperation({
+                ...gcfV1PollerOptions,
+                pollerName: `create-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`,
+                operationResourceName: op.name,
+                onPoll: scraper.poller,
+            });
         })
             .catch(rethrowAs(endpoint, "create"));
-        endpoint.uri = (_b = resultFunction === null || resultFunction === void 0 ? void 0 : resultFunction.httpsTrigger) === null || _b === void 0 ? void 0 : _b.url;
+        endpoint.uri = resultFunction?.httpsTrigger?.url;
         if (backend.isHttpsTriggered(endpoint)) {
             const invoker = endpoint.httpsTrigger.invoker || ["public"];
             if (!invoker.includes("private")) {
@@ -236,14 +241,13 @@ class Fabricator {
         }
     }
     async createV2Function(endpoint, scraper) {
-        var _a, _b, _c, _d;
-        const storageSource = (_a = this.sources[endpoint.codebase]) === null || _a === void 0 ? void 0 : _a.storage;
+        const storageSource = this.sources[endpoint.codebase]?.storage;
         if (!storageSource) {
             logger_1.logger.debug("Precondition failed. Cannot create a GCFv2 function without storage");
             throw new Error("Precondition failed");
         }
-        const apiFunction = gcfV2.functionFromEndpoint(Object.assign(Object.assign({}, endpoint), { source: { storageSource } }));
-        const topic = (_b = apiFunction.eventTrigger) === null || _b === void 0 ? void 0 : _b.pubsubTopic;
+        const apiFunction = gcfV2.functionFromEndpoint({ ...endpoint, source: { storageSource } });
+        const topic = apiFunction.eventTrigger?.pubsubTopic;
         if (topic) {
             await this.executor
                 .run(async () => {
@@ -262,7 +266,7 @@ class Fabricator {
             })
                 .catch(rethrowAs(endpoint, "create topic"));
         }
-        const channel = (_c = apiFunction.eventTrigger) === null || _c === void 0 ? void 0 : _c.channel;
+        const channel = apiFunction.eventTrigger?.channel;
         if (channel) {
             await this.executor
                 .run(async () => {
@@ -271,7 +275,11 @@ class Fabricator {
                         return;
                     }
                     const op = await eventarc.createChannel({ name: channel });
-                    return await poller.pollOperation(Object.assign(Object.assign({}, eventarcPollerOptions), { pollerName: `create-${channel}-${endpoint.region}-${endpoint.id}`, operationResourceName: op.name }));
+                    return await poller.pollOperation({
+                        ...eventarcPollerOptions,
+                        pollerName: `create-${channel}-${endpoint.region}-${endpoint.id}`,
+                        operationResourceName: op.name,
+                    });
                 }
                 catch (err) {
                     if (err.status === 409) {
@@ -293,7 +301,12 @@ class Fabricator {
                     apiFunction.buildConfig.sourceToken = await scraper.getToken();
                 }
                 const op = await gcfV2.createFunction(apiFunction);
-                return await poller.pollOperation(Object.assign(Object.assign({}, gcfV2PollerOptions), { pollerName: `create-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`, operationResourceName: op.name, onPoll: scraper.poller }));
+                return await poller.pollOperation({
+                    ...gcfV2PollerOptions,
+                    pollerName: `create-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`,
+                    operationResourceName: op.name,
+                    onPoll: scraper.poller,
+                });
             })
                 .catch(async (err) => {
                 scraper.abort();
@@ -308,8 +321,8 @@ class Fabricator {
             });
         }
         endpoint.uri = resultFunction.url;
-        const serviceName = (_d = resultFunction.serviceConfig) === null || _d === void 0 ? void 0 : _d.service;
-        endpoint.runServiceId = utils.last(serviceName === null || serviceName === void 0 ? void 0 : serviceName.split("/"));
+        const serviceName = resultFunction.serviceConfig?.service;
+        endpoint.runServiceId = utils.last(serviceName?.split("/"));
         if (!serviceName) {
             logger_1.logger.debug("Result function unexpectedly didn't have a service name.");
             utils.logLabeledWarning("functions", "Updated function is not associated with a service. This deployment is in an unexpected state - please re-deploy your functions.");
@@ -323,6 +336,15 @@ class Fabricator {
                     .catch(rethrowAs(endpoint, "set invoker"));
             }
         }
+        else if (backend.isDataConnectGraphqlTriggered(endpoint)) {
+            const invoker = endpoint.dataConnectGraphqlTrigger.invoker ?? [];
+            invoker.push((0, dataconnect_1.getDataConnectP4SA)(this.projectNumber));
+            if (!invoker.includes("private")) {
+                await this.executor
+                    .run(() => run.setInvokerCreate(endpoint.project, serviceName, invoker))
+                    .catch(rethrowAs(endpoint, "set invoker"));
+            }
+        }
         else if (backend.isCallableTriggered(endpoint)) {
             await this.executor
                 .run(() => run.setInvokerCreate(endpoint.project, serviceName, ["public"]))
@@ -354,8 +376,7 @@ class Fabricator {
         }
     }
     async updateV1Function(endpoint, scraper) {
-        var _a, _b;
-        const sourceUrl = (_a = this.sources[endpoint.codebase]) === null || _a === void 0 ? void 0 : _a.sourceUrl;
+        const sourceUrl = this.sources[endpoint.codebase]?.sourceUrl;
         if (!sourceUrl) {
             logger_1.logger.debug("Precondition failed. Cannot update a GCF function without sourceUrl");
             throw new Error("Precondition failed");
@@ -365,10 +386,15 @@ class Fabricator {
             .run(async () => {
             apiFunction.sourceToken = await scraper.getToken();
             const op = await gcf.updateFunction(apiFunction);
-            return await poller.pollOperation(Object.assign(Object.assign({}, gcfV1PollerOptions), { pollerName: `update-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`, operationResourceName: op.name, onPoll: scraper.poller }));
+            return await poller.pollOperation({
+                ...gcfV1PollerOptions,
+                pollerName: `update-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`,
+                operationResourceName: op.name,
+                onPoll: scraper.poller,
+            });
         })
             .catch(rethrowAs(endpoint, "update"));
-        endpoint.uri = (_b = resultFunction === null || resultFunction === void 0 ? void 0 : resultFunction.httpsTrigger) === null || _b === void 0 ? void 0 : _b.url;
+        endpoint.uri = resultFunction?.httpsTrigger?.url;
         let invoker;
         if (backend.isHttpsTriggered(endpoint)) {
             invoker = endpoint.httpsTrigger.invoker === null ? ["public"] : endpoint.httpsTrigger.invoker;
@@ -387,14 +413,13 @@ class Fabricator {
         }
     }
     async updateV2Function(endpoint, scraper) {
-        var _a, _b, _c, _d;
-        const storageSource = (_a = this.sources[endpoint.codebase]) === null || _a === void 0 ? void 0 : _a.storage;
+        const storageSource = this.sources[endpoint.codebase]?.storage;
         if (!storageSource) {
             logger_1.logger.debug("Precondition failed. Cannot update a GCFv2 function without storage");
             throw new Error("Precondition failed");
         }
-        const apiFunction = gcfV2.functionFromEndpoint(Object.assign(Object.assign({}, endpoint), { source: { storageSource } }));
-        if ((_b = apiFunction.eventTrigger) === null || _b === void 0 ? void 0 : _b.pubsubTopic) {
+        const apiFunction = gcfV2.functionFromEndpoint({ ...endpoint, source: { storageSource } });
+        if (apiFunction.eventTrigger?.pubsubTopic) {
             delete apiFunction.eventTrigger.pubsubTopic;
         }
         const resultFunction = await this.functionExecutor
@@ -403,16 +428,21 @@ class Fabricator {
                 apiFunction.buildConfig.sourceToken = await scraper.getToken();
             }
             const op = await gcfV2.updateFunction(apiFunction);
-            return await poller.pollOperation(Object.assign(Object.assign({}, gcfV2PollerOptions), { pollerName: `update-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`, operationResourceName: op.name, onPoll: scraper.poller }));
+            return await poller.pollOperation({
+                ...gcfV2PollerOptions,
+                pollerName: `update-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`,
+                operationResourceName: op.name,
+                onPoll: scraper.poller,
+            });
         }, { retryCodes: [...executor_1.DEFAULT_RETRY_CODES, CLOUD_RUN_RESOURCE_EXHAUSTED_CODE] })
             .catch((err) => {
             scraper.abort();
             logger_1.logger.error(err.message);
             throw new reporter.DeploymentError(endpoint, "update", err);
         });
-        endpoint.uri = (_c = resultFunction.serviceConfig) === null || _c === void 0 ? void 0 : _c.uri;
-        const serviceName = (_d = resultFunction.serviceConfig) === null || _d === void 0 ? void 0 : _d.service;
-        endpoint.runServiceId = utils.last(serviceName === null || serviceName === void 0 ? void 0 : serviceName.split("/"));
+        endpoint.uri = resultFunction.serviceConfig?.uri;
+        const serviceName = resultFunction.serviceConfig?.service;
+        endpoint.runServiceId = utils.last(serviceName?.split("/"));
         if (!serviceName) {
             logger_1.logger.debug("Result function unexpectedly didn't have a service name.");
             utils.logLabeledWarning("functions", "Updated function is not associated with a service. This deployment is in an unexpected state - please re-deploy your functions.");
@@ -422,6 +452,15 @@ class Fabricator {
         if (backend.isHttpsTriggered(endpoint)) {
             invoker = endpoint.httpsTrigger.invoker === null ? ["public"] : endpoint.httpsTrigger.invoker;
         }
+        else if (backend.isDataConnectGraphqlTriggered(endpoint)) {
+            invoker =
+                endpoint.dataConnectGraphqlTrigger.invoker === null
+                    ? []
+                    : endpoint.dataConnectGraphqlTrigger.invoker;
+            if (invoker) {
+                invoker.push((0, dataconnect_1.getDataConnectP4SA)(this.projectNumber));
+            }
+        }
         else if (backend.isTaskQueueTriggered(endpoint)) {
             invoker = endpoint.taskQueueTrigger.invoker === null ? [] : endpoint.taskQueueTrigger.invoker;
         }
@@ -445,7 +484,11 @@ class Fabricator {
         await this.functionExecutor
             .run(async () => {
             const op = await gcf.deleteFunction(fnName);
-            const pollerOptions = Object.assign(Object.assign({}, gcfV1PollerOptions), { pollerName: `delete-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`, operationResourceName: op.name });
+            const pollerOptions = {
+                ...gcfV1PollerOptions,
+                pollerName: `delete-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`,
+                operationResourceName: op.name,
+            };
             await poller.pollOperation(pollerOptions);
         })
             .catch(rethrowAs(endpoint, "delete"));
@@ -455,7 +498,11 @@ class Fabricator {
         await this.functionExecutor
             .run(async () => {
             const op = await gcfV2.deleteFunction(fnName);
-            const pollerOptions = Object.assign(Object.assign({}, gcfV2PollerOptions), { pollerName: `delete-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`, operationResourceName: op.name });
+            const pollerOptions = {
+                ...gcfV2PollerOptions,
+                pollerName: `delete-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`,
+                operationResourceName: op.name,
+            };
             await poller.pollOperation(pollerOptions);
         }, { retryCodes: [...executor_1.DEFAULT_RETRY_CODES, CLOUD_RUN_RESOURCE_EXHAUSTED_CODE] })
             .catch(rethrowAs(endpoint, "delete"));

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printTriggerUrls = exports.release = void 0;
+exports.release = release;
+exports.printTriggerUrls = printTriggerUrls;
 const clc = require("colorette");
 const logger_1 = require("../../../logger");
 const functional_1 = require("../../../functional");
@@ -32,12 +33,15 @@ async function release(context, options, payload) {
     }
     let plan = {};
     for (const [codebase, { wantBackend, haveBackend }] of Object.entries(payload.functions)) {
-        plan = Object.assign(Object.assign({}, plan), planner.createDeploymentPlan({
-            codebase,
-            wantBackend,
-            haveBackend,
-            filters: context.filters,
-        }));
+        plan = {
+            ...plan,
+            ...planner.createDeploymentPlan({
+                codebase,
+                wantBackend,
+                haveBackend,
+                filters: context.filters,
+            }),
+        };
     }
     const fnsToDelete = Object.values(plan)
         .map((regionalChanges) => regionalChanges.endpointsToDelete)
@@ -66,18 +70,19 @@ async function release(context, options, payload) {
         concurrency: 40,
         maxBackoff: 100000,
     };
+    const projectNumber = options.projectNumber || (await (0, getProjectNumber_1.getProjectNumber)(context.projectId));
     const fab = new fabricator.Fabricator({
         functionExecutor: new executor.QueueExecutor(throttlerOptions),
         executor: new executor.QueueExecutor(throttlerOptions),
         sources: context.sources,
         appEngineLocation: (0, functionsConfig_1.getAppEngineLocation)(context.firebaseConfig),
-        projectNumber: options.projectNumber || (await (0, getProjectNumber_1.getProjectNumber)(context.projectId)),
+        projectNumber: projectNumber,
     });
     const summary = await fab.applyPlan(plan);
     await reporter.logAndTrackDeployStats(summary, context);
     reporter.printErrors(summary);
     const wantBackend = backend.merge(...Object.values(payload.functions).map((p) => p.wantBackend));
-    printTriggerUrls(wantBackend);
+    printTriggerUrls(wantBackend, projectNumber);
     await setupArtifactCleanupPolicies(options, options.projectId, Object.keys(wantBackend.endpoints));
     const allErrors = summary.results.filter((r) => r.error).map((r) => r.error);
     if (allErrors.length) {
@@ -86,12 +91,13 @@ async function release(context, options, payload) {
         for (const error of allErrors) {
             logger_1.logger.debug(JSON.stringify(error, null, 2));
         }
-        throw new error_1.FirebaseError("There was an error deploying functions", Object.assign(Object.assign({}, opts), { exit: 2 }));
+        throw new error_1.FirebaseError("There was an error deploying functions", { ...opts, exit: 2 });
     }
 }
-exports.release = release;
-function printTriggerUrls(results) {
-    const httpsFunctions = backend.allEndpoints(results).filter(backend.isHttpsTriggered);
+function printTriggerUrls(results, projectNumber) {
+    const httpsFunctions = backend
+        .allEndpoints(results)
+        .filter((b) => backend.isHttpsTriggered(b) || backend.isDataConnectGraphqlTriggered(b));
     if (httpsFunctions.length === 0) {
         return;
     }
@@ -100,10 +106,13 @@ function printTriggerUrls(results) {
             logger_1.logger.debug("Not printing URL for HTTPS function. Typically this means it didn't match a filter or we failed deployment");
             continue;
         }
+        if (backend.isDataConnectGraphqlTriggered(httpsFunc)) {
+            logger_1.logger.info(clc.bold("Function URL"), `(${(0, functionsDeployHelper_1.getFunctionLabel)(httpsFunc)}):`, `https://${httpsFunc.id.toLowerCase()}-${projectNumber}.${httpsFunc.region}.run.app`);
+            continue;
+        }
         logger_1.logger.info(clc.bold("Function URL"), `(${(0, functionsDeployHelper_1.getFunctionLabel)(httpsFunc)}):`, httpsFunc.uri);
     }
 }
-exports.printTriggerUrls = printTriggerUrls;
 async function setupArtifactCleanupPolicies(options, projectId, locations) {
     if (locations.length === 0) {
         return;

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

@@ -1,6 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkForV2Upgrade = exports.checkForIllegalUpdate = exports.checkForUnsafeUpdate = exports.upgradedScheduleFromV1ToV2 = exports.changedV2PubSubTopic = exports.changedTriggerRegion = exports.upgradedToGCFv2WithoutSettingConcurrency = exports.createDeploymentPlan = exports.calculateUpdate = exports.calculateChangesets = void 0;
+exports.calculateChangesets = calculateChangesets;
+exports.calculateUpdate = calculateUpdate;
+exports.createDeploymentPlan = createDeploymentPlan;
+exports.upgradedToGCFv2WithoutSettingConcurrency = upgradedToGCFv2WithoutSettingConcurrency;
+exports.changedTriggerRegion = changedTriggerRegion;
+exports.changedV2PubSubTopic = changedV2PubSubTopic;
+exports.upgradedScheduleFromV1ToV2 = upgradedScheduleFromV1ToV2;
+exports.checkForUnsafeUpdate = checkForUnsafeUpdate;
+exports.checkForIllegalUpdate = checkForIllegalUpdate;
+exports.checkForV2Upgrade = checkForV2Upgrade;
 const functionsDeployHelper_1 = require("../functionsDeployHelper");
 const deploymentTool_1 = require("../../../deploymentTool");
 const error_1 = require("../../../error");
@@ -52,7 +61,6 @@ function calculateChangesets(want, have, keyFn, deleteAll) {
     }
     return result;
 }
-exports.calculateChangesets = calculateChangesets;
 function calculateUpdate(want, have) {
     checkForIllegalUpdate(want, have);
     const update = {
@@ -67,7 +75,6 @@ function calculateUpdate(want, have) {
     }
     return update;
 }
-exports.calculateUpdate = calculateUpdate;
 function createDeploymentPlan(args) {
     let { wantBackend, haveBackend, codebase, filters, deleteAll } = args;
     let deployment = {};
@@ -84,7 +91,7 @@ function createDeploymentPlan(args) {
     ]);
     for (const region of regions) {
         const changesets = calculateChangesets(wantBackend.endpoints[region] || {}, haveBackend.endpoints[region] || {}, (e) => `${codebase}-${e.region}-${e.availableMemoryMb || "default"}`, deleteAll);
-        deployment = Object.assign(Object.assign({}, deployment), changesets);
+        deployment = { ...deployment, ...changesets };
     }
     if (upgradedToGCFv2WithoutSettingConcurrency(wantBackend, haveBackend)) {
         utils.logLabeledBullet("functions", "You are updating one or more functions to Google Cloud Functions v2, " +
@@ -94,11 +101,9 @@ function createDeploymentPlan(args) {
     }
     return deployment;
 }
-exports.createDeploymentPlan = createDeploymentPlan;
 function upgradedToGCFv2WithoutSettingConcurrency(want, have) {
     return backend.someEndpoint(want, (endpoint) => {
-        var _a, _b;
-        if (((_b = (_a = have.endpoints[endpoint.region]) === null || _a === void 0 ? void 0 : _a[endpoint.id]) === null || _b === void 0 ? void 0 : _b.platform) !== "gcfv1") {
+        if (have.endpoints[endpoint.region]?.[endpoint.id]?.platform !== "gcfv1") {
             return false;
         }
         if (endpoint.platform !== "gcfv2") {
@@ -110,7 +115,6 @@ function upgradedToGCFv2WithoutSettingConcurrency(want, have) {
         return true;
     });
 }
-exports.upgradedToGCFv2WithoutSettingConcurrency = upgradedToGCFv2WithoutSettingConcurrency;
 function changedTriggerRegion(want, have) {
     if (want.platform !== "gcfv2") {
         return false;
@@ -126,7 +130,6 @@ function changedTriggerRegion(want, have) {
     }
     return want.eventTrigger.region !== have.eventTrigger.region;
 }
-exports.changedTriggerRegion = changedTriggerRegion;
 function changedV2PubSubTopic(want, have) {
     if (want.platform !== "gcfv2") {
         return false;
@@ -148,7 +151,6 @@ function changedV2PubSubTopic(want, have) {
     }
     return have.eventTrigger.eventFilters.topic !== want.eventTrigger.eventFilters.topic;
 }
-exports.changedV2PubSubTopic = changedV2PubSubTopic;
 function upgradedScheduleFromV1ToV2(want, have) {
     if (have.platform !== "gcfv1") {
         return false;
@@ -164,19 +166,20 @@ function upgradedScheduleFromV1ToV2(want, have) {
     }
     return true;
 }
-exports.upgradedScheduleFromV1ToV2 = upgradedScheduleFromV1ToV2;
 function checkForUnsafeUpdate(want, have) {
     return (backend.isEventTriggered(want) &&
         backend.isEventTriggered(have) &&
         want.eventTrigger.eventType ===
             v2events.CONVERTABLE_EVENTS[have.eventTrigger.eventType]);
 }
-exports.checkForUnsafeUpdate = checkForUnsafeUpdate;
 function checkForIllegalUpdate(want, have) {
     const triggerType = (e) => {
         if (backend.isHttpsTriggered(e)) {
             return "an HTTPS";
         }
+        else if (backend.isDataConnectGraphqlTriggered(e)) {
+            return "a Data Connect HTTPS";
+        }
         else if (backend.isCallableTriggered(e)) {
             return "a callable";
         }
@@ -205,11 +208,9 @@ function checkForIllegalUpdate(want, have) {
     }
     exports.checkForV2Upgrade(want, have);
 }
-exports.checkForIllegalUpdate = checkForIllegalUpdate;
 function checkForV2Upgrade(want, have) {
     if (want.platform === "gcfv2" && have.platform === "gcfv1") {
         throw new error_1.FirebaseError(`[${(0, functionsDeployHelper_1.getFunctionLabel)(have)}] Upgrading from 1st Gen to 2nd Gen is not yet supported. ` +
             "See https://firebase.google.com/docs/functions/2nd-gen-upgrade before migrating to 2nd Gen.");
     }
 }
-exports.checkForV2Upgrade = checkForV2Upgrade;

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

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.triggerTag = exports.printAbortedErrors = exports.printErrors = exports.logAndTrackDeployStats = exports.AbortedDeploymentError = exports.DeploymentError = void 0;
+exports.AbortedDeploymentError = exports.DeploymentError = void 0;
+exports.logAndTrackDeployStats = logAndTrackDeployStats;
+exports.printErrors = printErrors;
+exports.printAbortedErrors = printAbortedErrors;
+exports.triggerTag = triggerTag;
 const backend = require("../backend");
 const clc = require("colorette");
 const logger_1 = require("../../../logger");
@@ -24,7 +28,6 @@ class AbortedDeploymentError extends DeploymentError {
 }
 exports.AbortedDeploymentError = AbortedDeploymentError;
 async function logAndTrackDeployStats(summary, context) {
-    var _a, _b, _c;
     let totalTime = 0;
     let totalErrors = 0;
     let totalSuccesses = 0;
@@ -51,29 +54,29 @@ async function logAndTrackDeployStats(summary, context) {
         totalTime += result.durationMs;
         if (!result.error) {
             totalSuccesses++;
-            if (((_a = context === null || context === void 0 ? void 0 : context.codebaseDeployEvents) === null || _a === void 0 ? void 0 : _a[result.endpoint.codebase || "default"]) !== undefined) {
+            if (context?.codebaseDeployEvents?.[result.endpoint.codebase || "default"] !== undefined) {
                 context.codebaseDeployEvents[result.endpoint.codebase || "default"]
                     .fn_deploy_num_successes++;
             }
         }
         else if (result.error instanceof AbortedDeploymentError) {
             totalAborts++;
-            if (((_b = context === null || context === void 0 ? void 0 : context.codebaseDeployEvents) === null || _b === void 0 ? void 0 : _b[result.endpoint.codebase || "default"]) !== undefined) {
+            if (context?.codebaseDeployEvents?.[result.endpoint.codebase || "default"] !== undefined) {
                 context.codebaseDeployEvents[result.endpoint.codebase || "default"]
                     .fn_deploy_num_canceled++;
             }
         }
         else {
             totalErrors++;
-            if (((_c = context === null || context === void 0 ? void 0 : context.codebaseDeployEvents) === null || _c === void 0 ? void 0 : _c[result.endpoint.codebase || "default"]) !== undefined) {
+            if (context?.codebaseDeployEvents?.[result.endpoint.codebase || "default"] !== undefined) {
                 context.codebaseDeployEvents[result.endpoint.codebase || "default"]
                     .fn_deploy_num_failures++;
             }
         }
     }
     for (const codebase of codebases) {
-        if (context === null || context === void 0 ? void 0 : context.codebaseDeployEvents) {
-            reports.push((0, track_1.trackGA4)("codebase_deploy", Object.assign({}, context.codebaseDeployEvents[codebase])));
+        if (context?.codebaseDeployEvents) {
+            reports.push((0, track_1.trackGA4)("codebase_deploy", { ...context.codebaseDeployEvents[codebase] }));
         }
     }
     const fnDeployGroupEvent = {
@@ -81,7 +84,7 @@ async function logAndTrackDeployStats(summary, context) {
         fn_deploy_num_successes: totalSuccesses,
         fn_deploy_num_canceled: totalAborts,
         fn_deploy_num_failures: totalErrors,
-        has_runtime_config: String(!!(context === null || context === void 0 ? void 0 : context.hasRuntimeConfig)),
+        has_runtime_config: String(!!context?.hasRuntimeConfig),
     };
     reports.push((0, track_1.trackGA4)("function_deploy_group", fnDeployGroupEvent));
     const avgTime = totalTime / (totalSuccesses + totalErrors);
@@ -92,7 +95,6 @@ async function logAndTrackDeployStats(summary, context) {
     logger_1.logger.debug(`Average Function Deployment time: ${avgTime}`);
     await utils.allSettled(reports);
 }
-exports.logAndTrackDeployStats = logAndTrackDeployStats;
 function printErrors(summary) {
     const errored = summary.results.filter((r) => r.error);
     if (errored.length === 0) {
@@ -109,7 +111,6 @@ function printErrors(summary) {
     printQuotaErrors(errored);
     printAbortedErrors(errored);
 }
-exports.printErrors = printErrors;
 function printIamErrors(results) {
     const iamFailures = results.filter((r) => r.error instanceof DeploymentError && r.error.op === "set invoker");
     if (!iamFailures.length) {
@@ -137,16 +138,15 @@ function printIamErrors(results) {
 }
 function printQuotaErrors(results) {
     const hadQuotaError = results.find((r) => {
-        var _a, _b, _c, _d, _e, _f;
         if (!(r.error instanceof DeploymentError)) {
             return false;
         }
         const original = r.error.original;
-        const code = (original === null || original === void 0 ? void 0 : original.status) ||
-            (original === null || original === void 0 ? void 0 : original.code) ||
-            ((_b = (_a = original === null || original === void 0 ? void 0 : original.context) === null || _a === void 0 ? void 0 : _a.response) === null || _b === void 0 ? void 0 : _b.statusCode) ||
-            ((_c = original === null || original === void 0 ? void 0 : original.original) === null || _c === void 0 ? void 0 : _c.code) ||
-            ((_f = (_e = (_d = original === null || original === void 0 ? void 0 : original.original) === null || _d === void 0 ? void 0 : _d.context) === null || _e === void 0 ? void 0 : _e.response) === null || _f === void 0 ? void 0 : _f.statusCode);
+        const code = original?.status ||
+            original?.code ||
+            original?.context?.response?.statusCode ||
+            original?.original?.code ||
+            original?.original?.context?.response?.statusCode;
         return code === 429 || code === 409;
     });
     if (!hadQuotaError) {
@@ -170,9 +170,7 @@ function printAbortedErrors(results) {
         aborted.map((result) => `\n\t${(0, functionsDeployHelper_1.getFunctionLabel)(result.endpoint)}`).join(""));
     logger_1.logger.info(`To delete these, use ${clc.bold("firebase functions:delete")}`);
 }
-exports.printAbortedErrors = printAbortedErrors;
 function triggerTag(endpoint) {
-    var _a;
     const prefix = endpoint.platform === "gcfv1" ? "v1" : "v2";
     if (backend.isScheduleTriggered(endpoint)) {
         return `${prefix}.scheduled`;
@@ -184,14 +182,16 @@ function triggerTag(endpoint) {
         return `${prefix}.callable`;
     }
     if (backend.isHttpsTriggered(endpoint)) {
-        if ((_a = endpoint.labels) === null || _a === void 0 ? void 0 : _a["deployment-callable"]) {
+        if (endpoint.labels?.["deployment-callable"]) {
             return `${prefix}.callable`;
         }
         return `${prefix}.https`;
     }
+    if (backend.isDataConnectGraphqlTriggered(endpoint)) {
+        return `${prefix}.dataConnectGraphql`;
+    }
     if (backend.isBlockingTriggered(endpoint)) {
         return `${prefix}.blocking`;
     }
     return endpoint.eventTrigger.eventType;
 }
-exports.triggerTag = triggerTag;

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

@@ -50,12 +50,11 @@ class SourceTokenScraper {
     }
     get poller() {
         return (op) => {
-            var _a, _b, _c, _d, _e;
-            if (((_a = op.metadata) === null || _a === void 0 ? void 0 : _a.sourceToken) || op.done) {
-                const [, , , region] = ((_c = (_b = op.metadata) === null || _b === void 0 ? void 0 : _b.target) === null || _c === void 0 ? void 0 : _c.split("/")) || [];
-                logger_1.logger.debug(`Got source token ${(_d = op.metadata) === null || _d === void 0 ? void 0 : _d.sourceToken} for region ${region}`);
+            if (op.metadata?.sourceToken || op.done) {
+                const [, , , region] = op.metadata?.target?.split("/") || [];
+                logger_1.logger.debug(`Got source token ${op.metadata?.sourceToken} for region ${region}`);
                 this.resolve({
-                    token: (_e = op.metadata) === null || _e === void 0 ? void 0 : _e.sourceToken,
+                    token: op.metadata?.sourceToken,
                     aborted: false,
                 });
                 this.fetchState = "VALID";

package/lib/deploy/functions/remoteSource.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.requireFunctionsYaml = exports.getRemoteSource = void 0;
+exports.getRemoteSource = getRemoteSource;
+exports.requireFunctionsYaml = requireFunctionsYaml;
 const fs = require("fs");
 const path = require("path");
 const url_1 = require("url");
@@ -45,7 +46,6 @@ async function getRemoteSource(repository, ref, destDir, subDir) {
     (0, utils_1.logLabeledBullet)("functions", `downloaded remote source (${origin})`);
     return sourceDir;
 }
-exports.getRemoteSource = getRemoteSource;
 function parseGitHubUrl(url) {
     const shorthandMatch = /^[a-zA-Z0-9-]+\/[a-zA-Z0-9-_.]+$/.exec(url);
     if (shorthandMatch) {
@@ -68,7 +68,7 @@ function parseGitHubUrl(url) {
         }
         return { owner, repo };
     }
-    catch (_a) {
+    catch {
         return undefined;
     }
 }
@@ -81,4 +81,3 @@ function requireFunctionsYaml(codeDir) {
             `If you trust this repository and want to use it anyway, clone the repository locally, inspect the code for safety, and deploy it as a local source.`);
     }
 }
-exports.requireFunctionsYaml = requireFunctionsYaml;