Fix optional body setting in requests (#2007)

* handle optional body setting * pre-commit fixes --------- Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com>
DataDog · May 23, 2023 · a99cd7f · a99cd7f
1 parent cda7491
commit a99cd7f
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 7 deletions.
diff --git a/.generator/src/generator/templates/api.j2 b/.generator/src/generator/templates/api.j2
@@ -230,8 +230,15 @@ localVarQueryParams.Add("{{ parameter.name }}", {{ common_package_name }}.Parame
     {%- set isBodyOptional = False if "required" in operation.requestBody and operation.requestBody.required else True %}
 
 	// body params
-	localVarPostBody = &{% if isBodyOptional %}optionalParams.{{ operation.get("x-codegen-request-body-name", "body")|attribute_name }}{% else %}{{ operation.get("x-codegen-request-body-name", "body")|variable_name }}{% endif %}
+	{%- if isBodyOptional %}
+	if optionalParams.Body != nil {
+		localVarPostBody = &optionalParams.{{ operation.get("x-codegen-request-body-name", "body")|attribute_name }}
+	}
+	{%- else %}
+	localVarPostBody = &{{ operation.get("x-codegen-request-body-name", "body")|variable_name }}
 	{%- endif %}
+	{%- endif %}
+
 	{%- set authMethods = operation.security if "security" in operation else openapi.security %}
 	{%- if authMethods %}
         {{ common_package_name }}.SetAuthKeys(

diff --git a/api/datadogV2/api_audit.go b/api/datadogV2/api_audit.go
@@ -280,7 +280,9 @@ func (a *AuditApi) SearchAuditLogs(ctx _context.Context, o ...SearchAuditLogsOpt
 	localVarHeaderParams["Accept"] = "application/json"
 
 	// body params
-	localVarPostBody = &optionalParams.Body
+	if optionalParams.Body != nil {
+		localVarPostBody = &optionalParams.Body
+	}
 	datadog.SetAuthKeys(
 		ctx,
 		&localVarHeaderParams,

diff --git a/api/datadogV2/api_ci_visibility_pipelines.go b/api/datadogV2/api_ci_visibility_pipelines.go
@@ -349,7 +349,9 @@ func (a *CIVisibilityPipelinesApi) SearchCIAppPipelineEvents(ctx _context.Contex
 	localVarHeaderParams["Accept"] = "application/json"
 
 	// body params
-	localVarPostBody = &optionalParams.Body
+	if optionalParams.Body != nil {
+		localVarPostBody = &optionalParams.Body
+	}
 	datadog.SetAuthKeys(
 		ctx,
 		&localVarHeaderParams,

diff --git a/api/datadogV2/api_ci_visibility_tests.go b/api/datadogV2/api_ci_visibility_tests.go
@@ -349,7 +349,9 @@ func (a *CIVisibilityTestsApi) SearchCIAppTestEvents(ctx _context.Context, o ...
 	localVarHeaderParams["Accept"] = "application/json"
 
 	// body params
-	localVarPostBody = &optionalParams.Body
+	if optionalParams.Body != nil {
+		localVarPostBody = &optionalParams.Body
+	}
 	datadog.SetAuthKeys(
 		ctx,
 		&localVarHeaderParams,

diff --git a/api/datadogV2/api_events.go b/api/datadogV2/api_events.go
@@ -291,7 +291,9 @@ func (a *EventsApi) SearchEvents(ctx _context.Context, o ...SearchEventsOptional
 	localVarHeaderParams["Accept"] = "application/json"
 
 	// body params
-	localVarPostBody = &optionalParams.Body
+	if optionalParams.Body != nil {
+		localVarPostBody = &optionalParams.Body
+	}
 	datadog.SetAuthKeys(
 		ctx,
 		&localVarHeaderParams,

diff --git a/api/datadogV2/api_logs.go b/api/datadogV2/api_logs.go
@@ -147,7 +147,9 @@ func (a *LogsApi) ListLogs(ctx _context.Context, o ...ListLogsOptionalParameters
 	localVarHeaderParams["Accept"] = "application/json"
 
 	// body params
-	localVarPostBody = &optionalParams.Body
+	if optionalParams.Body != nil {
+		localVarPostBody = &optionalParams.Body
+	}
 	datadog.SetAuthKeys(
 		ctx,
 		&localVarHeaderParams,

diff --git a/api/datadogV2/api_security_monitoring.go b/api/datadogV2/api_security_monitoring.go
@@ -1571,7 +1571,9 @@ func (a *SecurityMonitoringApi) SearchSecurityMonitoringSignals(ctx _context.Con
 	localVarHeaderParams["Accept"] = "application/json"
 
 	// body params
-	localVarPostBody = &optionalParams.Body
+	if optionalParams.Body != nil {
+		localVarPostBody = &optionalParams.Body
+	}
 	datadog.SetAuthKeys(
 		ctx,
 		&localVarHeaderParams,