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

Bump reactor-netty-http to 1.0.24 in repository-azure #4880

Merged
merged 5 commits into from
Oct 24, 2022

Conversation

ryanbogan
Copy link
Member

Signed-off-by: Ryan Bogan rbogan@amazon.com

Description

Bumps reactor-netty-http to 1.0.24 in repository-azure

Issues Resolved

CVE-2022-31684

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff
  • [ X] Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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: Ryan Bogan <rbogan@amazon.com>
Signed-off-by: Ryan Bogan <rbogan@amazon.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

Signed-off-by: Ryan Bogan <rbogan@amazon.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

Signed-off-by: Ryan Bogan <rbogan@amazon.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@ryanbogan ryanbogan marked this pull request as ready for review October 21, 2022 23:05
@ryanbogan ryanbogan requested review from a team and reta as code owners October 21, 2022 23:05
@codecov-commenter
Copy link

Codecov Report

Merging #4880 (2b280cb) into main (3af46ae) will increase coverage by 0.14%.
The diff coverage is 80.64%.

@@             Coverage Diff              @@
##               main    #4880      +/-   ##
============================================
+ Coverage     70.70%   70.84%   +0.14%     
- Complexity    57896    57906      +10     
============================================
  Files          4689     4689              
  Lines        277137   276908     -229     
  Branches      40313    40299      -14     
============================================
+ Hits         195947   196173     +226     
+ Misses        64987    64499     -488     
- Partials      16203    16236      +33     
Impacted Files Coverage Δ
...main/java/org/opensearch/plugins/SearchPlugin.java 82.07% <ø> (+5.15%) ⬆️
.../main/java/org/opensearch/search/SearchModule.java 96.96% <ø> (+0.22%) ⬆️
...earch/search/aggregations/InternalAggregation.java 78.57% <ø> (+0.79%) ⬆️
...egations/pipeline/AvgBucketPipelineAggregator.java 91.66% <ø> (+18.33%) ⬆️
...ions/pipeline/BucketMetricsPipelineAggregator.java 89.47% <ø> (+28.75%) ⬆️
...tions/pipeline/BucketScriptPipelineAggregator.java 79.48% <ø> (+18.70%) ⬆️
...ons/pipeline/BucketSelectorPipelineAggregator.java 0.00% <ø> (ø)
...gations/pipeline/BucketSortPipelineAggregator.java 0.00% <ø> (ø)
...ions/pipeline/CumulativeSumPipelineAggregator.java 95.00% <ø> (+21.92%) ⬆️
...gations/pipeline/DerivativePipelineAggregator.java 96.77% <ø> (+23.60%) ⬆️
... and 520 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

CHANGELOG.md Outdated
@@ -64,6 +64,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- Bumps `tika` from 2.4.0 to 2.5.0 ([#4791](https://github.com/opensearch-project/OpenSearch/pull/4791))
- Exclude jettison version brought in with hadoop-minicluster. ([#4787](https://github.com/opensearch-project/OpenSearch/pull/4787))
- Bump protobuf-java to 3.21.7 in repository-gcs and repository-hdfs ([#]())
Bump reactor-netty-http to 1.0.24 in repository-azure ([#4880](https://github.com/opensearch-project/OpenSearch/pull/4880))
Copy link
Member

Choose a reason for hiding this comment

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

Missing a -

CHANGELOG.md Outdated
@@ -64,6 +64,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- Bumps `tika` from 2.4.0 to 2.5.0 ([#4791](https://github.com/opensearch-project/OpenSearch/pull/4791))
- Exclude jettison version brought in with hadoop-minicluster. ([#4787](https://github.com/opensearch-project/OpenSearch/pull/4787))
- Bump protobuf-java to 3.21.7 in repository-gcs and repository-hdfs ([#]())
Copy link
Member

Choose a reason for hiding this comment

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

This is also missing a PR link, care to fix?

Signed-off-by: Ryan Bogan <rbogan@amazon.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@dblock dblock merged commit 74b8ecd into opensearch-project:main Oct 24, 2022
@dblock dblock added the backport 2.x Backport to 2.x branch label Oct 24, 2022
@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-4880-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 74b8ecdf39c3cc78014d39f6cf89613467c94b57
# Push it to GitHub
git push --set-upstream origin backport/backport-4880-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-4880-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

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

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

@ryanbogan ryanbogan deleted the CVE-2022-31684 branch October 24, 2022 22:50
VachaShah pushed a commit to VachaShah/OpenSearch that referenced this pull request Oct 25, 2022
…ject#4880)

* Bump reactor-netty-http to 1.0.24

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

* Add CHANGELOG entry

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

* Bump reactor-netty-core to 1.0.24 to fix failing tests

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

* Update SHAs

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

* Addressed PR Comments

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

Signed-off-by: Ryan Bogan <rbogan@amazon.com>
VachaShah pushed a commit to VachaShah/OpenSearch that referenced this pull request Oct 25, 2022
…ject#4880)

* Bump reactor-netty-http to 1.0.24

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

* Add CHANGELOG entry

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

* Bump reactor-netty-core to 1.0.24 to fix failing tests

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

* Update SHAs

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

* Addressed PR Comments

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

Signed-off-by: Ryan Bogan <rbogan@amazon.com>
Signed-off-by: Vacha Shah <vachshah@amazon.com>
VachaShah pushed a commit to VachaShah/OpenSearch that referenced this pull request Oct 25, 2022
…ject#4880)

* Bump reactor-netty-http to 1.0.24

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

* Add CHANGELOG entry

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

* Bump reactor-netty-core to 1.0.24 to fix failing tests

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

* Update SHAs

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

* Addressed PR Comments

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

Signed-off-by: Ryan Bogan <rbogan@amazon.com>
Signed-off-by: Vacha Shah <vachshah@amazon.com>
VachaShah added a commit that referenced this pull request Oct 25, 2022
* Bump reactor-netty-http to 1.0.24 in repository-azure (#4880)

* Bump reactor-netty-http to 1.0.24

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

* Add CHANGELOG entry

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

* Bump reactor-netty-core to 1.0.24 to fix failing tests

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

* Update SHAs

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

* Addressed PR Comments

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

Signed-off-by: Ryan Bogan <rbogan@amazon.com>
Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Removing old SHAs and fixing CHANGELOG

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Bumping reactor-core to 3.4.23

Signed-off-by: Vacha Shah <vachshah@amazon.com>

Signed-off-by: Ryan Bogan <rbogan@amazon.com>
Signed-off-by: Vacha Shah <vachshah@amazon.com>
Co-authored-by: Ryan Bogan <10944539+ryanbogan@users.noreply.github.com>
ashking94 pushed a commit to ashking94/OpenSearch that referenced this pull request Nov 7, 2022
…ject#4880)

* Bump reactor-netty-http to 1.0.24

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

* Add CHANGELOG entry

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

* Bump reactor-netty-core to 1.0.24 to fix failing tests

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

* Update SHAs

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

* Addressed PR Comments

Signed-off-by: Ryan Bogan <rbogan@amazon.com>

Signed-off-by: Ryan Bogan <rbogan@amazon.com>
@ryanbogan ryanbogan added the backport 1.3 Backport to 1.3 branch label Jan 26, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.3 failed:

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

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-1.3 1.3
# Navigate to the new working tree
pushd ../.worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-4880-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 74b8ecdf39c3cc78014d39f6cf89613467c94b57
# Push it to GitHub
git push --set-upstream origin backport/backport-4880-to-1.3
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-1.3

Then, create a pull request where the base branch is 1.3 and the compare/head branch is backport/backport-4880-to-1.3.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.x backport 1.3 Backport to 1.3 branch backport 2.x Backport to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants