Remove --location from apphosting:backends:create and prompt for primary region

src/apphosting/backend.ts

@@ -48,7 +48,7 @@
     // SSL.
     const maybeNodeError = err as { cause: { code: string }; code: string };
     if (
       /HANDSHAKE_FAILURE/.test(maybeNodeError?.cause?.code) ||
       "EPROTO" === maybeNodeError?.code
     ) {
       return false;
@@ -73,7 +73,6 @@
 export async function doSetup(
   projectId: string,
   webAppName: string | null,
-  location: string | null,
   serviceAccount: string | null,
 ): Promise<void> {
   await Promise.all([
@@ -89,21 +88,11 @@
   // possible to reduce the likelihood that the subsequent Cloud Build fails. See b/336862200.
   await ensureAppHostingComputeServiceAccount(projectId, serviceAccount);
 
-  const allowedLocations = (await apphosting.listLocations(projectId)).map((loc) => loc.locationId);
-  if (location) {
-    if (!allowedLocations.includes(location)) {
-      throw new FirebaseError(
-        `Invalid location ${location}. Valid choices are ${allowedLocations.join(", ")}`,
-      );
-    }
-  }
-
-  location =
-    location || (await promptLocation(projectId, "Select a location to host your backend:\n"));
+  const primaryRegion = await promptPrimaryRegion(projectId, "Select a primary region to host your backend:\n");
 
   const gitRepositoryLink: GitRepositoryLink = await githubConnections.linkGitHubRepository(
     projectId,
-    location,
+    primaryRegion,
   );
 
   const rootDir = await promptOnce({
@@ -120,7 +109,7 @@
   logSuccess(`Repo linked successfully!\n`);
 
   logBullet(`${clc.yellow("===")} Set up your backend`);
-  const backendId = await promptNewBackendId(projectId, location, {
+  const backendId = await promptNewBackendId(projectId, primaryRegion, {
     name: "backendId",
     type: "input",
     default: "my-web-app",
@@ -136,7 +125,7 @@
   const createBackendSpinner = ora("Creating your new backend...").start();
   const backend = await createBackend(
     projectId,
-    location,
+    primaryRegion,
     backendId,
     gitRepositoryLink,
     serviceAccount,
@@ -145,7 +134,7 @@
   );
   createBackendSpinner.succeed(`Successfully created backend!\n\t${backend.name}\n`);
 
-  await setDefaultTrafficPolicy(projectId, location, backendId, branch);
+  await setDefaultTrafficPolicy(projectId, primaryRegion, backendId, branch);
 
   const confirmRollout = await promptOnce({
     type: "confirm",
@@ -168,6 +157,8 @@
   const createRolloutSpinner = ora(
     "Starting a new rollout; this may take a few minutes. It's safe to exit now.",
   ).start();
+  // TODO: remove this renaming when orchestrateRolloutArgs have been updated.
+  const location = primaryRegion
   await orchestrateRollout({
     projectId,
     location,
@@ -263,10 +254,10 @@
 async function promptNewBackendId(
   projectId: string,
   location: string,
   prompt: any,
 ): Promise<string> {
   while (true) {
     const backendId = await promptOnce(prompt);
     try {
       await apphosting.getBackend(projectId, location, backendId);
     } catch (err: unknown) {
@@ -387,12 +378,37 @@
   });
 }
 
+/**
+ * Prompts the user for a location. If there's only a single valid location, skips the prompt and returns that location.
+ */
+export async function promptPrimaryRegion(
+  projectId: string,
+  prompt = "Please select a primary region:",
+): Promise<string> {
+  const allowedRegions = (await apphosting.listLocations(projectId)).map((loc) => loc.locationId);
+  if (allowedRegions.length === 1) {
+    return allowedRegions[0];
+  }
+
+  const primaryRegion = (await promptOnce({
+    name: "primaryRegion",
+    type: "list",
+    default: DEFAULT_LOCATION,
+    message: prompt,
+    choices: allowedRegions,
+  })) as string;
+
+  logSuccess(`Primary Region set to ${primaryRegion}.\n`);
+
+  return primaryRegion;
+}
+
 /**
  * Prompts the user for a location. If there's only a single valid location, skips the prompt and returns that location.
  */
 export async function promptLocation(
   projectId: string,
-  prompt = "Please select a location:",
+  prompt = "Please select a primary region:",
 ): Promise<string> {
   const allowedLocations = (await apphosting.listLocations(projectId)).map((loc) => loc.locationId);
   if (allowedLocations.length === 1) {
@@ -407,7 +423,7 @@
     choices: allowedLocations,
   })) as string;
 
-  logSuccess(`Location set to ${location}.\n`);
+  logSuccess(`Primary Region set to ${location}.\n`);
 
   return location;
 }
@@ -443,7 +459,7 @@
   let { unreachable, backends } = await apphosting.listBackends(projectId, "-");
   if (unreachable && unreachable.length !== 0) {
     logWarning(
       `The following locations are currently unreachable: ${unreachable}.\n` +
         "If your backend is in one of these regions, please try again later.",
     );
   }
@@ -466,11 +482,11 @@
   backends.forEach((backend) =>
     backendsByLocation.set(apphosting.parseBackendName(backend.name).location, backend),
   );
   const location = await promptOnce({
     name: "location",
     type: "list",
     message: locationDisambugationPrompt,
     choices: [...backendsByLocation.keys()],
   });
   return backendsByLocation.get(location)!;
 }

src/commands/apphosting-backends-create.ts

@@ -13,7 +13,6 @@
     "-a, --app <webAppId>",
     "specify an existing Firebase web app's ID to associate your App Hosting backend with",
   )
-  .option("-l, --location <location>", "specify the location of the backend", "")
   .option(
     "-s, --service-account <serviceAccount>",
     "specify the service account used to run the server",
@@ -25,13 +24,11 @@
   .action(async (options: Options) => {
     const projectId = needProjectId(options);
     const webAppId = options.app;
-    const location = options.location;
     const serviceAccount = options.serviceAccount;
 
     await doSetup(
       projectId,
       webAppId as string | null,
-      location as string | null,
       serviceAccount as string | null,
     );
   });

src/commands/apphosting-backends-list.ts

@@ -7,7 +7,7 @@ import { Options } from "../options";
 import * as apphosting from "../gcp/apphosting";
 import * as Table from "cli-table3";
 
-const TABLE_HEAD = ["Backend", "Repository", "URL", "Location", "Updated Date"];
+const TABLE_HEAD = ["Backend", "Repository", "URL", "Primary Region", "Updated Date"];
 
 export const command = new Command("apphosting:backends:list")
   .description("list Firebase App Hosting backends")