refactor(api-spec): add a light internal api to isolate openai spec parsing

So it's easier to change it, or maybe add another file format, if
needed.

Author: Alenar

internal/tests/mithril-api-spec/src/apispec.rs

@@ -8,7 +8,7 @@ use warp::http::Response;
 use warp::http::StatusCode;
 use warp::hyper::body::Bytes;
 
-use crate::yaml_to_serde::convert_yaml_to_serde_json;
+use crate::spec_parser::OpenApiSpecParser;
 
 #[cfg(test)]
 pub(crate) const DEFAULT_SPEC_FILE: &str = "../../../openapi.yaml";
@@ -56,12 +56,8 @@ impl<'a> APISpec<'a> {
 
     /// APISpec factory from spec
     pub fn from_file(path: &str) -> APISpec<'a> {
-        use saphyr::LoadableYamlNode;
-
-        let yaml_spec = std::fs::read_to_string(path).unwrap();
-        let openapi = saphyr::Yaml::load_from_str(&yaml_spec).unwrap();
         APISpec {
-            openapi: convert_yaml_to_serde_json(&openapi[0]).unwrap(),
+            openapi: OpenApiSpecParser::parse_yaml(path).unwrap(),
             path: None,
             method: None,
             content_type: Some("application/json"),

internal/tests/mithril-api-spec/src/lib.rs

@@ -2,7 +2,7 @@
 //! This crate provides a toolset to verify conformity of http routes against an Open Api specification.
 
 mod apispec;
-mod yaml_to_serde;
+pub(crate) mod spec_parser;
 
 pub use apispec::*;
 

internal/tests/mithril-api-spec/src/spec_parser/mod.rs

@@ -0,0 +1,24 @@
+mod yaml;
+
+/// Parser for OpenApi Specification
+///
+/// Returns the parsed spec as a [serde_json::Value] as this crate uses a jsonschema validator
+/// to do the validation.
+pub(crate) struct OpenApiSpecParser;
+
+impl OpenApiSpecParser {
+    pub(crate) fn parse_yaml(spec_path: &str) -> Result<serde_json::Value, String> {
+        use saphyr::LoadableYamlNode;
+
+        let yaml_spec = std::fs::read_to_string(spec_path)
+            .map_err(|e| format!("Could not read spec file `{spec_path}`: {e}"))?;
+        let openapi = saphyr::Yaml::load_from_str(&yaml_spec)
+            .map_err(|e| format!("Could not parse spec file `{spec_path}`: {e}"))?;
+
+        if openapi.is_empty() {
+            Err("No spec found in file".to_string())
+        } else {
+            yaml::convert_yaml_to_serde_json(&openapi[0])
+        }
+    }
+}