Skip to content

Create an utility to read response bodies #1836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 25, 2023
Merged

Create an utility to read response bodies #1836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba3e6a9
Create an utility to read response bodies
therve Jan 25, 2023
9ad0caa
Merge branch 'master' into therve/read-body
therve Jan 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .generator/src/generator/templates/api.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,9 +409,7 @@ localVarQueryParams.Add("{{ parameter.name }}", {{ common_package_name }}.Parame
return {% if returnType %}localVarReturnValue, {% endif %}localVarHTTPResponse, err
}

localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body)
localVarHTTPResponse.Body.Close()
localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody))
localVarBody, err := datadog.ReadBody(localVarHTTPResponse)
if err != nil {
return {% if returnType %}localVarReturnValue, {% endif %}localVarHTTPResponse, err
}
Expand Down
9 changes: 9 additions & 0 deletions .generator/src/generator/templates/client.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ type Service struct {
Client *APIClient
}

// SetAuthKeys sets the appropriate values in the headers parameter.
func SetAuthKeys(ctx context.Context, headerParams *map[string]string, keys ...[2]string) {
if ctx != nil {
for _, key := range keys {
Expand All @@ -63,6 +64,14 @@ func SetAuthKeys(ctx context.Context, headerParams *map[string]string, keys ...[
}
}

// ReadBody returns the byte content of the response and make it available again on the response object.
func ReadBody(response *http.Response) ([]byte, error) {
body, err := io.ReadAll(response.Body)
response.Body.Close()
response.Body = io.NopCloser(bytes.NewBuffer(body))
return body, err
}

// NewAPIClient creates a new API client. Requires a userAgent string describing your application.
// optionally a custom http.Client to allow for advanced features such as caching.
func NewAPIClient(cfg *Configuration) *APIClient {
Expand Down
9 changes: 9 additions & 0 deletions api/datadog/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ type Service struct {
Client *APIClient
}

// SetAuthKeys sets the appropriate values in the headers parameter.
func SetAuthKeys(ctx context.Context, headerParams *map[string]string, keys ...[2]string) {
if ctx != nil {
for _, key := range keys {
Expand All @@ -64,6 +65,14 @@ func SetAuthKeys(ctx context.Context, headerParams *map[string]string, keys ...[
}
}

// ReadBody returns the byte content of the response and make it available again on the response object.
func ReadBody(response *http.Response) ([]byte, error) {
body, err := io.ReadAll(response.Body)
response.Body.Close()
response.Body = io.NopCloser(bytes.NewBuffer(body))
return body, err
}

// NewAPIClient creates a new API client. Requires a userAgent string describing your application.
// optionally a custom http.Client to allow for advanced features such as caching.
func NewAPIClient(cfg *Configuration) *APIClient {
Expand Down
6 changes: 1 addition & 5 deletions api/datadogV1/api_authentication.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
package datadogV1

import (
"bytes"
_context "context"
_io "io"
_nethttp "net/http"
_neturl "net/url"

Expand Down Expand Up @@ -75,9 +73,7 @@ func (a *AuthenticationApi) validateExecute(r apiValidateRequest) (Authenticatio
return localVarReturnValue, localVarHTTPResponse, err
}

localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body)
localVarHTTPResponse.Body.Close()
localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody))
localVarBody, err := datadog.ReadBody(localVarHTTPResponse)
if err != nil {
return localVarReturnValue, localVarHTTPResponse, err
}
Expand Down
38 changes: 9 additions & 29 deletions api/datadogV1/api_aws_integration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
package datadogV1

import (
"bytes"
_context "context"
_io "io"
_nethttp "net/http"
_neturl "net/url"

Expand Down Expand Up @@ -87,9 +85,7 @@ func (a *AWSIntegrationApi) createAWSAccountExecute(r apiCreateAWSAccountRequest
return localVarReturnValue, localVarHTTPResponse, err
}

localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body)
localVarHTTPResponse.Body.Close()
localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody))
localVarBody, err := datadog.ReadBody(localVarHTTPResponse)
if err != nil {
return localVarReturnValue, localVarHTTPResponse, err
}
Expand Down Expand Up @@ -189,9 +185,7 @@ func (a *AWSIntegrationApi) createAWSTagFilterExecute(r apiCreateAWSTagFilterReq
return localVarReturnValue, localVarHTTPResponse, err
}

localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body)
localVarHTTPResponse.Body.Close()
localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody))
localVarBody, err := datadog.ReadBody(localVarHTTPResponse)
if err != nil {
return localVarReturnValue, localVarHTTPResponse, err
}
Expand Down Expand Up @@ -291,9 +285,7 @@ func (a *AWSIntegrationApi) createNewAWSExternalIDExecute(r apiCreateNewAWSExter
return localVarReturnValue, localVarHTTPResponse, err
}

localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body)
localVarHTTPResponse.Body.Close()
localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody))
localVarBody, err := datadog.ReadBody(localVarHTTPResponse)
if err != nil {
return localVarReturnValue, localVarHTTPResponse, err
}
Expand Down Expand Up @@ -393,9 +385,7 @@ func (a *AWSIntegrationApi) deleteAWSAccountExecute(r apiDeleteAWSAccountRequest
return localVarReturnValue, localVarHTTPResponse, err
}

localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body)
localVarHTTPResponse.Body.Close()
localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody))
localVarBody, err := datadog.ReadBody(localVarHTTPResponse)
if err != nil {
return localVarReturnValue, localVarHTTPResponse, err
}
Expand Down Expand Up @@ -495,9 +485,7 @@ func (a *AWSIntegrationApi) deleteAWSTagFilterExecute(r apiDeleteAWSTagFilterReq
return localVarReturnValue, localVarHTTPResponse, err
}

localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body)
localVarHTTPResponse.Body.Close()
localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody))
localVarBody, err := datadog.ReadBody(localVarHTTPResponse)
if err != nil {
return localVarReturnValue, localVarHTTPResponse, err
}
Expand Down Expand Up @@ -642,9 +630,7 @@ func (a *AWSIntegrationApi) listAWSAccountsExecute(r apiListAWSAccountsRequest)
return localVarReturnValue, localVarHTTPResponse, err
}

localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body)
localVarHTTPResponse.Body.Close()
localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody))
localVarBody, err := datadog.ReadBody(localVarHTTPResponse)
if err != nil {
return localVarReturnValue, localVarHTTPResponse, err
}
Expand Down Expand Up @@ -742,9 +728,7 @@ func (a *AWSIntegrationApi) listAWSTagFiltersExecute(r apiListAWSTagFiltersReque
return localVarReturnValue, localVarHTTPResponse, err
}

localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body)
localVarHTTPResponse.Body.Close()
localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody))
localVarBody, err := datadog.ReadBody(localVarHTTPResponse)
if err != nil {
return localVarReturnValue, localVarHTTPResponse, err
}
Expand Down Expand Up @@ -836,9 +820,7 @@ func (a *AWSIntegrationApi) listAvailableAWSNamespacesExecute(r apiListAvailable
return localVarReturnValue, localVarHTTPResponse, err
}

localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body)
localVarHTTPResponse.Body.Close()
localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody))
localVarBody, err := datadog.ReadBody(localVarHTTPResponse)
if err != nil {
return localVarReturnValue, localVarHTTPResponse, err
}
Expand Down Expand Up @@ -991,9 +973,7 @@ func (a *AWSIntegrationApi) updateAWSAccountExecute(r apiUpdateAWSAccountRequest
return localVarReturnValue, localVarHTTPResponse, err
}

localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body)
localVarHTTPResponse.Body.Close()
localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody))
localVarBody, err := datadog.ReadBody(localVarHTTPResponse)
if err != nil {
return localVarReturnValue, localVarHTTPResponse, err
}
Expand Down
30 changes: 7 additions & 23 deletions api/datadogV1/api_aws_logs_integration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
package datadogV1

import (
"bytes"
_context "context"
_io "io"
_nethttp "net/http"
_neturl "net/url"

Expand Down Expand Up @@ -91,9 +89,7 @@ func (a *AWSLogsIntegrationApi) checkAWSLogsLambdaAsyncExecute(r apiCheckAWSLogs
return localVarReturnValue, localVarHTTPResponse, err
}

localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body)
localVarHTTPResponse.Body.Close()
localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody))
localVarBody, err := datadog.ReadBody(localVarHTTPResponse)
if err != nil {
return localVarReturnValue, localVarHTTPResponse, err
}
Expand Down Expand Up @@ -202,9 +198,7 @@ func (a *AWSLogsIntegrationApi) checkAWSLogsServicesAsyncExecute(r apiCheckAWSLo
return localVarReturnValue, localVarHTTPResponse, err
}

localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body)
localVarHTTPResponse.Body.Close()
localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody))
localVarBody, err := datadog.ReadBody(localVarHTTPResponse)
if err != nil {
return localVarReturnValue, localVarHTTPResponse, err
}
Expand Down Expand Up @@ -304,9 +298,7 @@ func (a *AWSLogsIntegrationApi) createAWSLambdaARNExecute(r apiCreateAWSLambdaAR
return localVarReturnValue, localVarHTTPResponse, err
}

localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body)
localVarHTTPResponse.Body.Close()
localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody))
localVarBody, err := datadog.ReadBody(localVarHTTPResponse)
if err != nil {
return localVarReturnValue, localVarHTTPResponse, err
}
Expand Down Expand Up @@ -406,9 +398,7 @@ func (a *AWSLogsIntegrationApi) deleteAWSLambdaARNExecute(r apiDeleteAWSLambdaAR
return localVarReturnValue, localVarHTTPResponse, err
}

localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body)
localVarHTTPResponse.Body.Close()
localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody))
localVarBody, err := datadog.ReadBody(localVarHTTPResponse)
if err != nil {
return localVarReturnValue, localVarHTTPResponse, err
}
Expand Down Expand Up @@ -508,9 +498,7 @@ func (a *AWSLogsIntegrationApi) enableAWSLogServicesExecute(r apiEnableAWSLogSer
return localVarReturnValue, localVarHTTPResponse, err
}

localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body)
localVarHTTPResponse.Body.Close()
localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody))
localVarBody, err := datadog.ReadBody(localVarHTTPResponse)
if err != nil {
return localVarReturnValue, localVarHTTPResponse, err
}
Expand Down Expand Up @@ -602,9 +590,7 @@ func (a *AWSLogsIntegrationApi) listAWSLogsIntegrationsExecute(r apiListAWSLogsI
return localVarReturnValue, localVarHTTPResponse, err
}

localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body)
localVarHTTPResponse.Body.Close()
localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody))
localVarBody, err := datadog.ReadBody(localVarHTTPResponse)
if err != nil {
return localVarReturnValue, localVarHTTPResponse, err
}
Expand Down Expand Up @@ -696,9 +682,7 @@ func (a *AWSLogsIntegrationApi) listAWSLogsServicesExecute(r apiListAWSLogsServi
return localVarReturnValue, localVarHTTPResponse, err
}

localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body)
localVarHTTPResponse.Body.Close()
localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody))
localVarBody, err := datadog.ReadBody(localVarHTTPResponse)
if err != nil {
return localVarReturnValue, localVarHTTPResponse, err
}
Expand Down
22 changes: 5 additions & 17 deletions api/datadogV1/api_azure_integration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
package datadogV1

import (
"bytes"
_context "context"
_io "io"
_nethttp "net/http"
_neturl "net/url"

Expand Down Expand Up @@ -90,9 +88,7 @@ func (a *AzureIntegrationApi) createAzureIntegrationExecute(r apiCreateAzureInte
return localVarReturnValue, localVarHTTPResponse, err
}

localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body)
localVarHTTPResponse.Body.Close()
localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody))
localVarBody, err := datadog.ReadBody(localVarHTTPResponse)
if err != nil {
return localVarReturnValue, localVarHTTPResponse, err
}
Expand Down Expand Up @@ -192,9 +188,7 @@ func (a *AzureIntegrationApi) deleteAzureIntegrationExecute(r apiDeleteAzureInte
return localVarReturnValue, localVarHTTPResponse, err
}

localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body)
localVarHTTPResponse.Body.Close()
localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody))
localVarBody, err := datadog.ReadBody(localVarHTTPResponse)
if err != nil {
return localVarReturnValue, localVarHTTPResponse, err
}
Expand Down Expand Up @@ -286,9 +280,7 @@ func (a *AzureIntegrationApi) listAzureIntegrationExecute(r apiListAzureIntegrat
return localVarReturnValue, localVarHTTPResponse, err
}

localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body)
localVarHTTPResponse.Body.Close()
localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody))
localVarBody, err := datadog.ReadBody(localVarHTTPResponse)
if err != nil {
return localVarReturnValue, localVarHTTPResponse, err
}
Expand Down Expand Up @@ -388,9 +380,7 @@ func (a *AzureIntegrationApi) updateAzureHostFiltersExecute(r apiUpdateAzureHost
return localVarReturnValue, localVarHTTPResponse, err
}

localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body)
localVarHTTPResponse.Body.Close()
localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody))
localVarBody, err := datadog.ReadBody(localVarHTTPResponse)
if err != nil {
return localVarReturnValue, localVarHTTPResponse, err
}
Expand Down Expand Up @@ -492,9 +482,7 @@ func (a *AzureIntegrationApi) updateAzureIntegrationExecute(r apiUpdateAzureInte
return localVarReturnValue, localVarHTTPResponse, err
}

localVarBody, err := _io.ReadAll(localVarHTTPResponse.Body)
localVarHTTPResponse.Body.Close()
localVarHTTPResponse.Body = _io.NopCloser(bytes.NewBuffer(localVarBody))
localVarBody, err := datadog.ReadBody(localVarHTTPResponse)
if err != nil {
return localVarReturnValue, localVarHTTPResponse, err
}
Expand Down
Loading