chore: Merge branch 'main' into chore/add-crd-versioning

Techassi · Techassi · commit db324bfcae9c · 2025-03-19T15:37:50.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -30,10 +30,10 @@ insta = { version= "1.40", features = ["glob"] }
 hyper = { version = "1.4.1", features = ["full"] }
 hyper-util = "0.1.8"
 itertools = "0.14.0"
-json-patch = "3.0.1"
+json-patch = "4.0.0"
 k8s-openapi = { version = "0.24.0", default-features = false, features = ["schemars", "v1_32"] }
 # We use rustls instead of openssl for easier portability, e.g. so that we can build stackablectl without the need to vendor (build from source) openssl
-kube = { version = "0.98.0", default-features = false, features = ["client", "jsonpatch", "runtime", "derive", "rustls-tls"] }
+kube = { version = "0.99.0", default-features = false, features = ["client", "jsonpatch", "runtime", "derive", "rustls-tls"] }
 opentelemetry = "0.23.0"
 opentelemetry_sdk = { version = "0.23.0", features = ["rt-tokio"] }
 opentelemetry-appender-tracing = "0.4.0"
diff --git a/crates/stackable-certs/src/ca/mod.rs b/crates/stackable-certs/src/ca/mod.rs
@@ -380,7 +380,7 @@ where
         key_certificate: &str,
         key_private_key: &str,
     ) -> Result<Self, SecretError<S::Error>> {
-        if !secret.type_.as_ref().is_some_and(|s| s == TLS_SECRET_TYPE) {
+        if secret.type_.as_ref().is_none_or(|s| s != TLS_SECRET_TYPE) {
             return InvalidSecretTypeSnafu.fail();
         }
 
diff --git a/crates/stackable-operator/CHANGELOG.md b/crates/stackable-operator/CHANGELOG.md
@@ -4,6 +4,32 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [0.87.4] - 2025-03-17
+
+## [0.87.3] - 2025-03-14
+
+### Added
+
+- Add a `Region::is_default_config` function to determine if a region sticks to the default config ([#983]).
+
+[#983]: https://github.com/stackabletech/operator-rs/pull/983
+
+## [0.87.2] - 2025-03-10
+
+### Changed
+
+- Make `region.name` field in in S3ConnectionSpec public ([#980]).
+
+[#980]: https://github.com/stackabletech/operator-rs/pull/980
+
+## [0.87.1] - 2025-03-10
+
+### Changed
+
+- Refactor `region` field in S3ConnectionSpec ([#976]).
+
+[#976]: https://github.com/stackabletech/operator-rs/pull/976
+
 ## [0.87.0] - 2025-02-28
 
 ### Changed
@@ -24,7 +50,7 @@ All notable changes to this project will be documented in this file.
 
 ### Added
 
-- Add `region` field to S3ConnectionSpec ([#959]).
+- BREAKING: Add `region` field to S3ConnectionSpec (defaults to `us-east-1`) ([#959]).
 
 [#959]: https://github.com/stackabletech/operator-rs/pull/959
 
diff --git a/crates/stackable-operator/Cargo.toml b/crates/stackable-operator/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "stackable-operator"
 description = "Stackable Operator Framework"
-version = "0.87.0"
+version = "0.87.4"
 authors.workspace = true
 license.workspace = true
 edition.workspace = true
diff --git a/crates/stackable-operator/src/commons/rbac.rs b/crates/stackable-operator/src/commons/rbac.rs
@@ -30,7 +30,6 @@ pub enum Error {
 /// Build RBAC objects for the product workloads.
 /// The `product_name` is meant to be the product name, for example: zookeeper, airflow, etc.
 /// and it is a assumed that a ClusterRole named `{product_name}-clusterrole` exists.
-
 pub fn build_rbac_resources<T: Clone + Resource<DynamicType = ()>>(
     resource: &T,
     // 'product_name' is not used to build the names of the serviceAccount and roleBinding objects,
diff --git a/crates/stackable-operator/src/config/fragment.rs b/crates/stackable-operator/src/config/fragment.rs
@@ -26,7 +26,7 @@ pub struct Validator<'a> {
     parent: Option<&'a Validator<'a>>,
 }
 
-impl<'a> Validator<'a> {
+impl Validator<'_> {
     /// Creates a `Validator` for a subfield of the current object
     pub fn field<'b>(&'b self, ident: &'b dyn Display) -> Validator<'b> {
         Validator {
diff --git a/crates/stackable-operator/src/config/merge.rs b/crates/stackable-operator/src/config/merge.rs
@@ -146,7 +146,7 @@ impl Atomic for bool {}
 impl Atomic for String {}
 impl Atomic for Quantity {}
 impl Atomic for Duration {}
-impl<'a> Atomic for &'a str {}
+impl Atomic for &str {}
 impl Atomic for LabelSelector {}
 impl Atomic for PodAffinity {}
 impl Atomic for PodAntiAffinity {}
diff --git a/crates/stackable-operator/src/cpu.rs b/crates/stackable-operator/src/cpu.rs
@@ -70,7 +70,7 @@ impl<'de> Deserialize<'de> for CpuQuantity {
     {
         struct CpuQuantityVisitor;
 
-        impl<'de> Visitor<'de> for CpuQuantityVisitor {
+        impl Visitor<'_> for CpuQuantityVisitor {
             type Value = CpuQuantity;
 
             fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
diff --git a/crates/stackable-operator/src/memory.rs b/crates/stackable-operator/src/memory.rs
@@ -347,7 +347,7 @@ impl<'de> Deserialize<'de> for MemoryQuantity {
     {
         struct MemoryQuantityVisitor;
 
-        impl<'de> Visitor<'de> for MemoryQuantityVisitor {
+        impl Visitor<'_> for MemoryQuantityVisitor {
             type Value = MemoryQuantity;
 
             fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
diff --git a/crates/stackable-operator/src/status/condition/operations.rs b/crates/stackable-operator/src/status/condition/operations.rs
@@ -13,7 +13,7 @@ pub struct ClusterOperationsConditionBuilder<'a> {
     cluster_operation: &'a ClusterOperation,
 }
 
-impl<'a> ConditionBuilder for ClusterOperationsConditionBuilder<'a> {
+impl ConditionBuilder for ClusterOperationsConditionBuilder<'_> {
     fn build_conditions(&self) -> ClusterConditionSet {
         vec![self.reconciliation_paused(), self.cluster_stopped()].into()
     }
diff --git a/crates/stackable-operator/src/time/serde_impl.rs b/crates/stackable-operator/src/time/serde_impl.rs
@@ -4,7 +4,7 @@ use crate::time::Duration;
 
 struct DurationVisitor;
 
-impl<'de> Visitor<'de> for DurationVisitor {
+impl Visitor<'_> for DurationVisitor {
     type Value = Duration;
 
     fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
diff --git a/crates/stackable-telemetry/src/instrumentation/axum/extractor.rs b/crates/stackable-telemetry/src/instrumentation/axum/extractor.rs
@@ -18,7 +18,7 @@ use opentelemetry::{propagation::Extractor, Context};
 /// [4]: https://docs.rs/opentelemetry-http/latest/opentelemetry_http/struct.HeaderExtractor.html
 pub struct HeaderExtractor<'a>(pub(crate) &'a HeaderMap);
 
-impl<'a> Extractor for HeaderExtractor<'a> {
+impl Extractor for HeaderExtractor<'_> {
     fn get(&self, key: &str) -> Option<&str> {
         self.0
             .get(key)
diff --git a/crates/stackable-telemetry/src/instrumentation/axum/injector.rs b/crates/stackable-telemetry/src/instrumentation/axum/injector.rs
@@ -20,7 +20,7 @@ use opentelemetry::{propagation::Injector, Context};
 /// [5]: https://docs.rs/opentelemetry-http/latest/opentelemetry_http/struct.HeaderInjector.html
 pub struct HeaderInjector<'a>(pub(crate) &'a mut HeaderMap);
 
-impl<'a> Injector for HeaderInjector<'a> {
+impl Injector for HeaderInjector<'_> {
     fn set(&mut self, key: &str, value: String) {
         if let Ok(header_name) = HeaderName::from_bytes(key.as_bytes()) {
             if let Ok(header_value) = HeaderValue::from_str(&value) {
diff --git a/crates/stackable-versioned-macros/Cargo.toml b/crates/stackable-versioned-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "stackable-versioned-macros"
-version = "0.6.0"
+version = "0.7.0"
 authors.workspace = true
 license.workspace = true
 edition.workspace = true
diff --git a/crates/stackable-versioned-macros/src/attrs/k8s.rs b/crates/stackable-versioned-macros/src/attrs/k8s.rs
@@ -30,7 +30,7 @@ pub(crate) struct KubernetesArguments {
     pub(crate) namespaced: Flag,
     // root
     pub(crate) crates: Option<KubernetesCrateArguments>,
-    pub(crate) status: Option<String>,
+    pub(crate) status: Option<Path>,
     // derive
     // schema
     // scale
diff --git a/crates/stackable-versioned-macros/src/codegen/changes.rs b/crates/stackable-versioned-macros/src/codegen/changes.rs
@@ -66,7 +66,7 @@ where
     where
         F: Fn(&V) -> bool,
     {
-        self.get(key).map_or(false, f)
+        self.get(key).is_some_and(f)
     }
 
     fn lo_bound(&self, bound: Bound<&K>) -> Option<(&K, &V)> {
diff --git a/crates/stackable-versioned-macros/src/codegen/container/enum.rs b/crates/stackable-versioned-macros/src/codegen/container/enum.rs
@@ -34,7 +34,7 @@ impl Container {
                 .common
                 .options
                 .skip
-                .map_or(false, |s| s.from.is_present()),
+                .is_some_and(|s| s.from.is_present()),
         };
 
         let idents = ContainerIdents::from(item_enum.ident, None);
@@ -68,10 +68,7 @@ impl Container {
 
         let options = ContainerOptions {
             kubernetes_options: None,
-            skip_from: attributes
-                .options
-                .skip
-                .map_or(false, |s| s.from.is_present()),
+            skip_from: attributes.options.skip.is_some_and(|s| s.from.is_present()),
         };
 
         let idents = ContainerIdents::from(item_enum.ident, None);
@@ -209,7 +206,7 @@ impl Enum {
         // cannot be deprecated). Then we retrieve the status of the variant and
         // ensure it is deprecated.
         self.variants.iter().any(|f| {
-            f.changes.as_ref().map_or(false, |c| {
+            f.changes.as_ref().is_some_and(|c| {
                 c.value_is(&version.inner, |a| {
                     matches!(
                         a,
diff --git a/crates/stackable-versioned-macros/src/codegen/container/mod.rs b/crates/stackable-versioned-macros/src/codegen/container/mod.rs
@@ -275,7 +275,7 @@ pub(crate) struct KubernetesOptions {
     pub(crate) namespaced: bool,
     // root
     pub(crate) crates: KubernetesCrateOptions,
-    pub(crate) status: Option<String>,
+    pub(crate) status: Option<Path>,
     // derive
     // schema
     // scale
@@ -302,7 +302,7 @@ impl From<KubernetesArguments> for KubernetesOptions {
                 .map_or_else(KubernetesCrateOptions::default, |crates| crates.into()),
             status: args.status,
             shortnames: args.shortnames,
-            skip_merged_crd: args.skip.map_or(false, |s| s.merged_crd.is_present()),
+            skip_merged_crd: args.skip.is_some_and(|s| s.merged_crd.is_present()),
         }
     }
 }
diff --git a/crates/stackable-versioned-macros/src/codegen/container/struct.rs b/crates/stackable-versioned-macros/src/codegen/container/struct.rs
@@ -47,7 +47,7 @@ impl Container {
                 .common
                 .options
                 .skip
-                .map_or(false, |s| s.from.is_present()),
+                .is_some_and(|s| s.from.is_present()),
             kubernetes_options,
         };
 
@@ -90,10 +90,7 @@ impl Container {
         }
 
         let options = ContainerOptions {
-            skip_from: attributes
-                .options
-                .skip
-                .map_or(false, |s| s.from.is_present()),
+            skip_from: attributes.options.skip.is_some_and(|s| s.from.is_present()),
             kubernetes_options,
         };
 
@@ -245,7 +242,7 @@ impl Struct {
         // cannot be deprecated). Then we retrieve the status of the field and
         // ensure it is deprecated.
         self.fields.iter().any(|f| {
-            f.changes.as_ref().map_or(false, |c| {
+            f.changes.as_ref().is_some_and(|c| {
                 c.value_is(&version.inner, |a| {
                     matches!(
                         a,
diff --git a/crates/stackable-versioned-macros/src/codegen/mod.rs b/crates/stackable-versioned-macros/src/codegen/mod.rs
@@ -36,7 +36,7 @@ impl From<&StandaloneContainerAttributes> for Vec<VersionDefinition> {
             .versions
             .iter()
             .map(|v| VersionDefinition {
-                skip_from: v.skip.as_ref().map_or(false, |s| s.from.is_present()),
+                skip_from: v.skip.as_ref().is_some_and(|s| s.from.is_present()),
                 ident: format_ident!("{version}", version = v.name.to_string()).into(),
                 deprecated: v.deprecated.as_ref().map(|r#override| {
                     r#override
@@ -57,7 +57,7 @@ impl From<&ModuleAttributes> for Vec<VersionDefinition> {
             .versions
             .iter()
             .map(|v| VersionDefinition {
-                skip_from: v.skip.as_ref().map_or(false, |s| s.from.is_present()),
+                skip_from: v.skip.as_ref().is_some_and(|s| s.from.is_present()),
                 ident: format_ident!("{version}", version = v.name.to_string()).into(),
                 deprecated: v.deprecated.as_ref().map(|r#override| {
                     r#override
diff --git a/crates/stackable-versioned-macros/src/codegen/module.rs b/crates/stackable-versioned-macros/src/codegen/module.rs
@@ -53,7 +53,7 @@ impl Module {
             .options
             .skip
             .as_ref()
-            .map_or(false, |opts| opts.from.is_present());
+            .is_some_and(|opts| opts.from.is_present());
 
         let mut errors = Error::accumulator();
         let mut submodules = HashMap::new();
diff --git a/crates/stackable-versioned/CHANGELOG.md b/crates/stackable-versioned/CHANGELOG.md
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [0.7.0] - 2025-03-17
+
+### Changed
+
+- Change `status` field type to `syn::Path` in `KubernetesArguments` and `KubernetesOptions` ([#982]).
+
+[#982]: https://github.com/stackabletech/operator-rs/pull/982
+
 ## [0.6.0] - 2025-02-28
 
 ### Added
diff --git a/crates/stackable-versioned/Cargo.toml b/crates/stackable-versioned/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "stackable-versioned"
-version = "0.6.0"
+version = "0.7.0"
 authors.workspace = true
 license.workspace = true
 edition.workspace = true
diff --git a/deny.toml b/deny.toml
@@ -17,18 +17,37 @@ ignore = [
     # So we need to accept this, as of SDP 24.11 we are not using the rsa crate to create certificates used in production
     # setups.
     #
-    # TODO: Remove after https://github.com/RustCrypto/RSA/pull/394 is merged
+    # TODO: Remove after https://github.com/RustCrypto/RSA/pull/394 is merged and v0.10.0 is released
     "RUSTSEC-2023-0071",
 
     # https://rustsec.org/advisories/RUSTSEC-2024-0384
     # "instant" is unmaintained
     #
     # The upstream "kube" crate also silenced this in https://github.com/kube-rs/kube/commit/4f1e889f265da8f19f03f60683569cae1a154fda
     # They/we are actively working on migrating kube from backoff to backon, which removes the transitive dependency on
-    # instant, in https://github.com/kube-rs/kube/pull/1652.
+    # instant, in https://github.com/kube-rs/kube/pull/1653.
     #
-    # TODO: Remove after https://github.com/kube-rs/kube/pull/1652 is merged
+    # TODO: Remove after https://github.com/kube-rs/kube/pull/1653 is released
     "RUSTSEC-2024-0384",
+
+    # Advisory: https://rustsec.org/advisories/RUSTSEC-2025-0012
+    # The [backoff](https://crates.io/crates/backoff) crate is no longer actively maintained. For exponential backoffs/retrying, you can use the [backon](https://crates.io/crates/backon) crate.
+    # Announcement: https://github.com/ihrwein/backoff/issues/66
+    #
+    # TODO: Remove after https://github.com/kube-rs/kube/pull/1653 is released
+    "RUSTSEC-2025-0012",
+
+    # Advisory: https://rustsec.org/advisories/RUSTSEC-2024-0436
+    # The creator of the crate `paste` has stated in the [`README.md`](https://github.com/dtolnay/paste/blob/master/README.md)
+    # that this project is not longer maintained as well as archived the repository
+    # Announcement: https://github.com/dtolnay/paste
+    #
+    # This comes in via aws-lc-rs. There is a PR open to migrate from `paste` to `concat-idents`.
+    # https://github.com/aws/aws-lc-rs/pull/723
+    #
+    # TODO: Remove after the migration is done and aws-lc-rs doesn't use paste anymore.
+    "RUSTSEC-2024-0436",
+
 ]
 
 [bans]
@@ -47,7 +66,7 @@ allow = [
     "LicenseRef-webpki",
     "MIT",
     "MPL-2.0",
-    "OpenSSL", # Needed for the ring and/or aws-lc-sys crate. See https://github.com/stackabletech/operator-templating/pull/464 for details
+    "OpenSSL",           # Needed for the ring and/or aws-lc-sys crate. See https://github.com/stackabletech/operator-templating/pull/464 for details
     "Unicode-3.0",
     "Unicode-DFS-2016",
     "Zlib",
@@ -58,16 +77,12 @@ private = { ignore = true }
 [[licenses.clarify]]
 name = "ring"
 expression = "LicenseRef-ring"
-license-files = [
-    { path = "LICENSE", hash = 0xbd0eed23 },
-]
+license-files = [{ path = "LICENSE", hash = 0xbd0eed23 }]
 
 [[licenses.clarify]]
 name = "webpki"
 expression = "LicenseRef-webpki"
-license-files = [
-    { path = "LICENSE", hash = 0x001c7e6c },
-]
+license-files = [{ path = "LICENSE", hash = 0x001c7e6c }]
 
 [sources]
 unknown-registry = "deny"

Original file line number	Diff line number	Diff line change
`@@ -380,7 +380,7 @@ where`
`380`	`380`	`key_certificate: &str,`
`381`	`381`	`key_private_key: &str,`
`382`	`382`	`) -> Result<Self, SecretError<S::Error>> {`
`383`		`- if !secret.type_.as_ref().is_some_and(\|s\| s == TLS_SECRET_TYPE) {`
	`383`	`+ if secret.type_.as_ref().is_none_or(\|s\| s != TLS_SECRET_TYPE) {`
`384`	`384`	`return InvalidSecretTypeSnafu.fail();`
`385`	`385`	`}`
`386`	`386`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ pub struct Validator<'a> {`
`26`	`26`	`parent: Option<&'a Validator<'a>>,`
`27`	`27`	`}`
`28`	`28`
`29`		`-impl<'a> Validator<'a> {`
	`29`	`+impl Validator<'_> {`
`30`	`30`	/// Creates a `Validator` for a subfield of the current object
`31`	`31`	`pub fn field<'b>(&'b self, ident: &'b dyn Display) -> Validator<'b> {`
`32`	`32`	`Validator {`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ impl<'de> Deserialize<'de> for CpuQuantity {`
`70`	`70`	`{`
`71`	`71`	`struct CpuQuantityVisitor;`
`72`	`72`
`73`		`- impl<'de> Visitor<'de> for CpuQuantityVisitor {`
	`73`	`+ impl Visitor<'_> for CpuQuantityVisitor {`
`74`	`74`	`type Value = CpuQuantity;`
`75`	`75`
`76`	`76`	`fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {`
Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ impl<'de> Deserialize<'de> for MemoryQuantity {`
`347`	`347`	`{`
`348`	`348`	`struct MemoryQuantityVisitor;`
`349`	`349`
`350`		`- impl<'de> Visitor<'de> for MemoryQuantityVisitor {`
	`350`	`+ impl Visitor<'_> for MemoryQuantityVisitor {`
`351`	`351`	`type Value = MemoryQuantity;`
`352`	`352`
`353`	`353`	`fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {`