fix: minor code + add serde default for tier

hopinc · Aug 5, 2023 · 2b30ecf · 2b30ecf
1 parent 79d950c
commit 2b30ecf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/commands/ignite/templates.rs b/src/commands/ignite/templates.rs
@@ -108,7 +108,7 @@ pub async fn handle(options: Options, state: State) -> Result<()> {
                         }
 
                         let validator = {
-                            let valid = validator.split('/').into_iter().collect::<Vec<_>>();
+                            let valid = validator.split('/').collect::<Vec<_>>();
 
                             if valid.len() == 3 {
                                 valid[1]

diff --git a/src/commands/projects/types.rs b/src/commands/projects/types.rs
@@ -34,7 +34,8 @@ pub struct Project {
     pub namespace: String,
     #[serde(rename = "type")]
     pub type_: String,
-    #[serde(deserialize_with = "deserialize_null_default")]
+    //@this route does not return this field at all, hence the serde(default)
+    #[serde(default, deserialize_with = "deserialize_null_default")]
     pub tier: ProjectTier,
 }
 

diff --git a/src/commands/volumes/copy/utils.rs b/src/commands/volumes/copy/utils.rs
@@ -75,8 +75,10 @@ pub async fn get_files_from_volume(
     let packed = response
         .headers()
         .get("x-directory")
-        .context("No content type header")?
-        .to_str()?
+        .map(|x| x.to_str())
+        .transpose()?
+        // if the header is not present, assume false (not packed)
+        .unwrap_or("false")
         .to_lowercase()
         == "true";