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

[tammam-g]

Spark account can choose to use existing free instance or choose a new instance to be provisioned later

If new instance is chosen and free trial is used we will print upgrade instructions at the end

[gemini-code-assist]

Summary of Changes

Hello @tammam-g, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request resolves an issue within the Spark account initialization process where users faced difficulties in selecting a SQL instance, particularly during a second initialization. The changes refine the user experience by providing more informative prompts regarding billing requirements for new CloudSQL instances and by ensuring that appropriate upgrade instructions are presented at the correct stage when a free trial has been utilized and a billing account is necessary.

Highlights

• CloudSQL Instance Selection Logic: Refactored the logic for handling CloudSQL instance selection during Spark account initialization, specifically addressing scenarios where a free trial has been used or billing is required.
• Improved User Prompts: Enhanced the user prompt for creating new CloudSQL instances to clearly indicate when a billing account is required, improving clarity for users without billing enabled.
• Corrected Upgrade Instructions Display: Ensured that upgrade instructions are correctly displayed and the flow is halted when a user attempts to create a new CloudSQL instance after exhausting a free trial and without an active billing account.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description
Code Review	/gemini review	Performs a code review for the current pull request in its current state.
Pull Request Summary	/gemini summary	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help	/gemini help	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

[gemini-code-assist]

Code Review

This pull request refactors the Cloud SQL instance selection flow during firebase init dataconnect for users on the Spark plan. The changes correctly move the logic for handling billing requirements to a later stage, only after the user explicitly chooses to create a new paid instance. Additionally, the user-facing prompt is improved for clarity. The overall change improves the user experience and fixes the described issue. I have one minor suggestion to improve code clarity by removing a redundant fallback.

[gemini-code-assist]

The promptForCloudSQL function includes a guard at the beginning (if (!setup.projectId) { return; }), which ensures that setup.projectId is always defined at this point in the code. Consequently, the fallback to "your-firebase-project" is redundant.

Removing this fallback and relying on the established contract that setup.projectId exists will make the code cleaner and prevent the generation of a non-functional URL in the unlikely scenario that the initial guard is removed and setup.projectId is falsy.

Suggested change

	setup.instructions.push(
	upgradeInstructions(setup.projectId || "your-firebase-project", true),
	);
	setup.instructions.push(
	upgradeInstructions(setup.projectId!, true),
	);

[joehan]

Good suggestion

[joehan]

LGTM