firebase-tools 14.12.1 → 14.14.0

package/lib/extensions/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getResourceRuntime = exports.formatTimestamp = exports.getRandomString = exports.convertOfficialExtensionsToList = exports.convertExtensionOptionToLabeledList = void 0;
+exports.getResourceRuntime = exports.formatTimestamp = exports.getRandomString = exports.convertExtensionOptionToLabeledList = void 0;
 const types_1 = require("./types");
 function convertExtensionOptionToLabeledList(options) {
     return options.map((option) => {
@@ -12,17 +12,6 @@ function convertExtensionOptionToLabeledList(options) {
     });
 }
 exports.convertExtensionOptionToLabeledList = convertExtensionOptionToLabeledList;
-function convertOfficialExtensionsToList(officialExts) {
-    const l = Object.entries(officialExts).map(([key, entry]) => {
-        return {
-            checked: false,
-            value: `${entry.publisher}/${key}`,
-        };
-    });
-    l.sort((a, b) => a.value.localeCompare(b.value));
-    return l;
-}
-exports.convertOfficialExtensionsToList = convertOfficialExtensionsToList;
 function getRandomString(length) {
     const SUFFIX_CHAR_SET = "abcdefghijklmnopqrstuvwxyz0123456789";
     let result = "";

package/lib/firestore/api.js

@@ -6,6 +6,7 @@ const logger_1 = require("../logger");
 const utils = require("../utils");
 const validator = require("./validator");
 const types = require("./api-types");
+const api_types_1 = require("./api-types");
 const sort = require("./api-sort");
 const util = require("./util");
 const prompt_1 = require("../prompt");
@@ -13,6 +14,7 @@ const api_1 = require("../api");
 const error_1 = require("../error");
 const apiv2_1 = require("../apiv2");
 const pretty_print_1 = require("./pretty-print");
+const functional_1 = require("../functional");
 class FirestoreApi {
     constructor() {
         this.apiClient = new apiv2_1.Client({ urlPrefix: (0, api_1.firestoreOrigin)(), apiVersion: "v1" });
@@ -33,6 +35,7 @@ class FirestoreApi {
         });
     }
     async deploy(options, indexes, fieldOverrides, databaseId = "(default)") {
+        var _a;
         const spec = this.upgradeOldSpec({
             indexes,
             fieldOverrides,
@@ -42,8 +45,10 @@ class FirestoreApi {
         const fieldOverridesToDeploy = spec.fieldOverrides;
         const existingIndexes = await this.listIndexes(options.project, databaseId);
         const existingFieldOverrides = await this.listFieldOverrides(options.project, databaseId);
+        const database = await this.getDatabase(options.project, databaseId);
+        const edition = (_a = database.databaseEdition) !== null && _a !== void 0 ? _a : api_types_1.DatabaseEdition.STANDARD;
         const indexesToDelete = existingIndexes.filter((index) => {
-            return !indexesToDeploy.some((spec) => this.indexMatchesSpec(index, spec));
+            return !indexesToDeploy.some((spec) => this.indexMatchesSpec(index, spec, edition));
         });
         const fieldOverridesToDelete = existingFieldOverrides.filter((field) => {
             return !fieldOverridesToDeploy.some((spec) => {
@@ -79,7 +84,7 @@ class FirestoreApi {
             }
         }
         for (const index of indexesToDeploy) {
-            const exists = existingIndexes.some((x) => this.indexMatchesSpec(x, index));
+            const exists = existingIndexes.some((x) => this.indexMatchesSpec(x, index, edition));
             if (exists) {
                 logger_1.logger.debug(`Skipping existing index: ${JSON.stringify(index)}`);
             }
@@ -222,8 +227,9 @@ class FirestoreApi {
         if (index.multikey) {
             validator.assertType("multikey", index.multikey, "boolean");
         }
-        if (index.unique) {
+        if (index.unique !== undefined) {
             validator.assertType("unique", index.unique, "boolean");
+            throw new error_1.FirebaseError("The `unique` index configuration is not supported yet.");
         }
         validator.assertHas(index, "fields");
         index.fields.forEach((field) => {
@@ -328,7 +334,18 @@ class FirestoreApi {
         const url = index.name;
         return this.apiClient.delete(`/${url}`);
     }
-    indexMatchesSpec(index, spec) {
+    optionalApiScopeMatches(lhs, rhs) {
+        return (0, functional_1.optionalValueMatches)(lhs, rhs, types.ApiScope.ANY_API);
+    }
+    optionalDensityMatches(lhs, rhs, edition) {
+        const defaultValue = edition === api_types_1.DatabaseEdition.STANDARD ? types.Density.SPARSE_ALL : types.Density.DENSE;
+        return (0, functional_1.optionalValueMatches)(lhs, rhs, defaultValue);
+    }
+    optionalMultikeyMatches(lhs, rhs) {
+        const defaultValue = false;
+        return (0, functional_1.optionalValueMatches)(lhs, rhs, defaultValue);
+    }
+    indexMatchesSpec(index, spec, edition) {
         const collection = util.parseIndexName(index.name).collectionGroupId;
         if (collection !== spec.collectionGroup) {
             return false;
@@ -336,16 +353,13 @@ class FirestoreApi {
         if (index.queryScope !== spec.queryScope) {
             return false;
         }
-        if (index.apiScope !== spec.apiScope) {
-            return false;
-        }
-        if (index.density !== spec.density) {
+        if (!this.optionalApiScopeMatches(index.apiScope, spec.apiScope)) {
             return false;
         }
-        if (index.multikey !== spec.multikey) {
+        if (!this.optionalDensityMatches(index.density, spec.density, edition)) {
             return false;
         }
-        if (index.unique !== spec.unique) {
+        if (!this.optionalMultikeyMatches(index.multikey, spec.multikey)) {
             return false;
         }
         if (index.fields.length !== spec.fields.length) {
@@ -364,7 +378,7 @@ class FirestoreApi {
             if (iField.arrayConfig !== sField.arrayConfig) {
                 return false;
             }
-            if (iField.vectorConfig !== sField.vectorConfig) {
+            if (!utils.deepEqual(iField.vectorConfig, sField.vectorConfig)) {
                 return false;
             }
             i++;

package/lib/firestore/pretty-print.js

@@ -177,6 +177,13 @@ class PrettyPrint {
             }
             result += `(${field.fieldPath},${configString}) `;
         });
+        result += " -- ";
+        if (index.density !== undefined) {
+            result += clc.cyan(`Density:${index.density} `);
+        }
+        if (index.multikey !== undefined) {
+            result += clc.cyan(`Multikey:${index.multikey ? "YES" : "NO"}`);
+        }
         return result;
     }
     prettyBackupString(backup) {

package/lib/functional.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nullsafeVisitor = exports.mapObject = exports.partitionRecord = exports.partition = exports.assertExhaustive = exports.zipIn = exports.zip = exports.reduceFlat = exports.flatten = exports.flattenArray = exports.flattenObject = void 0;
+exports.optionalValueMatches = exports.nullsafeVisitor = exports.mapObject = exports.partitionRecord = exports.partition = exports.assertExhaustive = exports.zipIn = exports.zip = exports.reduceFlat = exports.flatten = exports.flattenArray = exports.flattenObject = void 0;
 function* flattenObject(obj) {
     function* helper(path, obj) {
         for (const [k, v] of Object.entries(obj)) {
@@ -85,3 +85,9 @@ const nullsafeVisitor = (func, ...rest) => (first) => {
     return func(first, ...rest);
 };
 exports.nullsafeVisitor = nullsafeVisitor;
+function optionalValueMatches(lhs, rhs, defaultValue) {
+    lhs = lhs === undefined ? defaultValue : lhs;
+    rhs = rhs === undefined ? defaultValue : rhs;
+    return lhs === rhs;
+}
+exports.optionalValueMatches = optionalValueMatches;

package/lib/functions/env.js

@@ -140,7 +140,7 @@ function parseStrict(data) {
     return envs;
 }
 exports.parseStrict = parseStrict;
-function findEnvfiles(functionsSource, projectId, projectAlias, isEmulator) {
+function findEnvfiles(configDir, projectId, projectAlias, isEmulator) {
     const files = [".env"];
     files.push(`.env.${projectId}`);
     if (projectAlias) {
@@ -150,26 +150,28 @@ function findEnvfiles(functionsSource, projectId, projectAlias, isEmulator) {
         files.push(FUNCTIONS_EMULATOR_DOTENV);
     }
     return files
-        .map((f) => path.join(functionsSource, f))
+        .map((f) => path.join(configDir, f))
         .filter(fs.existsSync)
         .map((p) => path.basename(p));
 }
-function hasUserEnvs({ functionsSource, projectId, projectAlias, isEmulator, }) {
-    return findEnvfiles(functionsSource, projectId, projectAlias, isEmulator).length > 0;
+function hasUserEnvs(opts) {
+    const configDir = opts.configDir || opts.functionsSource;
+    return findEnvfiles(configDir, opts.projectId, opts.projectAlias, opts.isEmulator).length > 0;
 }
 exports.hasUserEnvs = hasUserEnvs;
 function writeUserEnvs(toWrite, envOpts) {
     if (Object.keys(toWrite).length === 0) {
         return;
     }
-    const { functionsSource, projectId, projectAlias, isEmulator } = envOpts;
-    const allEnvFiles = findEnvfiles(functionsSource, projectId, projectAlias, isEmulator);
+    const { projectId, projectAlias, isEmulator } = envOpts;
+    const configDir = envOpts.configDir || envOpts.functionsSource;
+    const allEnvFiles = findEnvfiles(configDir, projectId, projectAlias, isEmulator);
     const targetEnvFile = envOpts.isEmulator
         ? FUNCTIONS_EMULATOR_DOTENV
         : `.env.${envOpts.projectId}`;
     const targetEnvFileExists = allEnvFiles.includes(targetEnvFile);
     if (!targetEnvFileExists) {
-        fs.writeFileSync(path.join(envOpts.functionsSource, targetEnvFile), "", { flag: "wx" });
+        fs.writeFileSync(path.join(configDir, targetEnvFile), "", { flag: "wx" });
         (0, utils_1.logBullet)(clc.yellow(clc.bold("functions: ")) +
             `Created new local file ${targetEnvFile} to store param values. We suggest explicitly adding or excluding this file from version control.`);
     }
@@ -186,7 +188,7 @@ function writeUserEnvs(toWrite, envOpts) {
     for (const k of Object.keys(toWrite)) {
         lines += formatUserEnvForWrite(k, toWrite[k]);
     }
-    fs.appendFileSync(path.join(functionsSource, targetEnvFile), lines);
+    fs.appendFileSync(path.join(configDir, targetEnvFile), lines);
 }
 exports.writeUserEnvs = writeUserEnvs;
 function checkForDuplicateKeys(isEmulator, keys, fullEnv, envsWithoutLocal) {
@@ -210,22 +212,24 @@ function formatUserEnvForWrite(key, value) {
     }
     return `${key}=${escapedValue}\n`;
 }
-function loadUserEnvs({ functionsSource, projectId, projectAlias, isEmulator, }) {
+function loadUserEnvs(opts) {
     var _a;
-    const envFiles = findEnvfiles(functionsSource, projectId, projectAlias, isEmulator);
+    const configDir = opts.configDir || opts.functionsSource;
+    const envFiles = findEnvfiles(configDir, opts.projectId, opts.projectAlias, opts.isEmulator);
     if (envFiles.length === 0) {
         return {};
     }
-    if (projectAlias) {
-        if (envFiles.includes(`.env.${projectId}`) && envFiles.includes(`.env.${projectAlias}`)) {
-            throw new error_1.FirebaseError(`Can't have both dotenv files with projectId (env.${projectId}) ` +
-                `and projectAlias (.env.${projectAlias}) as extensions.`);
+    if (opts.projectAlias) {
+        if (envFiles.includes(`.env.${opts.projectId}`) &&
+            envFiles.includes(`.env.${opts.projectAlias}`)) {
+            throw new error_1.FirebaseError(`Can't have both dotenv files with projectId (env.${opts.projectId}) ` +
+                `and projectAlias (.env.${opts.projectAlias}) as extensions.`);
         }
     }
     let envs = {};
     for (const f of envFiles) {
         try {
-            const data = fs.readFileSync(path.join(functionsSource, f), "utf8");
+            const data = fs.readFileSync(path.join(configDir, f), "utf8");
             envs = Object.assign(Object.assign({}, envs), parseStrict(data));
         }
         catch (err) {

package/lib/functions/projectConfig.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.configForCodebase = exports.normalizeAndValidate = exports.validate = exports.assertUnique = exports.validateCodebase = exports.normalize = exports.DEFAULT_CODEBASE = void 0;
+exports.configForCodebase = exports.normalizeAndValidate = exports.validate = exports.assertUnique = exports.validatePrefix = exports.validateCodebase = exports.normalize = exports.DEFAULT_CODEBASE = void 0;
 const error_1 = require("../error");
 exports.DEFAULT_CODEBASE = "default";
 function normalize(config) {
@@ -23,6 +23,15 @@ function validateCodebase(codebase) {
     }
 }
 exports.validateCodebase = validateCodebase;
+function validatePrefix(prefix) {
+    if (prefix.length > 30) {
+        throw new error_1.FirebaseError("Invalid prefix. Prefix must be 30 characters or less.");
+    }
+    if (!/^[a-z](?:[a-z0-9-]*[a-z0-9])?$/.test(prefix)) {
+        throw new error_1.FirebaseError("Invalid prefix. Prefix must start with a lowercase letter, can contain only lowercase letters, numeric characters, and dashes, and cannot start or end with a dash.");
+    }
+}
+exports.validatePrefix = validatePrefix;
 function validateSingle(config) {
     if (!config.source) {
         throw new error_1.FirebaseError("codebase source must be specified");
@@ -31,6 +40,9 @@ function validateSingle(config) {
         config.codebase = exports.DEFAULT_CODEBASE;
     }
     validateCodebase(config.codebase);
+    if (config.prefix) {
+        validatePrefix(config.prefix);
+    }
     return Object.assign(Object.assign({}, config), { source: config.source, codebase: config.codebase });
 }
 function assertUnique(config, property, propval) {
@@ -47,10 +59,21 @@ function assertUnique(config, property, propval) {
     }
 }
 exports.assertUnique = assertUnique;
+function assertUniqueSourcePrefixPair(config) {
+    var _a;
+    const sourcePrefixPairs = new Set();
+    for (const c of config) {
+        const key = JSON.stringify({ source: c.source, prefix: c.prefix || "" });
+        if (sourcePrefixPairs.has(key)) {
+            throw new error_1.FirebaseError(`More than one functions config specifies the same source directory ('${c.source}') and prefix ('${(_a = c.prefix) !== null && _a !== void 0 ? _a : ""}'). Please add a unique 'prefix' to each function configuration that shares this source to resolve the conflict.`);
+        }
+        sourcePrefixPairs.add(key);
+    }
+}
 function validate(config) {
     const validated = config.map((cfg) => validateSingle(cfg));
-    assertUnique(validated, "source");
     assertUnique(validated, "codebase");
+    assertUniqueSourcePrefixPair(validated);
     return validated;
 }
 exports.validate = validate;

package/lib/functions/secrets.js

@@ -235,6 +235,9 @@ async function updateEndpointSecret(projectInfo, secretVersion, endpoint) {
         const cfn = await poller.pollOperation(Object.assign(Object.assign({}, gcfV2PollerOptions), { operationResourceName: op.name }));
         return gcfV2.endpointFromFunction(cfn);
     }
+    else if (endpoint.platform === "run") {
+        throw new error_1.FirebaseError("Updating Cloud Run functions is not yet implemented.");
+    }
     else {
         (0, functional_1.assertExhaustive)(endpoint.platform);
     }

package/lib/gcp/cloudfunctionsv2.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.endpointFromFunction = exports.functionFromEndpoint = exports.deleteFunction = exports.updateFunction = exports.listAllFunctions = exports.listFunctions = exports.getFunction = exports.createFunction = exports.generateUploadUrl = exports.mebibytes = exports.API_VERSION = void 0;
+exports.endpointFromFunction = exports.functionFromEndpoint = exports.deleteFunction = exports.updateFunction = exports.listAllFunctions = exports.listFunctions = exports.getFunction = exports.createFunction = exports.generateUploadUrl = exports.API_VERSION = void 0;
 const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
 const api_1 = require("../api");
@@ -13,6 +13,7 @@ const utils = require("../utils");
 const projectConfig = require("../functions/projectConfig");
 const constants_1 = require("../functions/constants");
 const cloudfunctions_1 = require("./cloudfunctions");
+const k8s_1 = require("./k8s");
 exports.API_VERSION = "v2";
 const DEFAULT_MAX_INSTANCE_COUNT = 100;
 const client = new apiv2_1.Client({
@@ -20,35 +21,6 @@ const client = new apiv2_1.Client({
     auth: true,
     apiVersion: exports.API_VERSION,
 });
-const BYTES_PER_UNIT = {
-    "": 1,
-    k: 1e3,
-    M: 1e6,
-    G: 1e9,
-    T: 1e12,
-    Ki: 1 << 10,
-    Mi: 1 << 20,
-    Gi: 1 << 30,
-    Ti: 1 << 40,
-};
-function mebibytes(memory) {
-    const re = /^([0-9]+(\.[0-9]*)?)(Ki|Mi|Gi|Ti|k|M|G|T|([eE]([0-9]+)))?$/;
-    const matches = re.exec(memory);
-    if (!matches) {
-        throw new Error(`Invalid memory quantity "${memory}""`);
-    }
-    const quantity = Number.parseFloat(matches[1]);
-    let bytes;
-    if (matches[5]) {
-        bytes = quantity * Math.pow(10, Number.parseFloat(matches[5]));
-    }
-    else {
-        const suffix = matches[3] || "";
-        bytes = quantity * BYTES_PER_UNIT[suffix];
-    }
-    return bytes / (1 << 20);
-}
-exports.mebibytes = mebibytes;
 function functionsOpLogReject(func, type, err) {
     var _a, _b, _c, _d, _e, _f, _g;
     if ((_a = err === null || err === void 0 ? void 0 : err.message) === null || _a === void 0 ? void 0 : _a.includes("Runtime validation errors")) {
@@ -360,7 +332,7 @@ function endpointFromFunction(gcfFunction) {
                 logger_1.logger.debug("Prod should always return a valid memory amount");
                 return prod;
             }
-            const mem = mebibytes(prod);
+            const mem = (0, k8s_1.mebibytes)(prod);
             if (!backend.isValidMemoryOption(mem)) {
                 logger_1.logger.debug("Converting a function to an endpoint with an invalid memory option", mem);
             }

package/lib/gcp/cloudscheduler.js

@@ -124,7 +124,7 @@ async function jobFromEndpoint(endpoint, location, projectNumber) {
             },
         };
     }
-    else if (endpoint.platform === "gcfv2") {
+    else if (endpoint.platform === "gcfv2" || endpoint.platform === "run") {
         job.timeZone = endpoint.scheduleTrigger.timeZone || DEFAULT_TIME_ZONE_V2;
         job.httpTarget = {
             uri: endpoint.uri,

package/lib/gcp/cloudsql/cloudsqladmin.js

@@ -55,9 +55,8 @@ async function createInstance(args) {
     if (args.enableGoogleMlIntegration) {
         databaseFlags.push({ name: "cloudsql.enable_google_ml_integration", value: "on" });
     }
-    let op;
     try {
-        op = await client.post(`projects/${args.projectId}/instances`, {
+        await client.post(`projects/${args.projectId}/instances`, {
             name: args.instanceId,
             region: args.location,
             databaseVersion: "POSTGRES_15",
@@ -78,23 +77,12 @@ async function createInstance(args) {
                 },
             },
         });
+        return;
     }
     catch (err) {
         handleAllowlistError(err, args.location);
         throw err;
     }
-    if (!args.waitForCreation) {
-        return;
-    }
-    const opName = `projects/${args.projectId}/operations/${op.body.name}`;
-    const pollRes = await operationPoller.pollOperation({
-        apiOrigin: (0, api_1.cloudSQLAdminOrigin)(),
-        apiVersion: API_VERSION,
-        operationResourceName: opName,
-        doneFn: (op) => op.status === "DONE",
-        masterTimeout: 1200000,
-    });
-    return pollRes;
 }
 exports.createInstance = createInstance;
 async function updateInstanceForDataConnect(instance, enableGoogleMlIntegration) {

package/lib/gcp/cloudsql/connect.js

@@ -72,7 +72,7 @@ async function execute(sqlStatements, opts) {
         sqlStatements.push("COMMIT;");
     }
     for (const s of sqlStatements) {
-        logFn(`Executing: '${s}'`);
+        logFn(`> ${s}`);
         try {
             results.push(await conn.query(s));
         }
@@ -84,6 +84,7 @@ async function execute(sqlStatements, opts) {
         }
     }
     await cleanUpFn();
+    logFn(``);
     return results;
 }
 exports.execute = execute;
@@ -128,7 +129,7 @@ async function getIAMUser(options) {
     return toDatabaseUser(account);
 }
 exports.getIAMUser = getIAMUser;
-async function setupIAMUsers(instanceId, databaseId, options) {
+async function setupIAMUsers(instanceId, options) {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const { user, mode } = await getIAMUser(options);
     await cloudSqlAdminClient.createUser(projectId, instanceId, mode, user);

package/lib/gcp/cloudsql/permissionsSetup.js

@@ -1,18 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.brownfieldSqlSetup = exports.setupBrownfieldAsGreenfield = exports.getSchemaMetadata = exports.greenFieldSchemaSetup = exports.setupSQLPermissions = exports.checkSQLRoleIsGranted = exports.fdcSqlRoleMap = exports.SchemaSetupStatus = void 0;
+exports.grantRoleTo = exports.brownfieldSqlSetup = exports.setupBrownfieldAsGreenfield = exports.getSchemaMetadata = exports.greenFieldSchemaSetup = exports.setupSQLPermissions = exports.checkSQLRoleIsGranted = exports.fdcSqlRoleMap = exports.SchemaSetupStatus = void 0;
 const clc = require("colorette");
 const permissions_1 = require("./permissions");
 const cloudsqladmin_1 = require("./cloudsqladmin");
-const connect_1 = require("./connect");
 const logger_1 = require("../../logger");
 const prompt_1 = require("../../prompt");
 const error_1 = require("../../error");
 const projectUtils_1 = require("../../projectUtils");
-const connect_2 = require("./connect");
+const connect_1 = require("./connect");
 const lodash_1 = require("lodash");
-const connect_3 = require("./connect");
+const connect_2 = require("./connect");
 const utils = require("../../utils");
+const cloudSqlAdminClient = require("./cloudsqladmin");
 var SchemaSetupStatus;
 (function (SchemaSetupStatus) {
     SchemaSetupStatus["NotSetup"] = "not-setup";
@@ -53,7 +53,7 @@ async function checkSQLRoleIsGranted(options, instanceId, databaseId, grantedRol
     END $$;
 `;
     try {
-        await (0, connect_2.executeSqlCmdsAsIamUser)(options, instanceId, databaseId, [checkCmd], true);
+        await (0, connect_1.executeSqlCmdsAsIamUser)(options, instanceId, databaseId, [checkCmd], true);
         return true;
     }
     catch (e) {
@@ -77,7 +77,6 @@ async function setupSQLPermissions(instanceId, databaseId, schemaInfo, 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) {
         runGreenfieldSetup = true;
@@ -89,7 +88,7 @@ async function setupSQLPermissions(instanceId, databaseId, schemaInfo, options,
     }
     if (runGreenfieldSetup) {
         const greenfieldSetupCmds = await greenFieldSchemaSetup(instanceId, databaseId, schema, options);
-        await (0, connect_2.executeSqlCmdsAsSuperUser)(options, instanceId, databaseId, greenfieldSetupCmds, silent, true);
+        await (0, connect_1.executeSqlCmdsAsSuperUser)(options, instanceId, databaseId, greenfieldSetupCmds, silent, true);
         logFn(clc.green("Database setup complete."));
         return SchemaSetupStatus.GreenField;
     }
@@ -125,15 +124,15 @@ async function greenFieldSchemaSetup(instanceId, databaseId, schema, options) {
         logger_1.logger.warn("Detected cloudsqlsuperuser was previously given to firebase owner, revoking to improve database security.");
         revokes.push(`REVOKE "cloudsqlsuperuser" FROM "${(0, permissions_1.firebaseowner)(databaseId)}"`);
     }
-    const user = (await (0, connect_2.getIAMUser)(options)).user;
+    const user = (await (0, connect_1.getIAMUser)(options)).user;
     const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);
-    const { user: fdcP4SAUser } = (0, connect_3.toDatabaseUser)((0, connect_3.getDataConnectP4SA)(projectNumber));
+    const { user: fdcP4SAUser } = (0, connect_2.toDatabaseUser)((0, connect_2.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)));
     return sqlRoleSetupCmds;
 }
 exports.greenFieldSchemaSetup = greenFieldSchemaSetup;
 async function getSchemaMetadata(instanceId, databaseId, schema, options) {
-    const checkSchemaExists = await (0, connect_2.executeSqlCmdsAsIamUser)(options, instanceId, databaseId, [
+    const checkSchemaExists = await (0, connect_1.executeSqlCmdsAsIamUser)(options, instanceId, databaseId, [
         `SELECT pg_get_userbyid(nspowner) 
           FROM pg_namespace 
           WHERE nspname = '${schema}';`,
@@ -148,7 +147,7 @@ async function getSchemaMetadata(instanceId, databaseId, schema, options) {
     }
     const schemaOwner = checkSchemaExists[0].rows[0].pg_get_userbyid;
     const cmd = `SELECT tablename, tableowner FROM pg_tables WHERE schemaname='${schema}'`;
-    const res = await (0, connect_2.executeSqlCmdsAsIamUser)(options, instanceId, databaseId, [cmd], true);
+    const res = await (0, connect_1.executeSqlCmdsAsIamUser)(options, instanceId, databaseId, [cmd], true);
     const tables = res[0].rows.map((row) => {
         return {
             name: row.tablename,
@@ -157,7 +156,7 @@ async function getSchemaMetadata(instanceId, databaseId, schema, options) {
     });
     const checkRoleExists = async (role) => {
         const cmd = [`SELECT to_regrole('"${role}"') IS NOT NULL AS exists;`];
-        const result = await (0, connect_2.executeSqlCmdsAsIamUser)(options, instanceId, databaseId, cmd, true);
+        const result = await (0, connect_1.executeSqlCmdsAsIamUser)(options, instanceId, databaseId, cmd, true);
         return result[0].rows[0].exists;
     };
     let setupStatus;
@@ -198,7 +197,7 @@ async function setupBrownfieldAsGreenfield(instanceId, databaseId, schemaInfo, o
         ...alterTableCmds,
         ...revokeOwnersFromSuperuserCmds,
     ];
-    await (0, connect_2.executeSqlCmdsAsSuperUser)(options, instanceId, databaseId, setupCmds, silent, true);
+    await (0, connect_1.executeSqlCmdsAsSuperUser)(options, instanceId, databaseId, setupCmds, silent, true);
 }
 exports.setupBrownfieldAsGreenfield = setupBrownfieldAsGreenfield;
 async function brownfieldSqlSetup(instanceId, databaseId, schemaInfo, options, silent = false) {
@@ -206,9 +205,9 @@ async function brownfieldSqlSetup(instanceId, databaseId, schemaInfo, options, s
     const uniqueTablesOwners = filterTableOwners(schemaInfo, databaseId);
     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 iamUser = (await (0, connect_1.getIAMUser)(options)).user;
     const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);
-    const { user: fdcP4SAUser } = (0, connect_3.toDatabaseUser)((0, connect_3.getDataConnectP4SA)(projectNumber));
+    const { user: fdcP4SAUser } = (0, connect_2.toDatabaseUser)((0, connect_2.getDataConnectP4SA)(projectNumber));
     const firebaseDefaultPermissions = uniqueTablesOwners.flatMap((owner) => (0, permissions_1.defaultPermissions)(databaseId, schema, owner));
     const brownfieldSetupCmds = [
         ...grantOwnersToFirebasesuperuser,
@@ -219,6 +218,14 @@ async function brownfieldSqlSetup(instanceId, databaseId, schemaInfo, options, s
         ...firebaseDefaultPermissions,
         ...revokeOwnersFromFirebasesuperuser,
     ];
-    await (0, connect_2.executeSqlCmdsAsSuperUser)(options, instanceId, databaseId, brownfieldSetupCmds, silent, true);
+    await (0, connect_1.executeSqlCmdsAsSuperUser)(options, instanceId, databaseId, brownfieldSetupCmds, silent, true);
 }
 exports.brownfieldSqlSetup = brownfieldSqlSetup;
+async function grantRoleTo(options, instanceId, databaseId, role, email) {
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const { user, mode } = (0, connect_2.toDatabaseUser)(email);
+    await cloudSqlAdminClient.createUser(projectId, instanceId, mode, user);
+    const fdcSqlRole = exports.fdcSqlRoleMap[role](databaseId);
+    await (0, connect_1.executeSqlCmdsAsSuperUser)(options, instanceId, databaseId, [`GRANT "${fdcSqlRole}" TO "${user}"`], false);
+}
+exports.grantRoleTo = grantRoleTo;

package/lib/gcp/k8s.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mebibytes = void 0;
+const BYTES_PER_UNIT = {
+    "": 1,
+    k: 1e3,
+    M: 1e6,
+    G: 1e9,
+    T: 1e12,
+    Ki: 1 << 10,
+    Mi: 1 << 20,
+    Gi: 1 << 30,
+    Ti: 1 << 40,
+};
+function mebibytes(memory) {
+    const re = /^([0-9]+(\.[0-9]*)?)(Ki|Mi|Gi|Ti|k|M|G|T|([eE]([0-9]+)))?$/;
+    const matches = re.exec(memory);
+    if (!matches) {
+        throw new Error(`Invalid memory quantity "${memory}""`);
+    }
+    const quantity = Number.parseFloat(matches[1]);
+    let bytes;
+    if (matches[5]) {
+        bytes = quantity * Math.pow(10, Number.parseFloat(matches[5]));
+    }
+    else {
+        const suffix = matches[3] || "";
+        bytes = quantity * BYTES_PER_UNIT[suffix];
+    }
+    return bytes / (1 << 20);
+}
+exports.mebibytes = mebibytes;