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

Ignore BaseRestHandler unconsumed content check as it's always consumed #13290

Merged
merged 3 commits into from
Apr 19, 2024

Conversation

dbwiddis
Copy link
Member

@dbwiddis dbwiddis commented Apr 18, 2024

Description

Removes the BaseRestHandler check for unconsumed content added in 687978b as this check was inadvertently made dead code (when using real HttpRequests and not mocked ones) in 1cd464d

Related Issues

Resolves #13011
Related to opensearch-project/flow-framework#638

Check List

  • New functionality includes testing.
    • All tests pass
  • [ ] New functionality has been documented. (This behavior was undocumented and remains so.)
    • [ ] New functionality has javadoc added (No new functionality)
  • Failing checks are inspected and point to the corresponding known issue(s) (See: Troubleshooting Failing Builds)
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)
  • [ ] Public documentation issue/PR created (This behavior was undocumented and remains so.)

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: Daniel Widdis <widdis@gmail.com>
Copy link
Contributor

❌ Gradle check result for 50a25ca: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Signed-off-by: Daniel Widdis <widdis@gmail.com>
Copy link
Contributor

❌ Gradle check result for 2028570: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Member

@cwperks cwperks left a comment

Choose a reason for hiding this comment

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

LGTM!

Copy link
Contributor

❌ Gradle check result for 099c127: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Signed-off-by: Daniel Widdis <widdis@gmail.com>
Copy link
Contributor

❌ Gradle check result for 1c666ea: null

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

✅ Gradle check result for 1c666ea: SUCCESS

Copy link

codecov bot commented Apr 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.33%. Comparing base (b15cb0c) to head (1c666ea).
Report is 195 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main   #13290      +/-   ##
============================================
- Coverage     71.42%   71.33%   -0.09%     
- Complexity    59978    60561     +583     
============================================
  Files          4985     5039      +54     
  Lines        282275   285432    +3157     
  Branches      40946    41337     +391     
============================================
+ Hits         201603   203618    +2015     
- Misses        63999    65002    +1003     
- Partials      16673    16812     +139     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@dbwiddis dbwiddis merged commit 0282e64 into opensearch-project:main Apr 19, 2024
31 checks passed
@dbwiddis dbwiddis deleted the ignore-content branch April 19, 2024 06:05
@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/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-13290-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 0282e64bb25a8485526a1b6bf584ac2b9495f219
# Push it to GitHub
git push --set-upstream origin backport/backport-13290-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x

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

dbwiddis added a commit to dbwiddis/OpenSearch that referenced this pull request Apr 19, 2024
…ed (opensearch-project#13290)

* Ignore BaseRestHandler unconsumed content check as it's always consumed

Signed-off-by: Daniel Widdis <widdis@gmail.com>

* Remove comment, continue to ignore content on Force Merge

Signed-off-by: Daniel Widdis <widdis@gmail.com>

* Remove no-body test from RestDeletePitActionTests

Signed-off-by: Daniel Widdis <widdis@gmail.com>

---------

Signed-off-by: Daniel Widdis <widdis@gmail.com>
peternied pushed a commit that referenced this pull request Apr 19, 2024
…ed (#13290) (#13299)

Signed-off-by: Daniel Widdis <widdis@gmail.com>
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 backport-failed bug Something isn't working Other
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] The RestController always consumes content when handling real HTTP requests
5 participants