firebase-tools 13.34.0 → 13.35.0

package/lib/gcp/artifactregistry.js

@@ -1,16 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deletePackage = exports.API_VERSION = void 0;
+exports.updateRepository = exports.getRepository = exports.deletePackage = exports.ensureApiEnabled = exports.API_VERSION = void 0;
 const apiv2_1 = require("../apiv2");
 const api_1 = require("../api");
-exports.API_VERSION = "v1beta2";
+const metaprogramming_1 = require("../metaprogramming");
+const api = require("../ensureApiEnabled");
+const proto = require("./proto");
+exports.API_VERSION = "v1";
 const client = new apiv2_1.Client({
     urlPrefix: (0, api_1.artifactRegistryDomain)(),
     auth: true,
     apiVersion: exports.API_VERSION,
 });
+function ensureApiEnabled(projectId) {
+    return api.ensure(projectId, (0, api_1.artifactRegistryDomain)(), "artifactregistry", true);
+}
+exports.ensureApiEnabled = ensureApiEnabled;
+(0, metaprogramming_1.assertImplements)();
 async function deletePackage(name) {
     const res = await client.delete(name);
     return res.body;
 }
 exports.deletePackage = deletePackage;
+async function getRepository(repoPath) {
+    const res = await client.get(repoPath);
+    return res.body;
+}
+exports.getRepository = getRepository;
+async function updateRepository(repo) {
+    const updateMask = proto.fieldMasks(repo, "cleanupPolicies", "labels");
+    if (updateMask.length === 0) {
+        const res = await client.get(repo.name);
+        return res.body;
+    }
+    const res = await client.patch(`/${repo.name}`, repo, {
+        queryParams: { updateMask: updateMask.join(",") },
+    });
+    return res.body;
+}
+exports.updateRepository = updateRepository;

package/lib/gcp/cloudsql/connect.js

@@ -59,25 +59,35 @@ async function execute(sqlStatements, opts) {
             break;
         }
     }
+    const cleanUpFn = async () => {
+        conn.release();
+        await pool.end();
+        connector.close();
+    };
     const conn = await pool.connect();
     const results = [];
     logFn(`Logged in as ${opts.username}`);
+    if (opts.transaction) {
+        sqlStatements.unshift("BEGIN;");
+        sqlStatements.push("COMMIT;");
+    }
     for (const s of sqlStatements) {
         logFn(`Executing: '${s}'`);
         try {
             results.push(await conn.query(s));
         }
         catch (err) {
+            logFn(`Rolling back transaction due to error ${err}}`);
+            await conn.query("ROLLBACK;");
+            await cleanUpFn();
             throw new error_1.FirebaseError(`Error executing ${err}`);
         }
     }
-    conn.release();
-    await pool.end();
-    connector.close();
+    await cleanUpFn();
     return results;
 }
 exports.execute = execute;
-async function executeSqlCmdsAsIamUser(options, instanceId, databaseId, cmds, silent = false) {
+async function executeSqlCmdsAsIamUser(options, instanceId, databaseId, cmds, silent = false, transaction = false) {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const { user: iamUser } = await getIAMUser(options);
     return await execute(cmds, {
@@ -86,10 +96,11 @@ async function executeSqlCmdsAsIamUser(options, instanceId, databaseId, cmds, si
         databaseId,
         username: iamUser,
         silent: silent,
+        transaction: transaction,
     });
 }
 exports.executeSqlCmdsAsIamUser = executeSqlCmdsAsIamUser;
-async function executeSqlCmdsAsSuperUser(options, instanceId, databaseId, cmds, silent = false) {
+async function executeSqlCmdsAsSuperUser(options, instanceId, databaseId, cmds, silent = false, transaction = false) {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const superuser = "firebasesuperuser";
     const temporaryPassword = utils.generateId(20);
@@ -101,6 +112,7 @@ async function executeSqlCmdsAsSuperUser(options, instanceId, databaseId, cmds,
         username: superuser,
         password: temporaryPassword,
         silent: silent,
+        transaction: transaction,
     });
 }
 exports.executeSqlCmdsAsSuperUser = executeSqlCmdsAsSuperUser;

package/lib/gcp/cloudsql/permissions_setup.js

@@ -66,23 +66,24 @@ async function checkSQLRoleIsGranted(options, instanceId, databaseId, grantedRol
 exports.checkSQLRoleIsGranted = checkSQLRoleIsGranted;
 async function setupSQLPermissions(instanceId, databaseId, schemaInfo, options, silent = false) {
     const schema = schemaInfo.name;
-    logger_1.logger.info(`Attempting to Setup SQL schema "${schema}".`);
+    logger_1.logger.info(`Detected schema "${schema}" setup status is ${schemaInfo.setupStatus}. Running setup...`);
     const userIsCSQLAdmin = await (0, cloudsqladmin_1.iamUserIsCSQLAdmin)(options);
     if (!userIsCSQLAdmin) {
         throw new error_1.FirebaseError(`Missing required IAM permission to setup SQL schemas. SQL schema setup requires 'roles/cloudsql.admin' or an equivalent role.`);
     }
     await (0, connect_1.setupIAMUsers)(instanceId, databaseId, options);
+    let runGreenfieldSetup = false;
     if (schemaInfo.setupStatus === SchemaSetupStatus.GreenField) {
-        logger_1.logger.info(`Database ${databaseId} has already been setup. Rerunning setup to repair any missing permissions.`);
-        await greenFieldSchemaSetup(instanceId, databaseId, schema, options, silent);
-        return SchemaSetupStatus.GreenField;
-    }
-    else {
-        logger_1.logger.info(`Detected schema "${schema}" setup status is ${schemaInfo.setupStatus}.`);
+        runGreenfieldSetup = true;
+        logger_1.logger.info(`Database ${databaseId} has already been setup as greenfield project. Rerunning setup to repair any missing permissions.`);
     }
     if (schemaInfo.tables.length === 0) {
+        runGreenfieldSetup = true;
         logger_1.logger.info(`Found no tables in schema "${schema}", assuming greenfield project.`);
-        await greenFieldSchemaSetup(instanceId, databaseId, schema, options, silent);
+    }
+    if (runGreenfieldSetup) {
+        const greenfieldSetupCmds = await greenFieldSchemaSetup(instanceId, databaseId, schema, options);
+        await (0, connect_2.executeSqlCmdsAsSuperUser)(options, instanceId, databaseId, greenfieldSetupCmds, silent, true);
         logger_1.logger.info(clc.green("Database setup complete."));
         return SchemaSetupStatus.GreenField;
     }
@@ -99,6 +100,8 @@ async function setupSQLPermissions(instanceId, databaseId, schemaInfo, options,
     });
     if (shouldSetupGreenfield) {
         await setupBrownfieldAsGreenfield(instanceId, databaseId, schemaInfo, options, silent);
+        logger_1.logger.info(clc.green("Database setup complete."));
+        logger_1.logger.info(clc.yellow("IMPORTANT: please uncomment 'schemaValidation: \"COMPATIBLE\"' in your dataconnect.yaml file to avoid dropping any existing tables by mistake."));
         return SchemaSetupStatus.GreenField;
     }
     else {
@@ -110,7 +113,7 @@ async function setupSQLPermissions(instanceId, databaseId, schemaInfo, options,
     }
 }
 exports.setupSQLPermissions = setupSQLPermissions;
-async function greenFieldSchemaSetup(instanceId, databaseId, schema, options, silent = false) {
+async function greenFieldSchemaSetup(instanceId, databaseId, schema, options) {
     const revokes = [];
     if (await checkSQLRoleIsGranted(options, instanceId, databaseId, "cloudsqlsuperuser", (0, permissions_1.firebaseowner)(databaseId))) {
         logger_1.logger.warn("Detected cloudsqlsuperuser was previously given to firebase owner, revoking to improve database security.");
@@ -120,7 +123,7 @@ async function greenFieldSchemaSetup(instanceId, databaseId, schema, options, si
     const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);
     const { user: fdcP4SAUser } = (0, connect_3.toDatabaseUser)((0, connect_3.getDataConnectP4SA)(projectNumber));
     const sqlRoleSetupCmds = (0, lodash_1.concat)(revokes, [`CREATE SCHEMA IF NOT EXISTS "${schema}"`], (0, permissions_1.ownerRolePermissions)(databaseId, permissions_1.FIREBASE_SUPER_USER, schema), (0, permissions_1.writerRolePermissions)(databaseId, permissions_1.FIREBASE_SUPER_USER, schema), (0, permissions_1.readerRolePermissions)(databaseId, permissions_1.FIREBASE_SUPER_USER, schema), `GRANT "${(0, permissions_1.firebaseowner)(databaseId, schema)}" TO "${user}"`, `GRANT "${(0, permissions_1.firebasewriter)(databaseId, schema)}" TO "${fdcP4SAUser}"`, (0, permissions_1.defaultPermissions)(databaseId, schema, (0, permissions_1.firebaseowner)(databaseId, schema)));
-    await (0, connect_2.executeSqlCmdsAsSuperUser)(options, instanceId, databaseId, sqlRoleSetupCmds, silent);
+    return sqlRoleSetupCmds;
 }
 exports.greenFieldSchemaSetup = greenFieldSchemaSetup;
 async function getSchemaMetadata(instanceId, databaseId, schema, options) {
@@ -172,18 +175,28 @@ async function getSchemaMetadata(instanceId, databaseId, schema, options) {
 exports.getSchemaMetadata = getSchemaMetadata;
 async function setupBrownfieldAsGreenfield(instanceId, databaseId, schemaInfo, options, silent = false) {
     const schema = schemaInfo.name;
-    await greenFieldSchemaSetup(instanceId, databaseId, schema, options, silent);
     const firebaseOwnerRole = (0, permissions_1.firebaseowner)(databaseId, schema);
     const nonFirebasetablesOwners = [...new Set(schemaInfo.tables.map((t) => t.owner))].filter((owner) => owner !== firebaseOwnerRole);
+    const grantOwnersToSuperuserCmds = nonFirebasetablesOwners.map((owner) => `GRANT "${owner}" TO "${permissions_1.FIREBASE_SUPER_USER}"`);
+    const revokeOwnersFromSuperuserCmds = nonFirebasetablesOwners.map((owner) => `REVOKE "${owner}" FROM "${permissions_1.FIREBASE_SUPER_USER}"`);
+    const greenfieldSetupCmds = await greenFieldSchemaSetup(instanceId, databaseId, schema, options);
     const grantCmds = nonFirebasetablesOwners.map((owner) => `GRANT "${(0, permissions_1.firebasewriter)(databaseId, schema)}" TO "${owner}"`);
     const alterTableCmds = schemaInfo.tables.map((table) => `ALTER TABLE "${schema}"."${table.name}" OWNER TO "${firebaseOwnerRole}";`);
-    await (0, connect_2.executeSqlCmdsAsSuperUser)(options, instanceId, databaseId, [...grantCmds, ...alterTableCmds], silent);
+    const setupCmds = [
+        ...grantOwnersToSuperuserCmds,
+        ...greenfieldSetupCmds,
+        ...grantCmds,
+        ...alterTableCmds,
+        ...revokeOwnersFromSuperuserCmds,
+    ];
+    await (0, connect_2.executeSqlCmdsAsSuperUser)(options, instanceId, databaseId, setupCmds, silent, true);
 }
 exports.setupBrownfieldAsGreenfield = setupBrownfieldAsGreenfield;
 async function brownfieldSqlSetup(instanceId, databaseId, schemaInfo, options, silent = false) {
     const schema = schemaInfo.name;
     const uniqueTablesOwners = [...new Set(schemaInfo.tables.map((t) => t.owner))];
-    const grantOwnersToFirebasesuperuser = uniqueTablesOwners.map((owner) => `GRANT ${owner} TO ${permissions_1.FIREBASE_SUPER_USER}`);
+    const grantOwnersToFirebasesuperuser = uniqueTablesOwners.map((owner) => `GRANT "${owner}" TO "${permissions_1.FIREBASE_SUPER_USER}"`);
+    const revokeOwnersFromFirebasesuperuser = uniqueTablesOwners.map((owner) => `REVOKE "${owner}" FROM "${permissions_1.FIREBASE_SUPER_USER}"`);
     const iamUser = (await (0, connect_2.getIAMUser)(options)).user;
     const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);
     const { user: fdcP4SAUser } = (0, connect_3.toDatabaseUser)((0, connect_3.getDataConnectP4SA)(projectNumber));
@@ -195,7 +208,8 @@ async function brownfieldSqlSetup(instanceId, databaseId, schemaInfo, options, s
         `GRANT "${(0, permissions_1.firebasewriter)(databaseId, schema)}" TO "${iamUser}"`,
         `GRANT "${(0, permissions_1.firebasewriter)(databaseId, schema)}" TO "${fdcP4SAUser}"`,
         ...firebaseDefaultPermissions,
+        ...revokeOwnersFromFirebasesuperuser,
     ];
-    await (0, connect_2.executeSqlCmdsAsSuperUser)(options, instanceId, databaseId, brownfieldSetupCmds, silent);
+    await (0, connect_2.executeSqlCmdsAsSuperUser)(options, instanceId, databaseId, brownfieldSetupCmds, silent, true);
 }
 exports.brownfieldSqlSetup = brownfieldSqlSetup;

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

@@ -59,7 +59,7 @@ async function doSetup(setup, config) {
         await sdk.doSetup(setup, config);
     }
     else {
-        (0, utils_1.logBullet)(`If you'd like to add the generated SDK to your app your, run ${clc.bold("firebase init dataconnect:sdk")}`);
+        (0, utils_1.logBullet)(`If you'd like to add the generated SDK to your app later, run ${clc.bold("firebase init dataconnect:sdk")}`);
     }
     if (setup.projectId && !isBillingEnabled) {
         (0, utils_1.logBullet)((0, freeTrial_1.upgradeInstructions)(setup.projectId));

package/lib/init/features/dataconnect/sdk.js

@@ -14,6 +14,7 @@ const dataconnectEmulator_1 = require("../../../emulator/dataconnectEmulator");
 const error_1 = require("../../../error");
 const lodash_1 = require("lodash");
 const utils_1 = require("../../../utils");
+const auth_1 = require("../../../auth");
 exports.FDC_APP_FOLDER = "_FDC_APP_FOLDER";
 async function doSetup(setup, config) {
     const sdkInfo = await askQuestions(setup, config);
@@ -78,12 +79,13 @@ async function askQuestions(setup, config) {
     const newConnectorYaml = await generateSdkYaml(targetPlatform, connectorYaml, connectorInfo.directory, appDir);
     if (targetPlatform === types_1.Platform.WEB) {
         const unusedFrameworks = fileUtils_1.SUPPORTED_FRAMEWORKS.filter((framework) => { var _a; return !((_a = newConnectorYaml.generate) === null || _a === void 0 ? void 0 : _a.javascriptSdk[framework]); });
+        const hasFrameworkEnabled = unusedFrameworks.length < fileUtils_1.SUPPORTED_FRAMEWORKS.length;
         if (unusedFrameworks.length > 0) {
             const additionalFrameworks = await (0, prompt_1.prompt)(setup, [
                 {
                     type: "checkbox",
                     name: "fdcFrameworks",
-                    message: "Which framework would you like to generate SDKs for? " +
+                    message: `Which ${hasFrameworkEnabled && "additional "}frameworks would you like to generate SDKs for? ` +
                         "Press Space to select features, then Enter to confirm your choices.",
                     choices: unusedFrameworks.map((frameworkStr) => ({
                         value: frameworkStr,
@@ -125,6 +127,7 @@ async function generateSdkYaml(targetPlatform, connectorYaml, connectorDir, appD
         if (packageJson) {
             const frameworksUsed = (0, fileUtils_1.getFrameworksFromPackageJson)(packageJson);
             for (const framework of frameworksUsed) {
+                (0, utils_1.logBullet)(`Detected ${framework} app. Enabling ${framework} generated SDKs.`);
                 javascriptSdk[framework] = true;
             }
         }
@@ -155,17 +158,34 @@ async function generateSdkYaml(targetPlatform, connectorYaml, connectorDir, appD
 }
 exports.generateSdkYaml = generateSdkYaml;
 async function actuate(sdkInfo) {
-    var _a;
+    var _a, _b;
     const connectorYamlPath = `${sdkInfo.connectorInfo.directory}/connector.yaml`;
     fs.writeFileSync(connectorYamlPath, sdkInfo.connectorYamlContents, "utf8");
     (0, utils_1.logBullet)(`Wrote new config to ${connectorYamlPath}`);
+    const account = (0, auth_1.getGlobalDefaultAccount)();
     await dataconnectEmulator_1.DataConnectEmulator.generate({
         configDir: sdkInfo.connectorInfo.directory,
         connectorId: sdkInfo.connectorInfo.connectorYaml.connectorId,
+        account,
     });
     (0, utils_1.logBullet)(`Generated SDK code for ${sdkInfo.connectorInfo.connectorYaml.connectorId}`);
     if (((_a = sdkInfo.connectorInfo.connectorYaml.generate) === null || _a === void 0 ? void 0 : _a.swiftSdk) && sdkInfo.displayIOSWarning) {
-        (0, utils_1.logBullet)(clc.bold("Please follow the instructions here to add your generated sdk to your XCode project:\n\thttps://firebase.google.com/docs/data-connect/gp/ios-sdk#set-client"));
+        (0, utils_1.logBullet)(clc.bold("Please follow the instructions here to add your generated sdk to your XCode project:\n\thttps://firebase.google.com/docs/data-connect/ios-sdk#set-client"));
+    }
+    if ((_b = sdkInfo.connectorInfo.connectorYaml.generate) === null || _b === void 0 ? void 0 : _b.javascriptSdk) {
+        for (const framework of fileUtils_1.SUPPORTED_FRAMEWORKS) {
+            if (sdkInfo.connectorInfo.connectorYaml.generate.javascriptSdk[framework]) {
+                logInfoForFramework(framework);
+            }
+        }
     }
 }
 exports.actuate = actuate;
+function logInfoForFramework(framework) {
+    if (framework === "react") {
+        (0, utils_1.logBullet)("Visit https://firebase.google.com/docs/data-connect/web-sdk#react for more information on how to set up React Generated SDKs for Firebase Data Connect");
+    }
+    else if (framework === "angular") {
+        (0, utils_1.logBullet)("Run `npm i --save @angular/fire @tanstack-query-firebase/angular @tanstack/angular-query-experimental` to install angular sdk dependencies.\nVisit https://github.com/invertase/tanstack-query-firebase/tree/main/packages/angular for more information on how to set up Angular Generated SDKs for Firebase Data Connect");
+    }
+}

package/package.json

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

package/templates/init/dataconnect/connector.yaml

@@ -8,7 +8,7 @@ connectorId: __connectorId__
 #     packageJsonDir: < Optional. Path to your Javascript app's package.json>
 #   swiftSdk:
 #     outputDir: <Path where you want the generated SDK to be written to, relative to this file>
-#     package: "firebasegen/default"
+#     package: DefaultConnector
 #   kotlinSdk:
 #     outputDir: <Path where you want the generated SDK to be written to, relative to this file>
 #     package: connectors.default