起動に失敗しているpodのログを取得しようとしたとき関連するイベント情報を出力する

Cargo.toml

@@ -8,9 +8,11 @@ edition = "2018"
 members = [ "tui-wrapper", "event", "ansi", "clipboard-wrapper" ]
 
 [features]
+default = [ "logging" ]
 logging = [ "log", "log4rs", "event/logging", "tui-wrapper/logging" ]
 mock = [ "event/mock" ]
 mock-failed = [ "event/mock-failed" ]
+new-log-stream = [ "event/new-log-stream" ]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

Makefile

@@ -0,0 +1,18 @@
+
+
+build:
+	cargo build ${FLAGS}
+
+run:
+	cargo run ${FLAGS}
+
+debug:
+	RUST_LOG=debug cargo run
+
+e2e-test: build re-deploy
+	RUST_LOG=debug target/debug/kubetui
+.PHONY: e2e-test
+
+re-deploy:
+	-kubectl delete -f example/
+	-kubectl apply -f example/

event/Cargo.toml

@@ -10,6 +10,7 @@ edition = "2018"
 logging = [ "log" ]
 mock = []
 mock-failed = [ "hyper" ]
+new-log-stream = []
 
 [dependencies]
 crossterm = "0.19"
@@ -28,6 +29,9 @@ serde = { version = "1.0", features = ["derive"] }
 log = { version = "0.4", optional = true }
 hyper = { version = "0.14", optional = true }
 thiserror = "1"
+anyhow = "1"
+
+async-trait = "0.1"
 
 [dev-dependencies]
 pretty_assertions = "0.7"

event/src/error.rs

@@ -1,7 +1,7 @@
-pub type Result<R, E = Error> = std::result::Result<R, E>;
+// pub type Result<R> = std::result::Result<R, Box<dyn std::error::Error>>;
 
-use crossbeam::channel::{RecvError, SendError};
-use std::fmt::{Debug, Display, Formatter};
+pub use anyhow::anyhow;
+pub use anyhow::Result;
 use thiserror::Error as TError;
 
 #[cfg(any(feature = "mock", feature = "mock-failed"))]
@@ -26,28 +26,12 @@ pub enum Error {
     Raw(String),
     #[error(transparent)]
     IO(#[from] std::io::Error),
+    #[error(transparent)]
+    Pod(#[from] PodError),
 }
 
 #[derive(Debug, TError)]
-pub enum CrossbeamError<T: Debug> {
-    Recv(RecvError),
-    Send(SendError<T>),
-}
-
-impl<T: Debug> Display for CrossbeamError<T> {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self)
-    }
-}
-
-impl<T: Debug> From<SendError<T>> for CrossbeamError<T> {
-    fn from(e: SendError<T>) -> Self {
-        Self::Send(e)
-    }
-}
-
-impl<T: Debug> From<RecvError> for CrossbeamError<T> {
-    fn from(e: RecvError) -> Self {
-        Self::Recv(e)
-    }
+pub enum PodError {
+    #[error("ContainerExitCodeNotZero: {0}")]
+    ContainerExitCodeNotZero(String, Vec<String>),
 }

event/src/kubernetes/api_resources.rs

@@ -125,7 +125,7 @@ async fn get_all_api_info(client: &Client, server_url: &str) -> Result<Vec<APIIn
     let job = try_join_all(
         group_versions
             .iter()
-            .map(|gv| api_resource_list_to_api_info_list(&client, server_url, gv)),
+            .map(|gv| api_resource_list_to_api_info_list(client, server_url, gv)),
     )
     .await?;
 
@@ -347,7 +347,7 @@ async fn get_api_resources(
                 continue;
             }
 
-            ret.push(header_by_api_info(&info) + &table.to_print());
+            ret.push(header_by_api_info(info) + &table.to_print());
             ret.push("".to_string());
         }
     }

event/src/kubernetes/config.rs

@@ -9,7 +9,7 @@ use k8s_openapi::api::core::v1::{ConfigMap, Secret};
 
 use kube::{Api, Client};
 
-use crate::error::{Error, Result};
+use crate::error::{anyhow, Error, Result};
 
 #[derive(Clone, Copy)]
 enum Configs {
@@ -39,9 +39,9 @@ async fn fetch_configs_per_namespace(
     namespaces: &[String],
     ty: Configs,
 ) -> Result<Vec<Vec<String>>> {
-    let insert_ns = insert_ns(&namespaces);
+    let insert_ns = insert_ns(namespaces);
     let jobs = try_join_all(namespaces.iter().map(|ns| {
-        get_resourse_per_namespace(
+        get_resource_per_namespace(
             client,
             server_url,
             format!("api/v1/namespaces/{}/{}", ns, ty.kind()),
@@ -123,7 +123,7 @@ pub async fn configs_loop(
 pub async fn get_config(client: Client, ns: &str, kind: &str, name: &str) -> Result<Vec<String>> {
     match kind {
         "ConfigMap" => {
-            let cms: Api<ConfigMap> = Api::namespaced(client, &ns);
+            let cms: Api<ConfigMap> = Api::namespaced(client, ns);
             let cm = cms.get(name).await?;
             Ok(cm
                 .data
@@ -132,7 +132,7 @@ pub async fn get_config(client: Client, ns: &str, kind: &str, name: &str) -> Res
                 .collect())
         }
         "Secret" => {
-            let secs: Api<Secret> = Api::namespaced(client, &ns);
+            let secs: Api<Secret> = Api::namespaced(client, ns);
             let sec = secs.get(name).await?;
 
             Ok(sec
@@ -149,9 +149,9 @@ pub async fn get_config(client: Client, ns: &str, kind: &str, name: &str) -> Res
                 })
                 .collect())
         }
-        _ => Err(Error::Raw(format!(
+        _ => Err(anyhow!(Error::Raw(format!(
             "Invalid kind [{}]. Set kind ConfigMap or Secret",
             kind
-        ))),
+        )))),
     }
 }

event/src/kubernetes/event.rs

@@ -44,9 +44,9 @@ async fn get_event_table(
     let insert_ns = insert_ns(namespaces);
 
     let jobs = try_join_all(namespaces.iter().map(|ns| {
-        get_resourse_per_namespace(
-            &client,
-            &server_url,
+        get_resource_per_namespace(
+            client,
+            server_url,
             format!("api/v1/namespaces/{}/{}", ns, "events"),
             &TARGET,
             move |row: &TableRow, indexes: &[usize]| {