firebase-tools 11.4.1 → 11.4.2

package/lib/extensions/displayExtensionInfo.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printSourceDownloadLink = exports.displayUpdateChangesRequiringConfirmation = exports.displayUpdateChangesNoInput = exports.displayExtInfo = void 0;
-const _ = require("lodash");
+exports.printSourceDownloadLink = exports.displayExtInfo = void 0;
 const clc = require("cli-color");
 const { marked } = require("marked");
 const TerminalRenderer = require("marked-terminal");
@@ -12,8 +11,6 @@ const error_1 = require("../error");
 marked.setOptions({
     renderer: new TerminalRenderer(),
 });
-const additionColor = clc.green;
-const deletionColor = clc.red;
 function displayExtInfo(extensionName, publisher, spec, published = false) {
     const lines = [];
     lines.push(`**Name**: ${spec.displayName}`);
@@ -46,103 +43,6 @@ function displayExtInfo(extensionName, publisher, spec, published = false) {
     }
 }
 exports.displayExtInfo = displayExtInfo;
-function displayUpdateChangesNoInput(spec, newSpec) {
-    var _a, _b, _c, _d;
-    const lines = [];
-    if (spec.displayName !== newSpec.displayName) {
-        lines.push("", "**Name:**", deletionColor(`- ${spec.displayName}`), additionColor(`+ ${newSpec.displayName}`));
-    }
-    if (((_a = spec.author) === null || _a === void 0 ? void 0 : _a.authorName) !== ((_b = newSpec.author) === null || _b === void 0 ? void 0 : _b.authorName)) {
-        lines.push("", "**Author:**", deletionColor(`- ${(_c = spec.author) === null || _c === void 0 ? void 0 : _c.authorName}`), additionColor(`+ ${(_d = spec.author) === null || _d === void 0 ? void 0 : _d.authorName}`));
-    }
-    if (spec.description !== newSpec.description) {
-        lines.push("", "**Description:**", deletionColor(`- ${spec.description}`), additionColor(`+ ${newSpec.description}`));
-    }
-    if (spec.sourceUrl !== newSpec.sourceUrl) {
-        lines.push("", "**Source code:**", deletionColor(`- ${spec.sourceUrl}`), additionColor(`+ ${newSpec.sourceUrl}`));
-    }
-    if (spec.billingRequired && !newSpec.billingRequired) {
-        lines.push("", "**Billing is no longer required for this extension.**");
-    }
-    logger_1.logger.info(marked(lines.join("\n")));
-    return lines;
-}
-exports.displayUpdateChangesNoInput = displayUpdateChangesNoInput;
-async function displayUpdateChangesRequiringConfirmation(args) {
-    const equals = (a, b) => {
-        return _.isEqual(a, b);
-    };
-    if (args.spec.license !== args.newSpec.license) {
-        const message = "\n" +
-            "**License**\n" +
-            deletionColor(args.spec.license ? `- ${args.spec.license}\n` : "- None\n") +
-            additionColor(args.newSpec.license ? `+ ${args.newSpec.license}\n` : "+ None\n");
-        logger_1.logger.info(message);
-        if (!(await (0, extensionsHelper_1.confirm)({ nonInteractive: args.nonInteractive, force: args.force, default: true }))) {
-            throw new error_1.FirebaseError("Unable to update this extension instance without explicit consent for the change to 'License'.");
-        }
-    }
-    const apisDiffDeletions = _.differenceWith(args.spec.apis, _.get(args.newSpec, "apis", []), equals);
-    const apisDiffAdditions = _.differenceWith(args.newSpec.apis, _.get(args.spec, "apis", []), equals);
-    if (apisDiffDeletions.length || apisDiffAdditions.length) {
-        let message = "\n**APIs:**\n";
-        apisDiffDeletions.forEach((api) => {
-            message += deletionColor(`- ${api.apiName} (${api.reason})\n`);
-        });
-        apisDiffAdditions.forEach((api) => {
-            message += additionColor(`+ ${api.apiName} (${api.reason})\n`);
-        });
-        logger_1.logger.info(message);
-        if (!(await (0, extensionsHelper_1.confirm)({ nonInteractive: args.nonInteractive, force: args.force, default: true }))) {
-            throw new error_1.FirebaseError("Unable to update this extension instance without explicit consent for the change to 'APIs'.");
-        }
-    }
-    const resourcesDiffDeletions = _.differenceWith(args.spec.resources, _.get(args.newSpec, "resources", []), compareResources);
-    const resourcesDiffAdditions = _.differenceWith(args.newSpec.resources, _.get(args.spec, "resources", []), compareResources);
-    if (resourcesDiffDeletions.length || resourcesDiffAdditions.length) {
-        let message = "\n**Resources:**\n";
-        resourcesDiffDeletions.forEach((resource) => {
-            message += deletionColor(` - ${getResourceReadableName(resource)}`);
-        });
-        resourcesDiffAdditions.forEach((resource) => {
-            message += additionColor(`+ ${getResourceReadableName(resource)}`);
-        });
-        logger_1.logger.info(message);
-        if (!(await (0, extensionsHelper_1.confirm)({ nonInteractive: args.nonInteractive, force: args.force, default: true }))) {
-            throw new error_1.FirebaseError("Unable to update this extension instance without explicit consent for the change to 'Resources'.");
-        }
-    }
-    const rolesDiffDeletions = _.differenceWith(args.spec.roles, _.get(args.newSpec, "roles", []), equals);
-    const rolesDiffAdditions = _.differenceWith(args.newSpec.roles, _.get(args.spec, "roles", []), equals);
-    if (rolesDiffDeletions.length || rolesDiffAdditions.length) {
-        let message = "\n**Permissions:**\n";
-        rolesDiffDeletions.forEach((role) => {
-            message += deletionColor(`- ${role.role} (${role.reason})\n`);
-        });
-        rolesDiffAdditions.forEach((role) => {
-            message += additionColor(`+ ${role.role} (${role.reason})\n`);
-        });
-        logger_1.logger.info(message);
-        if (!(await (0, extensionsHelper_1.confirm)({ nonInteractive: args.nonInteractive, force: args.force, default: true }))) {
-            throw new error_1.FirebaseError("Unable to update this extension instance without explicit consent for the change to 'Permissions'.");
-        }
-    }
-    if (!args.spec.billingRequired && args.newSpec.billingRequired) {
-        logger_1.logger.info("Billing is now required for the new version of this extension.");
-        if (!(await (0, extensionsHelper_1.confirm)({ nonInteractive: args.nonInteractive, force: args.force, default: true }))) {
-            throw new error_1.FirebaseError("Unable to update this extension instance without explicit consent for the change to 'BillingRequired'.");
-        }
-    }
-}
-exports.displayUpdateChangesRequiringConfirmation = displayUpdateChangesRequiringConfirmation;
-function compareResources(resource1, resource2) {
-    return resource1.name === resource2.name && resource1.type === resource2.type;
-}
-function getResourceReadableName(resource) {
-    return resource.type === "firebaseextensions.v1beta.function"
-        ? `${resource.name} (Cloud Function): ${resource.description}\n`
-        : `${resource.name} (${resource.type})\n`;
-}
 function printSourceDownloadLink(sourceDownloadUri) {
     const sourceDownloadMsg = `Want to review the source code that will be installed? Download it here: ${sourceDownloadUri}`;
     utils.logBullet(marked(sourceDownloadMsg));

package/lib/extensions/emulator/triggerHelper.js

@@ -12,8 +12,8 @@ function functionResourceToEmulatedTriggerDefintion(resource) {
         platform: "gcfv1",
     };
     const properties = resource.properties || {};
-    proto.renameIfPresent(etd, properties, "timeoutSeconds", "timeout", proto.secondsFromDuration);
-    proto.renameIfPresent(etd, properties, "regions", "location", (str) => [str]);
+    proto.convertIfPresent(etd, properties, "timeoutSeconds", "timeout", proto.secondsFromDuration);
+    proto.convertIfPresent(etd, properties, "regions", "location", (str) => [str]);
     proto.copyIfPresent(etd, properties, "availableMemoryMb");
     if (properties.httpsTrigger) {
         etd.httpsTrigger = properties.httpsTrigger;

package/lib/extensions/updateHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.inferUpdateSource = exports.updateFromPublisherSource = exports.updateToVersionFromPublisherSource = exports.updateFromUrlSource = exports.updateFromLocalSource = exports.update = exports.displayChanges = exports.warningUpdateToOtherSource = exports.getExistingSourceOrigin = void 0;
+exports.inferUpdateSource = exports.updateFromPublisherSource = exports.updateToVersionFromPublisherSource = exports.updateFromUrlSource = exports.updateFromLocalSource = exports.update = exports.warningUpdateToOtherSource = exports.getExistingSourceOrigin = void 0;
 const clc = require("cli-color");
 const semver = require("semver");
 const { marked } = require("marked");
@@ -52,12 +52,6 @@ function warningUpdateToOtherSource(sourceOrigin) {
     logger_1.logger.info(marked(warning));
 }
 exports.warningUpdateToOtherSource = warningUpdateToOtherSource;
-async function displayChanges(args) {
-    utils.logLabeledBullet("extensions", "This update contains the following changes:");
-    (0, displayExtensionInfo_1.displayUpdateChangesNoInput)(args.spec, args.newSpec);
-    await (0, displayExtensionInfo_1.displayUpdateChangesRequiringConfirmation)(args);
-}
-exports.displayChanges = displayChanges;
 async function update(updateOptions) {
     const { projectId, instanceId, source, extRef, params, canEmitEvents, allowedEventTypes, eventarcChannel, } = updateOptions;
     if (extRef) {

package/lib/functional.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.partition = exports.assertExhaustive = exports.zipIn = exports.zip = exports.reduceFlat = exports.flatten = exports.flattenArray = exports.flattenObject = void 0;
+exports.nullsafeVisitor = exports.mapObject = exports.partition = exports.assertExhaustive = exports.zipIn = exports.zip = exports.reduceFlat = exports.flatten = exports.flattenArray = exports.flattenObject = void 0;
 function* flattenObject(obj) {
     function* helper(path, obj) {
         for (const [k, v] of Object.entries(obj)) {
@@ -63,3 +63,18 @@ function partition(arr, callbackFn) {
     }, [[], []]);
 }
 exports.partition = partition;
+function mapObject(input, transform) {
+    const result = {};
+    for (const [k, v] of Object.entries(input)) {
+        result[k] = transform(v);
+    }
+    return result;
+}
+exports.mapObject = mapObject;
+const nullsafeVisitor = (func, ...rest) => (first) => {
+    if (first === null) {
+        return null;
+    }
+    return func(first, ...rest);
+};
+exports.nullsafeVisitor = nullsafeVisitor;

package/lib/gcp/cloudfunctions.js

@@ -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

@@ -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");
@@ -11,13 +11,6 @@ const proto = require("./proto");
 const functional_1 = require("../functional");
 const VERSION = "v1beta1";
 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("/"));
@@ -76,14 +69,22 @@ function isIdentical(job, otherJob) {
         job.timeZone === otherJob.timeZone &&
         _.isEqual(job.retryConfig, otherJob.retryConfig));
 }
+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 +96,18 @@ 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));
+    }
     return job;
 }
 exports.jobFromEndpoint = jobFromEndpoint;

package/lib/gcp/cloudtasks.js

@@ -4,6 +4,7 @@ exports.queueFromEndpoint = exports.queueNameForEndpoint = exports.setEnqueuer =
 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,9 +137,9 @@ 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;
 }

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/previews.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.previews = void 0;
 const lodash_1 = require("lodash");
 const configstore_1 = require("./configstore");
-exports.previews = Object.assign({ rtdbrules: false, ext: false, extdev: false, rtdbmanagement: false, golang: false, deletegcfartifacts: false, emulatoruisnapshot: false, frameworkawareness: false, functionsparams: false }, configstore_1.configstore.get("previews"));
+exports.previews = Object.assign({ rtdbrules: false, ext: false, extdev: false, rtdbmanagement: false, golang: false, deletegcfartifacts: false, emulatoruisnapshot: false, frameworkawareness: false, functionsparams: false, crossservicerules: false }, configstore_1.configstore.get("previews"));
 if (process.env.FIREBASE_CLI_PREVIEWS) {
     process.env.FIREBASE_CLI_PREVIEWS.split(",").forEach((feature) => {
         if ((0, lodash_1.has)(exports.previews, feature)) {

package/lib/rulesDeploy.js

@@ -9,9 +9,14 @@ const logger_1 = require("./logger");
 const error_1 = require("./error");
 const utils = require("./utils");
 const prompt_1 = require("./prompt");
+const getProjectNumber_1 = require("./getProjectNumber");
+const resourceManager_1 = require("./gcp/resourceManager");
+const previews_1 = require("./previews");
 const QUOTA_EXCEEDED_STATUS_CODE = 429;
 const RULESET_COUNT_LIMIT = 1000;
 const RULESETS_TO_GC = 10;
+const CROSS_SERVICE_FUNCTIONS = /firestore\.(get|exists)/;
+const CROSS_SERVICE_RULES_ROLE = "roles/firebaserules.firestoreServiceAgent";
 var RulesetServiceType;
 (function (RulesetServiceType) {
     RulesetServiceType["CLOUD_FIRESTORE"] = "cloud.firestore";
@@ -54,17 +59,49 @@ class RulesDeploy {
         }
         return { latestName, latestContent };
     }
+    async checkStorageRulesIamPermissions(rulesContent) {
+        if ((rulesContent === null || rulesContent === void 0 ? void 0 : rulesContent.match(CROSS_SERVICE_FUNCTIONS)) === null) {
+            return;
+        }
+        if (this.options.nonInteractive) {
+            return;
+        }
+        const projectNumber = await (0, getProjectNumber_1.getProjectNumber)(this.options);
+        const saEmail = `service-${projectNumber}@gcp-sa-firebasestorage.iam.gserviceaccount.com`;
+        try {
+            if (await (0, resourceManager_1.serviceAccountHasRoles)(projectNumber, saEmail, [CROSS_SERVICE_RULES_ROLE], true)) {
+                return;
+            }
+            const addRole = await (0, prompt_1.promptOnce)({
+                type: "confirm",
+                name: "rulesRole",
+                message: `Cloud Storage for Firebase needs an IAM Role to use cross-service rules. Grant the new role?`,
+                default: true,
+            }, this.options);
+            if (addRole) {
+                await (0, resourceManager_1.addServiceAccountToRoles)(projectNumber, saEmail, [CROSS_SERVICE_RULES_ROLE], true);
+                utils.logBullet(`${clc.bold.cyan(RulesetType[this.type] + ":")} updated service account for cross-service rules...`);
+            }
+        }
+        catch (e) {
+            logger_1.logger.warn("[rules] Error checking or updating Cloud Storage for Firebase service account permissions.");
+            logger_1.logger.warn("[rules] Cross-service Storage rules may not function properly", e.message);
+        }
+    }
     async createRulesets(service) {
+        var _a;
         const createdRulesetNames = [];
         const { latestName: latestRulesetName, latestContent: latestRulesetContent } = await this.getCurrentRules(service);
         const newRulesetsByFilename = new Map();
-        for (const filename of Object.keys(this.rulesFiles)) {
-            const files = this.rulesFiles[filename];
+        for (const [filename, files] of Object.entries(this.rulesFiles)) {
             if (latestRulesetName && _.isEqual(files, latestRulesetContent)) {
                 utils.logBullet(`${clc.bold.cyan(RulesetType[this.type] + ":")} latest version of ${clc.bold(filename)} already up to date, skipping upload...`);
                 this.rulesetNames[filename] = latestRulesetName;
                 continue;
             }
+            if (previews_1.previews.crossservicerules && service === RulesetServiceType.FIREBASE_STORAGE) {
+                await this.checkStorageRulesIamPermissions((_a = files[0]) === null || _a === void 0 ? void 0 : _a.content);
+            }
             utils.logBullet(`${clc.bold.cyan(RulesetType[this.type] + ":")} uploading rules ${clc.bold(filename)}...`);
             newRulesetsByFilename.set(filename, gcp.rules.createRuleset(this.options.project, files));
         }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "firebase-tools",
-  "version": "11.4.1",
+  "version": "11.4.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "firebase-tools",
-      "version": "11.4.1",
+      "version": "11.4.2",
       "license": "MIT",
       "dependencies": {
         "@google-cloud/pubsub": "^3.0.1",