Introduce API instance pattern (#3)

Author: nkzou

.generator/src/generator/openapi.py

@@ -306,7 +306,7 @@ def return_type(operation, version):
     for response in operation.get("responses", {}).values():
         for content in response.get("content", {}).values():
             if "schema" in content:
-                return type_to_rust(content["schema"], version=version)
+                return type_to_rust(content["schema"], version=version, render_option=False)
         return
 
 

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

@@ -3,18 +3,48 @@ use futures::executor::block_on;
 use serde_json::Value;
 use std::collections::HashMap;
 
-use datadog_api_client::datadog::*;{#
+use datadog_api_client::datadog::*;
+{#
 {% for name, operations in apis["v1"].items() %}
 {%- set classname = "api_"+name%}
 use datadog_api_client::datadogV1::{{classname | snake_case}}::*;
 {%- endfor %}
-#}{%- for version, apis in all_apis.items() %}
+#}
+{%- for version, apis in all_apis.items() %}
 {%- for name, operations in apis.items() %}
 {%- set classname = "api_"+name %}
 use datadog_api_client::datadog{{ version.upper() }}::api::{{classname | snake_case}}::*;
 {%- endfor %}
 {%- endfor %}
 
+#[derive(Debug, Default)]
+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" %}
+    pub {{fieldName | snake_case}}: Option<{{structName}}>,
+{%- endfor %}
+{%- endfor %}
+}
+
+pub fn initialize_api_instance(world: &mut DatadogWorld, api: String) {
+    match api.as_str() {
+    {%- for version, apis in all_apis.items() %}
+    {%- for name, operations in apis.items() %}
+    {%- set fieldName = "api_"+name %}
+    {%- set structName = name|camel_case +"API" %}
+        "{{name|camel_case}}" => {
+            if world.api_instances.api_fastly_integration.is_none() {
+                world.api_instances.{{fieldName | snake_case}} = Some({{structName}}::with_config(world.config.clone()));
+            }
+        },
+    {%- endfor %}
+    {%- endfor %}
+        _ => panic!("{api} API instance not found"),
+    }
+}
+
 pub fn collect_function_calls(world: &mut DatadogWorld) {
 {%- for _, apis in all_apis.items() %}
 {%- for _, operations in apis.items() %}
@@ -26,26 +56,28 @@ pub fn collect_function_calls(world: &mut DatadogWorld) {
 }
 
 {%- for _, apis in all_apis.items() %}
-{%- for _, operations in apis.items() %}
+{%- for name, operations in apis.items() %}
+{%- set apiName = "api_"+name | snake_case %}
 {% for _, _, operation in operations %}
 {%- set operationParams = operation|parameters|list %}
 fn test_{{ operation['operationId'] | snake_case }}(world: &mut DatadogWorld, _parameters: &HashMap<String, Value>) {
+    let api = world.api_instances.{{ apiName }}.as_ref().expect("api instance not found");
     {%- if operationParams|length > 0 -%}
     let params = {{ operation['operationId'] }}Params {
         {%- for param in operationParams %}
         {{ param[0] }}: serde_json::from_value(_parameters.get("{{ param[0] }}").unwrap().clone()).unwrap(),
         {%- endfor %}
     };
-    let response = match block_on({{ operation['operationId'] | snake_case}}(&world.config, params)) {
+    let response = match block_on(api.{{ operation['operationId'] | snake_case}}_with_http_info(params)) {
     {%- else %}
-    let response = match block_on({{ operation['operationId'] | snake_case}}(&world.config)) {
+    let response = match block_on(api.{{ operation['operationId'] | snake_case}}_with_http_info()) {
     {%- endif %}
         Ok(response) => response,
         Err(error) => {
             return match error {
-                Error::Reqwest(e) => panic!("reqwest error: {}", e.to_string()),
-                Error::Serde(e) => panic!("serde error: {}", e.to_string()),
-                Error::Io(e) => panic!("io error: {}", e.to_string()),
+                Error::Reqwest(e) => panic!("reqwest error: {}", e),
+                Error::Serde(e) => panic!("serde error: {}", e),
+                Error::Io(e) => panic!("io error: {}", e),
                 Error::ResponseError(e) => world.response.code = e.status.as_u16(),
             };
         }

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

@@ -9,12 +9,16 @@ repos:
     pass_filenames: false
   - id: lint
     name: Lint
+    entry: cargo clippy
+    language: system
+    pass_filenames: false
+    stages: [manual]
+  - id: format
+    name: Format
     language: rust
     entry: cargo fmt
-    stages: [manual]
-    # files: '^api/.*\.go'
-    # types: ["file", "go"]
     pass_filenames: false
+    stages: [manual]
   - id: generator
     name: generator
     language: python

.pre-commit-config.yaml

@@ -25,4 +25,5 @@ pre_commit_wrapper () {
 
 rm -rf src/* examples/*
 pre_commit_wrapper generator
+pre_commit_wrapper format
 pre_commit_wrapper lint

generate.sh

@@ -0,0 +1,3 @@
+max_width = 120
+edition = "2021"
+use_small_heuristics = "Default"

rustfmt.toml

@@ -67,21 +67,15 @@ pub fn parse_deep_object(prefix: &str, value: &serde_json::Value) -> Vec<(String
 
         for (key, value) in object {
             match value {
-                serde_json::Value::Object(_) => params.append(&mut parse_deep_object(
-                    &format!("{}[{}]", prefix, key),
-                    value,
-                )),
+                serde_json::Value::Object(_) => {
+                    params.append(&mut parse_deep_object(&format!("{}[{}]", prefix, key), value))
+                }
                 serde_json::Value::Array(array) => {
                     for (i, value) in array.iter().enumerate() {
-                        params.append(&mut parse_deep_object(
-                            &format!("{}[{}][{}]", prefix, key, i),
-                            value,
-                        ));
+                        params.append(&mut parse_deep_object(&format!("{}[{}][{}]", prefix, key, i), value));
                     }
                 }
-                serde_json::Value::String(s) => {
-                    params.push((format!("{}[{}]", prefix, key), s.clone()))
-                }
+                serde_json::Value::String(s) => params.push((format!("{}[{}]", prefix, key), s.clone())),
                 _ => params.push((format!("{}[{}]", prefix, key), value.to_string())),
             }
         }