firebase-tools 12.7.0 → 12.8.0

package/lib/commands/frameworks-stacks-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("stacks:create")
+    .description("Create a stack 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-stacks-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("stacks:delete")
+    .description("Delete a stack from a Firebase project")
+    .option("-l, --location <location>", "App Backend location", "us-central1")
+    .option("-s, --stackId <stackId>", "Stack Id", "")
+    .withForce()
+    .action(async (options) => {
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const location = options.location;
+    const stackId = options.stackId;
+    if (!stackId) {
+        throw new error_1.FirebaseError("Stack 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 Stack with id: " + stackId + "\n  Are you sure?",
+    }, options);
+    if (!confirmDeletion) {
+        throw new error_1.FirebaseError("Deletion aborted.");
+    }
+    try {
+        await gcp.deleteStack(projectId, location, stackId);
+        utils.logSuccess(`Successfully deleted the stack: ${stackId}`);
+    }
+    catch (err) {
+        throw new error_1.FirebaseError(`Failed to delete stack: ${stackId}. Please check the parameters you have provided.`, { original: err });
+    }
+});

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

@@ -0,0 +1,29 @@
+"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");
+exports.command = new command_1.Command("stacks:get")
+    .description("Get stack details of a Firebase project")
+    .option("-l, --location <location>", "App Backend location", "us-central1")
+    .option("--s, --stackId <stackId>", "Stack Id", "")
+    .action(async (options) => {
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const location = options.location;
+    const stackId = options.stackId;
+    if (!stackId) {
+        throw new error_1.FirebaseError("Stack id can't be empty.");
+    }
+    let stack;
+    try {
+        stack = await gcp.getStack(projectId, location, stackId);
+        logger_1.logger.info(stack);
+    }
+    catch (err) {
+        throw new error_1.FirebaseError(`Failed to get stack: ${stackId}. Please check the parameters you have provided.`, { original: err });
+    }
+    return stack;
+});

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

@@ -0,0 +1,24 @@
+"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");
+exports.command = new command_1.Command("stacks:list")
+    .description("List stacks 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;
+    let stacks;
+    try {
+        stacks = await gcp.listStack(projectId, location);
+        logger_1.logger.info(stacks);
+    }
+    catch (err) {
+        throw new error_1.FirebaseError(`Unable to list stacks present in project: ${projectId}. Please check the parameters you have provided.`, { original: err });
+    }
+    return stacks;
+});

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.stacks = {};
+        client.frameworks.stacks.list = loadCommand("frameworks-stacks-list");
+        client.frameworks.stacks.create = loadCommand("frameworks-stacks-create");
+        client.frameworks.stacks.create = loadCommand("frameworks-stacks-get");
+        client.frameworks.stacks.create = loadCommand("frameworks-stacks-delete");
+    }
     client.login = loadCommand("login");
     client.login.add = loadCommand("login-add");
     client.login.ci = loadCommand("login-ci");

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.deleteStack = exports.listStack = exports.getStack = 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}`;
+    const name = `projects/${projectId}/locations/${location}/backends/${stackId}`;
     const res = await client.get(name);
     return res.body;
 }
 exports.getStack = getStack;
+async function listStack(projectId, location) {
+    const name = `projects/${projectId}/locations/${location}/backends`;
+    const res = await client.get(name);
+    return res.body;
+}
+exports.listStack = listStack;
+async function deleteStack(projectId, location, stackId) {
+    const name = `projects/${projectId}/locations/${location}/backends/${stackId}`;
+    const res = await client.delete(name);
+    return res.body;
+}
+exports.deleteStack = deleteStack;
 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 {
@@ -102,9 +106,9 @@ async function getExistingStack(projectId, setup, location) {
     }
     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.0",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {