firebase-tools 9.23.1 → 9.23.2

package/CHANGELOG.md

@@ -1,5 +1,7 @@
-- Corrects a bug where containers in Artifact Registry would not be deleted if a function has an upper case character in its name (#3918)
-- Fixes issue where providing the `--project` flag during `init` would not be recognized with a default project already set. (#3870)
-- Fixes issue with setting memory limits for some functions (#3924)
-- New HTTPS functions only allow secure traffic. (#3923)
-- No longer default-enable AR and don't send builds to AR unless an experiment is enabled (#3935)
+- Fixes issue when installing a Firebase Extension where secrets would be created before validation.
+- Fixes issue with filtering on a specific storage bucket using functions in the emulator. (#3893)
+- Fixes check in Cloud Functions for Firebase initialization to check for API enablement before trying to enable them. (#2574)
+- No longer tries to clean up function build images from Artifact Registry when Artifact Registry is not enabled. (#3943)
+- Show error message when running `firebase init hosting:github` with no Hosting config in `firebase.json`. (#3113)
+- Fixes issue where `remoteconfig:get` was not fetching the latest version by default. (#3559)
+- Fixes issue where empty variables in .env files would instead read as multi-line values. (#3934)

package/lib/commands/functions-delete.js

@@ -8,6 +8,7 @@ const projectUtils_1 = require("../projectUtils");
 const prompt_1 = require("../prompt");
 const functional_1 = require("../functional");
 const requirePermissions_1 = require("../requirePermissions");
+const ensure = require("../ensureApiEnabled");
 const helper = require("../deploy/functions/functionsDeployHelper");
 const utils = require("../utils");
 const backend = require("../deploy/functions/backend");
@@ -84,5 +85,10 @@ exports.default = new command_1.Command("functions:delete [filters...]")
             exit: 1,
         });
     }
-    await containerCleaner.cleanupBuildImages([], allEpToDelete);
+    const opts = {};
+    const arEnabled = await ensure.check(projectUtils_1.needProjectId(options), "artifactregistry.googleapis.com", "functions", true);
+    if (!arEnabled) {
+        opts.ar = new containerCleaner.NoopArtifactRegistryCleaner();
+    }
+    await containerCleaner.cleanupBuildImages([], allEpToDelete, opts);
 });

package/lib/commands/remoteconfig-get.js

@@ -11,13 +11,14 @@ const utils = require("../utils");
 const Table = require("cli-table");
 const fs = require("fs");
 const util = require("util");
+const error_1 = require("../error");
 const tableHead = ["Entry Name", "Value"];
 const MAX_DISPLAY_ITEMS = 20;
-function checkValidNumber(versionNumber) {
-    if (typeof Number(versionNumber) == "number") {
+function checkValidOptionalNumber(versionNumber) {
+    if (!versionNumber || typeof Number(versionNumber) == "number") {
         return versionNumber;
     }
-    return "null";
+    throw new error_1.FirebaseError(`Could not interpret "${versionNumber}" as a valid number.`);
 }
 module.exports = new command_1.Command("remoteconfig:get")
     .description("get a Firebase project's Remote Config template")
@@ -26,8 +27,8 @@ module.exports = new command_1.Command("remoteconfig:get")
     .before(requireAuth_1.requireAuth)
     .before(requirePermissions_1.requirePermissions, ["cloudconfig.configs.get"])
     .action(async (options) => {
-    utils.assertIsString(options.versionNumber);
-    const template = await rcGet.getTemplate(projectUtils_1.needProjectId(options), checkValidNumber(options.versionNumber));
+    utils.assertIsStringOrUndefined(options.versionNumber);
+    const template = await rcGet.getTemplate(projectUtils_1.needProjectId(options), checkValidOptionalNumber(options.versionNumber));
     const table = new Table({ head: tableHead, style: { head: ["green"] } });
     if (template.conditions) {
         let updatedConditions = template.conditions

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

@@ -124,7 +124,9 @@ class Fabricator {
         await this.setTrigger(endpoint);
     }
     async updateEndpoint(update, scraper) {
-        update.endpoint.labels = Object.assign(Object.assign({}, update.endpoint.labels), deploymentTool.labels());
+        if (update.deleteAndRecreate || update.endpoint.platform !== "gcfv2") {
+            update.endpoint.labels = Object.assign(Object.assign({}, update.endpoint.labels), deploymentTool.labels());
+        }
         if (update.deleteAndRecreate) {
             await this.deleteEndpoint(update.deleteAndRecreate);
             await this.createEndpoint(update.endpoint, scraper);

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

@@ -49,7 +49,11 @@ async function release(context, options, payload) {
     const deletedEndpoints = Object.values(plan)
         .map((r) => r.endpointsToDelete)
         .reduce(functional_1.reduceFlat, []);
-    await containerCleaner.cleanupBuildImages(haveEndpoints, deletedEndpoints);
+    const opts = {};
+    if (!context.artifactRegistryEnabled) {
+        opts.ar = new containerCleaner.NoopArtifactRegistryCleaner();
+    }
+    await containerCleaner.cleanupBuildImages(haveEndpoints, deletedEndpoints, opts);
     const allErrors = summary.results.filter((r) => r.error).map((r) => r.error);
     if (allErrors.length) {
         const opts = allErrors.length == 1 ? { original: allErrors[0] } : { children: allErrors };

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

@@ -29,8 +29,10 @@ async function logAndTrackDeployStats(summary) {
     let totalSuccesses = 0;
     let totalAborts = 0;
     const reports = [];
+    const regions = new Set();
     for (const result of summary.results) {
         const tag = triggerTag(result.endpoint);
+        regions.add(result.endpoint.region);
         totalTime += result.durationMs;
         if (!result.error) {
             totalSuccesses++;
@@ -45,6 +47,8 @@ async function logAndTrackDeployStats(summary) {
             reports.push(track.track("function_deploy_failure", tag, result.durationMs));
         }
     }
+    const regionCountTag = regions.size < 5 ? regions.size.toString() : ">=5";
+    reports.push(track.track("functions_region_count", regionCountTag, 1));
     const gcfv1 = summary.results.find((r) => r.endpoint.platform === "gcfv1");
     const gcfv2 = summary.results.find((r) => r.endpoint.platform === "gcfv2");
     const tag = gcfv1 && gcfv2 ? "v1+v2" : gcfv1 ? "v1" : "v2";

package/lib/emulator/auth/handlers.js

@@ -178,7 +178,7 @@ function registerHandlers(app, getProjectStateByApiKey) {
             : `
             <span class="mdc-list-item__graphic material-icons" aria-hidden=true>person</span>`}
           <span class="mdc-list-item__text"><span class="mdc-list-item__primary-text">${info.displayName || "(No display name)"}</span>
-          <span class="mdc-list-item__secondary-text fallback-secondary-text">${info.email || ""}</span>
+          <span class="mdc-list-item__secondary-text fallback-secondary-text" id="reuse-email">${info.email || ""}</span>
       </li>`)
             .join("\n");
         res.end(widget_ui_1.WIDGET_UI.replace(widget_ui_1.PROVIDERS_LIST_PLACEHOLDER, options));

package/lib/emulator/auth/widget_ui.js

@@ -158,16 +158,17 @@ var reuseAccountEls = document.querySelectorAll('.js-reuse-account');
 if (reuseAccountEls.length) {
   [].forEach.call(reuseAccountEls, function (el) {
     var urlEncodedIdToken = el.dataset.idToken;
+    const decoded = JSON.parse(decodeURIComponent(urlEncodedIdToken));
     el.addEventListener('click', function (e) {
       e.preventDefault();
-      finishWithUser(urlEncodedIdToken);
+      finishWithUser(urlEncodedIdToken, decoded.email);
     });
   });
 } else {
   document.querySelector('.js-accounts-help-text').textContent = "No " + formattedProviderId + " accounts exist in the Auth Emulator.";
 }
 
-function finishWithUser(urlEncodedIdToken) {
+function finishWithUser(urlEncodedIdToken, email) {
   // Use widget URL, but replace all query parameters (no apiKey etc.).
   var url = window.location.href.split('?')[0];
   // Avoid URLSearchParams for browser compatibility.
@@ -176,7 +177,6 @@ function finishWithUser(urlEncodedIdToken) {
 
   // Save reasonable defaults for SAML providers
   if (isSamlProvider) {
-    var email = document.getElementById('email-input').value;
     url += '&SAMLResponse=' + encodeURIComponent(JSON.stringify({
       assertion: {
         subject: {
@@ -234,7 +234,7 @@ document.getElementById('main-form').addEventListener('submit', function(e) {
     if (screenName) claims.screenName = screenName;
     if (photoUrl) claims.photoUrl = photoUrl;
 
-    finishWithUser(createFakeClaims(claims));
+    finishWithUser(createFakeClaims(claims), claims.email);
   }
 });
 

package/lib/emulator/functionsEmulator.js

@@ -29,6 +29,7 @@ const defaultCredentials_1 = require("../defaultCredentials");
 const adminSdkConfig_1 = require("./adminSdkConfig");
 const functionsEnv = require("../functions/env");
 const types_2 = require("./events/types");
+const validate_1 = require("../deploy/functions/validate");
 const EVENT_INVOKE = "functions:invoke";
 const DATABASE_PATH_PATTERN = new RegExp("^projects/[^/]+/instances/([^/]+)/refs(/.*)$");
 class FunctionsEmulator {
@@ -138,6 +139,9 @@ class FunctionsEmulator {
             else {
                 triggerKey = `${this.args.projectId}:${proto.eventType}`;
             }
+            if (proto.data.bucket) {
+                triggerKey += `:${proto.data.bucket}`;
+            }
             const triggers = this.multicastTriggers[triggerKey] || [];
             triggers.forEach((triggerId) => {
                 this.workQueue.submit(() => {
@@ -247,6 +251,13 @@ class FunctionsEmulator {
             return !anyEnabledMatch;
         });
         for (const definition of toSetup) {
+            try {
+                validate_1.functionIdsAreValid([definition]);
+            }
+            catch (e) {
+                this.logger.logLabeled("WARN", `functions[${definition.id}]`, `Invalid function id: ${e.message}`);
+                continue;
+            }
             let added = false;
             let url = undefined;
             if (definition.httpsTrigger) {
@@ -396,7 +407,10 @@ class FunctionsEmulator {
     }
     addStorageTrigger(projectId, key, eventTrigger) {
         logger_1.logger.debug(`addStorageTrigger`, JSON.stringify({ eventTrigger }));
-        const eventTriggerId = `${projectId}:${eventTrigger.eventType}`;
+        const bucket = eventTrigger.resource.startsWith("projects/_/buckets/")
+            ? eventTrigger.resource.split("/")[3]
+            : eventTrigger.resource;
+        const eventTriggerId = `${projectId}:${eventTrigger.eventType}:${bucket}`;
         const triggers = this.multicastTriggers[eventTriggerId] || [];
         triggers.push(key);
         this.multicastTriggers[eventTriggerId] = triggers;

package/lib/emulator/functionsEmulatorShared.js

@@ -55,6 +55,7 @@ function emulatedFunctionsByRegion(definitions) {
             defDeepCopy.regions = [region];
             defDeepCopy.region = region;
             defDeepCopy.id = `${region}-${defDeepCopy.name}`;
+            defDeepCopy.platform = defDeepCopy.platform || "gcfv1";
             regionDefinitions.push(defDeepCopy);
         }
     }

package/lib/emulator/pubsubEmulator.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PubsubEmulator = void 0;
 const uuid = require("uuid");
 const pubsub_1 = require("@google-cloud/pubsub");
-const api = require("../api");
 const downloadableEmulators = require("./downloadableEmulators");
+const apiv2_1 = require("../apiv2");
 const emulatorLogger_1 = require("./emulatorLogger");
 const types_1 = require("../emulator/types");
 const constants_1 = require("./constants");
@@ -87,47 +87,54 @@ class PubsubEmulator {
         this.triggersForTopic.set(topicName, triggers);
         this.subscriptionForTopic.set(topicName, sub);
     }
-    getRequestOptions(topic, message, signatureType) {
-        const baseOpts = {
-            origin: `http://${registry_1.EmulatorRegistry.getInfoHostString(registry_1.EmulatorRegistry.get(types_1.Emulators.FUNCTIONS).getInfo())}`,
-        };
-        if (signatureType === "event") {
-            return Object.assign(Object.assign({}, baseOpts), { data: {
-                    context: {
-                        eventId: uuid.v4(),
-                        resource: {
-                            service: "pubsub.googleapis.com",
-                            name: `projects/${this.args.projectId}/topics/${topic}`,
-                        },
-                        eventType: "google.pubsub.topic.publish",
-                        timestamp: message.publishTime.toISOString(),
-                    },
-                    data: {
-                        data: message.data,
-                        attributes: message.attributes,
-                    },
-                } });
+    ensureFunctionsClient() {
+        if (this.client != undefined)
+            return;
+        const funcEmulator = registry_1.EmulatorRegistry.get(types_1.Emulators.FUNCTIONS);
+        if (!funcEmulator) {
+            throw new error_1.FirebaseError(`Attempted to execute pubsub trigger but could not find the Functions emulator`);
         }
-        else if (signatureType === "cloudevent") {
-            const data = {
-                message: {
-                    messageId: message.id,
-                    publishTime: message.publishTime,
-                    attributes: message.attributes,
-                    orderingKey: message.orderingKey,
-                    data: message.data.toString("base64"),
+        this.client = new apiv2_1.Client({
+            urlPrefix: `http://${registry_1.EmulatorRegistry.getInfoHostString(funcEmulator.getInfo())}`,
+            auth: false,
+        });
+    }
+    createLegacyEventRequestBody(topic, message) {
+        return {
+            context: {
+                eventId: uuid.v4(),
+                resource: {
+                    service: "pubsub.googleapis.com",
+                    name: `projects/${this.args.projectId}/topics/${topic}`,
                 },
-                subscription: this.subscriptionForTopic.get(topic).name,
-            };
-            const ce = {
-                specVersion: 1,
-                type: "google.cloud.pubsub.topic.v1.messagePublished",
-                source: `//pubsub.googleapis.com/projects/${this.args.projectId}/topics/${topic}`,
-                data,
-            };
-            return Object.assign(Object.assign({}, baseOpts), { headers: { "Content-Type": "application/cloudevents+json; charset=UTF-8" }, data: ce });
-        }
-        throw new error_1.FirebaseError(`Unsupported trigger signature: ${signatureType}`);
+                eventType: "google.pubsub.topic.publish",
+                timestamp: message.publishTime.toISOString(),
+            },
+            data: {
+                data: message.data,
+                attributes: message.attributes,
+            },
+        };
+    }
+    createCloudEventRequestBody(topic, message) {
+        const data = {
+            message: {
+                messageId: message.id,
+                publishTime: message.publishTime,
+                attributes: message.attributes,
+                orderingKey: message.orderingKey,
+                data: message.data.toString("base64"),
+            },
+            subscription: this.subscriptionForTopic.get(topic).name,
+        };
+        return {
+            specversion: "1",
+            id: uuid.v4(),
+            time: message.publishTime.toISOString(),
+            type: "google.cloud.pubsub.topic.v1.messagePublished",
+            source: `//pubsub.googleapis.com/projects/${this.args.projectId}/topics/${topic}`,
+            data,
+        };
     }
     async onMessage(topicName, message) {
         this.logger.logLabeled("DEBUG", "pubsub", `onMessage(${topicName}, ${message.id})`);
@@ -135,14 +142,20 @@ class PubsubEmulator {
         if (!triggers || triggers.length === 0) {
             throw new error_1.FirebaseError(`No trigger for topic: ${topicName}`);
         }
-        if (!registry_1.EmulatorRegistry.get(types_1.Emulators.FUNCTIONS)) {
-            throw new error_1.FirebaseError(`Attempted to execute pubsub trigger for topic ${topicName} but could not find Functions emulator`);
-        }
         this.logger.logLabeled("DEBUG", "pubsub", `Executing ${triggers.length} matching triggers (${JSON.stringify(triggers.map((t) => t.triggerKey))})`);
+        this.ensureFunctionsClient();
         for (const { triggerKey, signatureType } of triggers) {
-            const reqOpts = this.getRequestOptions(topicName, message, signatureType);
             try {
-                await api.request("POST", `/functions/projects/${this.args.projectId}/triggers/${triggerKey}`, reqOpts);
+                const path = `/functions/projects/${this.args.projectId}/triggers/${triggerKey}`;
+                if (signatureType === "event") {
+                    await this.client.post(path, this.createLegacyEventRequestBody(topicName, message));
+                }
+                else if (signatureType === "cloudevent") {
+                    await this.client.post(path, this.createCloudEventRequestBody(topicName, message), { headers: { "Content-Type": "application/cloudevents+json; charset=UTF-8" } });
+                }
+                else {
+                    throw new error_1.FirebaseError(`Unsupported trigger signature: ${signatureType}`);
+                }
             }
             catch (e) {
                 this.logger.logLabeled("DEBUG", "pubsub", e);

package/lib/emulator/storage/cloudFunctions.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StorageCloudFunctions = void 0;
+const uuid = require("uuid");
 const registry_1 = require("../registry");
 const types_1 = require("../types");
 const emulatorLogger_1 = require("../emulatorLogger");
@@ -57,7 +58,7 @@ class StorageCloudFunctions {
     }
     createLegacyEventRequestBody(action, objectMetadataPayload) {
         const timestamp = new Date();
-        return JSON.stringify({
+        return {
             eventId: `${timestamp.getTime()}`,
             timestamp: metadata_1.toSerializedDate(timestamp),
             eventType: `google.storage.object.${action}`,
@@ -67,20 +68,26 @@ class StorageCloudFunctions {
                 type: "storage#object",
             },
             data: objectMetadataPayload,
-        });
+        };
     }
     createCloudEventRequestBody(action, objectMetadataPayload) {
         const ceAction = STORAGE_V2_ACTION_MAP[action];
         if (!ceAction) {
-            throw new Error("Action is not definied as a CloudEvents action");
+            throw new Error("Action is not defined as a CloudEvents action");
         }
         const data = objectMetadataPayload;
-        return JSON.stringify({
-            specVersion: 1,
+        let time = new Date().toISOString();
+        if (data.updated) {
+            time = typeof data.updated === "string" ? data.updated : data.updated.toISOString();
+        }
+        return {
+            specversion: "1",
+            id: uuid.v4(),
             type: `google.cloud.storage.object.v1.${ceAction}`,
             source: `//storage.googleapis.com/projects/_/buckets/${objectMetadataPayload.bucket}/objects/${objectMetadataPayload.name}`,
+            time,
             data,
-        });
+        };
     }
 }
 exports.StorageCloudFunctions = StorageCloudFunctions;

package/lib/ensureApiEnabled.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensure = exports.enable = exports.check = exports.POLL_SETTINGS = void 0;
+exports.ensure = exports.check = exports.POLL_SETTINGS = void 0;
 const cli_color_1 = require("cli-color");
 const track = require("./track");
 const api_1 = require("./api");
@@ -37,7 +37,6 @@ https://console.firebase.google.com/project/${projectId}/usage/details`);
         throw err;
     }
 }
-exports.enable = enable;
 async function pollCheckEnabled(projectId, apiName, prefix, silent, enablementRetries, pollRetries = 0) {
     if (pollRetries > exports.POLL_SETTINGS.pollsBeforeRetry) {
         return enableApiWithRetries(projectId, apiName, prefix, silent, enablementRetries + 1);

package/lib/extensions/askUserForParam.js

@@ -77,6 +77,7 @@ async function askForParam(projectId, instanceId, paramSpec, reconfiguring) {
                         "You may only select one option.",
                     choices: utils_1.convertExtensionOptionToLabeledList(paramSpec.options),
                 });
+                valid = checkResponse(response, paramSpec);
                 break;
             case extensionsApi_1.ParamType.MULTISELECT:
                 response = await utils_1.onceWithJoin({
@@ -95,11 +96,13 @@ async function askForParam(projectId, instanceId, paramSpec, reconfiguring) {
                         "You may select multiple options.",
                     choices: utils_1.convertExtensionOptionToLabeledList(paramSpec.options),
                 });
+                valid = checkResponse(response, paramSpec);
                 break;
             case extensionsApi_1.ParamType.SECRET:
                 response = reconfiguring
                     ? await promptReconfigureSecret(projectId, instanceId, paramSpec)
                     : await promptCreateSecret(projectId, instanceId, paramSpec);
+                valid = true;
                 break;
             default:
                 response = await prompt_1.promptOnce({
@@ -108,8 +111,8 @@ async function askForParam(projectId, instanceId, paramSpec, reconfiguring) {
                     default: paramSpec.default,
                     message: `Enter a value for ${label}:`,
                 });
+                valid = checkResponse(response, paramSpec);
         }
-        valid = checkResponse(response, paramSpec);
     }
     return response;
 }
@@ -139,10 +142,24 @@ async function promptReconfigureSecret(projectId, instanceId, paramSpec) {
                 type: "password",
                 message: `This secret will be stored in Cloud Secret Manager as ${secretName}.\nEnter new value for ${paramSpec.label.trim()}:`,
             });
-            if (!secret) {
-                secret = await secretManagerApi.createSecret(projectId, secretName, secretsUtils.getSecretLabels(instanceId));
+            if (secretValue === "" && paramSpec.required) {
+                logger_1.logger.info(`Secret value cannot be empty for required param ${paramSpec.param}`);
+                return promptReconfigureSecret(projectId, instanceId, paramSpec);
+            }
+            else if (secretValue !== "") {
+                if (checkResponse(secretValue, paramSpec)) {
+                    if (!secret) {
+                        secret = await secretManagerApi.createSecret(projectId, secretName, secretsUtils.getSecretLabels(instanceId));
+                    }
+                    return addNewSecretVersion(projectId, instanceId, secret, paramSpec, secretValue);
+                }
+                else {
+                    return promptReconfigureSecret(projectId, instanceId, paramSpec);
+                }
+            }
+            else {
+                return "";
             }
-            return addNewSecretVersion(projectId, instanceId, secret, paramSpec, secretValue);
         case SecretUpdateAction.LEAVE:
         default:
             return paramSpec.default || "";
@@ -158,13 +175,20 @@ async function promptCreateSecret(projectId, instanceId, paramSpec, secretName)
     });
     if (secretValue === "" && paramSpec.required) {
         logger_1.logger.info(`Secret value cannot be empty for required param ${paramSpec.param}`);
-        return await promptCreateSecret(projectId, instanceId, paramSpec, name);
+        return promptCreateSecret(projectId, instanceId, paramSpec, name);
     }
     else if (secretValue !== "") {
-        const secret = await secretManagerApi.createSecret(projectId, name, secretsUtils.getSecretLabels(instanceId));
-        return addNewSecretVersion(projectId, instanceId, secret, paramSpec, secretValue);
+        if (checkResponse(secretValue, paramSpec)) {
+            const secret = await secretManagerApi.createSecret(projectId, name, secretsUtils.getSecretLabels(instanceId));
+            return addNewSecretVersion(projectId, instanceId, secret, paramSpec, secretValue);
+        }
+        else {
+            return promptCreateSecret(projectId, instanceId, paramSpec, name);
+        }
+    }
+    else {
+        return "";
     }
-    return secretValue;
 }
 exports.promptCreateSecret = promptCreateSecret;
 async function generateSecretName(projectId, instanceId, paramName) {

package/lib/extensions/emulator/triggerHelper.js

@@ -9,6 +9,7 @@ function functionResourceToEmulatedTriggerDefintion(resource) {
     const etd = {
         name: resource.name,
         entryPoint: resource.name,
+        platform: "gcfv1",
     };
     const properties = _.get(resource, "properties", {});
     if (properties.timeout) {

package/lib/functions/env.js

@@ -32,11 +32,11 @@ const RESERVED_KEYS = [
 const LINE_RE = new RegExp("^" +
     "\\s*" +
     "(\\w+)" +
-    "\\s*=\\s*" +
+    "\\s*=[\\f\\t\\v]*" +
     "(" +
     "\\s*'(?:\\\\'|[^'])*'|" +
     '\\s*"(?:\\\\"|[^"])*"|' +
-    "[^#\\r\\n]+" +
+    "[^#\\r\\n]*" +
     ")?" +
     "\\s*" +
     "(?:#[^\\n]*)?" +

package/lib/init/features/functions/index.js

@@ -5,7 +5,7 @@ const logger_1 = require("../../../logger");
 const prompt_1 = require("../../../prompt");
 const requirePermissions_1 = require("../../../requirePermissions");
 const previews_1 = require("../../../previews");
-const ensureApiEnabled = require("../../../ensureApiEnabled");
+const ensureApiEnabled_1 = require("../../../ensureApiEnabled");
 module.exports = async function (setup, config, options) {
     var _a, _b;
     logger_1.logger.info();
@@ -17,8 +17,8 @@ module.exports = async function (setup, config, options) {
     if (projectId) {
         await requirePermissions_1.requirePermissions(Object.assign(Object.assign({}, options), { project: projectId }));
         await Promise.all([
-            ensureApiEnabled.enable(projectId, "cloudfunctions.googleapis.com"),
-            ensureApiEnabled.enable(projectId, "runtimeconfig.googleapis.com"),
+            ensureApiEnabled_1.ensure(projectId, "cloudfunctions.googleapis.com", "unused", true),
+            ensureApiEnabled_1.ensure(projectId, "runtimeconfig.googleapis.com", "unused", true),
         ]);
     }
     const choices = [

package/lib/init/features/hosting/github.js

@@ -31,6 +31,9 @@ async function initGitHub(setup, config, options) {
     if (!setup.projectId) {
         return utils_1.reject("Could not determine Project ID, can't set up GitHub workflow.", { exit: 1 });
     }
+    if (!setup.config.hosting) {
+        return utils_1.reject(`Didn't find a Hosting config in firebase.json. Run ${cli_color_1.bold("firebase init hosting")} instead.`);
+    }
     logger_1.logger.info();
     const gitRoot = getGitFolderPath();
     GIT_DIR = path.join(gitRoot, ".git");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "9.23.1",
+  "version": "9.23.2",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -94,7 +94,7 @@
     "chokidar": "^3.0.2",
     "cjson": "^0.3.1",
     "cli-color": "^1.2.0",
-    "cli-table": "^0.3.8",
+    "cli-table": "0.3.11",
     "commander": "^4.0.1",
     "configstore": "^5.0.1",
     "cors": "^2.8.5",