getting flavor from config to fix serverless output

Author: l-trotta

compiler-rs/clients_schema_to_openapi/src/lib.rs

@@ -103,7 +103,7 @@ pub fn convert_expanded_schema(model: &IndexedModel, config: &Configuration) ->
                 continue;
             }
         }
-        paths::add_endpoint(endpoint, &mut tac, &mut openapi.paths)?;
+        paths::add_endpoint(endpoint, &mut tac, &mut openapi.paths, &config.flavor)?;
     }
 
     // // Sort maps to ensure output stability
@@ -149,34 +149,33 @@ fn info(model: &IndexedModel) -> openapiv3::Info {
     }
 }
 
-pub fn availability_as_extensions(availabilities: &Option<Availabilities>) -> IndexMap<String, serde_json::Value> {
+pub fn availability_as_extensions(availabilities: &Option<Availabilities>, flavor: &Option<Flavor>) -> IndexMap<String, serde_json::Value> {
     let mut result = IndexMap::new();
-
     if let Some(avails) = availabilities {
-        // We may have several availabilities, but since generally exists only on stateful (stack)
-        for (_, availability) in avails {
-            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;
-                }
-                match stability {
-                    Stability::Beta => {
-                        let beta_since = "Beta".to_string() + &since_str;
-                        result.insert("x-state".to_string(), serde_json::Value::String(beta_since));
+        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;
                     }
-                    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));
+                    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));
+                        }
                     }
                 }
             }
         }
     }
-
     result
 }

compiler-rs/clients_schema_to_openapi/src/paths.rs

@@ -19,7 +19,7 @@ use std::collections::HashMap;
 use std::fmt::Write;
 
 use anyhow::{anyhow, bail};
-use clients_schema::Property;
+use clients_schema::{Flavor, Property};
 use indexmap::IndexMap;
 use indexmap::indexmap;
 use icu_segmenter::SentenceSegmenter;
@@ -37,6 +37,7 @@ pub fn add_endpoint(
     endpoint: &clients_schema::Endpoint,
     tac: &mut TypesAndComponents,
     out: &mut Paths,
+    flavor: &Option<Flavor>
 ) -> anyhow::Result<()> {
     if endpoint.request.is_none() {
         // tracing::warn!("Endpoint {} is missing a request -- ignored", &endpoint.name);
@@ -310,7 +311,7 @@ pub fn add_endpoint(
             deprecated: endpoint.deprecation.is_some(),
             security: None,
             servers: vec![],
-            extensions,
+            extensions: crate::availability_as_extensions(&endpoint.availability, flavor),
         };
 
 

compiler-rs/clients_schema_to_openapi/src/schemas.rs

@@ -469,7 +469,7 @@ impl<'a> TypesAndComponents<'a> {
         data.external_docs = self.convert_external_docs(prop);
         data.deprecated = prop.deprecation.is_some();
         data.description = self.property_description(prop)?;
-        data.extensions = crate::availability_as_extensions(&prop.availability);
+        data.extensions = crate::availability_as_extensions(&prop.availability, &self.config.flavor);
         // TODO: prop.aliases as extensions
         // TODO: prop.server_default as extension
         // TODO: prop.doc_id as extension (new representation of since and stability)