Skip to content

Update DlsFlsFilterLeafReader to reflect Apache Lucene 10 APIs changes#5123

Merged
willyborankin merged 4 commits into
opensearch-project:mainfrom
reta:fix.filetered.reader
Feb 25, 2025
Merged

Update DlsFlsFilterLeafReader to reflect Apache Lucene 10 APIs changes#5123
willyborankin merged 4 commits into
opensearch-project:mainfrom
reta:fix.filetered.reader

Conversation

@reta
Copy link
Copy Markdown
Collaborator

@reta reta commented Feb 23, 2025

Description

Update DlsFlsFilterLeafReader to reflect Apache Lucene 10 APIs changes in the FilterTermsEnum

Issues Resolved

Follow up on #5053 and concretely this workaround https://github.com/opensearch-project/security/pull/5053/files#r1950155753

Is this a backport? If so, please add backport PR # and/or commits #, and remove backport-failed label from the original PR.

Do these changes introduce new permission(s) to be displayed in the static dropdown on the front-end? If so, please open a draft PR in the security dashboards plugin and link the draft PR here

Testing

[Please provide details of testing done: unit testing, integration testing and manual testing]

Check List

  • New functionality includes testing
  • New functionality has been documented
  • New Roles/Permissions have a corresponding security dashboards plugin PR
  • API changes companion pull request created
  • Commits are signed per the DCO using --signoff

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.

Signed-off-by: Andriy Redko <drreta@gmail.com>
@reta
Copy link
Copy Markdown
Collaborator Author

reta commented Feb 23, 2025

Blocked by #5122

@codecov
Copy link
Copy Markdown

codecov Bot commented Feb 24, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.72%. Comparing base (7e7ca19) to head (f00318c).
Report is 1 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #5123      +/-   ##
==========================================
+ Coverage   71.67%   71.72%   +0.04%     
==========================================
  Files         335      335              
  Lines       22747    22748       +1     
  Branches     3598     3599       +1     
==========================================
+ Hits        16303    16315      +12     
+ Misses       4646     4634      -12     
- Partials     1798     1799       +1     
Files with missing lines Coverage Δ
...security/configuration/DlsFlsFilterLeafReader.java 56.66% <100.00%> (+3.87%) ⬆️

... and 7 files with indirect coverage changes

@willyborankin willyborankin merged commit 25dcefd into opensearch-project:main Feb 25, 2025
@opensearch-trigger-bot
Copy link
Copy Markdown
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:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/security/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/security/backport-2.x
# Create a new branch
git switch --create backport/backport-5123-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 25dcefd7d6989456e9156e914dd46ed53a928978
# Push it to GitHub
git push --set-upstream origin backport/backport-5123-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security/backport-2.x

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

@willyborankin
Copy link
Copy Markdown
Collaborator

Hi @reta, could you please create a manual backport when you get a chance?

@reta
Copy link
Copy Markdown
Collaborator Author

reta commented Feb 25, 2025

Hi @reta, could you please create a manual backport when you get a chance?

This is for 3.0.0 only, no need to backport, thanks @willyborankin

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants