Add yaml support

oxidecomputer · Nov 7, 2022 · d0f876b · d0f876b
1 parent 6aa3d69
commit d0f876b
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/progenitor/Cargo.toml b/progenitor/Cargo.toml
@@ -14,6 +14,7 @@ anyhow = "1.0"
 openapiv3 = "1.0.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
+serde_yaml = "0.9"
 clap = { version = "4.0.18", features = ["derive"] }
 
 [dev-dependencies]

diff --git a/progenitor/src/main.rs b/progenitor/src/main.rs
@@ -2,6 +2,7 @@
 
 use std::{
     fs::{File, OpenOptions},
+    io::Read,
     io::Write,
     path::{Path, PathBuf},
 };
@@ -171,7 +172,18 @@ pub fn load_api<P>(p: P) -> Result<OpenAPI>
 where
     P: AsRef<Path>,
 {
-    let f = File::open(p)?;
-    let api = serde_json::from_reader(f)?;
+    let mut f = File::open(p)?;
+
+    let mut buf = [b' '];
+    while buf[0].is_ascii_whitespace() {
+        f.read_exact(&mut buf)?;
+    }
+    let reader = buf.as_ref().chain(f);
+
+    let api = if buf[0] == b'{' {
+        serde_json::from_reader(reader)?
+    } else {
+        serde_yaml::from_reader(reader)?
+    };
     Ok(api)
 }