From 5d03ad27c87319ab7db949eef74d74f8f8bb2513 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 5 Nov 2024 14:40:34 -0800 Subject: [PATCH] Update Rust crate omicron-zone-package to 0.11.1 (#1535) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [omicron-zone-package](https://redirect.github.com/oxidecomputer/omicron-package) | workspace.dependencies | patch | `0.11.0` -> `0.11.1` | --- ### Configuration 📅 **Schedule**: Branch creation - "after 8pm,before 6am" in timezone America/Los_Angeles, Automerge - "after 8pm,before 6am" in timezone America/Los_Angeles. 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/oxidecomputer/crucible). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Alan Hanson --- Cargo.lock | 237 ++++++++------------------------------ Cargo.toml | 2 +- workspace-hack/Cargo.toml | 15 ++- 3 files changed, 60 insertions(+), 194 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2322e0736..edf37db6b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -65,7 +65,7 @@ dependencies = [ "futures", "futures-core", "rand 0.8.5", - "reqwest 0.12.7", + "reqwest", "serde", "signal-hook", "signal-hook-tokio", @@ -945,7 +945,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rayon", - "reqwest 0.12.7", + "reqwest", "ringbuffer", "schemars", "serde", @@ -981,7 +981,7 @@ dependencies = [ "expectorate", "futures", "http 0.2.12", - "hyper 1.4.1", + "hyper", "omicron-common", "openapi-lint", "openapiv3", @@ -1005,7 +1005,7 @@ dependencies = [ "crucible-workspace-hack", "percent-encoding", "progenitor", - "reqwest 0.12.7", + "reqwest", "schemars", "serde", "serde_json", @@ -1062,7 +1062,7 @@ dependencies = [ "crucible-workspace-hack", "percent-encoding", "progenitor", - "reqwest 0.12.7", + "reqwest", "schemars", "serde", "serde_json", @@ -1086,7 +1086,7 @@ dependencies = [ "futures-core", "hex", "http 0.2.12", - "hyper 1.4.1", + "hyper", "hyper-staticfile", "itertools 0.13.0", "libc", @@ -1103,7 +1103,7 @@ dependencies = [ "rand_chacha 0.3.1", "rayon", "repair-client", - "reqwest 0.12.7", + "reqwest", "ringbuffer", "rusqlite", "schemars", @@ -1167,7 +1167,7 @@ dependencies = [ "httptest", "rand 0.8.5", "repair-client", - "reqwest 0.12.7", + "reqwest", "serde", "serde_json", "sha2", @@ -1231,11 +1231,11 @@ dependencies = [ "futures", "hex", "http 0.2.12", - "hyper 1.4.1", + "hyper", "omicron-common", "openapi-lint", "openapiv3", - "reqwest 0.12.7", + "reqwest", "schemars", "serde", "serde_json", @@ -1256,7 +1256,7 @@ dependencies = [ "crucible-workspace-hack", "percent-encoding", "progenitor", - "reqwest 0.12.7", + "reqwest", "schemars", "serde", "serde_json", @@ -1329,7 +1329,8 @@ dependencies = [ "getrandom", "hashbrown 0.14.3", "hex", - "hyper 1.4.1", + "hyper", + "hyper-rustls", "hyper-util", "indexmap 2.5.0", "libc", @@ -1346,9 +1347,8 @@ dependencies = [ "rand_chacha 0.3.1", "regex-automata", "regex-syntax", - "reqwest 0.12.7", + "reqwest", "rustix", - "rustls 0.21.9", "rustls-pki-types", "schemars", "scopeguard", @@ -1362,6 +1362,7 @@ dependencies = [ "time", "time-macros", "tokio", + "tokio-util", "toml_datetime", "toml_edit 0.19.15", "tracing", @@ -1676,7 +1677,7 @@ dependencies = [ "http 1.1.0", "omicron-workspace-hack", "progenitor", - "reqwest 0.12.7", + "reqwest", "schemars", "serde", "slog", @@ -1715,7 +1716,7 @@ dependencies = [ "hostname 0.4.0", "http 1.1.0", "http-body-util", - "hyper 1.4.1", + "hyper", "hyper-util", "indexmap 2.5.0", "multer", @@ -1794,7 +1795,7 @@ dependencies = [ "crucible-workspace-hack", "percent-encoding", "progenitor", - "reqwest 0.12.7", + "reqwest", "schemars", "serde", "serde_json", @@ -2122,7 +2123,7 @@ dependencies = [ "omicron-workspace-hack", "progenitor", "rand 0.8.5", - "reqwest 0.12.7", + "reqwest", "schemars", "serde", "serde_json", @@ -2203,25 +2204,6 @@ dependencies = [ "scroll", ] -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.12", - "indexmap 2.5.0", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "h2" version = "0.4.6" @@ -2428,17 +2410,6 @@ dependencies = [ "itoa", ] -[[package]] -name = "http-body" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ - "bytes", - "http 0.2.12", - "pin-project-lite", -] - [[package]] name = "http-body" version = "1.0.1" @@ -2458,7 +2429,7 @@ dependencies = [ "bytes", "futures-util", "http 1.1.0", - "http-body 1.0.1", + "http-body", "pin-project-lite", ] @@ -2493,7 +2464,7 @@ dependencies = [ "futures", "http 1.1.0", "http-body-util", - "hyper 1.4.1", + "hyper", "hyper-util", "log", "once_cell", @@ -2537,30 +2508,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" -[[package]] -name = "hyper" -version = "0.14.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.5", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - [[package]] name = "hyper" version = "1.4.1" @@ -2570,9 +2517,9 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.6", + "h2", "http 1.1.0", - "http-body 1.0.1", + "http-body", "httparse", "httpdate", "itoa", @@ -2582,20 +2529,6 @@ dependencies = [ "want", ] -[[package]] -name = "hyper-rustls" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" -dependencies = [ - "futures-util", - "http 0.2.12", - "hyper 0.14.30", - "rustls 0.21.9", - "tokio", - "tokio-rustls 0.24.1", -] - [[package]] name = "hyper-rustls" version = "0.27.3" @@ -2604,14 +2537,14 @@ checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", "http 1.1.0", - "hyper 1.4.1", + "hyper", "hyper-util", "rustls 0.23.13", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", "tower-service", - "webpki-roots 0.26.6", + "webpki-roots", ] [[package]] @@ -2624,7 +2557,7 @@ dependencies = [ "http 1.1.0", "http-range", "httpdate", - "hyper 1.4.1", + "hyper", "mime_guess", "percent-encoding", "rand 0.8.5", @@ -2641,7 +2574,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.4.1", + "hyper", "hyper-util", "native-tls", "tokio", @@ -2659,8 +2592,8 @@ dependencies = [ "futures-channel", "futures-util", "http 1.1.0", - "http-body 1.0.1", - "hyper 1.4.1", + "http-body", + "hyper", "pin-project-lite", "socket2", "tokio", @@ -2823,11 +2756,11 @@ dependencies = [ "dns-service-client", "futures", "hickory-resolver", - "hyper 1.4.1", + "hyper", "omicron-common", "omicron-uuid-kinds", "omicron-workspace-hack", - "reqwest 0.12.7", + "reqwest", "slog", "thiserror", "uuid", @@ -3154,7 +3087,7 @@ dependencies = [ "chrono", "percent-encoding", "progenitor", - "reqwest 0.12.7", + "reqwest", "schemars", "serde", "serde_json", @@ -3294,7 +3227,7 @@ dependencies = [ "oxnet", "progenitor", "regress 0.9.1", - "reqwest 0.12.7", + "reqwest", "schemars", "serde", "serde_json", @@ -3663,7 +3596,7 @@ dependencies = [ "progenitor-client", "rand 0.8.5", "regress 0.9.1", - "reqwest 0.12.7", + "reqwest", "schemars", "semver 1.0.23", "serde", @@ -3710,9 +3643,9 @@ checksum = "e22821954cca73148cdd1547a540ac79a3f27b6d55b518490437bb9867212828" [[package]] name = "omicron-zone-package" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e75ad9eb79bb6a1ec78d2eecf36c67fffcf56264d779c456c6e2cd4b257ee9fe" +checksum = "a5cd917080e98f2e325ad3d803432be83fbe7eb9ccabb0f0f20390072982f550" dependencies = [ "anyhow", "async-trait", @@ -3725,7 +3658,7 @@ dependencies = [ "futures", "futures-util", "hex", - "reqwest 0.11.27", + "reqwest", "ring 0.16.20", "semver 1.0.23", "serde", @@ -4456,7 +4389,7 @@ dependencies = [ "bytes", "futures-core", "percent-encoding", - "reqwest 0.12.7", + "reqwest", "serde", "serde_json", "serde_urlencoded", @@ -4902,56 +4835,13 @@ dependencies = [ "crucible-workspace-hack", "percent-encoding", "progenitor", - "reqwest 0.12.7", + "reqwest", "schemars", "serde", "serde_json", "uuid", ] -[[package]] -name = "reqwest" -version = "0.11.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" -dependencies = [ - "base64 0.21.7", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.5", - "hyper 0.14.30", - "hyper-rustls 0.24.2", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls 0.21.9", - "rustls-pemfile 1.0.4", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 0.1.2", - "system-configuration 0.5.1", - "tokio", - "tokio-rustls 0.24.1", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "webpki-roots 0.25.2", - "winreg", -] - [[package]] name = "reqwest" version = "0.12.7" @@ -4964,12 +4854,12 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.4.6", + "h2", "http 1.1.0", - "http-body 1.0.1", + "http-body", "http-body-util", - "hyper 1.4.1", - "hyper-rustls 0.27.3", + "hyper", + "hyper-rustls", "hyper-tls", "hyper-util", "ipnet", @@ -4987,8 +4877,8 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.1", - "system-configuration 0.6.1", + "sync_wrapper", + "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls 0.26.0", @@ -4999,7 +4889,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.26.6", + "webpki-roots", "windows-registry", ] @@ -6000,12 +5890,6 @@ dependencies = [ "syn 2.0.86", ] -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - [[package]] name = "sync_wrapper" version = "1.0.1" @@ -6015,17 +5899,6 @@ dependencies = [ "futures-core", ] -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys 0.5.0", -] - [[package]] name = "system-configuration" version = "0.6.1" @@ -6034,17 +5907,7 @@ checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ "bitflags 2.6.0", "core-foundation", - "system-configuration-sys 0.6.0", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", + "system-configuration-sys", ] [[package]] @@ -7010,12 +6873,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki-roots" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" - [[package]] name = "webpki-roots" version = "0.26.6" diff --git a/Cargo.toml b/Cargo.toml index 01e6dd2a8..2096112ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,7 +66,7 @@ nix = { version = "0.29", features = [ "feature", "uio" ] } num_enum = "0.7" num-derive = "0.4" num-traits = "0.2" -omicron-zone-package = "0.11.0" +omicron-zone-package = "0.11.1" openapiv3 = "2.0.0" opentelemetry = "0.24.0" opentelemetry-jaeger = { version = "0.20.0" } diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 2737e30fb..5bfbac46f 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -120,63 +120,72 @@ zerocopy = { version = "0.7", features = ["derive", "simd"] } bitflags-dff4ba8e3ae991db = { package = "bitflags", version = "1" } dof = { version = "0.3", default-features = false, features = ["des"] } hyper = { version = "1", features = ["full"] } +hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] } hyper-util = { version = "0.1", features = ["full"] } mio = { version = "1", features = ["net", "os-ext"] } once_cell = { version = "1", features = ["unstable"] } rustix = { version = "0.38", features = ["fs", "stdio", "termios"] } -rustls = { version = "0.21", features = ["dangerous_configuration"] } rustls-pki-types = { version = "1", features = ["std"] } spin = { version = "0.9", default-features = false, features = ["once", "spin_mutex"] } +tokio-util = { version = "0.7", features = ["codec", "io"] } [target.x86_64-unknown-linux-gnu.build-dependencies] dof = { version = "0.3", default-features = false, features = ["des"] } hyper = { version = "1", features = ["full"] } +hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] } hyper-util = { version = "0.1", features = ["full"] } mio = { version = "1", features = ["net", "os-ext"] } once_cell = { version = "1", features = ["unstable"] } rustix = { version = "0.38", features = ["fs", "stdio", "termios"] } rustls-pki-types = { version = "1", features = ["std"] } spin = { version = "0.9", default-features = false, features = ["once", "spin_mutex"] } +tokio-util = { version = "0.7", features = ["codec", "io"] } [target.aarch64-apple-darwin.dependencies] hyper = { version = "1", features = ["full"] } +hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] } hyper-util = { version = "0.1", features = ["full"] } mio = { version = "1", features = ["net", "os-ext"] } once_cell = { version = "1", features = ["unstable"] } rustix = { version = "0.38", features = ["fs", "stdio", "termios"] } -rustls = { version = "0.21", features = ["dangerous_configuration"] } rustls-pki-types = { version = "1", features = ["std"] } +tokio-util = { version = "0.7", features = ["codec", "io"] } [target.aarch64-apple-darwin.build-dependencies] hyper = { version = "1", features = ["full"] } +hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] } hyper-util = { version = "0.1", features = ["full"] } mio = { version = "1", features = ["net", "os-ext"] } once_cell = { version = "1", features = ["unstable"] } rustix = { version = "0.38", features = ["fs", "stdio", "termios"] } rustls-pki-types = { version = "1", features = ["std"] } +tokio-util = { version = "0.7", features = ["codec", "io"] } [target.x86_64-unknown-illumos.dependencies] bitflags-dff4ba8e3ae991db = { package = "bitflags", version = "1" } dof = { version = "0.3", default-features = false, features = ["des"] } hyper = { version = "1", features = ["full"] } +hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] } hyper-util = { version = "0.1", features = ["full"] } mio = { version = "1", features = ["net", "os-ext"] } once_cell = { version = "1", features = ["unstable"] } rustix = { version = "0.38", features = ["fs", "stdio", "termios"] } -rustls = { version = "0.21", features = ["dangerous_configuration"] } rustls-pki-types = { version = "1", features = ["std"] } spin = { version = "0.9", default-features = false, features = ["once", "spin_mutex"] } +tokio-util = { version = "0.7", features = ["codec", "io"] } toml_edit = { version = "0.19", features = ["serde"] } [target.x86_64-unknown-illumos.build-dependencies] dof = { version = "0.3", default-features = false, features = ["des"] } hyper = { version = "1", features = ["full"] } +hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] } hyper-util = { version = "0.1", features = ["full"] } mio = { version = "1", features = ["net", "os-ext"] } once_cell = { version = "1", features = ["unstable"] } rustix = { version = "0.38", features = ["fs", "stdio", "termios"] } rustls-pki-types = { version = "1", features = ["std"] } spin = { version = "0.9", default-features = false, features = ["once", "spin_mutex"] } +tokio-util = { version = "0.7", features = ["codec", "io"] } toml_edit = { version = "0.19", features = ["serde"] } ### END HAKARI SECTION