Skip to content

Align CI event search schemas with API #4326

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

Closed
api-clients-generation-pipeline wants to merge 1 commit into from
Closed

Align CI event search schemas with API #4326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 25 additions & 1 deletion .generator/schemas/v2/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14574,6 +14574,7 @@ components:
type: string
x-enum-varnames: ["CIPIPELINE_RESOURCE_REQUEST"]
CIAppEventAttributes:
additionalProperties: {}
description: JSON object containing all event attributes and their associated values.
properties:
attributes:
Expand Down Expand Up @@ -14895,6 +14896,7 @@ components:
$ref: "#/components/schemas/CIAppPipelineEventTypeName"
type: object
CIAppPipelineEventAttributes:
additionalProperties: {}
description: JSON object containing all event attributes and their associated values.
properties:
attributes:
Expand Down Expand Up @@ -15789,7 +15791,7 @@ components:
options:
$ref: "#/components/schemas/CIAppQueryOptions"
page:
$ref: "#/components/schemas/CIAppQueryPageOptions"
$ref: "#/components/schemas/CIAppTestQueryPageOptions"
sort:
$ref: "#/components/schemas/CIAppSort"
type: object
Expand All @@ -15812,6 +15814,28 @@ components:
example: test
type: string
x-enum-varnames: ["SESSION", "MODULE", "SUITE", "TEST"]
CIAppTestQueryPageLimit:
default: 10
description: Maximum number of events in the response, supplied as an integer or a string containing decimal digits.
example: 25
oneOf:
- format: int32
maximum: 1000
minimum: 0
type: integer
- pattern: "^(?:[0-9]{1,3}|1000)$"
type: string
CIAppTestQueryPageOptions:
description: Paging attributes for listing test events.
properties:
cursor:
description: |-
List following results with a cursor provided in the previous query.
example: "eyJzdGFydEF0IjoiQVFBQUFYS2tMS3pPbm40NGV3QUFBQUJCV0V0clRFdDZVbG8zY3pCRmNsbHJiVmxDWlEifQ=="
type: string
limit:
$ref: "#/components/schemas/CIAppTestQueryPageLimit"
type: object
CIAppTestsAggregateRequest:
description: The object sent with the request to retrieve aggregation buckets of test events from your organization.
properties:
Expand Down
5 changes: 3 additions & 2 deletions examples/v2/ci-visibility-tests/SearchCIAppTestEvents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
import com.datadog.api.client.v2.api.CiVisibilityTestsApi;
import com.datadog.api.client.v2.api.CiVisibilityTestsApi.SearchCIAppTestEventsOptionalParameters;
import com.datadog.api.client.v2.model.CIAppQueryOptions;
import com.datadog.api.client.v2.model.CIAppQueryPageOptions;
import com.datadog.api.client.v2.model.CIAppSort;
import com.datadog.api.client.v2.model.CIAppTestEventsRequest;
import com.datadog.api.client.v2.model.CIAppTestEventsResponse;
import com.datadog.api.client.v2.model.CIAppTestQueryPageLimit;
import com.datadog.api.client.v2.model.CIAppTestQueryPageOptions;
import com.datadog.api.client.v2.model.CIAppTestsQueryFilter;

public class Example {
Expand All @@ -24,7 +25,7 @@ public static void main(String[] args) {
.query("@test.service:web-ui-tests AND @test.status:skip")
.to("now"))
.options(new CIAppQueryOptions().timezone("GMT"))
.page(new CIAppQueryPageOptions().limit(25))
.page(new CIAppTestQueryPageOptions().limit(new CIAppTestQueryPageLimit(25)))
.sort(CIAppSort.TIMESTAMP_ASCENDING);

try {
Expand Down
5 changes: 3 additions & 2 deletions examples/v2/ci-visibility-tests/SearchCIAppTestEvents_1675695429.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
import com.datadog.api.client.PaginationIterable;
import com.datadog.api.client.v2.api.CiVisibilityTestsApi;
import com.datadog.api.client.v2.api.CiVisibilityTestsApi.SearchCIAppTestEventsOptionalParameters;
import com.datadog.api.client.v2.model.CIAppQueryPageOptions;
import com.datadog.api.client.v2.model.CIAppSort;
import com.datadog.api.client.v2.model.CIAppTestEvent;
import com.datadog.api.client.v2.model.CIAppTestEventsRequest;
import com.datadog.api.client.v2.model.CIAppTestQueryPageLimit;
import com.datadog.api.client.v2.model.CIAppTestQueryPageOptions;
import com.datadog.api.client.v2.model.CIAppTestsQueryFilter;

public class Example {
Expand All @@ -22,7 +23,7 @@ public static void main(String[] args) {
.from("now-15m")
.query("@test.status:pass AND -@language:python")
.to("now"))
.page(new CIAppQueryPageOptions().limit(2))
.page(new CIAppTestQueryPageOptions().limit(new CIAppTestQueryPageLimit(2)))
.sort(CIAppSort.TIMESTAMP_ASCENDING);

try {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/datadog/api/client/v2/api/CiVisibilityTestsApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
import com.datadog.api.client.ApiResponse;
import com.datadog.api.client.PaginationIterable;
import com.datadog.api.client.Pair;
import com.datadog.api.client.v2.model.CIAppQueryPageOptions;
import com.datadog.api.client.v2.model.CIAppSort;
import com.datadog.api.client.v2.model.CIAppTestEvent;
import com.datadog.api.client.v2.model.CIAppTestEventsRequest;
import com.datadog.api.client.v2.model.CIAppTestEventsResponse;
import com.datadog.api.client.v2.model.CIAppTestQueryPageOptions;
import com.datadog.api.client.v2.model.CIAppTestsAggregateRequest;
import com.datadog.api.client.v2.model.CIAppTestsAnalyticsAggregateResponse;
import jakarta.ws.rs.client.Invocation;
Expand Down Expand Up @@ -600,14 +600,14 @@ public PaginationIterable<CIAppTestEvent> searchCIAppTestEventsWithPagination(
String valueGetterPath = "getMeta.getPage.getAfter";
String valueSetterPath = "body.getPage.setCursor";
Boolean valueSetterParamOptional = true;
Integer limit;
CIAppTestQueryPageLimit limit;

if (parameters.body == null) {
parameters.body(new CIAppTestEventsRequest());
}

if (parameters.body.getPage() == null) {
parameters.body.setPage(new CIAppQueryPageOptions());
parameters.body.setPage(new CIAppTestQueryPageOptions());
}

if (parameters.body.getPage().getLimit() == null) {
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/datadog/api/client/v2/model/CIAppTestEventsRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class CIAppTestEventsRequest {
private CIAppQueryOptions options;

public static final String JSON_PROPERTY_PAGE = "page";
private CIAppQueryPageOptions page;
private CIAppTestQueryPageOptions page;

public static final String JSON_PROPERTY_SORT = "sort";
private CIAppSort sort;
Expand Down Expand Up @@ -90,25 +90,25 @@ public void setOptions(CIAppQueryOptions options) {
}
}

public CIAppTestEventsRequest page(CIAppQueryPageOptions page) {
public CIAppTestEventsRequest page(CIAppTestQueryPageOptions page) {
this.page = page;
this.unparsed |= page.unparsed;
return this;
}

/**
* Paging attributes for listing events.
* Paging attributes for listing test events.
*
* @return page
*/
@jakarta.annotation.Nullable
@JsonProperty(JSON_PROPERTY_PAGE)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public CIAppQueryPageOptions getPage() {
public CIAppTestQueryPageOptions getPage() {
return page;
}

public void setPage(CIAppQueryPageOptions page) {
public void setPage(CIAppTestQueryPageOptions page) {
this.page = page;
if (page != null) {
this.unparsed |= page.unparsed;
Expand Down
Loading
Loading