firebase-tools 11.4.2 → 11.7.0

package/lib/deploy/functions/checkIam.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureServiceAgentRoles = exports.mergeBindings = exports.obtainDefaultComputeServiceAgentBindings = exports.obtainPubSubServiceAgentBindings = exports.checkHttpIam = exports.checkServiceAccountIam = exports.EVENTARC_EVENT_RECEIVER_ROLE = exports.RUN_INVOKER_ROLE = exports.SERVICE_ACCOUNT_TOKEN_CREATOR_ROLE = void 0;
-const cli_color_1 = require("cli-color");
+exports.ensureServiceAgentRoles = exports.mergeBindings = exports.obtainDefaultComputeServiceAgentBindings = exports.obtainPubSubServiceAgentBindings = exports.getDefaultComputeServiceAgent = exports.checkHttpIam = exports.checkServiceAccountIam = exports.EVENTARC_EVENT_RECEIVER_ROLE = exports.RUN_INVOKER_ROLE = exports.SERVICE_ACCOUNT_TOKEN_CREATOR_ROLE = void 0;
+const colorette_1 = require("colorette");
 const logger_1 = require("../../logger");
 const functionsDeployHelper_1 = require("./functionsDeployHelper");
 const error_1 = require("../../error");
@@ -28,7 +28,7 @@ async function checkServiceAccountIam(projectId) {
         return;
     }
     if (!passed) {
-        throw new error_1.FirebaseError(`Missing permissions required for functions deploy. You must have permission ${(0, cli_color_1.bold)("iam.serviceAccounts.ActAs")} on service account ${(0, cli_color_1.bold)(saEmail)}.\n\n` +
+        throw new error_1.FirebaseError(`Missing permissions required for functions deploy. You must have permission ${(0, colorette_1.bold)("iam.serviceAccounts.ActAs")} on service account ${(0, colorette_1.bold)(saEmail)}.\n\n` +
             `To address this error, ask a project Owner to assign your account the "Service Account User" role from this URL:\n\n` +
             `https://console.cloud.google.com/iam-admin/iam?project=${projectId}`);
     }
@@ -60,7 +60,7 @@ async function checkHttpIam(context, options, payload) {
     }
     if (!passed) {
         void (0, track_1.track)("Error (User)", "deploy:functions:http_create_missing_iam");
-        throw new error_1.FirebaseError(`Missing required permission on project ${(0, cli_color_1.bold)(context.projectId)} to deploy new HTTPS functions. The permission ${(0, cli_color_1.bold)(PERMISSION)} is required to deploy the following functions:\n\n- ` +
+        throw new error_1.FirebaseError(`Missing required permission on project ${(0, colorette_1.bold)(context.projectId)} to deploy new HTTPS functions. The permission ${(0, colorette_1.bold)(PERMISSION)} is required to deploy the following functions:\n\n- ` +
             newHttpsEndpoints.map((func) => func.id).join("\n- ") +
             `\n\nTo address this error, please ask a project Owner to assign your account the "Cloud Functions Admin" role at the following URL:\n\nhttps://console.cloud.google.com/iam-admin/iam?project=${context.projectId}`);
     }
@@ -68,11 +68,12 @@ async function checkHttpIam(context, options, payload) {
 }
 exports.checkHttpIam = checkHttpIam;
 function getPubsubServiceAgent(projectNumber) {
-    return `serviceAccount:service-${projectNumber}@gcp-sa-pubsub.iam.gserviceaccount.com`;
+    return `service-${projectNumber}@gcp-sa-pubsub.iam.gserviceaccount.com`;
 }
 function getDefaultComputeServiceAgent(projectNumber) {
-    return `serviceAccount:${projectNumber}-compute@developer.gserviceaccount.com`;
+    return `${projectNumber}-compute@developer.gserviceaccount.com`;
 }
+exports.getDefaultComputeServiceAgent = getDefaultComputeServiceAgent;
 function reduceEventsToServices(services, endpoint) {
     const service = (0, services_1.serviceForEndpoint)(endpoint);
     if (service.requiredProjectBindings && !services.find((s) => s.name === service.name)) {
@@ -83,13 +84,13 @@ function reduceEventsToServices(services, endpoint) {
 function obtainPubSubServiceAgentBindings(projectNumber) {
     const serviceAccountTokenCreatorBinding = {
         role: exports.SERVICE_ACCOUNT_TOKEN_CREATOR_ROLE,
-        members: [getPubsubServiceAgent(projectNumber)],
+        members: [`serviceAccount:${getPubsubServiceAgent(projectNumber)}`],
     };
     return [serviceAccountTokenCreatorBinding];
 }
 exports.obtainPubSubServiceAgentBindings = obtainPubSubServiceAgentBindings;
 function obtainDefaultComputeServiceAgentBindings(projectNumber) {
-    const defaultComputeServiceAgent = getDefaultComputeServiceAgent(projectNumber);
+    const defaultComputeServiceAgent = `serviceAccount:${getDefaultComputeServiceAgent(projectNumber)}`;
     const runInvokerBinding = {
         role: exports.RUN_INVOKER_ROLE,
         members: [defaultComputeServiceAgent],

package/lib/deploy/functions/containerCleaner.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DockerHelper = exports.deleteGcfArtifacts = exports.listGcfPaths = exports.ContainerRegistryCleaner = exports.NoopArtifactRegistryCleaner = exports.ArtifactRegistryCleaner = exports.cleanupBuildImages = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const error_1 = require("../../error");
 const api_1 = require("../../api");
 const logger_1 = require("../../logger");
@@ -34,7 +34,7 @@ async function retry(func) {
     }
 }
 async function cleanupBuildImages(haveFunctions, deletedFunctions, cleaners = {}) {
-    utils.logBullet(clc.bold.cyan("functions: ") + "cleaning up build files...");
+    utils.logBullet(clc.bold(clc.cyan("functions: ")) + "cleaning up build files...");
     const failedDomains = new Set();
     const cleanup = [];
     const arCleaner = cleaners.ar || new ArtifactRegistryCleaner();

package/lib/deploy/functions/deploy.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deploy = void 0;
 const tmp_1 = require("tmp");
-const clc = require("cli-color");
+const clc = require("colorette");
 const fs = require("fs");
 const checkIam_1 = require("./checkIam");
 const utils_1 = require("../../utils");
@@ -61,7 +61,7 @@ async function uploadCodebase(context, codebase, wantBackend) {
         }
         const sourceDir = (0, projectConfig_1.configForCodebase)(context.config, codebase).source;
         if (uploads.length) {
-            (0, utils_1.logSuccess)(`${clc.green.bold("functions:")} ${clc.bold(sourceDir)} folder uploaded successfully`);
+            (0, utils_1.logSuccess)(`${clc.green(clc.bold("functions:"))} ${clc.bold(sourceDir)} folder uploaded successfully`);
         }
     }
     catch (err) {

package/lib/deploy/functions/ensure.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.secretAccess = exports.cloudBuildEnabled = exports.defaultServiceAccount = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const ensureApiEnabled_1 = require("../../ensureApiEnabled");
 const error_1 = require("../../error");
 const utils_1 = require("../../utils");

package/lib/deploy/functions/params.js

@@ -21,7 +21,7 @@ function resolveInt(from, paramValues) {
     if (typeof from === "number") {
         return from;
     }
-    const match = /\A{{ params\.(\w+) }}\z/.exec(from);
+    const match = /{{ params\.(\w+) }}/.exec(from);
     if (!match) {
         throw new error_1.FirebaseError("CEL evaluation of expression '" + from + "' not yet supported");
     }
@@ -105,17 +105,17 @@ function canSatisfyParam(param, value) {
 async function resolveParams(params, projectId, userEnvs) {
     const paramValues = {};
     const [provided, outstanding] = (0, functional_1.partition)(params, (param) => {
-        return {}.hasOwnProperty.call(userEnvs, param.param);
+        return {}.hasOwnProperty.call(userEnvs, param.name);
     });
     for (const param of provided) {
-        if (!canSatisfyParam(param, userEnvs[param.param])) {
+        if (!canSatisfyParam(param, userEnvs[param.name])) {
             throw new error_1.FirebaseError("Parameter " +
-                param.param +
+                param.name +
                 " resolved to value from dotenv files " +
-                userEnvs[param.param] +
+                userEnvs[param.name] +
                 " of wrong type");
         }
-        paramValues[param.param] = userEnvs[param.param];
+        paramValues[param.name] = userEnvs[param.name];
     }
     for (const param of outstanding) {
         let paramDefault = param.default;
@@ -123,9 +123,9 @@ async function resolveParams(params, projectId, userEnvs) {
             paramDefault = resolveDefaultCEL(param.type, paramDefault, paramValues);
         }
         if (paramDefault && !canSatisfyParam(param, paramDefault)) {
-            throw new error_1.FirebaseError("Parameter " + param.param + " has default value " + paramDefault + " of wrong type");
+            throw new error_1.FirebaseError("Parameter " + param.name + " has default value " + paramDefault + " of wrong type");
         }
-        paramValues[param.param] = await promptParam(param, paramDefault);
+        paramValues[param.name] = await promptParam(param, paramDefault);
     }
     return paramValues;
 }
@@ -146,15 +146,15 @@ async function promptStringParam(param, resolvedDefault) {
     }
     switch (param.input.type) {
         case "select":
-            throw new error_1.FirebaseError("Build specified string parameter " + param.param + " with unsupported input type 'select'");
+            throw new error_1.FirebaseError("Build specified string parameter " + param.name + " with unsupported input type 'select'");
         case "text":
         default:
-            let prompt = `Enter a value for ${param.label || param.param}`;
+            let prompt = `Enter a value for ${param.label || param.name}:`;
             if (param.description) {
                 prompt += ` \n(${param.description})`;
             }
             return await (0, prompt_1.promptOnce)({
-                name: param.param,
+                name: param.name,
                 type: "input",
                 default: resolvedDefault,
                 message: prompt,
@@ -168,17 +168,17 @@ async function promptIntParam(param, resolvedDefault) {
     }
     switch (param.input.type) {
         case "select":
-            throw new error_1.FirebaseError("Build specified int parameter " + param.param + " with unsupported input type 'select'");
+            throw new error_1.FirebaseError("Build specified int parameter " + param.name + " with unsupported input type 'select'");
         case "text":
         default:
-            let prompt = `Enter a value for ${param.label || param.param}`;
+            let prompt = `Enter a value for ${param.label || param.name}:`;
             if (param.description) {
                 prompt += ` \n(${param.description})`;
             }
             let res;
             while (true) {
                 res = await (0, prompt_1.promptOnce)({
-                    name: param.param,
+                    name: param.name,
                     type: "number",
                     default: resolvedDefault,
                     message: prompt,
@@ -186,7 +186,7 @@ async function promptIntParam(param, resolvedDefault) {
                 if (Number.isInteger(res)) {
                     return res;
                 }
-                logger_1.logger.error(`${param.label || param.param} must be an integer; retrying...`);
+                logger_1.logger.error(`${param.label || param.name} must be an integer; retrying...`);
             }
     }
 }

package/lib/deploy/functions/prepare.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveCpu = exports.inferBlockingDetails = exports.inferDetailsFromExisting = exports.prepare = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const backend = require("./backend");
 const build = require("./build");
 const ensureApiEnabled = require("../../ensureApiEnabled");

package/lib/deploy/functions/prepareFunctionsUpload.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareFunctionsUpload = exports.getFunctionsConfig = void 0;
 const archiver = require("archiver");
-const clc = require("cli-color");
+const clc = require("colorette");
 const filesize = require("filesize");
 const fs = require("fs");
 const path = require("path");
@@ -74,7 +74,7 @@ async function packageSource(sourceDir, config, runtimeConfig) {
             exit: 1,
         });
     }
-    utils.logBullet(clc.cyan.bold("functions:") +
+    utils.logBullet(clc.cyan(clc.bold("functions:")) +
         " packaged " +
         clc.bold(sourceDir) +
         " (" +

package/lib/deploy/functions/prompts.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.promptForMinInstances = exports.promptForFunctionDeletion = exports.promptForFailurePolicies = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const functionsDeployHelper_1 = require("./functionsDeployHelper");
 const error_1 = require("../../error");
 const prompt_1 = require("../../prompt");

package/lib/deploy/functions/release/fabricator.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serviceIsResolved = exports.Fabricator = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const error_1 = require("../../../error");
 const sourceTokenScraper_1 = require("./sourceTokenScraper");
 const timer_1 = require("./timer");
@@ -24,6 +24,7 @@ const utils = require("../../../utils");
 const services = require("../services");
 const v1_1 = require("../../../functions/events/v1");
 const throttler_1 = require("../../../throttler/throttler");
+const checkIam_1 = require("../checkIam");
 const gcfV1PollerOptions = {
     apiOrigin: api_1.functionsOrigin,
     apiVersion: gcf.API_VERSION,
@@ -46,6 +47,7 @@ class Fabricator {
         this.functionExecutor = args.functionExecutor;
         this.sources = args.sources;
         this.appEngineLocation = args.appEngineLocation;
+        this.projectNumber = args.projectNumber;
     }
     async applyPlan(plan) {
         const timer = new timer_1.Timer();
@@ -270,6 +272,12 @@ class Fabricator {
                 .run(() => run.setInvokerCreate(endpoint.project, serviceName, ["public"]))
                 .catch(rethrowAs(endpoint, "set invoker"));
         }
+        else if (backend.isScheduleTriggered(endpoint)) {
+            const invoker = [(0, checkIam_1.getDefaultComputeServiceAgent)(this.projectNumber)];
+            await this.executor
+                .run(() => run.setInvokerCreate(endpoint.project, serviceName, invoker))
+                .catch(rethrowAs(endpoint, "set invoker"));
+        }
         const mem = endpoint.availableMemoryMb || backend.DEFAULT_MEMORY;
         const hasCustomCPU = endpoint.cpu !== backend.memoryToGen1Cpu(mem);
         if (!endpoint.concurrency) {
@@ -346,6 +354,9 @@ class Fabricator {
             v1_1.AUTH_BLOCKING_EVENTS.includes(endpoint.blockingTrigger.eventType)) {
             invoker = ["public"];
         }
+        else if (backend.isScheduleTriggered(endpoint)) {
+            invoker = [(0, checkIam_1.getDefaultComputeServiceAgent)(this.projectNumber)];
+        }
         if (invoker) {
             await this.executor
                 .run(() => run.setInvokerUpdate(endpoint.project, serviceName, invoker))
@@ -452,13 +463,16 @@ class Fabricator {
         }
     }
     async upsertScheduleV1(endpoint) {
-        const job = scheduler.jobFromEndpoint(endpoint, this.appEngineLocation);
+        const job = scheduler.jobFromEndpoint(endpoint, this.appEngineLocation, this.projectNumber);
         await this.executor
             .run(() => scheduler.createOrReplaceJob(job))
             .catch(rethrowAs(endpoint, "upsert schedule"));
     }
-    upsertScheduleV2(endpoint) {
-        return Promise.reject(new reporter.DeploymentError(endpoint, "upsert schedule", new Error("Not implemented")));
+    async upsertScheduleV2(endpoint) {
+        const job = scheduler.jobFromEndpoint(endpoint, endpoint.region, this.projectNumber);
+        await this.executor
+            .run(() => scheduler.createOrReplaceJob(job))
+            .catch(rethrowAs(endpoint, "upsert schedule"));
     }
     async upsertTaskQueue(endpoint) {
         const queue = cloudtasks.queueFromEndpoint(endpoint);
@@ -486,8 +500,11 @@ class Fabricator {
             .run(() => pubsub.deleteTopic(topicName))
             .catch(rethrowAs(endpoint, "delete topic"));
     }
-    deleteScheduleV2(endpoint) {
-        return Promise.reject(new reporter.DeploymentError(endpoint, "delete schedule", new Error("Not implemented")));
+    async deleteScheduleV2(endpoint) {
+        const jobName = scheduler.jobNameForEndpoint(endpoint, endpoint.region);
+        await this.executor
+            .run(() => scheduler.deleteJob(jobName))
+            .catch(rethrowAs(endpoint, "delete schedule"));
     }
     async disableTaskQueue(endpoint) {
         const update = {
@@ -510,7 +527,7 @@ class Fabricator {
     }
     logOpSuccess(op, endpoint) {
         const label = helper.getFunctionLabel(endpoint);
-        utils.logSuccess(`${clc.bold.green(`functions[${label}]`)} Successful ${op} operation.`);
+        utils.logSuccess(`${clc.bold(clc.green(`functions[${label}]`))} Successful ${op} operation.`);
     }
 }
 exports.Fabricator = Fabricator;

package/lib/deploy/functions/release/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.printTriggerUrls = exports.release = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const logger_1 = require("../../../logger");
 const functional_1 = require("../../../functional");
 const backend = require("../backend");
@@ -14,6 +14,7 @@ const prompts = require("../prompts");
 const functionsConfig_1 = require("../../../functionsConfig");
 const functionsDeployHelper_1 = require("../functionsDeployHelper");
 const error_1 = require("../../../error");
+const getProjectNumber_1 = require("../../../getProjectNumber");
 async function release(context, options, payload) {
     if (!context.config) {
         return;
@@ -53,6 +54,7 @@ async function release(context, options, payload) {
         executor: new executor.QueueExecutor({}),
         sources: context.sources,
         appEngineLocation: (0, functionsConfig_1.getAppEngineLocation)(context.firebaseConfig),
+        projectNumber: options.projectNumber || (await (0, getProjectNumber_1.getProjectNumber)(context.projectId)),
     });
     const summary = await fab.applyPlan(plan);
     await reporter.logAndTrackDeployStats(summary);

package/lib/deploy/functions/release/reporter.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.triggerTag = exports.printAbortedErrors = exports.printErrors = exports.logAndTrackDeployStats = exports.AbortedDeploymentError = exports.DeploymentError = void 0;
 const backend = require("../backend");
-const clc = require("cli-color");
+const clc = require("colorette");
 const logger_1 = require("../../../logger");
 const track_1 = require("../../../track");
 const utils = require("../../../utils");

package/lib/deploy/functions/runtimes/discovery/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.detectFromPort = exports.detectFromYaml = exports.yamlToBuild = exports.yamlToBackend = exports.readFileAsync = void 0;
+exports.detectFromPort = exports.detectFromYaml = exports.yamlToBuild = exports.readFileAsync = void 0;
 const node_fetch_1 = require("node-fetch");
 const fs = require("fs");
 const path = require("path");
@@ -11,21 +11,6 @@ const api = require("../../.../../../../api");
 const v1alpha1 = require("./v1alpha1");
 const error_1 = require("../../../../error");
 exports.readFileAsync = (0, util_1.promisify)(fs.readFile);
-function yamlToBackend(yaml, project, region, runtime) {
-    try {
-        if (!yaml.specVersion) {
-            throw new error_1.FirebaseError("Expect backend yaml to specify a version number");
-        }
-        if (yaml.specVersion === "v1alpha1") {
-            return v1alpha1.backendFromV1Alpha1(yaml, project, region, runtime);
-        }
-        throw new error_1.FirebaseError("It seems you are using a newer SDK than this version of the CLI can handle. Please update your CLI with `npm install -g firebase-tools`");
-    }
-    catch (err) {
-        throw new error_1.FirebaseError("Failed to parse backend specification", { children: [err] });
-    }
-}
-exports.yamlToBackend = yamlToBackend;
 function yamlToBuild(yaml, project, region, runtime) {
     try {
         if (!yaml.specVersion) {

package/lib/deploy/functions/runtimes/discovery/parsing.js

@@ -31,6 +31,22 @@ function assertKeyTypes(prefix, yaml, schema) {
             }
             continue;
         }
+        if (value === null) {
+            if (schemaType.endsWith("?")) {
+                continue;
+            }
+            throw new error_1.FirebaseError(`Expected ${fullKey} to be type ${schemaType}; was null`);
+        }
+        if (schemaType.endsWith("?")) {
+            schemaType = schemaType.slice(0, schemaType.length - 1);
+        }
+        if (schemaType.includes("Field")) {
+            const match = /^Field<(\w+)>$/.exec(schemaType);
+            if (match && typeof value !== "string" && typeof value !== match[1]) {
+                throw new error_1.FirebaseError(`Expected ${fullKey} to be Field<${match[1]}>; was ${typeof value}`);
+            }
+            continue;
+        }
         if (value === null) {
             if (schemaType.endsWith("?")) {
                 continue;