firebase-tools 12.7.0 → 12.8.1

package/lib/commands/firestore-databases-update.js

@@ -18,30 +18,37 @@ exports.command = new command_1.Command("firestore:databases:update <database>")
     .before(commandUtils_1.warnEmulatorNotSupported, types_1.Emulators.FIRESTORE)
     .action(async (database, options) => {
     const api = new fsi.FirestoreApi();
-    if (!options.type && !options.deleteProtection && !options.pointInTimeRecovery) {
+    if (!options.deleteProtection && !options.pointInTimeRecovery) {
         logger_1.logger.error("Missing properties to update. See firebase firestore:databases:update --help for more info.");
         return;
     }
-    const type = types.DatabaseType.FIRESTORE_NATIVE;
     if (options.deleteProtection &&
         options.deleteProtection !== types.DatabaseDeleteProtectionStateOption.ENABLED &&
         options.deleteProtection !== types.DatabaseDeleteProtectionStateOption.DISABLED) {
         logger_1.logger.error("Invalid value for flag --delete-protection. See firebase firestore:databases:update --help for more info.");
         return;
     }
-    const deleteProtectionState = options.deleteProtection === types.DatabaseDeleteProtectionStateOption.ENABLED
-        ? types.DatabaseDeleteProtectionState.ENABLED
-        : types.DatabaseDeleteProtectionState.DISABLED;
+    let deleteProtectionState;
+    if (options.deleteProtection === types.DatabaseDeleteProtectionStateOption.ENABLED) {
+        deleteProtectionState = types.DatabaseDeleteProtectionState.ENABLED;
+    }
+    else if (options.deleteProtection === types.DatabaseDeleteProtectionStateOption.DISABLED) {
+        deleteProtectionState = types.DatabaseDeleteProtectionState.DISABLED;
+    }
     if (options.pointInTimeRecovery &&
         options.pointInTimeRecovery !== types.PointInTimeRecoveryEnablementOption.ENABLED &&
         options.pointInTimeRecovery !== types.PointInTimeRecoveryEnablementOption.DISABLED) {
         logger_1.logger.error("Invalid value for flag --point-in-time-recovery. See firebase firestore:databases:update --help for more info.");
         return;
     }
-    const pointInTimeRecoveryEnablement = options.pointInTimeRecovery === types.PointInTimeRecoveryEnablementOption.ENABLED
-        ? types.PointInTimeRecoveryEnablement.ENABLED
-        : types.PointInTimeRecoveryEnablement.DISABLED;
-    const databaseResp = await api.updateDatabase(options.project, database, type, deleteProtectionState, pointInTimeRecoveryEnablement);
+    let pointInTimeRecoveryEnablement;
+    if (options.pointInTimeRecovery === types.PointInTimeRecoveryEnablementOption.ENABLED) {
+        pointInTimeRecoveryEnablement = types.PointInTimeRecoveryEnablement.ENABLED;
+    }
+    else if (options.pointInTimeRecovery === types.PointInTimeRecoveryEnablementOption.DISABLED) {
+        pointInTimeRecoveryEnablement = types.PointInTimeRecoveryEnablement.DISABLED;
+    }
+    const databaseResp = await api.updateDatabase(options.project, database, deleteProtectionState, pointInTimeRecoveryEnablement);
     if (options.json) {
         logger_1.logger.info(JSON.stringify(databaseResp, undefined, 2));
     }

package/lib/commands/frameworks-backends-create.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.command = void 0;
+const command_1 = require("../command");
+const projectUtils_1 = require("../projectUtils");
+const requireInteractive_1 = require("../requireInteractive");
+const frameworks_1 = require("../init/features/frameworks");
+exports.command = new command_1.Command("backends:create")
+    .description("Create a backend in a Firebase project")
+    .before(requireInteractive_1.default)
+    .action(async (options) => {
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    await (0, frameworks_1.doSetup)(options, projectId);
+});

package/lib/commands/frameworks-backends-delete.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.command = void 0;
+const command_1 = require("../command");
+const projectUtils_1 = require("../projectUtils");
+const error_1 = require("../error");
+const gcp = require("../gcp/frameworks");
+const prompt_1 = require("../prompt");
+const utils = require("../utils");
+exports.command = new command_1.Command("backends:delete")
+    .description("Delete a backend from a Firebase project")
+    .option("-l, --location <location>", "App Backend location", "us-central1")
+    .option("-s, --backendId <backendId>", "Backend Id", "")
+    .withForce()
+    .action(async (options) => {
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const location = options.location;
+    const backendId = options.backendId;
+    if (!backendId) {
+        throw new error_1.FirebaseError("Backend id can't be empty.");
+    }
+    const confirmDeletion = await (0, prompt_1.promptOnce)({
+        type: "confirm",
+        name: "force",
+        default: false,
+        message: "You are about to delete the backend with id: " + backendId + "\n  Are you sure?",
+    }, options);
+    if (!confirmDeletion) {
+        throw new error_1.FirebaseError("Deletion aborted.");
+    }
+    try {
+        await gcp.deleteBackend(projectId, location, backendId);
+        utils.logSuccess(`Successfully deleted the backend: ${backendId}`);
+    }
+    catch (err) {
+        throw new error_1.FirebaseError(`Failed to delete backend: ${backendId}. Please check the parameters you have provided.`, { original: err });
+    }
+});

package/lib/commands/frameworks-backends-get.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.command = void 0;
+const command_1 = require("../command");
+const projectUtils_1 = require("../projectUtils");
+const gcp = require("../gcp/frameworks");
+const error_1 = require("../error");
+const logger_1 = require("../logger");
+const Table = require("cli-table");
+exports.command = new command_1.Command("backends:get")
+    .description("Get backend details of a Firebase project")
+    .option("-l, --location <location>", "App Backend location", "us-central1")
+    .option("--s, --backendId <backendId>", "Backend Id", "")
+    .action(async (options) => {
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const location = options.location;
+    const backendId = options.backendId;
+    if (!backendId) {
+        throw new error_1.FirebaseError("Backend id can't be empty.");
+    }
+    let backend;
+    try {
+        backend = await gcp.getBackend(projectId, location, backendId);
+        const table = new Table({
+            head: ["Backend Id", "Repository Name", "URL", "Location", "Created Date", "Updated Date"],
+            style: { head: ["green"] },
+        });
+        table.push([
+            backend.name,
+            backend.codebase.repository,
+            backend.uri,
+            backend.createTime,
+            backend.updateTime,
+        ]);
+        logger_1.logger.info(table.toString());
+    }
+    catch (err) {
+        throw new error_1.FirebaseError(`Failed to get backend: ${backendId}. Please check the parameters you have provided.`, { original: err });
+    }
+    return backend;
+});

package/lib/commands/frameworks-backends-list.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.command = void 0;
+const command_1 = require("../command");
+const projectUtils_1 = require("../projectUtils");
+const gcp = require("../gcp/frameworks");
+const error_1 = require("../error");
+const logger_1 = require("../logger");
+const colorette_1 = require("colorette");
+const Table = require("cli-table");
+exports.command = new command_1.Command("backends:list")
+    .description("List backends of a Firebase project.")
+    .option("-l, --location <location>", "App Backend location", "us-central1")
+    .action(async (options) => {
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const location = options.location;
+    const table = new Table({
+        head: ["Backend Id", "Repository Name", "URL", "Location", "Created Date", "Updated Date"],
+        style: { head: ["green"] },
+    });
+    let backendsList;
+    try {
+        backendsList = await gcp.listBackends(projectId, location);
+        for (const backend of backendsList.backends) {
+            const entry = [
+                backend.name,
+                backend.codebase.repository,
+                backend.uri,
+                backend.createTime,
+                backend.updateTime,
+            ];
+            table.push(entry);
+        }
+        logger_1.logger.info(`Backends for project ${(0, colorette_1.bold)(projectId)}`);
+        logger_1.logger.info(table.toString());
+    }
+    catch (err) {
+        throw new error_1.FirebaseError(`Unable to list backends present in project: ${projectId}. Please check the parameters you have provided.`, { original: err });
+    }
+    return backendsList;
+});

package/lib/commands/index.js

@@ -145,6 +145,14 @@ function load(client) {
         client.internaltesting.functions = {};
         client.internaltesting.functions.discover = loadCommand("internaltesting-functions-discover");
     }
+    if (experiments.isEnabled("internalframeworks")) {
+        client.frameworks = {};
+        client.frameworks.backends = {};
+        client.frameworks.backends.list = loadCommand("frameworks-backends-list");
+        client.frameworks.backends.create = loadCommand("frameworks-backends-create");
+        client.frameworks.backends.get = loadCommand("frameworks-backends-get");
+        client.frameworks.backends.delete = loadCommand("frameworks-backends-delete");
+    }
     client.login = loadCommand("login");
     client.login.add = loadCommand("login-add");
     client.login.ci = loadCommand("login-ci");

package/lib/firestore/api.js

@@ -485,10 +485,9 @@ class FirestoreApi {
         }
         return database;
     }
-    async updateDatabase(project, databaseId, type, deleteProtectionState, pointInTimeRecoveryEnablement) {
+    async updateDatabase(project, databaseId, deleteProtectionState, pointInTimeRecoveryEnablement) {
         const url = `/projects/${project}/databases/${databaseId}`;
         const payload = {
-            type,
             deleteProtectionState,
             pointInTimeRecoveryEnablement,
         };

package/lib/functions/env.js

@@ -241,6 +241,7 @@ function loadFirebaseEnvs(firebaseConfig, projectId) {
     return {
         FIREBASE_CONFIG: JSON.stringify(firebaseConfig),
         GCLOUD_PROJECT: projectId,
+        FIRESTORE_PREFER_REST: "true",
     };
 }
 exports.loadFirebaseEnvs = loadFirebaseEnvs;

package/lib/gcp/cloudfunctionsv2.js

@@ -304,7 +304,8 @@ function endpointFromFunction(gcfFunction) {
     else if (gcfFunction.eventTrigger) {
         const eventFilters = {};
         const eventFilterPathPatterns = {};
-        if (gcfFunction.eventTrigger.pubsubTopic) {
+        if (gcfFunction.eventTrigger.pubsubTopic &&
+            gcfFunction.eventTrigger.eventType === v2_1.PUBSUB_PUBLISH_EVENT) {
             eventFilters.topic = gcfFunction.eventTrigger.pubsubTopic;
         }
         else {

package/lib/gcp/frameworks.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createBuild = exports.getStack = exports.createStack = exports.API_VERSION = void 0;
+exports.createBuild = exports.deleteBackend = exports.listBackends = exports.getBackend = exports.createStack = exports.API_VERSION = void 0;
 const apiv2_1 = require("../apiv2");
 const api_1 = require("../api");
 exports.API_VERSION = "v1alpha";
@@ -9,21 +9,32 @@ const client = new apiv2_1.Client({
     auth: true,
     apiVersion: exports.API_VERSION,
 });
-async function createStack(projectId, location, stackInput) {
-    const stackId = stackInput.name;
-    const res = await client.post(`projects/${projectId}/locations/${location}/stacks`, stackInput, { queryParams: { stackId } });
+async function createStack(projectId, location, stackReqBoby, backendId) {
+    const res = await client.post(`projects/${projectId}/locations/${location}/backends`, stackReqBoby, { queryParams: { backendId } });
     return res.body;
 }
 exports.createStack = createStack;
-async function getStack(projectId, location, stackId) {
-    const name = `projects/${projectId}/locations/${location}/stacks/${stackId}`;
+async function getBackend(projectId, location, backendId) {
+    const name = `projects/${projectId}/locations/${location}/backends/${backendId}`;
     const res = await client.get(name);
     return res.body;
 }
-exports.getStack = getStack;
+exports.getBackend = getBackend;
+async function listBackends(projectId, location) {
+    const name = `projects/${projectId}/locations/${location}/backends`;
+    const res = await client.get(name);
+    return res.body;
+}
+exports.listBackends = listBackends;
+async function deleteBackend(projectId, location, backendId) {
+    const name = `projects/${projectId}/locations/${location}/backends/${backendId}`;
+    const res = await client.delete(name);
+    return res.body;
+}
+exports.deleteBackend = deleteBackend;
 async function createBuild(projectId, location, stackId, buildInput) {
     const buildId = buildInput.name;
-    const res = await client.post(`projects/${projectId}/locations/${location}/stacks/${stackId}/builds`, buildInput, { queryParams: { buildId } });
+    const res = await client.post(`projects/${projectId}/locations/${location}/backends/${stackId}/builds`, buildInput, { queryParams: { buildId } });
     return res.body;
 }
 exports.createBuild = createBuild;

package/lib/hosting/api.js

@@ -217,7 +217,7 @@ async function getCleanDomains(project, site) {
         acc[current] = true;
         return acc;
     }, {});
-    const siteMatch = new RegExp(`${site}--`, "i");
+    const siteMatch = new RegExp(`^${site}--`, "i");
     const firebaseAppMatch = new RegExp(/firebaseapp.com$/);
     const domains = await (0, auth_1.getAuthDomains)(project);
     const authDomains = [];

package/lib/init/features/frameworks/index.js

@@ -18,9 +18,7 @@ const frameworksPollerOptions = {
     masterTimeout: 25 * 60 * 1000,
     maxBackoff: 10000,
 };
-async function doSetup(setup) {
-    var _a, _b;
-    const projectId = (_b = (_a = setup === null || setup === void 0 ? void 0 : setup.rcfile) === null || _a === void 0 ? void 0 : _a.projects) === null || _b === void 0 ? void 0 : _b.default;
+async function doSetup(setup, projectId) {
     setup.frameworks = {};
     utils.logBullet("First we need a few details to create your service.");
     await (0, prompt_1.promptOnce)({
@@ -46,12 +44,18 @@ async function doSetup(setup) {
         message: "How do you want to deploy",
         choices: constants_1.ALLOWED_DEPLOY_METHODS,
     }, setup.frameworks);
-    await getOrCreateStack(projectId, setup);
+    const stack = await getOrCreateStack(projectId, setup);
+    if (stack) {
+        utils.logSuccess(`Successfully created a stack: ${stack.name}`);
+    }
 }
 exports.doSetup = doSetup;
-function toStack(cloudBuildConnRepo, stackId) {
+function toStack(cloudBuildConnRepo) {
     return {
-        name: stackId,
+        codebase: {
+            repository: `${cloudBuildConnRepo.name}`,
+            rootDirectory: "/",
+        },
         labels: {},
     };
 }
@@ -65,9 +69,9 @@ async function getOrCreateStack(projectId, setup) {
         if (err.status === 404) {
             logger_1.logger.info("Creating new stack.");
             if (deployMethod === "github") {
-                const cloudBuildConnRepo = await repo.linkGitHubRepository(projectId, location, setup.frameworks.serviceName);
-                const stackDetails = toStack(cloudBuildConnRepo, setup.frameworks.serviceName);
-                return await createStack(projectId, location, stackDetails);
+                const cloudBuildConnRepo = await repo.linkGitHubRepository(projectId, location);
+                const stackDetails = toStack(cloudBuildConnRepo);
+                return await createStack(projectId, location, stackDetails, setup.frameworks.serviceName);
             }
         }
         else {
@@ -78,7 +82,7 @@ async function getOrCreateStack(projectId, setup) {
 }
 exports.getOrCreateStack = getOrCreateStack;
 async function getExistingStack(projectId, setup, location) {
-    let stack = await gcp.getStack(projectId, location, setup.frameworks.serviceName);
+    let stack = await gcp.getBackend(projectId, location, setup.frameworks.serviceName);
     while (stack) {
         setup.frameworks.serviceName = undefined;
         await (0, prompt_1.promptOnce)({
@@ -97,14 +101,14 @@ async function getExistingStack(projectId, setup, location) {
             default: "acme-inc-web",
             message: "Please enter a new service name [1-30 characters]",
         }, setup.frameworks);
-        stack = await gcp.getStack(projectId, location, setup.frameworks.serviceName);
+        stack = await gcp.getBackend(projectId, location, setup.frameworks.serviceName);
         setup.frameworks.existingStack = undefined;
     }
     return stack;
 }
-async function createStack(projectId, location, stackInput) {
-    const op = await gcp.createStack(projectId, location, stackInput);
-    const stack = await poller.pollOperation(Object.assign(Object.assign({}, frameworksPollerOptions), { pollerName: `create-${projectId}-${location}-${stackInput.name}`, operationResourceName: op.name }));
+async function createStack(projectId, location, stackReqBoby, stackId) {
+    const op = await gcp.createStack(projectId, location, stackReqBoby, stackId);
+    const stack = await poller.pollOperation(Object.assign(Object.assign({}, frameworksPollerOptions), { pollerName: `create-${projectId}-${location}-${stackId}`, operationResourceName: op.name }));
     return stack;
 }
 exports.createStack = createStack;

package/lib/init/features/frameworks/repo.js

@@ -21,11 +21,15 @@ function extractRepoSlugFromURI(remoteUri) {
     }
     return match[1];
 }
-function generateRepositoryId() {
-    return `composer-repo`;
+function generateRepositoryId(remoteUri) {
+    var _a;
+    return (_a = extractRepoSlugFromURI(remoteUri)) === null || _a === void 0 ? void 0 : _a.replaceAll("/", "-");
 }
-async function linkGitHubRepository(projectId, location, stackId) {
-    const connectionId = stackId;
+function generateConnectionId(location) {
+    return `frameworks-${location}`;
+}
+async function linkGitHubRepository(projectId, location) {
+    const connectionId = generateConnectionId(location);
     await getOrCreateConnection(projectId, location, connectionId);
     let remoteUri = await promptRepositoryURI(projectId, location, connectionId);
     while (remoteUri === "") {
@@ -92,7 +96,7 @@ async function getOrCreateConnection(projectId, location, connectionId) {
 }
 exports.getOrCreateConnection = getOrCreateConnection;
 async function getOrCreateRepository(projectId, location, connectionId, remoteUri) {
-    const repositoryId = generateRepositoryId();
+    const repositoryId = generateRepositoryId(remoteUri);
     if (!repositoryId) {
         throw new error_1.FirebaseError(`Failed to generate repositoryId for URI "${remoteUri}".`);
     }

package/package.json

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