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

Bumps snakeyaml to 2.0 #6511

Merged
merged 2 commits into from
Mar 1, 2023

Conversation

owaiskazi19
Copy link
Member

@owaiskazi19 owaiskazi19 commented Feb 28, 2023

Description

Snakeyaml released the version 2.0 which also addresses the CVE-2022-1471.

Issues Resolved

#5576

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
  • 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.

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@codecov-commenter
Copy link

Codecov Report

Merging #6511 (ca94902) into main (bc50a2e) will increase coverage by 0.16%.
The diff coverage is 100.00%.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@             Coverage Diff              @@
##               main    #6511      +/-   ##
============================================
+ Coverage     70.64%   70.81%   +0.16%     
- Complexity    59005    59134     +129     
============================================
  Files          4802     4802              
  Lines        282967   282967              
  Branches      40793    40793              
============================================
+ Hits         199889   200370     +481     
+ Misses        66648    66188     -460     
+ Partials      16430    16409      -21     
Impacted Files Coverage Δ
...a/org/opensearch/extensions/ExtensionsManager.java 45.62% <100.00%> (ø)
...r/src/main/java/org/opensearch/http/HttpUtils.java 16.66% <0.00%> (-50.00%) ⬇️
...h/action/ingest/SimulateDocumentVerboseResult.java 60.71% <0.00%> (-39.29%) ⬇️
...java/org/opensearch/threadpool/ThreadPoolInfo.java 56.25% <0.00%> (-37.50%) ⬇️
...pensearch/action/ingest/DeletePipelineRequest.java 31.25% <0.00%> (-37.50%) ⬇️
...n/decider/SnapshotInProgressAllocationDecider.java 34.78% <0.00%> (-34.79%) ⬇️
...nsearch/index/shard/IndexShardClosedException.java 66.66% <0.00%> (-33.34%) ⬇️
...a/org/opensearch/index/mapper/MapperException.java 75.00% <0.00%> (-25.00%) ⬇️
...va/org/opensearch/monitor/process/ProcessInfo.java 68.00% <0.00%> (-24.00%) ⬇️
...pensearch/index/mapper/MapperParsingException.java 77.77% <0.00%> (-22.23%) ⬇️
... and 490 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
@@ -34,6 +34,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Bump `joni` from 2.1.44 to 2.1.45
- Bump `commons-io:commons-io` from 2.7 to 2.11.0
- Bump `org.jruby.joni:joni` from 2.1.45 to 2.1.48
- Bump `snakeyaml` from 1.33 to 2.0 ([#6511](https://github.com/opensearch-project/OpenSearch/pull/6511))
Copy link
Member

Choose a reason for hiding this comment

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

Do you plan to backport this change to 2.x?

Copy link
Member

Choose a reason for hiding this comment

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

Yes, please do backport (and move this to the 2.x section in this PR prior to the backport).

Copy link
Member Author

Choose a reason for hiding this comment

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

Pushed the change!

@andrross andrross added the backport 2.x Backport to 2.x branch label Feb 28, 2023
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@andrross
Copy link
Member

andrross commented Mar 1, 2023

@owaiskazi19 Can you rebase this?

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>
Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>
@github-actions
Copy link
Contributor

github-actions bot commented Mar 1, 2023

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.search.backpressure.SearchBackpressureIT.testSearchShardTaskCancellationWithHighCpu

@andrross andrross merged commit 8bda365 into opensearch-project:main Mar 1, 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:

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

@kotwanikunal
Copy link
Member

Backport failed due to changelog divergence. Fix: #6518

@cwperks
Copy link
Member

cwperks commented Mar 9, 2023

@owaiskazi19 @saratvemulapalli Should this be backported to 1.3?

mingshl pushed a commit to mingshl/OpenSearch-Mingshl that referenced this pull request Mar 24, 2023
* Bumps snakeyaml to 2.0

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>

* Moved changelog under 2.x

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>

---------

Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>
Signed-off-by: Mingshi Liu <mingshl@amazon.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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants