api key error reporting and null last_written_at fix

.gitignore

@@ -3,3 +3,4 @@
 /*.csv
 /.vscode
 .DS_Store
+/*.sh

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "honey-health"
-version = "0.3.1"
+version = "0.3.2"
 edition = "2021"
 authors = ["Jeremy Blythe <[email protected]>"]
 

src/honeycomb.rs

@@ -12,7 +12,7 @@ const HONEYCOMB_API_KEY: &str = "HONEYCOMB_API_KEY";
 #[derive(Debug, Deserialize)]
 pub struct Dataset {
     pub slug: String,
-    pub last_written_at: DateTime<Utc>,
+    pub last_written_at: Option<DateTime<Utc>>,
 }
 
 #[derive(Debug, Deserialize, Serialize)]
@@ -33,19 +33,37 @@ impl HoneyComb {
         }
     }
     pub fn list_all_datasets(&self) -> anyhow::Result<Vec<Dataset>> {
-        let response = reqwest::blocking::Client::new()
+        let client = reqwest::blocking::Client::new();
+        let response = client
             .get(format!("{}datasets", URL))
             .header("X-Honeycomb-Team", &self.api_key)
-            .send()?
-            .json::<Vec<Dataset>>()?;
-        Ok(response)
+            .send()?;
+
+        let text = response.text()?;
+
+        match serde_json::from_str::<Vec<Dataset>>(&text) {
+            Ok(datasets) => Ok(datasets),
+            Err(_) => {
+                println!("Invalid JSON data: {}", text);
+                Err(anyhow::anyhow!("Invalid JSON data"))
+            }
+        }
     }
     pub fn list_all_columns(&self, dataset_slug: &str) -> anyhow::Result<Vec<Column>> {
-        let response = reqwest::blocking::Client::new()
+        let client = reqwest::blocking::Client::new();
+        let response = client
             .get(format!("{}columns/{}", URL, dataset_slug))
             .header("X-Honeycomb-Team", &self.api_key)
-            .send()?
-            .json::<Vec<Column>>()?;
-        Ok(response)
+            .send()?;
+
+        let text = response.text()?;
+
+        match serde_json::from_str::<Vec<Column>>(&text) {
+            Ok(columns) => Ok(columns),
+            Err(_) => {
+                println!("Invalid JSON data: {}", text);
+                Err(anyhow::anyhow!("Invalid JSON data"))
+            }
+        }
     }
 }

src/main.rs

@@ -104,7 +104,9 @@ impl ColumnUsageMap {
             .list_all_datasets()?
             .iter()
             .filter_map(|d| {
-                if (now - d.last_written_at).num_days() < max_last_written_days as i64 {
+                if (now - d.last_written_at.unwrap_or(Utc::now())).num_days()
+                    < max_last_written_days as i64
+                {
                     if inc_datasets.is_empty() || inc_datasets.contains(&d.slug) {
                         Some(d.slug.clone())
                     } else {
@@ -117,7 +119,7 @@ impl ColumnUsageMap {
             .collect::<Vec<_>>();
         datasets.sort();
         cm.datasets = datasets;
-        eprint!("Reading datasets ");
+        eprint!("Reading {} datasets ", cm.datasets.len());
         for (dataset_num, dataset_slug) in cm.datasets.iter().enumerate() {
             //println!("Reading dataset: {}", dataset_slug);
             eprint!(".");