From 05ec2e4fbb21ac1168241918e00f07ddeba22951 Mon Sep 17 00:00:00 2001 From: Shaun Arman Date: Sat, 6 Jun 2026 13:47:51 -0500 Subject: [PATCH] fix: address clippy warnings - Remove unused imports - Use PortForwardSessionConfig struct to reduce function arguments --- src-tauri/src/commands/kube.rs | 19 +++++++------- src-tauri/src/kube/portforward.rs | 42 ++++++++++++++++--------------- 2 files changed, 32 insertions(+), 29 deletions(-) diff --git a/src-tauri/src/commands/kube.rs b/src-tauri/src/commands/kube.rs index f25e5529..1550788b 100644 --- a/src-tauri/src/commands/kube.rs +++ b/src-tauri/src/commands/kube.rs @@ -1,4 +1,5 @@ use crate::kube::ClusterClient; +use crate::kube::portforward::PortForwardSessionConfig; use crate::state::AppState; use serde::{Deserialize, Serialize}; use serde_yaml::Value; @@ -154,16 +155,16 @@ pub async fn start_port_forward( let cluster_name = cluster.name.clone(); let _kubeconfig_content = cluster.kubeconfig_content.clone(); - let session = crate::kube::PortForwardSession::new( - session_id.clone(), - request.cluster_id.clone(), + let session = crate::kube::PortForwardSession::new(PortForwardSessionConfig { + id: session_id.clone(), + cluster_id: request.cluster_id.clone(), cluster_name, - request.namespace.clone(), - request.pod.clone(), - None, - vec![request.container_port], - vec![0], - ); + namespace: request.namespace.clone(), + pod: request.pod.clone(), + container: None, + ports: vec![request.container_port], + local_ports: vec![0], + }); { let mut port_forwards = state.port_forwards.lock().await; diff --git a/src-tauri/src/kube/portforward.rs b/src-tauri/src/kube/portforward.rs index f151a894..2b70ffc6 100644 --- a/src-tauri/src/kube/portforward.rs +++ b/src-tauri/src/kube/portforward.rs @@ -1,4 +1,3 @@ -use std::process::{Child, Command, Stdio}; use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::Arc; @@ -12,7 +11,7 @@ pub struct PortForwardSession { pub ports: Vec, pub local_ports: Vec, pub status: PortForwardStatus, - pub kubectl_child: Option>>, + pub kubectl_child: Option>>, pub is_stopped: Arc, } @@ -22,26 +21,29 @@ pub enum PortForwardStatus { Error(String), } +#[derive(Debug, Clone)] +pub struct PortForwardSessionConfig { + pub id: String, + pub cluster_id: String, + pub cluster_name: String, + pub namespace: String, + pub pod: String, + pub container: Option, + pub ports: Vec, + pub local_ports: Vec, +} + impl PortForwardSession { - pub fn new( - id: String, - cluster_id: String, - cluster_name: String, - namespace: String, - pod: String, - container: Option, - ports: Vec, - local_ports: Vec, - ) -> Self { + pub fn new(config: PortForwardSessionConfig) -> Self { Self { - id, - cluster_id, - cluster_name, - namespace, - pod, - container, - ports, - local_ports, + id: config.id, + cluster_id: config.cluster_id, + cluster_name: config.cluster_name, + namespace: config.namespace, + pod: config.pod, + container: config.container, + ports: config.ports, + local_ports: config.local_ports, status: PortForwardStatus::Active, kubectl_child: None, is_stopped: Arc::new(AtomicBool::new(false)),