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 tough dep #340

Merged
merged 1 commit into from
Mar 27, 2024
Merged

update tough dep #340

merged 1 commit into from
Mar 27, 2024

Conversation

astoycos
Copy link
Contributor

@astoycos astoycos commented Mar 22, 2024

Summary

DO NOT MERGE UNTIL awslabs/tough#755 merges and the fixed crate to @kommendorkapten is updated

awslabs/tough#755 merged but still isn't in a released version

Rebases and updates #320

This commit updates the tough dependency, which
changes how many of our trait definitions work.

Additionally move from the use of
oncecell to oncelock for sigstoretrustroot.trusted_root
so that SigstoreTrustRoot can be Send.

Update examples and tests.

Manual fix for #317 and #337

Fixes #338

Release Note

Documentation

@astoycos astoycos changed the title update tough dep update tough dep DO NOT MERGE Mar 22, 2024
@astoycos astoycos changed the title update tough dep DO NOT MERGE update tough dep Mar 22, 2024
@astoycos
Copy link
Contributor Author

Once awslabs/tough#759 Merges I'll be able to use the tagged release version of tough here 🥳

@astoycos
Copy link
Contributor Author

cc @Xynnn007 and @kommendorkapten for reviews

@astoycos
Copy link
Contributor Author

Touch point we're using this downstream in bpfman/bpfman#1042

@haydentherapper
Copy link
Contributor

also cc @flavio

src/trust/mod.rs Outdated Show resolved Hide resolved
src/trust/sigstore/mod.rs Outdated Show resolved Hide resolved
src/trust/mod.rs Show resolved Hide resolved
src/trust/sigstore/mod.rs Show resolved Hide resolved
@flavio
Copy link
Member

flavio commented Mar 26, 2024

@astoycos thanks a lot for having created this PR. I left some comments, please make sure all the tests are passing

@flavio
Copy link
Member

flavio commented Mar 27, 2024

Great news, a new tough release is out: https://github.com/awslabs/tough/releases/tag/tough-v0.17.1

Copy link
Member

@flavio flavio left a comment

Choose a reason for hiding this comment

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

Everything looks good. The Cargo.toml file has to be updated to consume the freshly published tough crate.

I'll be happy to merge this PR and tag a new minor release ASAP

Cargo.toml Outdated Show resolved Hide resolved
src/trust/mod.rs Show resolved Hide resolved
src/trust/sigstore/mod.rs Outdated Show resolved Hide resolved
@astoycos
Copy link
Contributor Author

Thanks for the reviews @flavio!

This commit updates the tough dependency, which
changes how many of our trait definitions work.

Additionally move from the use of
std::sync::oncecell to tokio::sync::oncecell for
sigstoretrustroot.trusted_root so that SigstoreTrustRoot
can be Send.

Update examples and tests.

Remove some unused types

Fixup clippy warnings

Signed-off-by: Andrew Stoycos <astoycos@redhat.com>
Copy link
Member

@flavio flavio left a comment

Choose a reason for hiding this comment

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

One last minor change

src/trust/sigstore/mod.rs Outdated Show resolved Hide resolved
@flavio
Copy link
Member

flavio commented Mar 27, 2024

I'm waiting for all the tests to be green, then I'll merge it :)

Copy link
Member

@flavio flavio left a comment

Choose a reason for hiding this comment

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

thanks a lot for having handled this upgrade

@flavio flavio merged commit 2223b6e into sigstore:main Mar 27, 2024
6 checks passed
flavio added a commit to flavio/sigstore-rs that referenced this pull request Mar 27, 2024
== What's Changed
* sign: init by @jleightcap in sigstore#310
* cargo audit: ignore RUSTSEC-2023-0071 by @jleightcap in sigstore#321
* chore(deps): Update json-syntax requirement from 0.9.6 to 0.10.0 by @dependabot in sigstore#319
* chore(deps): Update cached requirement from 0.46.0 to 0.47.0 by @dependabot in sigstore#323
* chore(deps): Update serial_test requirement from 2.0.0 to 3.0.0 by @dependabot in sigstore#322
* dep: update rustls-webpki, fold in pki_types by @jleightcap in sigstore#324
* chore(deps): Update cached requirement from 0.47.0 to 0.48.0 by @dependabot in sigstore#325
* chore(deps): Update json-syntax requirement from 0.10.0 to 0.11.1 by @dependabot in sigstore#327
* chore(deps): Update cached requirement from 0.48.0 to 0.49.2 by @dependabot in sigstore#329
* chore(deps): Update json-syntax requirement from 0.11.1 to 0.12.2 by @dependabot in sigstore#330
* lint: fix lint error of chrono and tokio by @Xynnn007 in sigstore#334
* chore(deps): Update base64 requirement from 0.21.0 to 0.22.0 by @dependabot in sigstore#332
* The `Repository` trait and `ManualRepository` struct no longer require a feature flag by @tannaurus in sigstore#331
* chore(deps): Bump actions/checkout from 4.1.1 to 4.1.2 by @dependabot in sigstore#336
* chore(deps): Update reqwest requirement from 0.11 to 0.12 by @dependabot in sigstore#341
* update tough dep by @astoycos in sigstore#340

== New Contributors
* @tannaurus made their first contribution in sigstore#331
* @astoycos made their first contribution in sigstore#340

**Full Changelog**: sigstore/sigstore-rs@v0.8.0...v0.9.0

Signed-off-by: Flavio Castelli <fcastelli@suse.com>
@flavio flavio mentioned this pull request Mar 27, 2024
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.

BUG: Failed to parse root metadata: unknown variant ecdsa, expected one of rsa, ed25519, ecdsa-sha2-nistp256
3 participants