Skip to content

Conversation

@pacoavila808
Copy link
Contributor

@pacoavila808 pacoavila808 commented Nov 24, 2025

Fix inconsistent handling of Firestore Project and Database ID in routing header (resolves #36894)

Updates the WriteFn logic to consistently handle the project / database ID values that it sets in the routing header and RPC requests.


Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:

  • Mention the appropriate issue in your description (for example: addresses #123), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, comment fixes #<ISSUE NUMBER> instead.
  • Update CHANGES.md with noteworthy changes.
  • If this contribution is large, please file an Apache Individual Contributor License Agreement.

See the Contributor Guide for more tips on how to make review process smoother.

To check the build health, please visit https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md

GitHub Actions Tests Status (on master branch)

Build python source distribution and wheels
Python tests
Java tests
Go tests

See CI.md for more information about GitHub Actions CI or the workflows README to see a list of phrases to trigger workflows.

@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello @pacoavila808, 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 inconsistency in how Firestore Project and Database IDs are handled within the Beam SDK. The changes introduce a more robust and explicit mechanism for resolving these IDs when creating Firestore stubs and making API requests. This ensures that the correct project and database are consistently targeted, improving reliability and configurability, particularly in testing environments.

Highlights

  • Refactored FirestoreStub Creation: Introduced an overloaded getFirestoreStub method in FirestoreStatefulComponentFactory that accepts explicit configuredProjectId and configuredDatabaseId parameters, allowing for more precise control over the target Firestore instance.
  • Enhanced Project and Database ID Resolution: The logic for constructing the x-goog-request-params header has been improved to prioritize explicitly provided project and database IDs, falling back to FirestoreOptions and then GcpOptions for the project ID, ensuring consistent and predictable ID usage.
  • Explicit ID Usage in FirestoreV1WriteFn: The FirestoreV1WriteFn now utilizes the new getFirestoreStub method, passing the resolved project and database IDs directly, which aligns its behavior with the updated ID resolution mechanism.
  • Updated Firestore Testing Helper: The FirestoreTestingHelper has been modified to accept an explicit database ID during its instantiation, enabling more flexible and accurate testing scenarios that reflect the new ID handling logic.
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.

@pacoavila808
Copy link
Contributor Author

R: @yixiaoshen

@github-actions
Copy link
Contributor

Stopping reviewer notifications for this pull request: review requested by someone other than the bot, ceding control. If you'd like to restart, comment assign set of reviewers

Copy link
Contributor

@yixiaoshen yixiaoshen left a comment

Choose a reason for hiding this comment

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

thanks for the fix

@pacoavila808
Copy link
Contributor Author

assign set of reviewers

@github-actions
Copy link
Contributor

Assigning reviewers:

R: @kennknowles for label java.

Note: If you would like to opt out of this review, comment assign to next reviewer.

Available commands:

  • stop reviewer notifications - opt out of the automated review tooling
  • remind me after tests pass - tag the comment author after tests pass
  • waiting on author - shift the attention set back to the author (any comment or push by the author will return the attention set to the reviewers)

The PR bot will only process comments in the main thread (not review comments).

Copy link
Contributor

@Abacn Abacn left a comment

Choose a reason for hiding this comment

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

Thanks, will merge once tests completed

@Abacn Abacn merged commit 2ffd443 into apache:master Nov 26, 2025
17 checks passed
@pacoavila808 pacoavila808 deleted the fsProjectBugFix branch November 26, 2025 17:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug]: FirestoreV1 Beam connectors allow configuring inconsistent project/database IDs between RPC requests and routing headers

3 participants