fixing wrap bug - filling out changelog (#43)

Signed-off-by: Daniel Guns <danbguns@gmail.com>

Author: dgunzy

CHANGELOG.md

@@ -18,68 +18,73 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [0.4.0] - 2025-11-20
 
 ### Added
-- 
+- Support for Flux operator CRDs (#33)
+- Screenshot image to documentation (#31, #32)
 
-### Changed
-- 
+## [0.3.1] - 2025-11-20
 
 ### Fixed
-- 
-
-## [0.3.1] - 2025-11-20
+- Fixed trace functionality (#28)
+- Replaced hardcoded strings with configuration (#27)
 
-### Added
-- 
+## [0.3.0] - 2025-11-18
 
 ### Changed
-- 
+- Default mode set to readOnly (#23)
 
-### Fixed
-- 
+## [0.2.4] - 2025-11-16
 
-## [0.3.0] - 2025-11-18
+### Changed
+- Workflow tweaks and improvements (#19)
 
-### Added
-- 
+## [0.2.2] - 2025-11-16
 
 ### Changed
-- 
+- Code hygiene improvements (#16)
+- Workflow release changes (#16)
 
-### Fixed
-- 
+## [0.2.1] - 2025-11-16
 
-## [0.2.4] - 2025-11-16
+### Changed
+- Version bump to 0.2.1
 
-### Added
-- 
+## [0.2.0] - 2025-11-16
 
-### Changed
-- 
+### Added
+- ReadOnly mode support
+- Configuration and config-cli functionality
 
 ### Fixed
-- 
+- OpenSSL build issues (#10, #8)
+- Windows temporary file handling (#9)
 
-## [0.2.3] - 2025-11-16
+## [0.1.5] - 2025-11-16
 
 ### Added
-- 
+- OpenSSL support
+- Debug logging (#7)
+- Proxy support (#6)
 
-### Changed
-- 
+## [0.1.4] - 2025-11-16
 
-### Fixed
-- 
+### Added
+- Homebrew support (#5)
 
-## [0.2.2] - 2025-11-16
+## [0.1.3] - 2025-11-16
 
 ### Added
-- 
+- Homebrew macOS architecture support (#4)
 
-### Changed
-- 
+## [0.1.2] - 2025-11-16
 
-### Fixed
-- 
+### Added
+- Homebrew macOS architecture support (#3)
+- macOS M-chip (Apple Silicon) support (#2)
+
+## [0.1.1] - 2025-11-16
+
+### Added
+- Binstall support
 
 ## [0.1.0] - YYYY-MM-DD
 

src/models/_generated/mod.rs

@@ -5,7 +5,7 @@
 
 #![allow(clippy::all)]
 #![allow(unknown_lints)]
-#![allow(doc_markdown)]
+#![allow(clippy::doc_markdown)]
 #![allow(clippy::doc_overindented_list_items)]
 
 pub mod flux_operator_fluxinstances;

src/models/flux_resource_kind.rs

@@ -5,6 +5,7 @@
 //! type safety for resource kind references.
 
 use std::fmt;
+use std::str::FromStr;
 
 /// Enumeration of all Flux CRD resource kinds
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
@@ -61,29 +62,10 @@ impl FluxResourceKind {
         }
     }
 
-    /// Try to parse a string into a FluxResourceKind
-    pub fn from_str(s: &str) -> Option<Self> {
-        match s {
-            "GitRepository" => Some(FluxResourceKind::GitRepository),
-            "OCIRepository" => Some(FluxResourceKind::OCIRepository),
-            "HelmRepository" => Some(FluxResourceKind::HelmRepository),
-            "Bucket" => Some(FluxResourceKind::Bucket),
-            "HelmChart" => Some(FluxResourceKind::HelmChart),
-            "ExternalArtifact" => Some(FluxResourceKind::ExternalArtifact),
-            "Kustomization" => Some(FluxResourceKind::Kustomization),
-            "HelmRelease" => Some(FluxResourceKind::HelmRelease),
-            "ImageRepository" => Some(FluxResourceKind::ImageRepository),
-            "ImagePolicy" => Some(FluxResourceKind::ImagePolicy),
-            "ImageUpdateAutomation" => Some(FluxResourceKind::ImageUpdateAutomation),
-            "Alert" => Some(FluxResourceKind::Alert),
-            "Provider" => Some(FluxResourceKind::Provider),
-            "Receiver" => Some(FluxResourceKind::Receiver),
-            "ResourceSet" => Some(FluxResourceKind::ResourceSet),
-            "ResourceSetInputProvider" => Some(FluxResourceKind::ResourceSetInputProvider),
-            "FluxReport" => Some(FluxResourceKind::FluxReport),
-            "FluxInstance" => Some(FluxResourceKind::FluxInstance),
-            _ => None,
-        }
+    /// Try to parse a string into a FluxResourceKind, returning None if invalid
+    /// Use this when you want Option<Self> instead of Result<Self, String>
+    pub fn parse_optional(s: &str) -> Option<Self> {
+        s.parse().ok()
     }
 
     /// Try to parse a string (case-insensitive) into a FluxResourceKind
@@ -134,6 +116,34 @@ impl From<FluxResourceKind> for String {
     }
 }
 
+impl FromStr for FluxResourceKind {
+    type Err = String;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "GitRepository" => Ok(FluxResourceKind::GitRepository),
+            "OCIRepository" => Ok(FluxResourceKind::OCIRepository),
+            "HelmRepository" => Ok(FluxResourceKind::HelmRepository),
+            "Bucket" => Ok(FluxResourceKind::Bucket),
+            "HelmChart" => Ok(FluxResourceKind::HelmChart),
+            "ExternalArtifact" => Ok(FluxResourceKind::ExternalArtifact),
+            "Kustomization" => Ok(FluxResourceKind::Kustomization),
+            "HelmRelease" => Ok(FluxResourceKind::HelmRelease),
+            "ImageRepository" => Ok(FluxResourceKind::ImageRepository),
+            "ImagePolicy" => Ok(FluxResourceKind::ImagePolicy),
+            "ImageUpdateAutomation" => Ok(FluxResourceKind::ImageUpdateAutomation),
+            "Alert" => Ok(FluxResourceKind::Alert),
+            "Provider" => Ok(FluxResourceKind::Provider),
+            "Receiver" => Ok(FluxResourceKind::Receiver),
+            "ResourceSet" => Ok(FluxResourceKind::ResourceSet),
+            "ResourceSetInputProvider" => Ok(FluxResourceKind::ResourceSetInputProvider),
+            "FluxReport" => Ok(FluxResourceKind::FluxReport),
+            "FluxInstance" => Ok(FluxResourceKind::FluxInstance),
+            _ => Err(format!("Unknown Flux resource kind: {}", s)),
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -148,14 +158,14 @@ mod tests {
     #[test]
     fn test_from_str() {
         assert_eq!(
-            FluxResourceKind::from_str("GitRepository"),
+            FluxResourceKind::parse_optional("GitRepository"),
             Some(FluxResourceKind::GitRepository)
         );
         assert_eq!(
-            FluxResourceKind::from_str("OCIRepository"),
+            FluxResourceKind::parse_optional("OCIRepository"),
             Some(FluxResourceKind::OCIRepository)
         );
-        assert_eq!(FluxResourceKind::from_str("Unknown"), None);
+        assert_eq!(FluxResourceKind::parse_optional("Unknown"), None);
     }
 
     #[test]

src/trace/core.rs

@@ -35,7 +35,7 @@ pub async fn trace_object(
 
     // Check if the initial object itself is a Kustomization or HelmRelease
     use crate::models::FluxResourceKind;
-    let initial_kind = FluxResourceKind::from_str(resource_type);
+    let initial_kind = FluxResourceKind::parse_optional(resource_type);
     if matches!(
         initial_kind,
         Some(FluxResourceKind::Kustomization) | Some(FluxResourceKind::HelmRelease)
@@ -129,7 +129,7 @@ async fn walk_owner_chain(
 
                     // If this is a Kustomization or HelmRelease, resolve its source
                     if matches!(
-                        FluxResourceKind::from_str(&flux_owner.kind),
+                        FluxResourceKind::parse_optional(&flux_owner.kind),
                         Some(FluxResourceKind::Kustomization) | Some(FluxResourceKind::HelmRelease)
                     ) {
                         let source =
@@ -217,7 +217,7 @@ async fn walk_owner_chain(
 
                 // If this is a Kustomization or HelmRelease, resolve its source
                 if matches!(
-                    FluxResourceKind::from_str(owner_kind),
+                    FluxResourceKind::parse_optional(owner_kind),
                     Some(FluxResourceKind::Kustomization) | Some(FluxResourceKind::HelmRelease)
                 ) {
                     let source =
@@ -274,7 +274,7 @@ async fn resolve_source(
 ) -> Result<Option<TraceNode>> {
     use crate::models::FluxResourceKind;
 
-    match FluxResourceKind::from_str(&node.kind) {
+    match FluxResourceKind::parse_optional(&node.kind) {
         Some(FluxResourceKind::Kustomization) => {
             resolve_kustomization_source(client, node, default_ns).await
         }
@@ -527,7 +527,7 @@ fn parse_namespaced_name(ref_str: &str, default_ns: &str) -> (String, String) {
 
 /// Check if a resource kind is a Flux resource
 fn is_flux_resource(kind: &str) -> bool {
-    FluxResourceKind::from_str(kind).is_some()
+    FluxResourceKind::parse_optional(kind).is_some()
 }
 
 /// Find Flux owner from labels

src/tui/api.rs

@@ -12,7 +12,7 @@ use crate::watcher::{
 
 /// Get GroupVersionKind for a resource type
 pub fn get_gvk_for_resource_type(resource_type: &str) -> Result<(String, String, String)> {
-    let (group, version, plural) = match FluxResourceKind::from_str(resource_type) {
+    let (group, version, plural) = match FluxResourceKind::parse_optional(resource_type) {
         Some(FluxResourceKind::GitRepository) => (
             GitRepository::api_group(),
             GitRepository::api_version(),

src/tui/app.rs

@@ -14,6 +14,24 @@ use ratatui::{
 use std::collections::HashMap;
 use std::sync::{Arc, RwLock};
 
+// Type aliases for complex types
+type TraceRequest = (
+    String,
+    String,
+    String,
+    kube::Client,
+    tokio::sync::oneshot::Sender<anyhow::Result<crate::tui::trace::TraceResult>>,
+);
+
+type OperationRequest = (
+    String,
+    String,
+    String,
+    char,
+    kube::Client,
+    tokio::sync::oneshot::Sender<anyhow::Result<()>>,
+);
+
 /// Main application state
 pub struct App {
     state: ResourceState,
@@ -166,15 +184,7 @@ impl App {
         self.yaml_fetch_pending = None;
     }
 
-    pub fn trigger_trace(
-        &mut self,
-    ) -> Option<(
-        String,
-        String,
-        String,
-        kube::Client,
-        tokio::sync::oneshot::Sender<anyhow::Result<crate::tui::trace::TraceResult>>,
-    )> {
+    pub fn trigger_trace(&mut self) -> Option<TraceRequest> {
         if let Some((ref resource_type, ref namespace, ref name)) = self.trace_pending {
             if let Some(ref client) = self.kube_client {
                 let (tx, rx) = tokio::sync::oneshot::channel();
@@ -606,39 +616,27 @@ impl App {
         op_key: char,
     ) {
         // Check readonly mode - prevent modification operations
-        if self.config.read_only {
-            if self.operation_registry.get_by_keybinding(op_key).is_some() {
-                // All operations are modifications, so block them all in readonly mode
-                self.status_message = Some((
-                    "Readonly mode is enabled. Use :readonly to toggle write actions.".to_string(),
-                    true,
-                ));
-                return;
-            }
+        if self.config.read_only && self.operation_registry.get_by_keybinding(op_key).is_some() {
+            // All operations are modifications, so block them all in readonly mode
+            self.status_message = Some((
+                "Readonly mode is enabled. Use :readonly to toggle write actions.".to_string(),
+                true,
+            ));
+            return;
         }
 
-        if self.operation_registry.get_by_keybinding(op_key).is_some() {
-            if self.kube_client.is_some() {
-                let rt = resource_type.to_string();
-                let ns = namespace.to_string();
-                let n = name.to_string();
+        if self.operation_registry.get_by_keybinding(op_key).is_some() && self.kube_client.is_some()
+        {
+            let rt = resource_type.to_string();
+            let ns = namespace.to_string();
+            let n = name.to_string();
 
-                // Mark operation as pending - will be executed in main loop
-                self.pending_operation = Some((rt, ns, n, op_key));
-            }
+            // Mark operation as pending - will be executed in main loop
+            self.pending_operation = Some((rt, ns, n, op_key));
         }
     }
 
-    pub fn trigger_operation_execution(
-        &mut self,
-    ) -> Option<(
-        String,
-        String,
-        String,
-        char,
-        kube::Client,
-        tokio::sync::oneshot::Sender<anyhow::Result<()>>,
-    )> {
+    pub fn trigger_operation_execution(&mut self) -> Option<OperationRequest> {
         if let Some((ref resource_type, ref namespace, ref name, op_key)) = self.pending_operation {
             if let Some(ref client) = self.kube_client {
                 if self.operation_registry.get_by_keybinding(op_key).is_some() {

src/tui/mod.rs

@@ -57,7 +57,7 @@ async fn fetch_resource_yaml(
         }};
     }
 
-    match FluxResourceKind::from_str(resource_type) {
+    match FluxResourceKind::parse_optional(resource_type) {
         Some(FluxResourceKind::GitRepository) => fetch_resource!(GitRepository),
         Some(FluxResourceKind::OCIRepository) => fetch_resource!(OCIRepository),
         Some(FluxResourceKind::HelmRepository) => fetch_resource!(HelmRepository),