firebase-tools 11.0.0 → 11.2.0

package/lib/extensions/secretsUtils.js

@@ -5,7 +5,7 @@ const getProjectNumber_1 = require("../getProjectNumber");
 const utils = require("../utils");
 const ensureApiEnabled_1 = require("../ensureApiEnabled");
 const projectUtils_1 = require("../projectUtils");
-const extensionsApi = require("./extensionsApi");
+const types_1 = require("./types");
 const secretManagerApi = require("../gcp/secretManager");
 const logger_1 = require("../logger");
 exports.SECRET_LABEL = "firebase-extensions-managed";
@@ -15,7 +15,7 @@ async function ensureSecretManagerApiEnabled(options) {
 }
 exports.ensureSecretManagerApiEnabled = ensureSecretManagerApiEnabled;
 function usesSecrets(spec) {
-    return spec.params && !!spec.params.find((p) => p.type === extensionsApi.ParamType.SECRET);
+    return spec.params && !!spec.params.find((p) => p.type === types_1.ParamType.SECRET);
 }
 exports.usesSecrets = usesSecrets;
 async function grantFirexServiceAgentSecretAdminRole(secret) {
@@ -38,7 +38,7 @@ async function getManagedSecrets(instance) {
 exports.getManagedSecrets = getManagedSecrets;
 function getActiveSecrets(spec, params) {
     return spec.params
-        .map((p) => (p.type === extensionsApi.ParamType.SECRET ? params[p.param] : ""))
+        .map((p) => (p.type === types_1.ParamType.SECRET ? params[p.param] : ""))
         .filter((pv) => !!pv);
 }
 exports.getActiveSecrets = getActiveSecrets;

package/lib/extensions/types.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ParamType = exports.FUNCTIONS_RESOURCE_TYPE = exports.Visibility = exports.RegistryLaunchStage = void 0;
+var RegistryLaunchStage;
+(function (RegistryLaunchStage) {
+    RegistryLaunchStage["EXPERIMENTAL"] = "EXPERIMENTAL";
+    RegistryLaunchStage["BETA"] = "BETA";
+    RegistryLaunchStage["GA"] = "GA";
+    RegistryLaunchStage["DEPRECATED"] = "DEPRECATED";
+    RegistryLaunchStage["REGISTRY_LAUNCH_STAGE_UNSPECIFIED"] = "REGISTRY_LAUNCH_STAGE_UNSPECIFIED";
+})(RegistryLaunchStage = exports.RegistryLaunchStage || (exports.RegistryLaunchStage = {}));
+var Visibility;
+(function (Visibility) {
+    Visibility["UNLISTED"] = "unlisted";
+    Visibility["PUBLIC"] = "public";
+})(Visibility = exports.Visibility || (exports.Visibility = {}));
+exports.FUNCTIONS_RESOURCE_TYPE = "firebaseextensions.v1beta.function";
+var ParamType;
+(function (ParamType) {
+    ParamType["STRING"] = "STRING";
+    ParamType["SELECT"] = "SELECT";
+    ParamType["MULTISELECT"] = "MULTISELECT";
+    ParamType["SECRET"] = "SECRET";
+})(ParamType = exports.ParamType || (exports.ParamType = {}));

package/lib/extensions/updateHelper.js

@@ -17,7 +17,7 @@ function invalidSourceErrMsgTemplate(instanceId, source) {
   - Run \`${clc.bold("firebase ext:update " + instanceId)}\` to update from the published source.\n
   - Check your directory path or URL, then run \`${clc.bold("firebase ext:update " + instanceId + " <otherSource>")}\` to update from a local directory or URL source.`;
 }
-async function getExistingSourceOrigin(projectId, instanceId, extensionName, existingSource) {
+async function getExistingSourceOrigin(projectId, instanceId) {
     const instance = await extensionsApi.getInstance(projectId, instanceId);
     return instance && instance.config.extensionRef
         ? extensionsHelper_1.SourceOrigin.PUBLISHED_EXTENSION

package/lib/extensions/utils.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatTimestamp = exports.getRandomString = exports.convertOfficialExtensionsToList = exports.convertExtensionOptionToLabeledList = exports.onceWithJoin = void 0;
-const _ = require("lodash");
 const prompt_1 = require("../prompt");
 async function onceWithJoin(question) {
     const response = await (0, prompt_1.promptOnce)(question);
@@ -22,7 +21,7 @@ function convertExtensionOptionToLabeledList(options) {
 }
 exports.convertExtensionOptionToLabeledList = convertExtensionOptionToLabeledList;
 function convertOfficialExtensionsToList(officialExts) {
-    const l = _.map(officialExts, (entry, key) => {
+    const l = Object.entries(officialExts).map(([key, entry]) => {
         return {
             checked: false,
             value: `${entry.publisher}/${key}`,

package/lib/extensions/warnings.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.paramsFlagDeprecationWarning = exports.displayWarningsForDeploy = exports.displayWarningPrompts = void 0;
 const { marked } = require("marked");
 const clc = require("cli-color");
-const extensionsApi_1 = require("./extensionsApi");
+const types_1 = require("./types");
 const displayExtensionInfo_1 = require("./displayExtensionInfo");
 const extensionsHelper_1 = require("./extensionsHelper");
 const resolveSource_1 = require("./resolveSource");
@@ -31,7 +31,7 @@ async function displayWarningPrompts(publisherId, launchStage, extensionVersion)
             githubLink: extensionVersion.spec.sourceUrl,
         });
     }
-    else if (launchStage === extensionsApi_1.RegistryLaunchStage.EXPERIMENTAL) {
+    else if (launchStage === types_1.RegistryLaunchStage.EXPERIMENTAL) {
         displayExperimentalWarning();
     }
     else {
@@ -55,7 +55,7 @@ async function displayWarningsForDeploy(instancesToCreate) {
         await (0, planner_1.getExtension)(i);
     }
     const [eapExtensions, nonEapExtensions] = (0, functional_1.partition)(publishedExtensionInstances, (i) => { var _a, _b; return !trustedPublishers.includes((_b = (_a = i.ref) === null || _a === void 0 ? void 0 : _a.publisherId) !== null && _b !== void 0 ? _b : ""); });
-    const experimental = nonEapExtensions.filter((i) => i.extension.registryLaunchStage === extensionsApi_1.RegistryLaunchStage.EXPERIMENTAL);
+    const experimental = nonEapExtensions.filter((i) => i.extension.registryLaunchStage === types_1.RegistryLaunchStage.EXPERIMENTAL);
     if (experimental.length) {
         const humanReadableList = experimental.map((i) => `\t${(0, deploymentSummary_1.humanReadable)(i)}`).join("\n");
         utils.logLabeledBullet(extensionsHelper_1.logPrefix, marked(`The following are instances of ${clc.bold("experimental")} extensions.They may not be production-ready. Their functionality may change in backward-incompatible ways before their official release, or they may be discontinued.\n${humanReadableList}\n`, { gfm: false }));

package/lib/firestore/checkDatabaseType.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkDatabaseType = void 0;
-const api = require("../api");
+const api_1 = require("../api");
+const apiv2_1 = require("../apiv2");
 const logger_1 = require("../logger");
 async function checkDatabaseType(projectId) {
     try {
-        const resp = await api.request("GET", "/v1/apps/" + projectId, {
-            auth: true,
-            origin: api.appengineOrigin,
-        });
+        const client = new apiv2_1.Client({ urlPrefix: api_1.appengineOrigin, apiVersion: "v1" });
+        const resp = await client.get(`/apps/${projectId}`);
         return resp.body.databaseType;
     }
     catch (err) {

package/lib/firestore/encodeFirestoreValue.js

@@ -9,22 +9,22 @@ function isPlainObject(input) {
         _.isEqual(Object.getPrototypeOf(input), Object.prototype));
 }
 function encodeHelper(val) {
-    if (_.isString(val)) {
+    if (typeof val === "string") {
         return { stringValue: val };
     }
-    if (_.isBoolean(val)) {
+    if (val === !!val) {
         return { booleanValue: val };
     }
-    if (_.isInteger(val)) {
+    if (Number.isInteger(val)) {
         return { integerValue: val };
     }
-    if (_.isNumber(val)) {
+    if (typeof val === "number") {
         return { doubleValue: val };
     }
-    if (_.isDate(val)) {
+    if (val instanceof Date && !Number.isNaN(val)) {
         return { timestampValue: val.toISOString() };
     }
-    if (_.isArray(val)) {
+    if (Array.isArray(val)) {
         const encodedElements = [];
         for (const v of val) {
             const enc = encodeHelper(v);
@@ -36,7 +36,7 @@ function encodeHelper(val) {
             arrayValue: { values: encodedElements },
         };
     }
-    if (_.isNull(val)) {
+    if (val === null) {
         return { nullValue: "NULL_VALUE" };
     }
     if (val instanceof Buffer || val instanceof Uint8Array) {
@@ -51,6 +51,9 @@ function encodeHelper(val) {
         "The emulator does not yet support Firestore document reference values or geo points.");
 }
 function encodeFirestoreValue(data) {
-    return _.mapValues(data, encodeHelper);
+    return Object.entries(data).reduce((acc, [key, val]) => {
+        acc[key] = encodeHelper(val);
+        return acc;
+    }, {});
 }
 exports.encodeFirestoreValue = encodeFirestoreValue;

package/lib/firestore/indexes.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FirestoreIndexes = void 0;
 const clc = require("cli-color");
-const api = require("../api");
 const logger_1 = require("../logger");
 const utils = require("../utils");
 const validator = require("./validator");
@@ -10,7 +9,12 @@ const API = require("./indexes-api");
 const sort = require("./indexes-sort");
 const util = require("./util");
 const prompt_1 = require("../prompt");
+const api_1 = require("../api");
+const apiv2_1 = require("../apiv2");
 class FirestoreIndexes {
+    constructor() {
+        this.apiClient = new apiv2_1.Client({ urlPrefix: api_1.firestoreOrigin, apiVersion: "v1" });
+    }
     async deploy(options, indexes, fieldOverrides) {
         const spec = this.upgradeOldSpec({
             indexes,
@@ -112,11 +116,8 @@ class FirestoreIndexes {
         }
     }
     async listIndexes(project) {
-        const url = `projects/${project}/databases/(default)/collectionGroups/-/indexes`;
-        const res = await api.request("GET", `/v1/${url}`, {
-            auth: true,
-            origin: api.firestoreOrigin,
-        });
+        const url = `/projects/${project}/databases/(default)/collectionGroups/-/indexes`;
+        const res = await this.apiClient.get(url);
         const indexes = res.body.indexes;
         if (!indexes) {
             return [];
@@ -135,11 +136,8 @@ class FirestoreIndexes {
     }
     async listFieldOverrides(project) {
         const parent = `projects/${project}/databases/(default)/collectionGroups/-`;
-        const url = `${parent}/fields?filter=indexConfig.usesAncestorConfig=false`;
-        const res = await api.request("GET", `/v1/${url}`, {
-            auth: true,
-            origin: api.firestoreOrigin,
-        });
+        const url = `/${parent}/fields?filter=indexConfig.usesAncestorConfig=false`;
+        const res = await this.apiClient.get(url);
         const fields = res.body.fields;
         if (!fields) {
             return [];
@@ -248,7 +246,7 @@ class FirestoreIndexes {
         });
     }
     async patchField(project, spec) {
-        const url = `projects/${project}/databases/(default)/collectionGroups/${spec.collectionGroup}/fields/${spec.fieldPath}`;
+        const url = `/projects/${project}/databases/(default)/collectionGroups/${spec.collectionGroup}/fields/${spec.fieldPath}`;
         const indexes = spec.indexes.map((index) => {
             return {
                 queryScope: index.queryScope,
@@ -266,38 +264,23 @@ class FirestoreIndexes {
                 indexes,
             },
         };
-        await api.request("PATCH", `/v1/${url}`, {
-            auth: true,
-            origin: api.firestoreOrigin,
-            data,
-        });
+        await this.apiClient.patch(url, data);
     }
     deleteField(field) {
         const url = field.name;
         const data = {};
-        return api.request("PATCH", "/v1/" + url + "?updateMask=indexConfig", {
-            auth: true,
-            origin: api.firestoreOrigin,
-            data,
-        });
+        return this.apiClient.patch(`/${url}`, data, { queryParams: { updateMask: "indexConfig" } });
     }
     createIndex(project, index) {
-        const url = `projects/${project}/databases/(default)/collectionGroups/${index.collectionGroup}/indexes`;
-        return api.request("POST", "/v1/" + url, {
-            auth: true,
-            data: {
-                fields: index.fields,
-                queryScope: index.queryScope,
-            },
-            origin: api.firestoreOrigin,
+        const url = `/projects/${project}/databases/(default)/collectionGroups/${index.collectionGroup}/indexes`;
+        return this.apiClient.post(url, {
+            fields: index.fields,
+            queryScope: index.queryScope,
         });
     }
     deleteIndex(index) {
         const url = index.name;
-        return api.request("DELETE", "/v1/" + url, {
-            auth: true,
-            origin: api.firestoreOrigin,
-        });
+        return this.apiClient.delete(`/${url}`);
     }
     indexMatchesSpec(index, spec) {
         const collection = util.parseIndexName(index.name).collectionGroupId;

package/lib/fsAsync.js

@@ -8,7 +8,7 @@ const minimatch = require("minimatch");
 async function readdirRecursiveHelper(options) {
     const dirContents = (0, fs_extra_1.readdirSync)(options.path);
     const fullPaths = dirContents.map((n) => (0, path_1.join)(options.path, n));
-    const filteredPaths = _.reject(fullPaths, options.filter);
+    const filteredPaths = fullPaths.filter((p) => !options.filter(p));
     const filePromises = [];
     for (const p of filteredPaths) {
         const fstat = (0, fs_extra_1.statSync)(p);
@@ -22,12 +22,12 @@ async function readdirRecursiveHelper(options) {
     }
     const files = await Promise.all(filePromises);
     let flatFiles = _.flattenDeep(files);
-    flatFiles = _.reject(flatFiles, (f) => _.isNull(f));
+    flatFiles = flatFiles.filter((f) => f !== null);
     return flatFiles;
 }
 async function readdirRecursive(options) {
     const mmopts = { matchBase: true, dot: true };
-    const rules = _.map(options.ignore || [], (glob) => {
+    const rules = (options.ignore || []).map((glob) => {
         return (p) => minimatch(p, glob, mmopts);
     });
     const filter = (t) => {

package/lib/functions/events/v2.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FIREBASE_ALERTS_PUBLISH_EVENT = exports.STORAGE_EVENTS = exports.PUBSUB_PUBLISH_EVENT = void 0;
+exports.DATABASE_EVENTS = exports.FIREBASE_ALERTS_PUBLISH_EVENT = exports.STORAGE_EVENTS = exports.PUBSUB_PUBLISH_EVENT = void 0;
 exports.PUBSUB_PUBLISH_EVENT = "google.cloud.pubsub.topic.v1.messagePublished";
 exports.STORAGE_EVENTS = [
     "google.cloud.storage.object.v1.finalized",
@@ -9,3 +9,9 @@ exports.STORAGE_EVENTS = [
     "google.cloud.storage.object.v1.metadataUpdated",
 ];
 exports.FIREBASE_ALERTS_PUBLISH_EVENT = "google.firebase.firebasealerts.alerts.v1.published";
+exports.DATABASE_EVENTS = [
+    "google.firebase.database.ref.v1.written",
+    "google.firebase.database.ref.v1.created",
+    "google.firebase.database.ref.v1.updated",
+    "google.firebase.database.ref.v1.deleted",
+];

package/lib/functionsConfig.js

@@ -27,7 +27,7 @@ function setVariable(projectId, configId, varPath, val) {
     return runtimeconfig.variables.set(projectId, configId, varPath, val);
 }
 function isReservedNamespace(id) {
-    return _.some(exports.RESERVED_NAMESPACES, (reserved) => {
+    return exports.RESERVED_NAMESPACES.some((reserved) => {
         return id.config.toLowerCase().startsWith(reserved);
     });
 }
@@ -44,7 +44,7 @@ function varNameToIds(varName) {
 }
 exports.varNameToIds = varNameToIds;
 function idsToVarName(projectId, configId, varId) {
-    return _.join(["projects", projectId, "configs", configId, "variables", varId], "/");
+    return ["projects", projectId, "configs", configId, "variables", varId].join("/");
 }
 exports.idsToVarName = idsToVarName;
 function getAppEngineLocation(config) {
@@ -63,7 +63,7 @@ async function getFirebaseConfig(options) {
 exports.getFirebaseConfig = getFirebaseConfig;
 async function setVariablesRecursive(projectId, configId, varPath, val) {
     let parsed = val;
-    if (_.isString(val)) {
+    if (typeof val === "string") {
         try {
             parsed = JSON.parse(val);
         }
@@ -71,8 +71,8 @@ async function setVariablesRecursive(projectId, configId, varPath, val) {
         }
     }
     if (_.isPlainObject(parsed)) {
-        return Promise.all(_.map(parsed, (item, key) => {
-            const newVarPath = varPath ? _.join([varPath, key], "/") : key;
+        return Promise.all(Object.entries(parsed).map(([key, item]) => {
+            const newVarPath = varPath ? [varPath, key].join("/") : key;
             return setVariablesRecursive(projectId, configId, newVarPath, item);
         }));
     }
@@ -87,7 +87,7 @@ async function materializeConfig(configName, output) {
         _.set(output, key, variable.text);
     };
     const traverseVariables = async function (variables) {
-        return Promise.all(_.map(variables, (variable) => {
+        return Promise.all(variables.map((variable) => {
             return materializeVariable(variable.name);
         }));
     };
@@ -99,7 +99,10 @@ exports.materializeConfig = materializeConfig;
 async function materializeAll(projectId) {
     const output = {};
     const configs = await runtimeconfig.configs.list(projectId);
-    await Promise.all(_.map(configs, (config) => {
+    if (!Array.isArray(configs) || !configs.length) {
+        return output;
+    }
+    await Promise.all(configs.map((config) => {
         if (config.name.match(new RegExp("configs/firebase"))) {
             return;
         }
@@ -110,7 +113,7 @@ async function materializeAll(projectId) {
 exports.materializeAll = materializeAll;
 function parseSetArgs(args) {
     const parsed = [];
-    _.forEach(args, (arg) => {
+    for (const arg of args) {
         const parts = arg.split("=");
         const key = parts[0];
         if (parts.length < 2) {
@@ -129,17 +132,17 @@ function parseSetArgs(args) {
             varId: id.variable,
             val: val,
         });
-    });
+    }
     return parsed;
 }
 exports.parseSetArgs = parseSetArgs;
 function parseUnsetArgs(args) {
     const parsed = [];
     let splitArgs = [];
-    _.forEach(args, (arg) => {
-        splitArgs = _.union(splitArgs, arg.split(","));
-    });
-    _.forEach(splitArgs, (key) => {
+    for (const arg of args) {
+        splitArgs = Array.from(new Set([...splitArgs, ...arg.split(",")]));
+    }
+    for (const key of splitArgs) {
         const id = keyToIds(key);
         if (isReservedNamespace(id)) {
             throw new error_1.FirebaseError("Cannot unset reserved namespace " + clc.bold(id.config));
@@ -148,7 +151,7 @@ function parseUnsetArgs(args) {
             configId: id.config,
             varId: id.variable,
         });
-    });
+    }
     return parsed;
 }
 exports.parseUnsetArgs = parseUnsetArgs;

package/lib/functionsConfigClone.js

@@ -1,68 +1,68 @@
 "use strict";
-var _ = require("lodash");
-var clc = require("cli-color");
-var { FirebaseError } = require("./error");
-var functionsConfig = require("./functionsConfig");
-var runtimeconfig = require("./gcp/runtimeconfig");
-var _matchPrefix = function (short, long) {
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.functionsConfigClone = void 0;
+const _ = require("lodash");
+const clc = require("cli-color");
+const error_1 = require("./error");
+const functionsConfig = require("./functionsConfig");
+const runtimeconfig = require("./gcp/runtimeconfig");
+function matchPrefix(short, long) {
     if (short.length > long.length) {
         return false;
     }
-    return _.reduce(short, function (accum, x, i) {
-        return accum && x === long[i];
-    }, true);
-};
-var _applyExcept = function (json, except) {
-    _.forEach(except, function (key) {
+    return short.reduce((accum, x, i) => accum && x === long[i], true);
+}
+function applyExcept(json, except) {
+    for (const key of except) {
         _.unset(json, key);
-    });
-};
-var _cloneVariable = function (varName, toProject) {
-    return runtimeconfig.variables.get(varName).then(function (variable) {
-        var id = functionsConfig.varNameToIds(variable.name);
+    }
+}
+function cloneVariable(varName, toProject) {
+    return runtimeconfig.variables.get(varName).then((variable) => {
+        const id = functionsConfig.varNameToIds(variable.name);
         return runtimeconfig.variables.set(toProject, id.config, id.variable, variable.text);
     });
-};
-var _cloneConfig = function (configName, toProject) {
-    return runtimeconfig.variables.list(configName).then(function (variables) {
-        return Promise.all(_.map(variables, function (variable) {
-            return _cloneVariable(variable.name, toProject);
+}
+function cloneConfig(configName, toProject) {
+    return runtimeconfig.variables.list(configName).then((variables) => {
+        return Promise.all(variables.map((variable) => {
+            return cloneVariable(variable.name, toProject);
         }));
     });
-};
-var _cloneConfigOrVariable = function (key, fromProject, toProject) {
-    var parts = key.split(".");
-    if (_.includes(functionsConfig.RESERVED_NAMESPACES, parts[0])) {
-        throw new FirebaseError("Cannot clone reserved namespace " + clc.bold(parts[0]));
+}
+async function cloneConfigOrVariable(key, fromProject, toProject) {
+    const parts = key.split(".");
+    if (functionsConfig.RESERVED_NAMESPACES.includes(parts[0])) {
+        throw new error_1.FirebaseError("Cannot clone reserved namespace " + clc.bold(parts[0]));
     }
-    var configName = _.join(["projects", fromProject, "configs", parts[0]], "/");
+    const configName = ["projects", fromProject, "configs", parts[0]].join("/");
     if (parts.length === 1) {
-        return _cloneConfig(configName, toProject);
+        return cloneConfig(configName, toProject);
     }
-    return runtimeconfig.variables.list(configName).then(function (variables) {
-        var promises = [];
-        _.forEach(variables, function (variable) {
-            var varId = functionsConfig.varNameToIds(variable.name).variable;
-            var variablePrefixFilter = parts.slice(1);
-            if (_matchPrefix(variablePrefixFilter, varId.split("/"))) {
-                promises.push(_cloneVariable(variable.name, toProject));
+    return runtimeconfig.variables.list(configName).then((variables) => {
+        const promises = [];
+        for (const variable of variables) {
+            const varId = functionsConfig.varNameToIds(variable.name).variable;
+            const variablePrefixFilter = parts.slice(1);
+            if (matchPrefix(variablePrefixFilter, varId.split("/"))) {
+                promises.push(cloneVariable(variable.name, toProject));
             }
-        });
+        }
         return Promise.all(promises);
     });
-};
-module.exports = function (fromProject, toProject, only, except) {
-    except = except || [];
+}
+async function functionsConfigClone(fromProject, toProject, only, except = []) {
     if (only) {
-        return Promise.all(_.map(only, function (key) {
-            return _cloneConfigOrVariable(key, fromProject, toProject);
+        return Promise.all(only.map((key) => {
+            return cloneConfigOrVariable(key, fromProject, toProject);
         }));
     }
-    return functionsConfig.materializeAll(fromProject).then(function (toClone) {
+    return functionsConfig.materializeAll(fromProject).then((toClone) => {
         _.unset(toClone, "firebase");
-        _applyExcept(toClone, except);
-        return Promise.all(_.map(toClone, function (val, configId) {
+        applyExcept(toClone, except);
+        return Promise.all(Object.entries(toClone).map(([configId, val]) => {
             return functionsConfig.setVariablesRecursive(toProject, configId, "", val);
         }));
     });
-};
+}
+exports.functionsConfigClone = functionsConfigClone;

package/lib/gcp/cloudfunctions.js

@@ -4,7 +4,6 @@ exports.functionFromEndpoint = exports.endpointFromFunction = exports.listAllFun
 const clc = require("cli-color");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
-const previews_1 = require("../previews");
 const backend = require("../deploy/functions/backend");
 const utils = require("../utils");
 const proto = require("./proto");
@@ -24,10 +23,6 @@ const BLOCKING_EVENT_TO_LABEL_KEY = {
     "providers/cloud.auth/eventTypes/user.beforeCreate": "before-create",
     "providers/cloud.auth/eventTypes/user.beforeSignIn": "before-sign-in",
 };
-function validateFunction(func) {
-    proto.assertOneOf("Cloud Function", func, "sourceCode", "sourceArchiveUrl", "sourceRepository", "sourceUploadUrl");
-    proto.assertOneOf("Cloud Function", func, "trigger", "httpsTrigger", "eventTrigger");
-}
 function functionsOpLogReject(funcName, type, err) {
     var _a, _b;
     if (((_b = (_a = err === null || err === void 0 ? void 0 : err.context) === null || _a === void 0 ? void 0 : _a.response) === null || _b === void 0 ? void 0 : _b.statusCode) === 429) {
@@ -58,11 +53,7 @@ async function createFunction(cloudFunction) {
     const apiPath = cloudFunction.name.substring(0, cloudFunction.name.lastIndexOf("/"));
     const endpoint = `/${apiPath}`;
     try {
-        const headers = {};
-        if (previews_1.previews.artifactregistry) {
-            headers["X-Firebase-Artifact-Registry"] = "optin";
-        }
-        const res = await client.post(endpoint, cloudFunction, { headers });
+        const res = await client.post(endpoint, cloudFunction);
         return {
             name: res.body.name,
             type: "create",
@@ -147,12 +138,7 @@ async function updateFunction(cloudFunction) {
     const endpoint = `/${cloudFunction.name}`;
     const fieldMasks = proto.fieldMasks(cloudFunction, "labels", "environmentVariables", "secretEnvironmentVariables");
     try {
-        const headers = {};
-        if (previews_1.previews.artifactregistry) {
-            headers["X-Firebase-Artifact-Registry"] = "optin";
-        }
         const res = await client.patch(endpoint, cloudFunction, {
-            headers,
             queryParams: {
                 updateMask: fieldMasks.join(","),
             },
@@ -293,6 +279,7 @@ function functionFromEndpoint(endpoint, sourceUploadUrl) {
         sourceUploadUrl: sourceUploadUrl,
         entryPoint: endpoint.entryPoint,
         runtime: endpoint.runtime,
+        dockerRegistry: "ARTIFACT_REGISTRY",
     };
     proto.copyIfPresent(gcfFunction, endpoint, "labels");
     if (backend.isEventTriggered(endpoint)) {

package/lib/gcp/cloudfunctionsv2.js

@@ -209,6 +209,13 @@ function functionFromEndpoint(endpoint, source) {
             for (const [attribute, value] of Object.entries(endpoint.eventTrigger.eventFilters)) {
                 gcfFunction.eventTrigger.eventFilters.push({ attribute, value });
             }
+            for (const [attribute, value] of Object.entries(endpoint.eventTrigger.eventFilterPathPatterns || {})) {
+                gcfFunction.eventTrigger.eventFilters.push({
+                    attribute,
+                    value,
+                    operator: "match-path-pattern",
+                });
+            }
         }
         proto.renameIfPresent(gcfFunction.eventTrigger, endpoint.eventTrigger, "triggerRegion", "region");
         proto.copyIfPresent(gcfFunction.eventTrigger, endpoint.eventTrigger, "channel");
@@ -277,8 +284,16 @@ function endpointFromFunction(gcfFunction) {
             trigger.eventTrigger.eventFilters.topic = gcfFunction.eventTrigger.pubsubTopic;
         }
         else {
-            for (const { attribute, value } of gcfFunction.eventTrigger.eventFilters || []) {
-                trigger.eventTrigger.eventFilters[attribute] = value;
+            for (const eventFilter of gcfFunction.eventTrigger.eventFilters || []) {
+                if (eventFilter.operator === "match-path-pattern") {
+                    if (!trigger.eventTrigger.eventFilterPathPatterns) {
+                        trigger.eventTrigger.eventFilterPathPatterns = {};
+                    }
+                    trigger.eventTrigger.eventFilterPathPatterns[eventFilter.attribute] = eventFilter.value;
+                }
+                else {
+                    trigger.eventTrigger.eventFilters[eventFilter.attribute] = eventFilter.value;
+                }
             }
         }
         proto.copyIfPresent(trigger.eventTrigger, gcfFunction.eventTrigger, "channel");

package/lib/gcp/iam.js

@@ -14,7 +14,7 @@ async function createServiceAccount(projectId, accountId, description, displayNa
             displayName,
             description,
         },
-    });
+    }, { skipLog: { resBody: true } });
     return response.body;
 }
 exports.createServiceAccount = createServiceAccount;