Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable FirestoreV1IT to run against a non default host #27256

Merged
merged 8 commits into from Jul 26, 2023
Merged

Enable FirestoreV1IT to run against a non default host #27256

merged 8 commits into from Jul 26, 2023

Conversation

SabaSathya
Copy link
Contributor

@SabaSathya SabaSathya commented Jun 27, 2023 •
edited

Added setHost() and getHost() to FirestoreOptions to allow endpoint (i.e. host + port) other than default endpoint for testing purposes.

Please add a meaningful description for your change here

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.

@SabaSathya SabaSathya changed the title Added FIRESTORE_HOST env variable to allow endpoint (i.e. host + port… Enable FirestoreV1IT to run against a non default host Jun 27, 2023
@SabaSathya
Copy link
Contributor Author

SabaSathya commented Jun 27, 2023 •
edited

addresses #27255

@SabaSathya SabaSathya marked this pull request as ready for review June 27, 2023 00:57
@github-actions
Copy link
Contributor

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

R: @bvolpato for label java.
R: @bvolpato for label io.

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).

@SabaSathya
Copy link
Contributor Author

Run PostCommit_Java_Dataflow

@SabaSathya
Copy link
Contributor Author

Run PostCommit_Java_DataflowV2

@Abacn
Copy link
Contributor

Abacn commented Jun 27, 2023 •
edited

Hi, I disabled FirestoreV1IT again on master due to test failures: #27267

I see the same test failure on this PR: https://ci-beam.apache.org/job/beam_PostCommit_Java_DataflowV1_PR/182/

For testing this PR now it would need to remove the exclusion here:

beam/runners/google-cloud-dataflow-java/build.gradle

Line 563 in 664f355

exclude '**/FirestoreV1IT.class'

beam/runners/google-cloud-dataflow-java/build.gradle

Line 612 in 664f355

exclude '**/FirestoreV1IT.class'

@bvolpato
Copy link
Contributor

Run Java PreCommit

1 similar comment
@SabaSathya
Copy link
Contributor Author

Run Java PreCommit

@SabaSathya
Copy link
Contributor Author

R: @pcostell for Firestore.

@github-actions
Copy link
Contributor

Stopping reviewer notifications for this pull request: review requested by someone other than the bot, ceding control

@SabaSathya
Added FIRESTORE_HOST env variable to allow endpoint (i.e. host + port…
c2a1ef1 
…) other than default endpoint for testing purposes. If FIRESTORE_HOST env variable is set, it will be used as Firestore endpoint. If FIRESTORE_HOST env variable is not set, the default endpoint will be used.
@SabaSathya
Fix format.
c4258cc
@SabaSathya
Set host only if options don't have it set already.
f45ecf6
@SabaSathya
Used FIRESTORE_EMULATOR_HOST env var for emulator host.
a1f5c6c
@damccorm
Copy link
Contributor

What are next steps on this PR? @SabaSathya @pcostell @Abacn

@Abacn
Copy link
Contributor

Abacn commented Jul 11, 2023

FirestoreV1IT integration tests need to be triggered by phrase Run PostCommit_Java_Dataflow The relevant tests is currently disabled: #27256 (comment)

To confirm, is this PR still blocked by #25851 ?

pcostell
pcostell reviewed Jul 20, 2023
View reviewed changes
...le-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/firestore/it/BaseFirestoreIT.java Outdated Show resolved Hide resolved
...ogle-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/firestore/FirestoreOptions.java Outdated Show resolved Hide resolved
...rm/src/main/java/org/apache/beam/sdk/io/gcp/firestore/FirestoreStatefulComponentFactory.java Outdated Show resolved Hide resolved
...rm/src/main/java/org/apache/beam/sdk/io/gcp/firestore/FirestoreStatefulComponentFactory.java Outdated Show resolved Hide resolved
...rm/src/main/java/org/apache/beam/sdk/io/gcp/firestore/FirestoreStatefulComponentFactory.java Outdated Show resolved Hide resolved
...d-platform/src/test/java/org/apache/beam/sdk/io/gcp/firestore/it/FirestoreTestingHelper.java Show resolved Hide resolved
sdks/java/io/google-cloud-platform/build.gradle Show resolved Hide resolved
@Abacn Abacn merged commit d3ea232 into apache:master Jul 26, 2023
23 checks passed
bullet03 pushed a commit to akvelon/beam that referenced this pull request Aug 11, 2023
@SabaSathya @bullet03
Enable FirestoreV1IT to run against a non default host (apache#27256)
565bb63 
* Added FIRESTORE_HOST env variable to allow endpoint (i.e. host + port) other than default endpoint for testing purposes. If FIRESTORE_HOST env variable is set, it will be used as Firestore endpoint. If FIRESTORE_HOST env variable is not set, the default endpoint will be used.

* Fix format.

* Set host only if options don't have it set already.

* Used FIRESTORE_EMULATOR_HOST env var for emulator host.

* Updated to use host as argument in FirestoreV1IT

* Don't inject value back into FirestoreOptions

* Updates for review comments

* Removed unused import
@kellen
Copy link
Contributor

kellen commented Oct 3, 2023

This PR results in a command line arg of --host, which is a little generic and has the risk of conflicting with other PipelineOptions classes (not to mention non-PipelineOptions arguments). Can we revisit to rename to something more specific like firestoreHost (which corresponds with the already-existing firestoreDb)

cc @Abacn

@Abacn
Copy link
Contributor

Abacn commented Oct 3, 2023

This PR results in a command line arg of --host, which is a little generic and has the risk of conflicting with other PipelineOptions classes (not to mention non-PipelineOptions arguments). Can we revisit to rename to something more specific like firestoreHost (which corresponds with the already-existing firestoreDb)

cc @Abacn

Thanks, this sounds totally reasonable and I should have noticed this honestly. Would you mind drafting a PR for it. This flag currently is used for testing purpose so it should be fine

This was referenced Oct 30, 2023
Merged
Merged
@SabaSathya SabaSathya deleted the ss-firestore-host branch November 11, 2023 00:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pcostell pcostell pcostell approved these changes

@Abacn Abacn Abacn approved these changes

Assignees
No one assigned
Labels
gcp io java Next Action: Reviewers
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@SabaSathya @Abacn @bvolpato @damccorm @kellen @pcostell