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] React to changes in ActionListener and ActionResponse from #9082 #3153

Merged
merged 1 commit into from
Aug 11, 2023

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented Aug 11, 2023

Description

Reacts to changes in ActionListener and ActionResponse introduced in opensearch-project/OpenSearch#9082

Also includes a fix for a call to XContentHelper.toXContent in response to opensearch-project/OpenSearch#9156

  • Category (Enhancement, New feature, Bug fix, Test fix, Refactoring, Maintenance, Documentation)

Maintenance

Issues Resolved

#3151

Check List

  • New functionality includes testing
  • New functionality has been documented
  • 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: Craig Perkins <craig5008@gmail.com>
@codecov
Copy link

codecov bot commented Aug 11, 2023

Codecov Report

Merging #3153 (171c059) into main (3139c18) will decrease coverage by 0.06%.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##               main    #3153      +/-   ##
============================================
- Coverage     62.48%   62.43%   -0.06%     
+ Complexity     3357     3351       -6     
============================================
  Files           254      254              
  Lines         19749    19749              
  Branches       3334     3334              
============================================
- Hits          12340    12330      -10     
- Misses         5779     5789      +10     
  Partials       1630     1630              
Files Changed Coverage Δ
.../opensearch/security/OpenSearchSecurityPlugin.java 84.34% <ø> (ø)
.../security/action/whoami/TransportWhoAmIAction.java 28.57% <ø> (ø)
...nsearch/security/action/whoami/WhoAmIResponse.java 0.00% <ø> (ø)
...ty/configuration/ConfigurationLoaderSecurity7.java 69.29% <ø> (ø)
...ity/configuration/DlsFilterLevelActionHandler.java 57.20% <ø> (ø)
...rch/security/configuration/DlsFlsRequestValve.java 0.00% <ø> (ø)
...search/security/configuration/DlsFlsValveImpl.java 59.23% <ø> (ø)
...arch/security/dlic/rest/api/AbstractApiAction.java 82.37% <ø> (ø)
...ch/security/dlic/rest/api/FlushCacheApiAction.java 63.63% <ø> (ø)
...earch/security/dlic/rest/api/MigrateApiAction.java 4.71% <ø> (ø)
... and 2 more

... and 5 files with indirect coverage changes

@cwperks
Copy link
Member Author

cwperks commented Aug 11, 2023

Manually removed gradle cache v8-gradle|Windows|ci-test[e4db8b2270e24daa96ed4ba1d65b2fc6]-3139c184137f0bfbe8c1dea7f3839724e7a3ebef

@peternied
Copy link
Member

Manually removed gradle cache ...

@cwperks With the speed snapshots are changing do we need to disable caching on OpenSearch to prevent this manual step?

@peternied peternied merged commit 31ec322 into opensearch-project:main Aug 11, 2023
@cwperks
Copy link
Member Author

cwperks commented Aug 11, 2023

@cwperks With the speed snapshots are changing do we need to disable caching on OpenSearch to prevent this manual step?

Yes, please.

I once had to delete ~80 caches manually. I did that because there was an approved PR and instead of opening a new one I went through the manual process of deleting caches. There is no bulk operation, it must be done one-by-one >.<

@RyanL1997 RyanL1997 added the backport 2.x backport to 2.x branch label Aug 15, 2023
@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:

# 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-3153-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 31ec3220841d063042926936bd803afaf2ace637
# Push it to GitHub
git push --set-upstream origin backport/backport-3153-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-3153-to-2.x.

cwperks added a commit to cwperks/security that referenced this pull request Aug 15, 2023
…nsearch-project#3153)

Reacts to changes in ActionListener and ActionResponse introduced in
opensearch-project/OpenSearch#9082

Also includes a fix for a call to XContentHelper.toXContent in response
to opensearch-project/OpenSearch#9156

Signed-off-by: Craig Perkins <craig5008@gmail.com>
(cherry picked from commit 31ec322)
cwperks pushed a commit that referenced this pull request Aug 15, 2023
### Description
Manual backport for #3153 of React to changes in ActionListener in core
Also includes a fix for a call to XContentHelper.toXContent in response
to opensearch-project/OpenSearch#9156
### Issues Resolved
* Relate opensearch-project/OpenSearch#9352
* Relate #3153 

### Check List
- [ ] ~New functionality includes testing~
- [ ] ~New functionality has been documented~
- [X] 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](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin).

---------

Signed-off-by: Ryan Liang <jiallian@amazon.com>
Signed-off-by: Peter Nied <petern@amazon.com>
Co-authored-by: Peter Nied <petern@amazon.com>
@peternied peternied changed the title React to changes in ActionListener and ActionResponse from #9082 [Build Break] React to changes in ActionListener and ActionResponse from #9082 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.

4 participants