Consolidate the ABIU prompts in the CLI so it matches the UI behavior (#10352)

* Consolidate the ABIU prompts in the CLI so it matches the UI more closely

* Address linter errors

Author: falahat

src/apphosting/backend.spec.ts

@@ -123,7 +123,6 @@ describe("apphosting setup functions", () => {
         serviceAccount: "custom-service-account",
         appId: webAppId,
         runtime: { value: "" },
-        automaticBaseImageUpdatesDisabled: undefined,
       };
       expect(createBackendStub).to.be.calledWith(projectId, location, backendInput, backendId);
     });
@@ -155,74 +154,11 @@ describe("apphosting setup functions", () => {
           serviceAccount: "custom-service-account",
           appId: webAppId,
           runtime: { value: runtime ?? "" },
-          automaticBaseImageUpdatesDisabled: undefined,
         };
         expect(createBackendStub).to.be.calledWith(projectId, location, backendInput, backendId);
       });
     }
 
-    it("should create a new backend with automatic base image updates disabled", async () => {
-      createBackendStub.resolves(op);
-      pollOperationStub.resolves(completeBackend);
-
-      await createBackend(
-        projectId,
-        location,
-        backendId,
-        "custom-service-account",
-        cloudBuildConnRepo,
-        webAppId,
-        "/",
-        undefined,
-        true, // automaticBaseImageUpdatesDisabled
-      );
-
-      const backendInput: Omit<apphosting.Backend, apphosting.BackendOutputOnlyFields> = {
-        servingLocality: "GLOBAL_ACCESS",
-        codebase: {
-          repository: cloudBuildConnRepo.name,
-          rootDirectory: "/",
-        },
-        labels: deploymentTool.labels(),
-        serviceAccount: "custom-service-account",
-        appId: webAppId,
-        runtime: { value: "" },
-        automaticBaseImageUpdatesDisabled: true,
-      };
-      expect(createBackendStub).to.be.calledWith(projectId, location, backendInput, backendId);
-    });
-
-    it("should create a new backend with automatic base image updates enabled", async () => {
-      createBackendStub.resolves(op);
-      pollOperationStub.resolves(completeBackend);
-
-      await createBackend(
-        projectId,
-        location,
-        backendId,
-        "custom-service-account",
-        cloudBuildConnRepo,
-        webAppId,
-        "/",
-        undefined,
-        false, // automaticBaseImageUpdatesDisabled
-      );
-
-      const backendInput: Omit<apphosting.Backend, apphosting.BackendOutputOnlyFields> = {
-        servingLocality: "GLOBAL_ACCESS",
-        codebase: {
-          repository: cloudBuildConnRepo.name,
-          rootDirectory: "/",
-        },
-        labels: deploymentTool.labels(),
-        serviceAccount: "custom-service-account",
-        appId: webAppId,
-        runtime: { value: "" },
-        automaticBaseImageUpdatesDisabled: false,
-      };
-      expect(createBackendStub).to.be.calledWith(projectId, location, backendInput, backendId);
-    });
-
     it("should set default rollout policy to 100% all at once", async () => {
       const completeTraffic: apphosting.Traffic = {
         name: `projects/${projectId}/locations/${location}/backends/${backendId}/traffic`,

src/apphosting/backend.ts

@@ -29,7 +29,7 @@ import fetch from "node-fetch";
 import { orchestrateRollout } from "./rollout";
 import * as fuzzy from "fuzzy";
 import { isEnabled } from "../experiments";
-import { DEFAULT_RUNTIME, promptRuntime, promptAutomaticBaseImageUpdates } from "./prompts";
+import { DEFAULT_RUNTIME, promptRuntime } from "./prompts";
 
 const DEFAULT_COMPUTE_SERVICE_ACCOUNT_NAME = "firebase-app-hosting-compute";
 
@@ -82,7 +82,6 @@ export async function doSetup(
   primaryRegion?: string,
   rootDir?: string,
   runtime?: string,
-  automaticBaseImageUpdatesDisabled?: boolean,
 ): Promise<void> {
   await ensureRequiredApisEnabled(projectId);
 
@@ -137,12 +136,6 @@ export async function doSetup(
     }
   }
 
-  if (automaticBaseImageUpdatesDisabled === undefined && isEnabled("abiu")) {
-    if (!nonInteractive) {
-      automaticBaseImageUpdatesDisabled = !(await promptAutomaticBaseImageUpdates());
-    }
-  }
-
   const webApp = await webApps.getOrCreateWebApp(
     projectId,
     webAppName ? webAppName : null,
@@ -162,7 +155,6 @@ export async function doSetup(
     webApp?.id,
     rootDir,
     runtime,
-    automaticBaseImageUpdatesDisabled,
   );
   createBackendSpinner.succeed(`Successfully created backend!\n\t${backend.name}\n`);
 
@@ -373,7 +365,6 @@ export async function createBackend(
   webAppId: string | undefined,
   rootDir = "/",
   runtime?: string,
-  automaticBaseImageUpdatesDisabled?: boolean,
 ): Promise<Backend> {
   const defaultServiceAccount = defaultComputeServiceAccountEmail(projectId);
   const backendReqBody: Omit<Backend, BackendOutputOnlyFields> = {
@@ -392,7 +383,6 @@ export async function createBackend(
   // this is to be extra careful that we do not set the ABIU fields if the experiment is disabled
   if (isEnabled("abiu")) {
     backendReqBody.runtime = { value: runtime ?? "" };
-    backendReqBody.automaticBaseImageUpdatesDisabled = automaticBaseImageUpdatesDisabled;
   }
 
   async function createBackendAndPoll(): Promise<apphosting.Backend> {

src/apphosting/prompts.ts

@@ -1,39 +1,46 @@
-import { select, confirm, Choice } from "../prompt";
-import { logWarning } from "../utils";
+import { select, Choice } from "../prompt";
+import { logWarning, logBullet } from "../utils";
 import * as apphosting from "../gcp/apphosting";
+
 export const DEFAULT_RUNTIME = "nodejs";
 
 /**
- * Asks the user for their runtime. This is required for ABIU.
+ * Asks the user for their runtime.
  */
 export async function promptRuntime(projectId: string, location: string): Promise<string> {
-  const choices: Choice<string>[] = [{ name: "Node.js (default)", value: DEFAULT_RUNTIME }];
+  const choices: Choice<string>[] = [];
+  let nodejsChoice: Choice<string> = { name: "Node.js (default)", value: DEFAULT_RUNTIME };
+
   try {
     const supportedRuntimes = await apphosting.listSupportedRuntimes(projectId, location);
     for (const r of supportedRuntimes) {
-      if (r.runtimeId !== DEFAULT_RUNTIME) {
-        choices.push({ name: r.runtimeId, value: r.runtimeId });
+      const abiuText = r.automaticBaseImageUpdatesSupported
+        ? "Enables Automatic Base Image Updates"
+        : "No Automatic Base Image Updates";
+      const choiceName = `${r.runtimeId} - ${abiuText}`;
+
+      if (r.runtimeId === DEFAULT_RUNTIME) {
+        nodejsChoice = { name: choiceName, value: r.runtimeId };
+      } else {
+        choices.push({ name: choiceName, value: r.runtimeId });
       }
     }
+    choices.unshift(nodejsChoice);
   } catch (err) {
     logWarning("Failed to list supported runtimes. Falling back to hardcoded list.");
-    // We add this hardcoded nodejs22 to unblock testing.
-    // This line will be removed when the ListSupportedRuntime API is stable.
-    choices.push({ name: "nodejs22", value: "nodejs22" });
+    choices.push({ name: "nodejs - No Automatic Base Image Updates", value: "nodejs" });
+    choices.push({ name: "nodejs22 - Enables Automatic Base Image Updates", value: "nodejs22" });
   }
-  return await select({
+
+  const selectedRuntime = await select({
     message: "Which runtime do you want to use?",
     choices: choices,
     default: DEFAULT_RUNTIME,
   });
-}
 
-/**
- * Asks the user if ABIU should be enabled. True by default.
- */
-export async function promptAutomaticBaseImageUpdates(): Promise<boolean> {
-  return await confirm({
-    message: "Would you like to enable Automatic Base Image Updates (ABIU)?",
-    default: true,
-  });
+  if (selectedRuntime === DEFAULT_RUNTIME) {
+    logBullet("ABIU will not be enabled for the unversioned 'nodejs' runtime.");
+  }
+
+  return selectedRuntime;
 }

src/commands/apphosting-backends-create.spec.ts

@@ -23,7 +23,7 @@ describe("apphosting:backends:create", () => {
     sinon.restore();
   });
 
-  it("should fail if ABIU flags are used without experiment enabled", async () => {
+  it("should fail if runtime flag is used without experiment enabled", async () => {
     isEnabledStub.returns(false);
     const options = {
       project: PROJECT_ID,
@@ -34,11 +34,11 @@ describe("apphosting:backends:create", () => {
 
     await expect(command.runner()(options)).to.be.rejectedWith(
       FirebaseError,
-      /The --runtime and --automatic-base-image-updates flags are only available when the 'abiu' experiment is enabled/,
+      /The --runtime flag is only available when the 'abiu' experiment is enabled/,
     );
   });
 
-  it("should default ABIU to enabled and runtime to empty string when experiment is on", async () => {
+  it("should default runtime to undefined when experiment is on and no flag provided", async () => {
     isEnabledStub.returns(true);
     const options = {
       project: PROJECT_ID,
@@ -59,33 +59,6 @@ describe("apphosting:backends:create", () => {
       "us-central1", // primaryRegion
       undefined, // rootDir
       undefined, // expected runtime (doSetup handles the default to 'nodejs')
-      false, // expected default automaticBaseImageUpdatesDisabled (enabled)
-    );
-  });
-
-  it("should pass explicit ABIU disabled flag", async () => {
-    isEnabledStub.returns(true);
-    const options = {
-      project: PROJECT_ID,
-      nonInteractive: true,
-      backend: "test-backend",
-      primaryRegion: "us-central1",
-      serviceAccount: "",
-      automaticBaseImageUpdates: false,
-    };
-
-    await command.runner()(options);
-
-    expect(doSetupStub).to.be.calledWith(
-      PROJECT_ID,
-      true,
-      undefined,
-      "test-backend",
-      "",
-      "us-central1",
-      undefined,
-      undefined,
-      true, // automaticBaseImageUpdatesDisabled should be true
     );
   });
 
@@ -111,7 +84,6 @@ describe("apphosting:backends:create", () => {
       "us-central1",
       undefined,
       "", // explicit empty string should be preserved
-      false,
     );
   });
 
@@ -137,7 +109,6 @@ describe("apphosting:backends:create", () => {
       "us-central1",
       undefined,
       "nodejs22",
-      false, // ABIU defaults to enabled even with explicit runtime
     );
   });
 
@@ -163,7 +134,6 @@ describe("apphosting:backends:create", () => {
       "us-central1",
       undefined,
       undefined, // Should default to undefined, then nodejs in doSetup
-      false,
     );
   });
 });

src/commands/apphosting-backends-create.ts

@@ -31,10 +31,10 @@ export const command = new Command("apphosting:backends:create")
   .option("--root-dir <rootDir>", "specify the root directory for the backend.");
 const abiuEnabled = experiments.isEnabled("abiu");
 if (abiuEnabled) {
-  command
-    .option("--runtime [runtime]", "specify the runtime for the backend (e.g., nodejs, nodejs22)")
-    .option("--automatic-base-image-updates", "enable automatic base image updates")
-    .option("--no-automatic-base-image-updates", "disable automatic base image updates");
+  command.option(
+    "--runtime [runtime]",
+    "specify the runtime for the backend (e.g., nodejs, nodejs22)",
+  );
 }
 
 command
@@ -48,18 +48,15 @@ command
     }
 
     const abiuAllowed = experiments.isEnabled("abiu");
-    if (!abiuAllowed && (options.runtime || options.automaticBaseImageUpdates !== undefined)) {
+    if (!abiuAllowed && options.runtime) {
       throw new FirebaseError(
-        "The --runtime and --automatic-base-image-updates flags are only available when the 'abiu' experiment is enabled. To enable it, run 'firebase experiments:enable abiu'.",
+        "The --runtime flag is only available when the 'abiu' experiment is enabled. To enable it, run 'firebase experiments:enable abiu'.",
       );
     }
     // When ABIU is allowed but the user doesn't provide a runtime string, we let doSetup handle it.
     // We strictly check for string type to avoid boolean true (flag present without value) causing issues.
     const runtime =
       abiuAllowed && typeof options.runtime === "string" ? options.runtime : undefined;
-    const automaticBaseImageUpdatesDisabled = abiuAllowed
-      ? options.automaticBaseImageUpdates === false
-      : undefined;
 
     return doSetup(
       projectId,
@@ -70,6 +67,5 @@ command
       options.primaryRegion as string | undefined,
       options.rootDir as string | undefined,
       runtime,
-      automaticBaseImageUpdatesDisabled,
     );
   });

src/init/features/apphosting.ts

@@ -95,11 +95,9 @@ export async function doSetup(setup: Setup, config: Config, options: Options): P
     const prompts = await dynamicImport("./apphosting/prompts");
 
     let runtime = experiments.isEnabled("abiu") ? prompts.DEFAULT_RUNTIME : undefined;
-    let automaticBaseImageUpdatesDisabled = experiments.isEnabled("abiu") ? false : undefined;
 
     if (experiments.isEnabled("abiu") && !options.nonInteractive) {
       runtime = await prompts.promptRuntime(projectId, location);
-      automaticBaseImageUpdatesDisabled = !(await prompts.promptAutomaticBaseImageUpdates());
     }
 
     const createBackendSpinner = ora("Creating your new backend...").start();
@@ -112,7 +110,6 @@ export async function doSetup(setup: Setup, config: Config, options: Options): P
       webApp?.id,
       /* rootDir= */ "/",
       runtime,
-      automaticBaseImageUpdatesDisabled,
     );
 
     createBackendSpinner.succeed(`Successfully created backend!\n\t${backend.name}\n`);