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.

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

Add wrapper to builder #806

Merged
merged 1 commit into from
Jan 18, 2024
Merged

Conversation

ls-urs-keller
Copy link
Contributor

Description

Add the missing builder and query function for the Kind.Wrapper

Issues Resolved

Missing isWrapper, wrapper() and wrapper(...) in a downstream project

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

reta
reta previously approved these changes Jan 10, 2024
@reta
Copy link
Collaborator

reta commented Jan 10, 2024

Looks like a miss, thank you @ls-urs-keller , could you please add CHANELOG entry?

@ls-urs-keller
Copy link
Contributor Author

Looks like a miss, thank you @ls-urs-keller , could you please add CHANELOG entry?

Done. What would be the process to get this into the next 2.8.2 version? PR to 2.x branch or back port from main? Thank you.

@reta
Copy link
Collaborator

reta commented Jan 12, 2024

Done. What would be the process to get this into the next 2.8.2 version? PR to 2.x branch or back port from main? Thank you.

Yes, the backport should be automatic but we sadly have DCO failing check :( could you please amend the commit? git --amend --sign-off ? thank you

Signed-off-by: Urs Keller <urs@ukeller.ch>
@VachaShah VachaShah merged commit 550dd4b into opensearch-project:main Jan 18, 2024
48 checks passed
@VachaShah VachaShah added the backport 2.x Backport to 2.x branch label Jan 18, 2024
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-806-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 550dd4b1e523d4d5d0d1c03104ace317dda4ccb9
# Push it to GitHub
git push --set-upstream origin backport/backport-806-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-806-to-2.x.

@@ -17,6 +17,8 @@ This section is for maintaining a changelog for all breaking changes for the cli
### Added
- Document HTTP/2 support ([#330](https://github.com/opensearch-project/opensearch-java/pull/330))
- Expose HTTP status code through `ResponseException#status` ([#756](https://github.com/opensearch-project/opensearch-java/pull/756))
- Added missing WrapperQuery accessors and builder methods ([#806](https://github.com/opensearch-project/opensearch-java/pull/806))
Copy link
Collaborator

Choose a reason for hiding this comment

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

Actually I merged this too quickly. This changelog line should be added to the [Unreleased 2.x] section since this is to be released in 2.x. This way, the backport workflow also will not have merge conflicts.

@VachaShah
Copy link
Collaborator

@ls-urs-keller Can you manually backport this please? Thank you!

@ls-urs-keller
Copy link
Contributor Author

ls-urs-keller commented Jan 19, 2024

@ls-urs-keller Can you manually backport this please? Thank you!

Hey. Yes no problem. So the workflow is:

  • decide if something will be back ported before merging to main
  • put to the release notes in the corresponding section based on that decision
  • manual back port if the decision comes later

What to do with the release notes on the main branch, do I create another PR to correct them, or is this done when 2.x is released?

ls-urs-keller added a commit to ls-urs-keller/opensearch-java that referenced this pull request Jan 19, 2024
Signed-off-by: Urs Keller <urs@ukeller.ch>
Co-authored-by: Urs Keller <urs@ukeller.ch>
@ls-urs-keller
Copy link
Contributor Author

Backport PR #816

reta pushed a commit that referenced this pull request Jan 19, 2024
Signed-off-by: Urs Keller <urs@ukeller.ch>
Co-authored-by: Urs Keller <urs@ukeller.ch>
@BrendonFaleiro BrendonFaleiro mentioned this pull request Jun 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants