include additionalProperties by default and check when false (#249)

Co-authored-by: ci.datadog-api-spec <[email protected]>

Author: amaskara-dd

.generator/src/generator/formatter.py

@@ -573,6 +573,9 @@ def format_data_with_schema_dict(
         missing = required_properties - set(data.keys())
         if missing:
             raise ValueError(f"missing required properties: {missing}")
+        additionalProperties = set(data.keys()) - set(schema["properties"].keys())
+        if schema.get("additionalProperties") == False and additionalProperties:
+            raise ValueError(f"additional properties not allowed: {additionalProperties}")
         for k, v in schema["properties"].items():
             if k not in data:
                 continue

.generator/src/generator/templates/model_simple.j2

@@ -25,8 +25,9 @@ pub struct {{ name }} {
     #[serde(rename = "{{ attr }}"{% if not required and nullable%}, default, with = "::serde_with::rust::double_option"{% endif %})]
     pub {{propertyName}}: {{dataType}},
 {%- endfor %}
-{%- if model.additionalProperties is defined and model.additionalProperties != false %}
-{%- set dataType = get_type(model.additionalProperties, alternative_name=None, render_nullable=false, render_option=false, render_box=false, version=version) %}
+{%- set additionalProperties = model.get("additionalProperties", {}) %}
+{%- if additionalProperties != false %}
+{%- set dataType = get_type(additionalProperties, alternative_name=None, render_nullable=false, render_option=false, render_box=false, version=version) %}
     #[serde(flatten)]
     pub additional_properties: std::collections::BTreeMap<String, {{ dataType }}>,
 {%- endif %}
@@ -51,7 +52,7 @@ impl {{ name }} {
             {{ attr|variable_name }}: None,
             {%- endif %}
             {%- endfor %}
-            {%- if model.additionalProperties is defined and model.additionalProperties != false %}
+            {%- if additionalProperties != false %}
             additional_properties: std::collections::BTreeMap::new(),
             {%- endif %}
             _unparsed: false,
@@ -68,8 +69,8 @@ impl {{ name }} {
         self
     }
     {% endfor %}
-    {%- if model.additionalProperties is defined and model.additionalProperties != false %}
-    {%- set dataType = get_type(model.additionalProperties, alternative_name=None, render_nullable=false, render_option=false, render_box=false, version=version) %}
+    {%- if additionalProperties != false %}
+    {%- set dataType = get_type(additionalProperties, alternative_name=None, render_nullable=false, render_option=false, render_box=false, version=version) %}
     pub fn additional_properties(mut self, value: std::collections::BTreeMap<String, {{ dataType }}>) -> Self {
         self.additional_properties = value;
         self
@@ -110,8 +111,8 @@ impl<'de> Deserialize<'de> for {{ name }} {
                 let mut {{ propertyName }}: {% if required %}Option<{% endif %}{{ dataType }}{% if required %}>{% endif %} = None;
                 {%- endfor %}
 
-                {%- if model.additionalProperties is defined and model.additionalProperties != false %}
-                {%- set dataType = get_type(model.additionalProperties, alternative_name=None, render_nullable=false, render_option=false, render_box=false, version=version) %}
+                {%- if additionalProperties != false %}
+                {%- set dataType = get_type(additionalProperties, alternative_name=None, render_nullable=false, render_option=false, render_box=false, version=version) %}
                     let mut additional_properties: std::collections::BTreeMap<String, {{ dataType }}> = std::collections::BTreeMap::new();
                 {%- endif %}
                 let mut _unparsed = false;
@@ -143,10 +144,12 @@ impl<'de> Deserialize<'de> for {{ name }} {
                         },
                         {%- endfor %}
                         &_ => {
-                            {%- if model.additionalProperties is defined and model.additionalProperties != false %}
+                            {%- if additionalProperties != false %}
                             if let Ok(value) = serde_json::from_value(v.clone()) {
                                 additional_properties.insert(k, value);
                             }
+                            {% else %}
+                            return Err(serde::de::Error::custom("Additional properties not allowed"));
                             {%- endif %}
                         },
                     }
@@ -173,7 +176,7 @@ impl<'de> Deserialize<'de> for {{ name }} {
                     {%- set propertyName = attr|variable_name %}
                     {{ propertyName }},
                     {%- endfor %}
-                    {%- if model.additionalProperties is defined and model.additionalProperties != false %}
+                    {%- if additionalProperties != false %}
                     additional_properties,
                     {%- endif %}
                     _unparsed,

LICENSE-3rdparty.csv

@@ -1,6 +1,7 @@
 Component,Origin,License,Copyright
 addr2line,https://github.com/gimli-rs/addr2line,Apache-2.0 OR MIT,The addr2line Authors
 adler,https://github.com/jonas-schievink/adler,0BSD OR MIT OR Apache-2.0,Jonas Schievink <[email protected]>
+adler2,https://github.com/oyvindln/adler2,0BSD OR MIT OR Apache-2.0,"Jonas Schievink <[email protected]>, oyvindln <[email protected]>"
 android-tzdata,https://github.com/RumovZ/android-tzdata,MIT OR Apache-2.0,RumovZ
 android_system_properties,https://github.com/nical/android_system_properties,MIT OR Apache-2.0,Nicolas Silva <[email protected]>
 anyhow,https://github.com/dtolnay/anyhow,MIT OR Apache-2.0,David Tolnay <[email protected]>

src/datadogV1/model/model_add_signal_to_incident_request.rs

@@ -20,6 +20,8 @@ pub struct AddSignalToIncidentRequest {
     /// Version of the updated signal. If server side version is higher, update will be rejected.
     #[serde(rename = "version")]
     pub version: Option<i64>,
+    #[serde(flatten)]
+    pub additional_properties: std::collections::BTreeMap<String, serde_json::Value>,
     #[serde(skip)]
     #[serde(default)]
     pub(crate) _unparsed: bool,
@@ -31,6 +33,7 @@ impl AddSignalToIncidentRequest {
             add_to_signal_timeline: None,
             incident_id,
             version: None,
+            additional_properties: std::collections::BTreeMap::new(),
             _unparsed: false,
         }
     }
@@ -44,6 +47,14 @@ impl AddSignalToIncidentRequest {
         self.version = Some(value);
         self
     }
+
+    pub fn additional_properties(
+        mut self,
+        value: std::collections::BTreeMap<String, serde_json::Value>,
+    ) -> Self {
+        self.additional_properties = value;
+        self
+    }
 }
 
 impl<'de> Deserialize<'de> for AddSignalToIncidentRequest {
@@ -66,6 +77,10 @@ impl<'de> Deserialize<'de> for AddSignalToIncidentRequest {
                 let mut add_to_signal_timeline: Option<bool> = None;
                 let mut incident_id: Option<i64> = None;
                 let mut version: Option<i64> = None;
+                let mut additional_properties: std::collections::BTreeMap<
+                    String,
+                    serde_json::Value,
+                > = std::collections::BTreeMap::new();
                 let mut _unparsed = false;
 
                 while let Some((k, v)) = map.next_entry::<String, serde_json::Value>()? {
@@ -87,7 +102,11 @@ impl<'de> Deserialize<'de> for AddSignalToIncidentRequest {
                             }
                             version = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
                         }
-                        &_ => {}
+                        &_ => {
+                            if let Ok(value) = serde_json::from_value(v.clone()) {
+                                additional_properties.insert(k, value);
+                            }
+                        }
                     }
                 }
                 let incident_id =
@@ -97,6 +116,7 @@ impl<'de> Deserialize<'de> for AddSignalToIncidentRequest {
                     add_to_signal_timeline,
                     incident_id,
                     version,
+                    additional_properties,
                     _unparsed,
                 };
 

src/datadogV1/model/model_alert_graph_widget_definition.rs

@@ -32,6 +32,8 @@ pub struct AlertGraphWidgetDefinition {
     /// Whether to display the Alert Graph as a timeseries or a top list.
     #[serde(rename = "viz_type")]
     pub viz_type: crate::datadogV1::model::WidgetVizType,
+    #[serde(flatten)]
+    pub additional_properties: std::collections::BTreeMap<String, serde_json::Value>,
     #[serde(skip)]
     #[serde(default)]
     pub(crate) _unparsed: bool,
@@ -51,6 +53,7 @@ impl AlertGraphWidgetDefinition {
             title_size: None,
             type_,
             viz_type,
+            additional_properties: std::collections::BTreeMap::new(),
             _unparsed: false,
         }
     }
@@ -74,6 +77,14 @@ impl AlertGraphWidgetDefinition {
         self.title_size = Some(value);
         self
     }
+
+    pub fn additional_properties(
+        mut self,
+        value: std::collections::BTreeMap<String, serde_json::Value>,
+    ) -> Self {
+        self.additional_properties = value;
+        self
+    }
 }
 
 impl<'de> Deserialize<'de> for AlertGraphWidgetDefinition {
@@ -101,6 +112,10 @@ impl<'de> Deserialize<'de> for AlertGraphWidgetDefinition {
                 let mut type_: Option<crate::datadogV1::model::AlertGraphWidgetDefinitionType> =
                     None;
                 let mut viz_type: Option<crate::datadogV1::model::WidgetVizType> = None;
+                let mut additional_properties: std::collections::BTreeMap<
+                    String,
+                    serde_json::Value,
+                > = std::collections::BTreeMap::new();
                 let mut _unparsed = false;
 
                 while let Some((k, v)) = map.next_entry::<String, serde_json::Value>()? {
@@ -167,7 +182,11 @@ impl<'de> Deserialize<'de> for AlertGraphWidgetDefinition {
                                 }
                             }
                         }
-                        &_ => {}
+                        &_ => {
+                            if let Ok(value) = serde_json::from_value(v.clone()) {
+                                additional_properties.insert(k, value);
+                            }
+                        }
                     }
                 }
                 let alert_id = alert_id.ok_or_else(|| M::Error::missing_field("alert_id"))?;
@@ -182,6 +201,7 @@ impl<'de> Deserialize<'de> for AlertGraphWidgetDefinition {
                     title_size,
                     type_,
                     viz_type,
+                    additional_properties,
                     _unparsed,
                 };
 

src/datadogV1/model/model_alert_value_widget_definition.rs

@@ -35,6 +35,8 @@ pub struct AlertValueWidgetDefinition {
     /// Unit to display with the value.
     #[serde(rename = "unit")]
     pub unit: Option<String>,
+    #[serde(flatten)]
+    pub additional_properties: std::collections::BTreeMap<String, serde_json::Value>,
     #[serde(skip)]
     #[serde(default)]
     pub(crate) _unparsed: bool,
@@ -54,6 +56,7 @@ impl AlertValueWidgetDefinition {
             title_size: None,
             type_,
             unit: None,
+            additional_properties: std::collections::BTreeMap::new(),
             _unparsed: false,
         }
     }
@@ -87,6 +90,14 @@ impl AlertValueWidgetDefinition {
         self.unit = Some(value);
         self
     }
+
+    pub fn additional_properties(
+        mut self,
+        value: std::collections::BTreeMap<String, serde_json::Value>,
+    ) -> Self {
+        self.additional_properties = value;
+        self
+    }
 }
 
 impl<'de> Deserialize<'de> for AlertValueWidgetDefinition {
@@ -115,6 +126,10 @@ impl<'de> Deserialize<'de> for AlertValueWidgetDefinition {
                 let mut type_: Option<crate::datadogV1::model::AlertValueWidgetDefinitionType> =
                     None;
                 let mut unit: Option<String> = None;
+                let mut additional_properties: std::collections::BTreeMap<
+                    String,
+                    serde_json::Value,
+                > = std::collections::BTreeMap::new();
                 let mut _unparsed = false;
 
                 while let Some((k, v)) = map.next_entry::<String, serde_json::Value>()? {
@@ -190,7 +205,11 @@ impl<'de> Deserialize<'de> for AlertValueWidgetDefinition {
                             }
                             unit = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
                         }
-                        &_ => {}
+                        &_ => {
+                            if let Ok(value) = serde_json::from_value(v.clone()) {
+                                additional_properties.insert(k, value);
+                            }
+                        }
                     }
                 }
                 let alert_id = alert_id.ok_or_else(|| M::Error::missing_field("alert_id"))?;
@@ -205,6 +224,7 @@ impl<'de> Deserialize<'de> for AlertValueWidgetDefinition {
                     title_size,
                     type_,
                     unit,
+                    additional_properties,
                     _unparsed,
                 };
 

src/datadogV1/model/model_api_error_response.rs

@@ -14,6 +14,8 @@ pub struct APIErrorResponse {
     /// Array of errors returned by the API.
     #[serde(rename = "errors")]
     pub errors: Vec<String>,
+    #[serde(flatten)]
+    pub additional_properties: std::collections::BTreeMap<String, serde_json::Value>,
     #[serde(skip)]
     #[serde(default)]
     pub(crate) _unparsed: bool,
@@ -23,9 +25,18 @@ impl APIErrorResponse {
     pub fn new(errors: Vec<String>) -> APIErrorResponse {
         APIErrorResponse {
             errors,
+            additional_properties: std::collections::BTreeMap::new(),
             _unparsed: false,
         }
     }
+
+    pub fn additional_properties(
+        mut self,
+        value: std::collections::BTreeMap<String, serde_json::Value>,
+    ) -> Self {
+        self.additional_properties = value;
+        self
+    }
 }
 
 impl<'de> Deserialize<'de> for APIErrorResponse {
@@ -46,19 +57,31 @@ impl<'de> Deserialize<'de> for APIErrorResponse {
                 M: MapAccess<'a>,
             {
                 let mut errors: Option<Vec<String>> = None;
+                let mut additional_properties: std::collections::BTreeMap<
+                    String,
+                    serde_json::Value,
+                > = std::collections::BTreeMap::new();
                 let mut _unparsed = false;
 
                 while let Some((k, v)) = map.next_entry::<String, serde_json::Value>()? {
                     match k.as_str() {
                         "errors" => {
                             errors = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
                         }
-                        &_ => {}
+                        &_ => {
+                            if let Ok(value) = serde_json::from_value(v.clone()) {
+                                additional_properties.insert(k, value);
+                            }
+                        }
                     }
                 }
                 let errors = errors.ok_or_else(|| M::Error::missing_field("errors"))?;
 
-                let content = APIErrorResponse { errors, _unparsed };
+                let content = APIErrorResponse {
+                    errors,
+                    additional_properties,
+                    _unparsed,
+                };
 
                 Ok(content)
             }