firebase-tools 10.4.2 → 10.7.0

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

@@ -5,6 +5,7 @@ const chokidar = require("chokidar");
 const emulatorLogger_1 = require("../../emulatorLogger");
 const types_1 = require("../../types");
 const runtime_1 = require("./runtime");
+const fsutils_1 = require("../../../fsutils");
 function createStorageRulesManager(rules, runtime) {
     return Array.isArray(rules)
         ? new ResourceBasedStorageRulesManager(rules, runtime)
@@ -18,31 +19,24 @@ class DefaultStorageRulesManager {
         this._logger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.STORAGE);
         this._rules = _rules;
     }
-    start() {
-        return this.updateSourceFile(this._rules);
+    async start() {
+        const issues = await this.loadRuleset();
+        this.updateWatcher(this._rules.name);
+        return issues;
     }
     getRuleset() {
         return this._ruleset;
     }
-    async updateSourceFile(rules) {
-        const prevRulesFile = this._rules.name;
-        this._rules = rules;
-        const issues = await this.loadRuleset();
-        this.updateWatcher(rules.name, prevRulesFile);
-        return issues;
-    }
     async stop() {
         await this._watcher.close();
     }
-    updateWatcher(rulesFile, prevRulesFile) {
-        if (prevRulesFile) {
-            this._watcher.unwatch(prevRulesFile);
-        }
+    updateWatcher(rulesFile) {
         this._watcher = chokidar
             .watch(rulesFile, { persistent: true, ignoreInitial: true })
             .on("change", async () => {
             await new Promise((res) => setTimeout(res, 5));
             this._logger.logLabeled("BULLET", "storage", "Change detected, updating rules for Cloud Storage...");
+            this._rules.content = (0, fsutils_1.readFile)(rulesFile);
             await this.loadRuleset();
         });
     }
@@ -83,10 +77,6 @@ class ResourceBasedStorageRulesManager {
         var _a;
         return (_a = this._rulesManagers.get(resource)) === null || _a === void 0 ? void 0 : _a.getRuleset();
     }
-    updateSourceFile(rules, resource) {
-        const rulesManager = this._rulesManagers.get(resource) || this.createRulesManager(resource, rules);
-        return rulesManager.updateSourceFile(rules);
-    }
     async stop() {
         await Promise.all(Array.from(this._rulesManagers.values(), async (rulesManager) => await rulesManager.stop()));
     }

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

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isPermitted = exports.getAdminCredentialValidator = exports.getRulesValidator = void 0;
+exports.isPermitted = exports.getAdminCredentialValidator = exports.getAdminOnlyFirebaseRulesValidator = exports.getFirebaseRulesValidator = void 0;
 const emulatorLogger_1 = require("../../emulatorLogger");
 const types_1 = require("../../types");
-function getRulesValidator(rulesetProvider) {
+function getFirebaseRulesValidator(rulesetProvider) {
     return {
         validate: async (path, bucketId, method, variableOverrides, authorization) => {
             return await isPermitted({
@@ -16,7 +16,15 @@ function getRulesValidator(rulesetProvider) {
         },
     };
 }
-exports.getRulesValidator = getRulesValidator;
+exports.getFirebaseRulesValidator = getFirebaseRulesValidator;
+function getAdminOnlyFirebaseRulesValidator() {
+    return {
+        validate: (_path, _bucketId, _method, _variableOverrides, _authorization) => {
+            return Promise.resolve(true);
+        },
+    };
+}
+exports.getAdminOnlyFirebaseRulesValidator = getAdminOnlyFirebaseRulesValidator;
 function getAdminCredentialValidator() {
     return { validate: isValidAdminCredentials };
 }

package/lib/emulator/storage/server.js

@@ -8,6 +8,7 @@ const types_1 = require("../types");
 const bodyParser = require("body-parser");
 const gcloud_1 = require("./apis/gcloud");
 const firebase_1 = require("./apis/firebase");
+const errors_1 = require("../auth/errors");
 function createApp(defaultProjectId, emulator) {
     const { storageLayer } = emulator;
     const app = express();
@@ -44,21 +45,43 @@ function createApp(defaultProjectId, emulator) {
         res.sendStatus(200);
     });
     app.put("/internal/setRules", async (req, res) => {
-        const rules = req.body.rules;
-        if (!(rules && Array.isArray(rules.files) && rules.files.length > 0)) {
-            res.status(400).send("Request body must include 'rules.files' array .");
+        const rulesRaw = req.body.rules;
+        if (!(rulesRaw && Array.isArray(rulesRaw.files) && rulesRaw.files.length > 0)) {
+            res.status(400).json({
+                message: "Request body must include 'rules.files' array",
+            });
             return;
         }
-        const file = rules.files[0];
-        if (!(file.name && file.content)) {
-            res
-                .status(400)
-                .send("Request body must include 'rules.files' array where each member contains 'name' and 'content'.");
-            return;
+        const { files } = rulesRaw;
+        function parseRulesFromFiles(files) {
+            if (files.length === 1) {
+                const file = files[0];
+                if (!isRulesFile(file)) {
+                    throw new errors_1.InvalidArgumentError("Each member of 'rules.files' array must contain 'name' and 'content'");
+                }
+                return { name: file.name, content: file.content };
+            }
+            const rules = [];
+            for (const file of files) {
+                if (!isRulesFile(file) || !file.resource) {
+                    throw new errors_1.InvalidArgumentError("Each member of 'rules.files' array must contain 'name', 'content', and 'resource'");
+                }
+                rules.push({ resource: file.resource, rules: { name: file.name, content: file.content } });
+            }
+            return rules;
         }
-        const name = file.name;
-        const content = file.content;
-        const issues = await emulator.rulesManager.updateSourceFile({ name, content }, req.params.bucketId);
+        let rules;
+        try {
+            rules = parseRulesFromFiles(files);
+        }
+        catch (err) {
+            if (err instanceof errors_1.InvalidArgumentError) {
+                res.status(400).json({ message: err.message });
+                return;
+            }
+            throw err;
+        }
+        const issues = await emulator.replaceRules(rules);
         if (issues.errors.length > 0) {
             res.status(400).json({
                 message: "There was an error updating rules, see logs for more details",
@@ -78,3 +101,6 @@ function createApp(defaultProjectId, emulator) {
     return Promise.resolve(app);
 }
 exports.createApp = createApp;
+function isRulesFile(file) {
+    return (typeof file.name === "string" && typeof file.content === "string");
+}

package/lib/ensureApiEnabled.js

@@ -2,7 +2,7 @@
 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 track = require("./track");
+const track_1 = require("./track");
 const api_1 = require("./api");
 const apiv2_1 = require("./apiv2");
 const utils = require("./utils");
@@ -16,7 +16,9 @@ const apiClient = new apiv2_1.Client({
     apiVersion: "v1",
 });
 async function check(projectId, apiName, prefix, silent = false) {
-    const res = await apiClient.get(`/projects/${projectId}/services/${apiName}`);
+    const res = await apiClient.get(`/projects/${projectId}/services/${apiName}`, {
+        skipLog: { resBody: true },
+    });
     const isEnabled = res.body.state === "ENABLED";
     if (isEnabled && !silent) {
         utils.logLabeledSuccess(prefix, `required API ${(0, cli_color_1.bold)(apiName)} is enabled`);
@@ -26,7 +28,9 @@ async function check(projectId, apiName, prefix, silent = false) {
 exports.check = check;
 async function enable(projectId, apiName) {
     try {
-        await apiClient.post(`/projects/${projectId}/services/${apiName}:enable`);
+        await apiClient.post(`/projects/${projectId}/services/${apiName}:enable`, {
+            skipLog: { resBody: true },
+        });
     }
     catch (err) {
         if ((0, error_1.isBillingError)(err)) {
@@ -46,7 +50,7 @@ async function pollCheckEnabled(projectId, apiName, prefix, silent, enablementRe
     });
     const isEnabled = await check(projectId, apiName, prefix, silent);
     if (isEnabled) {
-        void track("api_enabled", apiName);
+        void (0, track_1.track)("api_enabled", apiName);
         return;
     }
     if (!silent) {

package/lib/extensions/askUserForParam.js

@@ -172,12 +172,12 @@ async function promptSecretLocations(paramSpec) {
             choices: [
                 {
                     checked: true,
-                    name: "Google Cloud Secret Manager",
+                    name: "Google Cloud Secret Manager (Used by deployed extensions and emulator)",
                     value: SecretLocation.CLOUD.toString(),
                 },
                 {
                     checked: false,
-                    name: "Local file (Only used by Firebase Emulator)",
+                    name: "Local file (Used by emulator only)",
                     value: SecretLocation.LOCAL.toString(),
                 },
             ],
@@ -191,25 +191,28 @@ async function promptSecretLocations(paramSpec) {
         choices: [
             {
                 checked: false,
-                name: "Google Cloud Secret Manager",
+                name: "Google Cloud Secret Manager (Used by deployed extensions and emulator)",
                 value: SecretLocation.CLOUD.toString(),
             },
             {
                 checked: false,
-                name: "Local file (Only used by Firebase Emulator)",
+                name: "Local file (Used by emulator only)",
                 value: SecretLocation.LOCAL.toString(),
             },
         ],
     });
 }
 async function promptLocalSecret(instanceId, paramSpec) {
-    utils.logLabeledBullet(extensionsHelper_1.logPrefix, "Configure a local secret value for Extensions Emulator");
-    const value = await (0, prompt_1.promptOnce)({
-        name: paramSpec.param,
-        type: "input",
-        message: `This secret will be stored in ./extensions/${instanceId}.secret.local.\n` +
-            `Enter value for "${paramSpec.label.trim()}" to be used by Extensions Emulator:`,
-    });
+    let value;
+    do {
+        utils.logLabeledBullet(extensionsHelper_1.logPrefix, "Configure a local secret value for Extensions Emulator");
+        value = await (0, prompt_1.promptOnce)({
+            name: paramSpec.param,
+            type: "input",
+            message: `This secret will be stored in ./extensions/${instanceId}.secret.local.\n` +
+                `Enter value for "${paramSpec.label.trim()}" to be used by Extensions Emulator:`,
+        });
+    } while (!value);
     return value;
 }
 async function promptReconfigureSecret(projectId, instanceId, paramSpec) {

package/lib/extensions/changelog.js

@@ -16,7 +16,7 @@ marked.setOptions({
     renderer: new TerminalRenderer(),
 });
 const EXTENSIONS_CHANGELOG = "CHANGELOG.md";
-const VERSION_LINE_REGEX = /##.*(\d+\.\d+\.\d+).*/;
+const VERSION_LINE_REGEX = /##.*(\d+\.\d+\.\d+(?:-((\d+|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(\d+|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?).*/;
 async function getReleaseNotesForUpdate(args) {
     const releaseNotes = {};
     const filter = `id<="${args.toVersion}" AND id>"${args.fromVersion}"`;

package/lib/extensions/emulator/optionsHelper.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getParams = exports.getSecretEnvVars = exports.getNonSecretEnv = exports.getExtensionFunctionInfo = exports.buildOptions = void 0;
 const fs = require("fs-extra");
-const _ = require("lodash");
 const path = require("path");
 const paramHelper = require("../paramHelper");
 const specHelper = require("./specHelper");
@@ -10,6 +9,7 @@ const localHelper = require("../localHelper");
 const triggerHelper = require("./triggerHelper");
 const extensionsApi_1 = require("../extensionsApi");
 const extensionsHelper = require("../extensionsHelper");
+const planner = require("../../deploy/extensions/planner");
 const config_1 = require("../../config");
 const error_1 = require("../../error");
 const emulatorLogger_1 = require("../../emulator/emulatorLogger");
@@ -36,13 +36,13 @@ async function buildOptions(options) {
     return options;
 }
 exports.buildOptions = buildOptions;
-async function getExtensionFunctionInfo(extensionDir, instanceId, paramValues) {
-    const spec = await specHelper.readExtensionYaml(extensionDir);
+async function getExtensionFunctionInfo(instance, paramValues) {
+    const spec = await planner.getExtensionSpec(instance);
     const functionResources = specHelper.getFunctionResourcesWithParamSubstitution(spec, paramValues);
     const extensionTriggers = functionResources
         .map((r) => triggerHelper.functionResourceToEmulatedTriggerDefintion(r))
         .map((trigger) => {
-        trigger.name = `ext-${instanceId}-${trigger.name}`;
+        trigger.name = `ext-${instance.instanceId}-${trigger.name}`;
         return trigger;
     });
     const nodeMajorVersion = specHelper.getNodeVersion(functionResources);
@@ -159,12 +159,10 @@ function buildConfig(functionResources, testConfig) {
     return config;
 }
 function getFunctionSourceDirectory(functionResources) {
+    var _a;
     let sourceDirectory;
     for (const r of functionResources) {
-        let dir = _.get(r, "properties.sourceDirectory");
-        if (!dir) {
-            dir = "functions";
-        }
+        const dir = ((_a = r.properties) === null || _a === void 0 ? void 0 : _a.sourceDirectory) || "functions";
         if (!sourceDirectory) {
             sourceDirectory = dir;
         }
@@ -172,14 +170,15 @@ function getFunctionSourceDirectory(functionResources) {
             throw new error_1.FirebaseError(`Found function resources with different sourceDirectories: '${sourceDirectory}' and '${dir}'. The extensions emulator only supports a single sourceDirectory.`);
         }
     }
-    return sourceDirectory;
+    return sourceDirectory || "functions";
 }
 function shouldEmulateFunctions(resources) {
     return resources.length > 0;
 }
 function shouldEmulate(emulatorName, resources) {
+    var _a, _b;
     for (const r of resources) {
-        const eventType = _.get(r, "properties.eventTrigger.eventType", "");
+        const eventType = ((_b = (_a = r.properties) === null || _a === void 0 ? void 0 : _a.eventTrigger) === null || _b === void 0 ? void 0 : _b.eventType) || "";
         if (eventType.includes(emulatorName)) {
             return true;
         }

package/lib/extensions/emulator/specHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNodeVersion = exports.getFunctionProperties = exports.getFunctionResourcesWithParamSubstitution = exports.readFileFromDirectory = exports.readExtensionYaml = void 0;
+exports.getNodeVersion = exports.getFunctionProperties = exports.getFunctionResourcesWithParamSubstitution = exports.readFileFromDirectory = exports.readPostinstall = exports.readExtensionYaml = void 0;
 const yaml = require("js-yaml");
 const path = require("path");
 const fs = require("fs-extra");
@@ -8,6 +8,7 @@ const error_1 = require("../../error");
 const extensionsHelper_1 = require("../extensionsHelper");
 const functionsEmulatorUtils_1 = require("../../emulator/functionsEmulatorUtils");
 const SPEC_FILE = "extension.yaml";
+const POSTINSTALL_FILE = "POSTINSTALL.md";
 const validFunctionTypes = [
     "firebaseextensions.v1beta.function",
     "firebaseextensions.v1beta.scheduledFunction",
@@ -29,6 +30,11 @@ async function readExtensionYaml(directory) {
     return wrappedSafeLoad(source);
 }
 exports.readExtensionYaml = readExtensionYaml;
+async function readPostinstall(directory) {
+    const content = await readFileFromDirectory(directory, POSTINSTALL_FILE);
+    return content.source;
+}
+exports.readPostinstall = readPostinstall;
 function readFileFromDirectory(directory, file) {
     return new Promise((resolve, reject) => {
         fs.readFile(path.resolve(directory, file), "utf8", (err, data) => {

package/lib/extensions/emulator/triggerHelper.js

@@ -1,32 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.functionResourceToEmulatedTriggerDefintion = void 0;
-const _ = require("lodash");
 const functionsEmulatorShared_1 = require("../../emulator/functionsEmulatorShared");
 const emulatorLogger_1 = require("../../emulator/emulatorLogger");
 const types_1 = require("../../emulator/types");
+const proto = require("../../gcp/proto");
 function functionResourceToEmulatedTriggerDefintion(resource) {
     const etd = {
         name: resource.name,
         entryPoint: resource.name,
         platform: "gcfv1",
     };
-    const properties = _.get(resource, "properties", {});
-    if (properties.timeout) {
-        etd.timeout = properties.timeout;
-    }
-    if (properties.location) {
-        etd.regions = [properties.location];
-    }
-    if (properties.availableMemoryMb) {
-        etd.availableMemoryMb = properties.availableMemoryMb;
-    }
+    const properties = resource.properties || {};
+    proto.renameIfPresent(etd, properties, "timeoutSeconds", "timeout", proto.secondsFromDuration);
+    proto.renameIfPresent(etd, properties, "regions", "location", (str) => [str]);
+    proto.copyIfPresent(etd, properties, "availableMemoryMb");
     if (properties.httpsTrigger) {
         etd.httpsTrigger = properties.httpsTrigger;
     }
-    else if (properties.eventTrigger) {
-        properties.eventTrigger.service = (0, functionsEmulatorShared_1.getServiceFromEventType)(properties.eventTrigger.eventType);
-        etd.eventTrigger = properties.eventTrigger;
+    if (properties.eventTrigger) {
+        etd.eventTrigger = {
+            eventType: properties.eventTrigger.eventType,
+            resource: properties.eventTrigger.resource,
+            service: (0, functionsEmulatorShared_1.getServiceFromEventType)(properties.eventTrigger.eventType),
+        };
     }
     else {
         emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.FUNCTIONS).log("WARN", `Function '${resource.name} is missing a trigger in extension.yaml. Please add one, as triggers defined in code are ignored.`);

package/lib/extensions/extensionsApi.js

@@ -1,6 +1,6 @@
 "use strict";
 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 = exports.ParamType = exports.Visibility = exports.RegistryLaunchStage = void 0;
+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 = exports.ParamType = exports.FUNCTIONS_RESOURCE_TYPE = exports.Visibility = exports.RegistryLaunchStage = void 0;
 const yaml = require("js-yaml");
 const clc = require("cli-color");
 const { marked } = require("marked");
@@ -26,6 +26,7 @@ var Visibility;
     Visibility["UNLISTED"] = "unlisted";
     Visibility["PUBLIC"] = "public";
 })(Visibility = exports.Visibility || (exports.Visibility = {}));
+exports.FUNCTIONS_RESOURCE_TYPE = "firebaseextensions.v1beta.function";
 var ParamType;
 (function (ParamType) {
     ParamType["STRING"] = "STRING";

package/lib/extensions/extensionsHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+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 _ = require("lodash");
 const clc = require("cli-color");
 const ora = require("ora");
@@ -305,7 +305,7 @@ async function publishExtensionVersionFromLocalSource(args) {
             "Please create one and add an entry for this version. " +
             marked("See https://firebase.google.com/docs/extensions/alpha/create-user-docs#writing-changelog for more details."));
     }
-    if (!notes && extension) {
+    if (!notes && !semver.prerelease(extensionSpec.version) && extension) {
         throw new error_1.FirebaseError(`No entry for version ${extensionSpec.version} found in CHANGELOG.md. ` +
             "Please add one so users know what has changed in this version. " +
             marked("See https://firebase.google.com/docs/extensions/alpha/create-user-docs#writing-changelog for more details."));
@@ -363,32 +363,26 @@ async function publishExtensionVersionFromLocalSource(args) {
 }
 exports.publishExtensionVersionFromLocalSource = publishExtensionVersionFromLocalSource;
 async function createSourceFromLocation(projectId, sourceUri) {
+    const extensionRoot = "/";
     let packageUri;
-    let extensionRoot;
     let objectPath = "";
-    if (!sourceUri.startsWith("https:")) {
-        const uploadSpinner = ora(" Archiving and uploading extension source code");
-        try {
-            uploadSpinner.start();
-            objectPath = await archiveAndUploadSource(sourceUri, exports.EXTENSIONS_BUCKET_NAME);
-            uploadSpinner.succeed(" Uploaded extension source code");
-            packageUri = api_1.storageOrigin + objectPath + "?alt=media";
-            extensionRoot = "/";
-        }
-        catch (err) {
-            uploadSpinner.fail();
-            throw new error_1.FirebaseError(`Failed to archive and upload extension source, ${err}`, {
-                original: err,
-            });
-        }
+    const spinner = ora(" Archiving and uploading extension source code");
+    try {
+        spinner.start();
+        objectPath = await archiveAndUploadSource(sourceUri, exports.EXTENSIONS_BUCKET_NAME);
+        spinner.succeed(" Uploaded extension source code");
+        packageUri = api_1.storageOrigin + objectPath + "?alt=media";
+        const res = await (0, extensionsApi_1.createSource)(projectId, packageUri, extensionRoot);
+        logger_1.logger.debug("Created new Extension Source %s", res.name);
+        await deleteUploadedSource(objectPath);
+        return res;
     }
-    else {
-        [packageUri, extensionRoot] = sourceUri.split("#");
+    catch (err) {
+        spinner.fail();
+        throw new error_1.FirebaseError(`Failed to archive and upload extension source from ${sourceUri}, ${err}`, {
+            original: err,
+        });
     }
-    const res = await (0, extensionsApi_1.createSource)(projectId, packageUri, extensionRoot);
-    logger_1.logger.debug("Created new Extension Source %s", res.name);
-    await deleteUploadedSource(objectPath);
-    return res;
 }
 exports.createSourceFromLocation = createSourceFromLocation;
 async function deleteUploadedSource(objectPath) {
@@ -535,3 +529,15 @@ async function diagnoseAndFixProject(options) {
     }
 }
 exports.diagnoseAndFixProject = diagnoseAndFixProject;
+function canonicalizeRefInput(extensionName) {
+    if (extensionName.split("/").length < 2) {
+        const [extensionID, version] = extensionName.split("@");
+        extensionName = `firebase/${extensionID}@${version || "latest"}`;
+    }
+    const ref = refs.parse(extensionName);
+    if (!ref.version) {
+        extensionName = `${extensionName}@latest`;
+    }
+    return extensionName;
+}
+exports.canonicalizeRefInput = canonicalizeRefInput;

package/lib/extensions/manifest.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.showPreviewWarning = exports.showDeprecationWarning = exports.readInstanceParam = exports.getInstanceRef = exports.instanceExists = exports.loadConfig = exports.removeFromManifest = exports.writeLocalSecrets = exports.writeToManifest = exports.ENV_DIRECTORY = void 0;
+exports.showPreviewWarning = exports.showDeprecationWarning = 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 path = require("path");
 const refs = require("./refs");
 const config_1 = require("../config");
+const planner_1 = require("../deploy/extensions/planner");
 const logger_1 = require("../logger");
 const prompt_1 = require("../prompt");
 const paramHelper_1 = require("./paramHelper");
@@ -42,11 +43,12 @@ async function writeToManifest(specs, config, options, allowOverwrite = false) {
 exports.writeToManifest = writeToManifest;
 async function writeLocalSecrets(specs, config, force) {
     for (const spec of specs) {
-        if (!spec.paramSpecs) {
+        const extensionSpec = await (0, planner_1.getExtensionSpec)(spec);
+        if (!extensionSpec.params) {
             continue;
         }
         const writeBuffer = {};
-        const locallyOverridenSecretParams = spec.paramSpecs.filter((p) => p.type === extensionsApi_1.ParamType.SECRET && spec.params[p.param].local);
+        const locallyOverridenSecretParams = extensionSpec.params.filter((p) => p.type === extensionsApi_1.ParamType.SECRET && spec.params[p.param].local);
         for (const paramSpec of locallyOverridenSecretParams) {
             const key = paramSpec.param;
             const localValue = spec.params[key].local;
@@ -97,18 +99,35 @@ function instanceExists(instanceId, config) {
     return !!config.get("extensions", {})[instanceId];
 }
 exports.instanceExists = instanceExists;
-function getInstanceRef(instanceId, config) {
+function getInstanceTarget(instanceId, config) {
     if (!instanceExists(instanceId, config)) {
         throw new error_1.FirebaseError(`Could not find extension instance ${instanceId} in firebase.json`);
     }
-    const ref = config.get("extensions", {})[instanceId];
-    return refs.parse(ref);
+    return config.get("extensions", {})[instanceId];
+}
+exports.getInstanceTarget = getInstanceTarget;
+function getInstanceRef(instanceId, config) {
+    const source = getInstanceTarget(instanceId, config);
+    if ((0, extensionsHelper_1.isLocalPath)(source)) {
+        throw new error_1.FirebaseError(`Extension instance ${instanceId} doesn't have a ref because it is from a local source`);
+    }
+    return refs.parse(source);
 }
 exports.getInstanceRef = getInstanceRef;
 function writeExtensionsToFirebaseJson(specs, config) {
     const extensions = config.get("extensions", {});
     for (const s of specs) {
-        extensions[s.instanceId] = refs.toExtensionVersionRef(s.ref);
+        let target;
+        if (s.ref) {
+            target = refs.toExtensionVersionRef(s.ref);
+        }
+        else if (s.localPath) {
+            target = s.localPath;
+        }
+        else {
+            throw new error_1.FirebaseError(`Unable to resolve ManifestInstanceSpec, make sure you provide either extension ref or a local path to extension source code`);
+        }
+        extensions[s.instanceId] = target;
     }
     config.set("extensions", extensions);
     config.writeProjectFile("firebase.json", config.src);
@@ -117,6 +136,7 @@ function writeExtensionsToFirebaseJson(specs, config) {
 async function writeEnvFiles(specs, config, force) {
     for (const spec of specs) {
         const content = Object.entries(spec.params)
+            .filter((r) => r[1].baseValue !== "")
             .sort((a, b) => {
             return a[0].localeCompare(b[0]);
         })
@@ -170,7 +190,7 @@ function showDeprecationWarning() {
 }
 exports.showDeprecationWarning = showDeprecationWarning;
 function showPreviewWarning() {
-    utils.logLabeledWarning(extensionsHelper_1.logPrefix, "These changes will be reflected in your Firebase Emulator after restart. " +
+    utils.logLabeledWarning(extensionsHelper_1.logPrefix, `See these changes in your Firebase Emulator by running "firebase emulators:start". ` +
         `Run ${clc.bold("firebase deploy (--only extensions)")} to deploy the changes to your Firebase project. `);
 }
 exports.showPreviewWarning = showPreviewWarning;