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

[Build Break] Fix build after Lucene upgrade and breaking XContentFactory changes #3069

Merged

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented Jul 29, 2023

There are multiple PRs in core affecting the security plugin that the security plugin needs to adapt to.

I am opening a Draft PR that includes a fix for the Lucene-related test failures which was caused by opensearch-project/OpenSearch#7792

Resolves: #3064

Signed-off-by: Craig Perkins <[email protected]>
@codecov
Copy link

codecov bot commented Jul 29, 2023

Codecov Report

Merging #3069 (e50d967) into main (d3488e8) will increase coverage by 26.41%.
The diff coverage is 100.00%.

@@              Coverage Diff              @@
##               main    #3069       +/-   ##
=============================================
+ Coverage     36.01%   62.42%   +26.41%     
- Complexity     1870     3349     +1479     
=============================================
  Files           254      254               
  Lines         19735    19744        +9     
  Branches       3334     3334               
=============================================
+ Hits           7108    12326     +5218     
+ Misses        11532     5785     -5747     
- Partials       1095     1633      +538     
Files Changed Coverage Δ
...security/configuration/DlsFlsFilterLeafReader.java 61.52% <100.00%> (+43.55%) ⬆️
.../org/opensearch/security/support/ConfigHelper.java 86.53% <100.00%> (+26.92%) ⬆️
...a/org/opensearch/security/tools/SecurityAdmin.java 44.40% <100.00%> (+44.40%) ⬆️

... and 149 files with indirect coverage changes

@willyborankin willyborankin merged commit 08d1734 into opensearch-project:main Jul 31, 2023
55 checks passed
@cwperks cwperks added the backport 2.x backport to 2.x branch label Jul 31, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

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
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-3069-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 08d17343c0821f7b7528a9559fc3384af5aa2c5b
# Push it to GitHub
git push --set-upstream origin backport/backport-3069-to-2.x
# Go back to the original working tree
cd ../..
# 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-3069-to-2.x.

@cwperks
Copy link
Member Author

cwperks commented Jul 31, 2023

I will create a backport for this ASAP.

cwperks added a commit to cwperks/security that referenced this pull request Jul 31, 2023
…pensearch-project#3069)

There are multiple PRs in core affecting the security plugin that the
security plugin needs to adapt to.

- opensearch-project/OpenSearch#7792
- opensearch-project/OpenSearch#8826
- opensearch-project/OpenSearch#8668

I am opening a Draft PR that includes a fix for the Lucene-related test
failures which was caused by
opensearch-project/OpenSearch#7792

Resolves: opensearch-project#3064

Signed-off-by: Craig Perkins <[email protected]>
(cherry picked from commit 08d1734)
peternied pushed a commit that referenced this pull request Jul 31, 2023
@peternied peternied changed the title Fix build after Lucene upgrade and breaking XContentFactory changes [Build Break] Fix build after Lucene upgrade and breaking XContentFactory changes Aug 31, 2023
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.

Investigate CI Failures
3 participants