firebase-tools 9.21.0 → 9.22.0

package/lib/gcp/cloudfunctionsv2.js

@@ -158,13 +158,16 @@ function functionFromEndpoint(endpoint, source) {
         }
     }
     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") {
@@ -172,6 +175,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: {

package/lib/gcp/cloudtasks.js

@@ -0,0 +1,143 @@
+"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;
+const proto = require("./proto");
+const apiv2_1 = require("../apiv2");
+const api_1 = require("../api");
+const API_VERSION = "v2";
+const client = new apiv2_1.Client({
+    urlPrefix: api_1.cloudTasksOrigin,
+    auth: true,
+    apiVersion: API_VERSION,
+});
+exports.DEFAULT_SETTINGS = {
+    rateLimits: {
+        maxConcurrentDispatches: 1000,
+        maxBurstSize: 100,
+        maxDispatchesPerSecond: 500,
+    },
+    state: "RUNNING",
+    retryConfig: {
+        maxDoublings: 16,
+        maxAttempts: 3,
+        maxBackoff: "3600s",
+        minBackoff: "0.100s",
+    },
+};
+async function createQueue(queue) {
+    const path = queue.name.substring(0, queue.name.lastIndexOf("/"));
+    const res = await client.post(path, queue);
+    return res.body;
+}
+exports.createQueue = createQueue;
+async function getQueue(name) {
+    const res = await client.get(name);
+    return res.body;
+}
+exports.getQueue = getQueue;
+async function updateQueue(queue) {
+    const res = await client.patch(queue.name, queue, {
+        queryParams: { updateMask: proto.fieldMasks(queue).join(",") },
+    });
+    return res.body;
+}
+exports.updateQueue = updateQueue;
+async function upsertQueue(queue) {
+    var _a, _b;
+    try {
+        const existing = await module.exports.getQueue(queue.name);
+        if (JSON.stringify(queue) === JSON.stringify(existing)) {
+            return false;
+        }
+        if (existing.state === "DISABLED") {
+            await module.exports.purgeQueue(queue.name);
+        }
+        await module.exports.updateQueue(queue);
+        return false;
+    }
+    catch (err) {
+        if (((_b = (_a = err === null || err === void 0 ? void 0 : err.context) === null || _a === void 0 ? void 0 : _a.response) === null || _b === void 0 ? void 0 : _b.statusCode) === 404) {
+            await module.exports.createQueue(queue);
+            return true;
+        }
+        throw err;
+    }
+}
+exports.upsertQueue = upsertQueue;
+async function purgeQueue(name) {
+    await client.post(`${name}:purge`);
+}
+exports.purgeQueue = purgeQueue;
+async function deleteQueue(name) {
+    await client.delete(name);
+}
+exports.deleteQueue = deleteQueue;
+async function setIamPolicy(name, policy) {
+    const res = await client.post(`${name}:setIamPolicy`, {
+        policy,
+    });
+    return res.body;
+}
+exports.setIamPolicy = setIamPolicy;
+async function getIamPolicy(name) {
+    const res = await client.post(`${name}:getIamPolicy`);
+    return res.body;
+}
+exports.getIamPolicy = getIamPolicy;
+const ENQUEUER_ROLE = "roles/cloudtasks.enqueuer";
+async function setEnqueuer(name, invoker, assumeEmpty = false) {
+    var _a, _b;
+    let existing;
+    if (assumeEmpty) {
+        existing = {
+            bindings: [],
+            etag: "",
+            version: 3,
+        };
+    }
+    else {
+        existing = await module.exports.getIamPolicy(name);
+    }
+    const [, project] = name.split("/");
+    const invokerMembers = proto.getInvokerMembers(invoker, project);
+    while (true) {
+        const policy = {
+            bindings: existing.bindings.filter((binding) => binding.role != ENQUEUER_ROLE),
+            etag: existing.etag,
+            version: existing.version,
+        };
+        if (invokerMembers.length) {
+            policy.bindings.push({ role: ENQUEUER_ROLE, members: invokerMembers });
+        }
+        if (JSON.stringify(policy) === JSON.stringify(existing)) {
+            return;
+        }
+        try {
+            await module.exports.setIamPolicy(name, policy);
+            return;
+        }
+        catch (err) {
+            if (((_b = (_a = err === null || err === void 0 ? void 0 : err.context) === null || _a === void 0 ? void 0 : _a.response) === null || _b === void 0 ? void 0 : _b.statusCode) === 429) {
+                existing = await module.exports.getIamPolicy(name);
+                continue;
+            }
+            throw err;
+        }
+    }
+}
+exports.setEnqueuer = setEnqueuer;
+function queueNameForEndpoint(endpoint) {
+    return `projects/${endpoint.project}/locations/${endpoint.region}/queues/${endpoint.id}`;
+}
+exports.queueNameForEndpoint = queueNameForEndpoint;
+function queueFromEndpoint(endpoint) {
+    const queue = Object.assign(Object.assign({}, JSON.parse(JSON.stringify(exports.DEFAULT_SETTINGS))), { name: queueNameForEndpoint(endpoint) });
+    if (endpoint.taskQueueTrigger.rateLimits) {
+        proto.copyIfPresent(queue.rateLimits, endpoint.taskQueueTrigger.rateLimits, "maxBurstSize", "maxConcurrentDispatches", "maxDispatchesPerSecond");
+    }
+    if (endpoint.taskQueueTrigger.retryConfig) {
+        proto.copyIfPresent(queue.retryConfig, endpoint.taskQueueTrigger.retryConfig, "maxAttempts", "maxBackoff", "maxDoublings", "maxRetryDuration", "minBackoff");
+    }
+    return queue;
+}
+exports.queueFromEndpoint = queueFromEndpoint;

package/lib/gcp/docker.js

@@ -4,7 +4,7 @@ exports.Client = void 0;
 const error_1 = require("../error");
 const api = require("../apiv2");
 function isErrors(response) {
-    return Object.prototype.hasOwnProperty.call(response, "errors");
+    return !!response && Object.prototype.hasOwnProperty.call(response, "errors");
 }
 const API_VERSION = "v2";
 class Client {
@@ -27,6 +27,9 @@ class Client {
     async deleteTag(path, tag) {
         var _a;
         const response = await this.client.delete(`${path}/manifests/${tag}`);
+        if (!response.body) {
+            return;
+        }
         if (((_a = response.body.errors) === null || _a === void 0 ? void 0 : _a.length) != 0) {
             throw new error_1.FirebaseError(`Failed to delete tag ${tag} at path ${path}`, {
                 children: response.body.errors,
@@ -36,6 +39,9 @@ class Client {
     async deleteImage(path, digest) {
         var _a;
         const response = await this.client.delete(`${path}/manifests/${digest}`);
+        if (!response.body) {
+            return;
+        }
         if (((_a = response.body.errors) === null || _a === void 0 ? void 0 : _a.length) != 0) {
             throw new error_1.FirebaseError(`Failed to delete image ${digest} at path ${path}`, {
                 children: response.body.errors,

package/lib/gcp/proto.js

@@ -67,10 +67,10 @@ function fieldMasksHelper(prefixes, cursor, doNotRecurseIn, masks) {
     }
 }
 function getInvokerMembers(invoker, projectId) {
-    if (invoker[0] === "private") {
+    if (invoker.includes("private")) {
         return [];
     }
-    if (invoker[0] === "public") {
+    if (invoker.includes("public")) {
         return ["allUsers"];
     }
     return invoker.map((inv) => formatServiceAccount(inv, projectId));

package/lib/gcp/secretManager.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.grantServiceAgentRole = exports.addVersion = exports.createSecret = exports.parseSecretResourceName = exports.secretExists = exports.getSecretLabels = exports.getSecret = exports.listSecrets = void 0;
+exports.grantServiceAgentRole = exports.addVersion = exports.createSecret = exports.toSecretVersionResourceName = exports.parseSecretVersionResourceName = exports.parseSecretResourceName = exports.secretExists = exports.getSecretVersion = exports.getSecret = exports.listSecrets = exports.secretManagerConsoleUri = void 0;
+const utils_1 = require("../utils");
 const api = require("../api");
+exports.secretManagerConsoleUri = (projectId) => `https://console.cloud.google.com/security/secret-manager?project=${projectId}`;
 async function listSecrets(projectId) {
     const listRes = await api.request("GET", `/v1beta1/projects/${projectId}/secrets`, {
         auth: true,
@@ -11,21 +13,24 @@ async function listSecrets(projectId) {
 }
 exports.listSecrets = listSecrets;
 async function getSecret(projectId, name) {
+    var _a;
     const getRes = await api.request("GET", `/v1beta1/projects/${projectId}/secrets/${name}`, {
         auth: true,
         origin: api.secretManagerOrigin,
     });
-    return parseSecretResourceName(getRes.body.name);
+    const secret = parseSecretResourceName(getRes.body.name);
+    secret.labels = (_a = getRes.body.labels) !== null && _a !== void 0 ? _a : {};
+    return secret;
 }
 exports.getSecret = getSecret;
-async function getSecretLabels(projectId, name) {
-    const getRes = await api.request("GET", `/v1beta1/projects/${projectId}/secrets/${name}`, {
+async function getSecretVersion(projectId, name, version) {
+    const getRes = await api.request("GET", `/v1beta1/projects/${projectId}/secrets/${name}/versions/${version}`, {
         auth: true,
         origin: api.secretManagerOrigin,
     });
-    return getRes.body.labels;
+    return parseSecretVersionResourceName(getRes.body.name);
 }
-exports.getSecretLabels = getSecretLabels;
+exports.getSecretVersion = getSecretVersion;
 async function secretExists(projectId, name) {
     try {
         await getSecret(projectId, name);
@@ -47,6 +52,21 @@ function parseSecretResourceName(resourceName) {
     };
 }
 exports.parseSecretResourceName = parseSecretResourceName;
+function parseSecretVersionResourceName(resourceName) {
+    const nameTokens = resourceName.split("/");
+    return {
+        secret: {
+            projectId: nameTokens[1],
+            name: nameTokens[3],
+        },
+        versionId: nameTokens[5],
+    };
+}
+exports.parseSecretVersionResourceName = parseSecretVersionResourceName;
+function toSecretVersionResourceName(secretVersion) {
+    return `projects/${secretVersion.secret.projectId}/secrets/${secretVersion.secret.name}/versions/${secretVersion.versionId}`;
+}
+exports.toSecretVersionResourceName = toSecretVersionResourceName;
 async function createSecret(projectId, name, labels) {
     const createRes = await api.request("POST", `/v1beta1/projects/${projectId}/secrets?secretId=${name}`, {
         auth: true,
@@ -107,5 +127,6 @@ async function grantServiceAgentRole(secret, serviceAccountEmail, role) {
             },
         },
     });
+    utils_1.logLabeledSuccess("SecretManager", `Granted ${role} on projects/${secret.projectId}/secrets/${secret.name} to ${serviceAccountEmail}`);
 }
 exports.grantServiceAgentRole = grantServiceAgentRole;

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, functionsv2: false, golang: false, deletegcfartifacts: false, dotenv: false, crashlyticsSymbolsUpload: false }, configstore_1.configstore.get("previews"));
+exports.previews = Object.assign({ rtdbrules: false, ext: false, extdev: false, rtdbmanagement: false, functionsv2: false, golang: false, deletegcfartifacts: false, dotenv: false, artifactregistry: false }, configstore_1.configstore.get("previews"));
 if (process.env.FIREBASE_CLI_PREVIEWS) {
     process.env.FIREBASE_CLI_PREVIEWS.split(",").forEach((feature) => {
         if (lodash_1.has(exports.previews, feature)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "9.21.0",
+  "version": "9.22.0",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -26,6 +26,7 @@
     "test:client-integration": "./scripts/client-integration-tests/run.sh",
     "test:compile": "tsc --project tsconfig.compile.json",
     "test:emulator": "./scripts/emulator-tests/run.sh",
+    "test:extensions-deploy": "./scripts/extensions-deploy-tests/run.sh",
     "test:extensions-emulator": "./scripts/extensions-emulator-tests/run.sh",
     "test:hosting": "./scripts/hosting-tests/run.sh",
     "test:triggers-end-to-end": "./scripts/triggers-end-to-end-tests/run.sh",

package/schema/firebase-config.json

@@ -1,6 +1,12 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "additionalProperties": false,
+    "definitions": {
+        "ExtensionsConfig": {
+            "additionalProperties": false,
+            "type": "object"
+        }
+    },
     "properties": {
         "database": {
             "anyOf": [
@@ -273,6 +279,9 @@
             },
             "type": "object"
         },
+        "extensions": {
+            "$ref": "#/definitions/ExtensionsConfig"
+        },
         "firestore": {
             "additionalProperties": false,
             "properties": {