Fix second init on spark account not allowing choosing a sql instance

src/init/features/dataconnect/index.ts

@@ -118,7 +118,7 @@
 
 // askQuestions prompts the user about the Data Connect service they want to init. Any prompting
 // logic should live here, and _no_ actuation logic should live here.
 export async function askQuestions(setup: Setup): Promise<void> {
   const info: RequiredInfo = {
     flow: "",
     appDescription: "",
@@ -166,10 +166,10 @@
 
 // actuate writes product specific files and makes product specifc API calls.
 // It does not handle writing firebase.json and .firebaserc
 export async function actuate(setup: Setup, config: Config, options: any): Promise<void> {
   // Most users will want to persist data between emulator runs, so set this to a reasonable default.
   const dir: string = config.get("dataconnect.source", "dataconnect");
   const dataDir = config.get("emulators.dataconnect.dataDir", `${dir}/.dataconnect/pgliteData`);
   config.set("emulators.dataconnect.dataDir", dataDir);
 
   const info = setup.featureInfo?.dataconnect;
@@ -211,7 +211,7 @@
     setup.instructions.push(
       `You can visualize the Data Connect Schema in Firebase Console:
 
     https://console.firebase.google.com/project/${setup.projectId!}/dataconnect/locations/${info.locationId}/services/${info.serviceId}/schema`,
     );
   }
   setup.instructions.push(
@@ -223,7 +223,7 @@
   setup: Setup,
   config: Config,
   info: RequiredInfo,
   options: any,
 ): Promise<void> {
   const projectId = setup.projectId;
   if (!projectId) {
@@ -328,7 +328,7 @@
       { schemaGql: schemaFiles, connectors: connectors, seedDataGql: seedDataGql },
       options,
     );
   } catch (err: any) {
     logLabeledError("dataconnect", `Operation Generation failed...`);
     // GiF generate operation API has stability concerns.
     // Fallback to save only the generated schema.
@@ -402,9 +402,9 @@
   config: Config,
   info: RequiredInfo,
   serviceGql: ServiceGQL,
   options: any,
 ): Promise<void> {
   const dir: string = config.get("dataconnect.source") || "dataconnect";
   const subbedDataconnectYaml = subDataconnectYamlValues(
     {
       ...info,
@@ -703,12 +703,6 @@
       "dataconnect",
       "CloudSQL no cost trial has already been used on this project.",
     );
-    if (!billingEnabled) {
-      setup.instructions.push(
-        upgradeInstructions(setup.projectId || "your-firebase-project", true),
-      );
-      return;
-    }
   } else if (instrumentlessTrialEnabled || billingEnabled) {
     logLabeledSuccess("dataconnect", "CloudSQL no cost trial available!");
   }
@@ -729,7 +723,11 @@
       if (freeTrialAvailable) {
         choices.push({ name: "Create a new free trial instance", value: "", location: "" });
       } else {
-        choices.push({ name: "Create a new CloudSQL instance", value: "", location: "" });
+        choices.push({
+          name: `Create a new CloudSQL instance${billingEnabled ? "" : " (requires billing account)"}`,
+          value: "",
+          location: "",
+        });
       }
       info.cloudSqlInstanceId = await select<string>({
         message: `Which CloudSQL instance would you like to use?`,
@@ -741,6 +739,12 @@
         info.locationId = choices.find((c) => c.value === info.cloudSqlInstanceId)!.location;
       } else {
         info.flow += "_pick_new_csql";
+        if (!billingEnabled && freeTrialUsed) {
+          setup.instructions.push(
+            upgradeInstructions(setup.projectId || "your-firebase-project", true),
+          );
+          return;
+        }
         info.cloudSqlInstanceId = await input({
           message: `What ID would you like to use for your new CloudSQL instance?`,
           default: newUniqueId(