fix(update lint cargo fmt and clappy rules) - ensured consistent code structure

Author: Alex Holmberg

src/agent/tools/helmlint.rs

@@ -18,8 +18,8 @@ use serde::{Deserialize, Serialize};
 use serde_json::json;
 use std::path::PathBuf;
 
-use crate::analyzer::helmlint::{lint_chart, HelmlintConfig, LintResult, Severity};
 use crate::analyzer::helmlint::types::RuleCategory;
+use crate::analyzer::helmlint::{HelmlintConfig, LintResult, Severity, lint_chart};
 
 /// Arguments for the helmlint tool
 #[derive(Debug, Deserialize)]
@@ -94,7 +94,9 @@ impl HelmlintTool {
             "HL1001" => "Create a Chart.yaml file in the chart root directory.",
             "HL1002" => "Add 'apiVersion: v2' (for Helm 3) or 'apiVersion: v1' to Chart.yaml.",
             "HL1003" => "Add a 'name' field to Chart.yaml matching the chart directory name.",
-            "HL1004" => "Add a 'version' field with semantic versioning (e.g., '1.0.0') to Chart.yaml.",
+            "HL1004" => {
+                "Add a 'version' field with semantic versioning (e.g., '1.0.0') to Chart.yaml."
+            }
             "HL1005" => "Use semantic versioning format (MAJOR.MINOR.PATCH) for the version field.",
             "HL1006" => "Add a 'description' field explaining what the chart does.",
             "HL1007" => "Add a 'maintainers' list with name and email for chart ownership.",
@@ -430,7 +432,12 @@ spec:
 
         let result = tool.call(args).await;
         assert!(result.is_err());
-        assert!(result.unwrap_err().to_string().contains("No chart specified"));
+        assert!(
+            result
+                .unwrap_err()
+                .to_string()
+                .contains("No chart specified")
+        );
     }
 
     #[tokio::test]

src/agent/tools/kubelint.rs

@@ -18,7 +18,7 @@ use serde_json::json;
 use std::path::PathBuf;
 
 use crate::analyzer::kubelint::{
-    lint, lint_content, lint_file, KubelintConfig, LintResult, Severity,
+    KubelintConfig, LintResult, Severity, lint, lint_content, lint_file,
 };
 
 /// Arguments for the kubelint tool
@@ -86,35 +86,62 @@ impl KubelintTool {
     fn get_check_category(code: &str) -> &'static str {
         match code {
             // Security checks
-            "privileged-container" | "privilege-escalation" | "run-as-non-root"
-            | "read-only-root-fs" | "drop-net-raw-capability" | "hostnetwork" | "hostpid"
-            | "hostipc" | "host-mounts" | "writable-host-mount" | "docker-sock"
-            | "unsafe-proc-mount" | "scc-deny-privileged-container" => "security",
+            "privileged-container"
+            | "privilege-escalation"
+            | "run-as-non-root"
+            | "read-only-root-fs"
+            | "drop-net-raw-capability"
+            | "hostnetwork"
+            | "hostpid"
+            | "hostipc"
+            | "host-mounts"
+            | "writable-host-mount"
+            | "docker-sock"
+            | "unsafe-proc-mount"
+            | "scc-deny-privileged-container" => "security",
 
             // Best practice checks
-            "latest-tag" | "no-liveness-probe" | "no-readiness-probe" | "unset-cpu-requirements"
-            | "unset-memory-requirements" | "minimum-replicas" | "no-anti-affinity"
-            | "no-rolling-update-strategy" | "default-service-account"
-            | "deprecated-service-account" | "env-var-secret" | "read-secret-from-env-var"
-            | "priority-class-name" | "no-node-affinity" | "restart-policy" | "sysctls"
+            "latest-tag"
+            | "no-liveness-probe"
+            | "no-readiness-probe"
+            | "unset-cpu-requirements"
+            | "unset-memory-requirements"
+            | "minimum-replicas"
+            | "no-anti-affinity"
+            | "no-rolling-update-strategy"
+            | "default-service-account"
+            | "deprecated-service-account"
+            | "env-var-secret"
+            | "read-secret-from-env-var"
+            | "priority-class-name"
+            | "no-node-affinity"
+            | "restart-policy"
+            | "sysctls"
             | "dnsconfig-options" => "best-practice",
 
             // RBAC checks
-            "access-to-secrets" | "access-to-create-pods" | "cluster-admin-role-binding"
+            "access-to-secrets"
+            | "access-to-create-pods"
+            | "cluster-admin-role-binding"
             | "wildcard-in-rules" => "rbac",
 
             // Validation checks
-            "dangling-service" | "dangling-ingress" | "dangling-horizontalpodautoscaler"
-            | "dangling-networkpolicy" | "mismatching-selector" | "duplicate-env-var"
-            | "invalid-target-ports" | "non-existent-service-account" | "non-isolated-pod"
-            | "use-namespace" | "env-var-value-from" | "job-ttl-seconds-after-finished" => {
-                "validation"
-            }
+            "dangling-service"
+            | "dangling-ingress"
+            | "dangling-horizontalpodautoscaler"
+            | "dangling-networkpolicy"
+            | "mismatching-selector"
+            | "duplicate-env-var"
+            | "invalid-target-ports"
+            | "non-existent-service-account"
+            | "non-isolated-pod"
+            | "use-namespace"
+            | "env-var-value-from"
+            | "job-ttl-seconds-after-finished" => "validation",
 
             // Port checks
-            "ssh-port" | "privileged-ports" | "liveness-port" | "readiness-port" | "startup-port" => {
-                "ports"
-            }
+            "ssh-port" | "privileged-ports" | "liveness-port" | "readiness-port"
+            | "startup-port" => "ports",
 
             // PDB checks
             "pdb-max-unavailable" | "pdb-min-available" | "pdb-unhealthy-pod-eviction-policy" => {
@@ -383,8 +410,8 @@ impl Tool for KubelintTool {
                 "deployment",
                 "helm",
                 "charts",
-                "test-lint",      // For testing
-                "test-lint/k8s",  // For testing
+                "test-lint",     // For testing
+                "test-lint/k8s", // For testing
                 ".",
             ];
 
@@ -402,14 +429,12 @@ impl Tool for KubelintTool {
                     }
                     // Check for YAML files
                     if let Ok(entries) = std::fs::read_dir(&candidate_path) {
-                        let has_yaml = entries
-                            .filter_map(|e| e.ok())
-                            .any(|e| {
-                                e.path()
-                                    .extension()
-                                    .map(|ext| ext == "yaml" || ext == "yml")
-                                    .unwrap_or(false)
-                            });
+                        let has_yaml = entries.filter_map(|e| e.ok()).any(|e| {
+                            e.path()
+                                .extension()
+                                .map(|ext| ext == "yaml" || ext == "yml")
+                                .unwrap_or(false)
+                        });
                         if has_yaml {
                             found = Some((candidate_path, candidate.to_string()));
                             break;
@@ -471,10 +496,7 @@ spec:
         let args = KubelintArgs {
             path: None,
             content: Some(yaml.to_string()),
-            include: vec![
-                "privileged-container".to_string(),
-                "latest-tag".to_string(),
-            ],
+            include: vec!["privileged-container".to_string(), "latest-tag".to_string()],
             exclude: vec![],
             threshold: None,
         };
@@ -523,10 +545,7 @@ spec:
         let args = KubelintArgs {
             path: None,
             content: Some(yaml.to_string()),
-            include: vec![
-                "privileged-container".to_string(),
-                "latest-tag".to_string(),
-            ],
+            include: vec!["privileged-container".to_string(), "latest-tag".to_string()],
             exclude: vec![],
             threshold: None,
         };
@@ -582,7 +601,12 @@ spec:
         let result = tool.call(args).await.unwrap();
         let parsed: serde_json::Value = serde_json::from_str(&result).unwrap();
 
-        assert!(parsed["source"].as_str().unwrap().contains("deployment.yaml"));
+        assert!(
+            parsed["source"]
+                .as_str()
+                .unwrap()
+                .contains("deployment.yaml")
+        );
         assert!(parsed["summary"]["objects_analyzed"].as_u64().unwrap_or(0) >= 1);
     }
 
@@ -613,7 +637,7 @@ spec:
         let args = KubelintArgs {
             path: None,
             content: Some(yaml.to_string()),
-            include: vec![],  // Use all defaults + builtin
+            include: vec![], // Use all defaults + builtin
             exclude: vec![],
             threshold: None,
         };
@@ -624,11 +648,19 @@ spec:
         let parsed: serde_json::Value = serde_json::from_str(&result).unwrap();
 
         // Verify structure
-        assert!(parsed["summary"]["total_issues"].as_u64().unwrap() > 0,
-            "Expected issues but got none. Output: {}", result);
-        assert!(!parsed["action_plan"]["critical"].as_array().unwrap().is_empty() ||
-                !parsed["action_plan"]["high"].as_array().unwrap().is_empty(),
-            "Expected critical or high priority issues");
+        assert!(
+            parsed["summary"]["total_issues"].as_u64().unwrap() > 0,
+            "Expected issues but got none. Output: {}",
+            result
+        );
+        assert!(
+            !parsed["action_plan"]["critical"]
+                .as_array()
+                .unwrap()
+                .is_empty()
+                || !parsed["action_plan"]["high"].as_array().unwrap().is_empty(),
+            "Expected critical or high priority issues"
+        );
     }
 
     #[tokio::test]
@@ -659,10 +691,7 @@ spec:
             path: None,
             content: Some(yaml.to_string()),
             include: vec![],
-            exclude: vec![
-                "privileged-container".to_string(),
-                "latest-tag".to_string(),
-            ],
+            exclude: vec!["privileged-container".to_string(), "latest-tag".to_string()],
             threshold: None,
         };
 
@@ -680,9 +709,11 @@ spec:
             })
             .collect();
 
-        assert!(!all_issues
-            .iter()
-            .any(|i| i["check"] == "privileged-container"));
+        assert!(
+            !all_issues
+                .iter()
+                .any(|i| i["check"] == "privileged-container")
+        );
         assert!(!all_issues.iter().any(|i| i["check"] == "latest-tag"));
     }
 }

src/agent/ui/helmlint_display.rs

@@ -57,12 +57,7 @@ impl HelmlintDisplay {
         );
 
         // Empty line
-        let _ = writeln!(
-            handle,
-            "{}│{}",
-            brand::DIM,
-            " ".repeat(BOX_WIDTH - 1)
-        );
+        let _ = writeln!(handle, "{}│{}", brand::DIM, " ".repeat(BOX_WIDTH - 1));
 
         // Decision context
         if let Some(context) = result["decision_context"].as_str() {
@@ -95,12 +90,7 @@ impl HelmlintDisplay {
         }
 
         // Empty line
-        let _ = writeln!(
-            handle,
-            "{}│{}",
-            brand::DIM,
-            " ".repeat(BOX_WIDTH - 1)
-        );
+        let _ = writeln!(handle, "{}│{}", brand::DIM, " ".repeat(BOX_WIDTH - 1));
 
         // Summary counts
         if let Some(summary) = result.get("summary") {
@@ -120,12 +110,7 @@ impl HelmlintDisplay {
                 // Files checked
                 let files = summary["files_checked"].as_u64().unwrap_or(0);
                 let stats = format!("{} files checked", files);
-                let _ = writeln!(
-                    handle,
-                    "{}│{}",
-                    brand::DIM,
-                    " ".repeat(BOX_WIDTH - 1)
-                );
+                let _ = writeln!(handle, "{}│{}", brand::DIM, " ".repeat(BOX_WIDTH - 1));
                 let _ = writeln!(
                     handle,
                     "{}│  {}{}{}{}",
@@ -178,12 +163,7 @@ impl HelmlintDisplay {
         if let Some(quick_fixes) = result.get("quick_fixes").and_then(|f| f.as_array())
             && !quick_fixes.is_empty()
         {
-            let _ = writeln!(
-                handle,
-                "{}│{}",
-                brand::DIM,
-                " ".repeat(BOX_WIDTH - 1)
-            );
+            let _ = writeln!(handle, "{}│{}", brand::DIM, " ".repeat(BOX_WIDTH - 1));
             let _ = writeln!(
                 handle,
                 "{}│  {}{} Quick Fixes:{}{}",
@@ -241,7 +221,13 @@ impl HelmlintDisplay {
         }
 
         // Critical and High priority issues with details
-        Self::print_priority_section(&mut handle, result, "critical", "Critical Issues", brand::CORAL);
+        Self::print_priority_section(
+            &mut handle,
+            result,
+            "critical",
+            "Critical Issues",
+            brand::CORAL,
+        );
         Self::print_priority_section(&mut handle, result, "high", "High Priority", brand::PEACH);
 
         // Medium/Low summary
@@ -256,16 +242,15 @@ impl HelmlintDisplay {
         let other_count = medium_count + low_count;
 
         if other_count > 0 {
-            let _ = writeln!(
-                handle,
-                "{}│{}",
-                brand::DIM,
-                " ".repeat(BOX_WIDTH - 1)
-            );
+            let _ = writeln!(handle, "{}│{}", brand::DIM, " ".repeat(BOX_WIDTH - 1));
             let msg = format!(
                 "{} {} priority issue{} (use --verbose to see all)",
                 other_count,
-                if medium_count > 0 { "medium/low" } else { "low" },
+                if medium_count > 0 {
+                    "medium/low"
+                } else {
+                    "low"
+                },
                 if other_count == 1 { "" } else { "s" }
             );
             let _ = writeln!(
@@ -305,12 +290,7 @@ impl HelmlintDisplay {
                 return;
             }
 
-            let _ = writeln!(
-                handle,
-                "{}│{}",
-                brand::DIM,
-                " ".repeat(BOX_WIDTH - 1)
-            );
+            let _ = writeln!(handle, "{}│{}", brand::DIM, " ".repeat(BOX_WIDTH - 1));
             let _ = writeln!(
                 handle,
                 "{}│  {}{}:{}{}",