Check billing during App Hosting init and move App Hosting option next to Hosting in init list

CHANGELOG.md

@@ -1,2 +1,3 @@
+- Check that billing is enabled and move App Hosting next to Hosting in init list (#7871).
 - Fix rollouts:create to handle backend regionality & other fixes. (#7862)
 - Fixed Next.js issue with PPR routes not rendering correctly. (#7625)

src/commands/init.ts

@@ -45,6 +45,12 @@
     name: "Functions: Configure a Cloud Functions directory and its files",
     checked: false,
   },
+  {
+    value: "apphosting",
+    name: "App Hosting: Configure an apphosting.yaml file for App Hosting",
+    checked: false,
+    hidden: false,
+  },
   {
     value: "hosting",
     name: "Hosting: Configure files for Firebase Hosting and (optionally) set up GitHub Action deploys",
@@ -87,12 +93,6 @@
     checked: false,
     hidden: true,
   },
-  {
-    value: "apphosting",
-    name: "App Hosting: Configure an apphosting.yaml file for App Hosting",
-    checked: false,
-    hidden: false,
-  },
 ];
 
 if (isEnabled("genkit")) {
@@ -176,7 +176,7 @@
 
   const setup: Setup = {
     config: config.src,
     rcfile: config.readProjectFile(".firebaserc", {
       json: true,
       fallback: {},
     }),

src/init/features/apphosting.ts

@@ -2,13 +2,16 @@
 import * as utils from "../../utils";
 import { Config } from "../../config";
 import { readTemplateSync } from "../../templates";
+import { checkBillingEnabled } from "../../gcp/cloudbilling";
 
 const APPHOSTING_YAML_TEMPLATE = readTemplateSync("init/apphosting/apphosting.yaml");
 
 /**
  * Set up an apphosting.yaml file for a new App Hosting project.
  */
 export async function doSetup(setup: any, config: Config): Promise<void> {
+  await checkBillingEnabled(setup.projectId);
   utils.logBullet("Writing default settings to " + clc.bold("apphosting.yaml") + "...");
   await config.askWriteProjectFile("apphosting.yaml", APPHOSTING_YAML_TEMPLATE);
+  utils.logSuccess("Create a new App Hosting backend with `firebase apphosting:backends:create`");
 }