adding privileges to openapi export

Author: l-trotta

compiler-rs/clients_schema/src/lib.rs

@@ -264,7 +264,7 @@ pub struct Availability {
     pub visibility: Option<Visibility>,
 }
 
-/// The availability of an
+/// The availability of an endpoint, field or parameter
 pub type Availabilities = IndexMap<Flavor, Availability>;
 
 pub trait AvailabilityFilter: Fn(&Option<Availabilities>) -> bool {}

compiler-rs/clients_schema_to_openapi/src/lib.rs

@@ -22,7 +22,7 @@ mod utils;
 
 use indexmap::IndexMap;
 
-use clients_schema::{Availabilities, Flavor, IndexedModel, Stability, Visibility};
+use clients_schema::{Availabilities, Flavor, IndexedModel, Privileges, Stability, Visibility};
 use openapiv3::{Components, OpenAPI};
 use clients_schema::transform::ExpandConfig;
 use crate::components::TypesAndComponents;
@@ -151,7 +151,7 @@ fn info(model: &IndexedModel) -> openapiv3::Info {
     }
 }
 
-pub fn availability_as_extensions(availabilities: &Option<Availabilities>) -> IndexMap<String, serde_json::Value> {
+pub fn extensions(availabilities: &Option<Availabilities>, privileges: &Option<Privileges>) -> IndexMap<String, serde_json::Value> {
     let mut result = IndexMap::new();
 
     if let Some(avails) = availabilities {
@@ -176,5 +176,14 @@ pub fn availability_as_extensions(availabilities: &Option<Availabilities>) -> In
         }
     }
 
+    if let Some(privs) = privileges {
+        if privs.index.len()>0 {
+            result.insert("index-privileges".to_string(),serde_json::Value::String(privs.index.join(",")));
+        }
+        if privs.cluster.len()>0 {
+            result.insert("cluster-privileges".to_string(),serde_json::Value::String(privs.cluster.join(",")));
+        }
+    }
+
     result
 }

compiler-rs/clients_schema_to_openapi/src/paths.rs

@@ -274,7 +274,7 @@ pub fn add_endpoint(
             deprecated: endpoint.deprecation.is_some(),
             security: None,
             servers: vec![],
-            extensions: crate::availability_as_extensions(&endpoint.availability),
+            extensions: crate::extensions(&endpoint.availability,&endpoint.privileges),
         };
 
 

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::extensions(&prop.availability, &None);
         // TODO: prop.aliases as extensions
         // TODO: prop.server_default as extension
         // TODO: prop.doc_id as extension (new representation of since and stability)