Skip to content

fix(cli): respect .env override for GOOGLE_CLOUD_PROJECT#26288

Merged
DavidAPierce merged 3 commits intomainfrom
fix-cloudshell-vertex-env-override
May 1, 2026
Merged

fix(cli): respect .env override for GOOGLE_CLOUD_PROJECT#26288
DavidAPierce merged 3 commits intomainfrom
fix-cloudshell-vertex-env-override

Conversation

@DavidAPierce
Copy link
Copy Markdown
Contributor

Summary

Fixes a bug where GOOGLE_CLOUD_PROJECT overrides from .env files were being ignored in Cloud Shell when the vertex-ai authentication type was selected.

Details

Previously, setUpCloudShellEnvironment returned early if AuthType.USE_VERTEX_AI was selected, completely skipping the local .env parsing block. Because the environment variable was populated before returning, loadEnvironment's generic parser would skip it, leaving .env overrides ignored.

This change removes the early return, sets the baseline project fallback appropriately, and executes the .env parsing logic for all authentication types. This guarantees that explicit .env configurations are correctly respected.

Related Issues

Follow up for #24494

How to Validate

  1. Run the targeted unit test validating the .env override logic:
    npm run test -- packages/cli/src/config/settings.test.ts -t "should respect .env override for GOOGLE_CLOUD_PROJECT in Cloud Shell when auth type is vertex-ai"
  2. (Manual) In a Cloud Shell environment, set a GOOGLE_CLOUD_PROJECT in your .env file, switch your auth type to vertex-ai, and verify that the CLI respects the .env project over the gcloud active project.

Pre-Merge Checklist

  • Updated relevant documentation and README (if needed)
  • Added/updated tests (if needed)
  • Noted breaking changes (if any)
  • Validated on required platforms/methods:
    • MacOS
      • npm run
      • npx
      • Docker
      • Podman
      • Seatbelt
    • Windows
      • npm run
      • npx
      • Docker
    • Linux
      • npm run
      • npx
      • Docker

…ll when auth type is vertex-ai

Removed the early return in `setUpCloudShellEnvironment` so that the .env override logic is correctly applied.
@DavidAPierce DavidAPierce requested a review from a team as a code owner April 30, 2026 20:41
@gemini-code-assist
Copy link
Copy Markdown
Contributor

Summary of Changes

Hello, I'm Gemini Code Assist1! 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 addresses an issue where environment variable overrides defined in .env files were being ignored when using Vertex AI authentication within Cloud Shell. By refactoring the environment setup flow to remove an premature exit, the system now correctly processes local configuration files regardless of the selected authentication type, ensuring consistent behavior for project-specific settings.

Highlights

  • Environment Variable Resolution: Removed the early return in setUpCloudShellEnvironment for Vertex AI authentication, ensuring that local .env file parsing logic is consistently executed.
  • Project Fallback Logic: Updated the project fallback mechanism to correctly prioritize .env overrides over default Cloud Shell project settings.
  • Test Coverage: Added a new unit test case to verify that GOOGLE_CLOUD_PROJECT is correctly overridden by .env files when using Vertex AI authentication in Cloud Shell.
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.

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-cli
Copy link
Copy Markdown
Contributor

gemini-cli Bot commented Apr 30, 2026

Hi @DavidAPierce, thank you so much for your contribution to Gemini CLI! We really appreciate the time and effort you've put into this.

We're making some updates to our contribution process to improve how we track and review changes. Please take a moment to review our recent discussion post: Improving Our Contribution Process & Introducing New Guidelines.

Key Update: Starting January 26, 2026, the Gemini CLI project will require all pull requests to be associated with an existing issue. Any pull requests not linked to an issue by that date will be automatically closed.

Thank you for your understanding and for being a part of our community!

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 30, 2026

Size Change: -80 B (0%)

Total Size: 33.9 MB

Filename Size Change
./bundle/chunk-2HF5A2L7.js 0 B -3.43 kB (removed) 🏆
./bundle/chunk-6L7YPSBA.js 0 B -49.2 kB (removed) 🏆
./bundle/chunk-BIPJORYT.js 0 B -657 kB (removed) 🏆
./bundle/chunk-D3SPH3LR.js 0 B -2.72 MB (removed) 🏆
./bundle/chunk-QJJD4TLW.js 0 B -3.8 kB (removed) 🏆
./bundle/chunk-T24QVA6Y.js 0 B -12.5 kB (removed) 🏆
./bundle/chunk-WQXBH5OA.js 0 B -14.7 MB (removed) 🏆
./bundle/chunk-XVU2V5AO.js 0 B -19.5 kB (removed) 🏆
./bundle/core-K72OTWQW.js 0 B -48.2 kB (removed) 🏆
./bundle/devtoolsService-T5LJY75F.js 0 B -28 kB (removed) 🏆
./bundle/gemini-XPRGQ4QD.js 0 B -582 kB (removed) 🏆
./bundle/interactiveCli-GI5F27AH.js 0 B -1.32 MB (removed) 🏆
./bundle/liteRtServerManager-DDLMRFLI.js 0 B -2.11 kB (removed) 🏆
./bundle/oauth2-provider-OMHTS7KG.js 0 B -9.16 kB (removed) 🏆
./bundle/chunk-2HJECZTT.js 12.5 kB +12.5 kB (new file) 🆕
./bundle/chunk-5N463PZ7.js 49.2 kB +49.2 kB (new file) 🆕
./bundle/chunk-HSEL54XL.js 14.7 MB +14.7 MB (new file) 🆕
./bundle/chunk-JGQ3ZNNF.js 19.5 kB +19.5 kB (new file) 🆕
./bundle/chunk-POVAYXPC.js 3.8 kB +3.8 kB (new file) 🆕
./bundle/chunk-QLZOLSC3.js 657 kB +657 kB (new file) 🆕
./bundle/chunk-V3D66YTE.js 3.43 kB +3.43 kB (new file) 🆕
./bundle/chunk-WDYKDAU7.js 2.72 MB +2.72 MB (new file) 🆕
./bundle/core-2VGTWHOE.js 48.2 kB +48.2 kB (new file) 🆕
./bundle/devtoolsService-HWBE2EVU.js 28 kB +28 kB (new file) 🆕
./bundle/gemini-OH75SFRH.js 582 kB +582 kB (new file) 🆕
./bundle/interactiveCli-DQ6G47DI.js 1.32 MB +1.32 MB (new file) 🆕
./bundle/liteRtServerManager-H5VGU6K7.js 2.11 kB +2.11 kB (new file) 🆕
./bundle/oauth2-provider-WIXABAMG.js 9.16 kB +9.16 kB (new file) 🆕
ℹ️ View Unchanged
Filename Size Change
./bundle/bundled/third_party/index.js 8 MB 0 B
./bundle/chunk-34MYV7JD.js 2.45 kB 0 B
./bundle/chunk-5AUYMPVF.js 858 B 0 B
./bundle/chunk-5PS3AYFU.js 1.18 kB 0 B
./bundle/chunk-664ZODQF.js 124 kB 0 B
./bundle/chunk-DAHVX5MI.js 206 kB 0 B
./bundle/chunk-IBHWQ36L.js 1.97 MB 0 B
./bundle/chunk-IUUIT4SU.js 56.5 kB 0 B
./bundle/chunk-RJTRUG2J.js 39.8 kB 0 B
./bundle/cleanup-BY42NUY7.js 0 B -932 B (removed) 🏆
./bundle/devtools-36NN55EP.js 696 kB 0 B
./bundle/dist-T73EYRDX.js 356 B 0 B
./bundle/events-XB7DADIJ.js 418 B 0 B
./bundle/examples/hooks/scripts/on-start.js 188 B 0 B
./bundle/examples/mcp-server/example.js 1.43 kB 0 B
./bundle/gemini.js 5.14 kB 0 B
./bundle/getMachineId-bsd-TXG52NKR.js 1.55 kB 0 B
./bundle/getMachineId-darwin-7OE4DDZ6.js 1.55 kB 0 B
./bundle/getMachineId-linux-SHIFKOOX.js 1.34 kB 0 B
./bundle/getMachineId-unsupported-5U5DOEYY.js 1.06 kB 0 B
./bundle/getMachineId-win-6KLLGOI4.js 1.72 kB 0 B
./bundle/memoryDiscovery-KH2QDS2N.js 980 B 0 B
./bundle/multipart-parser-KPBZEGQU.js 11.7 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/client/main.js 222 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/_client-assets.js 229 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/index.js 13.4 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/types.js 132 B 0 B
./bundle/sandbox-macos-permissive-open.sb 890 B 0 B
./bundle/sandbox-macos-permissive-proxied.sb 1.31 kB 0 B
./bundle/sandbox-macos-restrictive-open.sb 3.36 kB 0 B
./bundle/sandbox-macos-restrictive-proxied.sb 3.56 kB 0 B
./bundle/sandbox-macos-strict-open.sb 4.82 kB 0 B
./bundle/sandbox-macos-strict-proxied.sb 5.02 kB 0 B
./bundle/src-QVCVGIUX.js 47 kB 0 B
./bundle/start-K5YWXX2E.js 0 B -652 B (removed) 🏆
./bundle/tree-sitter-7U6MW5PS.js 274 kB 0 B
./bundle/tree-sitter-bash-34ZGLXVX.js 1.84 MB 0 B
./bundle/cleanup-6QH6KZLL.js 932 B +932 B (new file) 🆕
./bundle/start-HTP6VAAG.js 652 B +652 B (new file) 🆕

compressed-size-action

Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request refactors the setUpCloudShellEnvironment function to ensure that .env file configurations for GOOGLE_CLOUD_PROJECT are correctly applied when using Vertex AI authentication within Cloud Shell. By integrating the Vertex AI project logic into the main environment processing flow, the system now properly prioritizes local environment file settings over default Cloud Shell values. Additionally, a new test case has been added to verify this override behavior. I have no feedback to provide.

@gemini-cli gemini-cli Bot added the status/need-issue Pull requests that need to have an associated issue. label Apr 30, 2026
@DavidAPierce DavidAPierce enabled auto-merge May 1, 2026 16:45
@DavidAPierce DavidAPierce added this pull request to the merge queue May 1, 2026
Merged via the queue into main with commit 9cb4802 May 1, 2026
27 checks passed
@DavidAPierce DavidAPierce deleted the fix-cloudshell-vertex-env-override branch May 1, 2026 17:05
TirthNaik-99 pushed a commit to TirthNaik-99/gemini-cli that referenced this pull request May 4, 2026
kimjune01 pushed a commit to kimjune01/gemini-cli-claude that referenced this pull request May 6, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

status/need-issue Pull requests that need to have an associated issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants