firebase-tools 15.12.0 → 15.12.1-main.0

package/lib/apphosting/config.js

@@ -12,6 +12,7 @@ exports.maybeAddSecretToYaml = maybeAddSecretToYaml;
 exports.maybeGenerateEmulatorYaml = maybeGenerateEmulatorYaml;
 exports.overrideChosenEnv = overrideChosenEnv;
 exports.suggestedTestKeyName = suggestedTestKeyName;
+exports.splitEnvVars = splitEnvVars;
 const path_1 = require("path");
 const fs_1 = require("fs");
 const yaml = require("yaml");
@@ -23,7 +24,6 @@ const yaml_1 = require("./yaml");
 const logger_1 = require("../logger");
 const csm = require("../gcp/secretManager");
 const error_1 = require("../error");
-const path_2 = require("path");
 exports.APPHOSTING_BASE_YAML_FILE = "apphosting.yaml";
 exports.APPHOSTING_EMULATORS_YAML_FILE = "apphosting.emulator.yaml";
 exports.APPHOSTING_LOCAL_YAML_FILE = "apphosting.local.yaml";
@@ -69,7 +69,7 @@ function load(yamlPath) {
 const dynamicDispatch = exports;
 async function getAppHostingConfiguration(backendDir) {
     const appHostingConfigPaths = dynamicDispatch.listAppHostingFilesInPath(backendDir);
-    const fileNameToPathMap = Object.fromEntries(appHostingConfigPaths.map((path) => [(0, path_2.basename)(path), path]));
+    const fileNameToPathMap = Object.fromEntries(appHostingConfigPaths.map((path) => [(0, path_1.basename)(path), path]));
     const output = yaml_1.AppHostingYamlConfig.empty();
     const baseFilePath = fileNameToPathMap[exports.APPHOSTING_BASE_YAML_FILE];
     const emulatorsFilePath = fileNameToPathMap[exports.APPHOSTING_EMULATORS_YAML_FILE];
@@ -246,3 +246,20 @@ async function overrideChosenEnv(projectId, env) {
 function suggestedTestKeyName(variable) {
     return "test-" + variable.replace(/_/g, "-").toLowerCase();
 }
+function splitEnvVars(env) {
+    const build = {};
+    const runtime = {};
+    for (const [key, val] of Object.entries(env)) {
+        const envVal = { ...val };
+        if (envVal.value !== undefined) {
+            envVal.value = String(envVal.value);
+        }
+        if (val.availability?.includes("BUILD") || !val.availability) {
+            build[key] = envVal;
+        }
+        if (val.availability?.includes("RUNTIME") || !val.availability) {
+            runtime[key] = envVal;
+        }
+    }
+    return { build, runtime };
+}

package/lib/apphosting/localbuilds.js

@@ -2,10 +2,28 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.localBuild = localBuild;
 const build_1 = require("@apphosting/build");
-async function localBuild(projectRoot, framework) {
-    const apphostingBuildOutput = await (0, build_1.localBuild)(projectRoot, framework);
+async function localBuild(projectRoot, framework, env = {}) {
+    const originalEnv = { ...process.env };
+    const addedEnv = toProcessEnv(env);
+    for (const [key, value] of Object.entries(addedEnv)) {
+        process.env[key] = value;
+    }
+    let apphostingBuildOutput;
+    try {
+        apphostingBuildOutput = await (0, build_1.localBuild)(projectRoot, framework);
+    }
+    finally {
+        for (const key in process.env) {
+            if (!(key in originalEnv)) {
+                delete process.env[key];
+            }
+        }
+        for (const [key, value] of Object.entries(originalEnv)) {
+            process.env[key] = value;
+        }
+    }
     const annotations = Object.fromEntries(Object.entries(apphostingBuildOutput.metadata).map(([key, value]) => [key, String(value)]));
-    const env = apphostingBuildOutput.runConfig.environmentVariables?.map(({ variable, value, availability }) => ({
+    const discoveredEnv = apphostingBuildOutput.runConfig.environmentVariables?.map(({ variable, value, availability }) => ({
         variable,
         value,
         availability,
@@ -15,7 +33,10 @@ async function localBuild(projectRoot, framework) {
         annotations,
         buildConfig: {
             runCommand: apphostingBuildOutput.runConfig.runCommand,
-            env: env ?? [],
+            env: discoveredEnv ?? [],
         },
     };
 }
+function toProcessEnv(env) {
+    return Object.fromEntries(Object.entries(env).map(([key, value]) => [key, value.value || ""]));
+}

package/lib/deploy/apphosting/prepare.js

@@ -1,10 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
+exports.injectEnvVarsFromApphostingConfig = injectEnvVarsFromApphostingConfig;
+exports.injectAutoInitEnvVars = injectAutoInitEnvVars;
 exports.getBackendConfigs = getBackendConfigs;
 const path = require("path");
 const backend_1 = require("../../apphosting/backend");
 const apphosting_1 = require("../../gcp/apphosting");
+const yaml_1 = require("../../apphosting/yaml");
+const config_1 = require("../../apphosting/config");
 const devConnect_1 = require("../../gcp/devConnect");
 const resourceManager_1 = require("../../gcp/resourceManager");
 const projectUtils_1 = require("../../projectUtils");
@@ -13,6 +17,8 @@ const prompt_1 = require("../../prompt");
 const utils_1 = require("../../utils");
 const localbuilds_1 = require("../../apphosting/localbuilds");
 const error_1 = require("../../error");
+const managementApps = require("../../management/apps");
+const utils_2 = require("../../apphosting/utils");
 const experiments = require("../../experiments");
 const logger_1 = require("../../logger");
 async function default_1(context, options) {
@@ -116,20 +122,27 @@ async function default_1(context, options) {
     if (skippedBackends.length > 0) {
         (0, utils_1.logLabeledWarning)("apphosting", `Skipping deployment of backend(s) ${skippedBackends.map((cfg) => cfg.backendId).join(", ")}.`);
     }
+    const buildEnv = {};
+    const runtimeEnv = {};
     for (const cfg of Object.values(context.backendConfigs)) {
         if (!cfg.localBuild) {
             continue;
         }
         experiments.assertEnabled("apphostinglocalbuilds", "locally build App Hosting backends");
         (0, utils_1.logLabeledBullet)("apphosting", `Starting local build for backend ${cfg.backendId}`);
+        await injectEnvVarsFromApphostingConfig(configs.filter((c) => c.backendId === cfg.backendId), options, buildEnv, runtimeEnv);
+        await injectAutoInitEnvVars(cfg, backends, buildEnv, runtimeEnv);
         try {
-            const { outputFiles, annotations, buildConfig } = await (0, localbuilds_1.localBuild)(options.projectRoot || "./", "nextjs");
+            const { outputFiles, annotations, buildConfig } = await (0, localbuilds_1.localBuild)(options.projectRoot || "./", "nextjs", buildEnv[cfg.backendId] || {});
             if (outputFiles.length !== 1) {
                 throw new error_1.FirebaseError(`Local build for backend ${cfg.backendId} failed: No output files found.`);
             }
             context.backendLocalBuilds[cfg.backendId] = {
                 buildDir: outputFiles[0],
-                buildConfig,
+                buildConfig: {
+                    ...buildConfig,
+                    env: mergeEnvVars(buildConfig.env || [], runtimeEnv[cfg.backendId] || {}),
+                },
                 annotations,
             };
         }
@@ -139,6 +152,39 @@ async function default_1(context, options) {
         }
     }
 }
+async function injectEnvVarsFromApphostingConfig(configs, options, buildEnv, runtimeEnv) {
+    for (const cfg of configs) {
+        const rootDir = options.projectRoot || process.cwd();
+        const appDir = path.join(rootDir, cfg.rootDir || "");
+        let yamlConfig = yaml_1.AppHostingYamlConfig.empty();
+        try {
+            yamlConfig = await (0, config_1.getAppHostingConfiguration)(appDir);
+        }
+        catch (e) {
+            (0, utils_1.logLabeledWarning)("apphosting", `Failed to read apphosting.yaml, may be missing environment variables and other configs`);
+        }
+        const { build, runtime } = (0, config_1.splitEnvVars)(yamlConfig.env);
+        buildEnv[cfg.backendId] = { ...buildEnv[cfg.backendId], ...build };
+        runtimeEnv[cfg.backendId] = { ...runtimeEnv[cfg.backendId], ...runtime };
+    }
+}
+async function injectAutoInitEnvVars(cfg, backends, buildEnv, runtimeEnv) {
+    var _a, _b;
+    const backend = backends.find((b) => (0, apphosting_1.parseBackendName)(b.name).id === cfg.backendId);
+    if (backend?.appId) {
+        try {
+            const webappConfig = (await managementApps.getAppConfig(backend.appId, managementApps.AppPlatform.WEB));
+            const autoinitVars = (0, utils_2.getAutoinitEnvVars)(webappConfig);
+            for (const [envVarName, envVarValue] of Object.entries(autoinitVars)) {
+                (_a = buildEnv[cfg.backendId])[envVarName] ?? (_a[envVarName] = { value: envVarValue });
+                (_b = runtimeEnv[cfg.backendId])[envVarName] ?? (_b[envVarName] = { value: envVarValue });
+            }
+        }
+        catch (e) {
+            (0, utils_1.logLabeledWarning)("apphosting", `Unable to lookup details for backend ${cfg.backendId}. Firebase SDK autoinit will not be available.`);
+        }
+    }
+}
 function getBackendConfigs(options) {
     if (!options.config.src.apphosting) {
         return [];
@@ -165,7 +211,25 @@ function getBackendConfigs(options) {
     if (backendIds.length === 0) {
         return [];
     }
-    return backendConfigs.filter((cfg) => backendIds.includes(cfg.backendId));
+    const filteredConfigs = backendConfigs.filter((cfg) => backendIds.includes(cfg.backendId));
+    const foundIds = filteredConfigs.map((cfg) => cfg.backendId);
+    const missingIds = backendIds.filter((id) => !foundIds.includes(id));
+    if (missingIds.length > 0) {
+        throw new error_1.FirebaseError(`App Hosting backend IDs ${missingIds.join(",")} not detected in firebase.json`);
+    }
+    return filteredConfigs;
+}
+function mergeEnvVars(base, overrides) {
+    const merged = new Map();
+    for (const env of base) {
+        if (env.variable) {
+            merged.set(env.variable, env);
+        }
+    }
+    for (const [envVarName, envVarConfig] of Object.entries(overrides)) {
+        merged.set(envVarName, { ...envVarConfig, variable: envVarName });
+    }
+    return Array.from(merged.values());
 }
 async function ensureAppHostingServiceAgentRoles(projectId, projectNumber) {
     const p4saEmail = (0, apphosting_1.serviceAgentEmail)(projectNumber);

package/lib/deploy/functions/prepare.js

@@ -318,6 +318,7 @@ async function loadCodebases(config, options, firebaseConfig, runtimeConfig, fil
             throw new error_1.FirebaseError(`Functions codebase ${codebase} has invalid runtime ` +
                 `${firebaseJsonRuntime} specified in firebase.json. Valid values are: \n` +
                 Object.keys(supported.RUNTIMES)
+                    .filter((runtime) => !supported.isDecommissioned(runtime))
                     .map((s) => `- ${s}`)
                     .join("\n"));
         }

package/lib/deploy/functions/prepareFunctionsUpload.js

@@ -9,6 +9,7 @@ const filesize = require("filesize");
 const fs = require("fs");
 const path = require("path");
 const tmp = require("tmp");
+const crypto = require("crypto");
 const error_1 = require("../../error");
 const logger_1 = require("../../logger");
 const hash_1 = require("./cache/hash");
@@ -54,6 +55,7 @@ async function packageSource(projectDir, sourceDir, config, additionalSources, r
     });
     const archive = exportType === "tar.gz" ? archiver("tar", { gzip: true }) : archiver("zip");
     const hashes = [];
+    let configHash = "";
     const ignore = config.ignore || ["node_modules", ".git"];
     ignore.push("firebase-debug.log", "firebase-debug.*.log", CONFIG_DEST_FILE);
     try {
@@ -82,7 +84,7 @@ async function packageSource(projectDir, sourceDir, config, additionalSources, r
         }
         if (typeof runtimeConfig !== "undefined") {
             const runtimeConfigHashString = JSON.stringify(convertToSortedKeyValueArray(runtimeConfig));
-            hashes.push(runtimeConfigHashString);
+            configHash = crypto.createHash("sha1").update(runtimeConfigHashString).digest("hex");
             const runtimeConfigString = JSON.stringify(runtimeConfig, null, 2);
             archive.append(runtimeConfigString, {
                 name: CONFIG_DEST_FILE,
@@ -109,7 +111,8 @@ async function packageSource(projectDir, sourceDir, config, additionalSources, r
         " (" +
         filesize(archive.pointer()) +
         ") for uploading");
-    const hash = hashes.join(".");
+    const sourceHash = crypto.createHash("sha1").update(hashes.sort().join("")).digest("hex");
+    const hash = configHash ? `${sourceHash}.${configHash}` : sourceHash;
     return { pathToSource: tmpFile, hash };
 }
 async function prepareFunctionsUpload(projectDir, sourceDir, config, additionalSources, runtimeConfig, options) {

package/lib/gcp/cloudsql/cloudsqladmin.js

@@ -61,7 +61,7 @@ async function getInstance(projectId, instanceId) {
 function instanceConsoleLink(projectId, instanceId) {
     return `https://console.cloud.google.com/sql/instances/${instanceId}/overview?project=${projectId}`;
 }
-exports.DEFAULT_DATABASE_VERSION = "POSTGRES_17";
+exports.DEFAULT_DATABASE_VERSION = "POSTGRES_18";
 async function createInstance(args) {
     const databaseFlags = [{ name: "cloudsql.iam_authentication", value: "on" }];
     if (args.enableGoogleMlIntegration) {