firebase-tools 15.1.0 → 15.2.0

package/lib/gcp/cloudfunctionsv2.js

@@ -1,6 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.endpointFromFunction = exports.functionFromEndpoint = exports.deleteFunction = exports.updateFunction = exports.listAllFunctions = exports.getFunction = exports.createFunction = exports.generateUploadUrl = exports.API_VERSION = void 0;
+exports.API_VERSION = void 0;
+exports.generateUploadUrl = generateUploadUrl;
+exports.createFunction = createFunction;
+exports.getFunction = getFunction;
+exports.listAllFunctions = listAllFunctions;
+exports.updateFunction = updateFunction;
+exports.deleteFunction = deleteFunction;
+exports.functionFromEndpoint = functionFromEndpoint;
+exports.endpointFromFunction = endpointFromFunction;
 const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
 const api_1 = require("../api");
@@ -22,34 +30,33 @@ const client = new apiv2_1.Client({
     apiVersion: exports.API_VERSION,
 });
 function functionsOpLogReject(func, type, err) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
-    if ((_a = err === null || err === void 0 ? void 0 : err.message) === null || _a === void 0 ? void 0 : _a.includes("Runtime validation errors")) {
+    if (err?.message?.includes("Runtime validation errors")) {
         const capturedMessage = (0, cloudfunctions_1.captureRuntimeValidationError)(err.message);
         utils.logLabeledWarning("functions", capturedMessage + " for function " + func.name);
     }
-    if ((_b = err === null || err === void 0 ? void 0 : err.message) === null || _b === void 0 ? void 0 : _b.includes("maxScale may not exceed")) {
+    if (err?.message?.includes("maxScale may not exceed")) {
         const maxInstances = func.serviceConfig.maxInstanceCount || DEFAULT_MAX_INSTANCE_COUNT;
         utils.logLabeledWarning("functions", `Your current project quotas don't allow for the current max instances setting of ${maxInstances}. ` +
             "Either reduce this function's maximum instances, or request a quota increase on the underlying Cloud Run service " +
             "at https://cloud.google.com/run/quotas.");
-        const suggestedFix = ((_c = func.buildConfig.runtime) === null || _c === void 0 ? void 0 : _c.startsWith("python"))
+        const suggestedFix = func.buildConfig.runtime?.startsWith("python")
             ? "firebase_functions.options.set_global_options(max_instances=10)"
             : "setGlobalOptions({maxInstances: 10})";
         utils.logLabeledWarning("functions", `You can adjust the max instances value in your function's runtime options:\n\t${suggestedFix}`);
     }
     else {
-        utils.logLabeledWarning("functions", `${err === null || err === void 0 ? void 0 : err.message}`);
-        if (((_e = (_d = err === null || err === void 0 ? void 0 : err.context) === null || _d === void 0 ? void 0 : _d.response) === null || _e === void 0 ? void 0 : _e.statusCode) === 429) {
+        utils.logLabeledWarning("functions", `${err?.message}`);
+        if (err?.context?.response?.statusCode === 429) {
             utils.logLabeledWarning("functions", `Got "Quota Exceeded" error while trying to ${type} ${func.name}. Waiting to retry...`);
         }
-        else if ((_f = err === null || err === void 0 ? void 0 : err.message) === null || _f === void 0 ? void 0 : _f.includes("If you recently started to use Eventarc, it may take a few minutes before all necessary permissions are propagated to the Service Agent")) {
+        else if (err?.message?.includes("If you recently started to use Eventarc, it may take a few minutes before all necessary permissions are propagated to the Service Agent")) {
             utils.logLabeledWarning("functions", `Since this is your first time using 2nd gen functions, we need a little bit longer to finish setting everything up. Retry the deployment in a few minutes.`);
         }
         utils.logLabeledWarning("functions", ` failed to ${type} function ${func.name}`);
     }
     throw new error_1.FirebaseError(`Failed to ${type} function ${func.name}`, {
         original: err,
-        status: (_h = (_g = err === null || err === void 0 ? void 0 : err.context) === null || _g === void 0 ? void 0 : _g.response) === null || _h === void 0 ? void 0 : _h.statusCode,
+        status: err?.context?.response?.statusCode,
         context: { function: func.name },
     });
 }
@@ -63,12 +70,18 @@ async function generateUploadUrl(projectId, location) {
         throw err;
     }
 }
-exports.generateUploadUrl = generateUploadUrl;
 async function createFunction(cloudFunction) {
     const components = cloudFunction.name.split("/");
     const functionId = components.splice(-1, 1)[0];
-    cloudFunction.buildConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.buildConfig.environmentVariables), { GOOGLE_NODE_RUN_SCRIPTS: "" });
-    cloudFunction.serviceConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.serviceConfig.environmentVariables), { FUNCTION_TARGET: cloudFunction.buildConfig.entryPoint.replaceAll("-", "."), LOG_EXECUTION_ID: "true" });
+    cloudFunction.buildConfig.environmentVariables = {
+        ...cloudFunction.buildConfig.environmentVariables,
+        GOOGLE_NODE_RUN_SCRIPTS: "",
+    };
+    cloudFunction.serviceConfig.environmentVariables = {
+        ...cloudFunction.serviceConfig.environmentVariables,
+        FUNCTION_TARGET: cloudFunction.buildConfig.entryPoint.replaceAll("-", "."),
+        LOG_EXECUTION_ID: "true",
+    };
     try {
         const res = await client.post(components.join("/"), cloudFunction, { queryParams: { functionId } });
         return res.body;
@@ -77,17 +90,14 @@ async function createFunction(cloudFunction) {
         throw functionsOpLogReject(cloudFunction, "create", err);
     }
 }
-exports.createFunction = createFunction;
 async function getFunction(projectId, location, functionId) {
     const name = `projects/${projectId}/locations/${location}/functions/${functionId}`;
     const res = await client.get(name);
     return res.body;
 }
-exports.getFunction = getFunction;
 async function listAllFunctions(projectId) {
     return await listFunctionsInternal(projectId, "-");
 }
-exports.listAllFunctions = listAllFunctions;
 async function listFunctionsInternal(projectId, region) {
     const functions = [];
     const unreacahble = new Set();
@@ -96,7 +106,7 @@ async function listFunctionsInternal(projectId, region) {
         const url = `projects/${projectId}/locations/${region}/functions`;
         const opts = { queryParams: { filter: `environment="GEN_2"` } };
         if (pageToken !== "") {
-            opts.queryParams = Object.assign(Object.assign({}, opts.queryParams), { pageToken });
+            opts.queryParams = { ...opts.queryParams, pageToken };
         }
         const res = await client.get(url, opts);
         functions.push(...(res.body.functions || []));
@@ -113,8 +123,15 @@ async function listFunctionsInternal(projectId, region) {
     }
 }
 async function updateFunction(cloudFunction) {
-    cloudFunction.buildConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.buildConfig.environmentVariables), { GOOGLE_NODE_RUN_SCRIPTS: "" });
-    cloudFunction.serviceConfig.environmentVariables = Object.assign(Object.assign({}, cloudFunction.serviceConfig.environmentVariables), { FUNCTION_TARGET: cloudFunction.buildConfig.entryPoint.replaceAll("-", "."), LOG_EXECUTION_ID: "true" });
+    cloudFunction.buildConfig.environmentVariables = {
+        ...cloudFunction.buildConfig.environmentVariables,
+        GOOGLE_NODE_RUN_SCRIPTS: "",
+    };
+    cloudFunction.serviceConfig.environmentVariables = {
+        ...cloudFunction.serviceConfig.environmentVariables,
+        FUNCTION_TARGET: cloudFunction.buildConfig.entryPoint.replaceAll("-", "."),
+        LOG_EXECUTION_ID: "true",
+    };
     const fieldMasks = proto.fieldMasks(cloudFunction, "labels", "serviceConfig.environmentVariables", "serviceConfig.secretEnvironmentVariables", "buildConfig.environmentVariables");
     try {
         const queryParams = {
@@ -127,7 +144,6 @@ async function updateFunction(cloudFunction) {
         throw functionsOpLogReject(cloudFunction, "update", err);
     }
 }
-exports.updateFunction = updateFunction;
 async function deleteFunction(cloudFunction) {
     try {
         const res = await client.delete(cloudFunction);
@@ -137,9 +153,7 @@ async function deleteFunction(cloudFunction) {
         throw functionsOpLogReject({ name: cloudFunction }, "update", err);
     }
 }
-exports.deleteFunction = deleteFunction;
 function functionFromEndpoint(endpoint) {
-    var _a, _b, _c;
     if (endpoint.platform !== "gcfv2") {
         throw new error_1.FirebaseError("Trying to create a v2 CloudFunction with v1 API. This should never happen");
     }
@@ -153,7 +167,7 @@ function functionFromEndpoint(endpoint) {
             runtime: endpoint.runtime || undefined,
             entryPoint: endpoint.entryPoint,
             source: {
-                storageSource: (_a = endpoint.source) === null || _a === void 0 ? void 0 : _a.storageSource,
+                storageSource: endpoint.source?.storageSource,
             },
             environmentVariables: {},
         },
@@ -189,7 +203,7 @@ function functionFromEndpoint(endpoint) {
             gcfFunction.eventTrigger.serviceAccountEmail = gcfFunction.serviceConfig.serviceAccountEmail;
         }
         if (gcfFunction.eventTrigger.eventType === v2_1.PUBSUB_PUBLISH_EVENT) {
-            if (!((_b = endpoint.eventTrigger.eventFilters) === null || _b === void 0 ? void 0 : _b.topic)) {
+            if (!endpoint.eventTrigger.eventFilters?.topic) {
                 throw new error_1.FirebaseError("Error: Pub/Sub event trigger is missing topic: " +
                     JSON.stringify(endpoint.eventTrigger, null, 2));
             }
@@ -219,56 +233,74 @@ function functionFromEndpoint(endpoint) {
         endpoint.eventTrigger.retry
             ? (gcfFunction.eventTrigger.retryPolicy = "RETRY_POLICY_RETRY")
             : (gcfFunction.eventTrigger.retryPolicy = "RETRY_POLICY_DO_NOT_RETRY");
-        gcfFunction.serviceConfig.environmentVariables = Object.assign(Object.assign({}, gcfFunction.serviceConfig.environmentVariables), { FUNCTION_SIGNATURE_TYPE: "cloudevent" });
+        gcfFunction.serviceConfig.environmentVariables = {
+            ...gcfFunction.serviceConfig.environmentVariables,
+            FUNCTION_SIGNATURE_TYPE: "cloudevent",
+        };
     }
     else if (backend.isScheduleTriggered(endpoint)) {
-        gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { "deployment-scheduled": "true" });
+        gcfFunction.labels = { ...gcfFunction.labels, "deployment-scheduled": "true" };
     }
     else if (backend.isTaskQueueTriggered(endpoint)) {
-        gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { "deployment-taskqueue": "true" });
+        gcfFunction.labels = { ...gcfFunction.labels, "deployment-taskqueue": "true" };
     }
     else if (backend.isCallableTriggered(endpoint)) {
-        gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { "deployment-callable": "true" });
+        gcfFunction.labels = { ...gcfFunction.labels, "deployment-callable": "true" };
         if (endpoint.callableTrigger.genkitAction) {
             gcfFunction.labels["genkit-action"] = "true";
         }
     }
+    else if (backend.isDataConnectGraphqlTriggered(endpoint)) {
+        gcfFunction.labels = { ...gcfFunction.labels, "deployment-fdcgraphql": "true" };
+    }
     else if (backend.isBlockingTriggered(endpoint)) {
-        gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { [constants_1.BLOCKING_LABEL]: constants_1.BLOCKING_EVENT_TO_LABEL_KEY[endpoint.blockingTrigger.eventType] });
+        gcfFunction.labels = {
+            ...gcfFunction.labels,
+            [constants_1.BLOCKING_LABEL]: constants_1.BLOCKING_EVENT_TO_LABEL_KEY[endpoint.blockingTrigger.eventType],
+        };
     }
     const codebase = endpoint.codebase || projectConfig.DEFAULT_CODEBASE;
     if (codebase !== projectConfig.DEFAULT_CODEBASE) {
-        gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { [constants_1.CODEBASE_LABEL]: codebase });
+        gcfFunction.labels = {
+            ...gcfFunction.labels,
+            [constants_1.CODEBASE_LABEL]: codebase,
+        };
     }
     else {
-        (_c = gcfFunction.labels) === null || _c === void 0 ? true : delete _c[constants_1.CODEBASE_LABEL];
+        delete gcfFunction.labels?.[constants_1.CODEBASE_LABEL];
     }
     if (endpoint.hash) {
-        gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { [constants_1.HASH_LABEL]: endpoint.hash });
+        gcfFunction.labels = {
+            ...gcfFunction.labels,
+            [constants_1.HASH_LABEL]: endpoint.hash,
+        };
     }
     return gcfFunction;
 }
-exports.functionFromEndpoint = functionFromEndpoint;
 function endpointFromFunction(gcfFunction) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     const [, project, , region, , id] = gcfFunction.name.split("/");
     let trigger;
-    if (((_a = gcfFunction.labels) === null || _a === void 0 ? void 0 : _a["deployment-scheduled"]) === "true") {
+    if (gcfFunction.labels?.["deployment-scheduled"] === "true") {
         trigger = {
             scheduleTrigger: {},
         };
     }
-    else if (((_b = gcfFunction.labels) === null || _b === void 0 ? void 0 : _b["deployment-taskqueue"]) === "true") {
+    else if (gcfFunction.labels?.["deployment-taskqueue"] === "true") {
         trigger = {
             taskQueueTrigger: {},
         };
     }
-    else if (((_c = gcfFunction.labels) === null || _c === void 0 ? void 0 : _c["deployment-callable"]) === "true") {
+    else if (gcfFunction.labels?.["deployment-callable"] === "true") {
         trigger = {
             callableTrigger: {},
         };
     }
-    else if ((_d = gcfFunction.labels) === null || _d === void 0 ? void 0 : _d[constants_1.BLOCKING_LABEL]) {
+    else if (gcfFunction.labels?.["deployment-fdcgraphql"] === "true") {
+        trigger = {
+            dataConnectGraphqlTrigger: {},
+        };
+    }
+    else if (gcfFunction.labels?.[constants_1.BLOCKING_LABEL]) {
         trigger = {
             blockingTrigger: {
                 eventType: constants_1.BLOCKING_LABEL_KEY_TO_EVENT[gcfFunction.labels[constants_1.BLOCKING_LABEL]],
@@ -310,12 +342,19 @@ function endpointFromFunction(gcfFunction) {
     else {
         trigger = { httpsTrigger: {} };
     }
-    if (((_e = gcfFunction.buildConfig) === null || _e === void 0 ? void 0 : _e.runtime) && !supported.isRuntime(gcfFunction.buildConfig.runtime)) {
+    if (gcfFunction.buildConfig?.runtime && !supported.isRuntime(gcfFunction.buildConfig.runtime)) {
         logger_1.logger.debug("GCFv2 function has a deprecated runtime:", JSON.stringify(gcfFunction, null, 2));
     }
-    const endpoint = Object.assign(Object.assign({ platform: "gcfv2", id,
+    const endpoint = {
+        platform: "gcfv2",
+        id,
         project,
-        region }, trigger), { entryPoint: ((_f = gcfFunction.buildConfig) === null || _f === void 0 ? void 0 : _f.entryPoint) || "", runtime: ((_g = gcfFunction.buildConfig) === null || _g === void 0 ? void 0 : _g.runtime) || undefined, source: (_h = gcfFunction.buildConfig) === null || _h === void 0 ? void 0 : _h.source });
+        region,
+        ...trigger,
+        entryPoint: gcfFunction.buildConfig?.entryPoint || "",
+        runtime: gcfFunction.buildConfig?.runtime || undefined,
+        source: gcfFunction.buildConfig?.source,
+    };
     if (gcfFunction.serviceConfig) {
         proto.copyIfPresent(endpoint, gcfFunction.serviceConfig, "ingressSettings", "environmentVariables", "secretEnvironmentVariables", "timeoutSeconds", "uri");
         proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "serviceAccount", "serviceAccountEmail");
@@ -355,11 +394,10 @@ function endpointFromFunction(gcfFunction) {
         }
     }
     proto.renameIfPresent(endpoint, gcfFunction, "uri", "url");
-    endpoint.codebase = ((_j = gcfFunction.labels) === null || _j === void 0 ? void 0 : _j[constants_1.CODEBASE_LABEL]) || projectConfig.DEFAULT_CODEBASE;
-    if ((_k = gcfFunction.labels) === null || _k === void 0 ? void 0 : _k[constants_1.HASH_LABEL]) {
+    endpoint.codebase = gcfFunction.labels?.[constants_1.CODEBASE_LABEL] || projectConfig.DEFAULT_CODEBASE;
+    if (gcfFunction.labels?.[constants_1.HASH_LABEL]) {
         endpoint.hash = gcfFunction.labels[constants_1.HASH_LABEL];
     }
     proto.copyIfPresent(endpoint, gcfFunction, "state");
     return endpoint;
 }
-exports.endpointFromFunction = endpointFromFunction;

package/lib/gcp/cloudlogging.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.listEntries = void 0;
+exports.listEntries = listEntries;
 const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
 const API_VERSION = "v2";
 async function listEntries(projectId, filter, pageSize, order, pageToken) {
-    var _a;
     const client = new apiv2_1.Client({ urlPrefix: (0, api_1.cloudloggingOrigin)(), apiVersion: API_VERSION });
     const body = {
         resourceNames: [`projects/${projectId}`],
@@ -20,7 +19,7 @@ async function listEntries(projectId, filter, pageSize, order, pageToken) {
     try {
         const result = await client.post("/entries:list", body);
         return {
-            entries: (_a = result.body.entries) !== null && _a !== void 0 ? _a : [],
+            entries: result.body.entries ?? [],
             nextPageToken: result.body.nextPageToken,
         };
     }
@@ -30,4 +29,3 @@ async function listEntries(projectId, filter, pageSize, order, pageToken) {
         });
     }
 }
-exports.listEntries = listEntries;

package/lib/gcp/cloudmonitoring.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.queryTimeSeries = exports.ValueType = exports.Reducer = exports.MetricKind = exports.Aligner = exports.TimeSeriesView = exports.CLOUD_MONITORING_VERSION = void 0;
+exports.ValueType = exports.Reducer = exports.MetricKind = exports.Aligner = exports.TimeSeriesView = exports.CLOUD_MONITORING_VERSION = void 0;
+exports.queryTimeSeries = queryTimeSeries;
 const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
@@ -9,7 +10,7 @@ var TimeSeriesView;
 (function (TimeSeriesView) {
     TimeSeriesView["FULL"] = "FULL";
     TimeSeriesView["HEADERS"] = "HEADERS";
-})(TimeSeriesView = exports.TimeSeriesView || (exports.TimeSeriesView = {}));
+})(TimeSeriesView || (exports.TimeSeriesView = TimeSeriesView = {}));
 var Aligner;
 (function (Aligner) {
     Aligner["ALIGN_NONE"] = "ALIGN_NONE";
@@ -25,14 +26,14 @@ var Aligner;
     Aligner["ALIGN_STDDEV"] = "ALIGN_STDDEV";
     Aligner["ALIGN_COUNT_TRUE"] = "ALIGN_COUNT_TRUE";
     Aligner["ALIGN_FRACTION_TRUE"] = "ALIGN_FRACTION_TRUE";
-})(Aligner = exports.Aligner || (exports.Aligner = {}));
+})(Aligner || (exports.Aligner = Aligner = {}));
 var MetricKind;
 (function (MetricKind) {
     MetricKind["METRIC_KIND_UNSPECIFIED"] = "METRIC_KIND_UNSPECIFIED";
     MetricKind["GAUGE"] = "GAUGE";
     MetricKind["DELTA"] = "DELTA";
     MetricKind["CUMULATIVE"] = "CUMULATIVE";
-})(MetricKind = exports.MetricKind || (exports.MetricKind = {}));
+})(MetricKind || (exports.MetricKind = MetricKind = {}));
 var Reducer;
 (function (Reducer) {
     Reducer["REDUCE_NONE"] = "REDUCE_NONE";
@@ -48,7 +49,7 @@ var Reducer;
     Reducer["REDUCE_PERCENTILE_95"] = "REDUCE_PERCENTILE_95";
     Reducer["REDUCE_PERCENTILE_50"] = "REDUCE_PERCENTILE_50";
     Reducer["REDUCE_PERCENTILE_05"] = "REDUCE_PERCENTILE_05";
-})(Reducer = exports.Reducer || (exports.Reducer = {}));
+})(Reducer || (exports.Reducer = Reducer = {}));
 var ValueType;
 (function (ValueType) {
     ValueType["VALUE_TYPE_UNSPECIFIED"] = "VALUE_TYPE_UNSPECIFIED";
@@ -56,7 +57,7 @@ var ValueType;
     ValueType["INT64"] = "INT64";
     ValueType["DOUBLE"] = "DOUBLE";
     ValueType["STRING"] = "STRING";
-})(ValueType = exports.ValueType || (exports.ValueType = {}));
+})(ValueType || (exports.ValueType = ValueType = {}));
 async function queryTimeSeries(query, project) {
     const client = new apiv2_1.Client({
         urlPrefix: (0, api_1.cloudMonitoringOrigin)(),
@@ -74,4 +75,3 @@ async function queryTimeSeries(query, project) {
         });
     }
 }
-exports.queryTimeSeries = queryTimeSeries;

package/lib/gcp/cloudscheduler.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jobFromEndpoint = exports.topicNameForEndpoint = exports.jobNameForEndpoint = exports.createOrReplaceJob = exports.getJob = exports.deleteJob = void 0;
+exports.deleteJob = deleteJob;
+exports.getJob = getJob;
+exports.createOrReplaceJob = createOrReplaceJob;
+exports.jobNameForEndpoint = jobNameForEndpoint;
+exports.topicNameForEndpoint = topicNameForEndpoint;
+exports.jobFromEndpoint = jobFromEndpoint;
 const _ = require("lodash");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
@@ -18,29 +23,28 @@ const apiClient = new apiv2_1.Client({ urlPrefix: (0, api_1.cloudschedulerOrigin
 function createJob(job) {
     const strippedName = job.name.substring(0, job.name.lastIndexOf("/"));
     const json = job.pubsubTarget
-        ? Object.assign({ timeZone: DEFAULT_TIME_ZONE_V1 }, job) : Object.assign({ timeZone: DEFAULT_TIME_ZONE_V2 }, job);
+        ? { timeZone: DEFAULT_TIME_ZONE_V1, ...job }
+        : { timeZone: DEFAULT_TIME_ZONE_V2, ...job };
     return apiClient.post(`/${strippedName}`, json);
 }
 function deleteJob(name) {
     return apiClient.delete(`/${name}`);
 }
-exports.deleteJob = deleteJob;
 function getJob(name) {
     return apiClient.get(`/${name}`, {
         resolveOnHTTPError: true,
     });
 }
-exports.getJob = getJob;
 function updateJob(job) {
     let fieldMasks;
     let json;
     if (job.pubsubTarget) {
         fieldMasks = proto.fieldMasks(job, "pubsubTarget");
-        json = Object.assign({ timeZone: DEFAULT_TIME_ZONE_V1 }, job);
+        json = { timeZone: DEFAULT_TIME_ZONE_V1, ...job };
     }
     else {
         fieldMasks = proto.fieldMasks(job, "httpTarget");
-        json = Object.assign({ timeZone: DEFAULT_TIME_ZONE_V2 }, job);
+        json = { timeZone: DEFAULT_TIME_ZONE_V2, ...job };
     }
     return apiClient.patch(`/${job.name}`, json, {
         queryParams: {
@@ -49,7 +53,6 @@ function updateJob(job) {
     });
 }
 async function createOrReplaceJob(job) {
-    var _a, _b;
     const jobName = job.name.split("/").pop();
     const existingJob = await getJob(job.name);
     if (existingJob.status === 404) {
@@ -58,7 +61,7 @@ async function createOrReplaceJob(job) {
             newJob = await createJob(job);
         }
         catch (err) {
-            if (((_b = (_a = err === null || err === void 0 ? void 0 : err.context) === null || _a === void 0 ? void 0 : _a.response) === null || _b === void 0 ? void 0 : _b.statusCode) === 404) {
+            if (err?.context?.response?.statusCode === 404) {
                 throw new error_1.FirebaseError(`Cloud resource location is not set for this project but scheduled functions require it. ` +
                     `Please see this documentation for more details: https://firebase.google.com/docs/projects/locations.`);
             }
@@ -78,7 +81,6 @@ async function createOrReplaceJob(job) {
     logger_1.logger.debug(`updated scheduler job ${jobName}`);
     return updatedJob;
 }
-exports.createOrReplaceJob = createOrReplaceJob;
 function needUpdate(existingJob, newJob) {
     if (!existingJob) {
         return true;
@@ -109,14 +111,11 @@ function jobNameForEndpoint(endpoint, location) {
     const id = backend.scheduleIdForFunction(endpoint);
     return `projects/${endpoint.project}/locations/${location}/jobs/${id}`;
 }
-exports.jobNameForEndpoint = jobNameForEndpoint;
 function topicNameForEndpoint(endpoint) {
     const id = backend.scheduleIdForFunction(endpoint);
     return `projects/${endpoint.project}/topics/${id}`;
 }
-exports.topicNameForEndpoint = topicNameForEndpoint;
 async function jobFromEndpoint(endpoint, location, projectNumber) {
-    var _a;
     const job = {};
     job.name = jobNameForEndpoint(endpoint, location);
     if (endpoint.platform === "gcfv1") {
@@ -134,7 +133,7 @@ async function jobFromEndpoint(endpoint, location, projectNumber) {
             uri: endpoint.uri,
             httpMethod: "POST",
             oidcToken: {
-                serviceAccountEmail: (_a = endpoint.serviceAccount) !== null && _a !== void 0 ? _a : (await gce.getDefaultServiceAccount(projectNumber)),
+                serviceAccountEmail: endpoint.serviceAccount ?? (await gce.getDefaultServiceAccount(projectNumber)),
             },
         };
     }
@@ -166,4 +165,3 @@ async function jobFromEndpoint(endpoint, location, projectNumber) {
     }
     return job;
 }
-exports.jobFromEndpoint = jobFromEndpoint;

package/lib/gcp/cloudsql/cloudsqladmin.js

@@ -1,6 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.listUsers = exports.deleteUser = exports.getUser = exports.createUser = exports.deleteDatabase = exports.createDatabase = exports.getDatabase = exports.listDatabases = exports.updateInstanceForDataConnect = exports.createInstance = exports.DEFAULT_DATABASE_VERSION = exports.instanceConsoleLink = exports.getInstance = exports.listInstances = exports.iamUserIsCSQLAdmin = void 0;
+exports.DEFAULT_DATABASE_VERSION = void 0;
+exports.iamUserIsCSQLAdmin = iamUserIsCSQLAdmin;
+exports.listInstances = listInstances;
+exports.getInstance = getInstance;
+exports.instanceConsoleLink = instanceConsoleLink;
+exports.createInstance = createInstance;
+exports.updateInstanceForDataConnect = updateInstanceForDataConnect;
+exports.listDatabases = listDatabases;
+exports.getDatabase = getDatabase;
+exports.createDatabase = createDatabase;
+exports.deleteDatabase = deleteDatabase;
+exports.createUser = createUser;
+exports.getUser = getUser;
+exports.deleteUser = deleteUser;
+exports.listUsers = listUsers;
 const apiv2_1 = require("../../apiv2");
 const api_1 = require("../../api");
 const clc = require("colorette");
@@ -32,13 +46,10 @@ async function iamUserIsCSQLAdmin(options) {
         return false;
     }
 }
-exports.iamUserIsCSQLAdmin = iamUserIsCSQLAdmin;
 async function listInstances(projectId) {
-    var _a;
     const res = await client.get(`projects/${projectId}/instances`);
-    return (_a = res.body.items) !== null && _a !== void 0 ? _a : [];
+    return res.body.items ?? [];
 }
-exports.listInstances = listInstances;
 async function getInstance(projectId, instanceId) {
     const res = await client.get(`projects/${projectId}/instances/${instanceId}`);
     if (res.body.state === "FAILED") {
@@ -46,11 +57,9 @@ async function getInstance(projectId, instanceId) {
     }
     return res.body;
 }
-exports.getInstance = getInstance;
 function instanceConsoleLink(projectId, instanceId) {
     return `https://console.cloud.google.com/sql/instances/${instanceId}/overview?project=${projectId}`;
 }
-exports.instanceConsoleLink = instanceConsoleLink;
 exports.DEFAULT_DATABASE_VERSION = "POSTGRES_17";
 async function createInstance(args) {
     const databaseFlags = [{ name: "cloudsql.iam_authentication", value: "on" }];
@@ -86,9 +95,7 @@ async function createInstance(args) {
         throw err;
     }
 }
-exports.createInstance = createInstance;
 async function updateInstanceForDataConnect(instance, enableGoogleMlIntegration) {
-    var _a, _b;
     let dbFlags = setDatabaseFlag({ name: "cloudsql.iam_authentication", value: "on" }, instance.settings.databaseFlags);
     if (enableGoogleMlIntegration) {
         dbFlags = setDatabaseFlag({ name: "cloudsql.enable_google_ml_integration", value: "on" }, dbFlags);
@@ -96,7 +103,7 @@ async function updateInstanceForDataConnect(instance, enableGoogleMlIntegration)
     const op = await client.patch(`projects/${instance.project}/instances/${instance.name}`, {
         settings: {
             ipConfiguration: {
-                enablePrivatePathForGoogleCloudServices: !!((_b = (_a = instance === null || instance === void 0 ? void 0 : instance.settings) === null || _a === void 0 ? void 0 : _a.ipConfiguration) === null || _b === void 0 ? void 0 : _b.privateNetwork),
+                enablePrivatePathForGoogleCloudServices: !!instance?.settings?.ipConfiguration?.privateNetwork,
             },
             databaseFlags: dbFlags,
             enableGoogleMlIntegration,
@@ -112,7 +119,6 @@ async function updateInstanceForDataConnect(instance, enableGoogleMlIntegration)
     });
     return pollRes;
 }
-exports.updateInstanceForDataConnect = updateInstanceForDataConnect;
 function handleAllowlistError(err, region) {
     if (err.message.includes("Not allowed to set system label: firebase-data-connect")) {
         throw new error_1.FirebaseError(`Cloud SQL free trial instances are not yet available in ${region}. Please check https://firebase.google.com/docs/data-connect/ for a full list of available regions.`);
@@ -127,12 +133,10 @@ async function listDatabases(projectId, instanceId) {
     const res = await client.get(`projects/${projectId}/instances/${instanceId}/databases`);
     return res.body.items;
 }
-exports.listDatabases = listDatabases;
 async function getDatabase(projectId, instanceId, databaseId) {
     const res = await client.get(`projects/${projectId}/instances/${instanceId}/databases/${databaseId}`);
     return res.body;
 }
-exports.getDatabase = getDatabase;
 async function createDatabase(projectId, instanceId, databaseId) {
     const op = await client.post(`projects/${projectId}/instances/${instanceId}/databases`, {
         project: projectId,
@@ -148,12 +152,10 @@ async function createDatabase(projectId, instanceId, databaseId) {
     });
     return pollRes;
 }
-exports.createDatabase = createDatabase;
 async function deleteDatabase(projectId, instanceId, databaseId) {
     const res = await client.delete(`projects/${projectId}/instances/${instanceId}/databases/${databaseId}`);
     return res.body;
 }
-exports.deleteDatabase = deleteDatabase;
 async function createUser(projectId, instanceId, type, username, password, retryTimeout) {
     const maxRetries = 3;
     let retries = 0;
@@ -183,7 +185,7 @@ async function createUser(projectId, instanceId, type, username, password, retry
             if (builtinRoleNotReady(err.message) && retries < maxRetries) {
                 retries++;
                 await new Promise((resolve) => {
-                    setTimeout(resolve, retryTimeout !== null && retryTimeout !== void 0 ? retryTimeout : 1000 * retries);
+                    setTimeout(resolve, retryTimeout ?? 1000 * retries);
                 });
             }
             else {
@@ -192,7 +194,6 @@ async function createUser(projectId, instanceId, type, username, password, retry
         }
     }
 }
-exports.createUser = createUser;
 function builtinRoleNotReady(message) {
     return message.includes("cloudsqliamuser");
 }
@@ -200,7 +201,6 @@ async function getUser(projectId, instanceId, username) {
     const res = await client.get(`projects/${projectId}/instances/${instanceId}/users/${username}`);
     return res.body;
 }
-exports.getUser = getUser;
 async function deleteUser(projectId, instanceId, username) {
     const res = await client.delete(`projects/${projectId}/instances/${instanceId}/users`, {
         queryParams: {
@@ -209,9 +209,7 @@ async function deleteUser(projectId, instanceId, username) {
     });
     return res.body;
 }
-exports.deleteUser = deleteUser;
 async function listUsers(projectId, instanceId) {
     const res = await client.get(`projects/${projectId}/instances/${instanceId}/users`);
     return res.body.items;
 }
-exports.listUsers = listUsers;