From 2b470ecdb1942756211c3d7f201eb0d16e3e940c Mon Sep 17 00:00:00 2001
From: Joe Hanley <joehanley@google.com>
Date: Tue, 3 Dec 2024 09:56:48 -0800
Subject: [PATCH 1/6] Adding better error messaging when using non Firebase
 projects

---
 CHANGELOG.md                                  |  1 +
 src/command.ts                                | 26 ++++++++++++---
 src/commands/apphosting-backends-create.ts    |  1 +
 src/commands/apphosting-backends-delete.ts    |  1 +
 src/commands/apphosting-backends-get.ts       |  1 +
 src/commands/apphosting-backends-list.ts      |  1 +
 src/commands/apphosting-builds-create.ts      |  1 +
 src/commands/apphosting-builds-get.ts         |  1 +
 src/commands/apphosting-config-export.ts      |  1 +
 src/commands/apphosting-repos-create.ts       |  1 +
 src/commands/apphosting-rollouts-create.ts    |  1 +
 src/commands/apphosting-rollouts-list.ts      |  1 +
 src/commands/apphosting-secrets-access.ts     |  1 +
 src/commands/apphosting-secrets-describe.ts   |  1 +
 .../apphosting-secrets-grantaccess.ts         |  1 +
 src/commands/apphosting-secrets-set.ts        |  1 +
 src/commands/apps-android-sha-create.ts       |  2 +-
 src/commands/dataconnect-sdk-generate.ts      |  1 +
 src/commands/dataconnect-services-list.ts     |  1 +
 src/commands/dataconnect-sql-diff.ts          |  1 +
 src/commands/dataconnect-sql-grant.ts         |  1 +
 src/commands/dataconnect-sql-migrate.ts       |  1 +
 src/commands/dataconnect-sql-shell.ts         |  1 +
 src/commands/deploy.ts                        | 33 ++++++++++++++++---
 src/commands/emulators-exec.ts                |  1 +
 src/commands/emulators-export.ts              |  1 +
 src/commands/emulators-start.ts               |  1 +
 src/commands/experimental-functions-shell.ts  |  1 +
 src/commands/experiments-describe.ts          |  1 +
 src/commands/experiments-disable.ts           |  1 +
 src/commands/experiments-enable.ts            |  1 +
 src/commands/experiments-list.ts              |  1 +
 src/commands/firestore-backups-delete.ts      |  1 +
 src/commands/firestore-backups-get.ts         |  1 +
 src/commands/firestore-backups-list.ts        |  1 +
 .../firestore-backups-schedules-create.ts     |  1 +
 .../firestore-backups-schedules-delete.ts     |  1 +
 .../firestore-backups-schedules-list.ts       |  1 +
 .../firestore-backups-schedules-update.ts     |  1 +
 src/commands/firestore-databases-create.ts    |  1 +
 src/commands/firestore-databases-delete.ts    |  1 +
 src/commands/firestore-databases-get.ts       |  1 +
 src/commands/firestore-databases-list.ts      |  1 +
 src/commands/firestore-databases-restore.ts   |  1 +
 src/commands/firestore-databases-update.ts    |  1 +
 src/commands/firestore-delete.ts              |  1 +
 src/commands/firestore-indexes-list.ts        |  1 +
 src/commands/firestore-locations.ts           |  1 +
 src/commands/functions-config-export.ts       |  1 +
 src/commands/functions-shell.ts               |  1 +
 src/commands/help.ts                          |  1 +
 src/commands/init.ts                          |  1 +
 src/commands/login-add.ts                     |  1 +
 src/commands/login-ci.ts                      |  1 +
 src/commands/login-list.ts                    |  1 +
 src/commands/login-use.ts                     |  1 +
 src/commands/login.ts                         |  1 +
 src/commands/logout.ts                        |  1 +
 src/commands/open.ts                          |  1 +
 src/commands/projects-addfirebase.ts          |  1 +
 src/commands/projects-create.ts               |  1 +
 src/commands/projects-list.ts                 |  1 +
 src/commands/serve.ts                         |  1 +
 src/commands/setup-emulators-database.ts      |  1 +
 src/commands/setup-emulators-dataconnect.ts   |  1 +
 src/commands/setup-emulators-firestore.ts     |  1 +
 src/commands/setup-emulators-pubsub.ts        |  1 +
 src/commands/setup-emulators-storage.ts       |  1 +
 src/commands/setup-emulators-ui.ts            |  1 +
 src/commands/target-apply.ts                  |  1 +
 src/commands/target-clear.ts                  |  1 +
 src/commands/target-remove.ts                 |  1 +
 src/commands/target.ts                        |  1 +
 src/commands/use.ts                           |  1 +
 src/filterTargets.ts                          |  6 ++--
 src/management/projects.ts                    | 21 ++++++++++++
 src/options.ts                                | 12 ++++++-
 src/utils.ts                                  |  9 +++++
 78 files changed, 166 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e2248731e4..d6b7f8aa075 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,2 +1,3 @@
 - Added default value for `emulators.dataconnect.dataDir` to `init dataconnect`.
 - Fixed an issue where `firebase` would error out instead of displaying help text.
+- Improved error messaging when using a project that does not have Firebase enabled.
diff --git a/src/command.ts b/src/command.ts
index 68b045e5f3e..20390942c58 100644
--- a/src/command.ts
+++ b/src/command.ts
@@ -10,7 +10,11 @@ import { configstore } from "./configstore";
 import { detectProjectRoot } from "./detectProjectRoot";
 import { trackEmulator, trackGA4 } from "./track";
 import { selectAccount, setActiveAccount } from "./auth";
-import { getProject } from "./management/projects";
+import {
+  getProject,
+  isFirebaseProject,
+  printMigrateToFirebaseMessage,
+} from "./management/projects";
 import { requireAuth } from "./requireAuth";
 import { Options } from "./options";
 
@@ -38,6 +42,7 @@ export class Command {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   private options: any[][] = [];
   private aliases: string[] = [];
+  private firebaseRequired = true;
   private actionFn: ActionFunction = (): void => {
     // noop by default, unless overwritten by `.action(fn)`.
   };
@@ -99,6 +104,15 @@ export class Command {
     return this;
   }
 
+  /**
+   * This command is safe to run on Cloud projects that do not have Firebase enabled.
+   * @returns
+   */
+  firebaseNotRequired(): Command {
+    this.firebaseRequired = false;
+    return this;
+  }
+
   /**
    * Attaches a function to run before the command's action function.
    * @param fn the function to run.
@@ -291,7 +305,7 @@ export class Command {
    * @param options the command options object.
    */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  public async prepare(options: any): Promise<void> {
+  public async prepare(options: any): Promise<Options> {
     options = options || {};
     options.project = getInheritedOption(options, "project");
 
@@ -342,6 +356,7 @@ export class Command {
       await this.resolveProjectIdentifiers(options);
       validateProjectId(options.projectId);
     }
+    return options as Options;
   }
 
   /**
@@ -415,12 +430,15 @@ export class Command {
         args.splice(args.length - 1, 0, "");
       }
 
-      const options = last(args);
-      await this.prepare(options);
+      const options = await this.prepare(last(args));
 
       for (const before of this.befores) {
         await before.fn(options, ...before.args);
       }
+      if (this.firebaseRequired && options.project && !(await isFirebaseProject(options.project))) {
+        printMigrateToFirebaseMessage(options.project);
+        throw new FirebaseError("This command requires your project to be migrated to Firebase.");
+      }
       return this.actionFn(...args);
     };
   }
diff --git a/src/commands/apphosting-backends-create.ts b/src/commands/apphosting-backends-create.ts
index 440870fe853..2f364434d2b 100644
--- a/src/commands/apphosting-backends-create.ts
+++ b/src/commands/apphosting-backends-create.ts
@@ -9,6 +9,7 @@ import { requireTosAcceptance } from "../requireTosAcceptance";
 
 export const command = new Command("apphosting:backends:create")
   .description("create a Firebase App Hosting backend")
+  .firebaseNotRequired()
   .option(
     "-a, --app <webAppId>",
     "specify an existing Firebase web app's ID to associate your App Hosting backend with",
diff --git a/src/commands/apphosting-backends-delete.ts b/src/commands/apphosting-backends-delete.ts
index d6caed07346..06015741a84 100644
--- a/src/commands/apphosting-backends-delete.ts
+++ b/src/commands/apphosting-backends-delete.ts
@@ -15,6 +15,7 @@ import * as ora from "ora";
 
 export const command = new Command("apphosting:backends:delete <backend>")
   .description("delete a Firebase App Hosting backend")
+  .firebaseNotRequired()
   .option("-l, --location <location>", "specify the location of the backend", "-")
   .withForce()
   .before(apphosting.ensureApiEnabled)
diff --git a/src/commands/apphosting-backends-get.ts b/src/commands/apphosting-backends-get.ts
index c4f5f1dd083..a21d132f311 100644
--- a/src/commands/apphosting-backends-get.ts
+++ b/src/commands/apphosting-backends-get.ts
@@ -8,6 +8,7 @@ import { printBackendsTable } from "./apphosting-backends-list";
 
 export const command = new Command("apphosting:backends:get <backend>")
   .description("print info about a Firebase App Hosting backend")
+  .firebaseNotRequired()
   .option("-l, --location <location>", "backend location", "-")
   .before(apphosting.ensureApiEnabled)
   .action(async (backend: string, options: Options) => {
diff --git a/src/commands/apphosting-backends-list.ts b/src/commands/apphosting-backends-list.ts
index 0b583e2d602..d7caaa1d63d 100644
--- a/src/commands/apphosting-backends-list.ts
+++ b/src/commands/apphosting-backends-list.ts
@@ -11,6 +11,7 @@ const TABLE_HEAD = ["Backend", "Repository", "URL", "Location", "Updated Date"];
 
 export const command = new Command("apphosting:backends:list")
   .description("list Firebase App Hosting backends")
+  .firebaseNotRequired()
   .option("-l, --location <location>", "list backends in the specified location", "-")
   .before(apphosting.ensureApiEnabled)
   .action(async (options: Options) => {
diff --git a/src/commands/apphosting-builds-create.ts b/src/commands/apphosting-builds-create.ts
index 2050917c92f..084af5ba707 100644
--- a/src/commands/apphosting-builds-create.ts
+++ b/src/commands/apphosting-builds-create.ts
@@ -6,6 +6,7 @@ import { needProjectId } from "../projectUtils";
 
 export const command = new Command("apphosting:builds:create <backendId>")
   .description("create a build for an App Hosting backend")
+  .firebaseNotRequired()
   .option("-l, --location <location>", "specify the region of the backend", "us-central1")
   .option("-i, --id <buildId>", "id of the build (defaults to autogenerating a random id)", "")
   .option("-b, --branch <branch>", "repository branch to deploy (defaults to 'main')", "main")
diff --git a/src/commands/apphosting-builds-get.ts b/src/commands/apphosting-builds-get.ts
index 1889b50029c..6a050cde33b 100644
--- a/src/commands/apphosting-builds-get.ts
+++ b/src/commands/apphosting-builds-get.ts
@@ -6,6 +6,7 @@ import { needProjectId } from "../projectUtils";
 
 export const command = new Command("apphosting:builds:get <backendId> <buildId>")
   .description("get a build for an App Hosting backend")
+  .firebaseNotRequired()
   .option("-l, --location <location>", "specify the region of the backend", "us-central1")
   .before(apphosting.ensureApiEnabled)
   .action(async (backendId: string, buildId: string, options: Options) => {
diff --git a/src/commands/apphosting-config-export.ts b/src/commands/apphosting-config-export.ts
index 7cb3351c5d4..18c54b7f469 100644
--- a/src/commands/apphosting-config-export.ts
+++ b/src/commands/apphosting-config-export.ts
@@ -12,6 +12,7 @@ export const command = new Command("apphosting:config:export")
   .description(
     "Export App Hosting configurations such as secrets into an apphosting.local.yaml file",
   )
+  .firebaseNotRequired()
   .option(
     "-s, --secrets <apphosting.yaml or apphosting.<environment>.yaml file to export secrets from>",
     "This command combines the base apphosting.yaml with the specified environment-specific file (e.g., apphosting.staging.yaml). If keys conflict, the environment-specific file takes precedence.",
diff --git a/src/commands/apphosting-repos-create.ts b/src/commands/apphosting-repos-create.ts
index e361a35b8bc..7f4f80c7b0b 100644
--- a/src/commands/apphosting-repos-create.ts
+++ b/src/commands/apphosting-repos-create.ts
@@ -9,6 +9,7 @@ import { requireTosAcceptance } from "../requireTosAcceptance";
 
 export const command = new Command("apphosting:repos:create")
   .description("create a Firebase App Hosting Developer Connect Git Repository Link")
+  .firebaseNotRequired()
   .option("-l, --location <location>", "specify the location of the backend", "")
   .option("-g, --gitconnection <connection>", "id of the connection", "")
   .before(ensureApiEnabled)
diff --git a/src/commands/apphosting-rollouts-create.ts b/src/commands/apphosting-rollouts-create.ts
index 5b827aa0f2b..8a97408f81d 100644
--- a/src/commands/apphosting-rollouts-create.ts
+++ b/src/commands/apphosting-rollouts-create.ts
@@ -7,6 +7,7 @@ import { createRollout } from "../apphosting/rollout";
 
 export const command = new Command("apphosting:rollouts:create <backendId>")
   .description("create a rollout using a build for an App Hosting backend")
+  .firebaseNotRequired()
   .option("-l, --location <location>", "specify the region of the backend", "-")
   .option(
     "-b, --git-branch <gitBranch>",
diff --git a/src/commands/apphosting-rollouts-list.ts b/src/commands/apphosting-rollouts-list.ts
index 5e3ac8c5350..2aa8369c9f1 100644
--- a/src/commands/apphosting-rollouts-list.ts
+++ b/src/commands/apphosting-rollouts-list.ts
@@ -6,6 +6,7 @@ import { needProjectId } from "../projectUtils";
 
 export const command = new Command("apphosting:rollouts:list <backendId>")
   .description("list rollouts of an App Hosting backend")
+  .firebaseNotRequired()
   .option(
     "-l, --location <location>",
     "region of the rollouts (defaults to listing rollouts from all regions)",
diff --git a/src/commands/apphosting-secrets-access.ts b/src/commands/apphosting-secrets-access.ts
index ecd5d539e7e..f9fd4325655 100644
--- a/src/commands/apphosting-secrets-access.ts
+++ b/src/commands/apphosting-secrets-access.ts
@@ -11,6 +11,7 @@ export const command = new Command("apphosting:secrets:access <secretName[@versi
   .description(
     "Access secret value given secret and its version. Defaults to accessing the latest version.",
   )
+  .firebaseNotRequired()
   .before(requireAuth)
   .before(secretManager.ensureApi)
   .before(requirePermissions, ["secretmanager.versions.access"])
diff --git a/src/commands/apphosting-secrets-describe.ts b/src/commands/apphosting-secrets-describe.ts
index 7abafafa8ef..1aa97a73c4d 100644
--- a/src/commands/apphosting-secrets-describe.ts
+++ b/src/commands/apphosting-secrets-describe.ts
@@ -11,6 +11,7 @@ const Table = require("cli-table");
 
 export const command = new Command("apphosting:secrets:describe <secretName>")
   .description("Get metadata for secret and its versions.")
+  .firebaseNotRequired()
   .before(requireAuth)
   .before(secretManager.ensureApi)
   .before(requirePermissions, ["secretmanager.secrets.get"])
diff --git a/src/commands/apphosting-secrets-grantaccess.ts b/src/commands/apphosting-secrets-grantaccess.ts
index 8d6c7da4134..5f5ff9a8e5e 100644
--- a/src/commands/apphosting-secrets-grantaccess.ts
+++ b/src/commands/apphosting-secrets-grantaccess.ts
@@ -11,6 +11,7 @@ import { getBackendForAmbiguousLocation } from "../apphosting/backend";
 
 export const command = new Command("apphosting:secrets:grantaccess <secretName>")
   .description("grant service accounts permissions to the provided secret")
+  .firebaseNotRequired()
   .option("-l, --location <location>", "backend location", "-")
   .option("-b, --backend <backend>", "backend name")
   .before(requireAuth)
diff --git a/src/commands/apphosting-secrets-set.ts b/src/commands/apphosting-secrets-set.ts
index 390181afbb6..372bbf40d88 100644
--- a/src/commands/apphosting-secrets-set.ts
+++ b/src/commands/apphosting-secrets-set.ts
@@ -14,6 +14,7 @@ import * as utils from "../utils";
 
 export const command = new Command("apphosting:secrets:set <secretName>")
   .description("create or update a secret for use in Firebase App Hosting")
+  .firebaseNotRequired()
   .option("-l, --location <location>", "optional location to retrict secret replication")
   // TODO: What is the right --force behavior for granting access? Seems correct to grant permissions
   // if there is only one set of accounts, but should maybe fail if there are more than one set of
diff --git a/src/commands/apps-android-sha-create.ts b/src/commands/apps-android-sha-create.ts
index 5103374f4f3..ae73eae9952 100644
--- a/src/commands/apps-android-sha-create.ts
+++ b/src/commands/apps-android-sha-create.ts
@@ -29,7 +29,7 @@ export const command = new Command("apps:android:sha:create <appId> <shaHash>")
           }),
         `Creating Android SHA certificate ${clc.bold(
           options.shaHash,
-        )}with Android app Id ${clc.bold(appId)}`,
+        )} with Android app Id ${clc.bold(appId)}`,
       );
 
       return shaCertificate;
diff --git a/src/commands/dataconnect-sdk-generate.ts b/src/commands/dataconnect-sdk-generate.ts
index 8892471e185..9dba61ce68d 100644
--- a/src/commands/dataconnect-sdk-generate.ts
+++ b/src/commands/dataconnect-sdk-generate.ts
@@ -12,6 +12,7 @@ type GenerateOptions = Options & { watch?: boolean };
 
 export const command = new Command("dataconnect:sdk:generate")
   .description("generates typed SDKs for your Data Connect connectors")
+  .firebaseNotRequired()
   .option(
     "--watch",
     "watch for changes to your connector GQL files and regenerate your SDKs when updates occur",
diff --git a/src/commands/dataconnect-services-list.ts b/src/commands/dataconnect-services-list.ts
index b0e5a3c2da4..7922176639d 100644
--- a/src/commands/dataconnect-services-list.ts
+++ b/src/commands/dataconnect-services-list.ts
@@ -10,6 +10,7 @@ const Table = require("cli-table");
 
 export const command = new Command("dataconnect:services:list")
   .description("list all deployed services in your Firebase project")
+  .firebaseNotRequired()
   .before(requirePermissions, [
     "dataconnect.services.list",
     "dataconnect.schemas.list",
diff --git a/src/commands/dataconnect-sql-diff.ts b/src/commands/dataconnect-sql-diff.ts
index cd8e68682f1..bf300add65a 100644
--- a/src/commands/dataconnect-sql-diff.ts
+++ b/src/commands/dataconnect-sql-diff.ts
@@ -11,6 +11,7 @@ export const command = new Command("dataconnect:sql:diff [serviceId]")
   .description(
     "displays the differences between  a local DataConnect schema and your CloudSQL database's current schema",
   )
+  .firebaseNotRequired()
   .before(requirePermissions, [
     "firebasedataconnect.services.list",
     "firebasedataconnect.schemas.list",
diff --git a/src/commands/dataconnect-sql-grant.ts b/src/commands/dataconnect-sql-grant.ts
index 95899de25b3..2a6b0c222ce 100644
--- a/src/commands/dataconnect-sql-grant.ts
+++ b/src/commands/dataconnect-sql-grant.ts
@@ -13,6 +13,7 @@ const allowedRoles = Object.keys(fdcSqlRoleMap);
 
 export const command = new Command("dataconnect:sql:grant [serviceId]")
   .description("Grants the SQL role <role> to the provided user or service account <email>.")
+  .firebaseNotRequired()
   .option("-R, --role <role>", "The SQL role to grant. One of: owner, writer, or reader.")
   .option(
     "-E, --email <email>",
diff --git a/src/commands/dataconnect-sql-migrate.ts b/src/commands/dataconnect-sql-migrate.ts
index 5aa1f23558c..a1226d58841 100644
--- a/src/commands/dataconnect-sql-migrate.ts
+++ b/src/commands/dataconnect-sql-migrate.ts
@@ -11,6 +11,7 @@ import { logLabeledSuccess } from "../utils";
 
 export const command = new Command("dataconnect:sql:migrate [serviceId]")
   .description("migrates your CloudSQL database's schema to match your local DataConnect schema")
+  .firebaseNotRequired()
   .before(requirePermissions, [
     "firebasedataconnect.services.list",
     "firebasedataconnect.schemas.list",
diff --git a/src/commands/dataconnect-sql-shell.ts b/src/commands/dataconnect-sql-shell.ts
index 9055267d6a5..1c4cf0aee89 100644
--- a/src/commands/dataconnect-sql-shell.ts
+++ b/src/commands/dataconnect-sql-shell.ts
@@ -86,6 +86,7 @@ async function mainShellLoop(conn: pg.PoolClient) {
 
 export const command = new Command("dataconnect:sql:shell [serviceId]")
   .description("Starts a shell connected directly to your dataconnect cloudsql instance.")
+  .firebaseNotRequired()
   .before(requirePermissions, ["firebasedataconnect.services.list", "cloudsql.instances.connect"])
   .before(requireAuth)
   .action(async (serviceId: string, options: Options) => {
diff --git a/src/commands/deploy.ts b/src/commands/deploy.ts
index 2d750c9a470..69ebee2296c 100644
--- a/src/commands/deploy.ts
+++ b/src/commands/deploy.ts
@@ -12,6 +12,9 @@ import { FirebaseError } from "../error";
 import { bold } from "colorette";
 import { interactiveCreateHostingSite } from "../hosting/interactive";
 import { logBullet } from "../utils";
+import { Options } from "../options";
+import { needProjectId } from "../projectUtils";
+import { isFirebaseProject, printMigrateToFirebaseMessage } from "../management/projects";
 
 // in order of least time-consuming to most time-consuming
 export const VALID_DEPLOY_TARGETS = [
@@ -74,6 +77,7 @@ export const TARGET_PERMISSIONS: Record<(typeof VALID_DEPLOY_TARGETS)[number], s
 
 export const command = new Command("deploy")
   .description("deploy code and assets to your Firebase project")
+  .firebaseNotRequired()
   .withForce(
     "delete Cloud Functions missing from the current working directory and bypass interactive prompts",
   )
@@ -97,19 +101,38 @@ export const command = new Command("deploy")
       "In order to provide better validation, this may still enable APIs on the target project.",
   )
   .before(requireConfig)
-  .before((options) => {
+  .before((options: Options) => {
     options.filteredTargets = filterTargets(options, VALID_DEPLOY_TARGETS);
     const permissions = options.filteredTargets.reduce((perms: string[], target: string) => {
       return perms.concat(TARGET_PERMISSIONS[target]);
     }, []);
     return requirePermissions(options, permissions);
   })
-  .before((options) => {
+  .before(async (options: Options) => {
+    if (
+      options.filteredTargets.includes("database") ||
+      options.filteredTargets.includes("extensions") ||
+      options.filteredTargets.includes("functions") ||
+      options.filteredTargets.includes("hosting") ||
+      options.filteredTargets.includes("remoteconfig") ||
+      options.filteredTargets.includes("storage")
+    ) {
+      const projectId = needProjectId(options);
+      if (!(await isFirebaseProject(projectId))) {
+        printMigrateToFirebaseMessage(projectId);
+        throw new FirebaseError(
+          "Some of the products in this deployment require this project to be migrated to Firebase.",
+        );
+      }
+    }
+  })
+  .before((options: Options) => {
     if (options.filteredTargets.includes("functions")) {
-      return checkServiceAccountIam(options.project);
+      const projectId = needProjectId(options);
+      return checkServiceAccountIam(projectId);
     }
   })
-  .before(async (options) => {
+  .before(async (options: Options) => {
     // only fetch the default instance for hosting or database deploys
     if (options.filteredTargets.includes("database")) {
       await requireDatabaseInstance(options);
@@ -145,6 +168,6 @@ export const command = new Command("deploy")
     }
   })
   .before(checkValidTargetFilters)
-  .action((options) => {
+  .action((options: Options) => {
     return deploy(options.filteredTargets, options);
   });
diff --git a/src/commands/emulators-exec.ts b/src/commands/emulators-exec.ts
index 6c023cbe098..71aeecdd0af 100644
--- a/src/commands/emulators-exec.ts
+++ b/src/commands/emulators-exec.ts
@@ -8,6 +8,7 @@ export const command = new Command("emulators:exec <script>")
   .description(
     "start the local Firebase emulators, " + "run a test script, then shut down the emulators",
   )
+  .firebaseNotRequired()
   .option(commandUtils.FLAG_ONLY, commandUtils.DESC_ONLY)
   .option(commandUtils.FLAG_INSPECT_FUNCTIONS, commandUtils.DESC_INSPECT_FUNCTIONS)
   .option(commandUtils.FLAG_IMPORT, commandUtils.DESC_IMPORT)
diff --git a/src/commands/emulators-export.ts b/src/commands/emulators-export.ts
index e54f22db882..d3a0d618a61 100644
--- a/src/commands/emulators-export.ts
+++ b/src/commands/emulators-export.ts
@@ -5,6 +5,7 @@ import * as commandUtils from "../emulator/commandUtils";
 const COMMAND_NAME = "emulators:export";
 export const command = new Command(`${COMMAND_NAME} <path>`)
   .description("export data from running emulators")
+  .firebaseNotRequired()
   .withForce("overwrite any export data in the target directory")
   .option(commandUtils.FLAG_ONLY, commandUtils.DESC_ONLY)
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/src/commands/emulators-start.ts b/src/commands/emulators-start.ts
index eddc62fa06c..cd13086a26d 100644
--- a/src/commands/emulators-start.ts
+++ b/src/commands/emulators-start.ts
@@ -22,6 +22,7 @@ export const command = new Command("emulators:start")
   .before(commandUtils.setExportOnExitOptions)
   .before(commandUtils.beforeEmulatorCommand)
   .description("start the local Firebase emulators")
+  .firebaseNotRequired()
   .option(commandUtils.FLAG_ONLY, commandUtils.DESC_ONLY)
   .option(commandUtils.FLAG_INSPECT_FUNCTIONS, commandUtils.DESC_INSPECT_FUNCTIONS)
   .option(commandUtils.FLAG_IMPORT, commandUtils.DESC_IMPORT)
diff --git a/src/commands/experimental-functions-shell.ts b/src/commands/experimental-functions-shell.ts
index b36e889974a..17c94ad4d00 100644
--- a/src/commands/experimental-functions-shell.ts
+++ b/src/commands/experimental-functions-shell.ts
@@ -7,6 +7,7 @@ export const command = new Command("experimental:functions:shell")
   .description(
     "launch full Node shell with emulated functions. (Alias for `firebase functions:shell.)",
   )
+  .firebaseNotRequired()
   .option("-p, --port <port>", "the port on which to emulate functions (default: 5000)", 5000)
   .before(requireConfig)
   .before(requirePermissions)
diff --git a/src/commands/experiments-describe.ts b/src/commands/experiments-describe.ts
index f712131c57f..7c25b674aec 100644
--- a/src/commands/experiments-describe.ts
+++ b/src/commands/experiments-describe.ts
@@ -8,6 +8,7 @@ import { last } from "../utils";
 
 export const command = new Command("experiments:describe <experiment>")
   .description("describe what an experiment does when enabled")
+  .firebaseNotRequired()
   .action((experiment: string) => {
     if (!experiments.isValidExperiment(experiment)) {
       let message = `Cannot find experiment ${bold(experiment)}`;
diff --git a/src/commands/experiments-disable.ts b/src/commands/experiments-disable.ts
index 02963a8e169..d8f7805dc75 100644
--- a/src/commands/experiments-disable.ts
+++ b/src/commands/experiments-disable.ts
@@ -8,6 +8,7 @@ import { last } from "../utils";
 
 export const command = new Command("experiments:disable <experiment>")
   .description("disable an experiment on this machine")
+  .firebaseNotRequired()
   .action((experiment: string) => {
     if (experiments.isValidExperiment(experiment)) {
       experiments.setEnabled(experiment, false);
diff --git a/src/commands/experiments-enable.ts b/src/commands/experiments-enable.ts
index e0d999eee95..d8dceda6442 100644
--- a/src/commands/experiments-enable.ts
+++ b/src/commands/experiments-enable.ts
@@ -8,6 +8,7 @@ import { last } from "../utils";
 
 export const command = new Command("experiments:enable <experiment>")
   .description("enable an experiment on this machine")
+  .firebaseNotRequired()
   .action((experiment: string) => {
     if (experiments.isValidExperiment(experiment)) {
       experiments.setEnabled(experiment, true);
diff --git a/src/commands/experiments-list.ts b/src/commands/experiments-list.ts
index e546fe6bca5..b5737d2821b 100644
--- a/src/commands/experiments-list.ts
+++ b/src/commands/experiments-list.ts
@@ -8,6 +8,7 @@ export const command = new Command("experiments:list")
   .description(
     "list all experiments, along with a description of each experiment and whether it is currently enabled",
   )
+  .firebaseNotRequired()
   .action(() => {
     const table = new Table({
       head: ["Enabled", "Name", "Description"],
diff --git a/src/commands/firestore-backups-delete.ts b/src/commands/firestore-backups-delete.ts
index 8e36c62e527..81aa68a22c8 100644
--- a/src/commands/firestore-backups-delete.ts
+++ b/src/commands/firestore-backups-delete.ts
@@ -12,6 +12,7 @@ import { FirebaseError } from "../error";
 export const command = new Command("firestore:backups:delete <backup>")
   .description("Delete a backup under your Cloud Firestore database.")
   .option("--force", "Attempt to delete backup without prompting for confirmation.")
+  .firebaseNotRequired()
   .before(requirePermissions, ["datastore.backups.delete"])
   .before(warnEmulatorNotSupported, Emulators.FIRESTORE)
   .action(async (backupName: string, options: FirestoreOptions) => {
diff --git a/src/commands/firestore-backups-get.ts b/src/commands/firestore-backups-get.ts
index 845ffd4bf4d..cbe38a7de7f 100644
--- a/src/commands/firestore-backups-get.ts
+++ b/src/commands/firestore-backups-get.ts
@@ -9,6 +9,7 @@ import { PrettyPrint } from "../firestore/pretty-print";
 
 export const command = new Command("firestore:backups:get <backup>")
   .description("Get a Cloud Firestore database backup.")
+  .firebaseNotRequired()
   .before(requirePermissions, ["datastore.backups.get"])
   .before(warnEmulatorNotSupported, Emulators.FIRESTORE)
   .action(async (backupName: string, options: FirestoreOptions) => {
diff --git a/src/commands/firestore-backups-list.ts b/src/commands/firestore-backups-list.ts
index 4a9cba0c405..08103384262 100644
--- a/src/commands/firestore-backups-list.ts
+++ b/src/commands/firestore-backups-list.ts
@@ -10,6 +10,7 @@ import { PrettyPrint } from "../firestore/pretty-print";
 
 export const command = new Command("firestore:backups:list")
   .description("List all Cloud Firestore backups in a given location")
+  .firebaseNotRequired()
   .option(
     "-l, --location <locationId>",
     "Location to search for backups, for example 'nam5'. Run 'firebase firestore:locations' to get a list of eligible locations. Defaults to all locations.",
diff --git a/src/commands/firestore-backups-schedules-create.ts b/src/commands/firestore-backups-schedules-create.ts
index 723ac6520e3..8d8888a58a5 100644
--- a/src/commands/firestore-backups-schedules-create.ts
+++ b/src/commands/firestore-backups-schedules-create.ts
@@ -19,6 +19,7 @@ import { FirebaseError } from "../error";
 
 export const command = new Command("firestore:backups:schedules:create")
   .description("Create a backup schedule under your Cloud Firestore database.")
+  .firebaseNotRequired()
   .option(
     "-d, --database <databaseId>",
     "Database under which you want to create a schedule. Defaults to the (default) database",
diff --git a/src/commands/firestore-backups-schedules-delete.ts b/src/commands/firestore-backups-schedules-delete.ts
index 81756db9854..ce4e4da6503 100644
--- a/src/commands/firestore-backups-schedules-delete.ts
+++ b/src/commands/firestore-backups-schedules-delete.ts
@@ -11,6 +11,7 @@ import { FirebaseError } from "../error";
 
 export const command = new Command("firestore:backups:schedules:delete <backupSchedule>")
   .description("Delete a backup schedule under your Cloud Firestore database.")
+  .firebaseNotRequired()
   .option("--force", "Attempt to delete backup schedule without prompting for confirmation.")
   .before(requirePermissions, ["datastore.backupSchedules.delete"])
   .before(warnEmulatorNotSupported, Emulators.FIRESTORE)
diff --git a/src/commands/firestore-backups-schedules-list.ts b/src/commands/firestore-backups-schedules-list.ts
index a69297ef1f4..7d81eacbfb0 100644
--- a/src/commands/firestore-backups-schedules-list.ts
+++ b/src/commands/firestore-backups-schedules-list.ts
@@ -9,6 +9,7 @@ import { PrettyPrint } from "../firestore/pretty-print";
 
 export const command = new Command("firestore:backups:schedules:list")
   .description("List backup schedules under your Cloud Firestore database.")
+  .firebaseNotRequired()
   .option(
     "-d, --database <databaseId>",
     "Database whose schedules you wish to list. Defaults to the (default) database.",
diff --git a/src/commands/firestore-backups-schedules-update.ts b/src/commands/firestore-backups-schedules-update.ts
index 11a6dd3748d..b11c83ec304 100644
--- a/src/commands/firestore-backups-schedules-update.ts
+++ b/src/commands/firestore-backups-schedules-update.ts
@@ -13,6 +13,7 @@ import { FirebaseError } from "../error";
 
 export const command = new Command("firestore:backups:schedules:update <backupSchedule>")
   .description("Update a backup schedule under your Cloud Firestore database.")
+  .firebaseNotRequired()
   .option("--retention <duration>", "duration string (e.g. 12h or 30d) for backup retention")
   .before(requirePermissions, ["datastore.backupSchedules.update"])
   .before(warnEmulatorNotSupported, Emulators.FIRESTORE)
diff --git a/src/commands/firestore-databases-create.ts b/src/commands/firestore-databases-create.ts
index 2967384f04b..b8c762a38f4 100644
--- a/src/commands/firestore-databases-create.ts
+++ b/src/commands/firestore-databases-create.ts
@@ -13,6 +13,7 @@ import { FirebaseError } from "../error";
 
 export const command = new Command("firestore:databases:create <database>")
   .description("Create a database in your Firebase project.")
+  .firebaseNotRequired()
   .option(
     "--location <locationId>",
     "Region to create database, for example 'nam5'. Run 'firebase firestore:locations' to get a list of eligible locations. (required)",
diff --git a/src/commands/firestore-databases-delete.ts b/src/commands/firestore-databases-delete.ts
index 60e0358aae2..c9e91b39424 100644
--- a/src/commands/firestore-databases-delete.ts
+++ b/src/commands/firestore-databases-delete.ts
@@ -16,6 +16,7 @@ export const command = new Command("firestore:databases:delete <database>")
   .description(
     "Delete a database in your Cloud Firestore project. Database delete protection state must be disabled. To do so, use the update command: firebase firestore:databases:update <database> --delete-protection DISABLED",
   )
+  .firebaseNotRequired()
   .option("--force", "Attempt to delete database without prompting for confirmation.")
   .before(requirePermissions, ["datastore.databases.delete"])
   .before(warnEmulatorNotSupported, Emulators.FIRESTORE)
diff --git a/src/commands/firestore-databases-get.ts b/src/commands/firestore-databases-get.ts
index 88888b451f5..129779012fd 100644
--- a/src/commands/firestore-databases-get.ts
+++ b/src/commands/firestore-databases-get.ts
@@ -10,6 +10,7 @@ import { PrettyPrint } from "../firestore/pretty-print";
 
 export const command = new Command("firestore:databases:get [database]")
   .description("Get database in your Cloud Firestore project.")
+  .firebaseNotRequired()
   .before(requirePermissions, ["datastore.databases.get"])
   .before(warnEmulatorNotSupported, Emulators.FIRESTORE)
   .action(async (database: string, options: FirestoreOptions) => {
diff --git a/src/commands/firestore-databases-list.ts b/src/commands/firestore-databases-list.ts
index 6fb049624df..18a19220e95 100644
--- a/src/commands/firestore-databases-list.ts
+++ b/src/commands/firestore-databases-list.ts
@@ -10,6 +10,7 @@ import { PrettyPrint } from "../firestore/pretty-print";
 
 export const command = new Command("firestore:databases:list")
   .description("List databases in your Cloud Firestore project.")
+  .firebaseNotRequired()
   .before(requirePermissions, ["datastore.databases.list"])
   .before(warnEmulatorNotSupported, Emulators.FIRESTORE)
   .action(async (options: FirestoreOptions) => {
diff --git a/src/commands/firestore-databases-restore.ts b/src/commands/firestore-databases-restore.ts
index b526c532ede..bc69d87528d 100644
--- a/src/commands/firestore-databases-restore.ts
+++ b/src/commands/firestore-databases-restore.ts
@@ -13,6 +13,7 @@ import { FirebaseError } from "../error";
 
 export const command = new Command("firestore:databases:restore")
   .description("Restore a Firestore database in your Firebase project.")
+  .firebaseNotRequired()
   .option("-d, --database <databaseID>", "ID of the database to restore into")
   .option("-b, --backup <backup>", "Backup from which to restore")
   .option(
diff --git a/src/commands/firestore-databases-update.ts b/src/commands/firestore-databases-update.ts
index 6242a26e473..30077283cbf 100644
--- a/src/commands/firestore-databases-update.ts
+++ b/src/commands/firestore-databases-update.ts
@@ -15,6 +15,7 @@ export const command = new Command("firestore:databases:update <database>")
   .description(
     "Update a database in your Firebase project. Must specify at least one property to update.",
   )
+  .firebaseNotRequired()
   .option("--json", "Prints raw json response of the create API call if specified")
   .option(
     "--delete-protection <deleteProtectionState>",
diff --git a/src/commands/firestore-delete.ts b/src/commands/firestore-delete.ts
index e0e284620ad..a6a67e53c71 100644
--- a/src/commands/firestore-delete.ts
+++ b/src/commands/firestore-delete.ts
@@ -68,6 +68,7 @@ function confirmationMessage(deleteOp: FirestoreDelete, options: FirestoreOption
 
 export const command = new Command("firestore:delete [path]")
   .description("Delete data from Cloud Firestore.")
+  .firebaseNotRequired()
   .option(
     "-r, --recursive",
     "Recursive. Delete all documents and subcollections at and under the " +
diff --git a/src/commands/firestore-indexes-list.ts b/src/commands/firestore-indexes-list.ts
index 5076be27264..9125ede20c4 100644
--- a/src/commands/firestore-indexes-list.ts
+++ b/src/commands/firestore-indexes-list.ts
@@ -11,6 +11,7 @@ import { PrettyPrint } from "../firestore/pretty-print";
 
 export const command = new Command("firestore:indexes")
   .description("List indexes in your project's Cloud Firestore database.")
+  .firebaseNotRequired()
   .option(
     "--pretty",
     "Pretty print. When not specified the indexes are printed in the " +
diff --git a/src/commands/firestore-locations.ts b/src/commands/firestore-locations.ts
index 13e7e10e51e..de89ad8dc4b 100644
--- a/src/commands/firestore-locations.ts
+++ b/src/commands/firestore-locations.ts
@@ -10,6 +10,7 @@ import { PrettyPrint } from "../firestore/pretty-print";
 
 export const command = new Command("firestore:locations")
   .description("List possible locations for your Cloud Firestore project.")
+  .firebaseNotRequired()
   .before(requirePermissions, ["datastore.locations.list"])
   .before(warnEmulatorNotSupported, Emulators.FIRESTORE)
   .action(async (options: FirestoreOptions) => {
diff --git a/src/commands/functions-config-export.ts b/src/commands/functions-config-export.ts
index dd4e58c34ac..c2adff4d3d5 100644
--- a/src/commands/functions-config-export.ts
+++ b/src/commands/functions-config-export.ts
@@ -95,6 +95,7 @@ function fromEntries<V>(itr: Iterable<[string, V]>): Record<string, V> {
 
 export const command = new Command("functions:config:export")
   .description("Export environment config as environment variables in dotenv format")
+  .firebaseNotRequired()
   .before(requirePermissions, [
     "runtimeconfig.configs.list",
     "runtimeconfig.configs.get",
diff --git a/src/commands/functions-shell.ts b/src/commands/functions-shell.ts
index 7209b7480b0..b45f5338c29 100644
--- a/src/commands/functions-shell.ts
+++ b/src/commands/functions-shell.ts
@@ -6,6 +6,7 @@ import { DESC_INSPECT_FUNCTIONS, FLAG_INSPECT_FUNCTIONS } from "../emulator/comm
 
 export const command = new Command("functions:shell")
   .description("launch full Node shell with emulated functions")
+  .firebaseNotRequired()
   .option("-p, --port <port>", "the port on which to emulate functions")
   .option(FLAG_INSPECT_FUNCTIONS, DESC_INSPECT_FUNCTIONS)
   .before(requireConfig)
diff --git a/src/commands/help.ts b/src/commands/help.ts
index 175c24ff685..9dbc394fac2 100644
--- a/src/commands/help.ts
+++ b/src/commands/help.ts
@@ -7,6 +7,7 @@ import * as utils from "../utils";
 
 export const command = new Command("help [command]")
   .description("display help information")
+  .firebaseNotRequired()
   // This must stay `function (commandName)`.
   .action(function (commandName) {
     // @ts-ignore
diff --git a/src/commands/init.ts b/src/commands/init.ts
index 050fab4d3a1..b72f2bc3dd2 100644
--- a/src/commands/init.ts
+++ b/src/commands/init.ts
@@ -121,6 +121,7 @@ ${[...featureNames]
 
 export const command = new Command("init [feature]")
   .description(DESCRIPTION)
+  .firebaseNotRequired()
   .before(requireAuth)
   .action(initAction);
 
diff --git a/src/commands/login-add.ts b/src/commands/login-add.ts
index 23725a82ec7..c20ba918e1c 100644
--- a/src/commands/login-add.ts
+++ b/src/commands/login-add.ts
@@ -8,6 +8,7 @@ import * as auth from "../auth";
 
 export const command = new Command("login:add [email]")
   .description("authorize the CLI for an additional account")
+  .firebaseNotRequired()
   .option(
     "--no-localhost",
     "copy and paste a code instead of starting a local server for authentication",
diff --git a/src/commands/login-ci.ts b/src/commands/login-ci.ts
index aa3eb969e5b..60e69d50246 100644
--- a/src/commands/login-ci.ts
+++ b/src/commands/login-ci.ts
@@ -8,6 +8,7 @@ import * as utils from "../utils";
 
 export const command = new Command("login:ci")
   .description("generate an access token for use in non-interactive environments")
+  .firebaseNotRequired()
   .option(
     "--no-localhost",
     "copy and paste a code instead of starting a local server for authentication",
diff --git a/src/commands/login-list.ts b/src/commands/login-list.ts
index 41da77c60dc..4f43c91d3fd 100644
--- a/src/commands/login-list.ts
+++ b/src/commands/login-list.ts
@@ -8,6 +8,7 @@ import * as auth from "../auth";
 
 export const command = new Command("login:list")
   .description("list authorized CLI accounts")
+  .firebaseNotRequired()
   .action((options: any) => {
     const user = options.user as User | undefined;
     const allAccounts = auth.getAllAccounts();
diff --git a/src/commands/login-use.ts b/src/commands/login-use.ts
index 15ea0f04fbd..33a0bef8ca8 100644
--- a/src/commands/login-use.ts
+++ b/src/commands/login-use.ts
@@ -9,6 +9,7 @@ export const command = new Command("login:use <email>")
   .description(
     "set the default account to use for this project directory or the global default account if not in a Firebase project directory",
   )
+  .firebaseNotRequired()
   .action((email: string, options: any) => {
     const allAccounts = auth.getAllAccounts();
     const accountExists = allAccounts.some((a) => a.user.email === email);
diff --git a/src/commands/login.ts b/src/commands/login.ts
index c16d9a26c6c..d337c1675bf 100644
--- a/src/commands/login.ts
+++ b/src/commands/login.ts
@@ -13,6 +13,7 @@ import { User, Tokens } from "../types/auth";
 
 export const command = new Command("login")
   .description("log the CLI into Firebase")
+  .firebaseNotRequired()
   .option("--no-localhost", "login from a device without an accessible localhost")
   .option("--reauth", "force reauthentication even if already logged in")
   .action(async (options: any) => {
diff --git a/src/commands/logout.ts b/src/commands/logout.ts
index df31f7cbbab..53ab9470eb0 100644
--- a/src/commands/logout.ts
+++ b/src/commands/logout.ts
@@ -17,6 +17,7 @@ import {
 
 export const command = new Command("logout [email]")
   .description("log the CLI out of Firebase")
+  .firebaseNotRequired()
   .action(logoutAction);
 
 /**
diff --git a/src/commands/open.ts b/src/commands/open.ts
index c85a99a328a..b95c5079fcd 100644
--- a/src/commands/open.ts
+++ b/src/commands/open.ts
@@ -63,6 +63,7 @@ const CHOICES = LINKS.map((l) => l.name);
 
 export const command = new Command("open [link]")
   .description("quickly open a browser to relevant project resources")
+  .firebaseNotRequired()
   .before(requirePermissions)
   .before(requireDatabaseInstance)
   .before(requireHostingSite)
diff --git a/src/commands/projects-addfirebase.ts b/src/commands/projects-addfirebase.ts
index aa285dc7884..75efabbe150 100644
--- a/src/commands/projects-addfirebase.ts
+++ b/src/commands/projects-addfirebase.ts
@@ -6,6 +6,7 @@ import { requireAuth } from "../requireAuth";
 
 export const command = new Command("projects:addfirebase [projectId]")
   .description("add Firebase resources to a Google Cloud Platform project")
+  .firebaseNotRequired()
   .before(requireAuth)
   .action(async (projectId: string | undefined, options: any): Promise<FirebaseProjectMetadata> => {
     if (!options.nonInteractive && !projectId) {
diff --git a/src/commands/projects-create.ts b/src/commands/projects-create.ts
index 4c1e69c3fd3..8e739facf84 100644
--- a/src/commands/projects-create.ts
+++ b/src/commands/projects-create.ts
@@ -13,6 +13,7 @@ export const command = new Command("projects:create [projectId]")
   .description(
     "creates a new Google Cloud Platform project, then adds Firebase resources to the project",
   )
+  .firebaseNotRequired()
   .option("-n, --display-name <displayName>", "(optional) display name for the project")
   .option(
     "-o, --organization <organizationId>",
diff --git a/src/commands/projects-list.ts b/src/commands/projects-list.ts
index 007346abe7f..10d8e2f57f6 100644
--- a/src/commands/projects-list.ts
+++ b/src/commands/projects-list.ts
@@ -48,6 +48,7 @@ function logProjectCount(arr: FirebaseProjectMetadata[] = []): void {
 
 export const command = new Command("projects:list")
   .description("list all Firebase projects you have access to")
+  .firebaseNotRequired()
   .before(requireAuth)
   .action(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/src/commands/serve.ts b/src/commands/serve.ts
index 11553484af3..f7095b1c590 100644
--- a/src/commands/serve.ts
+++ b/src/commands/serve.ts
@@ -24,6 +24,7 @@ function filterOnly(list: string[], only = ""): string[] {
 
 export const command = new Command("serve")
   .description("start a local server for your static assets")
+  .firebaseNotRequired()
   .option("-p, --port <port>", "the port on which to listen (default: 5000)", 5000)
   .option("-o, --host <host>", "the host on which to listen (default: localhost)", "localhost")
   .option(
diff --git a/src/commands/setup-emulators-database.ts b/src/commands/setup-emulators-database.ts
index c559b76927f..694e6f796ba 100644
--- a/src/commands/setup-emulators-database.ts
+++ b/src/commands/setup-emulators-database.ts
@@ -6,6 +6,7 @@ const NAME = Emulators.DATABASE;
 
 export const command = new Command(`setup:emulators:${NAME}`)
   .description(`downloads the ${NAME} emulator`)
+  .firebaseNotRequired()
   .action(() => {
     return downloadEmulator(NAME);
   });
diff --git a/src/commands/setup-emulators-dataconnect.ts b/src/commands/setup-emulators-dataconnect.ts
index b678145a6c4..a3e6f561d5c 100644
--- a/src/commands/setup-emulators-dataconnect.ts
+++ b/src/commands/setup-emulators-dataconnect.ts
@@ -8,6 +8,7 @@ const NAME = Emulators.DATACONNECT;
 
 export const command = new Command(`setup:emulators:${NAME}`)
   .description(`downloads the ${NAME} emulator`)
+  .firebaseNotRequired()
   .action(async (options: Options) => {
     await downloadIfNecessary(NAME);
     if (!options.config) {
diff --git a/src/commands/setup-emulators-firestore.ts b/src/commands/setup-emulators-firestore.ts
index 81119bab092..11ee55f10ba 100644
--- a/src/commands/setup-emulators-firestore.ts
+++ b/src/commands/setup-emulators-firestore.ts
@@ -6,6 +6,7 @@ const NAME = Emulators.FIRESTORE;
 
 export const command = new Command(`setup:emulators:${NAME}`)
   .description(`downloads the ${NAME} emulator`)
+  .firebaseNotRequired()
   .action(() => {
     return downloadEmulator(NAME);
   });
diff --git a/src/commands/setup-emulators-pubsub.ts b/src/commands/setup-emulators-pubsub.ts
index 79bd76d0bbc..871a62f6609 100644
--- a/src/commands/setup-emulators-pubsub.ts
+++ b/src/commands/setup-emulators-pubsub.ts
@@ -6,6 +6,7 @@ const EMULATOR_NAME = Emulators.PUBSUB;
 
 export const command = new Command(`setup:emulators:${EMULATOR_NAME}`)
   .description(`downloads the ${EMULATOR_NAME} emulator`)
+  .firebaseNotRequired()
   .action(() => {
     return downloadEmulator(EMULATOR_NAME);
   });
diff --git a/src/commands/setup-emulators-storage.ts b/src/commands/setup-emulators-storage.ts
index 9d094035a25..e90e1b73b27 100644
--- a/src/commands/setup-emulators-storage.ts
+++ b/src/commands/setup-emulators-storage.ts
@@ -6,6 +6,7 @@ const EMULATOR_NAME = Emulators.STORAGE;
 
 export const command = new Command(`setup:emulators:${EMULATOR_NAME}`)
   .description(`downloads the ${EMULATOR_NAME} emulator`)
+  .firebaseNotRequired()
   .action(() => {
     return downloadEmulator(EMULATOR_NAME);
   });
diff --git a/src/commands/setup-emulators-ui.ts b/src/commands/setup-emulators-ui.ts
index a6ec04e7da6..930caf2def1 100644
--- a/src/commands/setup-emulators-ui.ts
+++ b/src/commands/setup-emulators-ui.ts
@@ -6,6 +6,7 @@ const NAME = Emulators.UI;
 
 export const command = new Command(`setup:emulators:${NAME}`)
   .description(`downloads the ${NAME} emulator`)
+  .firebaseNotRequired()
   .action(() => {
     return downloadEmulator(NAME);
   });
diff --git a/src/commands/target-apply.ts b/src/commands/target-apply.ts
index 466954c843e..74fb3cb1e03 100644
--- a/src/commands/target-apply.ts
+++ b/src/commands/target-apply.ts
@@ -8,6 +8,7 @@ import { FirebaseError } from "../error";
 
 export const command = new Command("target:apply <type> <name> <resources...>")
   .description("apply a deploy target to a resource")
+  .firebaseNotRequired()
   .before(requireConfig)
   .action((type, name, resources, options) => {
     if (!options.project) {
diff --git a/src/commands/target-clear.ts b/src/commands/target-clear.ts
index d9ea73301ca..1bc2fd7a3d6 100644
--- a/src/commands/target-clear.ts
+++ b/src/commands/target-clear.ts
@@ -6,6 +6,7 @@ import * as utils from "../utils";
 
 export const command = new Command("target:clear <type> <target>")
   .description("clear all resources from a named resource target")
+  .firebaseNotRequired()
   .before(requireConfig)
   .action((type, name, options) => {
     const existed = options.rc.clearTarget(options.project, type, name);
diff --git a/src/commands/target-remove.ts b/src/commands/target-remove.ts
index c5c8dd6ab3f..98166a8dff3 100644
--- a/src/commands/target-remove.ts
+++ b/src/commands/target-remove.ts
@@ -6,6 +6,7 @@ import * as utils from "../utils";
 
 export const command = new Command("target:remove <type> <resource>")
   .description("remove a resource target")
+  .firebaseNotRequired()
   .before(requireConfig)
   .action((type, resource, options) => {
     const name = options.rc.removeTarget(options.project, type, resource);
diff --git a/src/commands/target.ts b/src/commands/target.ts
index 91a59a5e066..38c901b4bf7 100644
--- a/src/commands/target.ts
+++ b/src/commands/target.ts
@@ -18,6 +18,7 @@ function logTargets(type: string, targets: targetMap): void {
 
 export const command = new Command("target [type]")
   .description("display configured deploy targets for the current project")
+  .firebaseNotRequired()
   .before(requireConfig)
   .action((type, options) => {
     if (!options.project) {
diff --git a/src/commands/use.ts b/src/commands/use.ts
index 2a2aa27559f..439d915694a 100644
--- a/src/commands/use.ts
+++ b/src/commands/use.ts
@@ -32,6 +32,7 @@ function verifyMessage(name: string): string {
 
 export const command = new Command("use [alias_or_project_id]")
   .description("set an active Firebase project for your working directory")
+  .firebaseNotRequired()
   .option("--add", "create a new project alias interactively")
   .option("--alias <name>", "create a new alias for the provided project id")
   .option("--unalias <name>", "remove an already created project alias")
diff --git a/src/filterTargets.ts b/src/filterTargets.ts
index 6593968f27e..688aafb1944 100644
--- a/src/filterTargets.ts
+++ b/src/filterTargets.ts
@@ -1,6 +1,6 @@
 import { intersection, difference } from "lodash";
 import { FirebaseError } from "./error";
-import { Options } from "./options";
+import { Options, Target } from "./options";
 
 /**
  * Filters targets from options with valid targets as specified.
@@ -8,7 +8,7 @@ import { Options } from "./options";
  * @param validTargets Targets that are valid.
  * @return List of targets as specified and filtered by options and validTargets.
  */
-export function filterTargets(options: Options, validTargets: string[]): string[] {
+export function filterTargets(options: Options, validTargets: string[]): Target[] {
   let targets = validTargets.filter((t) => {
     return options.config.has(t);
   });
@@ -38,5 +38,5 @@ export function filterTargets(options: Options, validTargets: string[]): string[
 
     throw new FirebaseError(msg);
   }
-  return targets;
+  return targets as Target[];
 }
diff --git a/src/management/projects.ts b/src/management/projects.ts
index 93076da1699..b2b765abf6a 100644
--- a/src/management/projects.ts
+++ b/src/management/projects.ts
@@ -463,3 +463,24 @@ export async function getProject(projectId: string): Promise<ProjectInfo> {
   const response = await resourceManagerClient.get<ProjectInfo>(`/projects/${projectId}`);
   return response.body;
 }
+
+/**
+ * Check whether a project is registered as a Firebase project.
+ * @param projectId the project ID to check
+ * @returns true if it is a firebase project, false if it is a core app project, errors if the project does not exist.
+ */
+export async function isFirebaseProject(projectId: string) {
+  try {
+    await getFirebaseProject(projectId);
+    return true;
+  } catch (err: unknown) {
+    await getProject(projectId);
+    return false;
+  }
+}
+
+export function printMigrateToFirebaseMessage(projectId: string) {
+  `${clc.bold(projectId)} has limited access to some Firebase services. ` +
+    `Update this project to access all Firebase capabilities, including this Firebase service: ` +
+    `${utils.migrateToFirebaseLink(projectId)}`;
+}
diff --git a/src/options.ts b/src/options.ts
index 45814867e0c..3d6b7255046 100644
--- a/src/options.ts
+++ b/src/options.ts
@@ -9,7 +9,7 @@ export interface BaseOptions {
   only: string;
   except: string;
   config: Config;
-  filteredTargets: string[];
+  filteredTargets: Target[];
   force: boolean;
 
   // Options which are present on every command
@@ -30,6 +30,16 @@ export interface BaseOptions {
   import?: string;
 }
 
+export type Target =
+  | "database"
+  | "storage"
+  | "firestore"
+  | "functions"
+  | "hosting"
+  | "remoteconfig"
+  | "extensions"
+  | "dataconnect";
+
 export interface Options extends BaseOptions {
   // TODO(samstern): Remove this once options is better typed
   [key: string]: unknown;
diff --git a/src/utils.ts b/src/utils.ts
index 5ccf64eaa65..6e1083e7576 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -34,6 +34,7 @@ const THIRTY_DAYS_IN_MILLISECONDS = 30 * 24 * 60 * 60 * 1000;
 
 export const envOverrides: string[] = [];
 export const vscodeEnvVars: { [key: string]: string } = {};
+
 /**
  * Create a Firebase Console URL for the specified path and project.
  */
@@ -42,6 +43,14 @@ export function consoleUrl(project: string, path: string): string {
   return `${api.consoleOrigin()}/project/${project}${path}`;
 }
 
+/**
+ * Create a Migrate to Firebase Console URL for the specified project.
+ */
+export function migrateToFirebaseLink(project: string): string {
+  const api = require("./api");
+  return `${api.consoleOrigin()}?dlAction=MigrateCloudProject&cloudProjectNumber=${project}`;
+}
+
 /**
  * Trace up the ancestry of objects that have a `parent` key, finding the
  * first instance of the provided key.

From f397d640a18c3b695187713b055f03bf781a11c5 Mon Sep 17 00:00:00 2001
From: Joe Hanley <joehanley@google.com>
Date: Tue, 3 Dec 2024 10:03:24 -0800
Subject: [PATCH 2/6] oops

---
 src/management/projects.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/management/projects.ts b/src/management/projects.ts
index b2b765abf6a..674abd43750 100644
--- a/src/management/projects.ts
+++ b/src/management/projects.ts
@@ -480,7 +480,7 @@ export async function isFirebaseProject(projectId: string) {
 }
 
 export function printMigrateToFirebaseMessage(projectId: string) {
-  `${clc.bold(projectId)} has limited access to some Firebase services. ` +
+  utils.logWarning(`${clc.bold(projectId)} has limited access to some Firebase services. ` +
     `Update this project to access all Firebase capabilities, including this Firebase service: ` +
-    `${utils.migrateToFirebaseLink(projectId)}`;
+    `${utils.migrateToFirebaseLink(projectId)}`);
 }

From f331905ae7d8b80f6d4364a9070d467294bf6e44 Mon Sep 17 00:00:00 2001
From: joehan <joehanley@google.com>
Date: Tue, 3 Dec 2024 10:10:21 -0800
Subject: [PATCH 3/6] Update src/command.ts

Co-authored-by: rachelsaunders <52258509+rachelsaunders@users.noreply.github.com>
---
 src/command.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/command.ts b/src/command.ts
index 20390942c58..aec22c69ed5 100644
--- a/src/command.ts
+++ b/src/command.ts
@@ -437,7 +437,7 @@ export class Command {
       }
       if (this.firebaseRequired && options.project && !(await isFirebaseProject(options.project))) {
         printMigrateToFirebaseMessage(options.project);
-        throw new FirebaseError("This command requires your project to be migrated to Firebase.");
+        throw new FirebaseError("This command requires that your Google Cloud project has Firebase added to it.");
       }
       return this.actionFn(...args);
     };

From 65603fecc7a7a64d21c6c8fa5731747b92bbad40 Mon Sep 17 00:00:00 2001
From: joehan <joehanley@google.com>
Date: Tue, 3 Dec 2024 10:10:31 -0800
Subject: [PATCH 4/6] Update src/commands/deploy.ts

Co-authored-by: rachelsaunders <52258509+rachelsaunders@users.noreply.github.com>
---
 src/commands/deploy.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/commands/deploy.ts b/src/commands/deploy.ts
index 69ebee2296c..c853b8d2594 100644
--- a/src/commands/deploy.ts
+++ b/src/commands/deploy.ts
@@ -121,7 +121,7 @@ export const command = new Command("deploy")
       if (!(await isFirebaseProject(projectId))) {
         printMigrateToFirebaseMessage(projectId);
         throw new FirebaseError(
-          "Some of the products in this deployment require this project to be migrated to Firebase.",
+          "Some of the products in this deployment require that your Google Cloud project has Firebase added to it.",
         );
       }
     }

From 6eb253ecf4d7755996fd11bbd61d6a3fce7f00e0 Mon Sep 17 00:00:00 2001
From: Joe Hanley <joehanley@google.com>
Date: Tue, 3 Dec 2024 10:13:45 -0800
Subject: [PATCH 5/6] Reworking names

---
 src/command.ts             | 4 ++--
 src/commands/deploy.ts     | 4 ++--
 src/management/projects.ts | 4 ++--
 src/utils.ts               | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/command.ts b/src/command.ts
index aec22c69ed5..3320f99eeb2 100644
--- a/src/command.ts
+++ b/src/command.ts
@@ -13,7 +13,7 @@ import { selectAccount, setActiveAccount } from "./auth";
 import {
   getProject,
   isFirebaseProject,
-  printMigrateToFirebaseMessage,
+  printAddFirebaseMessage,
 } from "./management/projects";
 import { requireAuth } from "./requireAuth";
 import { Options } from "./options";
@@ -436,7 +436,7 @@ export class Command {
         await before.fn(options, ...before.args);
       }
       if (this.firebaseRequired && options.project && !(await isFirebaseProject(options.project))) {
-        printMigrateToFirebaseMessage(options.project);
+        printAddFirebaseMessage(options.project);
         throw new FirebaseError("This command requires that your Google Cloud project has Firebase added to it.");
       }
       return this.actionFn(...args);
diff --git a/src/commands/deploy.ts b/src/commands/deploy.ts
index c853b8d2594..ef86849f6f4 100644
--- a/src/commands/deploy.ts
+++ b/src/commands/deploy.ts
@@ -14,7 +14,7 @@ import { interactiveCreateHostingSite } from "../hosting/interactive";
 import { logBullet } from "../utils";
 import { Options } from "../options";
 import { needProjectId } from "../projectUtils";
-import { isFirebaseProject, printMigrateToFirebaseMessage } from "../management/projects";
+import { isFirebaseProject, printAddFirebaseMessage } from "../management/projects";
 
 // in order of least time-consuming to most time-consuming
 export const VALID_DEPLOY_TARGETS = [
@@ -119,7 +119,7 @@ export const command = new Command("deploy")
     ) {
       const projectId = needProjectId(options);
       if (!(await isFirebaseProject(projectId))) {
-        printMigrateToFirebaseMessage(projectId);
+        printAddFirebaseMessage(projectId);
         throw new FirebaseError(
           "Some of the products in this deployment require that your Google Cloud project has Firebase added to it.",
         );
diff --git a/src/management/projects.ts b/src/management/projects.ts
index 674abd43750..fbde60517c5 100644
--- a/src/management/projects.ts
+++ b/src/management/projects.ts
@@ -479,8 +479,8 @@ export async function isFirebaseProject(projectId: string) {
   }
 }
 
-export function printMigrateToFirebaseMessage(projectId: string) {
+export function printAddFirebaseMessage(projectId: string) {
   utils.logWarning(`${clc.bold(projectId)} has limited access to some Firebase services. ` +
     `Update this project to access all Firebase capabilities, including this Firebase service: ` +
-    `${utils.migrateToFirebaseLink(projectId)}`);
+    `${utils.addFirebaseToCloudProjectLink(projectId)}`);
 }
diff --git a/src/utils.ts b/src/utils.ts
index 6e1083e7576..02a25e82d44 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -46,7 +46,7 @@ export function consoleUrl(project: string, path: string): string {
 /**
  * Create a Migrate to Firebase Console URL for the specified project.
  */
-export function migrateToFirebaseLink(project: string): string {
+export function addFirebaseToCloudProjectLink(project: string): string {
   const api = require("./api");
   return `${api.consoleOrigin()}?dlAction=MigrateCloudProject&cloudProjectNumber=${project}`;
 }

From 907d6ac93a0f02bfa6474927417d08a0a39123a0 Mon Sep 17 00:00:00 2001
From: Joe Hanley <joehanley@google.com>
Date: Tue, 3 Dec 2024 12:43:16 -0800
Subject: [PATCH 6/6] Adding unit tests

---
 src/command.spec.ts                        | 32 +++++++
 src/command.ts                             | 10 +--
 src/deploy/hosting/prepare.spec.ts         |  2 +-
 src/emulator/extensions/validation.spec.ts |  2 +-
 src/management/projects.spec.ts            | 99 ++++++++++++++++++++++
 src/management/projects.ts                 | 30 ++++---
 6 files changed, 155 insertions(+), 20 deletions(-)

diff --git a/src/command.spec.ts b/src/command.spec.ts
index 8ba2d7b8d08..41adb5e2d53 100644
--- a/src/command.spec.ts
+++ b/src/command.spec.ts
@@ -2,6 +2,7 @@ import { expect } from "chai";
 import * as sinon from "sinon";
 import * as rc from "./rc";
 import * as nock from "nock";
+import * as projects from "./management/projects";
 
 import { Command, validateProjectId } from "./command";
 import { FirebaseError } from "./error";
@@ -34,14 +35,17 @@ describe("Command", () => {
 
   describe("runner", () => {
     let rcStub: sinon.SinonStub;
+    let isFirebaseProjectStub: sinon.SinonStub;
     beforeEach(() => {
       rcStub = sinon
         .stub(rc, "loadRC")
         .returns(new rc.RC(undefined, { projects: { default: "default-project" } }));
+      isFirebaseProjectStub = sinon.stub(projects, "isFirebaseProject").resolves(true);
     });
 
     afterEach(() => {
       rcStub.restore();
+      isFirebaseProjectStub.restore();
       nock.cleanAll();
     });
 
@@ -160,6 +164,34 @@ describe("Command", () => {
         project: "default-project",
       });
     });
+
+    it("should error for non-Firebase projects if the command requires Firebase", async () => {
+      isFirebaseProjectStub.resolves(false);
+      const run = command
+        .action((options) => {
+          return options;
+        })
+        .runner();
+
+      const result = run();
+      return expect(result).to.be.rejectedWith(
+        "This command requires that your Google Cloud project has Firebase added to it.",
+      );
+    });
+
+    it("should not error for non-Firebase projects if the command does not require Firebase", async () => {
+      isFirebaseProjectStub.resolves(false);
+      const run = command
+        .firebaseNotRequired()
+        .action((options) => {
+          options.foo = "bar";
+          return options;
+        })
+        .runner();
+
+      const result = run({ foo: "baz" });
+      await expect(result).to.eventually.have.property("foo", "bar");
+    });
   });
 });
 
diff --git a/src/command.ts b/src/command.ts
index 3320f99eeb2..7590df6f4ac 100644
--- a/src/command.ts
+++ b/src/command.ts
@@ -10,11 +10,7 @@ import { configstore } from "./configstore";
 import { detectProjectRoot } from "./detectProjectRoot";
 import { trackEmulator, trackGA4 } from "./track";
 import { selectAccount, setActiveAccount } from "./auth";
-import {
-  getProject,
-  isFirebaseProject,
-  printAddFirebaseMessage,
-} from "./management/projects";
+import { getProject, isFirebaseProject, printAddFirebaseMessage } from "./management/projects";
 import { requireAuth } from "./requireAuth";
 import { Options } from "./options";
 
@@ -437,7 +433,9 @@ export class Command {
       }
       if (this.firebaseRequired && options.project && !(await isFirebaseProject(options.project))) {
         printAddFirebaseMessage(options.project);
-        throw new FirebaseError("This command requires that your Google Cloud project has Firebase added to it.");
+        throw new FirebaseError(
+          "This command requires that your Google Cloud project has Firebase added to it.",
+        );
       }
       return this.actionFn(...args);
     };
diff --git a/src/deploy/hosting/prepare.spec.ts b/src/deploy/hosting/prepare.spec.ts
index e1579990594..ea58f3a3737 100644
--- a/src/deploy/hosting/prepare.spec.ts
+++ b/src/deploy/hosting/prepare.spec.ts
@@ -60,7 +60,7 @@ describe("hosting prepare", () => {
       configPath: ".",
       only: "hosting",
       except: "",
-      filteredTargets: ["HOSTING"],
+      filteredTargets: ["hosting"],
       force: false,
       json: false,
       nonInteractive: false,
diff --git a/src/emulator/extensions/validation.spec.ts b/src/emulator/extensions/validation.spec.ts
index 5e4a95c9a0c..63b8bc3a486 100644
--- a/src/emulator/extensions/validation.spec.ts
+++ b/src/emulator/extensions/validation.spec.ts
@@ -18,7 +18,7 @@ const TEST_OPTIONS: Options = {
   only: "",
   except: "",
   force: false,
-  filteredTargets: [""],
+  filteredTargets: [],
   nonInteractive: true,
   interactive: false,
   json: false,
diff --git a/src/management/projects.spec.ts b/src/management/projects.spec.ts
index ebe415b4c7b..8fed5c4a961 100644
--- a/src/management/projects.spec.ts
+++ b/src/management/projects.spec.ts
@@ -676,5 +676,104 @@ describe("Project management", () => {
         expect(nock.isDone()).to.be.true;
       });
     });
+
+    describe("getProject", () => {
+      it("should resolve with project information if it succeeds", async () => {
+        const expectedProjectInfo: projectManager.ProjectInfo = {
+          projectNumber: "123456789",
+          projectId: "my-project",
+          lifecycleState: "ACTIVE",
+          name: "my-project",
+          createTime: "1234512344",
+          parent: { type: "organization", id: "my-org-id" },
+        };
+        nock(api.resourceManagerOrigin())
+          .get(`/v1/projects/${PROJECT_ID}`)
+          .reply(200, expectedProjectInfo);
+
+        const projects = await projectManager.getProject(PROJECT_ID);
+
+        expect(projects).to.deep.equal(expectedProjectInfo);
+        expect(nock.isDone()).to.be.true;
+      });
+
+      it("should reject if the api call fails", async () => {
+        nock(api.resourceManagerOrigin())
+          .get(`/v1/projects/${PROJECT_ID}`)
+          .reply(404, { error: "Not Found" });
+
+        let err;
+        try {
+          await projectManager.getProject(PROJECT_ID);
+        } catch (e: any) {
+          err = e;
+        }
+
+        expect(err).to.not.be.undefined;
+        expect(nock.isDone()).to.be.true;
+      });
+    });
+
+    describe("isFirebaseProject", () => {
+      it("should return true if the Firebase API has project info", async () => {
+        const expectedProjectInfo: FirebaseProjectMetadata = {
+          name: `projects/${PROJECT_ID}`,
+          projectId: PROJECT_ID,
+          displayName: PROJECT_NAME,
+          projectNumber: PROJECT_NUMBER,
+          resources: {
+            hostingSite: HOSTING_SITE,
+            realtimeDatabaseInstance: DATABASE_INSTANCE,
+            storageBucket: STORAGE_BUCKET,
+            locationId: LOCATION_ID,
+          },
+        };
+        nock(api.firebaseApiOrigin())
+          .get(`/v1beta1/projects/${PROJECT_ID}`)
+          .reply(200, expectedProjectInfo);
+
+        const isFirebase = await projectManager.isFirebaseProject(PROJECT_ID);
+        expect(isFirebase).to.be.true;
+      });
+
+      it("should return false if the Firebase API doesn't have project info but resource manager does", async () => {
+        const expectedProjectInfo: projectManager.ProjectInfo = {
+          projectNumber: "123456789",
+          projectId: "my-project",
+          lifecycleState: "ACTIVE",
+          name: "my-project",
+          createTime: "1234512344",
+          parent: { type: "organization", id: "my-org-id" },
+        };
+        nock(api.resourceManagerOrigin())
+          .get(`/v1/projects/${PROJECT_ID}`)
+          .reply(200, expectedProjectInfo);
+        nock(api.firebaseApiOrigin())
+          .get(`/v1beta1/projects/${PROJECT_ID}`)
+          .reply(404, { error: "Not Found" });
+
+        const isFirebase = await projectManager.isFirebaseProject(PROJECT_ID);
+        expect(isFirebase).to.be.false;
+      });
+
+      it("should error if the project doesn't exist", async () => {
+        nock(api.firebaseApiOrigin())
+          .get(`/v1beta1/projects/${PROJECT_ID}`)
+          .reply(404, { error: "Not Found" });
+        nock(api.resourceManagerOrigin())
+          .get(`/v1/projects/${PROJECT_ID}`)
+          .reply(404, { error: "Not Found" });
+
+        let err;
+        try {
+          await projectManager.isFirebaseProject(PROJECT_ID);
+        } catch (e: any) {
+          err = e;
+        }
+
+        expect(err).to.not.be.undefined;
+        expect(nock.isDone()).to.be.true;
+      });
+    });
   });
 });
diff --git a/src/management/projects.ts b/src/management/projects.ts
index fbde60517c5..952d19078b0 100644
--- a/src/management/projects.ts
+++ b/src/management/projects.ts
@@ -405,17 +405,21 @@ export async function listFirebaseProjects(pageSize?: number): Promise<FirebaseP
   return projects;
 }
 
+async function _getFirebaseProject(projectId: string): Promise<FirebaseProjectMetadata> {
+  const res = await firebaseAPIClient.request<void, FirebaseProjectMetadata>({
+    method: "GET",
+    path: `/projects/${projectId}`,
+    timeout: TIMEOUT_MILLIS,
+  });
+  return res.body;
+}
 /**
  * Gets the Firebase project information identified by the specified project ID
  */
 export async function getFirebaseProject(projectId: string): Promise<FirebaseProjectMetadata> {
   try {
-    const res = await firebaseAPIClient.request<void, FirebaseProjectMetadata>({
-      method: "GET",
-      path: `/projects/${projectId}`,
-      timeout: TIMEOUT_MILLIS,
-    });
-    return res.body;
+    const projectMetadata = await _getFirebaseProject(projectId);
+    return projectMetadata;
   } catch (err: any) {
     if (getErrStatus(err) === 404) {
       try {
@@ -469,9 +473,9 @@ export async function getProject(projectId: string): Promise<ProjectInfo> {
  * @param projectId the project ID to check
  * @returns true if it is a firebase project, false if it is a core app project, errors if the project does not exist.
  */
-export async function isFirebaseProject(projectId: string) {
+export async function isFirebaseProject(projectId: string): Promise<boolean> {
   try {
-    await getFirebaseProject(projectId);
+    await _getFirebaseProject(projectId);
     return true;
   } catch (err: unknown) {
     await getProject(projectId);
@@ -479,8 +483,10 @@ export async function isFirebaseProject(projectId: string) {
   }
 }
 
-export function printAddFirebaseMessage(projectId: string) {
-  utils.logWarning(`${clc.bold(projectId)} has limited access to some Firebase services. ` +
-    `Update this project to access all Firebase capabilities, including this Firebase service: ` +
-    `${utils.addFirebaseToCloudProjectLink(projectId)}`);
+export function printAddFirebaseMessage(projectId: string): void {
+  utils.logWarning(
+    `${clc.bold(projectId)} has limited access to some Firebase services. ` +
+      `Update this project to access all Firebase capabilities, including this Firebase service: ` +
+      `${utils.addFirebaseToCloudProjectLink(projectId)}`,
+  );
 }