End user usability refactors (#11)

Author: nkzou

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

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

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

@@ -40,7 +40,7 @@ pub fn collect_function_calls(world: &mut DatadogWorld) {
 {%- for version, apis in all_apis.items() %}
 {%- for _, operations in apis.items() %}
 {%- for _, _, operation in operations %}
-    world.function_mappings.insert("{{version}}.{{ operation['operationId'] }}".to_string(), test_{{version}}_{{ operation['operationId'] | snake_case }});
+    world.function_mappings.insert("{{version}}.{{ operation['operationId'] }}".into(), test_{{version}}_{{ operation['operationId'] | snake_case }});
 {%- endfor %}
 {%- endfor %}
 {%- endfor %}
@@ -63,25 +63,23 @@ fn test_{{version}}_{{ operation['operationId'] | snake_case }}(world: &mut Data
     let {{ parameter[0] | variable_name }} = serde_json::from_value(_parameters.get("{{ parameter[0] }}").unwrap().clone()).unwrap();
     {%- endif -%}
     {%- else %}
-    let {{ parameter[0] | variable_name }} = if let Some(param) = _parameters.get("{{ parameter[0] }}") {
+    let {{ parameter[0] | variable_name }} = _parameters.get("{{ parameter[0] }}").and_then(|param| 
         {%- if schema | is_primitive and schema.get("format") == "binary" -%}
         Some(param.as_str().unwrap().as_bytes().to_vec())
         {%- else -%}
         Some(serde_json::from_value(param.clone()).unwrap())
         {%- endif -%}
-    } else {
-        None
-    };
+    );
     {%- endif %}
     {%- endfor %}
 
     {%- for parameter in optionalParams %}
     {%- if loop.first %}
-    let params = datadog{{ version.upper() }}::api::{{ apiName }}::{{ operation['operationId'] }}OptionalParams {
+    let mut params = datadog{{ version.upper() }}::api::{{ apiName }}::{{ operation['operationId'] }}OptionalParams::default();
     {%- endif %}
-        {{ parameter[0] | variable_name }},
+    params.{{ parameter[0] | variable_name }} = {{ parameter[0] | variable_name }};
     {%- if loop.last %}
-    };
+    ;
     {%- endif %}
     {%- endfor %}
     let response = match block_on(api.{{ operation['operationId'] | snake_case}}_with_http_info({% for name, parameter in requiredParams %}{{name|variable_name}}{% if loop.last %}{% if operation|has_optional_parameter %}, {% endif %}{% else %}, {% endif %}{% endfor %}{% if operation|has_optional_parameter %}params{% endif %})) {

.generator/src/generator/templates/lib.j2

@@ -2,11 +2,6 @@
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
 
-extern crate serde;
-extern crate serde_json;
-extern crate url;
-extern crate reqwest;
-
 pub mod datadog;
 pub mod datadogV1;
 pub mod datadogV2;

.generator/src/generator/templates/model.mustache

@@ -7,9 +7,10 @@ use serde::{Serialize, Deserialize};
 {{ description | block_comment }}
 {%- endif %}
 
+#[non_exhaustive]
 {%- if model["type"] == "integer" %}
 #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize_repr, Deserialize_repr)]
-#[repr({{model | simple_type(False, False)}})]
+#[repr({{model | simple_type(false, false)}})]
 {%- else %}
 #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)]
 {%- endif %}

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

@@ -1,6 +1,7 @@
 use serde::{Deserialize, Serialize};
 
 {{ model.description | block_comment }}
+#[non_exhaustive]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(untagged)]
 pub enum {{name}} {

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

@@ -2,13 +2,14 @@ use serde::{Serialize, Deserialize};
 use serde_with::skip_serializing_none;
 
 {{ model.description | block_comment }}
+#[non_exhaustive]
 #[skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct {{ name }} {
 {%- for attr, schema in model.get("properties", {}).items() %}
 {%- set propertyName = attr|variable_name %}
 {%- set required = attr in model.required %}
-{%- set nullable = schema.get("nullable", False)%}
+{%- set nullable = schema.get("nullable", false)%}
 {%- set dataType = get_type(schema, alternative_name=name + propertyName, render_nullable=nullable, render_option=not required, render_box=false, version=version) %}
     {%- if schema.description is defined %}
     {{ schema.description | block_comment }}
@@ -19,37 +20,37 @@ 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) %}
+{%- 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) %}
     #[serde(flatten)]
     pub additional_properties: std::collections::BTreeMap<String, {{ dataType }}>,
 {%- endif %}
 }
 
 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 dataType = get_type(schema, alternative_name=name + attr|variable_name, render_nullable=nullable, render_option=False, render_box=false, version=version) %}{{attr|variable_name}}: {{ 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 dataType = get_type(schema, alternative_name=name + attr|variable_name, render_nullable=nullable, render_option=false, render_box=false, version=version) %}{{attr|variable_name}}: {{ dataType }}{%- if not loop.last %}, {% endif %}{% endfor %}) -> {{ name }} {
         {%- if get_deprecated(model) %}
         #[allow(deprecated)]
         {%- endif %}
         {{ name }} {
             {%- for attr, schema in model.get("properties", {}).items() %}
             {%- set required = attr in model.required %}
-            {%- set nullable = schema.get("nullable", False)%}
+            {%- set nullable = schema.get("nullable", false)%}
             {%- set dataType = get_type(schema, alternative_name=name + attr|variable_name, render_nullable=nullable, render_option=not required, render_box=false, version=version) %}
             {%- if attr in model.get("required", []) %}
             {{ attr|variable_name }},
             {%- else %}
             {{ attr|variable_name }}: None,
             {%- endif %}
             {%- endfor %}
-            {%- if model.additionalProperties is defined and model.additionalProperties != False %}
+            {%- if model.additionalProperties is defined and model.additionalProperties != false %}
             additional_properties: std::collections::BTreeMap::new(),
             {%- endif %}
         }
     }
     {% for attr, schema in model.get("properties", {}).items() if attr not in model.required %}
-    {%- set nullable = schema.get("nullable", False)%}
-    {%- set dataType = get_type(schema, alternative_name=name + attr|variable_name, render_nullable=nullable, render_option=False, render_box=false, version=version) %}
+    {%- set nullable = schema.get("nullable", false)%}
+    {%- set dataType = get_type(schema, alternative_name=name + attr|variable_name, render_nullable=nullable, render_option=false, render_box=false, version=version) %}
     {%- if get_deprecated(model) %}
     #[allow(deprecated)]
     {%- endif %}

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

@@ -1,4 +1,5 @@
 cargo install --quiet dd-rust-license-tool
+cargo fetch --target aarch64-apple-darwin
 dd-rust-license-tool check
 if [ $? -ne 0 ]; then
   echo "Run 'dd-rust-license-tool write' to regenerate license csv file."

scripts/license-check.sh

@@ -6,6 +6,7 @@ use reqwest;
 use serde::{Deserialize, Serialize};
 
 /// ListAWSAccountsOptionalParams is a struct for passing parameters to the method [`AWSIntegrationAPI::list_aws_accounts`]
+#[non_exhaustive]
 #[derive(Clone, Default, Debug)]
 pub struct ListAWSAccountsOptionalParams {
     /// Only return AWS accounts that matches this `account_id`.
@@ -35,6 +36,7 @@ impl ListAWSAccountsOptionalParams {
 }
 
 /// UpdateAWSAccountOptionalParams is a struct for passing parameters to the method [`AWSIntegrationAPI::update_aws_account`]
+#[non_exhaustive]
 #[derive(Clone, Default, Debug)]
 pub struct UpdateAWSAccountOptionalParams {
     /// Only return AWS accounts that matches this `account_id`.

src/datadogV1/api/api_aws_integration.rs

@@ -6,6 +6,7 @@ use reqwest;
 use serde::{Deserialize, Serialize};
 
 /// GetPublicDashboardInvitationsOptionalParams is a struct for passing parameters to the method [`DashboardsAPI::get_public_dashboard_invitations`]
+#[non_exhaustive]
 #[derive(Clone, Default, Debug)]
 pub struct GetPublicDashboardInvitationsOptionalParams {
     /// The number of records to return in a single request.
@@ -28,6 +29,7 @@ impl GetPublicDashboardInvitationsOptionalParams {
 }
 
 /// ListDashboardsOptionalParams is a struct for passing parameters to the method [`DashboardsAPI::list_dashboards`]
+#[non_exhaustive]
 #[derive(Clone, Default, Debug)]
 pub struct ListDashboardsOptionalParams {
     /// When `true`, this query only returns shared custom created