firebase-tools 9.20.0 → 9.23.1

package/lib/extensions/paramHelper.js

@@ -4,13 +4,13 @@ exports.readEnvFile = exports.getParamsFromFile = exports.promptForNewParams = e
 const _ = require("lodash");
 const path = require("path");
 const clc = require("cli-color");
-const dotenv = require("dotenv");
 const fs = require("fs-extra");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
 const extensionsHelper_1 = require("./extensionsHelper");
 const askUserForParam = require("./askUserForParam");
 const track = require("../track");
+const env = require("../functions/env");
 function setNewDefaults(params, newDefaults) {
     params.forEach((param) => {
         if (newDefaults[param.param.toUpperCase()]) {
@@ -42,7 +42,6 @@ async function getParams(args) {
         params = getParamsFromFile({
             projectId: args.projectId,
             paramSpecs: args.paramSpecs,
-            noninteractive: args.nonInteractive,
             paramsEnvPath: args.paramsEnvPath,
         });
     }
@@ -71,7 +70,6 @@ async function getParamsForUpdate(args) {
         params = getParamsFromFile({
             projectId: args.projectId,
             paramSpecs: args.newSpec.params,
-            noninteractive: args.nonInteractive,
             paramsEnvPath: args.paramsEnvPath,
         });
     }
@@ -132,6 +130,10 @@ function getParamsFromFile(args) {
 exports.getParamsFromFile = getParamsFromFile;
 function readEnvFile(envPath) {
     const buf = fs.readFileSync(path.resolve(envPath), "utf8");
-    return dotenv.parse(buf.toString().trim(), { debug: true });
+    const result = env.parse(buf.toString().trim());
+    if (result.errors.length) {
+        throw new error_1.FirebaseError(`Error while parsing ${envPath} - unable to parse following lines:\n${result.errors.join("\n")}`);
+    }
+    return result.envs;
 }
 exports.readEnvFile = readEnvFile;

package/lib/extensions/provisioningHelper.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUsedProducts = exports.checkProductsProvisioned = exports.DeferredProduct = void 0;
+exports.getUsedProducts = exports.bulkCheckProductsProvisioned = exports.checkProductsProvisioned = exports.DeferredProduct = void 0;
 const marked = require("marked");
 const api = require("../api");
+const functional_1 = require("../functional");
 const error_1 = require("../error");
+const planner_1 = require("../deploy/extensions/planner");
 var DeferredProduct;
 (function (DeferredProduct) {
     DeferredProduct[DeferredProduct["STORAGE"] = 0] = "STORAGE";
@@ -11,6 +13,18 @@ var DeferredProduct;
 })(DeferredProduct = exports.DeferredProduct || (exports.DeferredProduct = {}));
 async function checkProductsProvisioned(projectId, spec) {
     const usedProducts = getUsedProducts(spec);
+    await checkProducts(projectId, usedProducts);
+}
+exports.checkProductsProvisioned = checkProductsProvisioned;
+async function bulkCheckProductsProvisioned(projectId, instanceSpecs) {
+    const usedProducts = await Promise.all(instanceSpecs.map(async (i) => {
+        const extensionVersion = await planner_1.getExtensionVersion(i);
+        return getUsedProducts(extensionVersion.spec);
+    }));
+    await checkProducts(projectId, [...functional_1.flattenArray(usedProducts)]);
+}
+exports.bulkCheckProductsProvisioned = bulkCheckProductsProvisioned;
+async function checkProducts(projectId, usedProducts) {
     const needProvisioning = [];
     let isStorageProvisionedPromise;
     let isAuthProvisionedPromise;
@@ -29,7 +43,7 @@ async function checkProductsProvisioned(projectId, spec) {
     if (needProvisioning.length > 0) {
         let errorMessage = "Some services used by this extension have not been set up on your " +
             "Firebase project. To ensure this extension works as intended, you must enable these " +
-            "services by following the provided links, then retry installing the extension\n\n";
+            "services by following the provided links, then retry this command\n\n";
         if (needProvisioning.includes(DeferredProduct.STORAGE)) {
             errorMessage +=
                 " - Firebase Storage: store and retrieve user-generated files like images, audio, and " +
@@ -46,7 +60,6 @@ async function checkProductsProvisioned(projectId, spec) {
         throw new error_1.FirebaseError(marked(errorMessage), { exit: 2 });
     }
 }
-exports.checkProductsProvisioned = checkProductsProvisioned;
 function getUsedProducts(spec) {
     var _a, _b;
     const usedProducts = [];

package/lib/extensions/refs.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toExtensionVersionName = exports.toExtensionName = exports.toExtensionVersionRef = exports.toExtensionRef = exports.parse = void 0;
+exports.equal = exports.toExtensionVersionName = exports.toExtensionName = exports.toExtensionVersionRef = exports.toExtensionRef = exports.parse = void 0;
 const semver = require("semver");
 const error_1 = require("../error");
 const refRegex = new RegExp(/^([^/@\n]+)\/{1}([^/@\n]+)(@{1}([^\n]+)|)$/);
@@ -57,3 +57,11 @@ function toExtensionVersionName(ref) {
     return `publishers/${ref.publisherId}/extensions/${ref.extensionId}/versions/${ref.version}`;
 }
 exports.toExtensionVersionName = toExtensionVersionName;
+function equal(a, b) {
+    return (!!a &&
+        !!b &&
+        a.publisherId === b.publisherId &&
+        a.extensionId === b.extensionId &&
+        a.version === b.version);
+}
+exports.equal = equal;

package/lib/extensions/secretsUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prettySecretName = exports.getSecretLabels = exports.getManagedSecrets = exports.grantFirexServiceAgentSecretAdminRole = exports.usesSecrets = exports.ensureSecretManagerApiEnabled = void 0;
+exports.prettySecretName = exports.getSecretLabels = exports.getActiveSecrets = exports.getManagedSecrets = exports.grantFirexServiceAgentSecretAdminRole = exports.usesSecrets = exports.ensureSecretManagerApiEnabled = exports.SECRET_LABEL = void 0;
 const getProjectNumber_1 = require("../getProjectNumber");
 const utils = require("../utils");
 const ensureApiEnabled_1 = require("../ensureApiEnabled");
@@ -8,7 +8,7 @@ const projectUtils_1 = require("../projectUtils");
 const extensionsApi = require("./extensionsApi");
 const secretManagerApi = require("../gcp/secretManager");
 const logger_1 = require("../logger");
-const SECRET_LABEL = "firebase-extensions-managed";
+exports.SECRET_LABEL = "firebase-extensions-managed";
 async function ensureSecretManagerApiEnabled(options) {
     const projectId = projectUtils_1.needProjectId(options);
     return await ensureApiEnabled_1.ensure(projectId, "secretmanager.googleapis.com", "extensions", options.markdown);
@@ -26,24 +26,25 @@ async function grantFirexServiceAgentSecretAdminRole(secret) {
 }
 exports.grantFirexServiceAgentSecretAdminRole = grantFirexServiceAgentSecretAdminRole;
 async function getManagedSecrets(instance) {
-    return (await Promise.all(getActiveSecrets(instance).map(async (secretResourceName) => {
+    return (await Promise.all(getActiveSecrets(instance.config.source.spec, instance.config.params).map(async (secretResourceName) => {
         const secret = secretManagerApi.parseSecretResourceName(secretResourceName);
-        const labels = await secretManagerApi.getSecretLabels(secret.projectId, secret.name);
-        if (labels && labels[SECRET_LABEL]) {
+        const labels = (await secretManagerApi.getSecret(secret.projectId, secret.name)).labels;
+        if (labels && labels[exports.SECRET_LABEL]) {
             return secretResourceName;
         }
         return Promise.resolve("");
     }))).filter((secretId) => !!secretId);
 }
 exports.getManagedSecrets = getManagedSecrets;
-function getActiveSecrets(instance) {
-    return instance.config.source.spec.params
-        .map((p) => p.type == extensionsApi.ParamType.SECRET && instance.config.params[p.param])
+function getActiveSecrets(spec, params) {
+    return spec.params
+        .map((p) => (p.type == extensionsApi.ParamType.SECRET ? params[p.param] : ""))
         .filter((pv) => !!pv);
 }
+exports.getActiveSecrets = getActiveSecrets;
 function getSecretLabels(instanceId) {
     const labels = {};
-    labels[SECRET_LABEL] = instanceId;
+    labels[exports.SECRET_LABEL] = instanceId;
     return labels;
 }
 exports.getSecretLabels = getSecretLabels;

package/lib/extensions/updateHelper.js

@@ -62,10 +62,20 @@ exports.displayChanges = displayChanges;
 async function update(updateOptions) {
     const { projectId, instanceId, source, extRef, params } = updateOptions;
     if (extRef) {
-        return await extensionsApi.updateInstanceFromRegistry(projectId, instanceId, extRef, params);
+        return await extensionsApi.updateInstanceFromRegistry({
+            projectId,
+            instanceId,
+            extRef,
+            params,
+        });
     }
     else if (source) {
-        return await extensionsApi.updateInstance(projectId, instanceId, source, params);
+        return await extensionsApi.updateInstance({
+            projectId,
+            instanceId,
+            extensionSource: source,
+            params,
+        });
     }
     throw new error_1.FirebaseError(`Neither a source nor a version of the extension was supplied for ${instanceId}. Please make sure this is a valid extension and try again.`);
 }

package/lib/extensions/versionHelper.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseVersionPredicate = void 0;
+const error_1 = require("../error");
+function parseVersionPredicate(versionPredicate) {
+    const versionPredicateRegex = "^(?<comparator>>=|<=|>|<)?(?<targetSemVer>.*)";
+    const matches = versionPredicate.match(versionPredicateRegex);
+    if (!matches || !matches.groups.targetSemVer) {
+        throw new error_1.FirebaseError("Invalid version predicate.");
+    }
+    const comparator = matches.groups.comparator || "=";
+    return { comparator, targetSemVer: matches.groups.targetSemVer };
+}
+exports.parseVersionPredicate = parseVersionPredicate;

package/lib/extensions/warnings.js

@@ -1,12 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.displayWarningPrompts = void 0;
+exports.displayWarningsForDeploy = exports.displayWarningPrompts = void 0;
 const marked = require("marked");
 const clc = require("cli-color");
 const extensionsApi_1 = require("./extensionsApi");
 const displayExtensionInfo_1 = require("./displayExtensionInfo");
 const extensionsHelper_1 = require("./extensionsHelper");
 const resolveSource_1 = require("./resolveSource");
+const deploymentSummary_1 = require("../deploy/extensions/deploymentSummary");
+const planner_1 = require("../deploy/extensions/planner");
+const functional_1 = require("../functional");
 const utils = require("../utils");
 function displayEAPWarning({ publisherId, sourceDownloadUri, githubLink, }) {
     const publisherNameLink = githubLink ? `[${publisherId}](${githubLink})` : publisherId;
@@ -35,3 +38,32 @@ async function displayWarningPrompts(publisherId, launchStage, extensionVersion)
     }
 }
 exports.displayWarningPrompts = displayWarningPrompts;
+const toListEntry = (i) => {
+    var _a, _b, _c, _d;
+    const idAndRef = deploymentSummary_1.humanReadable(i);
+    const sourceCodeLink = `\n\t[Source Code](${(_a = i.extensionVersion) === null || _a === void 0 ? void 0 : _a.sourceDownloadUri})`;
+    const githubLink = ((_c = (_b = i.extensionVersion) === null || _b === void 0 ? void 0 : _b.spec) === null || _c === void 0 ? void 0 : _c.sourceUrl) ? `\n\t[Publisher Contact](${(_d = i.extensionVersion) === null || _d === void 0 ? void 0 : _d.spec.sourceUrl})`
+        : "";
+    return `${idAndRef}${sourceCodeLink}${githubLink}`;
+};
+async function displayWarningsForDeploy(instancesToCreate) {
+    const trustedPublishers = await resolveSource_1.getTrustedPublishers();
+    for (const i of instancesToCreate) {
+        await planner_1.getExtension(i);
+        await planner_1.getExtensionVersion(i);
+    }
+    const [eapExtensions, nonEapExtensions] = functional_1.partition(instancesToCreate, (i) => { var _a, _b; return !trustedPublishers.includes((_b = (_a = i.ref) === null || _a === void 0 ? void 0 : _a.publisherId) !== null && _b !== void 0 ? _b : ""); });
+    const experimental = nonEapExtensions.filter((i) => i.extension.registryLaunchStage === extensionsApi_1.RegistryLaunchStage.EXPERIMENTAL);
+    if (experimental.length) {
+        const humanReadableList = experimental.map((i) => `\t${deploymentSummary_1.humanReadable(i)}`).join("\n");
+        utils.logLabeledBullet(extensionsHelper_1.logPrefix, marked(`The following are instances of ${clc.bold("experimental")} extensions.They may not be production-ready. Their functionality may change in backward-incompatible ways before their official release, or they may be discontinued.\n${humanReadableList}\n`));
+    }
+    if (eapExtensions.length) {
+        const humanReadableList = eapExtensions.map(toListEntry).join("\n");
+        utils.logLabeledBullet(extensionsHelper_1.logPrefix, marked(`These extensions are in preview and are built by a developer in the Extensions Publisher Early Access Program (http://bit.ly/firex-provider. Their functionality might change in backwards-incompatible ways. Since these extensions aren't built by Firebase, reach out to their publisher with questions about them.` +
+            ` They are provided “AS IS”, without any warranty, express or implied, from Google.` +
+            ` Google disclaims all liability for any damages, direct or indirect, resulting from the use of these extensions\n${humanReadableList}`));
+    }
+    return experimental.length > 0 || eapExtensions.length > 0;
+}
+exports.displayWarningsForDeploy = displayWarningsForDeploy;

package/lib/gcp/artifactregistry.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deletePackage = exports.API_VERSION = void 0;
+const apiv2_1 = require("../apiv2");
+const api_1 = require("../api");
+exports.API_VERSION = "v1beta2";
+const client = new apiv2_1.Client({
+    urlPrefix: api_1.artifactRegistryDomain,
+    auth: true,
+    apiVersion: exports.API_VERSION,
+});
+async function deletePackage(name) {
+    const res = await client.delete(name);
+    return res.body;
+}
+exports.deletePackage = deletePackage;

package/lib/gcp/cloudfunctions.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.functionFromEndpoint = exports.endpointFromFunction = exports.functionFromSpec = exports.specFromFunction = exports.listAllFunctions = exports.listFunctions = exports.deleteFunction = exports.updateFunction = exports.setInvokerUpdate = exports.setInvokerCreate = exports.getIamPolicy = exports.setIamPolicy = exports.createFunction = exports.generateUploadUrl = exports.API_VERSION = void 0;
+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.API_VERSION = void 0;
 const clc = require("cli-color");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
+const previews_1 = require("../previews");
 const api = require("../api");
 const backend = require("../deploy/functions/backend");
 const utils = require("../utils");
@@ -50,7 +51,12 @@ async function createFunction(cloudFunction) {
     const apiPath = cloudFunction.name.substring(0, cloudFunction.name.lastIndexOf("/"));
     const endpoint = `/${exports.API_VERSION}/${apiPath}`;
     try {
+        const headers = {};
+        if (previews_1.previews.artifactregistry) {
+            headers["X-Firebase-Artifact-Registry"] = "optin";
+        }
         const res = await api.request("POST", endpoint, {
+            headers,
             auth: true,
             data: cloudFunction,
             origin: api.functionsOrigin,
@@ -145,7 +151,12 @@ async function updateFunction(cloudFunction) {
     const endpoint = `/${exports.API_VERSION}/${cloudFunction.name}`;
     const fieldMasks = proto.fieldMasks(cloudFunction, "labels", "environmentVariables");
     try {
+        const headers = {};
+        if (previews_1.previews.artifactregistry) {
+            headers["X-Firebase-Artifact-Registry"] = "optin";
+        }
         const res = await api.request("PATCH", endpoint, {
+            headers,
             qs: {
                 updateMask: fieldMasks.join(","),
             },
@@ -214,87 +225,25 @@ async function listAllFunctions(projectId) {
     return list(projectId, "-");
 }
 exports.listAllFunctions = listAllFunctions;
-function specFromFunction(gcfFunction) {
-    var _a;
+function endpointFromFunction(gcfFunction) {
+    var _a, _b, _c;
     const [, project, , region, , id] = gcfFunction.name.split("/");
     let trigger;
     let uri;
-    if (gcfFunction.httpsTrigger) {
-        trigger = {};
-        uri = gcfFunction.httpsTrigger.url;
-    }
-    else {
+    if ((_a = gcfFunction.labels) === null || _a === void 0 ? void 0 : _a["deployment-scheduled"]) {
         trigger = {
-            eventType: gcfFunction.eventTrigger.eventType,
-            eventFilters: {
-                resource: gcfFunction.eventTrigger.resource,
-            },
-            retry: !!((_a = gcfFunction.eventTrigger.failurePolicy) === null || _a === void 0 ? void 0 : _a.retry),
+            scheduleTrigger: {},
         };
     }
-    if (!runtimes.isValidRuntime(gcfFunction.runtime)) {
-        logger_1.logger.debug("GCFv1 function has a deprecated runtime:", JSON.stringify(gcfFunction, null, 2));
-    }
-    const cloudFunction = {
-        platform: "gcfv1",
-        id,
-        project,
-        region,
-        trigger,
-        entryPoint: gcfFunction.entryPoint,
-        runtime: gcfFunction.runtime,
-    };
-    if (uri) {
-        cloudFunction.uri = uri;
-    }
-    proto.copyIfPresent(cloudFunction, gcfFunction, "serviceAccountEmail", "availableMemoryMb", "timeout", "minInstances", "maxInstances", "vpcConnector", "vpcConnectorEgressSettings", "ingressSettings", "labels", "environmentVariables", "sourceUploadUrl");
-    return cloudFunction;
-}
-exports.specFromFunction = specFromFunction;
-function functionFromSpec(cloudFunction, sourceUploadUrl) {
-    if (cloudFunction.platform != "gcfv1") {
-        throw new error_1.FirebaseError("Trying to create a v1 CloudFunction with v2 API. This should never happen");
-    }
-    if (!runtimes.isValidRuntime(cloudFunction.runtime)) {
-        throw new error_1.FirebaseError("Failed internal assertion. Trying to deploy a new function with a deprecated runtime." +
-            " This should never happen");
-    }
-    const gcfFunction = {
-        name: backend.functionName(cloudFunction),
-        sourceUploadUrl: sourceUploadUrl,
-        entryPoint: cloudFunction.entryPoint,
-        runtime: cloudFunction.runtime,
-    };
-    if (backend.isEventTrigger(cloudFunction.trigger)) {
-        gcfFunction.eventTrigger = {
-            eventType: cloudFunction.trigger.eventType,
-            resource: cloudFunction.trigger.eventFilters.resource,
+    else if ((_b = gcfFunction.labels) === null || _b === void 0 ? void 0 : _b["deployment-taskqueue"]) {
+        trigger = {
+            taskQueueTrigger: {},
         };
-        gcfFunction.eventTrigger.failurePolicy = cloudFunction.trigger.retry
-            ? { retry: {} }
-            : undefined;
     }
-    else {
-        gcfFunction.httpsTrigger = {};
-    }
-    proto.copyIfPresent(gcfFunction, cloudFunction, "serviceAccountEmail", "timeout", "availableMemoryMb", "minInstances", "maxInstances", "vpcConnector", "vpcConnectorEgressSettings", "ingressSettings", "labels", "environmentVariables");
-    return gcfFunction;
-}
-exports.functionFromSpec = functionFromSpec;
-function endpointFromFunction(gcfFunction) {
-    var _a, _b;
-    const [, project, , region, , id] = gcfFunction.name.split("/");
-    let trigger;
-    let uri;
-    if (gcfFunction.httpsTrigger) {
+    else if (gcfFunction.httpsTrigger) {
         trigger = { httpsTrigger: {} };
         uri = gcfFunction.httpsTrigger.url;
     }
-    else if ((_a = gcfFunction.labels) === null || _a === void 0 ? void 0 : _a["deployment-scheduled"]) {
-        trigger = {
-            scheduleTrigger: {},
-        };
-    }
     else {
         trigger = {
             eventTrigger: {
@@ -302,7 +251,7 @@ function endpointFromFunction(gcfFunction) {
                 eventFilters: {
                     resource: gcfFunction.eventTrigger.resource,
                 },
-                retry: !!((_b = gcfFunction.eventTrigger.failurePolicy) === null || _b === void 0 ? void 0 : _b.retry),
+                retry: !!((_c = gcfFunction.eventTrigger.failurePolicy) === null || _c === void 0 ? void 0 : _c.retry),
             },
         };
     }
@@ -351,6 +300,10 @@ function functionFromEndpoint(endpoint, sourceUploadUrl) {
         };
         gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { "deployment-scheduled": "true" });
     }
+    else if (backend.isTaskQueueTriggered(endpoint)) {
+        gcfFunction.httpsTrigger = {};
+        gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { "deployment-taskqueue": "true" });
+    }
     else {
         gcfFunction.httpsTrigger = {};
     }

package/lib/gcp/cloudfunctionsv2.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.endpointFromFunction = exports.functionFromEndpoint = exports.specFromFunction = exports.functionFromSpec = exports.deleteFunction = exports.updateFunction = exports.listAllFunctions = exports.listFunctions = exports.getFunction = exports.createFunction = exports.generateUploadUrl = exports.PUBSUB_PUBLISH_EVENT = exports.API_VERSION = void 0;
+exports.endpointFromFunction = exports.functionFromEndpoint = exports.deleteFunction = exports.updateFunction = exports.listAllFunctions = exports.listFunctions = exports.getFunction = exports.createFunction = exports.generateUploadUrl = exports.megabytes = exports.PUBSUB_PUBLISH_EVENT = exports.API_VERSION = void 0;
 const clc = require("cli-color");
 const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
@@ -17,6 +17,35 @@ const client = new apiv2_1.Client({
     apiVersion: exports.API_VERSION,
 });
 exports.PUBSUB_PUBLISH_EVENT = "google.cloud.pubsub.topic.v1.messagePublished";
+const BYTES_PER_UNIT = {
+    "": 1,
+    k: 1e3,
+    M: 1e6,
+    G: 1e9,
+    T: 1e12,
+    Ki: 1 << 10,
+    Mi: 1 << 20,
+    Gi: 1 << 30,
+    Ti: 1 << 40,
+};
+function megabytes(memory) {
+    const re = /^([0-9]+(\.[0-9]*)?)(Ki|Mi|Gi|Ti|k|M|G|T|([eE]([0-9]+)))?$/;
+    const matches = re.exec(memory);
+    if (!matches) {
+        throw new Error(`Invalid memory quantity "${memory}""`);
+    }
+    const quantity = Number.parseFloat(matches[1]);
+    let bytes;
+    if (matches[5]) {
+        bytes = quantity * Math.pow(10, Number.parseFloat(matches[5]));
+    }
+    else {
+        const suffix = matches[3] || "";
+        bytes = quantity * BYTES_PER_UNIT[suffix];
+    }
+    return bytes / 1e6;
+}
+exports.megabytes = megabytes;
 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) {
@@ -115,99 +144,6 @@ async function deleteFunction(cloudFunction) {
     }
 }
 exports.deleteFunction = deleteFunction;
-function functionFromSpec(cloudFunction, source) {
-    if (cloudFunction.platform != "gcfv2") {
-        throw new error_1.FirebaseError("Trying to create a v2 CloudFunction with v1 API. This should never happen");
-    }
-    if (!runtimes.isValidRuntime(cloudFunction.runtime)) {
-        throw new error_1.FirebaseError("Failed internal assertion. Trying to deploy a new function with a deprecated runtime." +
-            " This should never happen");
-    }
-    const gcfFunction = {
-        name: backend.functionName(cloudFunction),
-        buildConfig: {
-            runtime: cloudFunction.runtime,
-            entryPoint: cloudFunction.entryPoint,
-            source: {
-                storageSource: source,
-            },
-            environmentVariables: {},
-        },
-        serviceConfig: {},
-    };
-    proto.copyIfPresent(gcfFunction.serviceConfig, cloudFunction, "availableMemoryMb", "environmentVariables", "vpcConnector", "vpcConnectorEgressSettings", "serviceAccountEmail", "ingressSettings");
-    proto.renameIfPresent(gcfFunction.serviceConfig, cloudFunction, "timeoutSeconds", "timeout", proto.secondsFromDuration);
-    proto.renameIfPresent(gcfFunction.serviceConfig, cloudFunction, "minInstanceCount", "minInstances");
-    proto.renameIfPresent(gcfFunction.serviceConfig, cloudFunction, "maxInstanceCount", "maxInstances");
-    if (backend.isEventTrigger(cloudFunction.trigger)) {
-        gcfFunction.eventTrigger = {
-            eventType: cloudFunction.trigger.eventType,
-        };
-        if (cloudFunction.trigger.region) {
-            gcfFunction.eventTrigger.triggerRegion = cloudFunction.trigger.region;
-        }
-        if (gcfFunction.eventTrigger.eventType === exports.PUBSUB_PUBLISH_EVENT) {
-            gcfFunction.eventTrigger.pubsubTopic = cloudFunction.trigger.eventFilters.resource;
-        }
-        else {
-            gcfFunction.eventTrigger.eventFilters = [];
-            for (const [attribute, value] of Object.entries(cloudFunction.trigger.eventFilters)) {
-                gcfFunction.eventTrigger.eventFilters.push({ attribute, value });
-            }
-        }
-        if (cloudFunction.trigger.retry) {
-            logger_1.logger.warn("Cannot set a retry policy on Cloud Function", cloudFunction.id);
-        }
-    }
-    proto.copyIfPresent(gcfFunction, cloudFunction, "labels");
-    return gcfFunction;
-}
-exports.functionFromSpec = functionFromSpec;
-function specFromFunction(gcfFunction) {
-    const [, project, , region, , id] = gcfFunction.name.split("/");
-    let trigger;
-    if (gcfFunction.eventTrigger) {
-        trigger = {
-            eventType: gcfFunction.eventTrigger.eventType,
-            eventFilters: {},
-            retry: false,
-        };
-        if (gcfFunction.eventTrigger.triggerRegion) {
-            trigger.region = gcfFunction.eventTrigger.triggerRegion;
-        }
-        if (gcfFunction.eventTrigger.pubsubTopic) {
-            trigger.eventFilters.resource = gcfFunction.eventTrigger.pubsubTopic;
-        }
-        else {
-            for (const { attribute, value } of gcfFunction.eventTrigger.eventFilters || []) {
-                trigger.eventFilters[attribute] = value;
-            }
-        }
-    }
-    else {
-        trigger = {};
-    }
-    if (!runtimes.isValidRuntime(gcfFunction.buildConfig.runtime)) {
-        logger_1.logger.debug("GCFv2 function has a deprecated runtime:", JSON.stringify(gcfFunction, null, 2));
-    }
-    const cloudFunction = {
-        platform: "gcfv2",
-        id,
-        project,
-        region,
-        trigger,
-        entryPoint: gcfFunction.buildConfig.entryPoint,
-        runtime: gcfFunction.buildConfig.runtime,
-        uri: gcfFunction.serviceConfig.uri,
-    };
-    proto.copyIfPresent(cloudFunction, gcfFunction.serviceConfig, "serviceAccountEmail", "availableMemoryMb", "vpcConnector", "vpcConnectorEgressSettings", "ingressSettings", "environmentVariables");
-    proto.renameIfPresent(cloudFunction, gcfFunction.serviceConfig, "timeout", "timeoutSeconds", proto.durationFromSeconds);
-    proto.renameIfPresent(cloudFunction, gcfFunction.serviceConfig, "minInstances", "minInstanceCount");
-    proto.renameIfPresent(cloudFunction, gcfFunction.serviceConfig, "maxInstances", "maxInstanceCount");
-    proto.copyIfPresent(cloudFunction, gcfFunction, "labels");
-    return cloudFunction;
-}
-exports.specFromFunction = specFromFunction;
 function functionFromEndpoint(endpoint, source) {
     if (endpoint.platform != "gcfv2") {
         throw new error_1.FirebaseError("Trying to create a v2 CloudFunction with v1 API. This should never happen");
@@ -229,7 +165,8 @@ function functionFromEndpoint(endpoint, source) {
         serviceConfig: {},
     };
     proto.copyIfPresent(gcfFunction, endpoint, "labels");
-    proto.copyIfPresent(gcfFunction.serviceConfig, endpoint, "availableMemoryMb", "environmentVariables", "vpcConnector", "vpcConnectorEgressSettings", "serviceAccountEmail", "ingressSettings");
+    proto.copyIfPresent(gcfFunction.serviceConfig, endpoint, "environmentVariables", "vpcConnector", "vpcConnectorEgressSettings", "serviceAccountEmail", "ingressSettings");
+    proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "availableMemory", "availableMemoryMb", (mb) => `${mb}M`);
     proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "timeoutSeconds", "timeout", proto.secondsFromDuration);
     proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "minInstanceCount", "minInstances");
     proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "maxInstanceCount", "maxInstances");
@@ -246,18 +183,22 @@ function functionFromEndpoint(endpoint, source) {
                 gcfFunction.eventTrigger.eventFilters.push({ attribute, value });
             }
         }
+        proto.renameIfPresent(gcfFunction.eventTrigger, endpoint.eventTrigger, "triggerRegion", "region");
         if (endpoint.eventTrigger.retry) {
             logger_1.logger.warn("Cannot set a retry policy on Cloud Function", endpoint.id);
         }
     }
     else if (backend.isScheduleTriggered(endpoint)) {
-        gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { ["deployment-scheduled"]: "true" });
+        gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { "deployment-scheduled": "true" });
+    }
+    else if (backend.isTaskQueueTriggered(endpoint)) {
+        gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { "deployment-taskqueue": "true" });
     }
     return gcfFunction;
 }
 exports.functionFromEndpoint = functionFromEndpoint;
 function endpointFromFunction(gcfFunction) {
-    var _a;
+    var _a, _b;
     const [, project, , region, , id] = gcfFunction.name.split("/");
     let trigger;
     if (((_a = gcfFunction.labels) === null || _a === void 0 ? void 0 : _a["deployment-scheduled"]) === "true") {
@@ -265,6 +206,11 @@ function endpointFromFunction(gcfFunction) {
             scheduleTrigger: {},
         };
     }
+    else if (((_b = gcfFunction.labels) === null || _b === void 0 ? void 0 : _b["deployment-taskqueue"]) === "true") {
+        trigger = {
+            taskQueueTrigger: {},
+        };
+    }
     else if (gcfFunction.eventTrigger) {
         trigger = {
             eventTrigger: {
@@ -281,6 +227,7 @@ function endpointFromFunction(gcfFunction) {
                 trigger.eventTrigger.eventFilters[attribute] = value;
             }
         }
+        proto.renameIfPresent(trigger.eventTrigger, gcfFunction.eventTrigger, "region", "triggerRegion");
     }
     else {
         trigger = { httpsTrigger: {} };
@@ -291,7 +238,8 @@ 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", "availableMemoryMb", "vpcConnector", "vpcConnectorEgressSettings", "ingressSettings", "environmentVariables");
+    proto.copyIfPresent(endpoint, gcfFunction.serviceConfig, "serviceAccountEmail", "vpcConnector", "vpcConnectorEgressSettings", "ingressSettings", "environmentVariables");
+    proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "availableMemoryMb", "availableMemory", megabytes);
     proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "timeout", "timeoutSeconds", proto.durationFromSeconds);
     proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "minInstances", "minInstanceCount");
     proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "maxInstances", "maxInstanceCount");