Merge remote-tracking branch 'origin/main' into spike/generic-databases

Author: sbernauer

Cargo.lock

@@ -6,16 +6,23 @@ All notable changes to this project will be documented in this file.
 
 ### Added
 
+- Implement `Deref` for `kvp::Key` to be more ergonomic to use ([#1182]).
 - Add support for specifying a `clientAuthenticationMethod` for OIDC ([#1178]).
   This was originally done in [#1158] and had been reverted in [#1170].
-- Add generic database connection mechanism ([#1163])
+- Add generic database connection mechanism ([#1163]).
 
 ### Changed
 
-- BREAKING: Change signature of `ContainerBuilder::add_env_vars` from `Vec<EnvVar>` to `IntoIterator<Item = EnvVar>` ([#1163])
+- BREAKING: Change signature of `ContainerBuilder::add_env_vars` from `Vec<EnvVar>` to `IntoIterator<Item = EnvVar>` ([#1163]).
+
+### Removed
+
+- BREAKING: Remove unused `add_prefix`, `try_add_prefix`, `set_name`, and `try_set_name` associated
+  functions from `kvp::Key` to disallow mutable access to inner values ([#1182]).
 
 [#1163]: https://github.com/stackabletech/operator-rs/pull/1163
 [#1178]: https://github.com/stackabletech/operator-rs/pull/1178
+[#1182]: https://github.com/stackabletech/operator-rs/pull/1182
 
 ## [0.108.0] - 2026-03-10
 

crates/stackable-operator/CHANGELOG.md

@@ -58,6 +58,16 @@ pub enum KeyError {
 /// [k8s-labels]: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub struct Key {
+    /// A cached and formatted representation of a [`Key`] as a [`String`], which enables the
+    /// implementation of [`Deref`], instead of constructing a new [`String`] every time the string
+    /// representation of a key is needed.
+    ///
+    /// ### Safety
+    ///
+    /// This is safe to do (and cache it), because [`Key`] doesn't provide any **mutable** access
+    /// to the inner values.
+    string: String,
+
     prefix: Option<KeyPrefix>,
     name: KeyName,
 }
@@ -80,12 +90,22 @@ impl FromStr for Key {
             _ => return NestedPrefixSnafu.fail(),
         };
 
+        let prefix = prefix
+            .map(KeyPrefix::from_str)
+            .transpose()
+            .context(KeyPrefixSnafu)?;
+
+        let name = KeyName::from_str(name).context(KeyNameSnafu)?;
+
+        let string = match prefix {
+            Some(ref prefix) => format!("{prefix}/{name}"),
+            None => format!("{name}"),
+        };
+
         let key = Self {
-            prefix: prefix
-                .map(KeyPrefix::from_str)
-                .transpose()
-                .context(KeyPrefixSnafu)?,
-            name: KeyName::from_str(name).context(KeyNameSnafu)?,
+            string,
+            prefix,
+            name,
         };
 
         Ok(key)
@@ -102,10 +122,15 @@ impl TryFrom<&str> for Key {
 
 impl Display for Key {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match &self.prefix {
-            Some(prefix) => write!(f, "{}/{}", prefix, self.name),
-            None => write!(f, "{}", self.name),
-        }
+        write!(f, "{key}", key = self.string)
+    }
+}
+
+impl Deref for Key {
+    type Target = str;
+
+    fn deref(&self) -> &Self::Target {
+        self.string.as_str()
     }
 }
 
@@ -126,21 +151,6 @@ impl Key {
         self.prefix.as_ref()
     }
 
-    /// Adds or replaces the key prefix. This takes a parsed and validated
-    /// [`KeyPrefix`] as a parameter. If instead you want to use a raw value,
-    /// use the [`Key::try_add_prefix()`] function instead.
-    pub fn add_prefix(&mut self, prefix: KeyPrefix) {
-        self.prefix = Some(prefix)
-    }
-
-    /// Adds or replaces the key prefix by parsing and validation raw input. If
-    /// instead you already have a parsed and validated [`KeyPrefix`], use the
-    /// [`Key::add_prefix()`] function instead.
-    pub fn try_add_prefix(&mut self, prefix: impl AsRef<str>) -> Result<&mut Self, KeyError> {
-        self.prefix = Some(KeyPrefix::from_str(prefix.as_ref()).context(KeyPrefixSnafu)?);
-        Ok(self)
-    }
-
     /// Retrieves the key's name.
     ///
     /// ```
@@ -156,21 +166,6 @@ impl Key {
     pub fn name(&self) -> &KeyName {
         &self.name
     }
-
-    /// Sets the key name. This takes a parsed and validated [`KeyName`] as a
-    /// parameter. If instead you want to use a raw value, use the
-    /// [`Key::try_set_name()`] function instead.
-    pub fn set_name(&mut self, name: KeyName) {
-        self.name = name
-    }
-
-    /// Sets the key name by parsing and validation raw input. If instead you
-    /// already have a parsed and validated [`KeyName`], use the
-    /// [`Key::set_name()`] function instead.
-    pub fn try_set_name(&mut self, name: impl AsRef<str>) -> Result<&mut Self, KeyError> {
-        self.name = KeyName::from_str(name.as_ref()).context(KeyNameSnafu)?;
-        Ok(self)
-    }
 }
 
 /// The error type for key prefix parsing/validation operations.

crates/stackable-operator/src/kvp/key.rs

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [0.6.3] - 2026-03-30
+
+### Fixed
+
+- Only use ANSI escape sequences if stdout is a terminal/tty. Piping the output to a file will now
+  result in plain text log messages ([#1183]).
+
+[#1183]: https://github.com/stackabletech/operator-rs/pull/1183
+
 ## [0.6.2] - 2026-03-09
 
 ### Fixed

crates/stackable-telemetry/CHANGELOG.md

@@ -1,6 +1,6 @@
 [package]
 name = "stackable-telemetry"
-version = "0.6.2"
+version = "0.6.3"
 authors.workspace = true
 license.workspace = true
 edition.workspace = true

crates/stackable-telemetry/Cargo.toml

@@ -6,7 +6,7 @@
 //!
 //! To get started, see [`Tracing`].
 
-use std::{ops::Not, path::PathBuf};
+use std::{io::IsTerminal, ops::Not, path::PathBuf};
 
 use opentelemetry::trace::TracerProvider;
 use opentelemetry_appender_tracing::layer::OpenTelemetryTracingBridge;
@@ -432,15 +432,21 @@ impl Tracing {
 
             // NOTE (@NickLarsenNZ): There is no elegant way to build the layer depending on formats because the types
             // returned from each subscriber "modifier" function is different (sometimes with different generics).
+            // tracing-subscriber does not auto-detect whether stdout is a terminal
+            // (https://github.com/tokio-rs/tracing/issues/1160), so we check explicitly.
+            let use_ansi = std::io::stdout().is_terminal();
+
             match log_format {
                 Format::Plain => {
-                    let console_output_layer =
-                        tracing_subscriber::fmt::layer().with_filter(env_filter_layer);
+                    let console_output_layer = tracing_subscriber::fmt::layer()
+                        .with_ansi(use_ansi)
+                        .with_filter(env_filter_layer);
                     layers.push(console_output_layer.boxed());
                 }
                 Format::Json => {
                     let console_output_layer = tracing_subscriber::fmt::layer()
                         .json()
+                        .with_ansi(use_ansi)
                         .with_filter(env_filter_layer);
                     layers.push(console_output_layer.boxed());
                 }