firebase-tools 11.6.0 → 11.7.0

package/lib/functions/env.js

@@ -161,9 +161,11 @@ function writeUserEnvs(toWrite, envOpts) {
         return;
     }
     const { functionsSource, projectId, projectAlias, isEmulator } = envOpts;
-    let envFiles = findEnvfiles(functionsSource, projectId, projectAlias, isEmulator);
-    if (envFiles.length === 0) {
-        envFiles = [createEnvFile(envOpts)];
+    const envFiles = findEnvfiles(functionsSource, projectId, projectAlias, isEmulator);
+    const projectScopedFileName = `.env.${projectId}`;
+    const projectScopedFileExists = envFiles.includes(projectScopedFileName);
+    if (!projectScopedFileExists) {
+        createEnvFile(envOpts);
     }
     const currentEnvs = loadUserEnvs(envOpts);
     for (const k of Object.keys(toWrite)) {
@@ -172,17 +174,15 @@ function writeUserEnvs(toWrite, envOpts) {
             throw new error_1.FirebaseError(`Attempted to write param-defined key ${k} to .env files, but it was already defined.`);
         }
     }
-    const mostSpecificEnv = path.join(functionsSource, envFiles[envFiles.length - 1]);
-    (0, utils_1.logBullet)(clc.cyan(clc.bold("functions: ")) + `Writing new parameter values to disk: ${mostSpecificEnv}`);
+    (0, utils_1.logBullet)(clc.cyan(clc.bold("functions: ")) +
+        `Writing new parameter values to disk: ${projectScopedFileName}`);
     for (const k of Object.keys(toWrite)) {
-        fs.appendFileSync(mostSpecificEnv, formatUserEnvForWrite(k, toWrite[k]));
+        fs.appendFileSync(path.join(functionsSource, projectScopedFileName), formatUserEnvForWrite(k, toWrite[k]));
     }
 }
 exports.writeUserEnvs = writeUserEnvs;
 function createEnvFile(envOpts) {
-    const fileToWrite = envOpts.isEmulator
-        ? FUNCTIONS_EMULATOR_DOTENV
-        : `.env.${envOpts.projectAlias || envOpts.projectId}`;
+    const fileToWrite = envOpts.isEmulator ? FUNCTIONS_EMULATOR_DOTENV : `.env.${envOpts.projectId}`;
     logger_1.logger.debug(`Creating ${fileToWrite}...`);
     fs.writeFileSync(path.join(envOpts.functionsSource, fileToWrite), "", { flag: "wx" });
     return fileToWrite;

package/lib/gcp/cloudscheduler.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jobFromEndpoint = exports.topicNameForEndpoint = exports.jobNameForEndpoint = exports.createOrReplaceJob = exports.updateJob = exports.getJob = exports.deleteJob = exports.createJob = void 0;
+exports.jobFromEndpoint = exports.topicNameForEndpoint = exports.jobNameForEndpoint = exports.createOrReplaceJob = exports.deleteJob = void 0;
 const _ = require("lodash");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
@@ -8,15 +8,18 @@ const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
 const backend = require("../deploy/functions/backend");
 const proto = require("./proto");
+const checkIam_1 = require("../deploy/functions/checkIam");
 const functional_1 = require("../functional");
 const VERSION = "v1";
-const DEFAULT_TIME_ZONE = "America/Los_Angeles";
+const DEFAULT_TIME_ZONE_V1 = "America/Los_Angeles";
+const DEFAULT_TIME_ZONE_V2 = "UTC";
 const apiClient = new apiv2_1.Client({ urlPrefix: api_1.cloudschedulerOrigin, apiVersion: VERSION });
 function createJob(job) {
     const strippedName = job.name.substring(0, job.name.lastIndexOf("/"));
-    return apiClient.post(`/${strippedName}`, Object.assign({ timeZone: DEFAULT_TIME_ZONE }, job));
+    const json = job.pubsubTarget
+        ? Object.assign({ timeZone: DEFAULT_TIME_ZONE_V1 }, job) : Object.assign({ timeZone: DEFAULT_TIME_ZONE_V2 }, job);
+    return apiClient.post(`/${strippedName}`, json);
 }
-exports.createJob = createJob;
 function deleteJob(name) {
     return apiClient.delete(`/${name}`);
 }
@@ -26,16 +29,23 @@ function getJob(name) {
         resolveOnHTTPError: true,
     });
 }
-exports.getJob = getJob;
 function updateJob(job) {
-    const fieldMasks = proto.fieldMasks(job, "pubsubTarget");
-    return apiClient.patch(`/${job.name}`, Object.assign({ timeZone: DEFAULT_TIME_ZONE }, job), {
+    let fieldMasks;
+    let json;
+    if (job.pubsubTarget) {
+        fieldMasks = proto.fieldMasks(job, "pubsubTarget");
+        json = Object.assign({ timeZone: DEFAULT_TIME_ZONE_V1 }, job);
+    }
+    else {
+        fieldMasks = proto.fieldMasks(job, "httpTarget");
+        json = Object.assign({ timeZone: DEFAULT_TIME_ZONE_V2 }, job);
+    }
+    return apiClient.patch(`/${job.name}`, json, {
         queryParams: {
             updateMask: fieldMasks.join(","),
         },
     });
 }
-exports.updateJob = updateJob;
 async function createOrReplaceJob(job) {
     var _a, _b;
     const jobName = job.name.split("/").pop();
@@ -56,7 +66,7 @@ async function createOrReplaceJob(job) {
         return newJob;
     }
     if (!job.timeZone) {
-        job.timeZone = DEFAULT_TIME_ZONE;
+        job.timeZone = job.pubsubTarget ? DEFAULT_TIME_ZONE_V1 : DEFAULT_TIME_ZONE_V2;
     }
     if (!needUpdate(existingJob.body, job)) {
         logger_1.logger.debug(`scheduler job ${jobName} is up to date, no changes required`);
@@ -90,9 +100,9 @@ function needUpdate(existingJob, newJob) {
     }
     return false;
 }
-function jobNameForEndpoint(endpoint, appEngineLocation) {
+function jobNameForEndpoint(endpoint, location) {
     const id = backend.scheduleIdForFunction(endpoint);
-    return `projects/${endpoint.project}/locations/${appEngineLocation}/jobs/${id}`;
+    return `projects/${endpoint.project}/locations/${location}/jobs/${id}`;
 }
 exports.jobNameForEndpoint = jobNameForEndpoint;
 function topicNameForEndpoint(endpoint) {
@@ -100,10 +110,11 @@ function topicNameForEndpoint(endpoint) {
     return `projects/${endpoint.project}/topics/${id}`;
 }
 exports.topicNameForEndpoint = topicNameForEndpoint;
-function jobFromEndpoint(endpoint, appEngineLocation) {
+function jobFromEndpoint(endpoint, location, projectNumber) {
     const job = {};
+    job.name = jobNameForEndpoint(endpoint, location);
     if (endpoint.platform === "gcfv1") {
-        job.name = jobNameForEndpoint(endpoint, appEngineLocation);
+        job.timeZone = endpoint.scheduleTrigger.timeZone || DEFAULT_TIME_ZONE_V1;
         job.pubsubTarget = {
             topicName: topicNameForEndpoint(endpoint),
             attributes: {
@@ -112,7 +123,14 @@ function jobFromEndpoint(endpoint, appEngineLocation) {
         };
     }
     else if (endpoint.platform === "gcfv2") {
-        throw new error_1.FirebaseError("Do not know how to create a scheduled GCFv2 function");
+        job.timeZone = endpoint.scheduleTrigger.timeZone || DEFAULT_TIME_ZONE_V2;
+        job.httpTarget = {
+            uri: endpoint.uri,
+            httpMethod: "POST",
+            oidcToken: {
+                serviceAccountEmail: (0, checkIam_1.getDefaultComputeServiceAgent)(projectNumber),
+            },
+        };
     }
     else {
         (0, functional_1.assertExhaustive)(endpoint.platform);
@@ -121,7 +139,6 @@ function jobFromEndpoint(endpoint, appEngineLocation) {
         throw new error_1.FirebaseError("Cannot create a scheduler job without a schedule:" + JSON.stringify(endpoint));
     }
     job.schedule = endpoint.scheduleTrigger.schedule;
-    job.timeZone = endpoint.scheduleTrigger.timeZone || DEFAULT_TIME_ZONE;
     if (endpoint.scheduleTrigger.retryConfig) {
         job.retryConfig = {};
         proto.copyIfPresent(job.retryConfig, endpoint.scheduleTrigger.retryConfig, "maxDoublings", "retryCount");

package/lib/track.js

@@ -47,6 +47,9 @@ const EMULATOR_GA4_USER_PROPS = {
     node_version: {
         value: process.version,
     },
+    firebase_tools_version: {
+        value: pkg.version,
+    },
     firepit_version: {
         value: process.env.FIREPIT_VERSION || "none",
     },