firebase-tools 11.4.2 → 11.5.0

package/lib/emulator/storage/files.js

@@ -29,6 +29,7 @@ class StoredFile {
     }
 }
 exports.StoredFile = StoredFile;
+const TRAILING_SLASHES_PATTERN = /\/+$/;
 class StorageLayer {
     constructor(_projectId, _files, _buckets, _rulesValidator, _adminCredsValidator, _persistence, _cloudFunctions) {
         this._projectId = _projectId;
@@ -137,6 +138,7 @@ class StorageLayer {
         if (upload.status !== upload_1.UploadStatus.FINISHED) {
             throw new Error(`Unexpected upload status encountered: ${upload.status}.`);
         }
+        const storedMetadata = this.getMetadata(upload.bucketId, upload.objectId);
         const filePath = this.path(upload.bucketId, upload.objectId);
         const metadata = new metadata_1.StoredFileMetadata({
             name: upload.objectId,
@@ -149,7 +151,10 @@ class StorageLayer {
             customMetadata: upload.metadata.metadata,
         }, this._cloudFunctions, this._persistence.readBytes(upload.path, upload.size));
         metadata.update(upload.metadata, false);
-        const authorized = await this._rulesValidator.validate(["b", upload.bucketId, "o", upload.objectId].join("/"), upload.bucketId, types_1.RulesetOperationMethod.CREATE, { after: metadata === null || metadata === void 0 ? void 0 : metadata.asRulesResource() }, upload.authorization);
+        const authorized = await this._rulesValidator.validate(["b", upload.bucketId, "o", upload.objectId].join("/"), upload.bucketId, types_1.RulesetOperationMethod.CREATE, {
+            before: storedMetadata === null || storedMetadata === void 0 ? void 0 : storedMetadata.asRulesResource(),
+            after: metadata === null || metadata === void 0 ? void 0 : metadata.asRulesResource(),
+        }, upload.authorization);
         if (!authorized) {
             this._persistence.deleteFile(upload.path);
             throw new errors_1.ForbiddenError();
@@ -203,7 +208,7 @@ class StorageLayer {
     async listObjects(request) {
         var _a;
         const { bucketId, prefix, delimiter, pageToken, authorization } = request;
-        const authorized = await this._rulesValidator.validate(["b", bucketId, "o", prefix].join("/"), bucketId, types_1.RulesetOperationMethod.LIST, {}, authorization);
+        const authorized = await this._rulesValidator.validate(["b", bucketId, "o", prefix.replace(TRAILING_SLASHES_PATTERN, "")].join("/"), bucketId, types_1.RulesetOperationMethod.LIST, {}, authorization, delimiter);
         if (!authorized) {
             throw new errors_1.ForbiddenError();
         }

package/lib/emulator/storage/multipart.js

@@ -23,7 +23,8 @@ function splitBufferByDelimiter(buffer, delimiter, maxResults = -1) {
     return bufferParts;
 }
 function parseMultipartRequestBody(boundaryId, body) {
-    const boundaryString = `--${boundaryId}`;
+    const cleanBoundaryId = boundaryId.replace(/^["'](.+(?=["']$))["']$/, "$1");
+    const boundaryString = `--${cleanBoundaryId}`;
     const bodyParts = splitBufferByDelimiter(body, boundaryString).map((buf) => {
         return Buffer.from(buf.slice(2));
     });
@@ -35,8 +36,8 @@ function parseMultipartRequestBody(boundaryId, body) {
 }
 function parseMultipartRequestBodyPart(bodyPart) {
     const sections = splitBufferByDelimiter(bodyPart, LINE_SEPARATOR, 3);
-    const contentTypeRaw = sections[0].toString();
-    if (!contentTypeRaw.startsWith("Content-Type: ")) {
+    const contentTypeRaw = sections[0].toString().toLowerCase();
+    if (!contentTypeRaw.startsWith("content-type: ")) {
         throw new Error(`Failed to parse multipart request body part. Missing content type.`);
     }
     const dataRaw = Buffer.from(sections[2]).slice(0, sections[2].byteLength - LINE_SEPARATOR.length);

package/lib/emulator/storage/rules/runtime.js

@@ -199,6 +199,7 @@ class StorageRulesRuntime {
                 service: "firebase.storage",
                 path: opts.path,
                 method: opts.method,
+                delimiter: opts.delimiter,
                 variables: runtimeVariables,
             },
         };
@@ -293,7 +294,6 @@ function createRequestExpressionValue(opts) {
                 segments: opts.path
                     .split("/")
                     .filter((s) => s)
-                    .slice(3)
                     .map((simple) => ({
                     simple,
                 })),

package/lib/emulator/storage/rules/utils.js

@@ -5,13 +5,14 @@ const emulatorLogger_1 = require("../../emulatorLogger");
 const types_1 = require("../../types");
 function getFirebaseRulesValidator(rulesetProvider) {
     return {
-        validate: async (path, bucketId, method, variableOverrides, authorization) => {
+        validate: async (path, bucketId, method, variableOverrides, authorization, delimiter) => {
             return await isPermitted({
                 ruleset: rulesetProvider(bucketId),
                 file: variableOverrides,
                 path,
                 method,
                 authorization,
+                delimiter,
             });
         },
     };
@@ -19,7 +20,7 @@ function getFirebaseRulesValidator(rulesetProvider) {
 exports.getFirebaseRulesValidator = getFirebaseRulesValidator;
 function getAdminOnlyFirebaseRulesValidator() {
     return {
-        validate: (_path, _bucketId, _method, _variableOverrides, _authorization) => {
+        validate: (_path, _bucketId, _method, _variableOverrides, _authorization, delimiter) => {
             return Promise.resolve(true);
         },
     };
@@ -42,6 +43,7 @@ async function isPermitted(opts) {
         path: opts.path,
         file: opts.file,
         token: opts.authorization ? opts.authorization.split(" ")[1] : undefined,
+        delimiter: opts.delimiter,
     });
     if (issues.exist()) {
         issues.all.forEach((warningOrError) => {

package/lib/emulator/types.js

@@ -56,6 +56,7 @@ exports.EMULATORS_SUPPORTED_BY_USE_EMULATOR = [
     Emulators.DATABASE,
     Emulators.FIRESTORE,
     Emulators.FUNCTIONS,
+    Emulators.STORAGE,
 ];
 exports.ALL_EMULATORS = [
     Emulators.HUB,

package/lib/ensureApiEnabled.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enableApiURI = exports.ensure = exports.check = exports.POLL_SETTINGS = void 0;
-const cli_color_1 = require("cli-color");
+const colorette_1 = require("colorette");
 const track_1 = require("./track");
 const api_1 = require("./api");
 const apiv2_1 = require("./apiv2");
@@ -21,7 +21,7 @@ async function check(projectId, apiName, prefix, silent = false) {
     });
     const isEnabled = res.body.state === "ENABLED";
     if (isEnabled && !silent) {
-        utils.logLabeledSuccess(prefix, `required API ${(0, cli_color_1.bold)(apiName)} is enabled`);
+        utils.logLabeledSuccess(prefix, `required API ${(0, colorette_1.bold)(apiName)} is enabled`);
     }
     return isEnabled;
 }
@@ -34,7 +34,7 @@ async function enable(projectId, apiName) {
     }
     catch (err) {
         if ((0, error_1.isBillingError)(err)) {
-            throw new error_1.FirebaseError(`Your project ${(0, cli_color_1.bold)(projectId)} must be on the Blaze (pay-as-you-go) plan to complete this command. Required API ${(0, cli_color_1.bold)(apiName)} can't be enabled until the upgrade is complete. To upgrade, visit the following URL:
+            throw new error_1.FirebaseError(`Your project ${(0, colorette_1.bold)(projectId)} must be on the Blaze (pay-as-you-go) plan to complete this command. Required API ${(0, colorette_1.bold)(apiName)} can't be enabled until the upgrade is complete. To upgrade, visit the following URL:
 
 https://console.firebase.google.com/project/${projectId}/usage/details`);
         }
@@ -54,27 +54,27 @@ async function pollCheckEnabled(projectId, apiName, prefix, silent, enablementRe
         return;
     }
     if (!silent) {
-        utils.logLabeledBullet(prefix, `waiting for API ${(0, cli_color_1.bold)(apiName)} to activate...`);
+        utils.logLabeledBullet(prefix, `waiting for API ${(0, colorette_1.bold)(apiName)} to activate...`);
     }
     return pollCheckEnabled(projectId, apiName, prefix, silent, enablementRetries, pollRetries + 1);
 }
 async function enableApiWithRetries(projectId, apiName, prefix, silent, enablementRetries = 0) {
     if (enablementRetries > 1) {
-        throw new error_1.FirebaseError(`Timed out waiting for API ${(0, cli_color_1.bold)(apiName)} to enable. Please try again in a few minutes.`);
+        throw new error_1.FirebaseError(`Timed out waiting for API ${(0, colorette_1.bold)(apiName)} to enable. Please try again in a few minutes.`);
     }
     await enable(projectId, apiName);
     return pollCheckEnabled(projectId, apiName, prefix, silent, enablementRetries);
 }
 async function ensure(projectId, apiName, prefix, silent = false) {
     if (!silent) {
-        utils.logLabeledBullet(prefix, `ensuring required API ${(0, cli_color_1.bold)(apiName)} is enabled...`);
+        utils.logLabeledBullet(prefix, `ensuring required API ${(0, colorette_1.bold)(apiName)} is enabled...`);
     }
     const isEnabled = await check(projectId, apiName, prefix, silent);
     if (isEnabled) {
         return;
     }
     if (!silent) {
-        utils.logLabeledWarning(prefix, `missing required API ${(0, cli_color_1.bold)(apiName)}. Enabling now...`);
+        utils.logLabeledWarning(prefix, `missing required API ${(0, colorette_1.bold)(apiName)}. Enabling now...`);
     }
     return enableApiWithRetries(projectId, apiName, prefix, silent);
 }

package/lib/extensions/askUserForConsent.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.promptForPublisherTOS = exports.displayApis = exports.displayRoles = exports.retrieveRoleInfo = exports.formatDescription = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const { marked } = require("marked");
 const TerminalRenderer = require("marked-terminal");
 const error_1 = require("../error");

package/lib/extensions/askUserForEventsConfig.js

@@ -4,7 +4,7 @@ exports.askForEventArcLocation = exports.askShouldCollectEventsConfig = exports.
 const prompt_1 = require("../prompt");
 const extensionsApi = require("../extensions/extensionsApi");
 const utils = require("../utils");
-const clc = require("cli-color");
+const clc = require("colorette");
 const logger_1 = require("../logger");
 const { marked } = require("marked");
 function checkAllowedEventTypesResponse(response, validEvents) {

package/lib/extensions/askUserForParam.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInquirerDefault = exports.promptCreateSecret = exports.askForParam = exports.ask = exports.checkResponse = exports.SecretLocation = void 0;
 const _ = require("lodash");
-const clc = require("cli-color");
+const clc = require("colorette");
 const { marked } = require("marked");
 const types_1 = require("./types");
 const secretManagerApi = require("../gcp/secretManager");

package/lib/extensions/changelog.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseChangelog = exports.getLocalChangelog = exports.breakingChangesInUpdate = exports.displayReleaseNotes = exports.getReleaseNotesForUpdate = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const { marked } = require("marked");
 const path = require("path");
 const semver = require("semver");
@@ -39,7 +39,7 @@ function displayReleaseNotes(releaseNotes, fromVersion) {
     const table = new Table({ head: ["Version", "What's New"], style: { head: ["yellow", "bold"] } });
     for (const [version, note] of Object.entries(releaseNotes)) {
         if (breakingVersions.includes(version)) {
-            table.push([clc.yellow.bold(version), marked(note)]);
+            table.push([clc.yellow(clc.bold(version)), marked(note)]);
         }
         else {
             table.push([version, marked(note)]);

package/lib/extensions/checkProjectBilling.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enableBilling = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const opn = require("open");
 const cloudbilling = require("../gcp/cloudbilling");
 const error_1 = require("../error");
@@ -59,7 +59,7 @@ async function setUpBillingAccount(projectId) {
     logger_1.logger.info();
     logger_1.logger.info(`Extension require your project to be upgraded to the Blaze plan. Please visit the following link to add a billing account:`);
     logger_1.logger.info();
-    logger_1.logger.info(clc.bold.underline(billingURL));
+    logger_1.logger.info(clc.bold(clc.underline(billingURL)));
     logger_1.logger.info();
     const open = await prompt.promptOnce({
         name: "open-url",

package/lib/extensions/displayExtensionInfo.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.printSourceDownloadLink = exports.displayExtInfo = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const { marked } = require("marked");
 const TerminalRenderer = require("marked-terminal");
 const utils = require("../utils");

package/lib/extensions/extensionsApi.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExtension = exports.deleteExtension = exports.unpublishExtension = exports.publishExtensionVersion = exports.undeprecateExtensionVersion = exports.deprecateExtensionVersion = exports.registerPublisherProfile = exports.getPublisherProfile = exports.listExtensionVersions = exports.listExtensions = exports.getExtensionVersion = exports.getSource = exports.createSource = exports.updateInstanceFromRegistry = exports.updateInstance = exports.configureInstance = exports.listInstances = exports.getInstance = exports.deleteInstance = exports.createInstance = void 0;
 const yaml = require("js-yaml");
-const clc = require("cli-color");
+const clc = require("colorette");
 const { marked } = require("marked");
 const apiv2_1 = require("../apiv2");
 const api_1 = require("../api");

package/lib/extensions/extensionsHelper.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.canonicalizeRefInput = exports.diagnoseAndFixProject = exports.confirm = exports.getSourceOrigin = exports.isLocalOrURLPath = exports.isLocalPath = exports.isUrlPath = exports.instanceIdExists = exports.promptForRepeatInstance = exports.promptForOfficialExtension = exports.displayReleaseNotes = exports.getPublisherProjectFromName = exports.createSourceFromLocation = exports.publishExtensionVersionFromLocalSource = exports.ensureExtensionsApiEnabled = exports.promptForValidInstanceId = exports.validateSpec = exports.validateCommandLineParams = exports.populateDefaultParams = exports.substituteParams = exports.getFirebaseProjectParams = exports.getDBInstanceFromURL = exports.resourceTypeToNiceName = exports.AUTOPOULATED_PARAM_PLACEHOLDERS = exports.EXTENSIONS_BUCKET_NAME = exports.URL_REGEX = exports.logPrefix = exports.SourceOrigin = exports.SpecParamType = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const ora = require("ora");
 const semver = require("semver");
 const { marked } = require("marked");

package/lib/extensions/listExtensions.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listExtensions = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const Table = require("cli-table");
 const extensionsApi_1 = require("./extensionsApi");
 const logger_1 = require("../logger");

package/lib/extensions/manifest.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.showPostDeprecationNotice = exports.readInstanceParam = exports.getInstanceRef = exports.getInstanceTarget = exports.instanceExists = exports.loadConfig = exports.removeFromManifest = exports.writeLocalSecrets = exports.writeToManifest = exports.ENV_DIRECTORY = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const path = require("path");
 const refs = require("./refs");
 const config_1 = require("../config");

package/lib/extensions/metricsUtils.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildMetricsTableRow = exports.parseBucket = exports.parseTimeseriesResponse = void 0;
 const semver = require("semver");
-const clc = require("cli-color");
+const clc = require("colorette");
 function parseTimeseriesResponse(series) {
     const ret = [];
     for (const s of series) {

package/lib/extensions/paramHelper.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readEnvFile = exports.promptForNewParams = exports.getParamsForUpdate = exports.getParams = exports.getParamsWithCurrentValuesAsDefaults = exports.setNewDefaults = exports.buildBindingOptionsWithBaseValue = exports.getBaseParamBindings = void 0;
 const path = require("path");
-const clc = require("cli-color");
+const clc = require("colorette");
 const fs = require("fs-extra");
 const error_1 = require("../error");
 const logger_1 = require("../logger");

package/lib/extensions/updateHelper.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.inferUpdateSource = exports.updateFromPublisherSource = exports.updateToVersionFromPublisherSource = exports.updateFromUrlSource = exports.updateFromLocalSource = exports.update = exports.warningUpdateToOtherSource = exports.getExistingSourceOrigin = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const semver = require("semver");
 const { marked } = require("marked");
 const error_1 = require("../error");
@@ -120,7 +120,7 @@ async function updateToVersionFromPublisherSource(projectId, instanceId, extVers
         source = await extensionsApi.getExtensionVersion(extVersionRef);
     }
     catch (err) {
-        throw new error_1.FirebaseError(`Could not find source '${clc.bold(extVersionRef)}' because (${clc.bold(version)}) is not a published version. To update, use the latest version of this extension (${clc.bold(extension.latestVersion)}).`);
+        throw new error_1.FirebaseError(`Could not find source '${clc.bold(extVersionRef)}' because (${clc.bold(version || "")}) is not a published version. To update, use the latest version of this extension (${clc.bold(extension.latestVersion || "")}).`);
     }
     showUpdateVersionInfo(instanceId, existingSpec.version, source.spec.version, extVersionRef);
     warningUpdateToOtherSource(extensionsHelper_1.SourceOrigin.PUBLISHED_EXTENSION);

package/lib/extensions/warnings.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.outOfBandChangesWarning = exports.paramsFlagDeprecationWarning = exports.displayWarningsForDeploy = exports.displayWarningPrompts = void 0;
 const { marked } = require("marked");
-const clc = require("cli-color");
+const clc = require("colorette");
 const types_1 = require("./types");
 const displayExtensionInfo_1 = require("./displayExtensionInfo");
 const extensionsHelper_1 = require("./extensionsHelper");
@@ -20,7 +20,7 @@ function displayEAPWarning({ publisherId, sourceDownloadUri, githubLink, }) {
     (0, displayExtensionInfo_1.printSourceDownloadLink)(sourceDownloadUri);
 }
 function displayExperimentalWarning() {
-    utils.logLabeledBullet(extensionsHelper_1.logPrefix, marked(`${clc.yellow.bold("Important")}: This extension is ${clc.bold("experimental")} and may not be production-ready. Its functionality might change in backward-incompatible ways before its official release, or it may be discontinued.`));
+    utils.logLabeledBullet(extensionsHelper_1.logPrefix, marked(`${clc.yellow(clc.bold("Important"))}: This extension is ${clc.bold("experimental")} and may not be production-ready. Its functionality might change in backward-incompatible ways before its official release, or it may be discontinued.`));
 }
 async function displayWarningPrompts(publisherId, launchStage, extensionVersion) {
     const trustedPublishers = await (0, resolveSource_1.getTrustedPublishers)();

package/lib/fetchMOTD.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchMOTD = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const semver = require("semver");
 const apiv2_1 = require("./apiv2");
 const configstore_1 = require("./configstore");

package/lib/firestore/delete.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FirestoreDelete = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const ProgressBar = require("progress");
 const apiv2 = require("../apiv2");
 const firestore = require("../gcp/firestore");

package/lib/firestore/indexes.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FirestoreIndexes = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const logger_1 = require("../logger");
 const utils = require("../utils");
 const validator = require("./validator");
@@ -345,7 +345,7 @@ class FirestoreIndexes {
             return result;
         }
         if (spec.indexes[0].collectionId) {
-            utils.logBullet(clc.bold.cyan("firestore:") +
+            utils.logBullet(clc.bold(clc.cyan("firestore:")) +
                 " your indexes indexes are specified in the v1beta1 API format. " +
                 "Please upgrade to the new index API format by running " +
                 clc.bold("firebase firestore:indexes") +

package/lib/firestore/validator.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertEnum = exports.assertHasOneOf = exports.assertHas = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const error_1 = require("../error");
 function assertHas(obj, prop) {
     const objString = clc.cyan(JSON.stringify(obj));

package/lib/functions/env.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadFirebaseEnvs = exports.loadUserEnvs = exports.writeUserEnvs = exports.hasUserEnvs = exports.parseStrict = exports.validateKey = exports.KeyValidationError = exports.parse = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const fs = require("fs");
 const path = require("path");
 const error_1 = require("../error");
@@ -173,7 +173,7 @@ function writeUserEnvs(toWrite, envOpts) {
         }
     }
     const mostSpecificEnv = path.join(functionsSource, envFiles[envFiles.length - 1]);
-    (0, utils_1.logBullet)(clc.cyan.bold("functions: ") + `Writing new parameter values to disk: ${mostSpecificEnv}`);
+    (0, utils_1.logBullet)(clc.cyan(clc.bold("functions: ")) + `Writing new parameter values to disk: ${mostSpecificEnv}`);
     for (const k of Object.keys(toWrite)) {
         fs.appendFileSync(mostSpecificEnv, formatUserEnvForWrite(k, toWrite[k]));
     }
@@ -219,7 +219,7 @@ function loadUserEnvs({ functionsSource, projectId, projectAlias, isEmulator, })
             });
         }
     }
-    (0, utils_1.logBullet)(clc.cyan.bold("functions: ") + `Loaded environment variables from ${envFiles.join(", ")}.`);
+    (0, utils_1.logBullet)(clc.cyan(clc.bold("functions: ")) + `Loaded environment variables from ${envFiles.join(", ")}.`);
     return envs;
 }
 exports.loadUserEnvs = loadUserEnvs;

package/lib/functions/runtimeConfigExport.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateDotenvFilename = exports.toDotenvFormat = exports.hydrateEnvs = exports.configToEnv = exports.convertKey = exports.hydrateConfigs = exports.getProjectInfos = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const env = require("./env");
 const functionsConfig = require("../functionsConfig");
 const error_1 = require("../error");

package/lib/functionsConfig.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseUnsetArgs = exports.parseSetArgs = exports.materializeAll = exports.materializeConfig = exports.setVariablesRecursive = exports.getFirebaseConfig = exports.getAppEngineLocation = exports.idsToVarName = exports.varNameToIds = exports.ensureApi = exports.RESERVED_NAMESPACES = void 0;
 const _ = require("lodash");
-const clc = require("cli-color");
+const clc = require("colorette");
 const api_1 = require("./api");
 const apiv2_1 = require("./apiv2");
 const ensureApiEnabled_1 = require("./ensureApiEnabled");

package/lib/functionsConfigClone.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.functionsConfigClone = void 0;
 const _ = require("lodash");
-const clc = require("cli-color");
+const clc = require("colorette");
 const error_1 = require("./error");
 const functionsConfig = require("./functionsConfig");
 const runtimeconfig = require("./gcp/runtimeconfig");

package/lib/functionsShellCommandAction.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.actionFunction = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const repl = require("repl");
 const _ = require("lodash");
 const request = require("request");

package/lib/gcp/cloudfunctions.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.functionFromEndpoint = exports.endpointFromFunction = exports.listAllFunctions = exports.listFunctions = exports.deleteFunction = exports.updateFunction = exports.setInvokerUpdate = exports.setInvokerCreate = exports.getIamPolicy = exports.setIamPolicy = exports.createFunction = exports.generateUploadUrl = exports.BLOCKING_LABEL = exports.CODEBASE_LABEL = exports.API_VERSION = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
 const backend = require("../deploy/functions/backend");
@@ -26,10 +26,10 @@ const BLOCKING_EVENT_TO_LABEL_KEY = {
 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) {
-        utils.logWarning(`${clc.bold.yellow("functions:")} got "Quota Exceeded" error while trying to ${type} ${funcName}. Waiting to retry...`);
+        utils.logWarning(`${clc.bold(clc.yellow("functions:"))} got "Quota Exceeded" error while trying to ${type} ${funcName}. Waiting to retry...`);
     }
     else {
-        utils.logWarning(clc.bold.yellow("functions:") + " failed to " + type + " function " + funcName);
+        utils.logWarning(clc.bold(clc.yellow("functions:")) + " failed to " + type + " function " + funcName);
     }
     throw new error_1.FirebaseError(`Failed to ${type} function ${funcName}`, {
         original: err,

package/lib/gcp/cloudfunctionsv2.js

@@ -1,7 +1,7 @@
 "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.BLOCKING_LABEL = exports.CODEBASE_LABEL = exports.API_VERSION = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
 const api_1 = require("../api");
@@ -59,15 +59,15 @@ function mebibytes(memory) {
 exports.mebibytes = mebibytes;
 function functionsOpLogReject(funcName, type, err) {
     var _a, _b;
-    utils.logWarning(clc.bold.yellow("functions:") + ` ${err === null || err === void 0 ? void 0 : err.message}`);
+    utils.logWarning(clc.bold(clc.yellow("functions:")) + ` ${err === null || err === void 0 ? void 0 : err.message}`);
     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) {
-        utils.logWarning(`${clc.bold.yellow("functions:")} got "Quota Exceeded" error while trying to ${type} ${funcName}. Waiting to retry...`);
+        utils.logWarning(`${clc.bold(clc.yellow("functions:"))} got "Quota Exceeded" error while trying to ${type} ${funcName}. Waiting to retry...`);
     }
     else if (err === null || err === void 0 ? void 0 : err.message.includes("If you recently started to use Eventarc, it may take a few minutes before all necessary permissions are propagated to the Service Agent")) {
-        utils.logWarning(`${clc.bold.yellow("functions:")} since this is your first time using functions v2, we need a little bit longer to finish setting everything up, please retry the deployment in a few minutes.`);
+        utils.logWarning(`${clc.bold(clc.yellow("functions:"))} since this is your first time using functions v2, we need a little bit longer to finish setting everything up, please retry the deployment in a few minutes.`);
     }
     else {
-        utils.logWarning(clc.bold.yellow("functions:") + " failed to " + type + " function " + funcName);
+        utils.logWarning(clc.bold(clc.yellow("functions:")) + " failed to " + type + " function " + funcName);
     }
     throw new error_1.FirebaseError(`Failed to ${type} function ${funcName}`, {
         original: err,

package/lib/gcp/cloudscheduler.js

@@ -9,7 +9,7 @@ const apiv2_1 = require("../apiv2");
 const backend = require("../deploy/functions/backend");
 const proto = require("./proto");
 const functional_1 = require("../functional");
-const VERSION = "v1beta1";
+const VERSION = "v1";
 const DEFAULT_TIME_ZONE = "America/Los_Angeles";
 const apiClient = new apiv2_1.Client({ urlPrefix: api_1.cloudschedulerOrigin, apiVersion: VERSION });
 function createJob(job) {
@@ -28,7 +28,12 @@ function getJob(name) {
 }
 exports.getJob = getJob;
 function updateJob(job) {
-    return apiClient.patch(`/${job.name}`, Object.assign({ timeZone: DEFAULT_TIME_ZONE }, job));
+    const fieldMasks = proto.fieldMasks(job, "pubsubTarget");
+    return apiClient.patch(`/${job.name}`, Object.assign({ timeZone: DEFAULT_TIME_ZONE }, job), {
+        queryParams: {
+            updateMask: fieldMasks.join(","),
+        },
+    });
 }
 exports.updateJob = updateJob;
 async function createOrReplaceJob(job) {
@@ -53,7 +58,7 @@ async function createOrReplaceJob(job) {
     if (!job.timeZone) {
         job.timeZone = DEFAULT_TIME_ZONE;
     }
-    if (isIdentical(existingJob.body, job)) {
+    if (!needUpdate(existingJob.body, job)) {
         logger_1.logger.debug(`scheduler job ${jobName} is up to date, no changes required`);
         return;
     }
@@ -62,12 +67,28 @@ async function createOrReplaceJob(job) {
     return updatedJob;
 }
 exports.createOrReplaceJob = createOrReplaceJob;
-function isIdentical(job, otherJob) {
-    return (job &&
-        otherJob &&
-        job.schedule === otherJob.schedule &&
-        job.timeZone === otherJob.timeZone &&
-        _.isEqual(job.retryConfig, otherJob.retryConfig));
+function needUpdate(existingJob, newJob) {
+    if (!existingJob) {
+        return true;
+    }
+    if (!newJob) {
+        return true;
+    }
+    if (existingJob.schedule !== newJob.schedule) {
+        return true;
+    }
+    if (existingJob.timeZone !== newJob.timeZone) {
+        return true;
+    }
+    if (newJob.retryConfig) {
+        if (!existingJob.retryConfig) {
+            return true;
+        }
+        if (!_.isMatch(existingJob.retryConfig, newJob.retryConfig)) {
+            return true;
+        }
+    }
+    return false;
 }
 function jobNameForEndpoint(endpoint, appEngineLocation) {
     const id = backend.scheduleIdForFunction(endpoint);
@@ -107,6 +128,9 @@ function jobFromEndpoint(endpoint, appEngineLocation) {
         proto.convertIfPresent(job.retryConfig, endpoint.scheduleTrigger.retryConfig, "maxBackoffDuration", "maxBackoffSeconds", (0, functional_1.nullsafeVisitor)(proto.durationFromSeconds));
         proto.convertIfPresent(job.retryConfig, endpoint.scheduleTrigger.retryConfig, "minBackoffDuration", "minBackoffSeconds", (0, functional_1.nullsafeVisitor)(proto.durationFromSeconds));
         proto.convertIfPresent(job.retryConfig, endpoint.scheduleTrigger.retryConfig, "maxRetryDuration", "maxRetrySeconds", (0, functional_1.nullsafeVisitor)(proto.durationFromSeconds));
+        if (!Object.keys(job.retryConfig).length) {
+            delete job.retryConfig;
+        }
     }
     return job;
 }