Bugfixes based on BDD testing (#7)

Author: nkzou

.generator/src/generator/openapi.py

@@ -59,27 +59,26 @@ def type_to_rust(schema, alternative_name=None, render_nullable=False, render_op
             type_ = "array"
         elif "properties" in schema:
             type_ = "object"
+        elif "oneOf" in schema:
+            return alternative_name
         else:
             type_ = "object"
             warnings.warn(f"Unknown type for schema: {schema} ({name or alternative_name})")
+            return option_wrapper(f"serde_json::Value", render_option, render_nullable)
 
     if type_ == "array":
         if name and schema.get("x-generate-alias-as-model", False):
             return name
         if name or alternative_name:
             alternative_name = (name or alternative_name) + "Item"
-        name = type_to_rust(schema["items"], alternative_name=alternative_name, render_nullable=render_nullable, render_option=False, version=version)
-        # handle nullable arrays
-        if formatter.simple_type(schema["items"]) and schema["items"].get("nullable"):
-            name = f"Option<{name}>"
-        if schema.get("nullable") and formatter.is_primitive(schema["items"]):
-            name = formatter.simple_type(schema["items"], render_nullable=render_nullable, render_option=False)
+        nullable_item = schema["items"].get("nullable")
+        name = type_to_rust(schema["items"], alternative_name=alternative_name, render_nullable=nullable_item, render_option=False, version=version)
         return option_wrapper(f"Vec<{name}>", render_option, render_nullable)
     elif type_ == "object":
         name = "serde_json::Value"
         if "additionalProperties" in schema:
             name = type_to_rust(schema["additionalProperties"], render_nullable=render_nullable, render_option=False, version=version)
-        return option_wrapper(f"std::collections::HashMap<String, {name}>", render_option, render_nullable)
+        return option_wrapper(f"std::collections::BTreeMap<String, {name}>", render_option, render_nullable)
 
     raise ValueError(f"Unknown type {type_}")
 

.generator/src/generator/templates/api.j2

@@ -48,7 +48,7 @@ pub enum {{operation.operationId}}Error {
 }
 {% endfor %}
 
-{%- set structName = name|camel_case +"API" %}
+{%- set structName = name.replace(" ", "")+"API" %}
 #[derive(Debug, Clone)]
 pub struct {{ structName }} {
     config: configuration::Configuration,

.generator/src/generator/templates/configuration.j2

@@ -1,5 +1,4 @@
 {% include "partial_header.j2" %}
-use rustc_version::{version, Version};
 use std::env;
 
 #[derive(Debug, Clone)]
@@ -34,8 +33,8 @@ impl Default for Configuration {
             base_path: "https://api.datadoghq.com".to_owned(),
             user_agent: Some(format!(
                 "datadog-api-client-rust/{} (rust {}; os {}; arch {})",
-                env::var("CARGO_PKG_VERSION").unwrap_or("?".to_owned()),
-                version().unwrap_or(Version::new(0, 0, 0)),
+                option_env!("CARGO_PKG_VERSION").unwrap_or("?"),
+                option_env!("DD_RUSTC_VERSION").unwrap_or("?"),
                 env::consts::OS,
                 env::consts::ARCH,
             )),

.generator/src/generator/templates/function_mappings.j2

@@ -13,7 +13,7 @@ pub struct ApiInstances {
 {%- for version, apis in all_apis.items() %}
 {%- for name, operations in apis.items() %}
 {%- set fieldName = "api_"+name %}
-{%- set structName = name|camel_case +"API" %}
+{%- set structName = name.replace(" ", "")+"API" %}
     pub {{version}}_{{fieldName | snake_case}}: Option<datadog{{ version.upper() }}::api::{{fieldName | snake_case}}::{{structName}}>,
 {%- endfor %}
 {%- endfor %}
@@ -23,8 +23,8 @@ pub fn initialize_api_instance(world: &mut DatadogWorld, api: String) {
     match api.as_str() {
     {%- for name, versions in get_apis_and_versions(all_apis) %}
     {%- set fieldName = "api_"+name|snake_case %}
-    {%- set structName = name|camel_case +"API" %}
-        "{{name|camel_case}}" => {
+    {%- set structName = name.replace(" ", "")+"API" %}
+        "{{name.replace(" ", "")}}" => {
         {%- for version in versions %}
             if world.api_instances.{{version}}_{{fieldName}}.is_none() {
                 world.api_instances.{{version}}_{{fieldName}} = Some(datadog{{ version.upper() }}::api::{{fieldName}}::{{structName}}::with_config(world.config.clone()));
@@ -86,7 +86,12 @@ fn test_{{version}}_{{ operation['operationId'] | snake_case }}(world: &mut Data
         Ok(response) => response,
         Err(error) => {
             return match error {
-                Error::ResponseError(e) => world.response.code = e.status.as_u16(),
+                Error::ResponseError(e) => {
+                    world.response.code = e.status.as_u16();
+                    if let Some(entity) = e.entity {
+                        world.response.object = serde_json::to_value(entity).unwrap();
+                    }                    
+                },
                 _ => panic!("error parsing response: {}", error),
             };
         }

.generator/src/generator/templates/model_oneof.j2

@@ -7,6 +7,10 @@ pub enum {{name}} {
     {%- for oneOf in model.oneOf %}
 	{%- set dataType = get_type(oneOf, render_nullable=False, render_option=False, version=version) %}
 	{%- set attributeName = (get_name(oneOf) or dataType)|upperfirst %}
+	{%- if oneOf | is_primitive or oneOf.type == "array" %}
+	{{attributeName}}({{dataType}}),
+	{%- else %}
 	{{attributeName}}(Box<{{dataType}}>),
+	{%- endif %}
     {%- endfor%}
 }

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

@@ -20,7 +20,7 @@ pub struct {{ name }} {
 {%- 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=True, version=version) %}
     #[serde(flatten)]
-    pub additional_properties: std::collections::HashMap<String, {{ dataType }}>,
+    pub additional_properties: std::collections::BTreeMap<String, {{ dataType }}>,
 {%- endif %}
 }
 
@@ -42,8 +42,16 @@ impl {{ name }} {
             {%- endif %}
             {%- endfor %}
             {%- if model.additionalProperties is defined and model.additionalProperties != False %}
-            additional_properties: std::collections::HashMap::new(),
+            additional_properties: std::collections::BTreeMap::new(),
             {%- endif %}
         }
     }
 }
+
+{%- if not model.required %}
+impl Default for {{ name }} {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+{%- endif %}

Cargo.toml

@@ -10,26 +10,28 @@ edition = "2021"
 log = "0.4.20"
 reqwest = { version = "^0.11", features = ["multipart"] }
 reqwest-middleware = "0.1.6"
-rustc_version = "0.4.0"
 serde = "^1.0"
 serde_derive = "^1.0"
 serde_json = "^1.0"
 serde_repr = "0.1.17"
 serde_with = "^2.0"
 url = "^2.2"
 
+[build-dependencies]
+rustc_version = "0.4.0"
+
 [dev-dependencies]
 chrono = "0.4.31"
 cucumber = "0.20.2"
 env_logger = "0.10.0"
 futures = "0.3.28"
-handlebars = "4.4.0"
 regex = "1.9.5"
 rvcr = { git = "https://github.com/nkzou/rvcr.git", rev = "b8f84bc0dfacd539fdc6f7446637c6276dcbb57c" }
 vcr-cassette = "^2.0"
 sha256 = "1.4.0"
 tokio = { version = "1.10", features = ["macros", "rt-multi-thread", "time"] }
 lazy_static = "1.4.0"
+minijinja = "1.0.10"
 
 [[test]]
 harness = false  # allows Cucumber to print output instead of libtest

build.rs

@@ -0,0 +1,12 @@
+use rustc_version::version;
+
+fn main() {
+    println!(
+        "cargo:rustc-env=DD_RUSTC_VERSION={}",
+        match version() {
+            Ok(ver) => ver.to_string(),
+            Err(_) => "0.0.0".to_owned(),
+        }
+    );
+    println!("cargo:rerun-if-changed=src/");
+}

src/datadog/configuration.rs

@@ -1,7 +1,6 @@
 // Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2019-Present Datadog, Inc.
-use rustc_version::{version, Version};
 use std::env;
 
 #[derive(Debug, Clone)]
@@ -26,8 +25,8 @@ impl Default for Configuration {
             base_path: "https://api.datadoghq.com".to_owned(),
             user_agent: Some(format!(
                 "datadog-api-client-rust/{} (rust {}; os {}; arch {})",
-                env::var("CARGO_PKG_VERSION").unwrap_or("?".to_owned()),
-                version().unwrap_or(Version::new(0, 0, 0)),
+                option_env!("CARGO_PKG_VERSION").unwrap_or("?"),
+                option_env!("DD_RUSTC_VERSION").unwrap_or("?"),
                 env::consts::OS,
                 env::consts::ARCH,
             )),

src/datadogV1/api/api_aws_integration.rs

@@ -214,19 +214,19 @@ pub enum UpdateAWSAccountError {
 }
 
 #[derive(Debug, Clone)]
-pub struct AwsIntegrationAPI {
+pub struct AWSIntegrationAPI {
     config: configuration::Configuration,
 }
 
-impl Default for AwsIntegrationAPI {
+impl Default for AWSIntegrationAPI {
     fn default() -> Self {
         Self {
             config: configuration::Configuration::new(),
         }
     }
 }
 
-impl AwsIntegrationAPI {
+impl AWSIntegrationAPI {
     pub fn new() -> Self {
         Self::default()
     }
@@ -411,7 +411,7 @@ impl AwsIntegrationAPI {
         &self,
         params: CreateAWSTagFilterParams,
     ) -> Result<
-        Option<std::collections::HashMap<String, serde_json::Value>>,
+        Option<std::collections::BTreeMap<String, serde_json::Value>>,
         Error<CreateAWSTagFilterError>,
     > {
         match self.create_aws_tag_filter_with_http_info(params).await {
@@ -425,7 +425,7 @@ impl AwsIntegrationAPI {
         &self,
         params: CreateAWSTagFilterParams,
     ) -> Result<
-        ResponseContent<std::collections::HashMap<String, serde_json::Value>>,
+        ResponseContent<std::collections::BTreeMap<String, serde_json::Value>>,
         Error<CreateAWSTagFilterError>,
     > {
         let local_configuration = &self.config;
@@ -470,7 +470,7 @@ impl AwsIntegrationAPI {
         let local_content = local_resp.text().await?;
 
         if !local_status.is_client_error() && !local_status.is_server_error() {
-            let local_entity: Option<std::collections::HashMap<String, serde_json::Value>> =
+            let local_entity: Option<std::collections::BTreeMap<String, serde_json::Value>> =
                 serde_json::from_str(&local_content).ok();
             Ok(ResponseContent {
                 status: local_status,
@@ -577,7 +577,7 @@ impl AwsIntegrationAPI {
         &self,
         params: DeleteAWSAccountParams,
     ) -> Result<
-        Option<std::collections::HashMap<String, serde_json::Value>>,
+        Option<std::collections::BTreeMap<String, serde_json::Value>>,
         Error<DeleteAWSAccountError>,
     > {
         match self.delete_aws_account_with_http_info(params).await {
@@ -591,7 +591,7 @@ impl AwsIntegrationAPI {
         &self,
         params: DeleteAWSAccountParams,
     ) -> Result<
-        ResponseContent<std::collections::HashMap<String, serde_json::Value>>,
+        ResponseContent<std::collections::BTreeMap<String, serde_json::Value>>,
         Error<DeleteAWSAccountError>,
     > {
         let local_configuration = &self.config;
@@ -633,7 +633,7 @@ impl AwsIntegrationAPI {
         let local_content = local_resp.text().await?;
 
         if !local_status.is_client_error() && !local_status.is_server_error() {
-            let local_entity: Option<std::collections::HashMap<String, serde_json::Value>> =
+            let local_entity: Option<std::collections::BTreeMap<String, serde_json::Value>> =
                 serde_json::from_str(&local_content).ok();
             Ok(ResponseContent {
                 status: local_status,
@@ -743,7 +743,7 @@ impl AwsIntegrationAPI {
         &self,
         params: DeleteAWSTagFilterParams,
     ) -> Result<
-        Option<std::collections::HashMap<String, serde_json::Value>>,
+        Option<std::collections::BTreeMap<String, serde_json::Value>>,
         Error<DeleteAWSTagFilterError>,
     > {
         match self.delete_aws_tag_filter_with_http_info(params).await {
@@ -757,7 +757,7 @@ impl AwsIntegrationAPI {
         &self,
         params: DeleteAWSTagFilterParams,
     ) -> Result<
-        ResponseContent<std::collections::HashMap<String, serde_json::Value>>,
+        ResponseContent<std::collections::BTreeMap<String, serde_json::Value>>,
         Error<DeleteAWSTagFilterError>,
     > {
         let local_configuration = &self.config;
@@ -802,7 +802,7 @@ impl AwsIntegrationAPI {
         let local_content = local_resp.text().await?;
 
         if !local_status.is_client_error() && !local_status.is_server_error() {
-            let local_entity: Option<std::collections::HashMap<String, serde_json::Value>> =
+            let local_entity: Option<std::collections::BTreeMap<String, serde_json::Value>> =
                 serde_json::from_str(&local_content).ok();
             Ok(ResponseContent {
                 status: local_status,
@@ -1127,7 +1127,7 @@ impl AwsIntegrationAPI {
         &self,
         params: UpdateAWSAccountParams,
     ) -> Result<
-        Option<std::collections::HashMap<String, serde_json::Value>>,
+        Option<std::collections::BTreeMap<String, serde_json::Value>>,
         Error<UpdateAWSAccountError>,
     > {
         match self.update_aws_account_with_http_info(params).await {
@@ -1141,7 +1141,7 @@ impl AwsIntegrationAPI {
         &self,
         params: UpdateAWSAccountParams,
     ) -> Result<
-        ResponseContent<std::collections::HashMap<String, serde_json::Value>>,
+        ResponseContent<std::collections::BTreeMap<String, serde_json::Value>>,
         Error<UpdateAWSAccountError>,
     > {
         let local_configuration = &self.config;
@@ -1197,7 +1197,7 @@ impl AwsIntegrationAPI {
         let local_content = local_resp.text().await?;
 
         if !local_status.is_client_error() && !local_status.is_server_error() {
-            let local_entity: Option<std::collections::HashMap<String, serde_json::Value>> =
+            let local_entity: Option<std::collections::BTreeMap<String, serde_json::Value>> =
                 serde_json::from_str(&local_content).ok();
             Ok(ResponseContent {
                 status: local_status,