TestManager: Add flexibility to displayed columns

bottlerocket-os · Mar 1, 2023 · 01c2afe · 01c2afe
1 parent 609fe27
commit 01c2afe
Show file tree

Hide file tree

Showing 4 changed files with 263 additions and 342 deletions.
diff --git a/cli/src/status.rs b/cli/src/status.rs
@@ -1,9 +1,7 @@
 use anyhow::{Context, Result};
 use clap::Parser;
 use terminal_size::{Height, Width};
-use testsys_model::test_manager::{
-    CrdState, CrdType, SelectionParams, StatusProgress, TestManager,
-};
+use testsys_model::test_manager::{CrdState, CrdType, SelectionParams, StatusColumn, TestManager};
 
 /// Check the status of a TestSys object.
 #[derive(Debug, Parser)]
@@ -20,10 +18,6 @@ pub(crate) struct Status {
     #[clap(long, short = 'p')]
     progress: bool,
 
-    /// Include the `Test` status, too. Requires `--progress`
-    #[clap(long, requires("progress"))]
-    with_test: bool,
-
     /// Include the time the CRD was last updated
     #[clap(long, short = 'u')]
     with_time: bool,
@@ -68,14 +62,19 @@ impl Status {
             .await
             .context("Unable to get status")?;
 
-        if self.with_test {
-            status.with_progress(StatusProgress::WithTests);
-        } else if self.progress {
-            status.with_progress(StatusProgress::Resources);
+        status.add_column(StatusColumn::name());
+        status.add_column(StatusColumn::crd_type());
+        status.add_column(StatusColumn::state());
+        status.add_column(StatusColumn::passed());
+        status.add_column(StatusColumn::failed());
+        status.add_column(StatusColumn::skipped());
+
+        if self.progress {
+            status.add_column(StatusColumn::progress());
         }
 
         if self.with_time {
-            status.with_time();
+            status.add_column(StatusColumn::last_update());
         }
 
         if self.json {

diff --git a/model/src/test_manager/manager.rs b/model/src/test_manager/manager.rs
@@ -3,7 +3,7 @@ use super::{
     SelectionParams, StatusSnapshot,
 };
 use crate::clients::{AllowNotFound, CrdClient, ResourceClient, TestClient};
-use crate::constants::{LABEL_COMPONENT, TESTSYS_RESULTS_FILE};
+use crate::constants::TESTSYS_RESULTS_FILE;
 use crate::system::AgentType;
 use crate::{Crd, CrdName, Resource, SecretName, TaskState, Test, TestUserState};
 use bytes::Bytes;
@@ -296,34 +296,10 @@ impl TestManager {
     /// returned can be used to print a table containing each objects status (including rerun tests)
     /// or to print a json representation containing all included objects as well as the controller
     /// status.
-    pub async fn status(
-        &self,
-        selection_params: &SelectionParams,
-        include_controller: bool,
-    ) -> Result<StatusSnapshot> {
-        let controller_status = if include_controller {
-            let pod_api: Api<Pod> = self.namespaced_api();
-            let pods = pod_api
-                .list(&ListParams {
-                    label_selector: Some(format!("{}={}", LABEL_COMPONENT, "controller")),
-                    ..Default::default()
-                })
-                .await
-                .context(error::KubeSnafu {
-                    action: "get controller pod",
-                })?
-                .items;
-            if let Some(pod) = pods.first() {
-                pod.status.clone()
-            } else {
-                None
-            }
-        } else {
-            None
-        };
+    pub async fn status(&self, selection_params: &SelectionParams) -> Result<StatusSnapshot> {
         let crds = self.list(selection_params).await?;
 
-        Ok(StatusSnapshot::new(controller_status, crds))
+        Ok(StatusSnapshot::new(crds))
     }
 
     /// Retrieve the logs of a test.

diff --git a/model/src/test_manager/mod.rs b/model/src/test_manager/mod.rs
@@ -3,7 +3,7 @@ pub use error::{Error, Result};
 pub use manager::{read_manifest, TestManager};
 use serde::{Deserialize, Serialize};
 use serde_plain::derive_fromstr_from_deserialize;
-pub use status::StatusSnapshot;
+pub use status::{StatusColumn, StatusSnapshot};
 use std::collections::HashMap;
 
 mod delete;
@@ -85,10 +85,3 @@ pub enum ResourceState {
 }
 
 derive_fromstr_from_deserialize!(ResourceState);
-
-/// `StatusProgress` represents whether a `Test`'s `other_info` should be included or not.
-#[derive(Debug)]
-pub enum StatusProgress {
-    WithTests,
-    Resources,
-}