Merge pull request #90 from fioletoven/feature/add-kind-views

fioletoven · web-flow · commit 2debc5f5b033 · 2025-12-31T18:42:19.000+01:00
Add Endpoints, NetworkPolicy and ServiceAccount columns
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,11 @@
 # Change Log
 
-## WIP
+## 0.3.7 - 2025-12-31
 
 ### Features
 
 - add footer messages history pane
+- add columns for Endpoints, NetworkPolicy and ServiceAccount kinds
 
 ### Bug fixes
 
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,7 @@ members = [
 ]
 
 [workspace.package]
-version = "0.3.6"
+version = "0.3.7"
 edition = "2024"
 rust-version = "1.88"
 license = "MIT"
diff --git a/b4n-config/config.rs b/b4n-config/config.rs
@@ -77,6 +77,7 @@ fn default_aliases() -> HashMap<String, String> {
         ("clusterroles", "cr"),
         ("daemonsets", "ds,dms"),
         ("namespaces", "ns"),
+        ("networkpolicies", "np"),
         ("persistentvolumeclaims", "pvc"),
         ("persistentvolumes", "pv"),
         ("pods", "pp"),
diff --git a/b4n-kube/observer.rs b/b4n-kube/observer.rs
@@ -534,10 +534,10 @@ impl EventsProcessor {
 
 fn is_access_error(error: &watcher::Error) -> bool {
     match error {
-        watcher::Error::InitialListFailed(kube::Error::Api(response))
-        | watcher::Error::WatchStartFailed(kube::Error::Api(response))
-        | watcher::Error::WatchError(response)
-        | watcher::Error::WatchFailed(kube::Error::Api(response)) => response.code == 403,
+        Error::InitialListFailed(kube::Error::Api(response))
+        | Error::WatchStartFailed(kube::Error::Api(response))
+        | Error::WatchError(response)
+        | Error::WatchFailed(kube::Error::Api(response)) => response.code == 403,
         _ => false,
     }
 }
diff --git a/b4n-kube/stream_backoff.rs b/b4n-kube/stream_backoff.rs
@@ -5,8 +5,8 @@ use pin_project::pin_project;
 use std::{marker::PhantomData, pin::Pin, task::Poll};
 use tokio::time::{Instant, Sleep, sleep};
 
-/// Based on https://github.com/kube-rs/kube/blob/2.0.1/kube-runtime/src/utils/stream_backoff.rs
-/// If fixes the backoff reset on receiving Poll::Ready(Some(Ok(Event::Init))) which is sent also after errors.
+/// Based on <https://github.com/kube-rs/kube/blob/2.0.1/kube-runtime/src/utils/stream_backoff.rs>
+/// It fixes the backoff reset on receiving `Poll::Ready(Some(Ok(Event::Init)))` which is sent also after errors.
 ///
 /// Applies a [`Backoff`] policy to a [`Stream`]
 ///
@@ -58,7 +58,7 @@ where
             StreamBackoffStateProj::BackingOff(mut backoff_sleep) => match backoff_sleep.as_mut().poll(cx) {
                 Poll::Ready(()) => {
                     tracing::debug!(deadline = ?backoff_sleep.deadline(), "Backoff complete, waking up");
-                    this.state.set(State::Awake)
+                    this.state.set(State::Awake);
                 },
                 Poll::Pending => {
                     let deadline = backoff_sleep.deadline();
diff --git a/b4n-tasks/highlighter.rs b/b4n-tasks/highlighter.rs
@@ -147,7 +147,7 @@ pub enum HighlightResourceError {
 
     /// Cannot send syntax highlight request to the highlighter thread.
     #[error("cannot send syntax highlight request")]
-    CannotSendRequest(#[from] tokio::sync::mpsc::error::SendError<HighlightRequest>),
+    CannotSendRequest(#[from] mpsc::error::SendError<HighlightRequest>),
 
     /// Cannot receive syntax highlight request from the highlighter thread.
     #[error("cannot receive syntax highlight request")]
diff --git a/b4n-tui/widgets/footer.rs b/b4n-tui/widgets/footer.rs
@@ -90,7 +90,7 @@ impl Footer {
     /// Shows history pane.
     pub fn show_message_history(&mut self) {
         if self.history_pane.is_none() {
-            self.history_pane = Some(BottomPane::new(self.get_history_messages().into()))
+            self.history_pane = Some(BottomPane::new(self.get_history_messages().into()));
         }
     }
 
@@ -122,7 +122,7 @@ impl Footer {
     pub fn draw_history(&mut self, frame: &mut Frame<'_>, area: Rect, theme: &Theme) {
         if let Some(pane) = &mut self.history_pane {
             pane.draw(frame, area, theme);
-        };
+        }
     }
 
     fn draw_footer(&mut self, frame: &mut Frame<'_>, area: Rect, theme: &Theme) {
diff --git a/b4n-tui/widgets/history/bottom_pane.rs b/b4n-tui/widgets/history/bottom_pane.rs
@@ -20,7 +20,7 @@ pub struct BottomPane {
 }
 
 impl BottomPane {
-    /// Creates new [`MessagesList`] instance.
+    /// Creates new [`BottomPane`] instance.
     pub fn new(messages: MessagesList) -> Self {
         Self {
             history: List::new(messages),
diff --git a/b4n-tui/widgets/history/message.rs b/b4n-tui/widgets/history/message.rs
@@ -17,7 +17,7 @@ impl MessageItem {
     /// Creates new [`MessageItem`] instance from the [`Notification`] and it's time.
     pub fn from(notification: &Notification, time: Instant, id: usize) -> Self {
         Self {
-            uid: format!("_{}_", id),
+            uid: format!("_{id}_"),
             group: "notification",
             message: notification.text.clone(),
             time,
diff --git a/b4n-tui/widgets/list.rs b/b4n-tui/widgets/list.rs
@@ -32,7 +32,7 @@ impl<T: Table> List<T> {
             .min(MAX_ITEMS_ON_SCREEN)
     }
 
-    /// Returns `true` if anything on the List list is highlighted.
+    /// Returns `true` if anything on the list is highlighted.
     pub fn is_anything_highlighted(&self) -> bool {
         self.items.get_highlighted_item_name().is_some()
     }
diff --git a/b4n/kube/resources/data/endpoints.rs b/b4n/kube/resources/data/endpoints.rs
@@ -0,0 +1,72 @@
+use b4n_tui::table::{Column, Header, NAMESPACE};
+use k8s_openapi::serde_json::Value;
+use kube::api::DynamicObject;
+use std::collections::{HashMap, HashSet};
+use std::rc::Rc;
+
+use crate::kube::resources::{ResourceData, ResourceValue};
+
+/// Returns [`ResourceData`] for the `endpoints` kubernetes resource.
+pub fn data(object: &DynamicObject) -> ResourceData {
+    let is_terminating = object.metadata.deletion_timestamp.is_some();
+    let values: [ResourceValue; 1] = [get_endpoints(object.data["subsets"].as_array()).into()];
+
+    ResourceData::new(Box::new(values), is_terminating)
+}
+
+/// Returns [`Header`] for the `endpoints` kubernetes resource.
+pub fn header() -> Header {
+    Header::from(
+        NAMESPACE,
+        Some(Box::new([Column::bound("ENDPOINTS", 15, 50, false)])),
+        Rc::new([' ', 'N', 'E', 'A']),
+    )
+}
+
+fn get_endpoints(subsets: Option<&Vec<Value>>) -> Option<String> {
+    let mut endpoints = HashMap::<&str, HashSet<u64>>::new();
+
+    for subset in subsets? {
+        let Some(addresses) = subset["addresses"]
+            .as_array()
+            .map(|a| a.iter().filter_map(|a| a["ip"].as_str()).collect::<HashSet<_>>())
+        else {
+            continue;
+        };
+
+        let Some(ports) = subset["ports"]
+            .as_array()
+            .map(|a| a.iter().filter_map(|a| a["port"].as_u64()).collect::<HashSet<_>>())
+        else {
+            continue;
+        };
+
+        for address in addresses {
+            endpoints.entry(address).or_default().extend(ports.iter());
+        }
+    }
+
+    if endpoints.is_empty() {
+        None
+    } else {
+        let mut result = String::new();
+
+        let mut endpoints = endpoints.into_iter().collect::<Vec<_>>();
+        endpoints.sort_by_key(|(ip, _)| *ip);
+
+        for (i, (address, ports)) in endpoints.iter().enumerate() {
+            let mut ports = ports.iter().map(ToString::to_string).collect::<Vec<_>>();
+            ports.sort();
+
+            if i > 0 {
+                result.push(' ');
+            }
+
+            result.push_str(address);
+            result.push(':');
+            result.push_str(&ports.join(","));
+        }
+
+        Some(result)
+    }
+}
diff --git a/b4n/kube/resources/data/mod.rs b/b4n/kube/resources/data/mod.rs
@@ -16,11 +16,13 @@ pub mod custom_resource;
 pub mod daemon_set;
 pub mod default;
 pub mod deployment;
+pub mod endpoints;
 pub mod event;
 pub mod ingress;
 pub mod job;
 pub mod lease;
 pub mod namespace;
+pub mod network_policy;
 pub mod node;
 pub mod node_metrics;
 pub mod persistent_volume;
@@ -30,6 +32,7 @@ pub mod pod_metrics;
 pub mod replica_set;
 pub mod secret;
 pub mod service;
+pub mod service_account;
 pub mod stateful_set;
 pub mod storage_class;
 
@@ -52,11 +55,13 @@ pub fn get_resource_data(
         "CustomResourceDefinition" => crd::data(object),
         "DaemonSet" => daemon_set::data(object),
         "Deployment" => deployment::data(object),
+        "Endpoints" => endpoints::data(object),
         "Event" => event::data(object, is_filtered),
         "Ingress" => ingress::data(object),
         "Job" => job::data(object),
         "Lease" => lease::data(object),
         "Namespace" => namespace::data(object),
+        "NetworkPolicy" => network_policy::data(object),
         "Node" => node::data(object, stats),
         "NodeMetrics" if group == "metrics.k8s.io" => node_metrics::data(object),
         "PersistentVolume" => persistent_volume::data(object),
@@ -66,6 +71,7 @@ pub fn get_resource_data(
         "ReplicaSet" => replica_set::data(object),
         "Secret" => secret::data(object),
         "Service" => service::data(object),
+        "ServiceAccount" => service_account::data(object),
         "StatefulSet" => stateful_set::data(object),
         "StorageClass" => storage_class::data(object),
 
@@ -85,11 +91,13 @@ pub fn get_header_data(kind: &str, group: &str, crd: Option<&CrdColumns>, has_me
         "CustomResourceDefinition" => crd::header(),
         "DaemonSet" => daemon_set::header(),
         "Deployment" => deployment::header(),
+        "Endpoints" => endpoints::header(),
         "Event" => event::header(is_filtered),
         "Ingress" => ingress::header(),
         "Job" => job::header(),
         "Lease" => lease::header(),
         "Namespace" => namespace::header(),
+        "NetworkPolicy" => network_policy::header(),
         "Node" => node::header(has_metrics),
         "NodeMetrics" if group == "metrics.k8s.io" => node_metrics::header(),
         "PersistentVolume" => persistent_volume::header(),
@@ -99,6 +107,7 @@ pub fn get_header_data(kind: &str, group: &str, crd: Option<&CrdColumns>, has_me
         "ReplicaSet" => replica_set::header(),
         "Secret" => secret::header(),
         "Service" => service::header(),
+        "ServiceAccount" => service_account::header(),
         "StatefulSet" => stateful_set::header(),
         "StorageClass" => storage_class::header(),
 
diff --git a/b4n/kube/resources/data/network_policy.rs b/b4n/kube/resources/data/network_policy.rs
@@ -0,0 +1,32 @@
+use b4n_tui::table::{Column, Header, NAMESPACE};
+use k8s_openapi::serde_json::{Map, Value};
+use kube::api::DynamicObject;
+use std::rc::Rc;
+
+use crate::kube::resources::{ResourceData, ResourceValue};
+
+/// Returns [`ResourceData`] for the `networkpolicy` kubernetes resource.
+pub fn data(object: &DynamicObject) -> ResourceData {
+    let is_terminating = object.metadata.deletion_timestamp.is_some();
+    let values: [ResourceValue; 1] = [get_selector(object.data["spec"]["podSelector"]["matchLabels"].as_object()).into()];
+
+    ResourceData::new(Box::new(values), is_terminating)
+}
+
+/// Returns [`Header`] for the `networkpolicy` kubernetes resource.
+pub fn header() -> Header {
+    Header::from(
+        NAMESPACE,
+        Some(Box::new([Column::bound("POD SELECTOR", 15, 50, false)])),
+        Rc::new([' ', 'N', 'P', 'A']),
+    )
+}
+
+fn get_selector(labels: Option<&Map<String, Value>>) -> Option<String> {
+    let labels = labels?
+        .iter()
+        .filter_map(|(k, v)| v.as_str().map(|v| format!("{k}={v}")))
+        .collect::<Vec<_>>();
+
+    Some(labels.join(","))
+}
diff --git a/b4n/kube/resources/data/service_account.rs b/b4n/kube/resources/data/service_account.rs

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ members = [`
`10`	`10`	`]`
`11`	`11`
`12`	`12`	`[workspace.package]`
`13`		`-version = "0.3.6"`
	`13`	`+version = "0.3.7"`
`14`	`14`	`edition = "2024"`
`15`	`15`	`rust-version = "1.88"`
`16`	`16`	`license = "MIT"`
Original file line number	Diff line number	Diff line change
`@@ -534,10 +534,10 @@ impl EventsProcessor {`
`534`	`534`
`535`	`535`	`fn is_access_error(error: &watcher::Error) -> bool {`
`536`	`536`	`match error {`
`537`		`- watcher::Error::InitialListFailed(kube::Error::Api(response))`
`538`		`- \| watcher::Error::WatchStartFailed(kube::Error::Api(response))`
`539`		`- \| watcher::Error::WatchError(response)`
`540`		`- \| watcher::Error::WatchFailed(kube::Error::Api(response)) => response.code == 403,`
	`537`	`+ Error::InitialListFailed(kube::Error::Api(response))`
	`538`	`+ \| Error::WatchStartFailed(kube::Error::Api(response))`
	`539`	`+ \| Error::WatchError(response)`
	`540`	`+ \| Error::WatchFailed(kube::Error::Api(response)) => response.code == 403,`
`541`	`541`	`_ => false,`
`542`	`542`	`}`
`543`	`543`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ impl Footer {`
`90`	`90`	`/// Shows history pane.`
`91`	`91`	`pub fn show_message_history(&mut self) {`
`92`	`92`	`if self.history_pane.is_none() {`
`93`		`- self.history_pane = Some(BottomPane::new(self.get_history_messages().into()))`
	`93`	`+ self.history_pane = Some(BottomPane::new(self.get_history_messages().into()));`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`
`@@ -122,7 +122,7 @@ impl Footer {`
`122`	`122`	`pub fn draw_history(&mut self, frame: &mut Frame<'_>, area: Rect, theme: &Theme) {`
`123`	`123`	`if let Some(pane) = &mut self.history_pane {`
`124`	`124`	`pane.draw(frame, area, theme);`
`125`		`- };`
	`125`	`+ }`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`fn draw_footer(&mut self, frame: &mut Frame<'_>, area: Rect, theme: &Theme) {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ pub struct BottomPane {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`impl BottomPane {`
`23`		- /// Creates new [`MessagesList`] instance.
	`23`	+ /// Creates new [`BottomPane`] instance.
`24`	`24`	`pub fn new(messages: MessagesList) -> Self {`
`25`	`25`	`Self {`
`26`	`26`	`history: List::new(messages),`