firebase-tools 10.1.3 → 10.2.1

package/lib/emulator/functionsEmulatorRuntime.js

@@ -1,15 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
-const types_1 = require("./types");
-const functionsEmulatorShared_1 = require("./functionsEmulatorShared");
-const functionsEmulatorUtils_1 = require("./functionsEmulatorUtils");
 const express = require("express");
 const path = require("path");
 const bodyParser = require("body-parser");
 const url_1 = require("url");
 const _ = require("lodash");
-let triggers;
+const types_1 = require("./types");
+const constants_1 = require("./constants");
+const functionsEmulatorShared_1 = require("./functionsEmulatorShared");
+const functionsEmulatorUtils_1 = require("./functionsEmulatorUtils");
+let functionTrigger;
+let FUNCTION_TARGET_NAME;
+let FUNCTION_SIGNATURE;
 let developerPkgJSON;
 const dynamicImport = new Function("modulePath", "return import(modulePath)");
 function isFeatureEnabled(frb, feature) {
@@ -112,7 +115,7 @@ async function resolveDeveloperNodeModule(frb, name) {
     if (!isInPackageJSON) {
         return { declared: false, installed: false };
     }
-    const resolveResult = await requireResolveAsync(name, { paths: [frb.cwd] }).catch(noOp);
+    const resolveResult = await requireResolveAsync(name, { paths: [process.cwd()] }).catch(noOp);
     if (!resolveResult) {
         return { declared: true, installed: false };
     }
@@ -160,7 +163,7 @@ function requirePackageJson(frb) {
         return developerPkgJSON;
     }
     try {
-        const pkg = require(`${frb.cwd}/package.json`);
+        const pkg = require(`${process.cwd()}/package.json`);
         developerPkgJSON = {
             engines: pkg.engines || {},
             dependencies: pkg.dependencies || {},
@@ -321,7 +324,7 @@ function getDefaultConfig() {
 }
 function initializeRuntimeConfig(frb) {
     if (!process.env.CLOUD_RUNTIME_CONFIG) {
-        const configPath = `${frb.cwd}/.runtimeconfig.json`;
+        const configPath = `${process.cwd()}/.runtimeconfig.json`;
         try {
             const configContent = fs.readFileSync(configPath, "utf8");
             if (configContent) {
@@ -359,7 +362,7 @@ async function initializeFirebaseAdminStubs(frb) {
         const defaultApp = makeProxiedFirebaseApp(frb, adminModuleTarget.initializeApp(defaultAppOptions));
         logDebug("initializeApp(DEFAULT)", defaultAppOptions);
         localFunctionsModule.app.setEmulatedAdminApp(defaultApp);
-        if (frb.emulators.auth) {
+        if (process.env[constants_1.Constants.FIREBASE_AUTH_EMULATOR_HOST]) {
             if ((0, functionsEmulatorUtils_1.compareVersionStrings)(adminResolution.version, "9.3.0") < 0) {
                 new types_1.EmulatorLog("WARN_ONCE", "runtime-status", "The Firebase Authentication emulator is running, but your 'firebase-admin' dependency is below version 9.3.0, so calls to Firebase Authentication will affect production.").log();
             }
@@ -377,16 +380,20 @@ async function initializeFirebaseAdminStubs(frb) {
         return defaultApp;
     })
         .when("firestore", (target) => {
-        warnAboutFirestoreProd(frb);
+        warnAboutFirestoreProd();
         return Proxied.getOriginal(target, "firestore");
     })
         .when("database", (target) => {
-        warnAboutDatabaseProd(frb);
+        warnAboutDatabaseProd();
         return Proxied.getOriginal(target, "database");
     })
         .when("auth", (target) => {
-        warnAboutAuthProd(frb);
+        warnAboutAuthProd();
         return Proxied.getOriginal(target, "auth");
+    })
+        .when("storage", (target) => {
+        warnAboutStorageProd();
+        return Proxied.getOriginal(target, "storage");
     })
         .finalize();
     require.cache[adminResolution.resolution] = Object.assign(require.cache[adminResolution.resolution], {
@@ -401,37 +408,47 @@ function makeProxiedFirebaseApp(frb, original) {
     const appProxy = new Proxied(original);
     return appProxy
         .when("firestore", (target) => {
-        warnAboutFirestoreProd(frb);
+        warnAboutFirestoreProd();
         return Proxied.getOriginal(target, "firestore");
     })
         .when("database", (target) => {
-        warnAboutDatabaseProd(frb);
+        warnAboutDatabaseProd();
         return Proxied.getOriginal(target, "database");
     })
         .when("auth", (target) => {
-        warnAboutAuthProd(frb);
+        warnAboutAuthProd();
         return Proxied.getOriginal(target, "auth");
+    })
+        .when("storage", (target) => {
+        warnAboutStorageProd();
+        return Proxied.getOriginal(target, "storage");
     })
         .finalize();
 }
-function warnAboutFirestoreProd(frb) {
-    if (frb.emulators.firestore) {
+function warnAboutFirestoreProd() {
+    if (process.env[constants_1.Constants.FIRESTORE_EMULATOR_HOST]) {
         return;
     }
     new types_1.EmulatorLog("WARN_ONCE", "runtime-status", "The Cloud Firestore emulator is not running, so calls to Firestore will affect production.").log();
 }
-function warnAboutDatabaseProd(frb) {
-    if (frb.emulators.database) {
+function warnAboutDatabaseProd() {
+    if (process.env[constants_1.Constants.FIREBASE_DATABASE_EMULATOR_HOST]) {
         return;
     }
     new types_1.EmulatorLog("WARN_ONCE", "runtime-status", "The Realtime Database emulator is not running, so calls to Realtime Database will affect production.").log();
 }
-function warnAboutAuthProd(frb) {
-    if (frb.emulators.auth) {
+function warnAboutAuthProd() {
+    if (process.env[constants_1.Constants.FIREBASE_AUTH_EMULATOR_HOST]) {
         return;
     }
     new types_1.EmulatorLog("WARN_ONCE", "runtime-status", "The Firebase Authentication emulator is not running, so calls to Firebase Authentication will affect production.").log();
 }
+function warnAboutStorageProd() {
+    if (process.env[constants_1.Constants.FIREBASE_STORAGE_EMULATOR_HOST]) {
+        return;
+    }
+    new types_1.EmulatorLog("WARN_ONCE", "runtime-status", "The Firebase Storage emulator is not running, so calls to Firebase Storage will affect production.").log();
+}
 async function initializeFunctionsConfigHelper(frb) {
     const functionsResolution = await assertResolveDeveloperNodeModule(frb, "firebase-functions");
     const localFunctionsModule = require(functionsResolution.resolution);
@@ -467,7 +484,7 @@ async function initializeFunctionsConfigHelper(frb) {
 function rawBodySaver(req, res, buf) {
     req.rawBody = buf;
 }
-async function processHTTPS(frb, trigger) {
+async function processHTTPS(frb) {
     const ephemeralServer = express();
     const functionRouter = express.Router();
     const socketPath = frb.socketPath;
@@ -479,7 +496,6 @@ async function processHTTPS(frb, trigger) {
         const handler = async (req, res) => {
             try {
                 logDebug(`Ephemeral server handling ${req.method} request`);
-                const func = trigger.getRawFunction();
                 res.on("finish", () => {
                     instance.close((err) => {
                         if (err) {
@@ -490,7 +506,7 @@ async function processHTTPS(frb, trigger) {
                         }
                     });
                 });
-                await runHTTPS([req, res], func);
+                await runHTTPS([req, res]);
             }
             catch (err) {
                 rejectEphemeralServer(err);
@@ -524,11 +540,11 @@ async function processHTTPS(frb, trigger) {
         instance.on("error", rejectEphemeralServer);
     });
 }
-async function processBackground(frb, trigger, signature) {
+async function processBackground(frb, signature) {
     const proto = frb.proto;
     logDebug("ProcessBackground", proto);
     if (signature === "cloudevent") {
-        return runCloudEvent(proto, trigger.getRawFunction());
+        return runCloudEvent(proto);
     }
     const data = proto.data;
     delete proto.data;
@@ -539,7 +555,7 @@ async function processBackground(frb, trigger, signature) {
             context.resource = context.resource.name;
         }
     }
-    await runBackground({ data, context }, trigger.getRawFunction());
+    await runBackground({ data, context });
 }
 async function runFunction(func) {
     let caughtErr;
@@ -554,30 +570,30 @@ async function runFunction(func) {
         throw caughtErr;
     }
 }
-async function runBackground(proto, func) {
+async function runBackground(proto) {
     logDebug("RunBackground", proto);
     await runFunction(() => {
-        return func(proto.data, proto.context);
+        return functionTrigger(proto.data, proto.context);
     });
 }
-async function runCloudEvent(event, func) {
+async function runCloudEvent(event) {
     logDebug("RunCloudEvent", event);
     await runFunction(() => {
-        return func(event);
+        return functionTrigger(event);
     });
 }
-async function runHTTPS(args, func) {
+async function runHTTPS(args) {
     if (args.length < 2) {
         throw new Error("Function must be passed 2 args.");
     }
     await runFunction(() => {
-        return func(args[0], args[1]);
+        return functionTrigger(args[0], args[1]);
     });
 }
 async function moduleResolutionDetective(frb, error) {
     const clues = {
-        tsconfigJSON: await requireAsync("./tsconfig.json", { paths: [frb.cwd] }).catch(noOp),
-        packageJSON: await requireAsync("./package.json", { paths: [frb.cwd] }).catch(noOp),
+        tsconfigJSON: await requireAsync("./tsconfig.json", { paths: [process.cwd()] }).catch(noOp),
+        packageJSON: await requireAsync("./package.json", { paths: [process.cwd()] }).catch(noOp),
     };
     const isPotentially = {
         typescript: false,
@@ -595,45 +611,54 @@ async function moduleResolutionDetective(frb, error) {
 function logDebug(msg, data) {
     new types_1.EmulatorLog("DEBUG", "runtime-status", `[${process.pid}] ${msg}`, data).log();
 }
-async function invokeTrigger(frb, triggers) {
-    if (!frb.triggerId) {
-        throw new Error("frb.triggerId unexpectedly null");
-    }
-    new types_1.EmulatorLog("INFO", "runtime-status", `Beginning execution of "${frb.triggerId}"`, {
+async function invokeTrigger(frb) {
+    new types_1.EmulatorLog("INFO", "runtime-status", `Beginning execution of "${FUNCTION_TARGET_NAME}"`, {
         frb,
     }).log();
-    const trigger = triggers[frb.triggerId];
-    logDebug("triggerDefinition", trigger.definition);
-    const signature = (0, functionsEmulatorShared_1.getSignatureType)(trigger.definition);
-    logDebug(`Running ${frb.triggerId} in signature ${signature}`);
+    logDebug(`Running ${FUNCTION_TARGET_NAME} in signature ${FUNCTION_SIGNATURE}`);
     let seconds = 0;
     const timerId = setInterval(() => {
         seconds++;
     }, 1000);
     let timeoutId;
     if (isFeatureEnabled(frb, "timeout")) {
+        let timeout = process.env.FUNCTIONS_EMULATOR_TIMEOUT_SECONDS || "60";
+        if (timeout.endsWith("s")) {
+            timeout = timeout.slice(0, -1);
+        }
+        const timeoutMs = parseInt(timeout, 10) * 1000;
         timeoutId = setTimeout(() => {
-            new types_1.EmulatorLog("WARN", "runtime-status", `Your function timed out after ~${trigger.definition.timeout || "60s"}. To configure this timeout, see
+            new types_1.EmulatorLog("WARN", "runtime-status", `Your function timed out after ~${timeout}s. To configure this timeout, see
       https://firebase.google.com/docs/functions/manage-functions#set_timeout_and_memory_allocation.`).log();
             throw new Error("Function timed out.");
-        }, trigger.timeoutMs);
+        }, timeoutMs);
     }
-    switch (signature) {
+    switch (FUNCTION_SIGNATURE) {
         case "event":
         case "cloudevent":
-            await processBackground(frb, triggers[frb.triggerId], signature);
+            await processBackground(frb, FUNCTION_SIGNATURE);
             break;
         case "http":
-            await processHTTPS(frb, triggers[frb.triggerId]);
+            await processHTTPS(frb);
             break;
     }
     if (timeoutId) {
         clearTimeout(timeoutId);
     }
     clearInterval(timerId);
-    new types_1.EmulatorLog("INFO", "runtime-status", `Finished "${frb.triggerId}" in ~${Math.max(seconds, 1)}s`).log();
+    new types_1.EmulatorLog("INFO", "runtime-status", `Finished "${FUNCTION_TARGET_NAME}" in ~${Math.max(seconds, 1)}s`).log();
 }
-async function initializeRuntime(frb, serializedFunctionTrigger, extensionTriggers) {
+async function initializeRuntime(frb) {
+    FUNCTION_TARGET_NAME = process.env.FUNCTION_TARGET || "";
+    if (!FUNCTION_TARGET_NAME) {
+        new types_1.EmulatorLog("FATAL", "runtime-status", `Environment variable FUNCTION_TARGET cannot be empty. This shouldn't happen.`).log();
+        await flushAndExit(1);
+    }
+    FUNCTION_SIGNATURE = process.env.FUNCTION_SIGNATURE_TYPE || "";
+    if (!FUNCTION_SIGNATURE) {
+        new types_1.EmulatorLog("FATAL", "runtime-status", `Environment variable FUNCTION_SIGNATURE_TYPE cannot be empty. This shouldn't happen.`).log();
+        await flushAndExit(1);
+    }
     logDebug(`Disabled runtime features: ${JSON.stringify(frb.disabled_features)}`);
     const verified = await verifyDeveloperNodeModules(frb);
     if (!verified) {
@@ -645,35 +670,33 @@ async function initializeRuntime(frb, serializedFunctionTrigger, extensionTrigge
     await initializeFunctionsConfigHelper(frb);
     await initializeFirebaseFunctionsStubs(frb);
     await initializeFirebaseAdminStubs(frb);
-    let parsedDefinitions = [];
+}
+async function loadTrigger(frb, functionTarget, serializedFunctionTrigger) {
     let triggerModule;
     if (serializedFunctionTrigger) {
         triggerModule = eval(serializedFunctionTrigger)();
     }
     else {
         try {
-            triggerModule = require(frb.cwd);
+            triggerModule = require(process.cwd());
         }
         catch (err) {
             if (err.code !== "ERR_REQUIRE_ESM") {
                 await moduleResolutionDetective(frb, err);
-                return;
+                throw err;
             }
-            const modulePath = require.resolve(frb.cwd);
+            const modulePath = require.resolve(process.cwd());
             const moduleURL = (0, url_1.pathToFileURL)(modulePath).href;
             triggerModule = await dynamicImport(moduleURL);
         }
     }
-    if (extensionTriggers) {
-        parsedDefinitions = extensionTriggers;
-    }
-    else {
-        require("../deploy/functions/runtimes/node/extractTriggers")(triggerModule, parsedDefinitions);
+    const maybeTrigger = functionTarget.split(".").reduce((mod, functionTargetPart) => {
+        return mod === null || mod === void 0 ? void 0 : mod[functionTargetPart];
+    }, triggerModule);
+    if (!maybeTrigger) {
+        throw new Error(`Failed to find function ${functionTarget} in the loaded module`);
     }
-    const triggerDefinitions = (0, functionsEmulatorShared_1.emulatedFunctionsByRegion)(parsedDefinitions);
-    const triggers = (0, functionsEmulatorShared_1.getEmulatedTriggersFromDefinitions)(triggerDefinitions, triggerModule);
-    new types_1.EmulatorLog("SYSTEM", "triggers-parsed", "", { triggers, triggerDefinitions }).log();
-    return triggers;
+    return maybeTrigger;
 }
 async function flushAndExit(code) {
     await types_1.EmulatorLog.waitForFlush();
@@ -693,28 +716,22 @@ async function handleMessage(message) {
         await flushAndExit(1);
         return;
     }
-    if (!triggers) {
-        const serializedTriggers = runtimeArgs.opts ? runtimeArgs.opts.serializedTriggers : undefined;
-        const extensionTriggers = runtimeArgs.opts ? runtimeArgs.opts.extensionTriggers : undefined;
-        triggers = await initializeRuntime(runtimeArgs.frb, serializedTriggers, extensionTriggers);
-    }
-    if (!triggers) {
-        await flushAndExit(1);
-        return;
-    }
-    if (!runtimeArgs.frb.triggerId) {
-        await goIdle();
-        return;
-    }
-    if (!triggers[runtimeArgs.frb.triggerId]) {
-        new types_1.EmulatorLog("FATAL", "runtime-status", `Could not find trigger "${runtimeArgs.frb.triggerId}" in your functions directory.`).log();
-        return;
-    }
-    else {
-        logDebug(`Trigger "${runtimeArgs.frb.triggerId}" has been found, beginning invocation!`);
+    if (!functionTrigger) {
+        try {
+            await initializeRuntime(runtimeArgs.frb);
+            const serializedTriggers = runtimeArgs.opts ? runtimeArgs.opts.serializedTriggers : undefined;
+            functionTrigger = await loadTrigger(runtimeArgs.frb, FUNCTION_TARGET_NAME, serializedTriggers);
+        }
+        catch (e) {
+            logDebug(e);
+            new types_1.EmulatorLog("FATAL", "runtime-status", `Failed to initialize and load trigger. This shouldn't happen: ${e.message}`).log();
+            await flushAndExit(1);
+            return;
+        }
     }
+    logDebug(`Beginning invocation function ${FUNCTION_TARGET_NAME}!`);
     try {
-        await invokeTrigger(runtimeArgs.frb, triggers);
+        await invokeTrigger(runtimeArgs.frb);
         if (runtimeArgs.opts && runtimeArgs.opts.serializedTriggers) {
             await flushAndExit(0);
         }

package/lib/emulator/functionsEmulatorShared.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSignatureType = exports.formatHost = exports.findModuleRoot = exports.waitForBody = exports.getServiceFromEventType = exports.getFunctionService = exports.getTemporarySocketPath = exports.getEmulatedTriggersFromDefinitions = exports.emulatedFunctionsByRegion = exports.EmulatedTrigger = exports.HttpConstants = void 0;
+exports.getSignatureType = exports.formatHost = exports.findModuleRoot = exports.waitForBody = exports.getServiceFromEventType = exports.getFunctionService = exports.getTemporarySocketPath = exports.getEmulatedTriggersFromDefinitions = exports.emulatedFunctionsByRegion = exports.emulatedFunctionsFromEndpoints = exports.EmulatedTrigger = exports.HttpConstants = void 0;
 const _ = require("lodash");
 const os = require("os");
 const path = require("path");
 const fs = require("fs");
 const constants_1 = require("./constants");
+const backend_1 = require("../deploy/functions/backend");
+const proto_1 = require("../gcp/proto");
 const memoryLookup = {
     "128MB": 128,
     "256MB": 256,
@@ -44,6 +46,54 @@ class EmulatedTrigger {
     }
 }
 exports.EmulatedTrigger = EmulatedTrigger;
+function emulatedFunctionsFromEndpoints(endpoints) {
+    const regionDefinitions = [];
+    for (const endpoint of endpoints) {
+        if (!endpoint.region) {
+            endpoint.region = "us-central1";
+        }
+        const def = {
+            entryPoint: endpoint.entryPoint,
+            platform: endpoint.platform,
+            region: endpoint.region,
+            name: endpoint.id,
+            id: `${endpoint.region}-${endpoint.id}`,
+        };
+        (0, proto_1.copyIfPresent)(def, endpoint, "timeout", "availableMemoryMb", "labels", "platform", "secretEnvironmentVariables");
+        if ((0, backend_1.isHttpsTriggered)(endpoint)) {
+            def.httpsTrigger = endpoint.httpsTrigger;
+        }
+        else if ((0, backend_1.isEventTriggered)(endpoint)) {
+            const eventTrigger = endpoint.eventTrigger;
+            if (endpoint.platform === "gcfv1") {
+                def.eventTrigger = {
+                    eventType: eventTrigger.eventType,
+                    resource: eventTrigger.eventFilters.resource,
+                };
+            }
+            else {
+                const { resource, topic, bucket } = endpoint.eventTrigger.eventFilters;
+                const eventResource = resource || topic || bucket;
+                if (!eventResource) {
+                    continue;
+                }
+                def.eventTrigger = {
+                    eventType: eventTrigger.eventType,
+                    resource: eventResource,
+                };
+            }
+        }
+        else if ((0, backend_1.isScheduleTriggered)(endpoint)) {
+            def.eventTrigger = { eventType: "pubsub", resource: "" };
+            def.schedule = endpoint.scheduleTrigger;
+        }
+        else {
+        }
+        regionDefinitions.push(def);
+    }
+    return regionDefinitions;
+}
+exports.emulatedFunctionsFromEndpoints = emulatedFunctionsFromEndpoints;
 function emulatedFunctionsByRegion(definitions) {
     const regionDefinitions = [];
     for (const def of definitions) {

package/lib/emulator/functionsEmulatorShell.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FunctionsEmulatorShell = void 0;
 const uuid = require("uuid");
 const functionsEmulator_1 = require("./functionsEmulator");
-const functionsEmulatorShared_1 = require("./functionsEmulatorShared");
 const utils = require("../utils");
 const logger_1 = require("../logger");
 const error_1 = require("../error");
@@ -43,7 +42,7 @@ class FunctionsEmulatorShell {
             auth: opts.auth,
             data,
         };
-        this.emu.startFunctionRuntime(this.backend, trigger.id, trigger.name, (0, functionsEmulatorShared_1.getSignatureType)(trigger), proto);
+        this.emu.startFunctionRuntime(this.backend, trigger, proto);
     }
     getTrigger(name) {
         const result = this.triggers.find((trigger) => {

package/lib/emulator/functionsRuntimeWorker.js

@@ -43,7 +43,7 @@ class RuntimeWorker {
     execute(frb, opts) {
         const execFrb = Object.assign({}, frb);
         if (!execFrb.socketPath) {
-            execFrb.socketPath = (0, functionsEmulatorShared_1.getTemporarySocketPath)(this.runtime.pid, execFrb.cwd);
+            execFrb.socketPath = (0, functionsEmulatorShared_1.getTemporarySocketPath)(this.runtime.pid, this.runtime.cwd);
             this.log(`Assigning socketPath: ${execFrb.socketPath}`);
         }
         const args = { frb: execFrb, opts };

package/lib/emulator/storage/apis/gcloud.js

@@ -14,10 +14,10 @@ function createCloudEndpoints(emulator) {
         storageLayer.createBucket(req.params[0]);
         next();
     });
-    gcloudStorageAPI.get("/b", (req, res) => {
+    gcloudStorageAPI.get("/b", async (req, res) => {
         res.json({
             kind: "storage#buckets",
-            items: storageLayer.listBuckets(),
+            items: await storageLayer.listBuckets(),
         });
     });
     gcloudStorageAPI.get(["/b/:bucketId/o/:objectId", "/download/storage/v1/b/:bucketId/o/:objectId"], (req, res) => {

package/lib/emulator/storage/files.js

@@ -19,6 +19,7 @@ const fse = require("fs-extra");
 const rimraf = require("rimraf");
 const cloudFunctions_1 = require("./cloudFunctions");
 const logger_1 = require("../../logger");
+const adminSdkConfig_1 = require("../adminSdkConfig");
 class StoredFile {
     constructor(metadata, path) {
         this.metadata = metadata;
@@ -108,9 +109,13 @@ class StorageLayer {
             this._buckets.set(id, new metadata_1.CloudStorageBucketMetadata(id));
         }
     }
-    listBuckets() {
+    async listBuckets() {
         if (this._buckets.size == 0) {
-            this.createBucket("default-bucket");
+            let adminSdkConfig = await (0, adminSdkConfig_1.getProjectAdminSdkConfigOrCached)(this._projectId);
+            if (!adminSdkConfig) {
+                adminSdkConfig = (0, adminSdkConfig_1.constructDefaultAdminSdkConfig)(this._projectId);
+            }
+            this.createBucket(adminSdkConfig.storageBucket);
         }
         return [...this._buckets.values()];
     }
@@ -355,7 +360,7 @@ class StorageLayer {
         const bucketsList = {
             buckets: [],
         };
-        for (const b of this.listBuckets()) {
+        for (const b of await this.listBuckets()) {
             bucketsList.buckets.push({ id: b.id });
         }
         const bucketsFilePath = path.join(storageExportPath, "buckets.json");

package/lib/extensions/askUserForParam.js

@@ -199,7 +199,7 @@ async function generateSecretName(projectId, instanceId, paramName) {
     return secretName;
 }
 async function addNewSecretVersion(projectId, instanceId, secret, paramSpec, secretValue) {
-    const version = await secretManagerApi.addVersion(secret, secretValue);
+    const version = await secretManagerApi.addVersion(projectId, secret.name, secretValue);
     await secretsUtils.grantFirexServiceAgentSecretAdminRole(secret);
     return `projects/${version.secret.projectId}/secrets/${version.secret.name}/versions/${version.versionId}`;
 }

package/lib/extensions/diagnose.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.diagnose = void 0;
+const extensionsHelper_1 = require("./extensionsHelper");
+const getProjectNumber_1 = require("../getProjectNumber");
+const utils = require("../utils");
+const resourceManager = require("../gcp/resourceManager");
+const extensionsApi_1 = require("./extensionsApi");
+const prompt_1 = require("../prompt");
+const logger_1 = require("../logger");
+const error_1 = require("../error");
+const SERVICE_AGENT_ROLE = "roles/firebasemods.serviceAgent";
+async function diagnose(projectId) {
+    const projectNumber = await (0, getProjectNumber_1.getProjectNumber)({ projectId });
+    const firexSaProjectId = utils.envOverride("FIREBASE_EXTENSIONS_SA_PROJECT_ID", "gcp-sa-firebasemods");
+    const saEmail = `service-${projectNumber}@${firexSaProjectId}.iam.gserviceaccount.com`;
+    utils.logLabeledBullet(extensionsHelper_1.logPrefix, "Checking project IAM policy...");
+    await (0, extensionsApi_1.listInstances)(projectId);
+    let policy;
+    try {
+        policy = await resourceManager.getIamPolicy(projectId);
+        logger_1.logger.debug(policy);
+    }
+    catch (e) {
+        if (e instanceof error_1.FirebaseError && e.status === 403) {
+            throw new error_1.FirebaseError("Unable to get project IAM policy, permission denied (403). Please " +
+                "make sure you have sufficient project privileges or if this is a brand new project " +
+                "try again in a few minutes.");
+        }
+        throw e;
+    }
+    if (policy.bindings.find((b) => b.role === SERVICE_AGENT_ROLE && b.members.includes("serviceAccount:" + saEmail))) {
+        utils.logLabeledSuccess(extensionsHelper_1.logPrefix, "Project IAM policy OK");
+        return true;
+    }
+    else {
+        utils.logWarning("Firebase Extensions Service Agent is missing a required IAM role " +
+            "`Firebase Extensions API Service Agent`.");
+        const fix = await (0, prompt_1.promptOnce)({
+            type: "confirm",
+            message: "Would you like to fix the issue by updating IAM policy to include Firebase " +
+                "Extensions Service Agent with role `Firebase Extensions API Service Agent`",
+        });
+        if (fix) {
+            policy.bindings.push({
+                role: SERVICE_AGENT_ROLE,
+                members: ["serviceAccount:" + saEmail],
+            });
+            await resourceManager.setIamPolicy(projectId, policy, "bindings");
+            utils.logSuccess("Project IAM policy updated successfully");
+            return true;
+        }
+        return false;
+    }
+}
+exports.diagnose = diagnose;

package/lib/extensions/extensionsHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.confirm = exports.getSourceOrigin = exports.isLocalOrURLPath = exports.isLocalPath = exports.isUrlPath = exports.instanceIdExists = exports.promptForRepeatInstance = exports.promptForOfficialExtension = exports.displayReleaseNotes = exports.getPublisherProjectFromName = exports.getExtensionSourceFromName = 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;
+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 _ = require("lodash");
 const clc = require("cli-color");
 const ora = require("ora");
@@ -16,6 +16,7 @@ const utils_1 = require("./utils");
 const functionsConfig_1 = require("../functionsConfig");
 const resolveSource_1 = require("./resolveSource");
 const error_1 = require("../error");
+const diagnose_1 = require("./diagnose");
 const askUserForParam_1 = require("./askUserForParam");
 const ensureApiEnabled_1 = require("../ensureApiEnabled");
 const storage_1 = require("../gcp/storage");
@@ -382,22 +383,6 @@ async function deleteUploadedSource(objectPath) {
         }
     }
 }
-async function getExtensionSourceFromName(extensionName) {
-    const officialExtensionRegex = /^[a-zA-Z\-]+[0-9@.]*$/;
-    const existingSourceRegex = /projects\/.+\/sources\/.+/;
-    if (officialExtensionRegex.test(extensionName)) {
-        const [name, version] = extensionName.split("@");
-        const registryEntry = await (0, resolveSource_1.resolveRegistryEntry)(name);
-        const sourceUrl = (0, resolveSource_1.resolveSourceUrl)(registryEntry, name, version);
-        return await (0, extensionsApi_1.getSource)(sourceUrl);
-    }
-    else if (existingSourceRegex.test(extensionName)) {
-        logger_1.logger.info(`Fetching the source "${extensionName}"...`);
-        return await (0, extensionsApi_1.getSource)(extensionName);
-    }
-    throw new error_1.FirebaseError(`Could not find an extension named '${extensionName}'. `);
-}
-exports.getExtensionSourceFromName = getExtensionSourceFromName;
 function getPublisherProjectFromName(publisherName) {
     const publisherNameRegex = /projects\/.+\/publisherProfile/;
     if (publisherNameRegex.test(publisherName)) {
@@ -520,3 +505,11 @@ async function confirm(args) {
     }
 }
 exports.confirm = confirm;
+async function diagnoseAndFixProject(options) {
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const ok = await (0, diagnose_1.diagnose)(projectId);
+    if (!ok) {
+        throw new error_1.FirebaseError("Unable to proceed until all issues are resolved.");
+    }
+}
+exports.diagnoseAndFixProject = diagnoseAndFixProject;