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

Update rust dependencies #3330

Merged
merged 6 commits into from
Aug 23, 2023
Merged

Conversation

jpculp
Copy link
Member

@jpculp jpculp commented Aug 4, 2023

Description of changes:

Ran cargo update for sources and tools, avoided some updates that pull unnecessary extra versions, and adjusted the deny TOMLs as necessary. Also included updates for AWS SDK for Rust, coldsnap, and tough.

Testing done:

  • Build Bottlerocket
  • Publish AMI
  • Create SSM Parameter

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

@jpculp
Copy link
Member Author

jpculp commented Aug 4, 2023

I'll split this up into multiple commits after tough and coldsnap are released.

@jpculp jpculp mentioned this pull request Aug 4, 2023
Comment on lines +78 to +83
# aws-sdk-rust is using an old version of rustls, hyper-rustls, and tokio-rustls
{ name = "rustls", version = "=0.20" },
{ name = "hyper-rustls", version = "=0.23" },
{ name = "tokio-rustls", version = "=0.23" },
# kube-client uses an old version of redox_syscall
{ name = "redox_syscall", version = "=0.2" },
Copy link
Member Author

Choose a reason for hiding this comment

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

This looks like a lot, but it's because we're no longer skipping the entire testsys-model and bottlerocket-types trees.

Copy link
Member

@webern webern left a comment

Choose a reason for hiding this comment

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

Looks good. Actually looked at it.

@jpculp
Copy link
Member Author

jpculp commented Aug 23, 2023

  • Switched to newly released tough and coldsnap crates.
  • Broke PR up into multiple commits.
  • Updated a couple more minor dependencies.
  • Bumped PUBLISH_TUFTOOL_VERSION in Makefile.toml.

@jpculp
Copy link
Member Author

jpculp commented Aug 23, 2023

Rebased PR. Ready for review.

@jpculp jpculp marked this pull request as ready for review August 23, 2023 00:45
Copy link
Contributor

@stmcginnis stmcginnis left a comment

Choose a reason for hiding this comment

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

Built variant and able to deploy. Everything looks good.

@jpculp jpculp merged commit dea2c11 into bottlerocket-os:develop Aug 23, 2023
42 checks passed
@jpculp jpculp deleted the update-more-rust-deps branch August 23, 2023 21:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants