Fixed bulk index requests in BWC tests and hardened assertions#4817
Merged
RyanL1997 merged 1 commit intoopensearch-project:mainfrom Oct 16, 2024
Merged
Fixed bulk index requests in BWC tests and hardened assertions#4817RyanL1997 merged 1 commit intoopensearch-project:mainfrom
RyanL1997 merged 1 commit intoopensearch-project:mainfrom
Conversation
Signed-off-by: Nils Bandener <nils.bandener@eliatra.com>
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #4817 +/- ##
==========================================
- Coverage 70.99% 70.70% -0.29%
==========================================
Files 310 310
Lines 20938 20938
Branches 3326 3326
==========================================
- Hits 14865 14805 -60
- Misses 4325 4389 +64
+ Partials 1748 1744 -4 |
willyborankin
approved these changes
Oct 16, 2024
cwperks
reviewed
Oct 16, 2024
bwc-test/src/test/java/org/opensearch/security/bwc/SecurityBackwardsCompatibilityIT.java
Show resolved
Hide resolved
cwperks
approved these changes
Oct 16, 2024
RyanL1997
approved these changes
Oct 16, 2024
Contributor
|
The backport to 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-4817-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 7692d77d551c7f9d0115b1466d1f4dd894b99324
# Push it to GitHub
git push --set-upstream origin backport/backport-4817-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security/backport-2.xThen, create a pull request where the |
Member
|
@nibix Can you create a manual backport for this PR? I suspect its due to the difference between Apache HttpCliient5 on main vs Apache HttpClient4 on 2.x |
Collaborator
Author
Sorry, I missed this request. Will do asap. |
1 task
3 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
So far, the BWC test
SecurityBackwardsCompatibilityIT.testDataIngestionAndSearchBackwardsCompatibility()did not ingest any documents, as the submitted bulk requests were invalid.The test already asserted that
_bulkAPI calls returned a 200 OK HTTP status. However, this is not sufficient, as the_bulkAPI also returns a 200 status if processing of the bulk items fails. Such failures are only reflected item-wise in the response body. This indeed happened, as the test erroneously serialized a string containing the JSON document again as JSON, creating a JSON string containing JSON. This was rejected by OpenSearch.This is now fixed - additional assertions have been created to verify that the items of the bulk request are actually indexed.
Additionally, the DLS rules of the user would not match any of the ingested documents. This would have caused the
_searchAPI always to return empty result sets - even if any documents were ingested.The indexed test documents were adjusted to have proper
genreattributes which can match the configured DLS rule. Additional assertions were added that verify that the DLS and FLS rules are correctly applied to the result set.Testing
Check List
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.