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 requests version from 2.26.0 to 2.31.0 #913

Merged

Conversation

naveentatikonda
Copy link
Member

Description

Fix CVE by bumping requests dependency version from 2.26.0 to 2.31.0

Issues Resolved

#910

Check List

  • New functionality includes testing.
  • All tests pass
  • Commits are signed as 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.

@codecov
Copy link

codecov bot commented May 24, 2023

Codecov Report

Merging #913 (6551205) into main (7a5c101) will decrease coverage by 0.25%.
The diff coverage is n/a.

❗ Current head 6551205 differs from pull request most recent head fa475fc. Consider uploading reports for the commit fa475fc to get more accurate results

@@             Coverage Diff              @@
##               main     #913      +/-   ##
============================================
- Coverage     85.35%   85.10%   -0.25%     
+ Complexity     1089     1084       -5     
============================================
  Files           152      152              
  Lines          4404     4404              
  Branches        389      389              
============================================
- Hits           3759     3748      -11     
- Misses          470      479       +9     
- Partials        175      177       +2     

see 2 files with indirect coverage changes

@martin-gaievski
Copy link
Member

why we're skipping changelog for this one? If some breaking change is that library it's good to let customer know about it by including it into release notes

@naveentatikonda
Copy link
Member Author

why we're skipping changelog for this one? If some breaking change is that library it's good to let customer know about it by including it into release notes

Ok. I thought for CVE fixes we don't include them in changelog

junqiu-lei
junqiu-lei previously approved these changes May 25, 2023
@martin-gaievski martin-gaievski dismissed stale reviews from junqiu-lei and themself via fa475fc May 25, 2023 22:37
@naveentatikonda naveentatikonda merged commit 15319e2 into opensearch-project:main May 25, 2023
@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-913-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 15319e2e57aace412809abed0ac4e29e6d18a4ad
# Push it to GitHub
git push --set-upstream origin backport/backport-913-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-913-to-2.x.

martin-gaievski pushed a commit to martin-gaievski/k-NN that referenced this pull request May 25, 2023
martin-gaievski pushed a commit to martin-gaievski/k-NN that referenced this pull request May 26, 2023
(cherry picked from commit 15319e2)
Signed-off-by: Martin Gaievski <[email protected]>
martin-gaievski added a commit that referenced this pull request May 26, 2023
(cherry picked from commit 15319e2)
Signed-off-by: Martin Gaievski <[email protected]>

Co-authored-by: Naveen Tatikonda <[email protected]>
@naveentatikonda naveentatikonda added the backport 1.3 Backports PRs to 1.3 branch label Jun 19, 2023
@opensearch-trigger-bot
Copy link
Contributor

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

naveentatikonda added a commit to naveentatikonda/k-NN that referenced this pull request Jun 21, 2023
naveentatikonda added a commit to naveentatikonda/k-NN that referenced this pull request Jun 21, 2023
naveentatikonda added a commit that referenced this pull request Jun 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.3 Backports PRs to 1.3 branch backport 2.x
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants