Got age

Cargo.toml

@@ -34,3 +34,4 @@ fs2 = "0.4.3"
 log = "0.4.20"
 handlebars = "5.1.2"
 cron = "0.12.1"
+humantime = "2.1.0"

src/get/cronjob.rs

@@ -1,11 +1,14 @@
 use std::collections::HashMap;
 use chrono::SecondsFormat;
+use humantime;
+use k8s_openapi::api::batch::v1::CronJob;
 use crate::filestore::ObjectListItem;
 use crate::get::{Lister};
 use crate::get::lister::NameFilters;
 use crate::skatelet::SystemInfo;
+use crate::util::NamespacedName;
 
-pub (crate) struct CronjobsLister {}
+pub(crate) struct CronjobsLister {}
 
 impl Lister<ObjectListItem> for CronjobsLister {
     fn selector(&self, si: &SystemInfo, ns: &str, id: &str) -> Option<Vec<ObjectListItem>> {
@@ -17,17 +20,27 @@ impl Lister<ObjectListItem> for CronjobsLister {
 
     fn print(&self, resources: Vec<ObjectListItem>) {
         println!(
-            "{0: <30}  {1: <5}  {2: <20}",
-            "NAME", "#", "CREATED",
+            "{0: <10}  {1: <10}  {2: <10}  {3: <5}  {4: <10}  {5: <10}  {6: <10}  {7: <10}",
+            "NAMESPACE", "NAME", "SCHEDULE", "TIMEZONE", "SUSPEND", "ACTIVE", "LAST SCHEDULE", "AGE"
         );
-        let map = resources.iter().fold(HashMap::<String, Vec<ObjectListItem>>::new(), |mut acc, item| {
-            acc.entry(item.name.to_string()).or_insert(vec![]).push(item.clone());
+        let map = resources.iter().fold(HashMap::<NamespacedName, Vec<ObjectListItem>>::new(), |mut acc, item| {
+            acc.entry(item.name.clone()).or_insert(vec![]).push(item.clone());
             acc
         });
         for (name, item) in map {
+            let cronjob: CronJob = serde_yaml::from_value(item.first().as_ref().unwrap().manifest.as_ref().unwrap().clone()).unwrap_or_default();
+            let spec = cronjob.spec.unwrap_or_default();
+            let schedule = spec.schedule;
+            let timezone = spec.time_zone;
+            let created = item.first().unwrap().created_at;
+            let age = match chrono::offset::Local::now().signed_duration_since(created).to_std() {
+                Ok(age) => humantime::format_duration(age).to_string().split_whitespace().take(2).collect::<Vec<&str>>().join(""),
+                Err(_) => "".to_string()
+            };
+
             println!(
-                "{0: <30}  {1: <5}  {2: <20}",
-                name, item.len(), item.first().unwrap().created_at.to_rfc3339_opts(SecondsFormat::Secs, true)
+                "{0: <10}  {1: <10}  {2: <10}  {3: <5}  {4: <10}  {5: <10}  {6: <10}  {7: <10}",
+                name.namespace, name.name, "TODO", timezone.unwrap_or("-".to_string()), "False", "-", "-", age
             )
         }
     }

src/get/lister.rs

@@ -8,15 +8,15 @@ pub(crate) trait NameFilters {
     fn name(&self) -> String;
     fn namespace(&self) -> String;
     fn filter_names(&self, name: &str, ns: &str) -> bool {
-        let ns = match ns.is_empty(){
+        let ns = match ns.is_empty() {
             true => &"default",
             false => ns
         };
 
         if !ns.is_empty() && self.namespace() != ns {
             return false;
         }
-        if !name.is_empty() && ( self.id() != name || self.name() != name ) {
+        if !name.is_empty() && (self.id() != name || self.name() != name) {
             return false;
         }
         if ns.is_empty() && name.is_empty() && self.namespace() == "skate" {

src/util.rs

@@ -116,7 +116,7 @@ pub fn calc_k8s_resource_hash(obj: (impl Metadata<Scope=NamespaceResourceScope,
 }
 
 
-#[derive(Serialize, Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone, Eq, Hash, PartialEq)]
 pub struct NamespacedName {
     pub name: String,
     pub namespace: String,