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.

Sign up for GitHub

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

Jump to bottom

[8.17](backport #4367) Bump ristretto to v0.2.0 #4378

Merged
merged 1 commit into from
Jan 30, 2025
Merged

[8.17](backport #4367) Bump ristretto to v0.2.0 #4378

merged 1 commit into from
Jan 30, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 30, 2025

What is the problem this PR solves?

This fixes CVE-2024-45339.

How does this PR solve the problem?

By updating ristretto to a version that doesn't depend on glog.

This is an automatic backport of pull request #4367 done by [Mergify](https://mergify.com).

@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jan 30, 2025
@mergify mergify bot requested a review from a team as a code owner January 30, 2025 08:55
@mergify mergify bot requested a review from pkoutsovasilis January 30, 2025 08:55
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Jan 30, 2025

Cherry-pick of de20ff0 has failed:

On branch mergify/bp/8.17/pr-4367
Your branch is up to date with 'origin/8.17'.

You are currently cherry-picking commit de20ff0.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   NOTICE.txt
	modified:   go.sum

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   testing/go.mod
	both modified:   testing/go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested a review from kaanyalti January 30, 2025 08:55
swiatekm
swiatekm previously approved these changes Jan 30, 2025
View reviewed changes
pkoutsovasilis
pkoutsovasilis reviewed Jan 30, 2025
View reviewed changes
Copy link

@pkoutsovasilis pkoutsovasilis left a comment

Choose a reason for hiding this comment

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

@swiatekm can you handle the conflicts before approving? 🙂

@swiatekm
Bump ristretto to v0.2.0 (#4367)
49d8382 
This fixes  CVE-2024-45339.

(cherry picked from commit de20ff0)

# Conflicts:
#	go.mod
#	testing/go.mod
#	testing/go.sum
@swiatekm swiatekm force-pushed the mergify/bp/8.17/pr-4367 branch from 765f557 to 49d8382 Compare January 30, 2025 09:05
@elastic-sonarqube Elastic SonarQube
Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@swiatekm swiatekm enabled auto-merge (squash) January 30, 2025 09:33
@swiatekm swiatekm merged commit 07049a6 into 8.17 Jan 30, 2025
8 checks passed
@swiatekm swiatekm deleted the mergify/bp/8.17/pr-4367 branch January 30, 2025 09:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pkoutsovasilis pkoutsovasilis pkoutsovasilis approved these changes

@swiatekm swiatekm swiatekm left review comments

@kaanyalti kaanyalti Awaiting requested review from kaanyalti kaanyalti is a code owner automatically assigned from elastic/elastic-agent-control-plane

Assignees

@swiatekm swiatekm

Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@pkoutsovasilis @swiatekm