reduce duplication in api import path

Author: nkzou

.generator/src/generator/formatter.py

@@ -307,7 +307,7 @@ def format_parameters(data, spec, replace_values=None, has_body=False, **kwargs)
     if has_body and body_is_required:
         parameters += "body, "
     if has_optional or body_is_required is False:
-        imports.add(f"datadog_api_client::datadog{kwargs.get('version', '')}::api::api_{kwargs.get('api')}::{spec['operationId']}OptionalParams")
+        imports.add(f"datadog_api_client::datadog{kwargs.get('version', '')}::api_{kwargs.get('api')}::{spec['operationId']}OptionalParams")
         parameters += f"{spec['operationId']}OptionalParams::default()"
         if has_body and not body_is_required:
             parameters += ".body(body)"

.generator/src/generator/templates/example.j2

@@ -6,7 +6,7 @@
 {%- set body, imports = format_data_with_schema(context.body.value, context.api_request.schema.spec, replace_values=context._replace_values, required=True, variables=variables, version=version|upper, imports=imports)%}
 {%- endif %}
 use datadog_api_client::datadog;
-use datadog_api_client::datadog{{ version|upper }}::api::api_{{context["api_instance"]["name"] | snake_case}}::{{context["api_instance"]["name"]}}API;
+use datadog_api_client::datadog{{ version|upper }}::api_{{context["api_instance"]["name"] | snake_case}}::{{context["api_instance"]["name"]}}API;
 {%- for name in imports %}
 use {{name}};
 {%- endfor %}

.generator/src/generator/templates/mod.j2

@@ -1,4 +1,8 @@
 {% include "partial_header.j2" %}
 
 pub mod api;
+{%- for name, operations in apis.items() %}
+{%- set classname = "api_"+name%}
+pub use self::api::{{classname | snake_case}};
+{%- endfor %}
 pub mod model;

examples/v1_authentication_validate.rs

@@ -1,6 +1,6 @@
 // Validate API key returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_authentication::AuthenticationAPI;
+use datadog_api_client::datadogV1::api_authentication::AuthenticationAPI;
 
 #[tokio::main]
 async fn main() {

examples/v1_aws-integration_create_aws_account.rs

@@ -1,6 +1,6 @@
 // Create an AWS integration returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_aws_integration::AWSIntegrationAPI;
+use datadog_api_client::datadogV1::api_aws_integration::AWSIntegrationAPI;
 use datadog_api_client::datadogV1::model::AWSAccount;
 use std::collections::BTreeMap;
 

examples/v1_aws-integration_create_aws_event_bridge_source.rs

@@ -1,6 +1,6 @@
 // Create an Amazon EventBridge source returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_aws_integration::AWSIntegrationAPI;
+use datadog_api_client::datadogV1::api_aws_integration::AWSIntegrationAPI;
 use datadog_api_client::datadogV1::model::AWSEventBridgeCreateRequest;
 
 #[tokio::main]

examples/v1_aws-integration_create_aws_tag_filter.rs

@@ -1,6 +1,6 @@
 // Set an AWS tag filter returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_aws_integration::AWSIntegrationAPI;
+use datadog_api_client::datadogV1::api_aws_integration::AWSIntegrationAPI;
 use datadog_api_client::datadogV1::model::AWSNamespace;
 use datadog_api_client::datadogV1::model::AWSTagFilterCreateRequest;
 

examples/v1_aws-integration_create_new_aws_external_id.rs

@@ -1,6 +1,6 @@
 // Generate a new external ID returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_aws_integration::AWSIntegrationAPI;
+use datadog_api_client::datadogV1::api_aws_integration::AWSIntegrationAPI;
 use datadog_api_client::datadogV1::model::AWSAccount;
 use std::collections::BTreeMap;
 

examples/v1_aws-integration_delete_aws_account.rs

@@ -1,6 +1,6 @@
 // Delete an AWS integration returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_aws_integration::AWSIntegrationAPI;
+use datadog_api_client::datadogV1::api_aws_integration::AWSIntegrationAPI;
 use datadog_api_client::datadogV1::model::AWSAccountDeleteRequest;
 
 #[tokio::main]

examples/v1_aws-integration_delete_aws_event_bridge_source.rs

@@ -1,6 +1,6 @@
 // Delete an Amazon EventBridge source returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_aws_integration::AWSIntegrationAPI;
+use datadog_api_client::datadogV1::api_aws_integration::AWSIntegrationAPI;
 use datadog_api_client::datadogV1::model::AWSEventBridgeDeleteRequest;
 
 #[tokio::main]

examples/v1_aws-integration_delete_aws_tag_filter.rs

@@ -1,6 +1,6 @@
 // Delete a tag filtering entry returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_aws_integration::AWSIntegrationAPI;
+use datadog_api_client::datadogV1::api_aws_integration::AWSIntegrationAPI;
 use datadog_api_client::datadogV1::model::AWSNamespace;
 use datadog_api_client::datadogV1::model::AWSTagFilterDeleteRequest;
 

examples/v1_aws-integration_list_available_aws_namespaces.rs

@@ -1,6 +1,6 @@
 // List namespace rules returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_aws_integration::AWSIntegrationAPI;
+use datadog_api_client::datadogV1::api_aws_integration::AWSIntegrationAPI;
 
 #[tokio::main]
 async fn main() {

examples/v1_aws-integration_list_aws_accounts.rs

@@ -1,7 +1,7 @@
 // List all AWS integrations returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_aws_integration::AWSIntegrationAPI;
-use datadog_api_client::datadogV1::api::api_aws_integration::ListAWSAccountsOptionalParams;
+use datadog_api_client::datadogV1::api_aws_integration::AWSIntegrationAPI;
+use datadog_api_client::datadogV1::api_aws_integration::ListAWSAccountsOptionalParams;
 
 #[tokio::main]
 async fn main() {

examples/v1_aws-integration_list_aws_event_bridge_sources.rs

@@ -1,6 +1,6 @@
 // Get all Amazon EventBridge sources returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_aws_integration::AWSIntegrationAPI;
+use datadog_api_client::datadogV1::api_aws_integration::AWSIntegrationAPI;
 
 #[tokio::main]
 async fn main() {

examples/v1_aws-integration_list_aws_tag_filters.rs

@@ -1,6 +1,6 @@
 // Get all AWS tag filters returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_aws_integration::AWSIntegrationAPI;
+use datadog_api_client::datadogV1::api_aws_integration::AWSIntegrationAPI;
 
 #[tokio::main]
 async fn main() {

examples/v1_aws-integration_update_aws_account.rs

@@ -1,7 +1,7 @@
 // Update an AWS integration returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_aws_integration::AWSIntegrationAPI;
-use datadog_api_client::datadogV1::api::api_aws_integration::UpdateAWSAccountOptionalParams;
+use datadog_api_client::datadogV1::api_aws_integration::AWSIntegrationAPI;
+use datadog_api_client::datadogV1::api_aws_integration::UpdateAWSAccountOptionalParams;
 use datadog_api_client::datadogV1::model::AWSAccount;
 use std::collections::BTreeMap;
 

examples/v1_aws-logs-integration_check_aws_logs_lambda_async.rs

@@ -1,6 +1,6 @@
 // Check that an AWS Lambda Function exists returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_aws_logs_integration::AWSLogsIntegrationAPI;
+use datadog_api_client::datadogV1::api_aws_logs_integration::AWSLogsIntegrationAPI;
 use datadog_api_client::datadogV1::model::AWSAccountAndLambdaRequest;
 
 #[tokio::main]

examples/v1_aws-logs-integration_check_aws_logs_services_async.rs

@@ -1,6 +1,6 @@
 // Check permissions for log services returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_aws_logs_integration::AWSLogsIntegrationAPI;
+use datadog_api_client::datadogV1::api_aws_logs_integration::AWSLogsIntegrationAPI;
 use datadog_api_client::datadogV1::model::AWSLogsServicesRequest;
 
 #[tokio::main]

examples/v1_aws-logs-integration_create_aws_lambda_arn.rs

@@ -1,6 +1,6 @@
 // Add AWS Log Lambda ARN returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_aws_logs_integration::AWSLogsIntegrationAPI;
+use datadog_api_client::datadogV1::api_aws_logs_integration::AWSLogsIntegrationAPI;
 use datadog_api_client::datadogV1::model::AWSAccountAndLambdaRequest;
 
 #[tokio::main]

examples/v1_aws-logs-integration_delete_aws_lambda_arn.rs

@@ -1,6 +1,6 @@
 // Delete an AWS Logs integration returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_aws_logs_integration::AWSLogsIntegrationAPI;
+use datadog_api_client::datadogV1::api_aws_logs_integration::AWSLogsIntegrationAPI;
 use datadog_api_client::datadogV1::model::AWSAccountAndLambdaRequest;
 
 #[tokio::main]

examples/v1_aws-logs-integration_enable_aws_log_services.rs

@@ -1,6 +1,6 @@
 // Enable an AWS Logs integration returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_aws_logs_integration::AWSLogsIntegrationAPI;
+use datadog_api_client::datadogV1::api_aws_logs_integration::AWSLogsIntegrationAPI;
 use datadog_api_client::datadogV1::model::AWSLogsServicesRequest;
 
 #[tokio::main]

examples/v1_aws-logs-integration_list_aws_logs_integrations.rs

@@ -1,6 +1,6 @@
 // List all AWS Logs integrations returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_aws_logs_integration::AWSLogsIntegrationAPI;
+use datadog_api_client::datadogV1::api_aws_logs_integration::AWSLogsIntegrationAPI;
 
 #[tokio::main]
 async fn main() {

examples/v1_aws-logs-integration_list_aws_logs_services.rs

@@ -1,6 +1,6 @@
 // Get list of AWS log ready services returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_aws_logs_integration::AWSLogsIntegrationAPI;
+use datadog_api_client::datadogV1::api_aws_logs_integration::AWSLogsIntegrationAPI;
 
 #[tokio::main]
 async fn main() {

examples/v1_azure-integration_create_azure_integration.rs

@@ -1,6 +1,6 @@
 // Create an Azure integration returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_azure_integration::AzureIntegrationAPI;
+use datadog_api_client::datadogV1::api_azure_integration::AzureIntegrationAPI;
 use datadog_api_client::datadogV1::model::AzureAccount;
 
 #[tokio::main]

examples/v1_azure-integration_delete_azure_integration.rs

@@ -1,6 +1,6 @@
 // Delete an Azure integration returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_azure_integration::AzureIntegrationAPI;
+use datadog_api_client::datadogV1::api_azure_integration::AzureIntegrationAPI;
 use datadog_api_client::datadogV1::model::AzureAccount;
 
 #[tokio::main]

examples/v1_azure-integration_list_azure_integration.rs

@@ -1,6 +1,6 @@
 // List all Azure integrations returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_azure_integration::AzureIntegrationAPI;
+use datadog_api_client::datadogV1::api_azure_integration::AzureIntegrationAPI;
 
 #[tokio::main]
 async fn main() {

examples/v1_azure-integration_update_azure_host_filters.rs

@@ -1,6 +1,6 @@
 // Update Azure integration host filters returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_azure_integration::AzureIntegrationAPI;
+use datadog_api_client::datadogV1::api_azure_integration::AzureIntegrationAPI;
 use datadog_api_client::datadogV1::model::AzureAccount;
 
 #[tokio::main]

examples/v1_azure-integration_update_azure_integration.rs

@@ -1,6 +1,6 @@
 // Update an Azure integration returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_azure_integration::AzureIntegrationAPI;
+use datadog_api_client::datadogV1::api_azure_integration::AzureIntegrationAPI;
 use datadog_api_client::datadogV1::model::AzureAccount;
 
 #[tokio::main]

examples/v1_dashboard-lists_create_dashboard_list.rs

@@ -1,6 +1,6 @@
 // Create a dashboard list returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_dashboard_lists::DashboardListsAPI;
+use datadog_api_client::datadogV1::api_dashboard_lists::DashboardListsAPI;
 use datadog_api_client::datadogV1::model::DashboardList;
 
 #[tokio::main]

examples/v1_dashboard-lists_delete_dashboard_list.rs

@@ -1,6 +1,6 @@
 // Delete a dashboard list returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_dashboard_lists::DashboardListsAPI;
+use datadog_api_client::datadogV1::api_dashboard_lists::DashboardListsAPI;
 
 #[tokio::main]
 async fn main() {

examples/v1_dashboard-lists_get_dashboard_list.rs

@@ -1,6 +1,6 @@
 // Get a dashboard list returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_dashboard_lists::DashboardListsAPI;
+use datadog_api_client::datadogV1::api_dashboard_lists::DashboardListsAPI;
 
 #[tokio::main]
 async fn main() {

examples/v1_dashboard-lists_list_dashboard_lists.rs

@@ -1,6 +1,6 @@
 // Get all dashboard lists returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_dashboard_lists::DashboardListsAPI;
+use datadog_api_client::datadogV1::api_dashboard_lists::DashboardListsAPI;
 
 #[tokio::main]
 async fn main() {

examples/v1_dashboard-lists_update_dashboard_list.rs

@@ -1,6 +1,6 @@
 // Update a dashboard list returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_dashboard_lists::DashboardListsAPI;
+use datadog_api_client::datadogV1::api_dashboard_lists::DashboardListsAPI;
 use datadog_api_client::datadogV1::model::DashboardList;
 
 #[tokio::main]

examples/v1_dashboards_create_dashboard.rs

@@ -1,6 +1,6 @@
 // Create a new dashboard returns "OK" response
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_dashboards::DashboardsAPI;
+use datadog_api_client::datadogV1::api_dashboards::DashboardsAPI;
 use datadog_api_client::datadogV1::model::Dashboard;
 use datadog_api_client::datadogV1::model::DashboardLayoutType;
 use datadog_api_client::datadogV1::model::LogQueryDefinition;

examples/v1_dashboards_create_dashboard_1024858348.rs

@@ -1,6 +1,6 @@
 // Create a new dashboard with a formulas and functions treemap widget
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_dashboards::DashboardsAPI;
+use datadog_api_client::datadogV1::api_dashboards::DashboardsAPI;
 use datadog_api_client::datadogV1::model::Dashboard;
 use datadog_api_client::datadogV1::model::DashboardLayoutType;
 use datadog_api_client::datadogV1::model::FormulaAndFunctionEventAggregation;

examples/v1_dashboards_create_dashboard_1039800684.rs

@@ -1,6 +1,6 @@
 // Create a new dashboard with logs_pattern_stream list_stream widget
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_dashboards::DashboardsAPI;
+use datadog_api_client::datadogV1::api_dashboards::DashboardsAPI;
 use datadog_api_client::datadogV1::model::Dashboard;
 use datadog_api_client::datadogV1::model::DashboardLayoutType;
 use datadog_api_client::datadogV1::model::ListStreamColumn;

examples/v1_dashboards_create_dashboard_109450134.rs

@@ -1,6 +1,6 @@
 // Create a new dashboard with slo list widget with sort
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_dashboards::DashboardsAPI;
+use datadog_api_client::datadogV1::api_dashboards::DashboardsAPI;
 use datadog_api_client::datadogV1::model::Dashboard;
 use datadog_api_client::datadogV1::model::DashboardLayoutType;
 use datadog_api_client::datadogV1::model::SLOListWidgetDefinition;

examples/v1_dashboards_create_dashboard_1094917386.rs

@@ -1,6 +1,6 @@
 // Create a new dashboard with manage_status widget and show_priority parameter
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_dashboards::DashboardsAPI;
+use datadog_api_client::datadogV1::api_dashboards::DashboardsAPI;
 use datadog_api_client::datadogV1::model::Dashboard;
 use datadog_api_client::datadogV1::model::DashboardLayoutType;
 use datadog_api_client::datadogV1::model::MonitorSummaryWidgetDefinition;

examples/v1_dashboards_create_dashboard_1177423752.rs

@@ -1,6 +1,6 @@
 // Create a new dashboard with heatmap widget
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_dashboards::DashboardsAPI;
+use datadog_api_client::datadogV1::api_dashboards::DashboardsAPI;
 use datadog_api_client::datadogV1::model::Dashboard;
 use datadog_api_client::datadogV1::model::DashboardLayoutType;
 use datadog_api_client::datadogV1::model::HeatMapWidgetDefinition;

examples/v1_dashboards_create_dashboard_1200099236.rs

@@ -1,6 +1,6 @@
 // Create a new dashboard with hostmap widget
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_dashboards::DashboardsAPI;
+use datadog_api_client::datadogV1::api_dashboards::DashboardsAPI;
 use datadog_api_client::datadogV1::model::Dashboard;
 use datadog_api_client::datadogV1::model::DashboardLayoutType;
 use datadog_api_client::datadogV1::model::HostMapRequest;

examples/v1_dashboards_create_dashboard_1213075383.rs

@@ -1,6 +1,6 @@
 // Create a new dashboard with toplist widget
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_dashboards::DashboardsAPI;
+use datadog_api_client::datadogV1::api_dashboards::DashboardsAPI;
 use datadog_api_client::datadogV1::model::Dashboard;
 use datadog_api_client::datadogV1::model::DashboardLayoutType;
 use datadog_api_client::datadogV1::model::FormulaAndFunctionMetricAggregation;

examples/v1_dashboards_create_dashboard_1284514532.rs

@@ -1,7 +1,7 @@
 // Create a new dashboard with a timeseries widget using formulas and functions
 // cloud cost query
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_dashboards::DashboardsAPI;
+use datadog_api_client::datadogV1::api_dashboards::DashboardsAPI;
 use datadog_api_client::datadogV1::model::Dashboard;
 use datadog_api_client::datadogV1::model::DashboardLayoutType;
 use datadog_api_client::datadogV1::model::FormulaAndFunctionCloudCostDataSource;

examples/v1_dashboards_create_dashboard_1307120899.rs

@@ -1,6 +1,6 @@
 // Create a new timeseries widget with ci_tests data source
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_dashboards::DashboardsAPI;
+use datadog_api_client::datadogV1::api_dashboards::DashboardsAPI;
 use datadog_api_client::datadogV1::model::Dashboard;
 use datadog_api_client::datadogV1::model::DashboardLayoutType;
 use datadog_api_client::datadogV1::model::DashboardReflowType;

examples/v1_dashboards_create_dashboard_1423904722.rs

@@ -1,6 +1,6 @@
 // Create a new dashboard with slo list widget
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_dashboards::DashboardsAPI;
+use datadog_api_client::datadogV1::api_dashboards::DashboardsAPI;
 use datadog_api_client::datadogV1::model::Dashboard;
 use datadog_api_client::datadogV1::model::DashboardLayoutType;
 use datadog_api_client::datadogV1::model::SLOListWidgetDefinition;

examples/v1_dashboards_create_dashboard_1442588603.rs

@@ -1,7 +1,7 @@
 // Create a distribution widget using a histogram request containing a formulas
 // and functions APM Stats query
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_dashboards::DashboardsAPI;
+use datadog_api_client::datadogV1::api_dashboards::DashboardsAPI;
 use datadog_api_client::datadogV1::model::Dashboard;
 use datadog_api_client::datadogV1::model::DashboardLayoutType;
 use datadog_api_client::datadogV1::model::DistributionWidgetDefinition;

examples/v1_dashboards_create_dashboard_145494973.rs

@@ -1,6 +1,6 @@
 // Create a new dashboard with apm resource stats widget
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_dashboards::DashboardsAPI;
+use datadog_api_client::datadogV1::api_dashboards::DashboardsAPI;
 use datadog_api_client::datadogV1::model::Dashboard;
 use datadog_api_client::datadogV1::model::DashboardLayoutType;
 use datadog_api_client::datadogV1::model::FormulaAndFunctionApmResourceStatName;

examples/v1_dashboards_create_dashboard_173805046.rs

@@ -1,6 +1,6 @@
 // Create a new dashboard with slo widget
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_dashboards::DashboardsAPI;
+use datadog_api_client::datadogV1::api_dashboards::DashboardsAPI;
 use datadog_api_client::datadogV1::model::Dashboard;
 use datadog_api_client::datadogV1::model::DashboardLayoutType;
 use datadog_api_client::datadogV1::model::SLOWidgetDefinition;

examples/v1_dashboards_create_dashboard_1738608750.rs

@@ -1,6 +1,6 @@
 // Create a new dashboard with free_text widget
 use datadog_api_client::datadog;
-use datadog_api_client::datadogV1::api::api_dashboards::DashboardsAPI;
+use datadog_api_client::datadogV1::api_dashboards::DashboardsAPI;
 use datadog_api_client::datadogV1::model::Dashboard;
 use datadog_api_client::datadogV1::model::DashboardLayoutType;
 use datadog_api_client::datadogV1::model::FreeTextWidgetDefinition;