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 cryptography and orjson #17054

Merged
merged 4 commits into from
Mar 7, 2024
Merged

Conversation

FlorentClarret
Copy link
Member

@FlorentClarret FlorentClarret commented Mar 5, 2024

What does this PR do?

Bump cryptography and orjson

Motivation

To fix CVE. We are deprecating Centos 6 so we can bump them

Additional Notes

Review checklist (to be filled by reviewers)

  • Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
  • Changelog entries must be created for modifications to shipped code
  • Add the qa/skip-qa label if the PR doesn't need to be tested during QA.

Copy link

codecov bot commented Mar 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 90.10%. Comparing base (2c7325a) to head (8e6466b).

Additional details and impacted files
Flag Coverage Δ
activemq ?
cassandra ?
cisco_aci 95.31% <ø> (ø)
confluent_platform ?
datadog_checks_base 89.59% <ø> (+0.84%) ⬆️
hive ?
hivemq ?
http_check 95.32% <ø> (+2.02%) ⬆️
ignite ?
jboss_wildfly ?
kafka ?
mysql 87.61% <ø> (?)
presto ?
solr ?
tls 92.93% <ø> (+0.87%) ⬆️
weblogic ?

Flags with carried forward coverage won't be shown. Click here to find out more.

Copy link

github-actions bot commented Mar 5, 2024

Test Results

   32 files     32 suites   21m 37s ⏱️
1 469 tests 1 450 ✅  19 💤 0 ❌
6 144 runs  5 367 ✅ 777 💤 0 ❌

Results for commit 8e6466b.

♻️ This comment has been updated with latest results.

@FlorentClarret FlorentClarret changed the title bump cryptography Bump cryptography and orjson Mar 5, 2024
@FlorentClarret FlorentClarret marked this pull request as ready for review March 5, 2024 14:03
@FlorentClarret FlorentClarret requested review from a team as code owners March 5, 2024 14:03
lu-zhengda
lu-zhengda previously approved these changes Mar 5, 2024
@FlorentClarret FlorentClarret force-pushed the florentclarret/bump_cryptography branch from 08b2d66 to 8e6466b Compare March 7, 2024 10:30
@FlorentClarret FlorentClarret merged commit 2966389 into master Mar 7, 2024
40 of 43 checks passed
@FlorentClarret FlorentClarret deleted the florentclarret/bump_cryptography branch March 7, 2024 14:41
@datadog-agent-integrations-bot
Copy link
Contributor

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

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

marlon-merida pushed a commit that referenced this pull request Mar 11, 2024
* bump cryptography

* Bump orjson to 3.9.15 for addressing CVE-2024-27454

Signed-off-by: Vivekanand Ilango <vivekanand.ilango@datadoghq.com>

* changelogs

* changelogs

---------

Signed-off-by: Vivekanand Ilango <vivekanand.ilango@datadoghq.com>
Co-authored-by: Vivekanand Ilango <vivekanand.ilango@datadoghq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants