From b3b143ebd14ef8ce9ba3f9c3399f250cd516edfe Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 23 Sep 2026 14:44:27 +0200 Subject: [PATCH 1/3] chore: Dependency bumps --- Cargo.lock | 61 ++++++++----------- Cargo.toml | 19 +++--- crates/stackable-versioned-macros/Cargo.toml | 1 - .../src/attrs/item/variant.rs | 12 +++- 4 files changed, 45 insertions(+), 48 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 97b3d9639..db34c33d7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -551,22 +551,13 @@ dependencies = [ [[package]] name = "convert_case" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "affbf0190ed2caf063e3def54ff444b449371d55c58e513a95ab98eca50adb49" +checksum = "1af709f1f33454bf52eadfc8c78b3b9ef9cb26fb54d16dc9cd9a7299f899fd1b" dependencies = [ "unicode-segmentation", ] -[[package]] -name = "convert_case_extras" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589c70f0faf8aa9d17787557d5eae854d7755cac50f5c3d12c81d3d57661cebb" -dependencies = [ - "convert_case", -] - [[package]] name = "core-foundation" version = "0.9.4" @@ -998,9 +989,9 @@ dependencies = [ [[package]] name = "educe" -version = "0.7.6" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e451fac8dd8dece16234604bf1efce6e90fddd8ab6ad4d66eec0eca5160959dd" +checksum = "1ebdb1f8f8d2815bbe7b369a7da10343c82026a4503b68bd1279ba557611e96d" dependencies = [ "enum-ordinalize", "proc-macro2", @@ -2617,9 +2608,9 @@ checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" [[package]] name = "opentelemetry" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0142c63252a9e054e68a4c61a5778f7b14f576274d593f8ce883d191a099682" +checksum = "6cdb0b1b267eb9db3331b434ed9ddab10d50e280a9adf9d13e5233e2002b61b5" dependencies = [ "futures-core", "futures-sink", @@ -2631,9 +2622,9 @@ dependencies = [ [[package]] name = "opentelemetry-appender-tracing" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c0080f0dc1d7c786f467cd85a4e395fcab11ee852004f39a29a18ab7c25d837" +checksum = "e2b304e8d8f11326ba366a99ca5c7aaf7cd397b67268a332437175aeb42a40db" dependencies = [ "opentelemetry", "tracing", @@ -2643,9 +2634,9 @@ dependencies = [ [[package]] name = "opentelemetry-http" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5683015d09e2df236ef005b17f6f196f0d5f6313c4fa43a7b6a53b52776e4331" +checksum = "ee2c3625b8aa04209f7e01e513bc8044da9687fa38a9eacf59628ca5f3b87300" dependencies = [ "async-trait", "bytes", @@ -2656,11 +2647,12 @@ dependencies = [ [[package]] name = "opentelemetry-otlp" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9966929966d17620d7c316c643ba62631826e10021409357772d5eea84f62c35" +checksum = "699a67345e21962a231955b9059a157e428b219fa5df8efe11f08346fb23a344" dependencies = [ "http", + "httpdate", "opentelemetry", "opentelemetry-http", "opentelemetry-proto", @@ -2675,9 +2667,9 @@ dependencies = [ [[package]] name = "opentelemetry-proto" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d658ba1faf63f7b9c492cfbe6e0ec365440a16132d3270c1065f7b33f1b638" +checksum = "25da1ac11a0aeccf38d7f77ee0348715adaf8340f65ad46c94a02c6b20e2f65d" dependencies = [ "opentelemetry", "opentelemetry_sdk", @@ -2688,15 +2680,15 @@ dependencies = [ [[package]] name = "opentelemetry-semantic-conventions" -version = "0.32.1" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c913ac17a6c451661ee255f4625d143e51647ae78ebd969b75e41c4442f4fe47" +checksum = "d288b1e1bc3590052fbb8f0f635ef248dd9022cf1fbaeb6582b7ad6081a17b87" [[package]] name = "opentelemetry_sdk" -version = "0.32.1" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b59f80e1ac4d5ff7a2db8fb6c80badb7f0f3f858211fba08dd9aaec750894f9" +checksum = "cb39533d9d1c912123efd7d41d7e0c29d16917b60ce15b4c8d87cb1af7f67520" dependencies = [ "futures-channel", "futures-executor", @@ -3256,9 +3248,9 @@ dependencies = [ [[package]] name = "rstest" -version = "0.26.1" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5a3193c063baaa2a95a33f03035c8a72b83d97a54916055ba22d35ed3839d49" +checksum = "948203e6d13b83e51a90d7cf236dd58a0065f23f4b902f00f306e7eb2bd09b9c" dependencies = [ "futures-timer", "futures-util", @@ -3267,9 +3259,9 @@ dependencies = [ [[package]] name = "rstest_macros" -version = "0.26.1" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c845311f0ff7951c5506121a9ad75aec44d083c31583b2ea5a30bcb0b0abba0" +checksum = "a8d92eaf7b6e51e12471d71ddc72608e7151573de44099aacfbb1128177c0da4" dependencies = [ "cfg-if", "glob", @@ -3859,7 +3851,7 @@ dependencies = [ "const_format", "delegate", "dockerfile-parser", - "educe 0.7.6", + "educe 0.8.1", "either", "futures", "http", @@ -3970,7 +3962,6 @@ name = "stackable-versioned-macros" version = "0.11.1" dependencies = [ "convert_case", - "convert_case_extras", "darling 0.24.1", "indoc", "insta", @@ -4609,9 +4600,9 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adbc64cba7137545b8044cb1fe9814f7aacf3c6b5f9b45be8bb5db538befdb26" +checksum = "0a904802a1b902f43638b677ff2a650847e3b4404101b6c586d648e8c1e3e8fe" dependencies = [ "js-sys", "opentelemetry", diff --git a/Cargo.toml b/Cargo.toml index 07311a6e2..4ef690159 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,14 +26,13 @@ const_format = "0.2.36" # Unblocked once rsa 0.10 (currently at 0.10.0-rc.18) is released: https://github.com/RustCrypto/RSA # See also the ecdsa, p256, rand_core, sha2, signature and x509-cert pins below. const-oid = { version = "0.9.6", features = ["db"] } -convert_case = "0.11.0" -convert_case_extras = "0.2.0" +convert_case = "0.12.0" darling = "0.24.0" delegate = "0.13.5" dockerfile-parser = "0.9.0" # Pinned to the old RustCrypto generation, see the const-oid comment above. ecdsa = { version = "0.16.9", features = ["digest", "pem"] } -educe = { version = "0.7.6", default-features = false, features = ["Clone", "Debug", "Default", "PartialEq", "Eq"] } +educe = { version = "0.8.1", default-features = false, features = ["Clone", "Debug", "Default", "PartialEq", "Eq"] } either = "1.17.0" futures = "0.3.33" futures-util = "0.3.33" @@ -54,11 +53,11 @@ k8s-openapi = { version = "0.28.0", default-features = false, features = ["schem # We use ring instead of aws-lc-rs, as this currently fails to build in "make run-dev" kube = { version = "4.2.0", default-features = false, features = ["client", "jsonpatch", "runtime", "derive", "admission", "rustls-tls", "ring"] } local-ip-address = "0.6.13" -opentelemetry = "0.32.0" -opentelemetry_sdk = { version = "0.32.1", features = ["rt-tokio"] } -opentelemetry-appender-tracing = "0.32.0" -opentelemetry-otlp = "0.32.0" -opentelemetry-semantic-conventions = "0.32.1" +opentelemetry = "0.33.0" +opentelemetry_sdk = { version = "0.33.0", features = ["rt-tokio"] } +opentelemetry-appender-tracing = "0.33.0" +opentelemetry-otlp = "0.33.0" +opentelemetry-semantic-conventions = "0.33.0" # Pinned to the old RustCrypto generation, see the const-oid comment above. p256 = { version = "0.13.2", features = ["ecdsa"] } paste = "1.0.15" @@ -73,7 +72,7 @@ rand = "0.10.2" rand_core = "0.6.4" regex = "1.13.1" rsa = { version = "0.9.10", features = ["sha2"] } -rstest = "0.26.1" +rstest = "0.27.0" rstest_reuse = "0.7.0" schemars = { version = "1.2.2", features = ["url2"] } semver = "1.0.28" @@ -100,7 +99,7 @@ tower = { version = "0.5.3", features = ["util"] } tower-http = { version = "0.7.0", features = ["trace"] } # We don't actually use this crate, but we need to enable the `trace` feature tracing = "0.1.44" tracing-appender = "0.2.5" -tracing-opentelemetry = "0.33.0" +tracing-opentelemetry = "0.34.0" tracing-subscriber = { version = "0.3.23", features = ["env-filter", "json"] } trybuild = "1.0.120" url = { version = "2.5.8", features = ["serde"] } diff --git a/crates/stackable-versioned-macros/Cargo.toml b/crates/stackable-versioned-macros/Cargo.toml index a3c5f5654..c1b5d8ea5 100644 --- a/crates/stackable-versioned-macros/Cargo.toml +++ b/crates/stackable-versioned-macros/Cargo.toml @@ -31,7 +31,6 @@ proc-macro = true k8s-version = { path = "../k8s-version", features = ["darling"] } convert_case.workspace = true -convert_case_extras.workspace = true darling.workspace = true indoc.workspace = true itertools.workspace = true diff --git a/crates/stackable-versioned-macros/src/attrs/item/variant.rs b/crates/stackable-versioned-macros/src/attrs/item/variant.rs index 01f1f4bc2..dc0b003f2 100644 --- a/crates/stackable-versioned-macros/src/attrs/item/variant.rs +++ b/crates/stackable-versioned-macros/src/attrs/item/variant.rs @@ -1,5 +1,4 @@ -use convert_case::Case; -use convert_case_extras::is_case; +use convert_case::{Case, Casing}; use darling::{Error, FromVariant, Result}; use syn::{Attribute, Ident}; @@ -75,3 +74,12 @@ impl VariantAttributes { self.common.validate_versions(versions) } } + +// We don't want to take a dependency on the (unmaintained[1]) `convert_case` crate just for this +// function, so we vendor it from +// https://github.com/rutrum/convert-case-extras/blob/fe00fabaa00f065e254c675a28cadb4d0f6e1400/src/lib.rs#L36 +// +// [1]: https://github.com/rutrum/convert-case-extras/issues/1 +fn is_case>(s: T, case: Case) -> bool { + s.as_ref() == s.as_ref().to_case(case) +} From f525f572478552ff5fbb1d4e441f96c37110ac5e Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 23 Sep 2026 16:19:16 +0200 Subject: [PATCH 2/3] Update crates/stackable-versioned-macros/src/attrs/item/variant.rs Co-authored-by: Xenia --- crates/stackable-versioned-macros/src/attrs/item/variant.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/stackable-versioned-macros/src/attrs/item/variant.rs b/crates/stackable-versioned-macros/src/attrs/item/variant.rs index dc0b003f2..a3acec602 100644 --- a/crates/stackable-versioned-macros/src/attrs/item/variant.rs +++ b/crates/stackable-versioned-macros/src/attrs/item/variant.rs @@ -75,7 +75,7 @@ impl VariantAttributes { } } -// We don't want to take a dependency on the (unmaintained[1]) `convert_case` crate just for this +// We don't want to take a dependency on the (unmaintained[1]) `convert_case_extras` crate just for this // function, so we vendor it from // https://github.com/rutrum/convert-case-extras/blob/fe00fabaa00f065e254c675a28cadb4d0f6e1400/src/lib.rs#L36 // From b69dba6928f6c48adc422968ef515e6199c2eea9 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 23 Sep 2026 16:20:13 +0200 Subject: [PATCH 3/3] formatting --- crates/stackable-versioned-macros/src/attrs/item/variant.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/stackable-versioned-macros/src/attrs/item/variant.rs b/crates/stackable-versioned-macros/src/attrs/item/variant.rs index a3acec602..46d1c69fe 100644 --- a/crates/stackable-versioned-macros/src/attrs/item/variant.rs +++ b/crates/stackable-versioned-macros/src/attrs/item/variant.rs @@ -75,8 +75,8 @@ impl VariantAttributes { } } -// We don't want to take a dependency on the (unmaintained[1]) `convert_case_extras` crate just for this -// function, so we vendor it from +// We don't want to take a dependency on the (unmaintained[1]) `convert_case_extras` crate just for +// this function, so we vendor it from // https://github.com/rutrum/convert-case-extras/blob/fe00fabaa00f065e254c675a28cadb4d0f6e1400/src/lib.rs#L36 // // [1]: https://github.com/rutrum/convert-case-extras/issues/1