Implement OneOfs and remove default on enums (#6)

Author: nkzou

.generator/schemas/v1/openapi.yaml

@@ -13,7 +13,7 @@ use crate::datadog::*;
 {%- for name, parameter in operation|parameters %}
 {%- if loop.first %}
 /// {{ operation.operationId }}Params is a struct for passing parameters to the method [`{{operation.operationId}}`]
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug)]
 pub struct {{operation.operationId}}Params {
 {%- endif %}
     {%- if parameter.description is defined %}

.generator/schemas/v2/openapi.yaml

@@ -33,9 +33,3 @@ impl ToString for {{name}} {
         }
     }
 }
-
-impl Default for {{name}} {
-    fn default() -> {{name}} {
-        Self::{{ model["x-enum-varnames"].0 }}
-    }
-}

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

@@ -0,0 +1,12 @@
+use serde::{Deserialize, Serialize};
+
+{{ model.description | block_comment }}
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(untagged)]
+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 %}
+	{{attributeName}}(Box<{{dataType}}>),
+    {%- endfor%}
+}

.generator/src/generator/templates/model_enum.j2

@@ -3,7 +3,7 @@ use serde_with::skip_serializing_none;
 
 {{ model.description | block_comment }}
 #[skip_serializing_none]
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct {{ name }} {
 {%- for attr, schema in model.get("properties", {}).items() %}
 {%- set propertyName = attr|variable_name %}
@@ -25,7 +25,7 @@ pub struct {{ name }} {
 }
 
 impl {{ name }} {
-    pub fn new({% for attr, schema in model.get("properties", {}).items() if attr in model.required %}{%- set nullable = schema.get("nullable", False)%}{%- set propertyName = attr|variable_name %}{%- set dataType = get_type(schema, alternative_name=name + propertyName, render_nullable=nullable, render_option=False, version=version) %}{{propertyName}}: {{ dataType }}{%- if not loop.last %}, {% endif %}{% endfor %}) -> {{ name }} {
+    pub fn new({% for attr, schema in model.get("properties", {}).items() if attr in model.required %}{%- set nullable = schema.get("nullable", False)%}{%- set propertyName = attr|variable_name %}{%- set dataType = get_type(schema, alternative_name=name + propertyName, render_nullable=nullable, render_option=False, render_box=True, version=version) %}{{propertyName}}: {{ dataType }}{%- if not loop.last %}, {% endif %}{% endfor %}) -> {{ name }} {
         {%- if get_deprecated(model) %}
         #[allow(deprecated)]
         {%- endif %}
@@ -36,11 +36,7 @@ impl {{ name }} {
             {%- set nullable = schema.get("nullable", False)%}
             {%- set dataType = get_type(schema, alternative_name=name + propertyName, render_nullable=nullable, render_option=not required, render_box=True, version=version) %}
             {%- if attr in model.get("required", []) %}
-            {%- if "Box<" in dataType %}
-            {{ attr|variable_name }}: Box::new({{ attr|variable_name }}),
-            {%- else %}
             {{ attr|variable_name }},
-            {%- endif %}
             {%- else %}
             {{ attr|variable_name }}: None,
             {%- endif %}

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

@@ -7,29 +7,29 @@ use reqwest;
 use serde::{Deserialize, Serialize};
 
 /// CreateAWSAccountParams is a struct for passing parameters to the method [`CreateAWSAccount`]
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug)]
 pub struct CreateAWSAccountParams {
     /// AWS Request Object
     pub body: crate::datadogV1::model::AWSAccount,
 }
 
 /// CreateAWSEventBridgeSourceParams is a struct for passing parameters to the method [`CreateAWSEventBridgeSource`]
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug)]
 pub struct CreateAWSEventBridgeSourceParams {
     /// Create an Amazon EventBridge source for an AWS account with a given name and region.
     pub body: crate::datadogV1::model::AWSEventBridgeCreateRequest,
 }
 
 /// CreateAWSTagFilterParams is a struct for passing parameters to the method [`CreateAWSTagFilter`]
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug)]
 pub struct CreateAWSTagFilterParams {
     /// Set an AWS tag filter using an `aws_account_identifier`, `namespace`, and filtering string.
     /// Namespace options are `application_elb`, `elb`, `lambda`, `network_elb`, `rds`, `sqs`, and `custom`.
     pub body: crate::datadogV1::model::AWSTagFilterCreateRequest,
 }
 
 /// CreateNewAWSExternalIDParams is a struct for passing parameters to the method [`CreateNewAWSExternalID`]
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug)]
 pub struct CreateNewAWSExternalIDParams {
     /// Your Datadog role delegation name.
     /// For more information about your AWS account Role name,
@@ -38,28 +38,28 @@ pub struct CreateNewAWSExternalIDParams {
 }
 
 /// DeleteAWSAccountParams is a struct for passing parameters to the method [`DeleteAWSAccount`]
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug)]
 pub struct DeleteAWSAccountParams {
     /// AWS request object
     pub body: crate::datadogV1::model::AWSAccountDeleteRequest,
 }
 
 /// DeleteAWSEventBridgeSourceParams is a struct for passing parameters to the method [`DeleteAWSEventBridgeSource`]
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug)]
 pub struct DeleteAWSEventBridgeSourceParams {
     /// Delete the Amazon EventBridge source with the given name, region, and associated AWS account.
     pub body: crate::datadogV1::model::AWSEventBridgeDeleteRequest,
 }
 
 /// DeleteAWSTagFilterParams is a struct for passing parameters to the method [`DeleteAWSTagFilter`]
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug)]
 pub struct DeleteAWSTagFilterParams {
     /// Delete a tag filtering entry for a given AWS account and `dd-aws` namespace.
     pub body: crate::datadogV1::model::AWSTagFilterDeleteRequest,
 }
 
 /// ListAWSAccountsParams is a struct for passing parameters to the method [`ListAWSAccounts`]
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug)]
 pub struct ListAWSAccountsParams {
     /// Only return AWS accounts that matches this `account_id`.
     pub account_id: Option<String>,
@@ -70,14 +70,14 @@ pub struct ListAWSAccountsParams {
 }
 
 /// ListAWSTagFiltersParams is a struct for passing parameters to the method [`ListAWSTagFilters`]
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug)]
 pub struct ListAWSTagFiltersParams {
     /// Only return AWS filters that matches this `account_id`.
     pub account_id: String,
 }
 
 /// UpdateAWSAccountParams is a struct for passing parameters to the method [`UpdateAWSAccount`]
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug)]
 pub struct UpdateAWSAccountParams {
     /// AWS request object
     pub body: crate::datadogV1::model::AWSAccount,

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

@@ -7,35 +7,35 @@ use reqwest;
 use serde::{Deserialize, Serialize};
 
 /// CheckAWSLogsLambdaAsyncParams is a struct for passing parameters to the method [`CheckAWSLogsLambdaAsync`]
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug)]
 pub struct CheckAWSLogsLambdaAsyncParams {
     /// Check AWS Log Lambda Async request body.
     pub body: crate::datadogV1::model::AWSAccountAndLambdaRequest,
 }
 
 /// CheckAWSLogsServicesAsyncParams is a struct for passing parameters to the method [`CheckAWSLogsServicesAsync`]
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug)]
 pub struct CheckAWSLogsServicesAsyncParams {
     /// Check AWS Logs Async Services request body.
     pub body: crate::datadogV1::model::AWSLogsServicesRequest,
 }
 
 /// CreateAWSLambdaARNParams is a struct for passing parameters to the method [`CreateAWSLambdaARN`]
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug)]
 pub struct CreateAWSLambdaARNParams {
     /// AWS Log Lambda Async request body.
     pub body: crate::datadogV1::model::AWSAccountAndLambdaRequest,
 }
 
 /// DeleteAWSLambdaARNParams is a struct for passing parameters to the method [`DeleteAWSLambdaARN`]
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug)]
 pub struct DeleteAWSLambdaARNParams {
     /// Delete AWS Lambda ARN request body.
     pub body: crate::datadogV1::model::AWSAccountAndLambdaRequest,
 }
 
 /// EnableAWSLogServicesParams is a struct for passing parameters to the method [`EnableAWSLogServices`]
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug)]
 pub struct EnableAWSLogServicesParams {
     /// Enable AWS Log Services request body.
     pub body: crate::datadogV1::model::AWSLogsServicesRequest,

src/datadogV1/api/api_aws_integration.rs

@@ -7,28 +7,28 @@ use reqwest;
 use serde::{Deserialize, Serialize};
 
 /// CreateAzureIntegrationParams is a struct for passing parameters to the method [`CreateAzureIntegration`]
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug)]
 pub struct CreateAzureIntegrationParams {
     /// Create a Datadog-Azure integration for your Datadog account request body.
     pub body: crate::datadogV1::model::AzureAccount,
 }
 
 /// DeleteAzureIntegrationParams is a struct for passing parameters to the method [`DeleteAzureIntegration`]
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug)]
 pub struct DeleteAzureIntegrationParams {
     /// Delete a given Datadog-Azure integration request body.
     pub body: crate::datadogV1::model::AzureAccount,
 }
 
 /// UpdateAzureHostFiltersParams is a struct for passing parameters to the method [`UpdateAzureHostFilters`]
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug)]
 pub struct UpdateAzureHostFiltersParams {
     /// Update a Datadog-Azure integration's host filters request body.
     pub body: crate::datadogV1::model::AzureAccount,
 }
 
 /// UpdateAzureIntegrationParams is a struct for passing parameters to the method [`UpdateAzureIntegration`]
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug)]
 pub struct UpdateAzureIntegrationParams {
     /// Update a Datadog-Azure integration request body.
     pub body: crate::datadogV1::model::AzureAccount,

src/datadogV1/api/api_aws_logs_integration.rs

@@ -7,28 +7,28 @@ use reqwest;
 use serde::{Deserialize, Serialize};
 
 /// CreateDashboardListParams is a struct for passing parameters to the method [`CreateDashboardList`]
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug)]
 pub struct CreateDashboardListParams {
     /// Create a dashboard list request body.
     pub body: crate::datadogV1::model::DashboardList,
 }
 
 /// DeleteDashboardListParams is a struct for passing parameters to the method [`DeleteDashboardList`]
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug)]
 pub struct DeleteDashboardListParams {
     /// ID of the dashboard list to delete.
     pub list_id: i64,
 }
 
 /// GetDashboardListParams is a struct for passing parameters to the method [`GetDashboardList`]
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug)]
 pub struct GetDashboardListParams {
     /// ID of the dashboard list to fetch.
     pub list_id: i64,
 }
 
 /// UpdateDashboardListParams is a struct for passing parameters to the method [`UpdateDashboardList`]
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug)]
 pub struct UpdateDashboardListParams {
     /// ID of the dashboard list to update.
     pub list_id: i64,