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 #1810

Merged
merged 6 commits into from
Nov 10, 2021
Merged

Update Rust dependencies #1810

merged 6 commits into from
Nov 10, 2021

Conversation

cbgbt
Copy link
Contributor

@cbgbt cbgbt commented Nov 9, 2021

Description of changes:

tools: update tough to 0.12
tools: cargo update

sources: update nix to 0.23
sources: update tough to 0.12
sources: update to actix-web-4.0.0-beta.10
sources: cargo update

Not updated: gptman, hyper (in sources/), x509-parser
webpki (must match the version used by reqwest)

Testing done:

  • Unit tests pass.
  • Built AWS k8s 1.21 for aarch64 and ECS AMIs for x86_64. Confirmed systemctl status running, dmesg and journal OK. Ran a pod/task OK. Made API changes OK.
  • Ensured that handlebars templating changes don't cause semantic changes to rendered templates (thanks @tjkirch)
  • Confirmed that cargo make repo and cargo make ssm still work OK.
  • Test apiclient exec with the new nix change

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 tjkirch, bcressey and webern November 9, 2021 15:57
sources/api/migration/migrator/src/main.rs Outdated Show resolved Hide resolved
sources/deny.toml Show resolved Hide resolved
sources/updater/updog/src/main.rs Outdated Show resolved Hide resolved
tools/pubsys/src/repo.rs Outdated Show resolved Hide resolved
@cbgbt cbgbt changed the title Rust deps Update Rust dependencies Nov 9, 2021
Copy link
Contributor

@tjkirch tjkirch left a comment

Choose a reason for hiding this comment

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

LGTM if the remaining testing passes.

@cbgbt cbgbt marked this pull request as ready for review November 9, 2021 21:19
@cbgbt cbgbt requested a review from somnusfish November 9, 2021 21:19
@cbgbt cbgbt force-pushed the rust-deps branch 2 times, most recently from a8d63a0 to c7444a6 Compare November 10, 2021 15:58
@cbgbt
Copy link
Contributor Author

cbgbt commented Nov 10, 2021

The previous two force pushes:

  • Added the context() calls where previously unwrap() was being used
  • Rebased atop the latest code in the develop branch.

Based on test failures, looks like I need to modify the nix change to also update for apiclient exec, which was added in the rebase. I'll get a fix ready.

@cbgbt
Copy link
Contributor Author

cbgbt commented Nov 10, 2021

I've pushed just a change to move apiclient to nix 0.23. I tested apiclient exec with the changes.

Copy link
Contributor

@tjkirch tjkirch left a comment

Choose a reason for hiding this comment

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

LGTM assuming checks pass!

@tjkirch tjkirch requested a review from webern November 10, 2021 17:46
@cbgbt cbgbt merged commit 95260b7 into bottlerocket-os:develop Nov 10, 2021
@cbgbt cbgbt deleted the rust-deps branch November 10, 2021 18:44
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.

4 participants