From 23b99e19df43111036b8d653d86d3514f581ac74 Mon Sep 17 00:00:00 2001 From: Sherzod Karimov Date: Tue, 15 Nov 2022 13:56:07 -0500 Subject: [PATCH 1/7] return error in pagination channel --- .generator/src/generator/templates/api.j2 | 19 +++++-- tests/api/datadogV2/api_processes_test.go | 29 ++++++++++ ...ProcessesWithPaginationReturnsError.freeze | 1 + ...etProcessesWithPaginationReturnsError.yaml | 53 +++++++++++++++++++ tests/test_utils.go | 1 + 5 files changed, 100 insertions(+), 3 deletions(-) create mode 100644 tests/api/datadogV2/api_processes_test.go create mode 100644 tests/api/datadogV2/cassettes/TestGetProcessesWithPaginationReturnsError.freeze create mode 100644 tests/api/datadogV2/cassettes/TestGetProcessesWithPaginationReturnsError.yaml diff --git a/.generator/src/generator/templates/api.j2 b/.generator/src/generator/templates/api.j2 index 254279f939a..3c4841514e7 100644 --- a/.generator/src/generator/templates/api.j2 +++ b/.generator/src/generator/templates/api.j2 @@ -103,7 +103,7 @@ func (a *{{ classname }}) {{ operation.operationId }}(ctx _context.Context{% for {%- set pagination = operation["x-pagination"] %} // {{ operation.operationId }}WithPagination provides a paginated version of {{ operation.operationId }} returning a channel with all items. {%- set itemType = get_type_at_path(operation, pagination.resultsPath) %} -func (a *{{ classname }}) {{ operation.operationId }}WithPagination(ctx _context.Context{% for name, parameter in operation|parameters if parameter.required or parameter.in == "path" %}, {{ name|variable_name}} {{ get_type_for_parameter(parameter) }}{% endfor %}{%- for name, parameter in operation|parameters if not parameter.required and parameter.in != "path" %}{%- if loop.first %}, o ...{{ operation.operationId }}OptionalParameters{% endif %}{% endfor %}) (<-chan {{ itemType }}, func(), error) { +func (a *{{ classname }}) {{ operation.operationId }}WithPagination(ctx _context.Context{% for name, parameter in operation|parameters if parameter.required or parameter.in == "path" %}, {{ name|variable_name}} {{ get_type_for_parameter(parameter) }}{% endfor %}{%- for name, parameter in operation|parameters if not parameter.required and parameter.in != "path" %}{%- if loop.first %}, o ...{{ operation.operationId }}OptionalParameters{% endif %}{% endfor %}) (<-chan struct { {{ itemType }}; error }, func(), error) { ctx, cancel := _context.WithCancel(ctx) {%- set pageSizeType = get_container_type(operation, pagination.limitParam) %} @@ -141,16 +141,26 @@ func (a *{{ classname }}) {{ operation.operationId }}WithPagination(ctx _context } {%- endfor %} - items := make(chan {{ itemType }}, pageSize_) + items := make(chan struct { {{ itemType }}; error }, pageSize_) go func() { for { req, err := a.build{{ operation.operationId }}Request(ctx{% for name, parameter in operation|parameters if parameter.required or parameter.in == "path" %}, {{ name|variable_name}}{% endfor %}{%- for name, parameter in operation|parameters if not parameter.required and parameter.in != "path" %}{%- if loop.first %}, o...{% endif %}{% endfor %}) if err != nil { + var returnItem {{ itemType }} + items <- struct { + {{ itemType }} + error + }{returnItem, err} break } resp, _, err := a.{{ operation.operationId|untitle_case }}Execute(req) if err != nil { + var returnItem {{ itemType }} + items <- struct { + {{ itemType }} + error + }{returnItem, err} break } {%- set previous = {"part": ""} %} @@ -167,7 +177,10 @@ func (a *{{ classname }}) {{ operation.operationId }}WithPagination(ctx _context for _, item := range results { select { - case items <- item: + case items <- struct { + {{ itemType }} + error + }{item, nil}: case <-ctx.Done(): close(items) return diff --git a/tests/api/datadogV2/api_processes_test.go b/tests/api/datadogV2/api_processes_test.go new file mode 100644 index 00000000000..59398ab2e2d --- /dev/null +++ b/tests/api/datadogV2/api_processes_test.go @@ -0,0 +1,29 @@ +package test + +import ( + "context" + "testing" + + "github.com/DataDog/datadog-api-client-go/v2/api/datadog" + "github.com/DataDog/datadog-api-client-go/v2/api/datadogV2" + "github.com/DataDog/datadog-api-client-go/v2/tests" +) + +func TestGetProcessesWithPaginationReturnsError(t *testing.T) { + ctx, finish := tests.WithTestSpan(context.Background(), t) + defer finish() + ctx, finish = WithRecorder(WithTestAuth(ctx), t) + defer finish() + assert := tests.Assert(ctx, t) + + client := Client(ctx) + api := datadogV2.NewProcessesApi(client) + + resp, _, _ := api.ListProcessesWithPagination(ctx, datadogV2.ListProcessesOptionalParameters{ + From: datadog.PtrInt64(1000), + To: datadog.PtrInt64(1000), + }) + + item := <-resp + assert.Equal(item.Error(), "400 Bad Request") +} diff --git a/tests/api/datadogV2/cassettes/TestGetProcessesWithPaginationReturnsError.freeze b/tests/api/datadogV2/cassettes/TestGetProcessesWithPaginationReturnsError.freeze new file mode 100644 index 00000000000..f2c1ad432a8 --- /dev/null +++ b/tests/api/datadogV2/cassettes/TestGetProcessesWithPaginationReturnsError.freeze @@ -0,0 +1 @@ +2022-11-15T13:13:59.275948-05:00 \ No newline at end of file diff --git a/tests/api/datadogV2/cassettes/TestGetProcessesWithPaginationReturnsError.yaml b/tests/api/datadogV2/cassettes/TestGetProcessesWithPaginationReturnsError.yaml new file mode 100644 index 00000000000..af08cad253b --- /dev/null +++ b/tests/api/datadogV2/cassettes/TestGetProcessesWithPaginationReturnsError.yaml @@ -0,0 +1,53 @@ +--- +version: 1 +interactions: +- request: + body: "" + form: {} + headers: + Accept: + - application/json + User-Agent: + - datadog-api-client-go/2.5.1+dev (go go1.19; os darwin; arch arm64) + X-Datadog-Parent-Id: + - "7384854714580948314" + X-Datadog-Sampling-Priority: + - "2" + X-Datadog-Trace-Id: + - "4605861229392013972" + url: https://api.datadoghq.com/api/v2/processes?from=1000&page%5Blimit%5D=1000&to=1000 + method: GET + response: + body: '{"errors":["Only data from the past 36 hours are available"]}' + headers: + Cache-Control: + - no-cache + Connection: + - keep-alive + Content-Type: + - application/json + Date: + - Tue, 15 Nov 2022 18:13:59 GMT + Pragma: + - no-cache + Strict-Transport-Security: + - max-age=15724800; + Vary: + - Accept-Encoding + X-Content-Type-Options: + - nosniff + X-Frame-Options: + - SAMEORIGIN + X-Ratelimit-Limit: + - "100" + X-Ratelimit-Name: + - processes_get_all + X-Ratelimit-Period: + - "60" + X-Ratelimit-Remaining: + - "98" + X-Ratelimit-Reset: + - "1" + status: 400 Bad Request + code: 400 + duration: "" diff --git a/tests/test_utils.go b/tests/test_utils.go index 5ec011192bb..d644aecb760 100644 --- a/tests/test_utils.go +++ b/tests/test_utils.go @@ -81,6 +81,7 @@ var testFiles2EndpointTags = map[string]map[string]string{ "api_logs_test": "logs", "api_metrics_test": "metrics", "api_permissions_test": "permissions", + "api_processes_test": "processes", "api_roles_test": "roles", "api_users_test": "users", "security_monitoring_test": "security-monitoring", From a4c54f461d79795f525e98bef80f2c9678fc850a Mon Sep 17 00:00:00 2001 From: Sherzod Karimov Date: Tue, 15 Nov 2022 14:45:11 -0500 Subject: [PATCH 2/7] user generics and named attr --- .generator/src/generator/templates/api.j2 | 19 +++++-------------- .generator/src/generator/templates/utils.j2 | 6 ++++++ go.mod | 2 +- tests/api/datadogV2/api_processes_test.go | 4 ++-- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/.generator/src/generator/templates/api.j2 b/.generator/src/generator/templates/api.j2 index 3c4841514e7..4cdb0d2d97e 100644 --- a/.generator/src/generator/templates/api.j2 +++ b/.generator/src/generator/templates/api.j2 @@ -103,7 +103,7 @@ func (a *{{ classname }}) {{ operation.operationId }}(ctx _context.Context{% for {%- set pagination = operation["x-pagination"] %} // {{ operation.operationId }}WithPagination provides a paginated version of {{ operation.operationId }} returning a channel with all items. {%- set itemType = get_type_at_path(operation, pagination.resultsPath) %} -func (a *{{ classname }}) {{ operation.operationId }}WithPagination(ctx _context.Context{% for name, parameter in operation|parameters if parameter.required or parameter.in == "path" %}, {{ name|variable_name}} {{ get_type_for_parameter(parameter) }}{% endfor %}{%- for name, parameter in operation|parameters if not parameter.required and parameter.in != "path" %}{%- if loop.first %}, o ...{{ operation.operationId }}OptionalParameters{% endif %}{% endfor %}) (<-chan struct { {{ itemType }}; error }, func(), error) { +func (a *{{ classname }}) {{ operation.operationId }}WithPagination(ctx _context.Context{% for name, parameter in operation|parameters if parameter.required or parameter.in == "path" %}, {{ name|variable_name}} {{ get_type_for_parameter(parameter) }}{% endfor %}{%- for name, parameter in operation|parameters if not parameter.required and parameter.in != "path" %}{%- if loop.first %}, o ...{{ operation.operationId }}OptionalParameters{% endif %}{% endfor %}) (<-chan datadog.PaginationResult[{{ itemType }}], func(), error) { ctx, cancel := _context.WithCancel(ctx) {%- set pageSizeType = get_container_type(operation, pagination.limitParam) %} @@ -141,26 +141,20 @@ func (a *{{ classname }}) {{ operation.operationId }}WithPagination(ctx _context } {%- endfor %} - items := make(chan struct { {{ itemType }}; error }, pageSize_) + items := make(chan datadog.PaginationResult[{{ itemType }}], pageSize_) go func() { for { req, err := a.build{{ operation.operationId }}Request(ctx{% for name, parameter in operation|parameters if parameter.required or parameter.in == "path" %}, {{ name|variable_name}}{% endfor %}{%- for name, parameter in operation|parameters if not parameter.required and parameter.in != "path" %}{%- if loop.first %}, o...{% endif %}{% endfor %}) if err != nil { var returnItem {{ itemType }} - items <- struct { - {{ itemType }} - error - }{returnItem, err} + items <- datadog.PaginationResult[{{ itemType }}]{returnItem, err} break } resp, _, err := a.{{ operation.operationId|untitle_case }}Execute(req) if err != nil { var returnItem {{ itemType }} - items <- struct { - {{ itemType }} - error - }{returnItem, err} + items <- datadog.PaginationResult[{{ itemType }}]{returnItem, err} break } {%- set previous = {"part": ""} %} @@ -177,10 +171,7 @@ func (a *{{ classname }}) {{ operation.operationId }}WithPagination(ctx _context for _, item := range results { select { - case items <- struct { - {{ itemType }} - error - }{item, nil}: + case items <- datadog.PaginationResult[{{ itemType }}]{item, nil}: case <-ctx.Done(): close(items) return diff --git a/.generator/src/generator/templates/utils.j2 b/.generator/src/generator/templates/utils.j2 index 36cfb23acc4..403946758c4 100644 --- a/.generator/src/generator/templates/utils.j2 +++ b/.generator/src/generator/templates/utils.j2 @@ -32,6 +32,12 @@ func PtrString(v string) *string { return &v } // PtrTime is helper routine that returns a pointer to given Time value. func PtrTime(v time.Time) *time.Time { return &v } +// PaginationResult pagination item helper struct +type PaginationResult[T any] struct { + Item T + Error error +} + // NullableBool is a struct to hold a nullable boolean value. type NullableBool struct { value *bool diff --git a/go.mod b/go.mod index f27739eaff4..ef5283fa713 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/DataDog/datadog-api-client-go/v2 -go 1.17 +go 1.18 retract ( // Version used to retract v2.0.0 and v2.0.1. DO NOT USE. diff --git a/tests/api/datadogV2/api_processes_test.go b/tests/api/datadogV2/api_processes_test.go index 59398ab2e2d..cd7c831937c 100644 --- a/tests/api/datadogV2/api_processes_test.go +++ b/tests/api/datadogV2/api_processes_test.go @@ -23,7 +23,7 @@ func TestGetProcessesWithPaginationReturnsError(t *testing.T) { From: datadog.PtrInt64(1000), To: datadog.PtrInt64(1000), }) - item := <-resp - assert.Equal(item.Error(), "400 Bad Request") + assert.Error(item.Error) + assert.Equal(item.Error.Error(), "400 Bad Request") } From 0ac5f7e7e3b9c19ebd51228e78d07976fb66ed99 Mon Sep 17 00:00:00 2001 From: "ci.datadog-api-spec" Date: Tue, 15 Nov 2022 19:47:08 +0000 Subject: [PATCH 3/7] pre-commit fixes --- api/datadog/utils.go | 6 ++++++ api/datadogV2/api_audit.go | 20 ++++++++++++++------ api/datadogV2/api_ci_visibility_pipelines.go | 20 ++++++++++++++------ api/datadogV2/api_ci_visibility_tests.go | 20 ++++++++++++++------ api/datadogV2/api_events.go | 20 ++++++++++++++------ api/datadogV2/api_incidents.go | 10 +++++++--- api/datadogV2/api_logs.go | 20 ++++++++++++++------ api/datadogV2/api_processes.go | 10 +++++++--- api/datadogV2/api_rum.go | 20 ++++++++++++++------ api/datadogV2/api_security_monitoring.go | 20 ++++++++++++++------ 10 files changed, 118 insertions(+), 48 deletions(-) diff --git a/api/datadog/utils.go b/api/datadog/utils.go index 0210fea876a..8604b19e656 100644 --- a/api/datadog/utils.go +++ b/api/datadog/utils.go @@ -35,6 +35,12 @@ func PtrString(v string) *string { return &v } // PtrTime is helper routine that returns a pointer to given Time value. func PtrTime(v time.Time) *time.Time { return &v } +// PaginationResult pagination item helper struct +type PaginationResult[T any] struct { + Item T + Error error +} + // NullableBool is a struct to hold a nullable boolean value. type NullableBool struct { value *bool diff --git a/api/datadogV2/api_audit.go b/api/datadogV2/api_audit.go index ad03659d62f..0ee8c69b249 100644 --- a/api/datadogV2/api_audit.go +++ b/api/datadogV2/api_audit.go @@ -118,7 +118,7 @@ func (a *AuditApi) ListAuditLogs(ctx _context.Context, o ...ListAuditLogsOptiona } // ListAuditLogsWithPagination provides a paginated version of ListAuditLogs returning a channel with all items. -func (a *AuditApi) ListAuditLogsWithPagination(ctx _context.Context, o ...ListAuditLogsOptionalParameters) (<-chan AuditLogsEvent, func(), error) { +func (a *AuditApi) ListAuditLogsWithPagination(ctx _context.Context, o ...ListAuditLogsOptionalParameters) (<-chan datadog.PaginationResult[AuditLogsEvent], func(), error) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(10) if len(o) == 0 { @@ -129,16 +129,20 @@ func (a *AuditApi) ListAuditLogsWithPagination(ctx _context.Context, o ...ListAu } o[0].PageLimit = &pageSize_ - items := make(chan AuditLogsEvent, pageSize_) + items := make(chan datadog.PaginationResult[AuditLogsEvent], pageSize_) go func() { for { req, err := a.buildListAuditLogsRequest(ctx, o...) if err != nil { + var returnItem AuditLogsEvent + items <- datadog.PaginationResult[AuditLogsEvent]{returnItem, err} break } resp, _, err := a.listAuditLogsExecute(req) if err != nil { + var returnItem AuditLogsEvent + items <- datadog.PaginationResult[AuditLogsEvent]{returnItem, err} break } respData, ok := resp.GetDataOk() @@ -149,7 +153,7 @@ func (a *AuditApi) ListAuditLogsWithPagination(ctx _context.Context, o ...ListAu for _, item := range results { select { - case items <- item: + case items <- datadog.PaginationResult[AuditLogsEvent]{item, nil}: case <-ctx.Done(): close(items) return @@ -344,7 +348,7 @@ func (a *AuditApi) SearchAuditLogs(ctx _context.Context, o ...SearchAuditLogsOpt } // SearchAuditLogsWithPagination provides a paginated version of SearchAuditLogs returning a channel with all items. -func (a *AuditApi) SearchAuditLogsWithPagination(ctx _context.Context, o ...SearchAuditLogsOptionalParameters) (<-chan AuditLogsEvent, func(), error) { +func (a *AuditApi) SearchAuditLogsWithPagination(ctx _context.Context, o ...SearchAuditLogsOptionalParameters) (<-chan datadog.PaginationResult[AuditLogsEvent], func(), error) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(10) if len(o) == 0 { @@ -361,16 +365,20 @@ func (a *AuditApi) SearchAuditLogsWithPagination(ctx _context.Context, o ...Sear } o[0].Body.Page.Limit = &pageSize_ - items := make(chan AuditLogsEvent, pageSize_) + items := make(chan datadog.PaginationResult[AuditLogsEvent], pageSize_) go func() { for { req, err := a.buildSearchAuditLogsRequest(ctx, o...) if err != nil { + var returnItem AuditLogsEvent + items <- datadog.PaginationResult[AuditLogsEvent]{returnItem, err} break } resp, _, err := a.searchAuditLogsExecute(req) if err != nil { + var returnItem AuditLogsEvent + items <- datadog.PaginationResult[AuditLogsEvent]{returnItem, err} break } respData, ok := resp.GetDataOk() @@ -381,7 +389,7 @@ func (a *AuditApi) SearchAuditLogsWithPagination(ctx _context.Context, o ...Sear for _, item := range results { select { - case items <- item: + case items <- datadog.PaginationResult[AuditLogsEvent]{item, nil}: case <-ctx.Done(): close(items) return diff --git a/api/datadogV2/api_ci_visibility_pipelines.go b/api/datadogV2/api_ci_visibility_pipelines.go index a6317596646..ccad0a4a712 100644 --- a/api/datadogV2/api_ci_visibility_pipelines.go +++ b/api/datadogV2/api_ci_visibility_pipelines.go @@ -240,7 +240,7 @@ func (a *CIVisibilityPipelinesApi) ListCIAppPipelineEvents(ctx _context.Context, } // ListCIAppPipelineEventsWithPagination provides a paginated version of ListCIAppPipelineEvents returning a channel with all items. -func (a *CIVisibilityPipelinesApi) ListCIAppPipelineEventsWithPagination(ctx _context.Context, o ...ListCIAppPipelineEventsOptionalParameters) (<-chan CIAppPipelineEvent, func(), error) { +func (a *CIVisibilityPipelinesApi) ListCIAppPipelineEventsWithPagination(ctx _context.Context, o ...ListCIAppPipelineEventsOptionalParameters) (<-chan datadog.PaginationResult[CIAppPipelineEvent], func(), error) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(10) if len(o) == 0 { @@ -251,16 +251,20 @@ func (a *CIVisibilityPipelinesApi) ListCIAppPipelineEventsWithPagination(ctx _co } o[0].PageLimit = &pageSize_ - items := make(chan CIAppPipelineEvent, pageSize_) + items := make(chan datadog.PaginationResult[CIAppPipelineEvent], pageSize_) go func() { for { req, err := a.buildListCIAppPipelineEventsRequest(ctx, o...) if err != nil { + var returnItem CIAppPipelineEvent + items <- datadog.PaginationResult[CIAppPipelineEvent]{returnItem, err} break } resp, _, err := a.listCIAppPipelineEventsExecute(req) if err != nil { + var returnItem CIAppPipelineEvent + items <- datadog.PaginationResult[CIAppPipelineEvent]{returnItem, err} break } respData, ok := resp.GetDataOk() @@ -271,7 +275,7 @@ func (a *CIVisibilityPipelinesApi) ListCIAppPipelineEventsWithPagination(ctx _co for _, item := range results { select { - case items <- item: + case items <- datadog.PaginationResult[CIAppPipelineEvent]{item, nil}: case <-ctx.Done(): close(items) return @@ -464,7 +468,7 @@ func (a *CIVisibilityPipelinesApi) SearchCIAppPipelineEvents(ctx _context.Contex } // SearchCIAppPipelineEventsWithPagination provides a paginated version of SearchCIAppPipelineEvents returning a channel with all items. -func (a *CIVisibilityPipelinesApi) SearchCIAppPipelineEventsWithPagination(ctx _context.Context, o ...SearchCIAppPipelineEventsOptionalParameters) (<-chan CIAppPipelineEvent, func(), error) { +func (a *CIVisibilityPipelinesApi) SearchCIAppPipelineEventsWithPagination(ctx _context.Context, o ...SearchCIAppPipelineEventsOptionalParameters) (<-chan datadog.PaginationResult[CIAppPipelineEvent], func(), error) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(10) if len(o) == 0 { @@ -481,16 +485,20 @@ func (a *CIVisibilityPipelinesApi) SearchCIAppPipelineEventsWithPagination(ctx _ } o[0].Body.Page.Limit = &pageSize_ - items := make(chan CIAppPipelineEvent, pageSize_) + items := make(chan datadog.PaginationResult[CIAppPipelineEvent], pageSize_) go func() { for { req, err := a.buildSearchCIAppPipelineEventsRequest(ctx, o...) if err != nil { + var returnItem CIAppPipelineEvent + items <- datadog.PaginationResult[CIAppPipelineEvent]{returnItem, err} break } resp, _, err := a.searchCIAppPipelineEventsExecute(req) if err != nil { + var returnItem CIAppPipelineEvent + items <- datadog.PaginationResult[CIAppPipelineEvent]{returnItem, err} break } respData, ok := resp.GetDataOk() @@ -501,7 +509,7 @@ func (a *CIVisibilityPipelinesApi) SearchCIAppPipelineEventsWithPagination(ctx _ for _, item := range results { select { - case items <- item: + case items <- datadog.PaginationResult[CIAppPipelineEvent]{item, nil}: case <-ctx.Done(): close(items) return diff --git a/api/datadogV2/api_ci_visibility_tests.go b/api/datadogV2/api_ci_visibility_tests.go index 8959aca43cb..cffb1a1a44f 100644 --- a/api/datadogV2/api_ci_visibility_tests.go +++ b/api/datadogV2/api_ci_visibility_tests.go @@ -240,7 +240,7 @@ func (a *CIVisibilityTestsApi) ListCIAppTestEvents(ctx _context.Context, o ...Li } // ListCIAppTestEventsWithPagination provides a paginated version of ListCIAppTestEvents returning a channel with all items. -func (a *CIVisibilityTestsApi) ListCIAppTestEventsWithPagination(ctx _context.Context, o ...ListCIAppTestEventsOptionalParameters) (<-chan CIAppTestEvent, func(), error) { +func (a *CIVisibilityTestsApi) ListCIAppTestEventsWithPagination(ctx _context.Context, o ...ListCIAppTestEventsOptionalParameters) (<-chan datadog.PaginationResult[CIAppTestEvent], func(), error) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(10) if len(o) == 0 { @@ -251,16 +251,20 @@ func (a *CIVisibilityTestsApi) ListCIAppTestEventsWithPagination(ctx _context.Co } o[0].PageLimit = &pageSize_ - items := make(chan CIAppTestEvent, pageSize_) + items := make(chan datadog.PaginationResult[CIAppTestEvent], pageSize_) go func() { for { req, err := a.buildListCIAppTestEventsRequest(ctx, o...) if err != nil { + var returnItem CIAppTestEvent + items <- datadog.PaginationResult[CIAppTestEvent]{returnItem, err} break } resp, _, err := a.listCIAppTestEventsExecute(req) if err != nil { + var returnItem CIAppTestEvent + items <- datadog.PaginationResult[CIAppTestEvent]{returnItem, err} break } respData, ok := resp.GetDataOk() @@ -271,7 +275,7 @@ func (a *CIVisibilityTestsApi) ListCIAppTestEventsWithPagination(ctx _context.Co for _, item := range results { select { - case items <- item: + case items <- datadog.PaginationResult[CIAppTestEvent]{item, nil}: case <-ctx.Done(): close(items) return @@ -464,7 +468,7 @@ func (a *CIVisibilityTestsApi) SearchCIAppTestEvents(ctx _context.Context, o ... } // SearchCIAppTestEventsWithPagination provides a paginated version of SearchCIAppTestEvents returning a channel with all items. -func (a *CIVisibilityTestsApi) SearchCIAppTestEventsWithPagination(ctx _context.Context, o ...SearchCIAppTestEventsOptionalParameters) (<-chan CIAppTestEvent, func(), error) { +func (a *CIVisibilityTestsApi) SearchCIAppTestEventsWithPagination(ctx _context.Context, o ...SearchCIAppTestEventsOptionalParameters) (<-chan datadog.PaginationResult[CIAppTestEvent], func(), error) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(10) if len(o) == 0 { @@ -481,16 +485,20 @@ func (a *CIVisibilityTestsApi) SearchCIAppTestEventsWithPagination(ctx _context. } o[0].Body.Page.Limit = &pageSize_ - items := make(chan CIAppTestEvent, pageSize_) + items := make(chan datadog.PaginationResult[CIAppTestEvent], pageSize_) go func() { for { req, err := a.buildSearchCIAppTestEventsRequest(ctx, o...) if err != nil { + var returnItem CIAppTestEvent + items <- datadog.PaginationResult[CIAppTestEvent]{returnItem, err} break } resp, _, err := a.searchCIAppTestEventsExecute(req) if err != nil { + var returnItem CIAppTestEvent + items <- datadog.PaginationResult[CIAppTestEvent]{returnItem, err} break } respData, ok := resp.GetDataOk() @@ -501,7 +509,7 @@ func (a *CIVisibilityTestsApi) SearchCIAppTestEventsWithPagination(ctx _context. for _, item := range results { select { - case items <- item: + case items <- datadog.PaginationResult[CIAppTestEvent]{item, nil}: case <-ctx.Done(): close(items) return diff --git a/api/datadogV2/api_events.go b/api/datadogV2/api_events.go index b382cd9ec64..03f44584333 100644 --- a/api/datadogV2/api_events.go +++ b/api/datadogV2/api_events.go @@ -117,7 +117,7 @@ func (a *EventsApi) ListEvents(ctx _context.Context, o ...ListEventsOptionalPara } // ListEventsWithPagination provides a paginated version of ListEvents returning a channel with all items. -func (a *EventsApi) ListEventsWithPagination(ctx _context.Context, o ...ListEventsOptionalParameters) (<-chan EventResponse, func(), error) { +func (a *EventsApi) ListEventsWithPagination(ctx _context.Context, o ...ListEventsOptionalParameters) (<-chan datadog.PaginationResult[EventResponse], func(), error) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(10) if len(o) == 0 { @@ -128,16 +128,20 @@ func (a *EventsApi) ListEventsWithPagination(ctx _context.Context, o ...ListEven } o[0].PageLimit = &pageSize_ - items := make(chan EventResponse, pageSize_) + items := make(chan datadog.PaginationResult[EventResponse], pageSize_) go func() { for { req, err := a.buildListEventsRequest(ctx, o...) if err != nil { + var returnItem EventResponse + items <- datadog.PaginationResult[EventResponse]{returnItem, err} break } resp, _, err := a.listEventsExecute(req) if err != nil { + var returnItem EventResponse + items <- datadog.PaginationResult[EventResponse]{returnItem, err} break } respData, ok := resp.GetDataOk() @@ -148,7 +152,7 @@ func (a *EventsApi) ListEventsWithPagination(ctx _context.Context, o ...ListEven for _, item := range results { select { - case items <- item: + case items <- datadog.PaginationResult[EventResponse]{item, nil}: case <-ctx.Done(): close(items) return @@ -348,7 +352,7 @@ func (a *EventsApi) SearchEvents(ctx _context.Context, o ...SearchEventsOptional } // SearchEventsWithPagination provides a paginated version of SearchEvents returning a channel with all items. -func (a *EventsApi) SearchEventsWithPagination(ctx _context.Context, o ...SearchEventsOptionalParameters) (<-chan EventResponse, func(), error) { +func (a *EventsApi) SearchEventsWithPagination(ctx _context.Context, o ...SearchEventsOptionalParameters) (<-chan datadog.PaginationResult[EventResponse], func(), error) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(10) if len(o) == 0 { @@ -365,16 +369,20 @@ func (a *EventsApi) SearchEventsWithPagination(ctx _context.Context, o ...Search } o[0].Body.Page.Limit = &pageSize_ - items := make(chan EventResponse, pageSize_) + items := make(chan datadog.PaginationResult[EventResponse], pageSize_) go func() { for { req, err := a.buildSearchEventsRequest(ctx, o...) if err != nil { + var returnItem EventResponse + items <- datadog.PaginationResult[EventResponse]{returnItem, err} break } resp, _, err := a.searchEventsExecute(req) if err != nil { + var returnItem EventResponse + items <- datadog.PaginationResult[EventResponse]{returnItem, err} break } respData, ok := resp.GetDataOk() @@ -385,7 +393,7 @@ func (a *EventsApi) SearchEventsWithPagination(ctx _context.Context, o ...Search for _, item := range results { select { - case items <- item: + case items <- datadog.PaginationResult[EventResponse]{item, nil}: case <-ctx.Done(): close(items) return diff --git a/api/datadogV2/api_incidents.go b/api/datadogV2/api_incidents.go index 901dca7c998..0e0e5db964c 100644 --- a/api/datadogV2/api_incidents.go +++ b/api/datadogV2/api_incidents.go @@ -656,7 +656,7 @@ func (a *IncidentsApi) ListIncidents(ctx _context.Context, o ...ListIncidentsOpt } // ListIncidentsWithPagination provides a paginated version of ListIncidents returning a channel with all items. -func (a *IncidentsApi) ListIncidentsWithPagination(ctx _context.Context, o ...ListIncidentsOptionalParameters) (<-chan IncidentResponseData, func(), error) { +func (a *IncidentsApi) ListIncidentsWithPagination(ctx _context.Context, o ...ListIncidentsOptionalParameters) (<-chan datadog.PaginationResult[IncidentResponseData], func(), error) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int64(10) if len(o) == 0 { @@ -667,16 +667,20 @@ func (a *IncidentsApi) ListIncidentsWithPagination(ctx _context.Context, o ...Li } o[0].PageSize = &pageSize_ - items := make(chan IncidentResponseData, pageSize_) + items := make(chan datadog.PaginationResult[IncidentResponseData], pageSize_) go func() { for { req, err := a.buildListIncidentsRequest(ctx, o...) if err != nil { + var returnItem IncidentResponseData + items <- datadog.PaginationResult[IncidentResponseData]{returnItem, err} break } resp, _, err := a.listIncidentsExecute(req) if err != nil { + var returnItem IncidentResponseData + items <- datadog.PaginationResult[IncidentResponseData]{returnItem, err} break } respData, ok := resp.GetDataOk() @@ -687,7 +691,7 @@ func (a *IncidentsApi) ListIncidentsWithPagination(ctx _context.Context, o ...Li for _, item := range results { select { - case items <- item: + case items <- datadog.PaginationResult[IncidentResponseData]{item, nil}: case <-ctx.Done(): close(items) return diff --git a/api/datadogV2/api_logs.go b/api/datadogV2/api_logs.go index 1a009911d96..ed43ff13bdf 100644 --- a/api/datadogV2/api_logs.go +++ b/api/datadogV2/api_logs.go @@ -202,7 +202,7 @@ func (a *LogsApi) ListLogs(ctx _context.Context, o ...ListLogsOptionalParameters } // ListLogsWithPagination provides a paginated version of ListLogs returning a channel with all items. -func (a *LogsApi) ListLogsWithPagination(ctx _context.Context, o ...ListLogsOptionalParameters) (<-chan Log, func(), error) { +func (a *LogsApi) ListLogsWithPagination(ctx _context.Context, o ...ListLogsOptionalParameters) (<-chan datadog.PaginationResult[Log], func(), error) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(10) if len(o) == 0 { @@ -219,16 +219,20 @@ func (a *LogsApi) ListLogsWithPagination(ctx _context.Context, o ...ListLogsOpti } o[0].Body.Page.Limit = &pageSize_ - items := make(chan Log, pageSize_) + items := make(chan datadog.PaginationResult[Log], pageSize_) go func() { for { req, err := a.buildListLogsRequest(ctx, o...) if err != nil { + var returnItem Log + items <- datadog.PaginationResult[Log]{returnItem, err} break } resp, _, err := a.listLogsExecute(req) if err != nil { + var returnItem Log + items <- datadog.PaginationResult[Log]{returnItem, err} break } respData, ok := resp.GetDataOk() @@ -239,7 +243,7 @@ func (a *LogsApi) ListLogsWithPagination(ctx _context.Context, o ...ListLogsOpti for _, item := range results { select { - case items <- item: + case items <- datadog.PaginationResult[Log]{item, nil}: case <-ctx.Done(): close(items) return @@ -487,7 +491,7 @@ func (a *LogsApi) ListLogsGet(ctx _context.Context, o ...ListLogsGetOptionalPara } // ListLogsGetWithPagination provides a paginated version of ListLogsGet returning a channel with all items. -func (a *LogsApi) ListLogsGetWithPagination(ctx _context.Context, o ...ListLogsGetOptionalParameters) (<-chan Log, func(), error) { +func (a *LogsApi) ListLogsGetWithPagination(ctx _context.Context, o ...ListLogsGetOptionalParameters) (<-chan datadog.PaginationResult[Log], func(), error) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(10) if len(o) == 0 { @@ -498,16 +502,20 @@ func (a *LogsApi) ListLogsGetWithPagination(ctx _context.Context, o ...ListLogsG } o[0].PageLimit = &pageSize_ - items := make(chan Log, pageSize_) + items := make(chan datadog.PaginationResult[Log], pageSize_) go func() { for { req, err := a.buildListLogsGetRequest(ctx, o...) if err != nil { + var returnItem Log + items <- datadog.PaginationResult[Log]{returnItem, err} break } resp, _, err := a.listLogsGetExecute(req) if err != nil { + var returnItem Log + items <- datadog.PaginationResult[Log]{returnItem, err} break } respData, ok := resp.GetDataOk() @@ -518,7 +526,7 @@ func (a *LogsApi) ListLogsGetWithPagination(ctx _context.Context, o ...ListLogsG for _, item := range results { select { - case items <- item: + case items <- datadog.PaginationResult[Log]{item, nil}: case <-ctx.Done(): close(items) return diff --git a/api/datadogV2/api_processes.go b/api/datadogV2/api_processes.go index c4c51a9b25d..abd6f5262e3 100644 --- a/api/datadogV2/api_processes.go +++ b/api/datadogV2/api_processes.go @@ -112,7 +112,7 @@ func (a *ProcessesApi) ListProcesses(ctx _context.Context, o ...ListProcessesOpt } // ListProcessesWithPagination provides a paginated version of ListProcesses returning a channel with all items. -func (a *ProcessesApi) ListProcessesWithPagination(ctx _context.Context, o ...ListProcessesOptionalParameters) (<-chan ProcessSummary, func(), error) { +func (a *ProcessesApi) ListProcessesWithPagination(ctx _context.Context, o ...ListProcessesOptionalParameters) (<-chan datadog.PaginationResult[ProcessSummary], func(), error) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(1000) if len(o) == 0 { @@ -123,16 +123,20 @@ func (a *ProcessesApi) ListProcessesWithPagination(ctx _context.Context, o ...Li } o[0].PageLimit = &pageSize_ - items := make(chan ProcessSummary, pageSize_) + items := make(chan datadog.PaginationResult[ProcessSummary], pageSize_) go func() { for { req, err := a.buildListProcessesRequest(ctx, o...) if err != nil { + var returnItem ProcessSummary + items <- datadog.PaginationResult[ProcessSummary]{returnItem, err} break } resp, _, err := a.listProcessesExecute(req) if err != nil { + var returnItem ProcessSummary + items <- datadog.PaginationResult[ProcessSummary]{returnItem, err} break } respData, ok := resp.GetDataOk() @@ -143,7 +147,7 @@ func (a *ProcessesApi) ListProcessesWithPagination(ctx _context.Context, o ...Li for _, item := range results { select { - case items <- item: + case items <- datadog.PaginationResult[ProcessSummary]{item, nil}: case <-ctx.Done(): close(items) return diff --git a/api/datadogV2/api_rum.go b/api/datadogV2/api_rum.go index a626dca76ff..165daebdfb8 100644 --- a/api/datadogV2/api_rum.go +++ b/api/datadogV2/api_rum.go @@ -710,7 +710,7 @@ func (a *RUMApi) ListRUMEvents(ctx _context.Context, o ...ListRUMEventsOptionalP } // ListRUMEventsWithPagination provides a paginated version of ListRUMEvents returning a channel with all items. -func (a *RUMApi) ListRUMEventsWithPagination(ctx _context.Context, o ...ListRUMEventsOptionalParameters) (<-chan RUMEvent, func(), error) { +func (a *RUMApi) ListRUMEventsWithPagination(ctx _context.Context, o ...ListRUMEventsOptionalParameters) (<-chan datadog.PaginationResult[RUMEvent], func(), error) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(10) if len(o) == 0 { @@ -721,16 +721,20 @@ func (a *RUMApi) ListRUMEventsWithPagination(ctx _context.Context, o ...ListRUME } o[0].PageLimit = &pageSize_ - items := make(chan RUMEvent, pageSize_) + items := make(chan datadog.PaginationResult[RUMEvent], pageSize_) go func() { for { req, err := a.buildListRUMEventsRequest(ctx, o...) if err != nil { + var returnItem RUMEvent + items <- datadog.PaginationResult[RUMEvent]{returnItem, err} break } resp, _, err := a.listRUMEventsExecute(req) if err != nil { + var returnItem RUMEvent + items <- datadog.PaginationResult[RUMEvent]{returnItem, err} break } respData, ok := resp.GetDataOk() @@ -741,7 +745,7 @@ func (a *RUMApi) ListRUMEventsWithPagination(ctx _context.Context, o ...ListRUME for _, item := range results { select { - case items <- item: + case items <- datadog.PaginationResult[RUMEvent]{item, nil}: case <-ctx.Done(): close(items) return @@ -912,7 +916,7 @@ func (a *RUMApi) SearchRUMEvents(ctx _context.Context, body RUMSearchEventsReque } // SearchRUMEventsWithPagination provides a paginated version of SearchRUMEvents returning a channel with all items. -func (a *RUMApi) SearchRUMEventsWithPagination(ctx _context.Context, body RUMSearchEventsRequest) (<-chan RUMEvent, func(), error) { +func (a *RUMApi) SearchRUMEventsWithPagination(ctx _context.Context, body RUMSearchEventsRequest) (<-chan datadog.PaginationResult[RUMEvent], func(), error) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(10) if body.Page == nil { @@ -925,16 +929,20 @@ func (a *RUMApi) SearchRUMEventsWithPagination(ctx _context.Context, body RUMSea pageSize_ = *body.Page.Limit } - items := make(chan RUMEvent, pageSize_) + items := make(chan datadog.PaginationResult[RUMEvent], pageSize_) go func() { for { req, err := a.buildSearchRUMEventsRequest(ctx, body) if err != nil { + var returnItem RUMEvent + items <- datadog.PaginationResult[RUMEvent]{returnItem, err} break } resp, _, err := a.searchRUMEventsExecute(req) if err != nil { + var returnItem RUMEvent + items <- datadog.PaginationResult[RUMEvent]{returnItem, err} break } respData, ok := resp.GetDataOk() @@ -945,7 +953,7 @@ func (a *RUMApi) SearchRUMEventsWithPagination(ctx _context.Context, body RUMSea for _, item := range results { select { - case items <- item: + case items <- datadog.PaginationResult[RUMEvent]{item, nil}: case <-ctx.Done(): close(items) return diff --git a/api/datadogV2/api_security_monitoring.go b/api/datadogV2/api_security_monitoring.go index 560e087dcb0..05215c304a0 100644 --- a/api/datadogV2/api_security_monitoring.go +++ b/api/datadogV2/api_security_monitoring.go @@ -1597,7 +1597,7 @@ func (a *SecurityMonitoringApi) ListSecurityMonitoringSignals(ctx _context.Conte } // ListSecurityMonitoringSignalsWithPagination provides a paginated version of ListSecurityMonitoringSignals returning a channel with all items. -func (a *SecurityMonitoringApi) ListSecurityMonitoringSignalsWithPagination(ctx _context.Context, o ...ListSecurityMonitoringSignalsOptionalParameters) (<-chan SecurityMonitoringSignal, func(), error) { +func (a *SecurityMonitoringApi) ListSecurityMonitoringSignalsWithPagination(ctx _context.Context, o ...ListSecurityMonitoringSignalsOptionalParameters) (<-chan datadog.PaginationResult[SecurityMonitoringSignal], func(), error) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(10) if len(o) == 0 { @@ -1608,16 +1608,20 @@ func (a *SecurityMonitoringApi) ListSecurityMonitoringSignalsWithPagination(ctx } o[0].PageLimit = &pageSize_ - items := make(chan SecurityMonitoringSignal, pageSize_) + items := make(chan datadog.PaginationResult[SecurityMonitoringSignal], pageSize_) go func() { for { req, err := a.buildListSecurityMonitoringSignalsRequest(ctx, o...) if err != nil { + var returnItem SecurityMonitoringSignal + items <- datadog.PaginationResult[SecurityMonitoringSignal]{returnItem, err} break } resp, _, err := a.listSecurityMonitoringSignalsExecute(req) if err != nil { + var returnItem SecurityMonitoringSignal + items <- datadog.PaginationResult[SecurityMonitoringSignal]{returnItem, err} break } respData, ok := resp.GetDataOk() @@ -1628,7 +1632,7 @@ func (a *SecurityMonitoringApi) ListSecurityMonitoringSignalsWithPagination(ctx for _, item := range results { select { - case items <- item: + case items <- datadog.PaginationResult[SecurityMonitoringSignal]{item, nil}: case <-ctx.Done(): close(items) return @@ -1820,7 +1824,7 @@ func (a *SecurityMonitoringApi) SearchSecurityMonitoringSignals(ctx _context.Con } // SearchSecurityMonitoringSignalsWithPagination provides a paginated version of SearchSecurityMonitoringSignals returning a channel with all items. -func (a *SecurityMonitoringApi) SearchSecurityMonitoringSignalsWithPagination(ctx _context.Context, o ...SearchSecurityMonitoringSignalsOptionalParameters) (<-chan SecurityMonitoringSignal, func(), error) { +func (a *SecurityMonitoringApi) SearchSecurityMonitoringSignalsWithPagination(ctx _context.Context, o ...SearchSecurityMonitoringSignalsOptionalParameters) (<-chan datadog.PaginationResult[SecurityMonitoringSignal], func(), error) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(10) if len(o) == 0 { @@ -1837,16 +1841,20 @@ func (a *SecurityMonitoringApi) SearchSecurityMonitoringSignalsWithPagination(ct } o[0].Body.Page.Limit = &pageSize_ - items := make(chan SecurityMonitoringSignal, pageSize_) + items := make(chan datadog.PaginationResult[SecurityMonitoringSignal], pageSize_) go func() { for { req, err := a.buildSearchSecurityMonitoringSignalsRequest(ctx, o...) if err != nil { + var returnItem SecurityMonitoringSignal + items <- datadog.PaginationResult[SecurityMonitoringSignal]{returnItem, err} break } resp, _, err := a.searchSecurityMonitoringSignalsExecute(req) if err != nil { + var returnItem SecurityMonitoringSignal + items <- datadog.PaginationResult[SecurityMonitoringSignal]{returnItem, err} break } respData, ok := resp.GetDataOk() @@ -1857,7 +1865,7 @@ func (a *SecurityMonitoringApi) SearchSecurityMonitoringSignalsWithPagination(ct for _, item := range results { select { - case items <- item: + case items <- datadog.PaginationResult[SecurityMonitoringSignal]{item, nil}: case <-ctx.Done(): close(items) return From 7bb0f60fc8a7d4044be6c0df126855ee919b51a1 Mon Sep 17 00:00:00 2001 From: Sherzod Karimov Date: Tue, 15 Nov 2022 14:50:14 -0500 Subject: [PATCH 4/7] bump ci go version --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/test.yml | 2 +- .github/workflows/test_integration.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c1ed1fb4c24..92b4f387126 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/setup-go@v2 with: - go-version: 1.17.11 + go-version: 1.18.x # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d7522fd057a..4779f3698d0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -70,7 +70,7 @@ jobs: test: strategy: matrix: - go-version: [1.17.x, 1.18.x] + go-version: [1.18.x, 1.19.x] platform: [ubuntu-latest, macos-latest] runs-on: ${{ matrix.platform }} if: github.event.pull_request.draft == false && !contains(github.event.pull_request.labels.*.name, 'ci/skip') && !contains(github.event.pull_request.head.ref, 'datadog-api-spec/test/') diff --git a/.github/workflows/test_integration.yml b/.github/workflows/test_integration.yml index 08373210cec..06e2c00af90 100644 --- a/.github/workflows/test_integration.yml +++ b/.github/workflows/test_integration.yml @@ -53,7 +53,7 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: 1.17.x + go-version: 1.18.x cache: true cache-dependency-path: tests/go.sum - name: Run integration tests From 9fd2b542c4083116990fa581e6d459a68c7c3858 Mon Sep 17 00:00:00 2001 From: Sherzod Karimov Date: Wed, 16 Nov 2022 15:17:36 -0500 Subject: [PATCH 5/7] code review suggestions --- .generator/src/generator/templates/api.j2 | 4 ++-- .generator/src/generator/templates/example.j2 | 15 +++++++-------- README.md | 14 +++++++------- tests/api/datadogV2/api_processes_test.go | 2 +- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/.generator/src/generator/templates/api.j2 b/.generator/src/generator/templates/api.j2 index 4cdb0d2d97e..00b10247680 100644 --- a/.generator/src/generator/templates/api.j2 +++ b/.generator/src/generator/templates/api.j2 @@ -103,7 +103,7 @@ func (a *{{ classname }}) {{ operation.operationId }}(ctx _context.Context{% for {%- set pagination = operation["x-pagination"] %} // {{ operation.operationId }}WithPagination provides a paginated version of {{ operation.operationId }} returning a channel with all items. {%- set itemType = get_type_at_path(operation, pagination.resultsPath) %} -func (a *{{ classname }}) {{ operation.operationId }}WithPagination(ctx _context.Context{% for name, parameter in operation|parameters if parameter.required or parameter.in == "path" %}, {{ name|variable_name}} {{ get_type_for_parameter(parameter) }}{% endfor %}{%- for name, parameter in operation|parameters if not parameter.required and parameter.in != "path" %}{%- if loop.first %}, o ...{{ operation.operationId }}OptionalParameters{% endif %}{% endfor %}) (<-chan datadog.PaginationResult[{{ itemType }}], func(), error) { +func (a *{{ classname }}) {{ operation.operationId }}WithPagination(ctx _context.Context{% for name, parameter in operation|parameters if parameter.required or parameter.in == "path" %}, {{ name|variable_name}} {{ get_type_for_parameter(parameter) }}{% endfor %}{%- for name, parameter in operation|parameters if not parameter.required and parameter.in != "path" %}{%- if loop.first %}, o ...{{ operation.operationId }}OptionalParameters{% endif %}{% endfor %}) (<-chan datadog.PaginationResult[{{ itemType }}], func()) { ctx, cancel := _context.WithCancel(ctx) {%- set pageSizeType = get_container_type(operation, pagination.limitParam) %} @@ -212,7 +212,7 @@ func (a *{{ classname }}) {{ operation.operationId }}WithPagination(ctx _context } close(items) }() - return items, cancel, nil + return items, cancel } {%- endif %} diff --git a/.generator/src/generator/templates/example.j2 b/.generator/src/generator/templates/example.j2 index be23b08b325..180a0656fab 100644 --- a/.generator/src/generator/templates/example.j2 +++ b/.generator/src/generator/templates/example.j2 @@ -57,15 +57,14 @@ func main() { apiClient := datadog.NewAPIClient(configuration) api := datadog{{ version|upper }}.New{{ context.api_instance.name }}Api(apiClient) {%- if context.pagination %} - resp, _, err := api.{{ context.api_request.operation_id }}WithPagination(ctx{% if parameters %}, {{ parameters }}{% endif %}) + resp, _ := api.{{ context.api_request.operation_id }}WithPagination(ctx{% if parameters %}, {{ parameters }}{% endif %}) - if err != nil { - fmt.Fprintf(os.Stderr, "Error when calling `{{ context.api_instance.name }}Api.{{ context.api_request.operation_id }}`: %v\n", err) - } - - for item := range resp { - responseContent, _ := json.MarshalIndent(item, "", " ") - fmt.Fprintf(os.Stdout, "%s\n", responseContent) + for paginationResult := range resp { + if paginationResult.Error != nil { + fmt.Fprintf(os.Stderr, "Error when calling `{{ context.api_instance.name }}Api.{{ context.api_request.operation_id }}`: %v\n", paginationResult.Error) + } + responseContent, _ := json.MarshalIndent(paginationResult.Item, "", " ") + fmt.Fprintf(os.Stdout, "%s\n", responseContent) } {%- else %} {%- if response_has_three_values %} diff --git a/README.md b/README.md index 033d4772c11..8182a5dab9b 100644 --- a/README.md +++ b/README.md @@ -160,13 +160,13 @@ func main() { apiClient := datadog.NewAPIClient(configuration) incidentsApi := datadogV2.NewIncidentsApi(apiClient) - resp, _, err := incidentsApi.ListIncidentsWithPagination(ctx, *datadog.NewListIncidentsOptionalParameters()) - if err != nil { - fmt.Fprintf(os.Stderr, "Error when calling `IncidentsApi.ListIncidents`: %v\n", err) - } - - for incident := range resp { - fmt.Fprintf(os.Stdout, "Got incident %s\n", incident.GetId()) + resp, _ := incidentsApi.ListIncidentsWithPagination(ctx, *datadog.NewListIncidentsOptionalParameters()) + for paginationResult := range resp { + if paginationResult.Error != nil { + fmt.Fprintf(os.Stderr, "Error when calling `IncidentsApi.ListIncidentsWithPagination`: %v\n", paginationResult.Error) + } + responseContent, _ := json.MarshalIndent(paginationResult.Item, "", " ") + fmt.Fprintf(os.Stdout, "%s\n", responseContent) } } diff --git a/tests/api/datadogV2/api_processes_test.go b/tests/api/datadogV2/api_processes_test.go index cd7c831937c..06b487b0dd5 100644 --- a/tests/api/datadogV2/api_processes_test.go +++ b/tests/api/datadogV2/api_processes_test.go @@ -19,7 +19,7 @@ func TestGetProcessesWithPaginationReturnsError(t *testing.T) { client := Client(ctx) api := datadogV2.NewProcessesApi(client) - resp, _, _ := api.ListProcessesWithPagination(ctx, datadogV2.ListProcessesOptionalParameters{ + resp, _ := api.ListProcessesWithPagination(ctx, datadogV2.ListProcessesOptionalParameters{ From: datadog.PtrInt64(1000), To: datadog.PtrInt64(1000), }) From 69403e437ae0fe28937c8b79cd8fe350fa43e7a5 Mon Sep 17 00:00:00 2001 From: "ci.datadog-api-spec" Date: Wed, 16 Nov 2022 20:19:46 +0000 Subject: [PATCH 6/7] pre-commit fixes --- api/datadogV2/api_audit.go | 8 ++++---- api/datadogV2/api_ci_visibility_pipelines.go | 8 ++++---- api/datadogV2/api_ci_visibility_tests.go | 8 ++++---- api/datadogV2/api_events.go | 8 ++++---- api/datadogV2/api_incidents.go | 4 ++-- api/datadogV2/api_logs.go | 8 ++++---- api/datadogV2/api_processes.go | 4 ++-- api/datadogV2/api_rum.go | 8 ++++---- api/datadogV2/api_security_monitoring.go | 8 ++++---- doc.go | 14 +++++++------- examples/v2/audit/ListAuditLogs_1275402458.go | 13 ++++++------- examples/v2/audit/SearchAuditLogs_3215529662.go | 13 ++++++------- .../ListCIAppPipelineEvents_1270618359.go | 13 ++++++------- .../SearchCIAppPipelineEvents_3246135003.go | 13 ++++++------- .../ListCIAppTestEvents_3852605281.go | 13 ++++++------- .../SearchCIAppTestEvents_1675695429.go | 13 ++++++------- examples/v2/events/ListEvents_1527584014.go | 13 ++++++------- examples/v2/events/SearchEvents_3856995058.go | 13 ++++++------- examples/v2/incidents/ListIncidents_2665616954.go | 13 ++++++------- examples/v2/logs/ListLogsGet_738202670.go | 13 ++++++------- examples/v2/logs/ListLogs_3138392594.go | 13 ++++++------- examples/v2/processes/ListProcesses_797840471.go | 13 ++++++------- examples/v2/rum/ListRUMEvents_2680821282.go | 13 ++++++------- examples/v2/rum/SearchRUMEvents_574690310.go | 13 ++++++------- .../ListSecurityMonitoringSignals_3960412991.go | 13 ++++++------- .../SearchSecurityMonitoringSignals_1309350146.go | 13 ++++++------- 26 files changed, 135 insertions(+), 151 deletions(-) diff --git a/api/datadogV2/api_audit.go b/api/datadogV2/api_audit.go index 0ee8c69b249..d80cc450022 100644 --- a/api/datadogV2/api_audit.go +++ b/api/datadogV2/api_audit.go @@ -118,7 +118,7 @@ func (a *AuditApi) ListAuditLogs(ctx _context.Context, o ...ListAuditLogsOptiona } // ListAuditLogsWithPagination provides a paginated version of ListAuditLogs returning a channel with all items. -func (a *AuditApi) ListAuditLogsWithPagination(ctx _context.Context, o ...ListAuditLogsOptionalParameters) (<-chan datadog.PaginationResult[AuditLogsEvent], func(), error) { +func (a *AuditApi) ListAuditLogsWithPagination(ctx _context.Context, o ...ListAuditLogsOptionalParameters) (<-chan datadog.PaginationResult[AuditLogsEvent], func()) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(10) if len(o) == 0 { @@ -179,7 +179,7 @@ func (a *AuditApi) ListAuditLogsWithPagination(ctx _context.Context, o ...ListAu } close(items) }() - return items, cancel, nil + return items, cancel } // listAuditLogsExecute executes the request. @@ -348,7 +348,7 @@ func (a *AuditApi) SearchAuditLogs(ctx _context.Context, o ...SearchAuditLogsOpt } // SearchAuditLogsWithPagination provides a paginated version of SearchAuditLogs returning a channel with all items. -func (a *AuditApi) SearchAuditLogsWithPagination(ctx _context.Context, o ...SearchAuditLogsOptionalParameters) (<-chan datadog.PaginationResult[AuditLogsEvent], func(), error) { +func (a *AuditApi) SearchAuditLogsWithPagination(ctx _context.Context, o ...SearchAuditLogsOptionalParameters) (<-chan datadog.PaginationResult[AuditLogsEvent], func()) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(10) if len(o) == 0 { @@ -415,7 +415,7 @@ func (a *AuditApi) SearchAuditLogsWithPagination(ctx _context.Context, o ...Sear } close(items) }() - return items, cancel, nil + return items, cancel } // searchAuditLogsExecute executes the request. diff --git a/api/datadogV2/api_ci_visibility_pipelines.go b/api/datadogV2/api_ci_visibility_pipelines.go index ccad0a4a712..e5099b74cbb 100644 --- a/api/datadogV2/api_ci_visibility_pipelines.go +++ b/api/datadogV2/api_ci_visibility_pipelines.go @@ -240,7 +240,7 @@ func (a *CIVisibilityPipelinesApi) ListCIAppPipelineEvents(ctx _context.Context, } // ListCIAppPipelineEventsWithPagination provides a paginated version of ListCIAppPipelineEvents returning a channel with all items. -func (a *CIVisibilityPipelinesApi) ListCIAppPipelineEventsWithPagination(ctx _context.Context, o ...ListCIAppPipelineEventsOptionalParameters) (<-chan datadog.PaginationResult[CIAppPipelineEvent], func(), error) { +func (a *CIVisibilityPipelinesApi) ListCIAppPipelineEventsWithPagination(ctx _context.Context, o ...ListCIAppPipelineEventsOptionalParameters) (<-chan datadog.PaginationResult[CIAppPipelineEvent], func()) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(10) if len(o) == 0 { @@ -301,7 +301,7 @@ func (a *CIVisibilityPipelinesApi) ListCIAppPipelineEventsWithPagination(ctx _co } close(items) }() - return items, cancel, nil + return items, cancel } // listCIAppPipelineEventsExecute executes the request. @@ -468,7 +468,7 @@ func (a *CIVisibilityPipelinesApi) SearchCIAppPipelineEvents(ctx _context.Contex } // SearchCIAppPipelineEventsWithPagination provides a paginated version of SearchCIAppPipelineEvents returning a channel with all items. -func (a *CIVisibilityPipelinesApi) SearchCIAppPipelineEventsWithPagination(ctx _context.Context, o ...SearchCIAppPipelineEventsOptionalParameters) (<-chan datadog.PaginationResult[CIAppPipelineEvent], func(), error) { +func (a *CIVisibilityPipelinesApi) SearchCIAppPipelineEventsWithPagination(ctx _context.Context, o ...SearchCIAppPipelineEventsOptionalParameters) (<-chan datadog.PaginationResult[CIAppPipelineEvent], func()) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(10) if len(o) == 0 { @@ -535,7 +535,7 @@ func (a *CIVisibilityPipelinesApi) SearchCIAppPipelineEventsWithPagination(ctx _ } close(items) }() - return items, cancel, nil + return items, cancel } // searchCIAppPipelineEventsExecute executes the request. diff --git a/api/datadogV2/api_ci_visibility_tests.go b/api/datadogV2/api_ci_visibility_tests.go index cffb1a1a44f..6daecb9dee4 100644 --- a/api/datadogV2/api_ci_visibility_tests.go +++ b/api/datadogV2/api_ci_visibility_tests.go @@ -240,7 +240,7 @@ func (a *CIVisibilityTestsApi) ListCIAppTestEvents(ctx _context.Context, o ...Li } // ListCIAppTestEventsWithPagination provides a paginated version of ListCIAppTestEvents returning a channel with all items. -func (a *CIVisibilityTestsApi) ListCIAppTestEventsWithPagination(ctx _context.Context, o ...ListCIAppTestEventsOptionalParameters) (<-chan datadog.PaginationResult[CIAppTestEvent], func(), error) { +func (a *CIVisibilityTestsApi) ListCIAppTestEventsWithPagination(ctx _context.Context, o ...ListCIAppTestEventsOptionalParameters) (<-chan datadog.PaginationResult[CIAppTestEvent], func()) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(10) if len(o) == 0 { @@ -301,7 +301,7 @@ func (a *CIVisibilityTestsApi) ListCIAppTestEventsWithPagination(ctx _context.Co } close(items) }() - return items, cancel, nil + return items, cancel } // listCIAppTestEventsExecute executes the request. @@ -468,7 +468,7 @@ func (a *CIVisibilityTestsApi) SearchCIAppTestEvents(ctx _context.Context, o ... } // SearchCIAppTestEventsWithPagination provides a paginated version of SearchCIAppTestEvents returning a channel with all items. -func (a *CIVisibilityTestsApi) SearchCIAppTestEventsWithPagination(ctx _context.Context, o ...SearchCIAppTestEventsOptionalParameters) (<-chan datadog.PaginationResult[CIAppTestEvent], func(), error) { +func (a *CIVisibilityTestsApi) SearchCIAppTestEventsWithPagination(ctx _context.Context, o ...SearchCIAppTestEventsOptionalParameters) (<-chan datadog.PaginationResult[CIAppTestEvent], func()) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(10) if len(o) == 0 { @@ -535,7 +535,7 @@ func (a *CIVisibilityTestsApi) SearchCIAppTestEventsWithPagination(ctx _context. } close(items) }() - return items, cancel, nil + return items, cancel } // searchCIAppTestEventsExecute executes the request. diff --git a/api/datadogV2/api_events.go b/api/datadogV2/api_events.go index 03f44584333..cde82165b0a 100644 --- a/api/datadogV2/api_events.go +++ b/api/datadogV2/api_events.go @@ -117,7 +117,7 @@ func (a *EventsApi) ListEvents(ctx _context.Context, o ...ListEventsOptionalPara } // ListEventsWithPagination provides a paginated version of ListEvents returning a channel with all items. -func (a *EventsApi) ListEventsWithPagination(ctx _context.Context, o ...ListEventsOptionalParameters) (<-chan datadog.PaginationResult[EventResponse], func(), error) { +func (a *EventsApi) ListEventsWithPagination(ctx _context.Context, o ...ListEventsOptionalParameters) (<-chan datadog.PaginationResult[EventResponse], func()) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(10) if len(o) == 0 { @@ -178,7 +178,7 @@ func (a *EventsApi) ListEventsWithPagination(ctx _context.Context, o ...ListEven } close(items) }() - return items, cancel, nil + return items, cancel } // listEventsExecute executes the request. @@ -352,7 +352,7 @@ func (a *EventsApi) SearchEvents(ctx _context.Context, o ...SearchEventsOptional } // SearchEventsWithPagination provides a paginated version of SearchEvents returning a channel with all items. -func (a *EventsApi) SearchEventsWithPagination(ctx _context.Context, o ...SearchEventsOptionalParameters) (<-chan datadog.PaginationResult[EventResponse], func(), error) { +func (a *EventsApi) SearchEventsWithPagination(ctx _context.Context, o ...SearchEventsOptionalParameters) (<-chan datadog.PaginationResult[EventResponse], func()) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(10) if len(o) == 0 { @@ -419,7 +419,7 @@ func (a *EventsApi) SearchEventsWithPagination(ctx _context.Context, o ...Search } close(items) }() - return items, cancel, nil + return items, cancel } // searchEventsExecute executes the request. diff --git a/api/datadogV2/api_incidents.go b/api/datadogV2/api_incidents.go index 0e0e5db964c..2e9b3eb2799 100644 --- a/api/datadogV2/api_incidents.go +++ b/api/datadogV2/api_incidents.go @@ -656,7 +656,7 @@ func (a *IncidentsApi) ListIncidents(ctx _context.Context, o ...ListIncidentsOpt } // ListIncidentsWithPagination provides a paginated version of ListIncidents returning a channel with all items. -func (a *IncidentsApi) ListIncidentsWithPagination(ctx _context.Context, o ...ListIncidentsOptionalParameters) (<-chan datadog.PaginationResult[IncidentResponseData], func(), error) { +func (a *IncidentsApi) ListIncidentsWithPagination(ctx _context.Context, o ...ListIncidentsOptionalParameters) (<-chan datadog.PaginationResult[IncidentResponseData], func()) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int64(10) if len(o) == 0 { @@ -709,7 +709,7 @@ func (a *IncidentsApi) ListIncidentsWithPagination(ctx _context.Context, o ...Li } close(items) }() - return items, cancel, nil + return items, cancel } // listIncidentsExecute executes the request. diff --git a/api/datadogV2/api_logs.go b/api/datadogV2/api_logs.go index ed43ff13bdf..08069a310fb 100644 --- a/api/datadogV2/api_logs.go +++ b/api/datadogV2/api_logs.go @@ -202,7 +202,7 @@ func (a *LogsApi) ListLogs(ctx _context.Context, o ...ListLogsOptionalParameters } // ListLogsWithPagination provides a paginated version of ListLogs returning a channel with all items. -func (a *LogsApi) ListLogsWithPagination(ctx _context.Context, o ...ListLogsOptionalParameters) (<-chan datadog.PaginationResult[Log], func(), error) { +func (a *LogsApi) ListLogsWithPagination(ctx _context.Context, o ...ListLogsOptionalParameters) (<-chan datadog.PaginationResult[Log], func()) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(10) if len(o) == 0 { @@ -269,7 +269,7 @@ func (a *LogsApi) ListLogsWithPagination(ctx _context.Context, o ...ListLogsOpti } close(items) }() - return items, cancel, nil + return items, cancel } // listLogsExecute executes the request. @@ -491,7 +491,7 @@ func (a *LogsApi) ListLogsGet(ctx _context.Context, o ...ListLogsGetOptionalPara } // ListLogsGetWithPagination provides a paginated version of ListLogsGet returning a channel with all items. -func (a *LogsApi) ListLogsGetWithPagination(ctx _context.Context, o ...ListLogsGetOptionalParameters) (<-chan datadog.PaginationResult[Log], func(), error) { +func (a *LogsApi) ListLogsGetWithPagination(ctx _context.Context, o ...ListLogsGetOptionalParameters) (<-chan datadog.PaginationResult[Log], func()) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(10) if len(o) == 0 { @@ -552,7 +552,7 @@ func (a *LogsApi) ListLogsGetWithPagination(ctx _context.Context, o ...ListLogsG } close(items) }() - return items, cancel, nil + return items, cancel } // listLogsGetExecute executes the request. diff --git a/api/datadogV2/api_processes.go b/api/datadogV2/api_processes.go index abd6f5262e3..85a73529309 100644 --- a/api/datadogV2/api_processes.go +++ b/api/datadogV2/api_processes.go @@ -112,7 +112,7 @@ func (a *ProcessesApi) ListProcesses(ctx _context.Context, o ...ListProcessesOpt } // ListProcessesWithPagination provides a paginated version of ListProcesses returning a channel with all items. -func (a *ProcessesApi) ListProcessesWithPagination(ctx _context.Context, o ...ListProcessesOptionalParameters) (<-chan datadog.PaginationResult[ProcessSummary], func(), error) { +func (a *ProcessesApi) ListProcessesWithPagination(ctx _context.Context, o ...ListProcessesOptionalParameters) (<-chan datadog.PaginationResult[ProcessSummary], func()) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(1000) if len(o) == 0 { @@ -173,7 +173,7 @@ func (a *ProcessesApi) ListProcessesWithPagination(ctx _context.Context, o ...Li } close(items) }() - return items, cancel, nil + return items, cancel } // listProcessesExecute executes the request. diff --git a/api/datadogV2/api_rum.go b/api/datadogV2/api_rum.go index 165daebdfb8..10a342a14c3 100644 --- a/api/datadogV2/api_rum.go +++ b/api/datadogV2/api_rum.go @@ -710,7 +710,7 @@ func (a *RUMApi) ListRUMEvents(ctx _context.Context, o ...ListRUMEventsOptionalP } // ListRUMEventsWithPagination provides a paginated version of ListRUMEvents returning a channel with all items. -func (a *RUMApi) ListRUMEventsWithPagination(ctx _context.Context, o ...ListRUMEventsOptionalParameters) (<-chan datadog.PaginationResult[RUMEvent], func(), error) { +func (a *RUMApi) ListRUMEventsWithPagination(ctx _context.Context, o ...ListRUMEventsOptionalParameters) (<-chan datadog.PaginationResult[RUMEvent], func()) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(10) if len(o) == 0 { @@ -771,7 +771,7 @@ func (a *RUMApi) ListRUMEventsWithPagination(ctx _context.Context, o ...ListRUME } close(items) }() - return items, cancel, nil + return items, cancel } // listRUMEventsExecute executes the request. @@ -916,7 +916,7 @@ func (a *RUMApi) SearchRUMEvents(ctx _context.Context, body RUMSearchEventsReque } // SearchRUMEventsWithPagination provides a paginated version of SearchRUMEvents returning a channel with all items. -func (a *RUMApi) SearchRUMEventsWithPagination(ctx _context.Context, body RUMSearchEventsRequest) (<-chan datadog.PaginationResult[RUMEvent], func(), error) { +func (a *RUMApi) SearchRUMEventsWithPagination(ctx _context.Context, body RUMSearchEventsRequest) (<-chan datadog.PaginationResult[RUMEvent], func()) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(10) if body.Page == nil { @@ -979,7 +979,7 @@ func (a *RUMApi) SearchRUMEventsWithPagination(ctx _context.Context, body RUMSea } close(items) }() - return items, cancel, nil + return items, cancel } // searchRUMEventsExecute executes the request. diff --git a/api/datadogV2/api_security_monitoring.go b/api/datadogV2/api_security_monitoring.go index 05215c304a0..42dd3a9f977 100644 --- a/api/datadogV2/api_security_monitoring.go +++ b/api/datadogV2/api_security_monitoring.go @@ -1597,7 +1597,7 @@ func (a *SecurityMonitoringApi) ListSecurityMonitoringSignals(ctx _context.Conte } // ListSecurityMonitoringSignalsWithPagination provides a paginated version of ListSecurityMonitoringSignals returning a channel with all items. -func (a *SecurityMonitoringApi) ListSecurityMonitoringSignalsWithPagination(ctx _context.Context, o ...ListSecurityMonitoringSignalsOptionalParameters) (<-chan datadog.PaginationResult[SecurityMonitoringSignal], func(), error) { +func (a *SecurityMonitoringApi) ListSecurityMonitoringSignalsWithPagination(ctx _context.Context, o ...ListSecurityMonitoringSignalsOptionalParameters) (<-chan datadog.PaginationResult[SecurityMonitoringSignal], func()) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(10) if len(o) == 0 { @@ -1658,7 +1658,7 @@ func (a *SecurityMonitoringApi) ListSecurityMonitoringSignalsWithPagination(ctx } close(items) }() - return items, cancel, nil + return items, cancel } // listSecurityMonitoringSignalsExecute executes the request. @@ -1824,7 +1824,7 @@ func (a *SecurityMonitoringApi) SearchSecurityMonitoringSignals(ctx _context.Con } // SearchSecurityMonitoringSignalsWithPagination provides a paginated version of SearchSecurityMonitoringSignals returning a channel with all items. -func (a *SecurityMonitoringApi) SearchSecurityMonitoringSignalsWithPagination(ctx _context.Context, o ...SearchSecurityMonitoringSignalsOptionalParameters) (<-chan datadog.PaginationResult[SecurityMonitoringSignal], func(), error) { +func (a *SecurityMonitoringApi) SearchSecurityMonitoringSignalsWithPagination(ctx _context.Context, o ...SearchSecurityMonitoringSignalsOptionalParameters) (<-chan datadog.PaginationResult[SecurityMonitoringSignal], func()) { ctx, cancel := _context.WithCancel(ctx) pageSize_ := int32(10) if len(o) == 0 { @@ -1891,7 +1891,7 @@ func (a *SecurityMonitoringApi) SearchSecurityMonitoringSignalsWithPagination(ct } close(items) }() - return items, cancel, nil + return items, cancel } // searchSecurityMonitoringSignalsExecute executes the request. diff --git a/doc.go b/doc.go index 35243228ed9..82cf4eecd02 100644 --- a/doc.go +++ b/doc.go @@ -146,13 +146,13 @@ // apiClient := datadog.NewAPIClient(configuration) // incidentsApi := datadogV2.NewIncidentsApi(apiClient) // -// resp, _, err := incidentsApi.ListIncidentsWithPagination(ctx, *datadog.NewListIncidentsOptionalParameters()) -// if err != nil { -// fmt.Fprintf(os.Stderr, "Error when calling `IncidentsApi.ListIncidents`: %v\n", err) -// } -// -// for incident := range resp { -// fmt.Fprintf(os.Stdout, "Got incident %s\n", incident.GetId()) +// resp, _ := incidentsApi.ListIncidentsWithPagination(ctx, *datadog.NewListIncidentsOptionalParameters()) +// for paginationResult := range resp { +// if paginationResult.Error != nil { +// fmt.Fprintf(os.Stderr, "Error when calling `IncidentsApi.ListIncidentsWithPagination`: %v\n", paginationResult.Error) +// } +// responseContent, _ := json.MarshalIndent(paginationResult.Item, "", " ") +// fmt.Fprintf(os.Stdout, "%s\n", responseContent) // } // // } diff --git a/examples/v2/audit/ListAuditLogs_1275402458.go b/examples/v2/audit/ListAuditLogs_1275402458.go index 39f6a45122a..0c7c9cba0dd 100644 --- a/examples/v2/audit/ListAuditLogs_1275402458.go +++ b/examples/v2/audit/ListAuditLogs_1275402458.go @@ -17,14 +17,13 @@ func main() { configuration := datadog.NewConfiguration() apiClient := datadog.NewAPIClient(configuration) api := datadogV2.NewAuditApi(apiClient) - resp, _, err := api.ListAuditLogsWithPagination(ctx, *datadogV2.NewListAuditLogsOptionalParameters().WithPageLimit(2)) + resp, _ := api.ListAuditLogsWithPagination(ctx, *datadogV2.NewListAuditLogsOptionalParameters().WithPageLimit(2)) - if err != nil { - fmt.Fprintf(os.Stderr, "Error when calling `AuditApi.ListAuditLogs`: %v\n", err) - } - - for item := range resp { - responseContent, _ := json.MarshalIndent(item, "", " ") + for paginationResult := range resp { + if paginationResult.Error != nil { + fmt.Fprintf(os.Stderr, "Error when calling `AuditApi.ListAuditLogs`: %v\n", paginationResult.Error) + } + responseContent, _ := json.MarshalIndent(paginationResult.Item, "", " ") fmt.Fprintf(os.Stdout, "%s\n", responseContent) } } diff --git a/examples/v2/audit/SearchAuditLogs_3215529662.go b/examples/v2/audit/SearchAuditLogs_3215529662.go index 5d9653fff61..0274ef2f22b 100644 --- a/examples/v2/audit/SearchAuditLogs_3215529662.go +++ b/examples/v2/audit/SearchAuditLogs_3215529662.go @@ -30,14 +30,13 @@ func main() { configuration := datadog.NewConfiguration() apiClient := datadog.NewAPIClient(configuration) api := datadogV2.NewAuditApi(apiClient) - resp, _, err := api.SearchAuditLogsWithPagination(ctx, *datadogV2.NewSearchAuditLogsOptionalParameters().WithBody(body)) + resp, _ := api.SearchAuditLogsWithPagination(ctx, *datadogV2.NewSearchAuditLogsOptionalParameters().WithBody(body)) - if err != nil { - fmt.Fprintf(os.Stderr, "Error when calling `AuditApi.SearchAuditLogs`: %v\n", err) - } - - for item := range resp { - responseContent, _ := json.MarshalIndent(item, "", " ") + for paginationResult := range resp { + if paginationResult.Error != nil { + fmt.Fprintf(os.Stderr, "Error when calling `AuditApi.SearchAuditLogs`: %v\n", paginationResult.Error) + } + responseContent, _ := json.MarshalIndent(paginationResult.Item, "", " ") fmt.Fprintf(os.Stdout, "%s\n", responseContent) } } diff --git a/examples/v2/ci-visibility-pipelines/ListCIAppPipelineEvents_1270618359.go b/examples/v2/ci-visibility-pipelines/ListCIAppPipelineEvents_1270618359.go index a6e4eeed139..c155c185c38 100644 --- a/examples/v2/ci-visibility-pipelines/ListCIAppPipelineEvents_1270618359.go +++ b/examples/v2/ci-visibility-pipelines/ListCIAppPipelineEvents_1270618359.go @@ -18,14 +18,13 @@ func main() { configuration := datadog.NewConfiguration() apiClient := datadog.NewAPIClient(configuration) api := datadogV2.NewCIVisibilityPipelinesApi(apiClient) - resp, _, err := api.ListCIAppPipelineEventsWithPagination(ctx, *datadogV2.NewListCIAppPipelineEventsOptionalParameters().WithFilterFrom(time.Now().Add(time.Second * -30)).WithFilterTo(time.Now()).WithPageLimit(2)) + resp, _ := api.ListCIAppPipelineEventsWithPagination(ctx, *datadogV2.NewListCIAppPipelineEventsOptionalParameters().WithFilterFrom(time.Now().Add(time.Second * -30)).WithFilterTo(time.Now()).WithPageLimit(2)) - if err != nil { - fmt.Fprintf(os.Stderr, "Error when calling `CIVisibilityPipelinesApi.ListCIAppPipelineEvents`: %v\n", err) - } - - for item := range resp { - responseContent, _ := json.MarshalIndent(item, "", " ") + for paginationResult := range resp { + if paginationResult.Error != nil { + fmt.Fprintf(os.Stderr, "Error when calling `CIVisibilityPipelinesApi.ListCIAppPipelineEvents`: %v\n", paginationResult.Error) + } + responseContent, _ := json.MarshalIndent(paginationResult.Item, "", " ") fmt.Fprintf(os.Stdout, "%s\n", responseContent) } } diff --git a/examples/v2/ci-visibility-pipelines/SearchCIAppPipelineEvents_3246135003.go b/examples/v2/ci-visibility-pipelines/SearchCIAppPipelineEvents_3246135003.go index 7b31cc10053..7d8a85ba743 100644 --- a/examples/v2/ci-visibility-pipelines/SearchCIAppPipelineEvents_3246135003.go +++ b/examples/v2/ci-visibility-pipelines/SearchCIAppPipelineEvents_3246135003.go @@ -30,14 +30,13 @@ func main() { configuration := datadog.NewConfiguration() apiClient := datadog.NewAPIClient(configuration) api := datadogV2.NewCIVisibilityPipelinesApi(apiClient) - resp, _, err := api.SearchCIAppPipelineEventsWithPagination(ctx, *datadogV2.NewSearchCIAppPipelineEventsOptionalParameters().WithBody(body)) + resp, _ := api.SearchCIAppPipelineEventsWithPagination(ctx, *datadogV2.NewSearchCIAppPipelineEventsOptionalParameters().WithBody(body)) - if err != nil { - fmt.Fprintf(os.Stderr, "Error when calling `CIVisibilityPipelinesApi.SearchCIAppPipelineEvents`: %v\n", err) - } - - for item := range resp { - responseContent, _ := json.MarshalIndent(item, "", " ") + for paginationResult := range resp { + if paginationResult.Error != nil { + fmt.Fprintf(os.Stderr, "Error when calling `CIVisibilityPipelinesApi.SearchCIAppPipelineEvents`: %v\n", paginationResult.Error) + } + responseContent, _ := json.MarshalIndent(paginationResult.Item, "", " ") fmt.Fprintf(os.Stdout, "%s\n", responseContent) } } diff --git a/examples/v2/ci-visibility-tests/ListCIAppTestEvents_3852605281.go b/examples/v2/ci-visibility-tests/ListCIAppTestEvents_3852605281.go index 14ba5e1b66d..6ea0520a019 100644 --- a/examples/v2/ci-visibility-tests/ListCIAppTestEvents_3852605281.go +++ b/examples/v2/ci-visibility-tests/ListCIAppTestEvents_3852605281.go @@ -18,14 +18,13 @@ func main() { configuration := datadog.NewConfiguration() apiClient := datadog.NewAPIClient(configuration) api := datadogV2.NewCIVisibilityTestsApi(apiClient) - resp, _, err := api.ListCIAppTestEventsWithPagination(ctx, *datadogV2.NewListCIAppTestEventsOptionalParameters().WithFilterFrom(time.Now().Add(time.Second * -30)).WithFilterTo(time.Now()).WithPageLimit(2)) + resp, _ := api.ListCIAppTestEventsWithPagination(ctx, *datadogV2.NewListCIAppTestEventsOptionalParameters().WithFilterFrom(time.Now().Add(time.Second * -30)).WithFilterTo(time.Now()).WithPageLimit(2)) - if err != nil { - fmt.Fprintf(os.Stderr, "Error when calling `CIVisibilityTestsApi.ListCIAppTestEvents`: %v\n", err) - } - - for item := range resp { - responseContent, _ := json.MarshalIndent(item, "", " ") + for paginationResult := range resp { + if paginationResult.Error != nil { + fmt.Fprintf(os.Stderr, "Error when calling `CIVisibilityTestsApi.ListCIAppTestEvents`: %v\n", paginationResult.Error) + } + responseContent, _ := json.MarshalIndent(paginationResult.Item, "", " ") fmt.Fprintf(os.Stdout, "%s\n", responseContent) } } diff --git a/examples/v2/ci-visibility-tests/SearchCIAppTestEvents_1675695429.go b/examples/v2/ci-visibility-tests/SearchCIAppTestEvents_1675695429.go index 3684d2328b1..07f371cd957 100644 --- a/examples/v2/ci-visibility-tests/SearchCIAppTestEvents_1675695429.go +++ b/examples/v2/ci-visibility-tests/SearchCIAppTestEvents_1675695429.go @@ -28,14 +28,13 @@ func main() { configuration := datadog.NewConfiguration() apiClient := datadog.NewAPIClient(configuration) api := datadogV2.NewCIVisibilityTestsApi(apiClient) - resp, _, err := api.SearchCIAppTestEventsWithPagination(ctx, *datadogV2.NewSearchCIAppTestEventsOptionalParameters().WithBody(body)) + resp, _ := api.SearchCIAppTestEventsWithPagination(ctx, *datadogV2.NewSearchCIAppTestEventsOptionalParameters().WithBody(body)) - if err != nil { - fmt.Fprintf(os.Stderr, "Error when calling `CIVisibilityTestsApi.SearchCIAppTestEvents`: %v\n", err) - } - - for item := range resp { - responseContent, _ := json.MarshalIndent(item, "", " ") + for paginationResult := range resp { + if paginationResult.Error != nil { + fmt.Fprintf(os.Stderr, "Error when calling `CIVisibilityTestsApi.SearchCIAppTestEvents`: %v\n", paginationResult.Error) + } + responseContent, _ := json.MarshalIndent(paginationResult.Item, "", " ") fmt.Fprintf(os.Stdout, "%s\n", responseContent) } } diff --git a/examples/v2/events/ListEvents_1527584014.go b/examples/v2/events/ListEvents_1527584014.go index e79f8f6cb93..121dced4fb4 100644 --- a/examples/v2/events/ListEvents_1527584014.go +++ b/examples/v2/events/ListEvents_1527584014.go @@ -18,14 +18,13 @@ func main() { configuration.SetUnstableOperationEnabled("v2.ListEvents", true) apiClient := datadog.NewAPIClient(configuration) api := datadogV2.NewEventsApi(apiClient) - resp, _, err := api.ListEventsWithPagination(ctx, *datadogV2.NewListEventsOptionalParameters().WithFilterFrom("now-15m").WithFilterTo("now").WithPageLimit(2)) + resp, _ := api.ListEventsWithPagination(ctx, *datadogV2.NewListEventsOptionalParameters().WithFilterFrom("now-15m").WithFilterTo("now").WithPageLimit(2)) - if err != nil { - fmt.Fprintf(os.Stderr, "Error when calling `EventsApi.ListEvents`: %v\n", err) - } - - for item := range resp { - responseContent, _ := json.MarshalIndent(item, "", " ") + for paginationResult := range resp { + if paginationResult.Error != nil { + fmt.Fprintf(os.Stderr, "Error when calling `EventsApi.ListEvents`: %v\n", paginationResult.Error) + } + responseContent, _ := json.MarshalIndent(paginationResult.Item, "", " ") fmt.Fprintf(os.Stdout, "%s\n", responseContent) } } diff --git a/examples/v2/events/SearchEvents_3856995058.go b/examples/v2/events/SearchEvents_3856995058.go index 53fffa979d9..9e54efb32d0 100644 --- a/examples/v2/events/SearchEvents_3856995058.go +++ b/examples/v2/events/SearchEvents_3856995058.go @@ -31,14 +31,13 @@ func main() { configuration.SetUnstableOperationEnabled("v2.SearchEvents", true) apiClient := datadog.NewAPIClient(configuration) api := datadogV2.NewEventsApi(apiClient) - resp, _, err := api.SearchEventsWithPagination(ctx, *datadogV2.NewSearchEventsOptionalParameters().WithBody(body)) + resp, _ := api.SearchEventsWithPagination(ctx, *datadogV2.NewSearchEventsOptionalParameters().WithBody(body)) - if err != nil { - fmt.Fprintf(os.Stderr, "Error when calling `EventsApi.SearchEvents`: %v\n", err) - } - - for item := range resp { - responseContent, _ := json.MarshalIndent(item, "", " ") + for paginationResult := range resp { + if paginationResult.Error != nil { + fmt.Fprintf(os.Stderr, "Error when calling `EventsApi.SearchEvents`: %v\n", paginationResult.Error) + } + responseContent, _ := json.MarshalIndent(paginationResult.Item, "", " ") fmt.Fprintf(os.Stdout, "%s\n", responseContent) } } diff --git a/examples/v2/incidents/ListIncidents_2665616954.go b/examples/v2/incidents/ListIncidents_2665616954.go index d218e39148e..46e01ea125e 100644 --- a/examples/v2/incidents/ListIncidents_2665616954.go +++ b/examples/v2/incidents/ListIncidents_2665616954.go @@ -18,14 +18,13 @@ func main() { configuration.SetUnstableOperationEnabled("v2.ListIncidents", true) apiClient := datadog.NewAPIClient(configuration) api := datadogV2.NewIncidentsApi(apiClient) - resp, _, err := api.ListIncidentsWithPagination(ctx, *datadogV2.NewListIncidentsOptionalParameters().WithPageSize(2)) + resp, _ := api.ListIncidentsWithPagination(ctx, *datadogV2.NewListIncidentsOptionalParameters().WithPageSize(2)) - if err != nil { - fmt.Fprintf(os.Stderr, "Error when calling `IncidentsApi.ListIncidents`: %v\n", err) - } - - for item := range resp { - responseContent, _ := json.MarshalIndent(item, "", " ") + for paginationResult := range resp { + if paginationResult.Error != nil { + fmt.Fprintf(os.Stderr, "Error when calling `IncidentsApi.ListIncidents`: %v\n", paginationResult.Error) + } + responseContent, _ := json.MarshalIndent(paginationResult.Item, "", " ") fmt.Fprintf(os.Stdout, "%s\n", responseContent) } } diff --git a/examples/v2/logs/ListLogsGet_738202670.go b/examples/v2/logs/ListLogsGet_738202670.go index 0eeda783c47..3bab229686b 100644 --- a/examples/v2/logs/ListLogsGet_738202670.go +++ b/examples/v2/logs/ListLogsGet_738202670.go @@ -17,14 +17,13 @@ func main() { configuration := datadog.NewConfiguration() apiClient := datadog.NewAPIClient(configuration) api := datadogV2.NewLogsApi(apiClient) - resp, _, err := api.ListLogsGetWithPagination(ctx, *datadogV2.NewListLogsGetOptionalParameters().WithPageLimit(2)) + resp, _ := api.ListLogsGetWithPagination(ctx, *datadogV2.NewListLogsGetOptionalParameters().WithPageLimit(2)) - if err != nil { - fmt.Fprintf(os.Stderr, "Error when calling `LogsApi.ListLogsGet`: %v\n", err) - } - - for item := range resp { - responseContent, _ := json.MarshalIndent(item, "", " ") + for paginationResult := range resp { + if paginationResult.Error != nil { + fmt.Fprintf(os.Stderr, "Error when calling `LogsApi.ListLogsGet`: %v\n", paginationResult.Error) + } + responseContent, _ := json.MarshalIndent(paginationResult.Item, "", " ") fmt.Fprintf(os.Stdout, "%s\n", responseContent) } } diff --git a/examples/v2/logs/ListLogs_3138392594.go b/examples/v2/logs/ListLogs_3138392594.go index d10317a0d9d..9036556dc1f 100644 --- a/examples/v2/logs/ListLogs_3138392594.go +++ b/examples/v2/logs/ListLogs_3138392594.go @@ -33,14 +33,13 @@ func main() { configuration := datadog.NewConfiguration() apiClient := datadog.NewAPIClient(configuration) api := datadogV2.NewLogsApi(apiClient) - resp, _, err := api.ListLogsWithPagination(ctx, *datadogV2.NewListLogsOptionalParameters().WithBody(body)) + resp, _ := api.ListLogsWithPagination(ctx, *datadogV2.NewListLogsOptionalParameters().WithBody(body)) - if err != nil { - fmt.Fprintf(os.Stderr, "Error when calling `LogsApi.ListLogs`: %v\n", err) - } - - for item := range resp { - responseContent, _ := json.MarshalIndent(item, "", " ") + for paginationResult := range resp { + if paginationResult.Error != nil { + fmt.Fprintf(os.Stderr, "Error when calling `LogsApi.ListLogs`: %v\n", paginationResult.Error) + } + responseContent, _ := json.MarshalIndent(paginationResult.Item, "", " ") fmt.Fprintf(os.Stdout, "%s\n", responseContent) } } diff --git a/examples/v2/processes/ListProcesses_797840471.go b/examples/v2/processes/ListProcesses_797840471.go index c211dc2a4d3..ed9c6425266 100644 --- a/examples/v2/processes/ListProcesses_797840471.go +++ b/examples/v2/processes/ListProcesses_797840471.go @@ -17,14 +17,13 @@ func main() { configuration := datadog.NewConfiguration() apiClient := datadog.NewAPIClient(configuration) api := datadogV2.NewProcessesApi(apiClient) - resp, _, err := api.ListProcessesWithPagination(ctx, *datadogV2.NewListProcessesOptionalParameters().WithPageLimit(2)) + resp, _ := api.ListProcessesWithPagination(ctx, *datadogV2.NewListProcessesOptionalParameters().WithPageLimit(2)) - if err != nil { - fmt.Fprintf(os.Stderr, "Error when calling `ProcessesApi.ListProcesses`: %v\n", err) - } - - for item := range resp { - responseContent, _ := json.MarshalIndent(item, "", " ") + for paginationResult := range resp { + if paginationResult.Error != nil { + fmt.Fprintf(os.Stderr, "Error when calling `ProcessesApi.ListProcesses`: %v\n", paginationResult.Error) + } + responseContent, _ := json.MarshalIndent(paginationResult.Item, "", " ") fmt.Fprintf(os.Stdout, "%s\n", responseContent) } } diff --git a/examples/v2/rum/ListRUMEvents_2680821282.go b/examples/v2/rum/ListRUMEvents_2680821282.go index 9dc1b5856c7..cb6efca9b65 100644 --- a/examples/v2/rum/ListRUMEvents_2680821282.go +++ b/examples/v2/rum/ListRUMEvents_2680821282.go @@ -17,14 +17,13 @@ func main() { configuration := datadog.NewConfiguration() apiClient := datadog.NewAPIClient(configuration) api := datadogV2.NewRUMApi(apiClient) - resp, _, err := api.ListRUMEventsWithPagination(ctx, *datadogV2.NewListRUMEventsOptionalParameters().WithPageLimit(2)) + resp, _ := api.ListRUMEventsWithPagination(ctx, *datadogV2.NewListRUMEventsOptionalParameters().WithPageLimit(2)) - if err != nil { - fmt.Fprintf(os.Stderr, "Error when calling `RUMApi.ListRUMEvents`: %v\n", err) - } - - for item := range resp { - responseContent, _ := json.MarshalIndent(item, "", " ") + for paginationResult := range resp { + if paginationResult.Error != nil { + fmt.Fprintf(os.Stderr, "Error when calling `RUMApi.ListRUMEvents`: %v\n", paginationResult.Error) + } + responseContent, _ := json.MarshalIndent(paginationResult.Item, "", " ") fmt.Fprintf(os.Stdout, "%s\n", responseContent) } } diff --git a/examples/v2/rum/SearchRUMEvents_574690310.go b/examples/v2/rum/SearchRUMEvents_574690310.go index 7cc4eea9f33..b23b940d918 100644 --- a/examples/v2/rum/SearchRUMEvents_574690310.go +++ b/examples/v2/rum/SearchRUMEvents_574690310.go @@ -32,14 +32,13 @@ func main() { configuration := datadog.NewConfiguration() apiClient := datadog.NewAPIClient(configuration) api := datadogV2.NewRUMApi(apiClient) - resp, _, err := api.SearchRUMEventsWithPagination(ctx, body) + resp, _ := api.SearchRUMEventsWithPagination(ctx, body) - if err != nil { - fmt.Fprintf(os.Stderr, "Error when calling `RUMApi.SearchRUMEvents`: %v\n", err) - } - - for item := range resp { - responseContent, _ := json.MarshalIndent(item, "", " ") + for paginationResult := range resp { + if paginationResult.Error != nil { + fmt.Fprintf(os.Stderr, "Error when calling `RUMApi.SearchRUMEvents`: %v\n", paginationResult.Error) + } + responseContent, _ := json.MarshalIndent(paginationResult.Item, "", " ") fmt.Fprintf(os.Stdout, "%s\n", responseContent) } } diff --git a/examples/v2/security-monitoring/ListSecurityMonitoringSignals_3960412991.go b/examples/v2/security-monitoring/ListSecurityMonitoringSignals_3960412991.go index 6488fd4ac2d..e748e68e336 100644 --- a/examples/v2/security-monitoring/ListSecurityMonitoringSignals_3960412991.go +++ b/examples/v2/security-monitoring/ListSecurityMonitoringSignals_3960412991.go @@ -17,14 +17,13 @@ func main() { configuration := datadog.NewConfiguration() apiClient := datadog.NewAPIClient(configuration) api := datadogV2.NewSecurityMonitoringApi(apiClient) - resp, _, err := api.ListSecurityMonitoringSignalsWithPagination(ctx, *datadogV2.NewListSecurityMonitoringSignalsOptionalParameters().WithPageLimit(2)) + resp, _ := api.ListSecurityMonitoringSignalsWithPagination(ctx, *datadogV2.NewListSecurityMonitoringSignalsOptionalParameters().WithPageLimit(2)) - if err != nil { - fmt.Fprintf(os.Stderr, "Error when calling `SecurityMonitoringApi.ListSecurityMonitoringSignals`: %v\n", err) - } - - for item := range resp { - responseContent, _ := json.MarshalIndent(item, "", " ") + for paginationResult := range resp { + if paginationResult.Error != nil { + fmt.Fprintf(os.Stderr, "Error when calling `SecurityMonitoringApi.ListSecurityMonitoringSignals`: %v\n", paginationResult.Error) + } + responseContent, _ := json.MarshalIndent(paginationResult.Item, "", " ") fmt.Fprintf(os.Stdout, "%s\n", responseContent) } } diff --git a/examples/v2/security-monitoring/SearchSecurityMonitoringSignals_1309350146.go b/examples/v2/security-monitoring/SearchSecurityMonitoringSignals_1309350146.go index f58f83526a5..28679ba03bc 100644 --- a/examples/v2/security-monitoring/SearchSecurityMonitoringSignals_1309350146.go +++ b/examples/v2/security-monitoring/SearchSecurityMonitoringSignals_1309350146.go @@ -29,14 +29,13 @@ func main() { configuration := datadog.NewConfiguration() apiClient := datadog.NewAPIClient(configuration) api := datadogV2.NewSecurityMonitoringApi(apiClient) - resp, _, err := api.SearchSecurityMonitoringSignalsWithPagination(ctx, *datadogV2.NewSearchSecurityMonitoringSignalsOptionalParameters().WithBody(body)) + resp, _ := api.SearchSecurityMonitoringSignalsWithPagination(ctx, *datadogV2.NewSearchSecurityMonitoringSignalsOptionalParameters().WithBody(body)) - if err != nil { - fmt.Fprintf(os.Stderr, "Error when calling `SecurityMonitoringApi.SearchSecurityMonitoringSignals`: %v\n", err) - } - - for item := range resp { - responseContent, _ := json.MarshalIndent(item, "", " ") + for paginationResult := range resp { + if paginationResult.Error != nil { + fmt.Fprintf(os.Stderr, "Error when calling `SecurityMonitoringApi.SearchSecurityMonitoringSignals`: %v\n", paginationResult.Error) + } + responseContent, _ := json.MarshalIndent(paginationResult.Item, "", " ") fmt.Fprintf(os.Stdout, "%s\n", responseContent) } } From 552959fc6de246a44339f108605c31e8b19d4173 Mon Sep 17 00:00:00 2001 From: Sherzod Karimov Date: Wed, 16 Nov 2022 15:32:45 -0500 Subject: [PATCH 7/7] fix test --- tests/scenarios/step_definitions.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/scenarios/step_definitions.go b/tests/scenarios/step_definitions.go index 6771be8af22..103d3b06918 100644 --- a/tests/scenarios/step_definitions.go +++ b/tests/scenarios/step_definitions.go @@ -280,9 +280,6 @@ func requestWithPaginationIsSent(t gobdd.StepTest, ctx gobdd.Context) { return } - if result[2].Interface() != nil { - t.Errorf("unexpected error: %v", result[2].Interface()) - } var responseJSON interface{} if err != nil { err := err.(datadog.GenericOpenAPIError)