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 cargo dependencies #1267

Merged
merged 2 commits into from
Jan 11, 2021
Merged

update cargo dependencies #1267

merged 2 commits into from
Jan 11, 2021

Conversation

webern
Copy link
Contributor

@webern webern commented Jan 7, 2021

Issue number:

N/A

Description of changes:

cargo update, once in tools and once in sources.
Needed to bump the version of webpki-roots-shim to match what reqwest is using.

Testing done:

cargo make, cargo make ami and cargo make repo. Ran k8s 1.17, ran a pod. Also ssh'ed in and updog check-update worked.

Also checked apiclient with the following commands, which successfully changed the motd setting.

apiclient -m PATCH -u /settings -d '{"motd": "my own value!"}'
apiclient -m POST -u /tx/commit_and_apply
apiclient -u /settings | jq .motd
# "my own value!"

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.

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.

Would you please also check (1) unit tests and (2) that apiclient can change/commit/apply settings?

Does https://github.com/kbknapp/cargo-outdated show any bigger updates we need to apply? (modulo tokio, gptman) Does https://github.com/est31/cargo-udeps show anything unused? (careful with that one...)

@webern
Copy link
Contributor Author

webern commented Jan 9, 2021

Expanded to include all reasonable major updates. No udeps found. Unit tests pass (btw they run in CI as well).

I still need to repeat the testing that I listed in the PR description and add to that the apiclient tests suggested above.

Created two follow-up issues #1268 and #1269 for major dep upgrades that require follow-up.

@webern
Copy link
Contributor Author

webern commented Jan 10, 2021

Update: I repeated the testing (and added a test of apiclient) after dep major updates in c76670b and everything seems to be working.

sources/api/storewolf/Cargo.toml Outdated Show resolved Hide resolved
sources/api/migration/migrator/src/main.rs Outdated Show resolved Hide resolved
@webern
Copy link
Contributor Author

webern commented Jan 11, 2021

webern force-pushed the webern:bump branch from c76670b to d4ad267 now

Addresses @srgothi92 's findings.

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.

I'm a little hesitant about updating tough, just to change the migrator code back for the re-removed lifetime stuff in 0.10, but I don't mind if you prefer it.

sources/api/migration/migrator/Cargo.toml Outdated Show resolved Hide resolved
sources/api/migration/migrator/src/main.rs Show resolved Hide resolved
sources/growpart/Cargo.toml Outdated Show resolved Hide resolved
tools/pubsys-setup/Cargo.toml Outdated Show resolved Hide resolved
Also bump webpki-roots-shim to v0.20.0 so that reqwest continues to use
it.
@webern
Copy link
Contributor Author

webern commented Jan 11, 2021

webern force-pushed the webern:bump branch from d4ad267 to f2d56ed 28 seconds ago

Undo:

  • fmt of sources/api/datastore/src/memory.rs
  • tough version changes
  • inotify version change
  • reqwest version change

@webern webern merged commit d3ebb91 into bottlerocket-os:develop Jan 11, 2021
@webern webern deleted the bump branch January 12, 2021 00:26
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