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 dependencies, tighten cargo-deny settings #919

Merged
merged 7 commits into from
Jul 19, 2024

Conversation

cbgbt
Copy link
Contributor

@cbgbt cbgbt commented Jul 18, 2024

Description of changes:

Run cargo-deny using the SDK


clippy: fixes for rust version update to 1.78


build using the Bottlerocket SDK


Update sdk to v0.42.0


Update kube version to 0.88 & k8s-openapi to 0.21


Update AWS SDK for Rust to 1


cargo update, tighten cargo-deny settings

This change also contains several major-version updates for dependencies to pass the cargo-deny checks.

Testing done:

  • integration testing

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.

@cbgbt cbgbt requested review from jpculp and sumukhballal July 18, 2024 22:59
@cbgbt cbgbt force-pushed the doing-our-chores branch from 509ad47 to 61766f5 Compare July 19, 2024 00:32
@cbgbt cbgbt changed the title Doing our chores Update dependencies, tighten cargo-deny settings Jul 19, 2024
@cbgbt cbgbt force-pushed the doing-our-chores branch from 61766f5 to e032c24 Compare July 19, 2024 01:01
@jpculp
Copy link
Member

jpculp commented Jul 19, 2024

This is great! For the crate dependencies, I found we can reduce some duplication with the following changes:

  • base64: pem v3.0.4 → v3.0.3, and setting our cargo.tomls to base64 0.21
  • ring: sct v0.7.0 → v0.7.1

@cbgbt cbgbt force-pushed the doing-our-chores branch from e032c24 to 5446961 Compare July 19, 2024 19:12
@cbgbt
Copy link
Contributor Author

cbgbt commented Jul 19, 2024

The integration tests run kind, which creates a cluster within Docker. Since I changed these tests to be run within the SDK container, they failed without access to the docker socket.

This change modifies the integration test runner to have access to the docker socket, plus network access to interact with the kind cluster running in an additional container.

@cbgbt
Copy link
Contributor Author

cbgbt commented Jul 19, 2024

This is great! For the crate dependencies, I found we can reduce some duplication with the following changes:

@jpculp Nice wrangling, though since these dependencies are smaller, I think may prefer to keep them more up-to-date over eliminating dupes. What do you think?

@cbgbt cbgbt marked this pull request as ready for review July 19, 2024 19:46
@jpculp
Copy link
Member

jpculp commented Jul 19, 2024

@jpculp Nice wrangling, though since these dependencies are smaller, I think may prefer to keep them more up-to-date over eliminating dupes. What do you think?

I'm not super worried about base64, but with pem the only difference between 3.0.3 and 3.0.4 is the base64. If we want the benefits of base64 0.22 over 0.21 then yeah go for it.

As far as sct goes, there is no reason not to update to 0.7.1.

@cbgbt cbgbt force-pushed the doing-our-chores branch 2 times, most recently from 7227174 to b843ecf Compare July 19, 2024 21:45
@cbgbt
Copy link
Contributor Author

cbgbt commented Jul 19, 2024

Good point! Force pushed for the dependency changes mentioned by @jpculp.

@cbgbt cbgbt force-pushed the doing-our-chores branch 2 times, most recently from b7e97e4 to 2aadbe7 Compare July 19, 2024 22:39
cbgbt and others added 3 commits July 19, 2024 23:13
Co-authored-by: Patrick J.P. Culp <jpculp@amazon.com>
This change also contains several major-version updates for dependencies
to pass the cargo-deny checks.
@cbgbt cbgbt force-pushed the doing-our-chores branch from 2aadbe7 to b77e000 Compare July 19, 2024 23:13
@cbgbt
Copy link
Contributor Author

cbgbt commented Jul 19, 2024

I'm convinced that we can update our aws-config BehaviorVersion based on the following:

@jpculp jpculp merged commit 2725e1e into bottlerocket-os:develop Jul 19, 2024
4 checks passed
@cbgbt cbgbt deleted the doing-our-chores branch July 19, 2024 23:43
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.

3 participants