macos 15 runner (#47)

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

Author: dgunzy

.github/workflows/release.yml

@@ -59,7 +59,7 @@ jobs:
             asset_name: flux9s-macos-aarch64.tar.gz
             use_tar: true
 
-          - os: macos-13
+          - os: macos-15-intel
             target: x86_64-apple-darwin
             artifact_name: flux9s
             asset_name: flux9s-macos-x86_64.tar.gz

src/tui/app.rs

@@ -277,13 +277,18 @@ pub async fn run_tui(
         // Process watch events (non-blocking)
         // Update state from watch events
         let mut events_processed = 0;
+        // Track resource type count to detect when header layout needs recalculation
+        let resource_type_count_before = app.state().count_by_type().len();
+
         while let Ok(event) = event_rx.try_recv() {
             events_processed += 1;
             match event {
                 crate::watcher::WatchEvent::Applied(resource_type, ns, name, obj_json) => {
                     let key = crate::watcher::resource_key(&ns, &name, &resource_type);
                     let (suspended, ready, message, revision) =
                         crate::watcher::extract_status_fields(&obj_json);
+                    let labels = crate::watcher::extract_labels(&obj_json);
+                    let annotations = crate::watcher::extract_annotations(&obj_json);
                     app.state().upsert(
                         key.clone(),
                         crate::watcher::ResourceInfo {
@@ -295,6 +300,8 @@ pub async fn run_tui(
                             ready,
                             message,
                             revision,
+                            labels,
+                            annotations,
                         },
                     );
                     // Store full object for detail view
@@ -317,6 +324,11 @@ pub async fn run_tui(
 
         // Force a redraw if we processed events
         if events_processed > 0 {
+            // Check if number of resource types changed (affects header layout)
+            let resource_type_count_after = app.state().count_by_type().len();
+            if resource_type_count_after != resource_type_count_before {
+                app.notify_resource_types_changed();
+            }
             terminal.draw(|f| app.render(f))?;
         }
     }

src/tui/mod.rs

@@ -7,6 +7,8 @@ use crate::watcher::ResourceInfo;
 use anyhow::Result;
 use kube::Api;
 use serde_json::json;
+#[cfg(test)]
+use std::collections::HashMap;
 
 use crate::tui::api::get_api_resource_with_fallback;
 
@@ -663,6 +665,8 @@ mod tests {
             ready: None,
             message: None,
             revision: None,
+            labels: HashMap::new(),
+            annotations: HashMap::new(),
         };
 
         let msg = op.confirmation_message(&resource);
@@ -698,6 +702,8 @@ mod tests {
             ready: None,
             message: None,
             revision: None,
+            labels: HashMap::new(),
+            annotations: HashMap::new(),
         };
 
         let msg = op.confirmation_message(&resource);
@@ -778,6 +784,8 @@ mod tests {
             ready: None,
             message: None,
             revision: None,
+            labels: HashMap::new(),
+            annotations: HashMap::new(),
         };
 
         let msg = op.confirmation_message(&resource);

src/tui/operations.rs

@@ -30,14 +30,22 @@ pub fn render_help(f: &mut Frame, area: Rect, _theme: &Theme) {
         Line::from("  W        - Reconcile with source (Kustomization/HelmRelease)"),
         Line::from("  d        - Delete resource"),
         Line::from(""),
+        Line::from("Filter Syntax (/):"),
+        Line::from("  /text              - Filter by name"),
+        Line::from("  /label:key         - Filter by label key (any value)"),
+        Line::from("  /label:key=value   - Filter by label key=value"),
+        Line::from("  /ann:key           - Filter by annotation key"),
+        Line::from("  /ann:key=value     - Filter by annotation key=value"),
+        Line::from("  /annotations:...   - Alias for /ann:..."),
+        Line::from(""),
         Line::from("Commands:"),
         Line::from("  :help / :h / :?              - Show/hide this help"),
         Line::from("  :readonly                    - Toggle readonly mode"),
-        Line::from("  :skin <name>                  - Change theme/skin"),
+        Line::from("  :skin <name>                 - Change theme/skin"),
         Line::from("  :ns <name> / :namespace <name> - Switch namespace"),
-        Line::from("  :ns all / :ns -A              - Show all namespaces"),
-        Line::from("  :all / :clear                 - Show all resources"),
-        Line::from("  :q / :quit / :exit            - Quit application"),
+        Line::from("  :ns all / :ns -A             - Show all namespaces"),
+        Line::from("  :all / :clear                - Show all resources"),
+        Line::from("  :q / :quit / :exit           - Quit application"),
         Line::from(""),
     ];
 

src/tui/views/help.rs

@@ -12,16 +12,23 @@ pub fn extract_resource_specific_fields(
 
     if let Some(spec) = obj.get("spec").and_then(|s| s.as_object()) {
         match FluxResourceKind::parse_optional(resource_type) {
-            Some(FluxResourceKind::GitRepository)
-            | Some(FluxResourceKind::OCIRepository)
-            | Some(FluxResourceKind::HelmRepository) => {
+            Some(FluxResourceKind::GitRepository) | Some(FluxResourceKind::HelmRepository) => {
                 if let Some(url) = spec.get("url").and_then(|u| u.as_str()) {
                     fields.insert("URL".to_string(), url.to_string());
                 }
                 if let Some(branch) = spec.get("branch").and_then(|b| b.as_str()) {
                     fields.insert("BRANCH".to_string(), branch.to_string());
                 }
             }
+            Some(FluxResourceKind::OCIRepository) => {
+                if let Some(semver) = spec
+                    .get("ref")
+                    .and_then(|s| s.get("semver"))
+                    .and_then(|se| se.as_str())
+                {
+                    fields.insert("SEMVER".to_string(), semver.to_string());
+                }
+            }
             Some(FluxResourceKind::Kustomization) => {
                 if let Some(path) = spec.get("path").and_then(|p| p.as_str()) {
                     fields.insert("PATH".to_string(), path.to_string());
@@ -119,6 +126,23 @@ pub fn extract_resource_specific_fields(
                 fields.insert("STATUS".to_string(), release_status.to_string());
             }
         }
+        if FluxResourceKind::parse_optional(resource_type) == Some(FluxResourceKind::OCIRepository)
+        {
+            if let Some(digest) = status
+                .get("artifact")
+                .and_then(|a| a.get("digest"))
+                .and_then(|d| d.as_str())
+            {
+                fields.insert("DIGEST".to_string(), digest.to_string());
+            }
+            if let Some(revision) = status
+                .get("artifact")
+                .and_then(|a| a.get("revision"))
+                .and_then(|r| r.as_str())
+            {
+                fields.insert("REVISION".to_string(), revision.to_string());
+            }
+        }
     }
 
     fields
@@ -127,7 +151,7 @@ pub fn extract_resource_specific_fields(
 /// Get column headers for a resource type
 pub fn get_resource_type_columns(resource_type: &str) -> Vec<&'static str> {
     match FluxResourceKind::parse_optional(resource_type) {
-        Some(FluxResourceKind::GitRepository) | Some(FluxResourceKind::OCIRepository) => vec![
+        Some(FluxResourceKind::GitRepository) => vec![
             "STATUS",
             "NAMESPACE",
             "NAME",
@@ -137,6 +161,16 @@ pub fn get_resource_type_columns(resource_type: &str) -> Vec<&'static str> {
             "SUSPENDED",
             "READY",
         ],
+        Some(FluxResourceKind::OCIRepository) => {
+            vec![
+                "STATUS",
+                "NAMESPACE",
+                "NAME",
+                "SEMVER",
+                "DIGEST",
+                "REVISION",
+            ]
+        }
         Some(FluxResourceKind::HelmRepository) => vec![
             "STATUS",
             "NAMESPACE",

src/tui/views/resource_fields.rs

@@ -18,6 +18,37 @@ pub struct ResourceInfo {
     pub ready: Option<bool>,
     pub message: Option<String>,
     pub revision: Option<String>,
+    // Cached metadata for filtering
+    pub labels: HashMap<String, String>,
+    pub annotations: HashMap<String, String>,
+}
+
+/// Extract labels from a Kubernetes resource JSON object
+pub fn extract_labels(obj: &serde_json::Value) -> HashMap<String, String> {
+    obj.get("metadata")
+        .and_then(|m| m.get("labels"))
+        .and_then(|l| l.as_object())
+        .map(|labels| {
+            labels
+                .iter()
+                .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))
+                .collect()
+        })
+        .unwrap_or_default()
+}
+
+/// Extract annotations from a Kubernetes resource JSON object
+pub fn extract_annotations(obj: &serde_json::Value) -> HashMap<String, String> {
+    obj.get("metadata")
+        .and_then(|m| m.get("annotations"))
+        .and_then(|a| a.as_object())
+        .map(|annotations| {
+            annotations
+                .iter()
+                .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))
+                .collect()
+        })
+        .unwrap_or_default()
 }
 
 /// Thread-safe resource state store
@@ -135,6 +166,8 @@ mod tests {
             ready: Some(true),
             message: Some("Ready".to_string()),
             revision: None,
+            labels: HashMap::new(),
+            annotations: HashMap::new(),
         };
 
         use crate::models::FluxResourceKind;
@@ -168,6 +201,8 @@ mod tests {
             ready: None,
             message: None,
             revision: None,
+            labels: HashMap::new(),
+            annotations: HashMap::new(),
         };
         let key = resource_key(
             "default",
@@ -197,6 +232,8 @@ mod tests {
             ready: None,
             message: None,
             revision: None,
+            labels: HashMap::new(),
+            annotations: HashMap::new(),
         };
 
         let gitrepo = ResourceInfo {
@@ -208,6 +245,8 @@ mod tests {
             ready: None,
             message: None,
             revision: None,
+            labels: HashMap::new(),
+            annotations: HashMap::new(),
         };
 
         let kustomization2 = ResourceInfo {
@@ -219,6 +258,8 @@ mod tests {
             ready: None,
             message: None,
             revision: None,
+            labels: HashMap::new(),
+            annotations: HashMap::new(),
         };
 
         state.upsert(
@@ -258,6 +299,8 @@ mod tests {
                 ready: None,
                 message: None,
                 revision: None,
+                labels: HashMap::new(),
+                annotations: HashMap::new(),
             },
         );
 
@@ -272,6 +315,8 @@ mod tests {
                 ready: None,
                 message: None,
                 revision: None,
+                labels: HashMap::new(),
+                annotations: HashMap::new(),
             },
         );
 
@@ -286,6 +331,8 @@ mod tests {
                 ready: None,
                 message: None,
                 revision: None,
+                labels: HashMap::new(),
+                annotations: HashMap::new(),
             },
         );
 
@@ -317,6 +364,8 @@ mod tests {
                 ready: None,
                 message: None,
                 revision: None,
+                labels: HashMap::new(),
+                annotations: HashMap::new(),
             },
         );