chore: Fix clippy warnings

siegfriedweber · siegfriedweber · commit 0ddcd5736534 · 2025-07-15T16:45:33.000+02:00
diff --git a/rust/stackable-cockpit/src/platform/credentials.rs b/rust/stackable-cockpit/src/platform/credentials.rs
@@ -11,7 +11,7 @@ pub type Result<T, E = Error> = std::result::Result<T, E>;
 #[derive(Debug, Snafu)]
 pub enum Error {
     #[snafu(display("failed to fetch data from Kubernetes API"))]
-    KubeClientFetch { source: k8s::Error },
+    KubeClientFetch { source: Box<k8s::Error> },
 
     #[snafu(display("no credentials secret found"))]
     NoSecret,
@@ -69,6 +69,7 @@ pub async fn get(
                     "adminUser.password",
                 )
                 .await
+                .map_err(Box::new)
                 .context(KubeClientFetchSnafu)?
         }
         "nifi" => {
@@ -84,6 +85,7 @@ pub async fn get(
                     "password",
                 )
                 .await
+                .map_err(Box::new)
                 .context(KubeClientFetchSnafu)?
         }
         _ => return Ok(None),
diff --git a/rust/stackable-cockpit/src/platform/namespace.rs b/rust/stackable-cockpit/src/platform/namespace.rs
@@ -5,7 +5,7 @@ use crate::utils::k8s::{self, Client};
 #[derive(Debug, Snafu)]
 pub enum Error {
     #[snafu(display("failed to create Kubernetes client"))]
-    KubeClientCreate { source: k8s::Error },
+    KubeClientCreate { source: Box<k8s::Error> },
 
     #[snafu(display(
         "permission denied - try to create the namespace manually or choose an already existing one to which you have access to"
@@ -24,9 +24,11 @@ pub async fn create_if_needed(client: &Client, name: String) -> Result<(), Error
             k8s::Error::KubeClientCreate { source } => match source {
                 kube::Error::Api(err) if err.code == 401 => Error::PermissionDenied,
                 _ => Error::KubeClientCreate {
-                    source: k8s::Error::KubeClientCreate { source },
+                    source: Box::new(k8s::Error::KubeClientCreate { source }),
                 },
             },
-            _ => Error::KubeClientCreate { source: err },
+            _ => Error::KubeClientCreate {
+                source: Box::new(err),
+            },
         })
 }
diff --git a/rust/stackable-cockpit/src/platform/release/spec.rs b/rust/stackable-cockpit/src/platform/release/spec.rs
@@ -49,7 +49,7 @@ pub enum Error {
     BackgroundTask { source: JoinError },
 
     #[snafu(display("failed to deploy manifests using the kube client"))]
-    DeployManifest { source: k8s::Error },
+    DeployManifest { source: Box<k8s::Error> },
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
@@ -195,6 +195,7 @@ impl ReleaseSpec {
                 k8s_client
                     .replace_crds(&crd_manifests)
                     .await
+                    .map_err(Box::new)
                     .context(DeployManifestSnafu)?;
 
                 info!("Upgraded {product_name}-operator CRDs");
diff --git a/rust/stackable-cockpit/src/platform/service.rs b/rust/stackable-cockpit/src/platform/service.rs
@@ -18,7 +18,7 @@ use crate::utils::k8s::{self, Client, ListParamsExt};
 #[derive(Debug, Snafu)]
 pub enum Error {
     #[snafu(display("failed to fetch data from Kubernetes API"))]
-    KubeClientFetch { source: k8s::Error },
+    KubeClientFetch { source: Box<k8s::Error> },
 
     #[snafu(display("missing namespace for service {service:?}"))]
     MissingServiceNamespace { service: String },
@@ -62,6 +62,7 @@ pub async fn get_endpoints(
         }
         Err(err) => Err(err),
     }
+    .map_err(Box::new)
     .context(KubeClientFetchSnafu)?;
 
     let mut endpoints = IndexMap::new();
@@ -95,6 +96,7 @@ pub async fn get_endpoints(
     let services = client
         .list_services(Some(object_namespace), &list_params)
         .await
+        .map_err(Box::new)
         .context(KubeClientFetchSnafu)?;
 
     for service in services {
@@ -161,6 +163,7 @@ pub async fn get_endpoint_urls_for_nodeport(
     let endpoints = client
         .get_endpoints(service_namespace, service_name)
         .await
+        .map_err(Box::new)
         .context(KubeClientFetchSnafu)?;
 
     let node_name = match &endpoints.subsets {
@@ -288,7 +291,11 @@ async fn get_node_ip(client: &Client, node_name: &str) -> Result<String, Error>
 // TODO(sbernauer): Add caching. Not going to do so now, as listener-op
 // will replace this code entirely anyway.
 async fn get_node_name_ip_mapping(client: &Client) -> Result<HashMap<String, String>, Error> {
-    let nodes = client.list_nodes().await.context(KubeClientFetchSnafu)?;
+    let nodes = client
+        .list_nodes()
+        .await
+        .map_err(Box::new)
+        .context(KubeClientFetchSnafu)?;
 
     let mut result = HashMap::new();
     for node in nodes {
diff --git a/rust/stackable-cockpit/src/platform/stacklet/grafana.rs b/rust/stackable-cockpit/src/platform/stacklet/grafana.rs
@@ -16,6 +16,7 @@ pub(super) async fn list(client: &Client, namespace: Option<&str>) -> Result<Vec
     let services = client
         .list_services(namespace, &params)
         .await
+        .map_err(Box::new)
         .context(KubeClientFetchSnafu)?;
 
     for service in services {
diff --git a/rust/stackable-cockpit/src/platform/stacklet/minio.rs b/rust/stackable-cockpit/src/platform/stacklet/minio.rs
@@ -17,6 +17,7 @@ pub(super) async fn list(client: &Client, namespace: Option<&str>) -> Result<Vec
     let services = client
         .list_services(namespace, &params)
         .await
+        .map_err(Box::new)
         .context(KubeClientFetchSnafu)?;
 
     let console_services = services
diff --git a/rust/stackable-cockpit/src/platform/stacklet/mod.rs b/rust/stackable-cockpit/src/platform/stacklet/mod.rs
@@ -42,10 +42,10 @@ pub struct Stacklet {
 #[derive(Debug, Snafu)]
 pub enum Error {
     #[snafu(display("failed to create Kubernetes client"))]
-    KubeClientCreate { source: k8s::Error },
+    KubeClientCreate { source: Box<k8s::Error> },
 
     #[snafu(display("failed to fetch data from the Kubernetes API"))]
-    KubeClientFetch { source: k8s::Error },
+    KubeClientFetch { source: Box<k8s::Error> },
 
     #[snafu(display("no namespace set for custom resource {crd_name:?}"))]
     CustomCrdNamespace { crd_name: String },
@@ -87,6 +87,7 @@ pub async fn get_credentials_for_product(
     let product_cluster = match client
         .get_namespaced_object(namespace, object_name, &product_gvk)
         .await
+        .map_err(Box::new)
         .context(KubeClientFetchSnafu)?
     {
         Some(obj) => obj,
@@ -124,6 +125,7 @@ async fn list_stackable_stacklets(
         let objects = match client
             .list_objects(&product_gvk, namespace)
             .await
+            .map_err(Box::new)
             .context(KubeClientFetchSnafu)?
         {
             Some(obj) => obj,
diff --git a/rust/stackable-cockpit/src/platform/stacklet/opensearch.rs b/rust/stackable-cockpit/src/platform/stacklet/opensearch.rs
@@ -16,6 +16,7 @@ pub(super) async fn list(client: &Client, namespace: Option<&str>) -> Result<Vec
     let services = client
         .list_services(namespace, &params)
         .await
+        .map_err(Box::new)
         .context(KubeClientFetchSnafu)?;
 
     for service in services {
diff --git a/rust/stackable-cockpit/src/platform/stacklet/prometheus.rs b/rust/stackable-cockpit/src/platform/stacklet/prometheus.rs
@@ -17,6 +17,7 @@ pub(super) async fn list(client: &Client, namespace: Option<&str>) -> Result<Vec
     let services = client
         .list_services(namespace, &params)
         .await
+        .map_err(Box::new)
         .context(KubeClientFetchSnafu)?;
 
     for service in services {
diff --git a/rust/stackable-cockpit/src/utils/k8s/client.rs b/rust/stackable-cockpit/src/utils/k8s/client.rs
@@ -51,7 +51,7 @@ pub enum Error {
     GVKDiscoveryRun { source: kube::error::Error },
 
     #[snafu(display("failed to deploy manifest because type of object {object:?} is not set"))]
-    ObjectType { object: DynamicObject },
+    ObjectType { object: Box<DynamicObject> },
 
     // Using output close to Display for ObjectRef https://docs.rs/kube-runtime/0.99.0/src/kube_runtime/reflector/object_ref.rs.html#292-296
     #[snafu(display("failed to resolve GVK: {kind}.{version}.{group}",
@@ -440,13 +440,16 @@ impl Client {
     pub async fn create_namespace(&self, name: String) -> Result<()> {
         let namespace_api: Api<Namespace> = Api::all(self.client.clone());
         namespace_api
-            .create(&PostParams::default(), &Namespace {
-                metadata: ObjectMeta {
-                    name: Some(name),
+            .create(
+                &PostParams::default(),
+                &Namespace {
+                    metadata: ObjectMeta {
+                        name: Some(name),
+                        ..Default::default()
+                    },
                     ..Default::default()
                 },
-                ..Default::default()
-            })
+            )
             .await
             .context(KubeClientPatchSnafu)?;
 
diff --git a/rust/stackablectl/src/cli/mod.rs b/rust/stackablectl/src/cli/mod.rs
@@ -88,11 +88,8 @@ impl Cli {
     /// the default demo file URL constructed from [`DEMOS_REPOSITORY_URL_BASE`] and the provided branch, files provided
     /// by the ENV variable [`ENV_KEY_DEMO_FILES`], and lastly, files provided by the CLI argument `--demo-file`.
     pub fn get_demo_files(&self, branch: &str) -> Result<Vec<PathOrUrl>, PathOrUrlParseError> {
-        let branch_url = format!(
-            "{base}/{branch}/{demos}",
-            base = DEMOS_REPOSITORY_URL_BASE,
-            demos = DEMOS_REPOSITORY_DEMOS_SUBPATH
-        );
+        let branch_url =
+            format!("{DEMOS_REPOSITORY_URL_BASE}/{branch}/{DEMOS_REPOSITORY_DEMOS_SUBPATH}");
 
         let mut files = get_files(&branch_url, ENV_KEY_DEMO_FILES)?;
 
@@ -106,11 +103,8 @@ impl Cli {
     /// the default stack file URL constructed from [`DEMOS_REPOSITORY_URL_BASE`] and the provided branch, files provided
     /// by the ENV variable [`ENV_KEY_STACK_FILES`], and lastly, files provided by the CLI argument `--stack-file`.
     pub fn get_stack_files(&self, branch: &str) -> Result<Vec<PathOrUrl>, PathOrUrlParseError> {
-        let branch_url = format!(
-            "{base}/{branch}/{stacks}",
-            base = DEMOS_REPOSITORY_URL_BASE,
-            stacks = DEMOS_REPOSITORY_STACKS_SUBPATH
-        );
+        let branch_url =
+            format!("{DEMOS_REPOSITORY_URL_BASE}/{branch}/{DEMOS_REPOSITORY_STACKS_SUBPATH}");
 
         let mut files = get_files(&branch_url, ENV_KEY_STACK_FILES)?;
 
diff --git a/rust/stackablectl/src/cmds/debug.rs b/rust/stackablectl/src/cmds/debug.rs
@@ -36,7 +36,7 @@ pub enum CmdError {
 
     #[snafu(display("failed to get {pod}"))]
     GetPod {
-        source: kube::Error,
+        source: Box<kube::Error>,
         pod: ObjectRef<Pod>,
     },
 
@@ -48,15 +48,15 @@ pub enum CmdError {
 
     #[snafu(display("failed to create ephemeral debug container {container:?} on {pod}"))]
     CreateDebugContainer {
-        source: kube::Error,
-        pod: ObjectRef<Pod>,
+        source: Box<kube::Error>,
+        pod: Box<ObjectRef<Pod>>,
         container: String,
     },
 
     #[snafu(display("debug container {container:?} on {pod} never became ready"))]
     AwaitDebugContainerReadiness {
-        source: kube::runtime::wait::Error,
-        pod: ObjectRef<Pod>,
+        source: Box<kube::runtime::wait::Error>,
+        pod: Box<ObjectRef<Pod>>,
         container: String,
     },
 
@@ -68,8 +68,8 @@ pub enum CmdError {
 
     #[snafu(display("failed to attach to container {container:?} on {pod}"))]
     AttachContainer {
-        source: kube::Error,
-        pod: ObjectRef<Pod>,
+        source: Box<kube::Error>,
+        pod: Box<ObjectRef<Pod>>,
         container: String,
     },
 
@@ -149,6 +149,7 @@ impl DebugArgs {
             let pod = pods
                 .get(&self.pod)
                 .await
+                .map_err(Box::new)
                 .with_context(|_| GetPodSnafu { pod: pod_ref() })?;
             let template_container = pod
                 .spec
@@ -192,6 +193,7 @@ impl DebugArgs {
                 &kube::api::Patch::Strategic(pod_patch),
             )
             .await
+            .map_err(Box::new)
             .with_context(|_| CreateDebugContainerSnafu {
                 pod: pod_ref(),
                 container: &self.container,
@@ -212,6 +214,7 @@ impl DebugArgs {
                 },
             )
             .await
+            .map_err(Box::new)
             .with_context(|_| AwaitDebugContainerReadinessSnafu {
                 pod: pod_ref(),
                 container: &self.container,
@@ -241,6 +244,7 @@ impl DebugArgs {
                     &AttachParams::interactive_tty().container(debug_container_name),
                 )
                 .await
+                .map_err(Box::new)
                 .with_context(|_| AttachContainerSnafu {
                     pod: pod_ref(),
                     container: &self.container,
diff --git a/rust/stackablectl/src/cmds/demo.rs b/rust/stackablectl/src/cmds/demo.rs
@@ -173,9 +173,10 @@ impl DemoArgs {
 
         let release_branch = match &self.release {
             Some(release) => {
-                ensure!(release_list.contains_key(release), NoSuchReleaseSnafu {
-                    release
-                });
+                ensure!(
+                    release_list.contains_key(release),
+                    NoSuchReleaseSnafu { release }
+                );
 
                 if release == "dev" {
                     "main".to_string()
@@ -185,7 +186,7 @@ impl DemoArgs {
             }
             None => {
                 let (release_name, _) = release_list.first().context(LatestReleaseSnafu)?;
-                format!("release-{release}", release = release_name,)
+                format!("release-{release_name}")
             }
         };
 
diff --git a/rust/stackablectl/src/cmds/operator.rs b/rust/stackablectl/src/cmds/operator.rs
@@ -156,7 +156,7 @@ pub enum CmdError {
     SerializeJsonOutput { source: serde_json::Error },
 
     #[snafu(display("failed to create Kubernetes client"))]
-    KubeClientCreate { source: k8s::Error },
+    KubeClientCreate { source: Box<k8s::Error> },
 
     #[snafu(display("failed to create namespace {namespace:?}"))]
     NamespaceCreate {
@@ -317,7 +317,10 @@ async fn install_cmd(args: &OperatorInstallArgs, cli: &Cli) -> Result<String, Cm
         .await
         .context(CommonClusterArgsSnafu)?;
 
-    let client = Client::new().await.context(KubeClientCreateSnafu)?;
+    let client = Client::new()
+        .await
+        .map_err(Box::new)
+        .context(KubeClientCreateSnafu)?;
 
     namespace::create_if_needed(&client, args.operator_namespace.clone())
         .await
diff --git a/rust/stackablectl/src/cmds/stack.rs b/rust/stackablectl/src/cmds/stack.rs

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ pub type Result<T, E = Error> = std::result::Result<T, E>;`
`11`	`11`	`#[derive(Debug, Snafu)]`
`12`	`12`	`pub enum Error {`
`13`	`13`	`#[snafu(display("failed to fetch data from Kubernetes API"))]`
`14`		`- KubeClientFetch { source: k8s::Error },`
	`14`	`+ KubeClientFetch { source: Box<k8s::Error> },`
`15`	`15`
`16`	`16`	`#[snafu(display("no credentials secret found"))]`
`17`	`17`	`NoSecret,`
`@@ -69,6 +69,7 @@ pub async fn get(`
`69`	`69`	`"adminUser.password",`
`70`	`70`	`)`
`71`	`71`	`.await`
	`72`	`+ .map_err(Box::new)`
`72`	`73`	`.context(KubeClientFetchSnafu)?`
`73`	`74`	`}`
`74`	`75`	`"nifi" => {`
`@@ -84,6 +85,7 @@ pub async fn get(`
`84`	`85`	`"password",`
`85`	`86`	`)`
`86`	`87`	`.await`
	`88`	`+ .map_err(Box::new)`
`87`	`89`	`.context(KubeClientFetchSnafu)?`
`88`	`90`	`}`
`89`	`91`	`_ => return Ok(None),`