Skip to content

Fix Org Groups pagination response shape (meta.page + links) #3782

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
api-clients-generation-pipeline merged 1 commit into from
May 4, 2026
Merged

Fix Org Groups pagination response shape (meta.page + links) #3782

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
133 changes: 120 additions & 13 deletions .generator/schemas/v2/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51964,6 +51964,8 @@ components:
items:
$ref: "#/components/schemas/OrgGroupMembershipData"
type: array
links:
$ref: "#/components/schemas/OrgGroupPaginationLinks"
meta:
$ref: "#/components/schemas/OrgGroupPaginationMeta"
required:
Expand Down Expand Up @@ -52081,6 +52083,8 @@ components:
items:
$ref: "#/components/schemas/OrgGroupMembershipData"
type: array
links:
$ref: "#/components/schemas/OrgGroupPaginationLinks"
meta:
$ref: "#/components/schemas/OrgGroupPaginationMeta"
required:
Expand Down Expand Up @@ -52181,24 +52185,71 @@ components:
required:
- data
type: object
OrgGroupPaginationLinks:
description: Pagination links for navigating between pages of an org group list response.
properties:
first:
description: Link to the first page.
type: string
last:
description: Link to the last page.
type: string
next:
description: Link to the next page.
nullable: true
type: string
prev:
description: Link to the previous page.
nullable: true
type: string
self:
description: Link to the current page.
type: string
type: object
OrgGroupPaginationMeta:
description: Pagination metadata.
description: Pagination metadata for org group list responses.
properties:
page:
$ref: "#/components/schemas/OrgGroupPaginationMetaPage"
required:
- page
type: object
OrgGroupPaginationMetaPage:
description: Page-based pagination details.
description: Page-based pagination details for org group list responses.
properties:
total_count:
description: The total number of items.
example: 42
first_number:
description: First page number.
format: int64
type: integer
required:
- total_count
last_number:
description: Last page number.
format: int64
nullable: true
type: integer
next_number:
description: Next page number.
format: int64
nullable: true
type: integer
number:
description: Page number.
format: int64
type: integer
prev_number:
description: Previous page number.
format: int64
nullable: true
type: integer
size:
description: Page size.
format: int64
type: integer
total:
description: Total number of results.
format: int64
type: integer
type:
description: Pagination type.
example: "number_size"
type: string
type: object
OrgGroupPolicyAttributes:
description: Attributes of an org group policy.
Expand Down Expand Up @@ -52388,6 +52439,8 @@ components:
items:
$ref: "#/components/schemas/OrgGroupPolicyData"
type: array
links:
$ref: "#/components/schemas/OrgGroupPaginationLinks"
meta:
$ref: "#/components/schemas/OrgGroupPaginationMeta"
required:
Expand Down Expand Up @@ -52501,6 +52554,8 @@ components:
items:
$ref: "#/components/schemas/OrgGroupPolicyOverrideData"
type: array
links:
$ref: "#/components/schemas/OrgGroupPaginationLinks"
meta:
$ref: "#/components/schemas/OrgGroupPaginationMeta"
required:
Expand Down Expand Up @@ -111582,9 +111637,22 @@ paths:
id: "a1b2c3d4-e5f6-7890-abcd-ef0123456789"
type: org_groups
type: org_group_memberships
links:
first: "https://api.datadoghq.com/api/v2/org_group_memberships?filter%5Borg_group_id%5D=a1b2c3d4-e5f6-7890-abcd-ef0123456789&page%5Bnumber%5D=0&page%5Bsize%5D=50"
last: "https://api.datadoghq.com/api/v2/org_group_memberships?filter%5Borg_group_id%5D=a1b2c3d4-e5f6-7890-abcd-ef0123456789&page%5Bnumber%5D=0&page%5Bsize%5D=50"
next:
prev:
self: "https://api.datadoghq.com/api/v2/org_group_memberships?filter%5Borg_group_id%5D=a1b2c3d4-e5f6-7890-abcd-ef0123456789&page%5Bnumber%5D=0&page%5Bsize%5D=50"
meta:
page:
total_count: 1
first_number: 0
last_number: 0
next_number:
number: 0
prev_number:
size: 50
total: 1
type: number_size
schema:
$ref: "#/components/schemas/OrgGroupMembershipListResponse"
description: OK
Expand Down Expand Up @@ -111883,9 +111951,22 @@ paths:
id: "a1b2c3d4-e5f6-7890-abcd-ef0123456789"
type: org_groups
type: org_group_policies
links:
first: "https://api.datadoghq.com/api/v2/org_group_policies?filter%5Borg_group_id%5D=a1b2c3d4-e5f6-7890-abcd-ef0123456789&page%5Bnumber%5D=0&page%5Bsize%5D=50"
last: "https://api.datadoghq.com/api/v2/org_group_policies?filter%5Borg_group_id%5D=a1b2c3d4-e5f6-7890-abcd-ef0123456789&page%5Bnumber%5D=0&page%5Bsize%5D=50"
next:
prev:
self: "https://api.datadoghq.com/api/v2/org_group_policies?filter%5Borg_group_id%5D=a1b2c3d4-e5f6-7890-abcd-ef0123456789&page%5Bnumber%5D=0&page%5Bsize%5D=50"
meta:
page:
total_count: 1
first_number: 0
last_number: 0
next_number:
number: 0
prev_number:
size: 50
total: 1
type: number_size
schema:
$ref: "#/components/schemas/OrgGroupPolicyListResponse"
description: OK
Expand Down Expand Up @@ -112274,9 +112355,22 @@ paths:
id: "1a2b3c4d-5e6f-7890-abcd-ef0123456789"
type: org_group_policies
type: org_group_policy_overrides
links:
first: "https://api.datadoghq.com/api/v2/org_group_policy_overrides?filter%5Borg_group_id%5D=a1b2c3d4-e5f6-7890-abcd-ef0123456789&page%5Bnumber%5D=0&page%5Bsize%5D=50"
last: "https://api.datadoghq.com/api/v2/org_group_policy_overrides?filter%5Borg_group_id%5D=a1b2c3d4-e5f6-7890-abcd-ef0123456789&page%5Bnumber%5D=0&page%5Bsize%5D=50"
next:
prev:
self: "https://api.datadoghq.com/api/v2/org_group_policy_overrides?filter%5Borg_group_id%5D=a1b2c3d4-e5f6-7890-abcd-ef0123456789&page%5Bnumber%5D=0&page%5Bsize%5D=50"
meta:
page:
total_count: 1
first_number: 0
last_number: 0
next_number:
number: 0
prev_number:
size: 50
total: 1
type: number_size
schema:
$ref: "#/components/schemas/OrgGroupPolicyOverrideListResponse"
description: OK
Expand Down Expand Up @@ -112615,9 +112709,22 @@ paths:
owner_org_uuid: "b2c3d4e5-f6a7-8901-bcde-f01234567890"
id: "a1b2c3d4-e5f6-7890-abcd-ef0123456789"
type: org_groups
links:
first: "https://api.datadoghq.com/api/v2/org_groups?page%5Bnumber%5D=0&page%5Bsize%5D=50"
last: "https://api.datadoghq.com/api/v2/org_groups?page%5Bnumber%5D=0&page%5Bsize%5D=50"
next:
prev:
self: "https://api.datadoghq.com/api/v2/org_groups?page%5Bnumber%5D=0&page%5Bsize%5D=50"
meta:
page:
total_count: 1
first_number: 0
last_number: 0
next_number:
number: 0
prev_number:
size: 50
total: 1
type: number_size
schema:
$ref: "#/components/schemas/OrgGroupListResponse"
description: OK
Expand Down
32 changes: 30 additions & 2 deletions src/main/java/com/datadog/api/client/v2/model/OrgGroupListResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
@JsonPropertyOrder({
OrgGroupListResponse.JSON_PROPERTY_DATA,
OrgGroupListResponse.JSON_PROPERTY_INCLUDED,
OrgGroupListResponse.JSON_PROPERTY_LINKS,
OrgGroupListResponse.JSON_PROPERTY_META
})
@jakarta.annotation.Generated(
Expand All @@ -35,6 +36,9 @@ public class OrgGroupListResponse {
public static final String JSON_PROPERTY_INCLUDED = "included";
private List<OrgGroupMembershipData> included = null;

public static final String JSON_PROPERTY_LINKS = "links";
private OrgGroupPaginationLinks links;

public static final String JSON_PROPERTY_META = "meta";
private OrgGroupPaginationMeta meta;

Expand Down Expand Up @@ -109,14 +113,36 @@ public void setIncluded(List<OrgGroupMembershipData> included) {
this.included = included;
}

public OrgGroupListResponse links(OrgGroupPaginationLinks links) {
this.links = links;
this.unparsed |= links.unparsed;
return this;
}

/**
* Pagination links for navigating between pages of an org group list response.
*
* @return links
*/
@jakarta.annotation.Nullable
@JsonProperty(JSON_PROPERTY_LINKS)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public OrgGroupPaginationLinks getLinks() {
return links;
}

public void setLinks(OrgGroupPaginationLinks links) {
this.links = links;
}

public OrgGroupListResponse meta(OrgGroupPaginationMeta meta) {
this.meta = meta;
this.unparsed |= meta.unparsed;
return this;
}

/**
* Pagination metadata.
* Pagination metadata for org group list responses.
*
* @return meta
*/
Expand Down Expand Up @@ -189,13 +215,14 @@ public boolean equals(Object o) {
OrgGroupListResponse orgGroupListResponse = (OrgGroupListResponse) o;
return Objects.equals(this.data, orgGroupListResponse.data)
&& Objects.equals(this.included, orgGroupListResponse.included)
&& Objects.equals(this.links, orgGroupListResponse.links)
&& Objects.equals(this.meta, orgGroupListResponse.meta)
&& Objects.equals(this.additionalProperties, orgGroupListResponse.additionalProperties);
}

@Override
public int hashCode() {
return Objects.hash(data, included, meta, additionalProperties);
return Objects.hash(data, included, links, meta, additionalProperties);
}

@Override
Expand All @@ -204,6 +231,7 @@ public String toString() {
sb.append("class OrgGroupListResponse {\n");
sb.append(" data: ").append(toIndentedString(data)).append("\n");
sb.append(" included: ").append(toIndentedString(included)).append("\n");
sb.append(" links: ").append(toIndentedString(links)).append("\n");
sb.append(" meta: ").append(toIndentedString(meta)).append("\n");
sb.append(" additionalProperties: ")
.append(toIndentedString(additionalProperties))
Expand Down
32 changes: 30 additions & 2 deletions src/main/java/com/datadog/api/client/v2/model/OrgGroupMembershipListResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
/** Response containing a list of org group memberships. */
@JsonPropertyOrder({
OrgGroupMembershipListResponse.JSON_PROPERTY_DATA,
OrgGroupMembershipListResponse.JSON_PROPERTY_LINKS,
OrgGroupMembershipListResponse.JSON_PROPERTY_META
})
@jakarta.annotation.Generated(
Expand All @@ -31,6 +32,9 @@ public class OrgGroupMembershipListResponse {
public static final String JSON_PROPERTY_DATA = "data";
private List<OrgGroupMembershipData> data = new ArrayList<>();

public static final String JSON_PROPERTY_LINKS = "links";
private OrgGroupPaginationLinks links;

public static final String JSON_PROPERTY_META = "meta";
private OrgGroupPaginationMeta meta;

Expand Down Expand Up @@ -72,14 +76,36 @@ public void setData(List<OrgGroupMembershipData> data) {
this.data = data;
}

public OrgGroupMembershipListResponse links(OrgGroupPaginationLinks links) {
this.links = links;
this.unparsed |= links.unparsed;
return this;
}

/**
* Pagination links for navigating between pages of an org group list response.
*
* @return links
*/
@jakarta.annotation.Nullable
@JsonProperty(JSON_PROPERTY_LINKS)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public OrgGroupPaginationLinks getLinks() {
return links;
}

public void setLinks(OrgGroupPaginationLinks links) {
this.links = links;
}

public OrgGroupMembershipListResponse meta(OrgGroupPaginationMeta meta) {
this.meta = meta;
this.unparsed |= meta.unparsed;
return this;
}

/**
* Pagination metadata.
* Pagination metadata for org group list responses.
*
* @return meta
*/
Expand Down Expand Up @@ -152,21 +178,23 @@ public boolean equals(Object o) {
OrgGroupMembershipListResponse orgGroupMembershipListResponse =
(OrgGroupMembershipListResponse) o;
return Objects.equals(this.data, orgGroupMembershipListResponse.data)
&& Objects.equals(this.links, orgGroupMembershipListResponse.links)
&& Objects.equals(this.meta, orgGroupMembershipListResponse.meta)
&& Objects.equals(
this.additionalProperties, orgGroupMembershipListResponse.additionalProperties);
}

@Override
public int hashCode() {
return Objects.hash(data, meta, additionalProperties);
return Objects.hash(data, links, meta, additionalProperties);
}

@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class OrgGroupMembershipListResponse {\n");
sb.append(" data: ").append(toIndentedString(data)).append("\n");
sb.append(" links: ").append(toIndentedString(links)).append("\n");
sb.append(" meta: ").append(toIndentedString(meta)).append("\n");
sb.append(" additionalProperties: ")
.append(toIndentedString(additionalProperties))
Expand Down
Loading
Loading