From b72da8c514decf9f8d8e57f49463b8d2f93333be Mon Sep 17 00:00:00 2001 From: Alex Plotnick Date: Wed, 4 Nov 2026 12:24:22 -0700 Subject: [PATCH] Update to dropshot 0.18 and progenitor 0.15 Co-authored-by: Claude --- Cargo.lock | 194 ++++++++++++++++++++++++++++++++++++++++++++--------- Cargo.toml | 6 +- 2 files changed, 165 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5b65277f..745b87c3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -420,6 +420,12 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "base64" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5" + [[package]] name = "base64-simd" version = "0.8.0" @@ -1196,14 +1202,14 @@ dependencies = [ [[package]] name = "dropshot" -version = "0.17.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "803c4a57fd2a611df2ddd7069a62a565253368ee96ad4e5ac2e74e625dcf8430" +checksum = "4a9e64e150bf661306cc9fa32c25996cb37025edebcbe55e80669750aa90b703" dependencies = [ "async-compression", "async-stream", "async-trait", - "base64 0.22.1", + "base64 0.23.1", "bytes", "camino", "chrono", @@ -1222,7 +1228,6 @@ dependencies = [ "paste", "percent-encoding", "rustls", - "rustls-pemfile", "schemars 0.8.22", "scopeguard", "semver", @@ -1248,17 +1253,17 @@ dependencies = [ [[package]] name = "dropshot_endpoint" -version = "0.17.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f176851eb52822c728ad7a1c5aea0e3c95e68d9876cfa06ae32d5018730acb4" +checksum = "c7dfe21674cd808e8b344cc9d3ea107108846effc782c535ddf0bd2753443226" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", "semver", "serde", - "serde_tokenstream", - "syn 2.0.119", + "serde_tokenstream 0.3.0", + "syn 3.0.3", ] [[package]] @@ -3081,8 +3086,8 @@ dependencies = [ "natord", "once_cell", "permission-slip-common", - "progenitor", - "progenitor-client", + "progenitor 0.14.0", + "progenitor-client 0.14.0", "rand_core 0.6.4", "reqwest", "serde", @@ -3334,9 +3339,20 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8ba1d77160e6d5c95bdf0792527f76bf528791093fa83015bc2908a0ba9d076" dependencies = [ - "progenitor-client", - "progenitor-impl", - "progenitor-macro", + "progenitor-client 0.14.0", + "progenitor-impl 0.14.0", + "progenitor-macro 0.14.0", +] + +[[package]] +name = "progenitor" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15bd395aa613c6491be9233fae4a870a35cd611655c0ef1cbaae7aa9e1c4c0e6" +dependencies = [ + "progenitor-client 0.15.1", + "progenitor-impl 0.15.1", + "progenitor-macro 0.15.1", ] [[package]] @@ -3354,6 +3370,21 @@ dependencies = [ "serde_urlencoded", ] +[[package]] +name = "progenitor-client" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aa13eb6d9499a851512ec8fa3280f586be059682da4f05d953924be45d736f0" +dependencies = [ + "bytes", + "futures-core", + "percent-encoding", + "reqwest", + "serde", + "serde_json", + "serde_urlencoded", +] + [[package]] name = "progenitor-impl" version = "0.14.0" @@ -3372,7 +3403,29 @@ dependencies = [ "serde_json", "syn 2.0.119", "thiserror 2.0.20", - "typify", + "typify 0.6.2", + "unicode-ident", +] + +[[package]] +name = "progenitor-impl" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d9fbe5a1aa114c6c7c507a30ebeb0b12de383edab951ea27300210a3841917c" +dependencies = [ + "heck 0.5.0", + "http 1.5.0", + "indexmap 2.14.0", + "openapiv3", + "proc-macro2", + "quote", + "regex", + "schemars 0.8.22", + "serde", + "serde_json", + "syn 3.0.3", + "thiserror 2.0.20", + "typify 0.8.0", "unicode-ident", ] @@ -3384,16 +3437,34 @@ checksum = "efa969a1349979c5f64347f204e794781a86d738206d75672e6c9493f5910002" dependencies = [ "openapiv3", "proc-macro2", - "progenitor-impl", + "progenitor-impl 0.14.0", "quote", "schemars 0.8.22", "serde", "serde_json", - "serde_tokenstream", + "serde_tokenstream 0.2.3", "serde_yaml", "syn 2.0.119", ] +[[package]] +name = "progenitor-macro" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dccde5096e96f6a57e16af4a4ac575755d5973f0c1bd4e6b7b86808932a33408" +dependencies = [ + "openapiv3", + "proc-macro2", + "progenitor-impl 0.15.1", + "quote", + "schemars 0.8.22", + "serde", + "serde_json", + "serde_tokenstream 0.3.0", + "serde_yaml", + "syn 3.0.3", +] + [[package]] name = "pwd" version = "1.4.0" @@ -3672,6 +3743,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "regress" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32eef8b209c3c1c15dbad02c1f30f9539f00dc7253e0cbcdaae442a50a09d7c1" +dependencies = [ + "memchr", +] + [[package]] name = "reqwest" version = "0.13.4" @@ -3868,15 +3948,6 @@ dependencies = [ "security-framework", ] -[[package]] -name = "rustls-pemfile" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" -dependencies = [ - "rustls-pki-types", -] - [[package]] name = "rustls-pki-types" version = "1.15.1" @@ -4253,6 +4324,18 @@ dependencies = [ "syn 2.0.119", ] +[[package]] +name = "serde_tokenstream" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db95b8acf6eca5bc1bc771a7d7fb1a0d1485bdef0c46eec2f573bbaf4b4118f8" +dependencies = [ + "proc-macro2", + "quote", + "serde", + "syn 3.0.3", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -4870,8 +4953,8 @@ dependencies = [ "p256", "pem-rfc7468", "permission-slip-client", - "progenitor", - "progenitor-client", + "progenitor 0.15.1", + "progenitor-client 0.15.1", "rand 0.8.7", "reqwest", "rustix 1.1.4", @@ -5612,8 +5695,18 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc0b89f47309feaeb23c4509c15c9a04234f7deccef6f96c3bfe95319819a304" dependencies = [ - "typify-impl", - "typify-macro", + "typify-impl 0.6.2", + "typify-macro 0.6.2", +] + +[[package]] +name = "typify" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71187d2e983363e9a6ca884f7b061620bc6da4316902058e74bbc9d61c347696" +dependencies = [ + "typify-impl 0.8.0", + "typify-macro 0.8.0", ] [[package]] @@ -5626,7 +5719,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "regress", + "regress 0.11.1", "schemars 0.8.22", "semver", "serde", @@ -5636,6 +5729,26 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "typify-impl" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cbc3132686085f84a068ad86fc281cb3d566dd940c8911fd3562013851e9ae8" +dependencies = [ + "heck 0.5.0", + "log", + "proc-macro2", + "quote", + "regress 0.12.0", + "schemars 0.8.22", + "semver", + "serde", + "serde_json", + "syn 3.0.3", + "thiserror 2.0.20", + "unicode-ident", +] + [[package]] name = "typify-macro" version = "0.6.2" @@ -5648,9 +5761,26 @@ dependencies = [ "semver", "serde", "serde_json", - "serde_tokenstream", + "serde_tokenstream 0.2.3", "syn 2.0.119", - "typify-impl", + "typify-impl 0.6.2", +] + +[[package]] +name = "typify-macro" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3a7f8d08ec85254fb8b383a6c66fe43b81f7f6b288fa71eb365f0867fc8f3a6" +dependencies = [ + "proc-macro2", + "quote", + "schemars 0.8.22", + "semver", + "serde", + "serde_json", + "serde_tokenstream 0.3.0", + "syn 3.0.3", + "typify-impl 0.8.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 94d047f8..4e958756 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ chrono = { version = "0.4", features = ["serde"] } ciborium = "0.2" clap = { version = "4", features = ["derive", "env", "wrap_help"] } crypto-bigint = "0.5" -dropshot = "0.17" +dropshot = "0.18" ed25519-dalek = { version = "2", features = ["pkcs8", "rand_core"] } function_name = "0.3" futures = "0.3" @@ -43,8 +43,8 @@ pem-rfc7468 = { version = "0.7", features = ["std"] } percent-encoding = "2" permission-slip-client = { git = "https://github.com/oxidecomputer/permission-slip", rev = "e1ac78d5ddf1e02b977d6c5d1c1147cb08dac1ca", features = ["sush-types"] } pki-playground = { git = "https://github.com/oxidecomputer/pki-playground", rev = "7600756029ce046a02c6234aa84ce230cc5eaa04" } -progenitor = "0.14" -progenitor-client = "0.14" +progenitor = "0.15" +progenitor-client = "0.15" pwd = "1" rand = "0.8" rand_core = "0.6"