x-state in fields

Author: l-trotta

compiler-rs/clients_schema_to_openapi/src/lib.rs

@@ -23,8 +23,9 @@ pub mod cli;
 
 use indexmap::IndexMap;
 
-use clients_schema::{Availabilities, Flavor, IndexedModel, Stability, Visibility};
+use clients_schema::{Availabilities, Availability, Flavor, IndexedModel, Stability, Visibility};
 use openapiv3::{Components, OpenAPI};
+use serde_json::Value;
 use clients_schema::transform::ExpandConfig;
 use crate::components::TypesAndComponents;
 
@@ -151,31 +152,35 @@ fn info(model: &IndexedModel) -> openapiv3::Info {
 
 pub fn availability_as_extensions(availabilities: &Option<Availabilities>, flavor: &Option<Flavor>) -> IndexMap<String, serde_json::Value> {
     let mut result = IndexMap::new();
+    convert_availabilities(availabilities, flavor, &mut result);
+    result
+}
+
+pub fn convert_availabilities(availabilities: &Option<Availabilities>, flavor: &Option<Flavor>, result: &mut IndexMap<String, Value>) {
     if let Some(avails) = availabilities {
-        if let Some(flavor) = flavor {
-            if let Some(availability) = avails.get(flavor) {
-                if let Some(stability) = &availability.stability {
-                    let mut since_str = "".to_string();
-                    if let Some(since) = &availability.since {
-                        since_str = "; Added in ".to_string() + since;
+        if let Some(flav) = flavor {
+            if let Some(availability) = avails.get(flav) {
+                let Availability {since,stability,..} = &availability;
+                let stab = stability.clone().unwrap_or(Stability::Stable);
+                let mut since_str = "".to_string();
+                if let Some(since) = since {
+                    since_str = "; Added in ".to_string() + since;
+                }
+                match stab {
+                    Stability::Beta => {
+                        let beta_since = "Beta".to_string() + &since_str;
+                        result.insert("x-state".to_string(), Value::String(beta_since));
+                    }
+                    Stability::Experimental => {
+                        let exp_since = "Technical preview".to_string() + &since_str;
+                        result.insert("x-state".to_string(), Value::String(exp_since));
                     }
-                    match stability {
-                        Stability::Beta => {
-                            let beta_since = "Beta".to_string() + &since_str;
-                            result.insert("x-state".to_string(), serde_json::Value::String(beta_since));
-                        }
-                        Stability::Experimental => {
-                            let exp_since = "Technical preview".to_string() + &since_str;
-                            result.insert("x-state".to_string(), serde_json::Value::String(exp_since));
-                        }
-                        Stability::Stable => {
-                            let stable_since = "Generally available".to_string() + &since_str;
-                            result.insert("x-state".to_string(), serde_json::Value::String(stable_since));
-                        }
+                    Stability::Stable => {
+                        let stable_since = "Generally available".to_string() + &since_str;
+                        result.insert("x-state".to_string(), Value::String(stable_since));
                     }
                 }
             }
         }
     }
-    result
 }

compiler-rs/clients_schema_to_openapi/src/paths.rs

@@ -27,9 +27,10 @@ use openapiv3::{
     MediaType, Parameter, ParameterData, ParameterSchemaOrContent, PathItem, PathStyle, Paths, QueryStyle, ReferenceOr,
     RequestBody, Response, Responses, StatusCode, Example
 };
+use serde_json::Value;
 use clients_schema::SchemaExample;
-
 use crate::components::TypesAndComponents;
+use crate::convert_availabilities;
 
 /// Add an endpoint to the OpenAPI schema. This will result in the addition of a number of elements to the
 /// openapi schema's `paths` and `components` sections.
@@ -61,6 +62,8 @@ pub fn add_endpoint(
     let request = tac.model.get_request(endpoint.request.as_ref().unwrap())?;
 
     fn parameter_data(prop: &Property, in_path: bool, tac: &mut TypesAndComponents) -> anyhow::Result<ParameterData> {
+        let mut extensions: IndexMap<String,Value> = Default::default();
+        convert_availabilities(&prop.availability, &tac.config.flavor, &mut extensions);
         Ok(ParameterData {
             name: prop.name.clone(),
             description: tac.property_description(prop)?,