firebase-tools 15.1.0 → 15.2.0

package/lib/gcp/cloudbilling.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.listBillingAccounts = exports.setBillingAccount = exports.checkBillingEnabled = exports.isBillingEnabled = void 0;
+exports.isBillingEnabled = isBillingEnabled;
+exports.checkBillingEnabled = checkBillingEnabled;
+exports.setBillingAccount = setBillingAccount;
+exports.listBillingAccounts = listBillingAccounts;
 const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
 const utils = require("../utils");
@@ -16,21 +19,17 @@ async function isBillingEnabled(setup) {
     setup.isBillingEnabled = await checkBillingEnabled(setup.projectId);
     return setup.isBillingEnabled;
 }
-exports.isBillingEnabled = isBillingEnabled;
 async function checkBillingEnabled(projectId) {
     const res = await client.get(utils.endpoint(["projects", projectId, "billingInfo"]), { retryCodes: [500, 503] });
     return res.body.billingEnabled;
 }
-exports.checkBillingEnabled = checkBillingEnabled;
 async function setBillingAccount(projectId, billingAccountName) {
     const res = await client.put(utils.endpoint(["projects", projectId, "billingInfo"]), {
         billingAccountName: billingAccountName,
     }, { retryCodes: [500, 503] });
     return res.body.billingEnabled;
 }
-exports.setBillingAccount = setBillingAccount;
 async function listBillingAccounts() {
     const res = await client.get(utils.endpoint(["billingAccounts"]), { retryCodes: [500, 503] });
     return res.body.billingAccounts || [];
 }
-exports.listBillingAccounts = listBillingAccounts;

package/lib/gcp/cloudbuild.js

@@ -1,6 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaultServiceAgent = exports.getDefaultServiceAccount = exports.deleteRepository = exports.getRepository = exports.createRepository = exports.fetchLinkableRepositories = exports.deleteConnection = exports.listConnections = exports.getConnection = exports.createConnection = void 0;
+exports.createConnection = createConnection;
+exports.getConnection = getConnection;
+exports.listConnections = listConnections;
+exports.deleteConnection = deleteConnection;
+exports.fetchLinkableRepositories = fetchLinkableRepositories;
+exports.createRepository = createRepository;
+exports.getRepository = getRepository;
+exports.deleteRepository = deleteRepository;
+exports.getDefaultServiceAccount = getDefaultServiceAccount;
+exports.getDefaultServiceAgent = getDefaultServiceAgent;
 const apiv2_1 = require("../apiv2");
 const api_1 = require("../api");
 const PAGE_SIZE_MAX = 100;
@@ -13,13 +22,11 @@ async function createConnection(projectId, location, connectionId, githubConfig
     const res = await client.post(`projects/${projectId}/locations/${location}/connections`, { githubConfig }, { queryParams: { connectionId } });
     return res.body;
 }
-exports.createConnection = createConnection;
 async function getConnection(projectId, location, connectionId) {
     const name = `projects/${projectId}/locations/${location}/connections/${connectionId}`;
     const res = await client.get(name);
     return res.body;
 }
-exports.getConnection = getConnection;
 async function listConnections(projectId, location) {
     const conns = [];
     const getNextPage = async (pageToken = "") => {
@@ -39,13 +46,11 @@ async function listConnections(projectId, location) {
     await getNextPage();
     return conns;
 }
-exports.listConnections = listConnections;
 async function deleteConnection(projectId, location, connectionId) {
     const name = `projects/${projectId}/locations/${location}/connections/${connectionId}`;
     const res = await client.delete(name);
     return res.body;
 }
-exports.deleteConnection = deleteConnection;
 async function fetchLinkableRepositories(projectId, location, connectionId, pageToken = "", pageSize = 1000) {
     const name = `projects/${projectId}/locations/${location}/connections/${connectionId}:fetchLinkableRepositories`;
     const res = await client.get(name, {
@@ -56,29 +61,23 @@ async function fetchLinkableRepositories(projectId, location, connectionId, page
     });
     return res.body;
 }
-exports.fetchLinkableRepositories = fetchLinkableRepositories;
 async function createRepository(projectId, location, connectionId, repositoryId, remoteUri) {
     const res = await client.post(`projects/${projectId}/locations/${location}/connections/${connectionId}/repositories`, { remoteUri }, { queryParams: { repositoryId } });
     return res.body;
 }
-exports.createRepository = createRepository;
 async function getRepository(projectId, location, connectionId, repositoryId) {
     const name = `projects/${projectId}/locations/${location}/connections/${connectionId}/repositories/${repositoryId}`;
     const res = await client.get(name);
     return res.body;
 }
-exports.getRepository = getRepository;
 async function deleteRepository(projectId, location, connectionId, repositoryId) {
     const name = `projects/${projectId}/locations/${location}/connections/${connectionId}/repositories/${repositoryId}`;
     const res = await client.delete(name);
     return res.body;
 }
-exports.deleteRepository = deleteRepository;
 function getDefaultServiceAccount(projectNumber) {
     return `${projectNumber}@cloudbuild.gserviceaccount.com`;
 }
-exports.getDefaultServiceAccount = getDefaultServiceAccount;
 function getDefaultServiceAgent(projectNumber) {
     return `service-${projectNumber}@gcp-sa-cloudbuild.iam.gserviceaccount.com`;
 }
-exports.getDefaultServiceAgent = getDefaultServiceAgent;

package/lib/gcp/cloudfunctions.js

@@ -1,6 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.functionFromEndpoint = exports.endpointFromFunction = exports.listAllFunctions = exports.deleteFunction = exports.updateFunction = exports.setInvokerUpdate = exports.setInvokerCreate = exports.getIamPolicy = exports.setIamPolicy = exports.createFunction = exports.generateUploadUrl = exports.captureRuntimeValidationError = exports.API_VERSION = void 0;
+exports.API_VERSION = void 0;
+exports.captureRuntimeValidationError = captureRuntimeValidationError;
+exports.generateUploadUrl = generateUploadUrl;
+exports.createFunction = createFunction;
+exports.setIamPolicy = setIamPolicy;
+exports.getIamPolicy = getIamPolicy;
+exports.setInvokerCreate = setInvokerCreate;
+exports.setInvokerUpdate = setInvokerUpdate;
+exports.updateFunction = updateFunction;
+exports.deleteFunction = deleteFunction;
+exports.listAllFunctions = listAllFunctions;
+exports.endpointFromFunction = endpointFromFunction;
+exports.functionFromEndpoint = functionFromEndpoint;
 const clc = require("colorette");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
@@ -23,14 +35,12 @@ function captureRuntimeValidationError(errMessage) {
     }
     return "invalid runtime detected, please see https://cloud.google.com/functions/docs/runtime-support for the latest supported runtimes";
 }
-exports.captureRuntimeValidationError = captureRuntimeValidationError;
 function functionsOpLogReject(funcName, type, err) {
-    var _a, _b, _c, _d;
-    if ((err === null || err === void 0 ? void 0 : err.message).includes("Runtime validation errors")) {
+    if ((err?.message).includes("Runtime validation errors")) {
         const capturedMessage = captureRuntimeValidationError(err.message);
         utils.logWarning(clc.bold(clc.yellow("functions:")) + " " + capturedMessage + " for function " + funcName);
     }
-    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) === 429) {
+    if (err?.context?.response?.statusCode === 429) {
         utils.logWarning(`${clc.bold(clc.yellow("functions:"))} got "Quota Exceeded" error while trying to ${type} ${funcName}. Waiting to retry...`);
     }
     else {
@@ -38,7 +48,7 @@ function functionsOpLogReject(funcName, type, err) {
     }
     throw new error_1.FirebaseError(`Failed to ${type} function ${funcName}`, {
         original: err,
-        status: (_d = (_c = err === null || err === void 0 ? void 0 : err.context) === null || _c === void 0 ? void 0 : _c.response) === null || _d === void 0 ? void 0 : _d.statusCode,
+        status: err?.context?.response?.statusCode,
         context: { function: funcName },
     });
 }
@@ -54,11 +64,13 @@ async function generateUploadUrl(projectId, location) {
         throw err;
     }
 }
-exports.generateUploadUrl = generateUploadUrl;
 async function createFunction(cloudFunction) {
     const apiPath = cloudFunction.name.substring(0, cloudFunction.name.lastIndexOf("/"));
     const endpoint = `/${apiPath}`;
-    cloudFunction.buildEnvironmentVariables = Object.assign(Object.assign({}, cloudFunction.buildEnvironmentVariables), { GOOGLE_NODE_RUN_SCRIPTS: "" });
+    cloudFunction.buildEnvironmentVariables = {
+        ...cloudFunction.buildEnvironmentVariables,
+        GOOGLE_NODE_RUN_SCRIPTS: "",
+    };
     try {
         const res = await client.post(endpoint, cloudFunction);
         return {
@@ -71,9 +83,7 @@ async function createFunction(cloudFunction) {
         throw functionsOpLogReject(cloudFunction.name, "create", err);
     }
 }
-exports.createFunction = createFunction;
 async function setIamPolicy(options) {
-    var _a, _b;
     const endpoint = `/${options.name}:setIamPolicy`;
     try {
         await client.post(endpoint, {
@@ -84,11 +94,10 @@ async function setIamPolicy(options) {
     catch (err) {
         throw new error_1.FirebaseError(`Failed to set the IAM Policy on the function ${options.name}`, {
             original: err,
-            status: (_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,
+            status: err?.context?.response?.statusCode,
         });
     }
 }
-exports.setIamPolicy = setIamPolicy;
 async function getIamPolicy(fnName) {
     const endpoint = `/${fnName}:getIamPolicy`;
     try {
@@ -101,7 +110,6 @@ async function getIamPolicy(fnName) {
         });
     }
 }
-exports.getIamPolicy = getIamPolicy;
 async function setInvokerCreate(projectId, fnName, invoker) {
     if (invoker.length === 0) {
         throw new error_1.FirebaseError("Invoker cannot be an empty array");
@@ -116,16 +124,14 @@ async function setInvokerCreate(projectId, fnName, invoker) {
     };
     await setIamPolicy({ name: fnName, policy: policy });
 }
-exports.setInvokerCreate = setInvokerCreate;
 async function setInvokerUpdate(projectId, fnName, invoker) {
-    var _a;
     if (invoker.length === 0) {
         throw new error_1.FirebaseError("Invoker cannot be an empty array");
     }
     const invokerMembers = proto.getInvokerMembers(invoker, projectId);
     const invokerRole = "roles/cloudfunctions.invoker";
     const currentPolicy = await getIamPolicy(fnName);
-    const currentInvokerBinding = (_a = currentPolicy.bindings) === null || _a === void 0 ? void 0 : _a.find((binding) => binding.role === invokerRole);
+    const currentInvokerBinding = currentPolicy.bindings?.find((binding) => binding.role === invokerRole);
     if (currentInvokerBinding &&
         JSON.stringify(currentInvokerBinding.members.sort()) === JSON.stringify(invokerMembers.sort())) {
         return;
@@ -142,10 +148,12 @@ async function setInvokerUpdate(projectId, fnName, invoker) {
     };
     await setIamPolicy({ name: fnName, policy: policy });
 }
-exports.setInvokerUpdate = setInvokerUpdate;
 async function updateFunction(cloudFunction) {
     const endpoint = `/${cloudFunction.name}`;
-    cloudFunction.buildEnvironmentVariables = Object.assign(Object.assign({}, cloudFunction.buildEnvironmentVariables), { GOOGLE_NODE_RUN_SCRIPTS: "" });
+    cloudFunction.buildEnvironmentVariables = {
+        ...cloudFunction.buildEnvironmentVariables,
+        GOOGLE_NODE_RUN_SCRIPTS: "",
+    };
     const fieldMasks = proto.fieldMasks(cloudFunction, "labels", "environmentVariables", "secretEnvironmentVariables", "buildEnvironmentVariables");
     try {
         const res = await client.patch(endpoint, cloudFunction, {
@@ -163,7 +171,6 @@ async function updateFunction(cloudFunction) {
         throw functionsOpLogReject(cloudFunction.name, "update", err);
     }
 }
-exports.updateFunction = updateFunction;
 async function deleteFunction(name) {
     const endpoint = `/${name}`;
     try {
@@ -178,7 +185,6 @@ async function deleteFunction(name) {
         throw functionsOpLogReject(name, "delete", err);
     }
 }
-exports.deleteFunction = deleteFunction;
 async function list(projectId, region) {
     const endpoint = "/projects/" + projectId + "/locations/" + region + "/functions";
     try {
@@ -193,7 +199,7 @@ async function list(projectId, region) {
     }
     catch (err) {
         logger_1.logger.debug(`[functions] failed to list functions for ${projectId}`);
-        logger_1.logger.debug(`[functions] ${err === null || err === void 0 ? void 0 : err.message}`);
+        logger_1.logger.debug(`[functions] ${err?.message}`);
         throw new error_1.FirebaseError(`Failed to list functions for ${projectId}`, {
             original: err,
             status: err instanceof error_1.FirebaseError ? err.status : undefined,
@@ -203,30 +209,28 @@ async function list(projectId, region) {
 async function listAllFunctions(projectId) {
     return list(projectId, "-");
 }
-exports.listAllFunctions = listAllFunctions;
 function endpointFromFunction(gcfFunction) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
     const [, project, , region, , id] = gcfFunction.name.split("/");
     let trigger;
     let uri;
     let securityLevel;
-    if ((_a = gcfFunction.labels) === null || _a === void 0 ? void 0 : _a["deployment-scheduled"]) {
+    if (gcfFunction.labels?.["deployment-scheduled"]) {
         trigger = {
             scheduleTrigger: {},
         };
     }
-    else if ((_b = gcfFunction.labels) === null || _b === void 0 ? void 0 : _b["deployment-taskqueue"]) {
+    else if (gcfFunction.labels?.["deployment-taskqueue"]) {
         trigger = {
             taskQueueTrigger: {},
         };
     }
-    else if (((_c = gcfFunction.labels) === null || _c === void 0 ? void 0 : _c["deployment-callable"]) ||
-        ((_d = gcfFunction.labels) === null || _d === void 0 ? void 0 : _d["deployment-callabled"])) {
+    else if (gcfFunction.labels?.["deployment-callable"] ||
+        gcfFunction.labels?.["deployment-callabled"]) {
         trigger = {
             callableTrigger: {},
         };
     }
-    else if ((_e = gcfFunction.labels) === null || _e === void 0 ? void 0 : _e[constants_1.BLOCKING_LABEL]) {
+    else if (gcfFunction.labels?.[constants_1.BLOCKING_LABEL]) {
         trigger = {
             blockingTrigger: {
                 eventType: constants_1.BLOCKING_LABEL_KEY_TO_EVENT[gcfFunction.labels[constants_1.BLOCKING_LABEL]],
@@ -241,7 +245,7 @@ function endpointFromFunction(gcfFunction) {
             eventTrigger: {
                 eventType: gcfFunction.eventTrigger.eventType,
                 eventFilters: { resource: gcfFunction.eventTrigger.resource },
-                retry: !!((_f = gcfFunction.eventTrigger.failurePolicy) === null || _f === void 0 ? void 0 : _f.retry),
+                retry: !!gcfFunction.eventTrigger.failurePolicy?.retry,
             },
         };
     }
@@ -252,9 +256,15 @@ function endpointFromFunction(gcfFunction) {
     if (!supported.isRuntime(gcfFunction.runtime)) {
         logger_1.logger.debug("GCF 1st gen function has unsupported runtime:", JSON.stringify(gcfFunction, null, 2));
     }
-    const endpoint = Object.assign(Object.assign({ platform: "gcfv1", id,
+    const endpoint = {
+        platform: "gcfv1",
+        id,
         project,
-        region }, trigger), { entryPoint: gcfFunction.entryPoint, runtime: gcfFunction.runtime });
+        region,
+        ...trigger,
+        entryPoint: gcfFunction.entryPoint,
+        runtime: gcfFunction.runtime,
+    };
     if (uri) {
         endpoint.uri = uri;
     }
@@ -269,8 +279,8 @@ function endpointFromFunction(gcfFunction) {
         endpoint.vpc = { connector: gcfFunction.vpcConnector };
         proto.convertIfPresent(endpoint.vpc, gcfFunction, "egressSettings", "vpcConnectorEgressSettings", (raw) => raw);
     }
-    endpoint.codebase = ((_g = gcfFunction.labels) === null || _g === void 0 ? void 0 : _g[constants_1.CODEBASE_LABEL]) || projectConfig.DEFAULT_CODEBASE;
-    if ((_h = gcfFunction.labels) === null || _h === void 0 ? void 0 : _h[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.convertIfPresent(endpoint, gcfFunction, "state", "status", (status) => {
@@ -290,9 +300,7 @@ function endpointFromFunction(gcfFunction) {
     });
     return endpoint;
 }
-exports.endpointFromFunction = endpointFromFunction;
 function functionFromEndpoint(endpoint, sourceUploadUrl) {
-    var _a, _b;
     if (endpoint.platform !== "gcfv1") {
         throw new error_1.FirebaseError("Trying to create a v1 CloudFunction with v2 API. This should never happen");
     }
@@ -308,10 +316,10 @@ function functionFromEndpoint(endpoint, sourceUploadUrl) {
         dockerRegistry: "ARTIFACT_REGISTRY",
     };
     if (typeof endpoint.labels !== "undefined") {
-        gcfFunction.labels = Object.assign({}, endpoint.labels);
+        gcfFunction.labels = { ...endpoint.labels };
     }
     if (backend.isEventTriggered(endpoint)) {
-        if (!((_a = endpoint.eventTrigger.eventFilters) === null || _a === void 0 ? void 0 : _a.resource)) {
+        if (!endpoint.eventTrigger.eventFilters?.resource) {
             throw new error_1.FirebaseError("Cannot create v1 function from an eventTrigger without a resource");
         }
         gcfFunction.eventTrigger = {
@@ -328,20 +336,23 @@ function functionFromEndpoint(endpoint, sourceUploadUrl) {
             eventType: "google.pubsub.topic.publish",
             resource: `projects/${endpoint.project}/topics/${id}`,
         };
-        gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { "deployment-scheduled": "true" });
+        gcfFunction.labels = { ...gcfFunction.labels, "deployment-scheduled": "true" };
     }
     else if (backend.isTaskQueueTriggered(endpoint)) {
         gcfFunction.httpsTrigger = {};
-        gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { "deployment-taskqueue": "true" });
+        gcfFunction.labels = { ...gcfFunction.labels, "deployment-taskqueue": "true" };
     }
     else if (backend.isBlockingTriggered(endpoint)) {
         gcfFunction.httpsTrigger = {};
-        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],
+        };
     }
     else {
         gcfFunction.httpsTrigger = {};
         if (backend.isCallableTriggered(endpoint)) {
-            gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { "deployment-callable": "true" });
+            gcfFunction.labels = { ...gcfFunction.labels, "deployment-callable": "true" };
         }
         if (endpoint.securityLevel) {
             gcfFunction.httpsTrigger.securityLevel = endpoint.securityLevel;
@@ -361,14 +372,19 @@ function functionFromEndpoint(endpoint, sourceUploadUrl) {
     }
     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 {
-        (_b = gcfFunction.labels) === null || _b === void 0 ? true : delete _b[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;