chore: Rust dependency bumps

Author: sbernauer

Cargo.lock

@@ -33,13 +33,14 @@ directories = "6.0"
 dotenvy = "0.15"
 either = "1.15.0"
 futures = "0.3"
+hex = "0.4"
 indexmap = { version = "2.2", features = ["serde"] }
 indicatif = "0.18"
 lazy_static = "1.5"
 libc = "0.2"
 once_cell = "1.19"
-phf = "0.13"
-phf_codegen = "0.13"
+phf = "0.14"
+phf_codegen = "0.14"
 rand = "0.10"
 regex = "1.10"
 reqwest = { version = "0.13", default-features = false, features = ["json", "rustls"] }
@@ -49,14 +50,14 @@ semver = { version = "1.0", features = ["serde"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_yaml = "0.9"
-sha2 = "0.10"
+sha2 = "0.11"
 snafu = { version = "0.9", features = ["futures"] }
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.109.0", default-features = false, features = ["crds", "kube-ws"] }
-tera = "1.20"
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.113.4", default-features = false, features = ["crds", "kube-ws"] }
+tera = "2.0"
 termion = "4.0"
 tokio = { version = "1.38", features = ["rt-multi-thread", "macros", "fs", "process", "io-std"] }
 toml = { version = "1.0", features = ["serde"] }
-tower-http = { version = "0.6", features = ["validate-request"] }
+tower-http = { version = "0.7", features = ["validate-request"] }
 tracing = "0.1"
 tracing-indicatif = "0.3.9"
 tracing-subscriber = "0.3"

Cargo.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.93.0"
+channel = "1.95.0"
 profile = "default"

rust-toolchain.toml

@@ -18,6 +18,7 @@ helm-sys = { path = "../helm-sys" }
 bcrypt.workspace = true
 clap.workspace = true
 either.workspace = true
+hex.workspace = true
 indexmap.workspace = true
 rand.workspace = true
 reqwest.workspace = true

rust/stackable-cockpit/Cargo.toml

@@ -22,7 +22,7 @@ pub async fn create_if_needed(client: &Client, name: String) -> Result<(), Error
         .create_namespace_if_needed(name)
         .await
         .map_err(|err| match err {
-            k8s::Error::KubeClientCreate { source } => match source {
+            k8s::Error::KubeClientCreate { source } => match &*source {
                 kube::Error::Api(err) if err.code == 401 => Error::PermissionDenied,
                 _ => Error::KubeClientCreate {
                     source: Box::new(k8s::Error::KubeClientCreate { source }),

rust/stackable-cockpit/src/platform/namespace.rs

@@ -58,9 +58,9 @@ pub async fn get_endpoints(
         .await;
     let listeners = match listeners {
         Ok(ok) => Ok(ok.items),
-        Err(k8s::Error::KubeClientFetch {
-            source: kube::Error::Api(err),
-        }) if err.code == 404 => {
+        Err(k8s::Error::KubeClientFetch { source })
+            if matches!(&*source, kube::Error::Api(err) if err.code == 404) =>
+        {
             // In case the listener-operator is not installed, this will return a 404. We should not fail, as this causes
             // stackablectl to fail with ApiError 404 on clusters without listener-operator.
             Ok(Vec::new())

rust/stackable-cockpit/src/platform/service.rs

@@ -37,17 +37,27 @@ pub type Result<T, E = Error> = std::result::Result<T, E>;
 #[derive(Debug, Snafu)]
 pub enum Error {
     #[snafu(display("failed to create Kubernetes client"))]
-    KubeClientCreate { source: kube::error::Error },
+    KubeClientCreate {
+        #[snafu(source(from(kube::error::Error, Box::new)))]
+        source: Box<kube::error::Error>,
+    },
 
     #[snafu(display("failed to fetch data from Kubernetes API"))]
-    KubeClientFetch { source: kube::error::Error },
+    KubeClientFetch {
+        #[snafu(source(from(kube::error::Error, Box::new)))]
+        source: Box<kube::error::Error>,
+    },
 
     #[snafu(display("failed to patch/create Kubernetes object"))]
-    KubeClientPatch { source: kube::error::Error },
+    KubeClientPatch {
+        #[snafu(source(from(kube::error::Error, Box::new)))]
+        source: Box<kube::error::Error>,
+    },
 
     #[snafu(display("failed to replace Kubernetes object"))]
     KubeClientReplace {
-        source: kube::error::Error,
+        #[snafu(source(from(kube::error::Error, Box::new)))]
+        source: Box<kube::error::Error>,
         gvk: GroupVersionKind,
     },
 
@@ -60,7 +70,10 @@ pub enum Error {
     DeserializeYaml { source: serde_yaml::Error },
 
     #[snafu(display("failed to run GVK discovery"))]
-    GVKDiscoveryRun { source: kube::error::Error },
+    GVKDiscoveryRun {
+        #[snafu(source(from(kube::error::Error, Box::new)))]
+        source: Box<kube::error::Error>,
+    },
 
     #[snafu(display("failed to deploy manifest because type of object {object:?} is not set"))]
     ObjectType { object: Box<DynamicObject> },

rust/stackable-cockpit/src/utils/k8s/client.rs

@@ -2,8 +2,7 @@ use std::collections::HashMap;
 
 use bcrypt::DEFAULT_COST;
 use rand::distr::{Alphanumeric, SampleString};
-use serde::de::DeserializeOwned;
-use tera::{Context, Function, Tera, Value};
+use tera::{Context, Kwargs, State, Tera, TeraResult};
 
 use crate::constants::PASSWORD_LENGTH;
 
@@ -14,47 +13,25 @@ use crate::constants::PASSWORD_LENGTH;
 /// - `random_password`: Returns a random password with a relatively secure RNG.
 ///   See [`rand::rng`] for more information.
 /// - `bcrypt`: Returns the bcyrpt hash of the provided `password` parameter.
-pub fn render(content: &str, parameters: &HashMap<String, String>) -> Result<String, tera::Error> {
+pub fn render(content: &str, parameters: &HashMap<String, String>) -> TeraResult<String> {
     // Create templating context
     let context = Context::from_serialize(parameters)?;
 
     // Create render engine
-    let mut tera = Tera::default();
-    tera.register_function("random_password", random_password());
-    tera.register_function("bcrypt", bcrypt());
+    let mut tera = Tera::new();
+    tera.register_function("random_password", random_password);
+    tera.register_function("bcrypt", bcrypt);
 
     // Render template
-    tera.render_str(content, &context)
+    tera.render(content, &context)
 }
 
-/// Internal helper function to retrieve value of type `T` from the `map` by
-/// `key`. If the `key` is not present in the `map`, it returns an error.
-fn get_from_map<T>(map: &HashMap<String, Value>, key: &str) -> tera::Result<T>
-where
-    T: DeserializeOwned,
-{
-    match map.get(key) {
-        Some(value) => match tera::from_value(value.to_owned()) {
-            Ok(extracted) => Ok(extracted),
-            Err(_) => Err(format!("Unable to retrieve value of argument {key:?}").into()),
-        },
-        None => Err(format!("Failed to retrieve missing parameter {key:?}").into()),
-    }
+pub fn random_password(_: Kwargs, _: &State) -> TeraResult<String> {
+    Ok(Alphanumeric.sample_string(&mut rand::rng(), PASSWORD_LENGTH))
 }
 
-fn random_password() -> impl Function {
-    |_args: &HashMap<String, Value>| -> tera::Result<Value> {
-        let password = Alphanumeric.sample_string(&mut rand::rng(), PASSWORD_LENGTH);
-        Ok(password.into())
-    }
-}
-
-fn bcrypt() -> impl Function {
-    |args: &HashMap<String, Value>| -> tera::Result<Value> {
-        let password: String = get_from_map(args, "password")?;
-        let hash = bcrypt::hash(password, DEFAULT_COST)
-            .map_err(|err| format!("Failed to create bcrypt hash: {err}"))?;
-
-        Ok(hash.into())
-    }
+pub fn bcrypt(kwargs: Kwargs, _: &State) -> TeraResult<String> {
+    let password = kwargs.must_get::<String>("password")?;
+    bcrypt::hash(password, DEFAULT_COST)
+        .map_err(|err| tera::Error::message(format!("Failed to create bcrypt hash: {err}")))
 }

rust/stackable-cockpit/src/utils/templating.rs

@@ -222,16 +222,12 @@ impl Cache {
     }
 
     fn file_path(base_path: &Path, file_url: &Url) -> PathBuf {
-        let mut hasher = Sha256::new();
-
         let sanitized_file_name = file_url
             .as_str()
             .replace(|c: char| !c.is_alphanumeric(), "-");
+        let file_url_hash = hex::encode(Sha256::digest(file_url.as_str().as_bytes()));
 
-        hasher.update(file_url.as_str().as_bytes());
-        let file_url_hash = hasher.finalize();
-
-        base_path.join(format!("{sanitized_file_name}-{file_url_hash:x}"))
+        base_path.join(format!("{sanitized_file_name}-{file_url_hash}"))
     }
 }
 

rust/stackable-cockpit/src/xfer/cache.rs

@@ -54,7 +54,10 @@ pub enum Error {
     Cache { source: cache::CmdError },
 
     #[snafu(display("failed to execute debug (sub)command"))]
-    Debug { source: debug::CmdError },
+    Debug {
+        #[snafu(source(from(debug::CmdError, Box::new)))]
+        source: Box<debug::CmdError>,
+    },
 
     #[snafu(display("failed to execute version (sub)command"))]
     Version { source: version::CmdError },
@@ -194,7 +197,6 @@ impl Cli {
         }
     }
 
-    #[allow(clippy::result_large_err)]
     fn xdg_directories() -> Result<ProjectDirs, Error> {
         ProjectDirs::from(
             USER_DIR_QUALIFIER,