firebase-tools 11.4.0 → 11.5.0

package/lib/functions/env.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadFirebaseEnvs = exports.loadUserEnvs = exports.writeUserEnvs = exports.hasUserEnvs = exports.parseStrict = exports.validateKey = exports.KeyValidationError = exports.parse = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const fs = require("fs");
 const path = require("path");
 const error_1 = require("../error");
@@ -173,7 +173,7 @@ function writeUserEnvs(toWrite, envOpts) {
         }
     }
     const mostSpecificEnv = path.join(functionsSource, envFiles[envFiles.length - 1]);
-    (0, utils_1.logBullet)(clc.cyan.bold("functions: ") + `Writing new parameter values to disk: ${mostSpecificEnv}`);
+    (0, utils_1.logBullet)(clc.cyan(clc.bold("functions: ")) + `Writing new parameter values to disk: ${mostSpecificEnv}`);
     for (const k of Object.keys(toWrite)) {
         fs.appendFileSync(mostSpecificEnv, formatUserEnvForWrite(k, toWrite[k]));
     }
@@ -219,7 +219,7 @@ function loadUserEnvs({ functionsSource, projectId, projectAlias, isEmulator, })
             });
         }
     }
-    (0, utils_1.logBullet)(clc.cyan.bold("functions: ") + `Loaded environment variables from ${envFiles.join(", ")}.`);
+    (0, utils_1.logBullet)(clc.cyan(clc.bold("functions: ")) + `Loaded environment variables from ${envFiles.join(", ")}.`);
     return envs;
 }
 exports.loadUserEnvs = loadUserEnvs;

package/lib/functions/runtimeConfigExport.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateDotenvFilename = exports.toDotenvFormat = exports.hydrateEnvs = exports.configToEnv = exports.convertKey = exports.hydrateConfigs = exports.getProjectInfos = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const env = require("./env");
 const functionsConfig = require("../functionsConfig");
 const error_1 = require("../error");

package/lib/functionsConfig.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseUnsetArgs = exports.parseSetArgs = exports.materializeAll = exports.materializeConfig = exports.setVariablesRecursive = exports.getFirebaseConfig = exports.getAppEngineLocation = exports.idsToVarName = exports.varNameToIds = exports.ensureApi = exports.RESERVED_NAMESPACES = void 0;
 const _ = require("lodash");
-const clc = require("cli-color");
+const clc = require("colorette");
 const api_1 = require("./api");
 const apiv2_1 = require("./apiv2");
 const ensureApiEnabled_1 = require("./ensureApiEnabled");

package/lib/functionsConfigClone.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.functionsConfigClone = void 0;
 const _ = require("lodash");
-const clc = require("cli-color");
+const clc = require("colorette");
 const error_1 = require("./error");
 const functionsConfig = require("./functionsConfig");
 const runtimeconfig = require("./gcp/runtimeconfig");

package/lib/functionsShellCommandAction.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.actionFunction = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const repl = require("repl");
 const _ = require("lodash");
 const request = require("request");

package/lib/gcp/cloudfunctions.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.functionFromEndpoint = exports.endpointFromFunction = exports.listAllFunctions = exports.listFunctions = exports.deleteFunction = exports.updateFunction = exports.setInvokerUpdate = exports.setInvokerCreate = exports.getIamPolicy = exports.setIamPolicy = exports.createFunction = exports.generateUploadUrl = exports.BLOCKING_LABEL = exports.CODEBASE_LABEL = exports.API_VERSION = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
 const backend = require("../deploy/functions/backend");
@@ -26,10 +26,10 @@ const BLOCKING_EVENT_TO_LABEL_KEY = {
 function functionsOpLogReject(funcName, type, err) {
     var _a, _b;
     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) {
-        utils.logWarning(`${clc.bold.yellow("functions:")} got "Quota Exceeded" error while trying to ${type} ${funcName}. Waiting to retry...`);
+        utils.logWarning(`${clc.bold(clc.yellow("functions:"))} got "Quota Exceeded" error while trying to ${type} ${funcName}. Waiting to retry...`);
     }
     else {
-        utils.logWarning(clc.bold.yellow("functions:") + " failed to " + type + " function " + funcName);
+        utils.logWarning(clc.bold(clc.yellow("functions:")) + " failed to " + type + " function " + funcName);
     }
     throw new error_1.FirebaseError(`Failed to ${type} function ${funcName}`, {
         original: err,
@@ -255,18 +255,20 @@ function endpointFromFunction(gcfFunction) {
     if (securityLevel) {
         endpoint.securityLevel = securityLevel;
     }
-    proto.copyIfPresent(endpoint, gcfFunction, "serviceAccountEmail", "availableMemoryMb", "minInstances", "maxInstances", "ingressSettings", "labels", "environmentVariables", "secretEnvironmentVariables", "sourceUploadUrl");
-    proto.renameIfPresent(endpoint, gcfFunction, "timeoutSeconds", "timeout", proto.secondsFromDuration);
+    proto.copyIfPresent(endpoint, gcfFunction, "minInstances", "maxInstances", "ingressSettings", "labels", "environmentVariables", "secretEnvironmentVariables", "sourceUploadUrl");
+    proto.renameIfPresent(endpoint, gcfFunction, "serviceAccount", "serviceAccountEmail");
+    proto.convertIfPresent(endpoint, gcfFunction, "availableMemoryMb", (raw) => raw);
+    proto.convertIfPresent(endpoint, gcfFunction, "timeoutSeconds", "timeout", (dur) => dur === null ? null : proto.secondsFromDuration(dur));
     if (gcfFunction.vpcConnector) {
         endpoint.vpc = { connector: gcfFunction.vpcConnector };
-        proto.renameIfPresent(endpoint.vpc, gcfFunction, "egressSettings", "vpcConnectorEgressSettings");
+        proto.convertIfPresent(endpoint.vpc, gcfFunction, "egressSettings", "vpcConnectorEgressSettings", (raw) => raw);
     }
     endpoint.codebase = ((_g = gcfFunction.labels) === null || _g === void 0 ? void 0 : _g[exports.CODEBASE_LABEL]) || projectConfig.DEFAULT_CODEBASE;
     return endpoint;
 }
 exports.endpointFromFunction = endpointFromFunction;
 function functionFromEndpoint(endpoint, sourceUploadUrl) {
-    var _a;
+    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");
     }
@@ -281,8 +283,13 @@ function functionFromEndpoint(endpoint, sourceUploadUrl) {
         runtime: endpoint.runtime,
         dockerRegistry: "ARTIFACT_REGISTRY",
     };
-    proto.copyIfPresent(gcfFunction, endpoint, "labels");
+    if (typeof endpoint.labels !== "undefined") {
+        gcfFunction.labels = Object.assign({}, endpoint.labels);
+    }
     if (backend.isEventTriggered(endpoint)) {
+        if (!((_a = endpoint.eventTrigger.eventFilters) === null || _a === void 0 ? void 0 : _a.resource)) {
+            throw new error_1.FirebaseError("Cannot create v1 function from an eventTrigger without a resource");
+        }
         gcfFunction.eventTrigger = {
             eventType: endpoint.eventTrigger.eventType,
             resource: endpoint.eventTrigger.eventFilters.resource,
@@ -316,18 +323,24 @@ function functionFromEndpoint(endpoint, sourceUploadUrl) {
             gcfFunction.httpsTrigger.securityLevel = endpoint.securityLevel;
         }
     }
-    proto.copyIfPresent(gcfFunction, endpoint, "serviceAccountEmail", "availableMemoryMb", "minInstances", "maxInstances", "ingressSettings", "environmentVariables", "secretEnvironmentVariables");
-    proto.renameIfPresent(gcfFunction, endpoint, "timeout", "timeoutSeconds", proto.durationFromSeconds);
+    proto.copyIfPresent(gcfFunction, endpoint, "minInstances", "maxInstances", "ingressSettings", "environmentVariables", "secretEnvironmentVariables");
+    proto.renameIfPresent(gcfFunction, endpoint, "serviceAccountEmail", "serviceAccount");
+    proto.convertIfPresent(gcfFunction, endpoint, "availableMemoryMb", (mem) => mem);
+    proto.convertIfPresent(gcfFunction, endpoint, "timeout", "timeoutSeconds", (sec) => sec ? proto.durationFromSeconds(sec) : null);
     if (endpoint.vpc) {
         proto.renameIfPresent(gcfFunction, endpoint.vpc, "vpcConnector", "connector");
         proto.renameIfPresent(gcfFunction, endpoint.vpc, "vpcConnectorEgressSettings", "egressSettings");
     }
+    else if (endpoint.vpc === null) {
+        gcfFunction.vpcConnector = null;
+        gcfFunction.vpcConnectorEgressSettings = null;
+    }
     const codebase = endpoint.codebase || projectConfig.DEFAULT_CODEBASE;
     if (codebase !== projectConfig.DEFAULT_CODEBASE) {
         gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { [exports.CODEBASE_LABEL]: codebase });
     }
     else {
-        (_a = gcfFunction.labels) === null || _a === void 0 ? true : delete _a[exports.CODEBASE_LABEL];
+        (_b = gcfFunction.labels) === null || _b === void 0 ? true : delete _b[exports.CODEBASE_LABEL];
     }
     return gcfFunction;
 }

package/lib/gcp/cloudfunctionsv2.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.endpointFromFunction = exports.functionFromEndpoint = exports.deleteFunction = exports.updateFunction = exports.listAllFunctions = exports.listFunctions = exports.getFunction = exports.createFunction = exports.generateUploadUrl = exports.mebibytes = exports.BLOCKING_LABEL = exports.CODEBASE_LABEL = exports.API_VERSION = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
 const api_1 = require("../api");
@@ -59,15 +59,15 @@ function mebibytes(memory) {
 exports.mebibytes = mebibytes;
 function functionsOpLogReject(funcName, type, err) {
     var _a, _b;
-    utils.logWarning(clc.bold.yellow("functions:") + ` ${err === null || err === void 0 ? void 0 : err.message}`);
+    utils.logWarning(clc.bold(clc.yellow("functions:")) + ` ${err === null || err === void 0 ? void 0 : err.message}`);
     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) {
-        utils.logWarning(`${clc.bold.yellow("functions:")} got "Quota Exceeded" error while trying to ${type} ${funcName}. Waiting to retry...`);
+        utils.logWarning(`${clc.bold(clc.yellow("functions:"))} got "Quota Exceeded" error while trying to ${type} ${funcName}. Waiting to retry...`);
     }
     else if (err === null || err === void 0 ? void 0 : 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.logWarning(`${clc.bold.yellow("functions:")} since this is your first time using functions v2, we need a little bit longer to finish setting everything up, please retry the deployment in a few minutes.`);
+        utils.logWarning(`${clc.bold(clc.yellow("functions:"))} since this is your first time using functions v2, we need a little bit longer to finish setting everything up, please retry the deployment in a few minutes.`);
     }
     else {
-        utils.logWarning(clc.bold.yellow("functions:") + " failed to " + type + " function " + funcName);
+        utils.logWarning(clc.bold(clc.yellow("functions:")) + " failed to " + type + " function " + funcName);
     }
     throw new error_1.FirebaseError(`Failed to ${type} function ${funcName}`, {
         original: err,
@@ -161,7 +161,7 @@ async function deleteFunction(cloudFunction) {
 }
 exports.deleteFunction = deleteFunction;
 function functionFromEndpoint(endpoint, source) {
-    var _a;
+    var _a, _b;
     if (endpoint.platform !== "gcfv2") {
         throw new error_1.FirebaseError("Trying to create a v2 CloudFunction with v1 API. This should never happen");
     }
@@ -182,7 +182,8 @@ function functionFromEndpoint(endpoint, source) {
         serviceConfig: {},
     };
     proto.copyIfPresent(gcfFunction, endpoint, "labels");
-    proto.copyIfPresent(gcfFunction.serviceConfig, endpoint, "environmentVariables", "secretEnvironmentVariables", "serviceAccountEmail", "ingressSettings", "timeoutSeconds");
+    proto.copyIfPresent(gcfFunction.serviceConfig, endpoint, "environmentVariables", "secretEnvironmentVariables", "ingressSettings", "timeoutSeconds");
+    proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "serviceAccountEmail", "serviceAccount");
     const mem = endpoint.availableMemoryMb || backend.DEFAULT_MEMORY;
     gcfFunction.serviceConfig.availableMemory = mem > 1024 ? `${mem / 1024}Gi` : `${mem}Mi`;
     proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "minInstanceCount", "minInstances");
@@ -191,11 +192,19 @@ function functionFromEndpoint(endpoint, source) {
         proto.renameIfPresent(gcfFunction.serviceConfig, endpoint.vpc, "vpcConnector", "connector");
         proto.renameIfPresent(gcfFunction.serviceConfig, endpoint.vpc, "vpcConnectorEgressSettings", "egressSettings");
     }
+    else if (endpoint.vpc === null) {
+        gcfFunction.serviceConfig.vpcConnector = null;
+        gcfFunction.serviceConfig.vpcConnectorEgressSettings = null;
+    }
     if (backend.isEventTriggered(endpoint)) {
         gcfFunction.eventTrigger = {
             eventType: endpoint.eventTrigger.eventType,
         };
         if (gcfFunction.eventTrigger.eventType === v2_1.PUBSUB_PUBLISH_EVENT) {
+            if (!((_a = endpoint.eventTrigger.eventFilters) === null || _a === void 0 ? void 0 : _a.topic)) {
+                throw new error_1.FirebaseError("Error: Pub/Sub event trigger is missing topic: " +
+                    JSON.stringify(endpoint.eventTrigger, null, 2));
+            }
             gcfFunction.eventTrigger.pubsubTopic = endpoint.eventTrigger.eventFilters.topic;
             gcfFunction.eventTrigger.eventFilters = [];
             for (const [attribute, value] of Object.entries(endpoint.eventTrigger.eventFilters)) {
@@ -206,7 +215,7 @@ function functionFromEndpoint(endpoint, source) {
         }
         else {
             gcfFunction.eventTrigger.eventFilters = [];
-            for (const [attribute, value] of Object.entries(endpoint.eventTrigger.eventFilters)) {
+            for (const [attribute, value] of Object.entries(endpoint.eventTrigger.eventFilters || {})) {
                 gcfFunction.eventTrigger.eventFilters.push({ attribute, value });
             }
             for (const [attribute, value] of Object.entries(endpoint.eventTrigger.eventFilterPathPatterns || {})) {
@@ -241,7 +250,7 @@ function functionFromEndpoint(endpoint, source) {
         gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { [exports.CODEBASE_LABEL]: codebase });
     }
     else {
-        (_a = gcfFunction.labels) === null || _a === void 0 ? true : delete _a[exports.CODEBASE_LABEL];
+        (_b = gcfFunction.labels) === null || _b === void 0 ? true : delete _b[exports.CODEBASE_LABEL];
     }
     return gcfFunction;
 }
@@ -273,29 +282,33 @@ function endpointFromFunction(gcfFunction) {
         };
     }
     else if (gcfFunction.eventTrigger) {
-        trigger = {
-            eventTrigger: {
-                eventType: gcfFunction.eventTrigger.eventType,
-                eventFilters: {},
-                retry: false,
-            },
-        };
+        const eventFilters = {};
+        const eventFilterPathPatterns = {};
         if (gcfFunction.eventTrigger.pubsubTopic) {
-            trigger.eventTrigger.eventFilters.topic = gcfFunction.eventTrigger.pubsubTopic;
+            eventFilters.topic = gcfFunction.eventTrigger.pubsubTopic;
         }
         else {
             for (const eventFilter of gcfFunction.eventTrigger.eventFilters || []) {
                 if (eventFilter.operator === "match-path-pattern") {
-                    if (!trigger.eventTrigger.eventFilterPathPatterns) {
-                        trigger.eventTrigger.eventFilterPathPatterns = {};
-                    }
-                    trigger.eventTrigger.eventFilterPathPatterns[eventFilter.attribute] = eventFilter.value;
+                    eventFilterPathPatterns[eventFilter.attribute] = eventFilter.value;
                 }
                 else {
-                    trigger.eventTrigger.eventFilters[eventFilter.attribute] = eventFilter.value;
+                    eventFilters[eventFilter.attribute] = eventFilter.value;
                 }
             }
         }
+        trigger = {
+            eventTrigger: {
+                eventType: gcfFunction.eventTrigger.eventType,
+                retry: false,
+            },
+        };
+        if (Object.keys(eventFilters).length) {
+            trigger.eventTrigger.eventFilters = eventFilters;
+        }
+        if (Object.keys(eventFilterPathPatterns).length) {
+            trigger.eventTrigger.eventFilterPathPatterns = eventFilterPathPatterns;
+        }
         proto.copyIfPresent(trigger.eventTrigger, gcfFunction.eventTrigger, "channel");
         proto.renameIfPresent(trigger.eventTrigger, gcfFunction.eventTrigger, "region", "triggerRegion");
     }
@@ -308,8 +321,19 @@ function endpointFromFunction(gcfFunction) {
     const endpoint = Object.assign(Object.assign({ platform: "gcfv2", id,
         project,
         region }, trigger), { entryPoint: gcfFunction.buildConfig.entryPoint, runtime: gcfFunction.buildConfig.runtime, uri: gcfFunction.serviceConfig.uri });
-    proto.copyIfPresent(endpoint, gcfFunction.serviceConfig, "serviceAccountEmail", "ingressSettings", "environmentVariables", "secretEnvironmentVariables", "timeoutSeconds");
-    proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "availableMemoryMb", "availableMemory", mebibytes);
+    proto.copyIfPresent(endpoint, gcfFunction.serviceConfig, "ingressSettings", "environmentVariables", "secretEnvironmentVariables", "timeoutSeconds");
+    proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "serviceAccount", "serviceAccountEmail");
+    proto.convertIfPresent(endpoint, gcfFunction.serviceConfig, "availableMemoryMb", "availableMemory", (prod) => {
+        if (prod === null) {
+            logger_1.logger.debug("Prod should always return a valid memory amount");
+            return prod;
+        }
+        const mem = mebibytes(prod);
+        if (!backend.isValidMemoryOption(mem)) {
+            logger_1.logger.warn("Converting a function to an endpoint with an invalid memory option", mem);
+        }
+        return mem;
+    });
     proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "minInstances", "minInstanceCount");
     proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "maxInstances", "maxInstanceCount");
     proto.copyIfPresent(endpoint, gcfFunction, "labels");

package/lib/gcp/cloudscheduler.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jobFromEndpoint = exports.createOrReplaceJob = exports.updateJob = exports.getJob = exports.deleteJob = exports.createJob = exports.assertValidJob = void 0;
+exports.jobFromEndpoint = exports.topicNameForEndpoint = exports.jobNameForEndpoint = exports.createOrReplaceJob = exports.updateJob = exports.getJob = exports.deleteJob = exports.createJob = void 0;
 const _ = require("lodash");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
@@ -9,15 +9,8 @@ const apiv2_1 = require("../apiv2");
 const backend = require("../deploy/functions/backend");
 const proto = require("./proto");
 const functional_1 = require("../functional");
-const VERSION = "v1beta1";
+const VERSION = "v1";
 const DEFAULT_TIME_ZONE = "America/Los_Angeles";
-function assertValidJob(job) {
-    proto.assertOneOf("Scheduler Job", job, "target", "httpTarget", "pubsubTarget");
-    if (job.httpTarget) {
-        proto.assertOneOf("Scheduler Job", job.httpTarget, "httpTarget.authorizationHeader", "oauthToken", "odicToken");
-    }
-}
-exports.assertValidJob = assertValidJob;
 const apiClient = new apiv2_1.Client({ urlPrefix: api_1.cloudschedulerOrigin, apiVersion: VERSION });
 function createJob(job) {
     const strippedName = job.name.substring(0, job.name.lastIndexOf("/"));
@@ -35,7 +28,12 @@ function getJob(name) {
 }
 exports.getJob = getJob;
 function updateJob(job) {
-    return apiClient.patch(`/${job.name}`, Object.assign({ timeZone: DEFAULT_TIME_ZONE }, job));
+    const fieldMasks = proto.fieldMasks(job, "pubsubTarget");
+    return apiClient.patch(`/${job.name}`, Object.assign({ timeZone: DEFAULT_TIME_ZONE }, job), {
+        queryParams: {
+            updateMask: fieldMasks.join(","),
+        },
+    });
 }
 exports.updateJob = updateJob;
 async function createOrReplaceJob(job) {
@@ -60,7 +58,7 @@ async function createOrReplaceJob(job) {
     if (!job.timeZone) {
         job.timeZone = DEFAULT_TIME_ZONE;
     }
-    if (isIdentical(existingJob.body, job)) {
+    if (!needUpdate(existingJob.body, job)) {
         logger_1.logger.debug(`scheduler job ${jobName} is up to date, no changes required`);
         return;
     }
@@ -69,21 +67,45 @@ async function createOrReplaceJob(job) {
     return updatedJob;
 }
 exports.createOrReplaceJob = createOrReplaceJob;
-function isIdentical(job, otherJob) {
-    return (job &&
-        otherJob &&
-        job.schedule === otherJob.schedule &&
-        job.timeZone === otherJob.timeZone &&
-        _.isEqual(job.retryConfig, otherJob.retryConfig));
+function needUpdate(existingJob, newJob) {
+    if (!existingJob) {
+        return true;
+    }
+    if (!newJob) {
+        return true;
+    }
+    if (existingJob.schedule !== newJob.schedule) {
+        return true;
+    }
+    if (existingJob.timeZone !== newJob.timeZone) {
+        return true;
+    }
+    if (newJob.retryConfig) {
+        if (!existingJob.retryConfig) {
+            return true;
+        }
+        if (!_.isMatch(existingJob.retryConfig, newJob.retryConfig)) {
+            return true;
+        }
+    }
+    return false;
+}
+function jobNameForEndpoint(endpoint, appEngineLocation) {
+    const id = backend.scheduleIdForFunction(endpoint);
+    return `projects/${endpoint.project}/locations/${appEngineLocation}/jobs/${id}`;
+}
+exports.jobNameForEndpoint = jobNameForEndpoint;
+function topicNameForEndpoint(endpoint) {
+    const id = backend.scheduleIdForFunction(endpoint);
+    return `projects/${endpoint.project}/topics/${id}`;
 }
+exports.topicNameForEndpoint = topicNameForEndpoint;
 function jobFromEndpoint(endpoint, appEngineLocation) {
     const job = {};
     if (endpoint.platform === "gcfv1") {
-        const id = backend.scheduleIdForFunction(endpoint);
-        const region = appEngineLocation;
-        job.name = `projects/${endpoint.project}/locations/${region}/jobs/${id}`;
+        job.name = jobNameForEndpoint(endpoint, appEngineLocation);
         job.pubsubTarget = {
-            topicName: `projects/${endpoint.project}/topics/${id}`,
+            topicName: topicNameForEndpoint(endpoint),
             attributes: {
                 scheduled: "true",
             },
@@ -95,7 +117,21 @@ function jobFromEndpoint(endpoint, appEngineLocation) {
     else {
         (0, functional_1.assertExhaustive)(endpoint.platform);
     }
-    proto.copyIfPresent(job, endpoint.scheduleTrigger, "schedule", "retryConfig", "timeZone");
+    if (!endpoint.scheduleTrigger.schedule) {
+        throw new error_1.FirebaseError("Cannot create a scheduler job without a schedule:" + JSON.stringify(endpoint));
+    }
+    job.schedule = endpoint.scheduleTrigger.schedule;
+    job.timeZone = endpoint.scheduleTrigger.timeZone || DEFAULT_TIME_ZONE;
+    if (endpoint.scheduleTrigger.retryConfig) {
+        job.retryConfig = {};
+        proto.copyIfPresent(job.retryConfig, endpoint.scheduleTrigger.retryConfig, "maxDoublings", "retryCount");
+        proto.convertIfPresent(job.retryConfig, endpoint.scheduleTrigger.retryConfig, "maxBackoffDuration", "maxBackoffSeconds", (0, functional_1.nullsafeVisitor)(proto.durationFromSeconds));
+        proto.convertIfPresent(job.retryConfig, endpoint.scheduleTrigger.retryConfig, "minBackoffDuration", "minBackoffSeconds", (0, functional_1.nullsafeVisitor)(proto.durationFromSeconds));
+        proto.convertIfPresent(job.retryConfig, endpoint.scheduleTrigger.retryConfig, "maxRetryDuration", "maxRetrySeconds", (0, functional_1.nullsafeVisitor)(proto.durationFromSeconds));
+        if (!Object.keys(job.retryConfig).length) {
+            delete job.retryConfig;
+        }
+    }
     return job;
 }
 exports.jobFromEndpoint = jobFromEndpoint;

package/lib/gcp/cloudtasks.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.queueFromEndpoint = exports.queueNameForEndpoint = exports.setEnqueuer = exports.getIamPolicy = exports.setIamPolicy = exports.deleteQueue = exports.purgeQueue = exports.upsertQueue = exports.updateQueue = exports.getQueue = exports.createQueue = exports.DEFAULT_SETTINGS = void 0;
+exports.triggerFromQueue = exports.queueFromEndpoint = exports.queueNameForEndpoint = exports.setEnqueuer = exports.getIamPolicy = exports.setIamPolicy = exports.deleteQueue = exports.purgeQueue = exports.upsertQueue = exports.updateQueue = exports.getQueue = exports.createQueue = exports.DEFAULT_SETTINGS = void 0;
 const proto = require("./proto");
 const apiv2_1 = require("../apiv2");
 const api_1 = require("../api");
+const functional_1 = require("../functional");
 const API_VERSION = "v2";
 const client = new apiv2_1.Client({
     urlPrefix: api_1.cloudTasksOrigin,
@@ -136,10 +137,26 @@ function queueFromEndpoint(endpoint) {
     }
     if (endpoint.taskQueueTrigger.retryConfig) {
         proto.copyIfPresent(queue.retryConfig, endpoint.taskQueueTrigger.retryConfig, "maxAttempts", "maxDoublings");
-        proto.renameIfPresent(queue.retryConfig, endpoint.taskQueueTrigger.retryConfig, "maxRetryDuration", "maxRetrySeconds", proto.durationFromSeconds);
-        proto.renameIfPresent(queue.retryConfig, endpoint.taskQueueTrigger.retryConfig, "maxBackoff", "maxBackoffSeconds", proto.durationFromSeconds);
-        proto.renameIfPresent(queue.retryConfig, endpoint.taskQueueTrigger.retryConfig, "minBackoff", "minBackoffSeconds", proto.durationFromSeconds);
+        proto.convertIfPresent(queue.retryConfig, endpoint.taskQueueTrigger.retryConfig, "maxRetryDuration", "maxRetrySeconds", (0, functional_1.nullsafeVisitor)(proto.durationFromSeconds));
+        proto.convertIfPresent(queue.retryConfig, endpoint.taskQueueTrigger.retryConfig, "maxBackoff", "maxBackoffSeconds", (0, functional_1.nullsafeVisitor)(proto.durationFromSeconds));
+        proto.convertIfPresent(queue.retryConfig, endpoint.taskQueueTrigger.retryConfig, "minBackoff", "minBackoffSeconds", (0, functional_1.nullsafeVisitor)(proto.durationFromSeconds));
     }
     return queue;
 }
 exports.queueFromEndpoint = queueFromEndpoint;
+function triggerFromQueue(queue) {
+    const taskQueueTrigger = {};
+    if (queue.rateLimits) {
+        taskQueueTrigger.rateLimits = {};
+        proto.copyIfPresent(taskQueueTrigger.rateLimits, queue.rateLimits, "maxConcurrentDispatches", "maxDispatchesPerSecond");
+    }
+    if (queue.retryConfig) {
+        taskQueueTrigger.retryConfig = {};
+        proto.copyIfPresent(taskQueueTrigger.retryConfig, queue.retryConfig, "maxAttempts", "maxDoublings");
+        proto.convertIfPresent(taskQueueTrigger.retryConfig, queue.retryConfig, "maxRetrySeconds", "maxRetryDuration", (0, functional_1.nullsafeVisitor)(proto.secondsFromDuration));
+        proto.convertIfPresent(taskQueueTrigger.retryConfig, queue.retryConfig, "maxBackoffSeconds", "maxBackoff", (0, functional_1.nullsafeVisitor)(proto.secondsFromDuration));
+        proto.convertIfPresent(taskQueueTrigger.retryConfig, queue.retryConfig, "minBackoffSeconds", "minBackoff", (0, functional_1.nullsafeVisitor)(proto.secondsFromDuration));
+    }
+    return taskQueueTrigger;
+}
+exports.triggerFromQueue = triggerFromQueue;

package/lib/gcp/proto.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatServiceAccount = exports.getInvokerMembers = exports.fieldMasks = exports.renameIfPresent = exports.copyIfPresent = exports.assertOneOf = exports.durationFromSeconds = exports.secondsFromDuration = void 0;
+exports.formatServiceAccount = exports.getInvokerMembers = exports.fieldMasks = exports.renameIfPresent = exports.convertIfPresent = exports.copyIfPresent = exports.assertOneOf = exports.durationFromSeconds = exports.secondsFromDuration = void 0;
 const error_1 = require("../error");
 function secondsFromDuration(d) {
     return +d.slice(0, d.length - 1);
@@ -32,13 +32,25 @@ function copyIfPresent(dest, src, ...fields) {
     }
 }
 exports.copyIfPresent = copyIfPresent;
-function renameIfPresent(dest, src, destField, srcField, converter = (from) => {
-    return from;
-}) {
-    if (!Object.prototype.hasOwnProperty.call(src, srcField)) {
+function convertIfPresent(...args) {
+    if (args.length === 4) {
+        const [dest, src, key, converter] = args;
+        if (Object.prototype.hasOwnProperty.call(src, key)) {
+            dest[key] = converter(src[key]);
+        }
+        return;
+    }
+    const [dest, src, destKey, srcKey, converter] = args;
+    if (Object.prototype.hasOwnProperty.call(src, srcKey)) {
+        dest[destKey] = converter(src[srcKey]);
+    }
+}
+exports.convertIfPresent = convertIfPresent;
+function renameIfPresent(dest, src, destKey, srcKey) {
+    if (!Object.prototype.hasOwnProperty.call(src, srcKey)) {
         return;
     }
-    dest[destField] = converter(src[srcField]);
+    dest[destKey] = src[srcKey];
 }
 exports.renameIfPresent = renameIfPresent;
 function fieldMasks(object, ...doNotRecurseIn) {

package/lib/gcp/resourceManager.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addServiceAccountToRoles = exports.setIamPolicy = exports.getIamPolicy = exports.firebaseRoles = void 0;
+exports.serviceAccountHasRoles = exports.addServiceAccountToRoles = exports.setIamPolicy = exports.getIamPolicy = exports.firebaseRoles = void 0;
 const lodash_1 = require("lodash");
 const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
@@ -26,9 +26,11 @@ async function setIamPolicy(projectIdOrNumber, newPolicy, updateMask = "") {
     return response.body;
 }
 exports.setIamPolicy = setIamPolicy;
-async function addServiceAccountToRoles(projectId, serviceAccountName, roles) {
+async function addServiceAccountToRoles(projectId, serviceAccountName, roles, skipAccountLookup = false) {
     const [{ name: fullServiceAccountName }, projectPolicy] = await Promise.all([
-        (0, iam_1.getServiceAccount)(projectId, serviceAccountName),
+        skipAccountLookup
+            ? Promise.resolve({ name: serviceAccountName })
+            : (0, iam_1.getServiceAccount)(projectId, serviceAccountName),
         getIamPolicy(projectId),
     ]);
     const newMemberName = `serviceAccount:${fullServiceAccountName.split("/").pop()}`;
@@ -49,3 +51,23 @@ async function addServiceAccountToRoles(projectId, serviceAccountName, roles) {
     return setIamPolicy(projectId, projectPolicy, "bindings");
 }
 exports.addServiceAccountToRoles = addServiceAccountToRoles;
+async function serviceAccountHasRoles(projectId, serviceAccountName, roles, skipAccountLookup = false) {
+    const [{ name: fullServiceAccountName }, projectPolicy] = await Promise.all([
+        skipAccountLookup
+            ? Promise.resolve({ name: serviceAccountName })
+            : (0, iam_1.getServiceAccount)(projectId, serviceAccountName),
+        getIamPolicy(projectId),
+    ]);
+    const memberName = `serviceAccount:${fullServiceAccountName.split("/").pop()}`;
+    for (const roleName of roles) {
+        const binding = projectPolicy.bindings.find((b) => b.role === roleName);
+        if (!binding) {
+            return false;
+        }
+        if (!binding.members.includes(memberName)) {
+            return false;
+        }
+    }
+    return true;
+}
+exports.serviceAccountHasRoles = serviceAccountHasRoles;

package/lib/gcp/serviceusage.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateServiceIdentity = void 0;
-const cli_color_1 = require("cli-color");
+const colorette_1 = require("colorette");
 const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
@@ -11,7 +11,7 @@ const apiClient = new apiv2_1.Client({
     apiVersion: "v1beta1",
 });
 async function generateServiceIdentity(projectNumber, service, prefix) {
-    utils.logLabeledBullet(prefix, `generating the service identity for ${(0, cli_color_1.bold)(service)}...`);
+    utils.logLabeledBullet(prefix, `generating the service identity for ${(0, colorette_1.bold)(service)}...`);
     try {
         return await apiClient.post(`projects/${projectNumber}/services/${service}:generateServiceIdentity`);
     }

package/lib/handlePreviewToggles.js

@@ -2,18 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handlePreviewToggles = void 0;
 const lodash_1 = require("lodash");
-const cli_color_1 = require("cli-color");
+const colorette_1 = require("colorette");
 const configstore_1 = require("./configstore");
 const previews_1 = require("./previews");
 function _errorOut(name) {
-    console.log(cli_color_1.bold.red("Error:"), "Did not recognize preview feature", (0, cli_color_1.bold)(name));
+    console.log((0, colorette_1.bold)((0, colorette_1.red)("Error:")), "Did not recognize preview feature", (0, colorette_1.bold)(name || ""));
     process.exit(1);
 }
 function handlePreviewToggles(args) {
     const isValidPreview = (0, lodash_1.has)(previews_1.previews, args[1]);
     if (args[0] === "--open-sesame") {
         if (isValidPreview) {
-            console.log("Enabling preview feature", (0, cli_color_1.bold)(args[1]) + "...");
+            console.log("Enabling preview feature", (0, colorette_1.bold)(args[1]) + "...");
             previews_1.previews[args[1]] = true;
             configstore_1.configstore.set("previews", previews_1.previews);
             console.log("Preview feature enabled!");
@@ -23,7 +23,7 @@ function handlePreviewToggles(args) {
     }
     else if (args[0] === "--close-sesame") {
         if (isValidPreview) {
-            console.log("Disabling preview feature", (0, cli_color_1.bold)(args[1]));
+            console.log("Disabling preview feature", (0, colorette_1.bold)(args[1]));
             (0, lodash_1.unset)(previews_1.previews, args[1]);
             configstore_1.configstore.set("previews", previews_1.previews);
             return process.exit(0);

package/lib/hosting/implicitInit.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.implicitInit = void 0;
 const _ = require("lodash");
-const clc = require("cli-color");
+const clc = require("colorette");
 const fs = require("fs");
 const fetchWebSetup_1 = require("../fetchWebSetup");
 const utils = require("../utils");