firebase-tools 14.12.1 → 14.13.0

package/lib/emulator/downloadableEmulatorInfo.json

@@ -54,28 +54,28 @@
     },
     "dataconnect": {
         "darwin": {
-            "version": "2.11.1",
-            "expectedSize": 29352800,
-            "expectedChecksum": "52d86a5546bbb9e2fcd67faa90b9f07e",
-            "expectedChecksumSHA256": "217b66589c32d4378201100fa968e69f7c94537044b892be1aaa14d7f6ce6b12",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-v2.11.1",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.11.1"
+            "version": "2.11.2",
+            "expectedSize": 29447008,
+            "expectedChecksum": "13bc7d3bb0a0bbfe601991361e4413c2",
+            "expectedChecksumSHA256": "e3b029eb461f0fe6f0c825c7a71d42c7a09c2b8ee4fac10c3e187d78fe5083f6",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-v2.11.2",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.11.2"
         },
         "win32": {
-            "version": "2.11.1",
-            "expectedSize": 29841920,
-            "expectedChecksum": "704cee75ad2d384cf28ac1683c8d1179",
-            "expectedChecksumSHA256": "fadb5a1d0f03160c133389df9d452cc620cfdface041971a5356ac5a69e937ff",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-v2.11.1",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.11.1.exe"
+            "version": "2.11.2",
+            "expectedSize": 29934592,
+            "expectedChecksum": "032a0749781fc338b446d753dd543bf5",
+            "expectedChecksumSHA256": "2d0498b3ef94b4e777d6fc1d526279376caf3842549f39f13a8ca327393bf810",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-v2.11.2",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.11.2.exe"
         },
         "linux": {
-            "version": "2.11.1",
-            "expectedSize": 29282488,
-            "expectedChecksum": "435656eab760033228bf7b7e77d56dde",
-            "expectedChecksumSHA256": "0abb33c0bba0ed8ef1394cc1cab5a333ec81b3dddf48aa625abe8ca28f38840e",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-v2.11.1",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.11.1"
+            "version": "2.11.2",
+            "expectedSize": 29368504,
+            "expectedChecksum": "065a7523f881952040ac678a9a1e9323",
+            "expectedChecksumSHA256": "41ca6561cf77107b5d1d829233844d21c46a5e4bb823c150b1b32591dc2463e0",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-v2.11.2",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.11.2"
         }
     }
 }

package/lib/emulator/functionsEmulator.js

@@ -28,8 +28,9 @@ const utils_1 = require("../utils");
 const adminSdkConfig_1 = require("./adminSdkConfig");
 const validate_1 = require("../deploy/functions/validate");
 const secretManager_1 = require("../gcp/secretManager");
-const runtimes = require("../deploy/functions/runtimes");
 const backend = require("../deploy/functions/backend");
+const build = require("../deploy/functions/build");
+const runtimes = require("../deploy/functions/runtimes");
 const functionsEnv = require("../functions/env");
 const v1_1 = require("../functions/events/v1");
 const build_1 = require("../deploy/functions/build");
@@ -82,6 +83,7 @@ class FunctionsEmulator {
         this.blockingFunctionsConfig = {};
         this.staticBackends = [];
         this.dynamicBackends = [];
+        this.watchers = [];
         this.debugMode = false;
         this.staticBackends = args.emulatableBackends;
         emulatorLogger_1.EmulatorLogger.setVerbosity(this.args.verbosity ? emulatorLogger_1.Verbosity[this.args.verbosity] : emulatorLogger_1.Verbosity["DEBUG"]);
@@ -271,6 +273,7 @@ class FunctionsEmulator {
                 ],
                 persistent: true,
             });
+            this.watchers.push(watcher);
             const debouncedLoadTriggers = (0, utils_1.debounce)(() => this.loadTriggers(backend), 1000);
             watcher.on("change", (filePath) => {
                 this.logger.log("DEBUG", `File ${filePath} changed, reloading triggers`);
@@ -292,6 +295,10 @@ class FunctionsEmulator {
         for (const pool of Object.values(this.workerPools)) {
             pool.exit();
         }
+        for (const watcher of this.watchers) {
+            await watcher.close();
+        }
+        this.watchers = [];
         if (this.destroyServer) {
             await this.destroyServer();
         }
@@ -329,6 +336,7 @@ class FunctionsEmulator {
                 await this.args.extensionsEmulator.addDynamicExtensions(emulatableBackend.codebase, discoveredBuild);
                 await this.loadDynamicExtensionBackends();
             }
+            build.applyPrefix(discoveredBuild, emulatableBackend.prefix || "");
             const resolution = await (0, build_1.resolveBackend)({
                 build: discoveredBuild,
                 firebaseConfig: JSON.parse(firebaseConfig),

package/lib/experiments.js

@@ -48,6 +48,10 @@ exports.ALL_EXPERIMENTS = experiments({
         default: true,
         public: true,
     },
+    runfunctions: {
+        shortDescription: "Functions created using the V2 API target Cloud Run Functions (not production ready)",
+        public: false,
+    },
     emulatoruisnapshot: {
         shortDescription: "Load pre-release versions of the emulator UI",
     },

package/lib/extensions/extensionsHelper.js

@@ -7,7 +7,7 @@ var __asyncValues = (this && this.__asyncValues) || function (o) {
     function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.diagnoseAndFixProject = exports.getSourceOrigin = exports.isLocalOrURLPath = exports.isLocalPath = exports.isUrlPath = exports.instanceIdExists = exports.promptForRepeatInstance = exports.promptForOfficialExtension = exports.displayReleaseNotes = exports.getPublisherProjectFromName = exports.createSourceFromLocation = exports.getMissingPublisherError = exports.uploadExtensionVersionFromLocalSource = exports.uploadExtensionVersionFromGitHubSource = exports.unpackExtensionState = exports.getNextVersionByStage = exports.ensureExtensionsPublisherApiEnabled = exports.ensureExtensionsApiEnabled = exports.checkExtensionsApiEnabled = exports.promptForExtensionRoot = exports.promptForValidRepoURI = exports.promptForValidInstanceId = exports.validateSpec = exports.validateCommandLineParams = exports.populateDefaultParams = exports.substituteSecretParams = exports.substituteParams = exports.getFirebaseProjectParams = exports.getDBInstanceFromURL = exports.resourceTypeToNiceName = exports.AUTOPOPULATED_PARAM_PLACEHOLDERS = exports.EXTENSIONS_BUCKET_NAME = exports.URL_REGEX = exports.logPrefix = exports.SourceOrigin = exports.SpecParamType = void 0;
+exports.diagnoseAndFixProject = exports.getSourceOrigin = exports.isLocalOrURLPath = exports.isLocalPath = exports.isUrlPath = exports.instanceIdExists = exports.promptForRepeatInstance = exports.displayReleaseNotes = exports.getPublisherProjectFromName = exports.createSourceFromLocation = exports.getMissingPublisherError = exports.uploadExtensionVersionFromLocalSource = exports.uploadExtensionVersionFromGitHubSource = exports.unpackExtensionState = exports.getNextVersionByStage = exports.ensureExtensionsPublisherApiEnabled = exports.ensureExtensionsApiEnabled = exports.checkExtensionsApiEnabled = exports.promptForExtensionRoot = exports.promptForValidRepoURI = exports.promptForValidInstanceId = exports.validateSpec = exports.validateCommandLineParams = exports.populateDefaultParams = exports.substituteSecretParams = exports.substituteParams = exports.getFirebaseProjectParams = exports.getDBInstanceFromURL = exports.resourceTypeToNiceName = exports.AUTOPOPULATED_PARAM_PLACEHOLDERS = exports.EXTENSIONS_BUCKET_NAME = exports.URL_REGEX = exports.logPrefix = exports.SourceOrigin = exports.SpecParamType = void 0;
 const clc = require("colorette");
 const ora = require("ora");
 const semver = require("semver");
@@ -21,10 +21,8 @@ const unzip_1 = require("./../unzip");
 marked_1.marked.use((0, marked_terminal_1.markedTerminal)());
 const api_1 = require("../api");
 const archiveDirectory_1 = require("../archiveDirectory");
-const utils_1 = require("./utils");
 const functionsConfig_1 = require("../functionsConfig");
 const adminSdkConfig_1 = require("../emulator/adminSdkConfig");
-const resolveSource_1 = require("./resolveSource");
 const error_1 = require("../error");
 const diagnose_1 = require("./diagnose");
 const askUserForParam_1 = require("./askUserForParam");
@@ -37,7 +35,7 @@ const prompt_1 = require("../prompt");
 const refs = require("./refs");
 const localHelper_1 = require("./localHelper");
 const logger_1 = require("../logger");
-const utils_2 = require("../utils");
+const utils_1 = require("../utils");
 const change_log_1 = require("./change-log");
 const getProjectNumber_1 = require("../getProjectNumber");
 const constants_1 = require("../emulator/constants");
@@ -61,7 +59,7 @@ var SourceOrigin;
 exports.logPrefix = "extensions";
 const VALID_LICENSES = ["apache-2.0"];
 exports.URL_REGEX = /^https:/;
-exports.EXTENSIONS_BUCKET_NAME = (0, utils_2.envOverride)("FIREBASE_EXTENSIONS_UPLOAD_BUCKET", "firebase-ext-eap-uploads");
+exports.EXTENSIONS_BUCKET_NAME = (0, utils_1.envOverride)("FIREBASE_EXTENSIONS_UPLOAD_BUCKET", "firebase-ext-eap-uploads");
 const AUTOPOPULATED_PARAM_NAMES = [
     "PROJECT_ID",
     "STORAGE_BUCKET",
@@ -104,7 +102,7 @@ async function getFirebaseProjectParams(projectId, emulatorMode = false) {
             projectNumber = await (0, getProjectNumber_1.getProjectNumber)({ projectId });
         }
         catch (err) {
-            (0, utils_2.logLabeledError)("extensions", `Unable to look up project number for ${projectId}.\n` +
+            (0, utils_1.logLabeledError)("extensions", `Unable to look up project number for ${projectId}.\n` +
                 " If this is a real project, ensure that you are logged in and have access to it.\n" +
                 " If this is a fake project, please use a project ID starting with 'demo-' to skip production calls.\n" +
                 " Continuing with a fake project number - secrets and other features that require production access may behave unexpectedly.");
@@ -810,15 +808,6 @@ function displayReleaseNotes(args) {
     logger_1.logger.info(message);
 }
 exports.displayReleaseNotes = displayReleaseNotes;
-async function promptForOfficialExtension(message) {
-    const officialExts = await (0, resolveSource_1.getExtensionRegistry)(true);
-    return await (0, prompt_1.select)({
-        message,
-        choices: (0, utils_1.convertOfficialExtensionsToList)(officialExts),
-        pageSize: Object.keys(officialExts).length,
-    });
-}
-exports.promptForOfficialExtension = promptForOfficialExtension;
 async function promptForRepeatInstance(projectName, extensionName) {
     const message = `An extension with the ID '${clc.bold(extensionName)}' already exists in the project '${clc.bold(projectName)}'. What would you like to do?`;
     return await (0, prompt_1.select)({

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/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

@@ -128,7 +128,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

@@ -4,14 +4,13 @@ exports.brownfieldSqlSetup = exports.setupBrownfieldAsGreenfield = exports.getSc
 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");
 var SchemaSetupStatus;
 (function (SchemaSetupStatus) {
@@ -53,7 +52,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 +76,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 +87,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 +123,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 +146,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 +155,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 +196,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 +204,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 +217,6 @@ 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;