firebase-tools 13.6.0 → 13.6.1

package/lib/gcp/devConnect.js

@@ -1,24 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serviceAgentEmail = exports.getGitRepositoryLink = exports.createGitRepositoryLink = exports.listAllLinkableGitRepositories = exports.listAllConnections = exports.getConnection = exports.createConnection = exports.client = void 0;
+exports.generateP4SA = exports.serviceAgentEmail = exports.getGitRepositoryLink = exports.createGitRepositoryLink = exports.listAllLinkableGitRepositories = exports.listAllConnections = exports.getConnection = exports.deleteConnection = exports.createConnection = exports.client = void 0;
 const apiv2_1 = require("../apiv2");
 const api_1 = require("../api");
+const serviceusage_1 = require("./serviceusage");
 const PAGE_SIZE_MAX = 1000;
+const LOCATION_OVERRIDE = process.env.FIREBASE_DEVELOPERCONNECT_LOCATION_OVERRIDE;
 exports.client = new apiv2_1.Client({
     urlPrefix: (0, api_1.developerConnectOrigin)(),
     auth: true,
     apiVersion: "v1",
 });
-async function createConnection(projectId, location, connectionId, githubConfig) {
+async function createConnection(projectId, location, connectionId, githubConfig = {}) {
     const config = Object.assign(Object.assign({}, githubConfig), { githubApp: "FIREBASE" });
-    const res = await exports.client.post(`projects/${projectId}/locations/${location}/connections`, {
+    const res = await exports.client.post(`projects/${projectId}/locations/${LOCATION_OVERRIDE !== null && LOCATION_OVERRIDE !== void 0 ? LOCATION_OVERRIDE : location}/connections`, {
         githubConfig: config,
     }, { queryParams: { connectionId } });
     return res.body;
 }
 exports.createConnection = createConnection;
+async function deleteConnection(projectId, location, connectionId) {
+    const name = `projects/${projectId}/locations/${LOCATION_OVERRIDE !== null && LOCATION_OVERRIDE !== void 0 ? LOCATION_OVERRIDE : location}/connections/${connectionId}`;
+    const res = await exports.client.delete(name, { queryParams: { force: "true" } });
+    return res.body;
+}
+exports.deleteConnection = deleteConnection;
 async function getConnection(projectId, location, connectionId) {
-    const name = `projects/${projectId}/locations/${location}/connections/${connectionId}`;
+    const name = `projects/${projectId}/locations/${LOCATION_OVERRIDE !== null && LOCATION_OVERRIDE !== void 0 ? LOCATION_OVERRIDE : location}/connections/${connectionId}`;
     const res = await exports.client.get(name);
     return res.body;
 }
@@ -26,7 +34,7 @@ exports.getConnection = getConnection;
 async function listAllConnections(projectId, location) {
     const conns = [];
     const getNextPage = async (pageToken = "") => {
-        const res = await exports.client.get(`/projects/${projectId}/locations/${location}/connections`, {
+        const res = await exports.client.get(`/projects/${projectId}/locations/${LOCATION_OVERRIDE !== null && LOCATION_OVERRIDE !== void 0 ? LOCATION_OVERRIDE : location}/connections`, {
             queryParams: {
                 pageSize: PAGE_SIZE_MAX,
                 pageToken,
@@ -44,17 +52,17 @@ async function listAllConnections(projectId, location) {
 }
 exports.listAllConnections = listAllConnections;
 async function listAllLinkableGitRepositories(projectId, location, connectionId) {
-    const name = `projects/${projectId}/locations/${location}/connections/${connectionId}:fetchLinkableRepositories`;
+    const name = `projects/${projectId}/locations/${LOCATION_OVERRIDE !== null && LOCATION_OVERRIDE !== void 0 ? LOCATION_OVERRIDE : location}/connections/${connectionId}:fetchLinkableGitRepositories`;
     const repos = [];
     const getNextPage = async (pageToken = "") => {
         const res = await exports.client.get(name, {
             queryParams: {
-                PAGE_SIZE_MAX,
+                pageSize: PAGE_SIZE_MAX,
                 pageToken,
             },
         });
-        if (Array.isArray(res.body.repositories)) {
-            repos.push(...res.body.repositories);
+        if (Array.isArray(res.body.linkableGitRepositories)) {
+            repos.push(...res.body.linkableGitRepositories);
         }
         if (res.body.nextPageToken) {
             await getNextPage(res.body.nextPageToken);
@@ -65,12 +73,12 @@ async function listAllLinkableGitRepositories(projectId, location, connectionId)
 }
 exports.listAllLinkableGitRepositories = listAllLinkableGitRepositories;
 async function createGitRepositoryLink(projectId, location, connectionId, gitRepositoryLinkId, cloneUri) {
-    const res = await exports.client.post(`projects/${projectId}/locations/${location}/connections/${connectionId}/gitRepositoryLinks`, { cloneUri }, { queryParams: { gitRepositoryLinkId } });
+    const res = await exports.client.post(`projects/${projectId}/locations/${LOCATION_OVERRIDE !== null && LOCATION_OVERRIDE !== void 0 ? LOCATION_OVERRIDE : location}/connections/${connectionId}/gitRepositoryLinks`, { cloneUri }, { queryParams: { gitRepositoryLinkId } });
     return res.body;
 }
 exports.createGitRepositoryLink = createGitRepositoryLink;
 async function getGitRepositoryLink(projectId, location, connectionId, gitRepositoryLinkId) {
-    const name = `projects/${projectId}/locations/${location}/connections/${connectionId}/gitRepositoryLinks/${gitRepositoryLinkId}`;
+    const name = `projects/${projectId}/locations/${LOCATION_OVERRIDE !== null && LOCATION_OVERRIDE !== void 0 ? LOCATION_OVERRIDE : location}/connections/${connectionId}/gitRepositoryLinks/${gitRepositoryLinkId}`;
     const res = await exports.client.get(name);
     return res.body;
 }
@@ -79,3 +87,8 @@ function serviceAgentEmail(projectNumber) {
     return `service-${projectNumber}@${(0, api_1.developerConnectP4SAOrigin)()}`;
 }
 exports.serviceAgentEmail = serviceAgentEmail;
+async function generateP4SA(projectNumber) {
+    const devConnectOrigin = (0, api_1.developerConnectOrigin)();
+    await (0, serviceusage_1.generateServiceIdentityAndPoll)(projectNumber, new URL(devConnectOrigin).hostname, "apphosting");
+}
+exports.generateP4SA = generateP4SA;

package/lib/gcp/iam.js

@@ -1,10 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.testIamPermissions = exports.testResourceIamPermissions = exports.getRole = exports.listServiceAccountKeys = exports.deleteServiceAccount = exports.createServiceAccountKey = exports.getServiceAccount = exports.createServiceAccount = void 0;
+exports.testIamPermissions = exports.testResourceIamPermissions = exports.getRole = exports.listServiceAccountKeys = exports.deleteServiceAccount = exports.createServiceAccountKey = exports.getServiceAccount = exports.createServiceAccount = exports.getDefaultComputeEngineServiceAgent = exports.getDefaultCloudBuildServiceAgent = void 0;
 const api_1 = require("../api");
 const logger_1 = require("../logger");
 const apiv2_1 = require("../apiv2");
 const apiClient = new apiv2_1.Client({ urlPrefix: (0, api_1.iamOrigin)(), apiVersion: "v1" });
+function getDefaultCloudBuildServiceAgent(projectNumber) {
+    return `${projectNumber}@cloudbuild.gserviceaccount.com`;
+}
+exports.getDefaultCloudBuildServiceAgent = getDefaultCloudBuildServiceAgent;
+function getDefaultComputeEngineServiceAgent(projectNumber) {
+    return `${projectNumber}-compute@developer.gserviceaccount.com`;
+}
+exports.getDefaultComputeEngineServiceAgent = getDefaultComputeEngineServiceAgent;
 async function createServiceAccount(projectId, accountId, description, displayName) {
     const response = await apiClient.post(`/projects/${projectId}/serviceAccounts`, {
         accountId,

package/lib/gcp/secretManager.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureServiceAgentRole = exports.setIamPolicy = exports.getIamPolicy = exports.addVersion = exports.deleteSecret = exports.patchSecret = exports.createSecret = exports.toSecretVersionResourceName = exports.parseSecretVersionResourceName = exports.parseSecretResourceName = exports.secretExists = exports.destroySecretVersion = exports.accessSecretVersion = exports.getSecretVersion = exports.listSecretVersions = exports.getSecretMetadata = exports.listSecrets = exports.getSecret = exports.secretManagerConsoleUri = void 0;
+exports.labels = exports.ensureApi = exports.isAppHostingManaged = exports.isFunctionsManaged = exports.FIREBASE_MANAGED = exports.ensureServiceAgentRole = exports.setIamPolicy = exports.getIamPolicy = exports.addVersion = exports.deleteSecret = exports.patchSecret = exports.createSecret = exports.toSecretVersionResourceName = exports.parseSecretVersionResourceName = exports.parseSecretResourceName = exports.secretExists = exports.destroySecretVersion = exports.accessSecretVersion = exports.getSecretVersion = exports.listSecretVersions = exports.getSecretMetadata = exports.listSecrets = exports.getSecret = exports.secretManagerConsoleUri = void 0;
 const utils_1 = require("../utils");
 const error_1 = require("../error");
 const apiv2_1 = require("../apiv2");
 const api_1 = require("../api");
+const ensureApiEnabled = require("../ensureApiEnabled");
+const projectUtils_1 = require("../projectUtils");
 const SECRET_NAME_REGEX = new RegExp("projects\\/" +
     "(?<project>(?:\\d+)|(?:[A-Za-z]+[A-Za-z\\d-]*[A-Za-z\\d]?))\\/" +
     "secrets\\/" +
@@ -15,15 +17,16 @@ exports.secretManagerConsoleUri = secretManagerConsoleUri;
 const API_VERSION = "v1";
 const client = new apiv2_1.Client({ urlPrefix: (0, api_1.secretManagerOrigin)(), apiVersion: API_VERSION });
 async function getSecret(projectId, name) {
-    var _a;
+    var _a, _b;
     const getRes = await client.get(`projects/${projectId}/secrets/${name}`);
     const secret = parseSecretResourceName(getRes.body.name);
     secret.labels = (_a = getRes.body.labels) !== null && _a !== void 0 ? _a : {};
+    secret.replication = (_b = getRes.body.replication) !== null && _b !== void 0 ? _b : {};
     return secret;
 }
 exports.getSecret = getSecret;
 async function listSecrets(projectId, filter) {
-    var _a;
+    var _a, _b;
     const secrets = [];
     const path = `projects/${projectId}/secrets`;
     const baseOpts = filter ? { queryParams: { filter } } : {};
@@ -34,7 +37,7 @@ async function listSecrets(projectId, filter) {
             : Object.assign(Object.assign({}, baseOpts), { queryParams: Object.assign(Object.assign({}, baseOpts === null || baseOpts === void 0 ? void 0 : baseOpts.queryParams), { pageToken }) });
         const res = await client.get(path, opts);
         for (const s of res.body.secrets || []) {
-            secrets.push(Object.assign(Object.assign({}, parseSecretResourceName(s.name)), { labels: (_a = s.labels) !== null && _a !== void 0 ? _a : {} }));
+            secrets.push(Object.assign(Object.assign({}, parseSecretResourceName(s.name)), { labels: (_a = s.labels) !== null && _a !== void 0 ? _a : {}, replication: (_b = s.replication) !== null && _b !== void 0 ? _b : {} }));
         }
         if (!res.body.nextPageToken) {
             break;
@@ -69,7 +72,7 @@ async function listSecretVersions(projectId, name, filter) {
             : Object.assign(Object.assign({}, baseOpts), { queryParams: Object.assign(Object.assign({}, baseOpts === null || baseOpts === void 0 ? void 0 : baseOpts.queryParams), { pageToken }) });
         const res = await client.get(path, opts);
         for (const s of res.body.versions || []) {
-            secrets.push(Object.assign(Object.assign({}, parseSecretVersionResourceName(s.name)), { state: s.state }));
+            secrets.push(Object.assign(Object.assign({}, parseSecretVersionResourceName(s.name)), { state: s.state, createTime: s.createTime }));
         }
         if (!res.body.nextPageToken) {
             break;
@@ -81,7 +84,7 @@ async function listSecretVersions(projectId, name, filter) {
 exports.listSecretVersions = listSecretVersions;
 async function getSecretVersion(projectId, name, version) {
     const getRes = await client.get(`projects/${projectId}/secrets/${name}/versions/${version}`);
-    return Object.assign(Object.assign({}, parseSecretVersionResourceName(getRes.body.name)), { state: getRes.body.state });
+    return Object.assign(Object.assign({}, parseSecretVersionResourceName(getRes.body.name)), { state: getRes.body.state, createTime: getRes.body.createTime });
 }
 exports.getSecretVersion = getSecretVersion;
 async function accessSecretVersion(projectId, name, version) {
@@ -118,6 +121,8 @@ function parseSecretResourceName(resourceName) {
     return {
         projectId: match.groups.project,
         name: match.groups.secret,
+        labels: {},
+        replication: {},
     };
 }
 exports.parseSecretResourceName = parseSecretResourceName;
@@ -130,8 +135,11 @@ function parseSecretVersionResourceName(resourceName) {
         secret: {
             projectId: match.groups.project,
             name: match.groups.secret,
+            labels: {},
+            replication: {},
         },
         versionId: match.groups.version,
+        createTime: "",
     };
 }
 exports.parseSecretVersionResourceName = parseSecretVersionResourceName;
@@ -139,21 +147,35 @@ function toSecretVersionResourceName(secretVersion) {
     return `projects/${secretVersion.secret.projectId}/secrets/${secretVersion.secret.name}/versions/${secretVersion.versionId}`;
 }
 exports.toSecretVersionResourceName = toSecretVersionResourceName;
-async function createSecret(projectId, name, labels) {
+async function createSecret(projectId, name, labels, location) {
+    let replication;
+    if (location) {
+        replication = {
+            userManaged: {
+                replicas: [
+                    {
+                        location,
+                    },
+                ],
+            },
+        };
+    }
+    else {
+        replication = { automatic: {} };
+    }
     const createRes = await client.post(`projects/${projectId}/secrets`, {
         name,
-        replication: {
-            automatic: {},
-        },
+        replication,
         labels,
     }, { queryParams: { secretId: name } });
-    return Object.assign(Object.assign({}, parseSecretResourceName(createRes.body.name)), { labels });
+    return Object.assign(Object.assign({}, parseSecretResourceName(createRes.body.name)), { labels,
+        replication });
 }
 exports.createSecret = createSecret;
 async function patchSecret(projectId, name, labels) {
     const fullName = `projects/${projectId}/secrets/${name}`;
     const res = await client.patch(fullName, { name: fullName, labels }, { queryParams: { updateMask: "labels" } });
-    return parseSecretResourceName(res.body.name);
+    return Object.assign(Object.assign({}, parseSecretResourceName(res.body.name)), { labels: res.body.labels, replication: res.body.replication });
 }
 exports.patchSecret = patchSecret;
 async function deleteSecret(projectId, name) {
@@ -167,7 +189,7 @@ async function addVersion(projectId, name, payloadData) {
             data: Buffer.from(payloadData).toString("base64"),
         },
     });
-    return Object.assign(Object.assign({}, parseSecretVersionResourceName(res.body.name)), { state: res.body.state });
+    return Object.assign(Object.assign({}, parseSecretVersionResourceName(res.body.name)), { state: res.body.state, createTime: "" });
 }
 exports.addVersion = addVersion;
 async function getIamPolicy(secret) {
@@ -205,3 +227,21 @@ async function ensureServiceAgentRole(secret, serviceAccountEmails, role) {
     (0, utils_1.logLabeledSuccess)("secretmanager", `Granted ${role} on projects/${secret.projectId}/secrets/${secret.name} to ${serviceAccountEmails.join(", ")}`);
 }
 exports.ensureServiceAgentRole = ensureServiceAgentRole;
+exports.FIREBASE_MANAGED = "firebase-managed";
+function isFunctionsManaged(secret) {
+    return (secret.labels[exports.FIREBASE_MANAGED] === "true" || secret.labels[exports.FIREBASE_MANAGED] === "functions");
+}
+exports.isFunctionsManaged = isFunctionsManaged;
+function isAppHostingManaged(secret) {
+    return secret.labels[exports.FIREBASE_MANAGED] === "apphosting";
+}
+exports.isAppHostingManaged = isAppHostingManaged;
+function ensureApi(options) {
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    return ensureApiEnabled.ensure(projectId, (0, api_1.secretManagerOrigin)(), "secretmanager", true);
+}
+exports.ensureApi = ensureApi;
+function labels(product = "functions") {
+    return { [exports.FIREBASE_MANAGED]: product };
+}
+exports.labels = labels;

package/lib/gcp/serviceusage.js

@@ -1,19 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateServiceIdentity = void 0;
+exports.generateServiceIdentityAndPoll = exports.generateServiceIdentity = exports.apiClient = void 0;
 const colorette_1 = require("colorette");
 const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
 const utils = require("../utils");
-const apiClient = new apiv2_1.Client({
-    urlPrefix: (0, api_1.serviceUsageOrigin)(),
-    apiVersion: "v1beta1",
+const poller = require("../operation-poller");
+const API_VERSION = "v1beta1";
+const SERVICE_USAGE_ORIGIN = (0, api_1.serviceUsageOrigin)();
+exports.apiClient = new apiv2_1.Client({
+    urlPrefix: SERVICE_USAGE_ORIGIN,
+    apiVersion: API_VERSION,
 });
+const serviceUsagePollerOptions = {
+    apiOrigin: SERVICE_USAGE_ORIGIN,
+    apiVersion: API_VERSION,
+};
 async function generateServiceIdentity(projectNumber, service, prefix) {
     utils.logLabeledBullet(prefix, `generating the service identity for ${(0, colorette_1.bold)(service)}...`);
     try {
-        return await apiClient.post(`projects/${projectNumber}/services/${service}:generateServiceIdentity`);
+        const res = await exports.apiClient.post(`projects/${projectNumber}/services/${service}:generateServiceIdentity`);
+        return res.body;
     }
     catch (err) {
         throw new error_1.FirebaseError(`Error generating the service identity for ${service}.`, {
@@ -22,3 +30,11 @@ async function generateServiceIdentity(projectNumber, service, prefix) {
     }
 }
 exports.generateServiceIdentity = generateServiceIdentity;
+async function generateServiceIdentityAndPoll(projectNumber, service, prefix) {
+    const op = await generateServiceIdentity(projectNumber, service, prefix);
+    if (op.done) {
+        return;
+    }
+    await poller.pollOperation(Object.assign(Object.assign({}, serviceUsagePollerOptions), { operationResourceName: op.name }));
+}
+exports.generateServiceIdentityAndPoll = generateServiceIdentityAndPoll;

package/lib/init/features/functions/python.js

@@ -7,6 +7,7 @@ const path = require("path");
 const python_1 = require("../../../deploy/functions/runtimes/python");
 const python_2 = require("../../../functions/python");
 const prompt_1 = require("../../../prompt");
+const supported_1 = require("../../../deploy/functions/runtimes/supported");
 const TEMPLATE_ROOT = path.resolve(__dirname, "../../../../templates/init/functions/python");
 const MAIN_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "main.py"), "utf8");
 const REQUIREMENTS_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "requirements.txt"), "utf8");
@@ -15,9 +16,9 @@ async function setup(setup, config) {
     await config.askWriteProjectFile(`${setup.functions.source}/requirements.txt`, REQUIREMENTS_TEMPLATE);
     await config.askWriteProjectFile(`${setup.functions.source}/.gitignore`, GITIGNORE_TEMPLATE);
     await config.askWriteProjectFile(`${setup.functions.source}/main.py`, MAIN_TEMPLATE);
-    config.set("functions.runtime", python_1.LATEST_VERSION);
+    config.set("functions.runtime", (0, supported_1.latest)("python"));
     config.set("functions.ignore", ["venv", "__pycache__"]);
-    const venvProcess = spawn((0, python_1.getPythonBinary)(python_1.LATEST_VERSION), ["-m", "venv", "venv"], {
+    const venvProcess = spawn((0, python_1.getPythonBinary)((0, supported_1.latest)("python")), ["-m", "venv", "venv"], {
         shell: true,
         cwd: config.path(setup.functions.source),
         stdio: ["pipe", "pipe", "pipe", "pipe"],
@@ -38,7 +39,7 @@ async function setup(setup, config) {
             upgradeProcess.on("exit", resolve);
             upgradeProcess.on("error", reject);
         });
-        const installProcess = (0, python_2.runWithVirtualEnv)([(0, python_1.getPythonBinary)(python_1.LATEST_VERSION), "-m", "pip", "install", "-r", "requirements.txt"], config.path(setup.functions.source), {}, { stdio: ["inherit", "inherit", "inherit"] });
+        const installProcess = (0, python_2.runWithVirtualEnv)([(0, python_1.getPythonBinary)((0, supported_1.latest)("python")), "-m", "pip", "install", "-r", "requirements.txt"], config.path(setup.functions.source), {}, { stdio: ["inherit", "inherit", "inherit"] });
         await new Promise((resolve, reject) => {
             installProcess.on("exit", resolve);
             installProcess.on("error", reject);

package/lib/init/features/index.js

@@ -23,5 +23,5 @@ var remoteconfig_1 = require("./remoteconfig");
 Object.defineProperty(exports, "remoteconfig", { enumerable: true, get: function () { return remoteconfig_1.doSetup; } });
 var github_1 = require("./hosting/github");
 Object.defineProperty(exports, "hostingGithub", { enumerable: true, get: function () { return github_1.initGitHub; } });
-var apphosting_1 = require("./apphosting");
+var apphosting_1 = require("../../apphosting");
 Object.defineProperty(exports, "apphosting", { enumerable: true, get: function () { return apphosting_1.doSetup; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "13.6.0",
+  "version": "13.6.1",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {

package/schema/firebase-config.json

@@ -622,7 +622,12 @@
                                 "nodejs14",
                                 "nodejs16",
                                 "nodejs18",
-                                "nodejs20"
+                                "nodejs20",
+                                "nodejs6",
+                                "nodejs8",
+                                "python310",
+                                "python311",
+                                "python312"
                             ],
                             "type": "string"
                         },
@@ -678,7 +683,12 @@
                                     "nodejs14",
                                     "nodejs16",
                                     "nodejs18",
-                                    "nodejs20"
+                                    "nodejs20",
+                                    "nodejs6",
+                                    "nodejs8",
+                                    "python310",
+                                    "python311",
+                                    "python312"
                                 ],
                                 "type": "string"
                             },