remove client fully from the config object

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

@@ -103,13 +103,13 @@ impl {{ structName }} {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder = reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
+        let middleware_client_builder = reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
-        Self {config,client}
+        Self {config, client}
     }
 
-    pub fn with_client_and_config(config: configuration::Configuration,client: reqwest_middleware::ClientWithMiddleware) -> Self {
-        Self {config,client}
+    pub fn with_client_and_config(config: configuration::Configuration, client: reqwest_middleware::ClientWithMiddleware) -> Self {
+        Self {config, client}
     }
 
     {% for path, method, operation in operations|sort(attribute="2.operationId", case_sensitive=true) %}

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

@@ -42,7 +42,6 @@ pub struct APIKey {
 #[derive(Debug, Clone)]
 pub struct Configuration {
     pub(crate) user_agent: String,
-    pub(crate) client: reqwest_middleware::ClientWithMiddleware,
     pub(crate) unstable_operations: HashMap<String, bool>,
     pub(crate) auth_keys: HashMap<String, APIKey>,
     pub server_index: usize,
@@ -57,14 +56,6 @@ impl Configuration {
         Self::default()
     }
 
-    pub fn client(&mut self, client: reqwest_middleware::ClientWithMiddleware) {
-        self.client = client;
-    }
-
-    pub fn get_client(&self) -> &reqwest_middleware::ClientWithMiddleware {
-        &self.client
-    }
-
     pub fn get_operation_host(&self, operation_str: &str) -> String {
         let operation = operation_str.to_string();
         if let Some(servers) = OPERATION_SERVERS.get(&operation) {
@@ -127,7 +118,6 @@ impl Configuration {
 
 impl Default for Configuration {
     fn default() -> Self {
-        let http_client = reqwest_middleware::ClientBuilder::new(reqwest::Client::new());
         let user_agent = format!(
             "datadog-api-client-rust/{} (rust {}; os {}; arch {})",
             option_env!("CARGO_PKG_VERSION").unwrap_or("?"),
@@ -167,7 +157,6 @@ impl Default for Configuration {
 
         Self {
             user_agent,
-            client: http_client.build(),
             unstable_operations,
             auth_keys,
             server_index: 0,

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

@@ -28,7 +28,10 @@ pub fn initialize_api_instance(world: &mut DatadogWorld, api: String) {
     {%- set structName = name.replace(" ", "")+"API" %}
         "{{name.replace(" ", "")}}" => {
         {%- for version in versions %}
-            world.api_instances.{{version}}_{{fieldName}} = Some(datadog{{ version.upper() }}::api::{{fieldName}}::{{structName}}::with_client_and_config(world.config.clone(),world.config.get_client().clone(),));
+            world.api_instances.{{version}}_{{fieldName}} = Some(datadog{{ version.upper() }}::api::{{fieldName}}::{{structName}}::with_client_and_config(
+                world.config.clone(),
+                world.http_client.as_ref().unwrap().clone()
+            ));
         {%- endfor %}
         },
     {%- endfor %}

src/datadog/configuration.rs

@@ -44,7 +44,6 @@ pub struct APIKey {
 #[derive(Debug, Clone)]
 pub struct Configuration {
     pub(crate) user_agent: String,
-    pub(crate) client: reqwest_middleware::ClientWithMiddleware,
     pub(crate) unstable_operations: HashMap<String, bool>,
     pub(crate) auth_keys: HashMap<String, APIKey>,
     pub server_index: usize,
@@ -59,14 +58,6 @@ impl Configuration {
         Self::default()
     }
 
-    pub fn client(&mut self, client: reqwest_middleware::ClientWithMiddleware) {
-        self.client = client;
-    }
-
-    pub fn get_client(&self) -> &reqwest_middleware::ClientWithMiddleware {
-        &self.client
-    }
-
     pub fn get_operation_host(&self, operation_str: &str) -> String {
         let operation = operation_str.to_string();
         if let Some(servers) = OPERATION_SERVERS.get(&operation) {
@@ -130,7 +121,6 @@ impl Configuration {
 
 impl Default for Configuration {
     fn default() -> Self {
-        let http_client = reqwest_middleware::ClientBuilder::new(reqwest::Client::new());
         let user_agent = format!(
             "datadog-api-client-rust/{} (rust {}; os {}; arch {})",
             option_env!("CARGO_PKG_VERSION").unwrap_or("?"),
@@ -200,7 +190,6 @@ impl Default for Configuration {
 
         Self {
             user_agent,
-            client: http_client.build(),
             unstable_operations,
             auth_keys,
             server_index: 0,

src/datadogV1/api/api_authentication.rs

@@ -41,7 +41,7 @@ impl AuthenticationAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_aws_integration.rs

@@ -218,7 +218,7 @@ impl AWSIntegrationAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_aws_logs_integration.rs

@@ -101,7 +101,7 @@ impl AWSLogsIntegrationAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_azure_integration.rs

@@ -82,7 +82,7 @@ impl AzureIntegrationAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_dashboard_lists.rs

@@ -82,7 +82,7 @@ impl DashboardListsAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_dashboards.rs

@@ -243,7 +243,7 @@ impl DashboardsAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_downtimes.rs

@@ -126,7 +126,7 @@ impl DowntimesAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_events.rs

@@ -120,7 +120,7 @@ impl EventsAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_gcp_integration.rs

@@ -72,7 +72,7 @@ impl GCPIntegrationAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_hosts.rs

@@ -153,7 +153,7 @@ impl HostsAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_ip_ranges.rs

@@ -40,7 +40,7 @@ impl IPRangesAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_key_management.rs

@@ -135,7 +135,7 @@ impl KeyManagementAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_logs.rs

@@ -74,7 +74,7 @@ impl LogsAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_logs_indexes.rs

@@ -90,7 +90,7 @@ impl LogsIndexesAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_logs_pipelines.rs

@@ -101,7 +101,7 @@ impl LogsPipelinesAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_metrics.rs

@@ -172,7 +172,7 @@ impl MetricsAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_monitors.rs

@@ -368,7 +368,7 @@ impl MonitorsAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_notebooks.rs

@@ -167,7 +167,7 @@ impl NotebooksAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_organizations.rs

@@ -92,7 +92,7 @@ impl OrganizationsAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_pager_duty_integration.rs

@@ -73,7 +73,7 @@ impl PagerDutyIntegrationAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_security_monitoring.rs

@@ -65,7 +65,7 @@ impl SecurityMonitoringAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_service_checks.rs

@@ -44,7 +44,7 @@ impl ServiceChecksAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_service_level_objective_corrections.rs

@@ -108,7 +108,7 @@ impl ServiceLevelObjectiveCorrectionsAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_service_level_objectives.rs

@@ -289,7 +289,7 @@ impl ServiceLevelObjectivesAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_slack_integration.rs

@@ -87,7 +87,7 @@ impl SlackIntegrationAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_snapshots.rs

@@ -97,7 +97,7 @@ impl SnapshotsAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_synthetics.rs

@@ -404,7 +404,7 @@ impl SyntheticsAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_tags.rs

@@ -168,7 +168,7 @@ impl TagsAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_usage_metering.rs

@@ -1209,7 +1209,7 @@ impl UsageMeteringAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_users.rs

@@ -84,7 +84,7 @@ impl UsersAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV1/api/api_webhooks_integration.rs

@@ -116,7 +116,7 @@ impl WebhooksIntegrationAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }

src/datadogV2/api/api_apm_retention_filters.rs

@@ -93,7 +93,7 @@ impl APMRetentionFiltersAPI {
             reqwest_client_builder = reqwest_client_builder.proxy(proxy);
         }
 
-        let mut middleware_client_builder =
+        let middleware_client_builder =
             reqwest_middleware::ClientBuilder::new(reqwest_client_builder.build().unwrap());
         let client = middleware_client_builder.build();
         Self { config, client }