Skip to content

Commit 630a092

Browse files
author
ci.datadog-api-spec
committed
Regenerate client from commit 32dfab8 of spec repo
1 parent 80a160e commit 630a092

16 files changed

Lines changed: 32 additions & 293 deletions

.generator/schemas/v2/openapi.yaml

Lines changed: 13 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,20 +1051,6 @@ components:
10511051
example: "a1b2c3d4-e5f6-7890-abcd-ef0123456789"
10521052
format: uuid
10531053
type: string
1054-
OrgGroupInclude:
1055-
description: >-
1056-
List of related resources to include.
1057-
explode: false
1058-
in: query
1059-
name: include
1060-
required: false
1061-
schema:
1062-
example:
1063-
- memberships
1064-
items:
1065-
$ref: "#/components/schemas/OrgGroupIncludeOption"
1066-
type: array
1067-
style: form
10681054
OrgGroupMembershipFilterOrgGroupId:
10691055
description: Filter memberships by org group ID. Required when `filter[org_uuid]` is not provided.
10701056
in: query
@@ -58973,22 +58959,13 @@ components:
5897358959
example: "a1b2c3d4-e5f6-7890-abcd-ef0123456789"
5897458960
format: uuid
5897558961
type: string
58976-
relationships:
58977-
$ref: "#/components/schemas/OrgGroupRelationships"
5897858962
type:
5897958963
$ref: "#/components/schemas/OrgGroupType"
5898058964
required:
5898158965
- id
5898258966
- type
5898358967
- attributes
5898458968
type: object
58985-
OrgGroupIncludeOption:
58986-
description: Allowed include options for org group endpoints.
58987-
enum:
58988-
- memberships
58989-
type: string
58990-
x-enum-varnames:
58991-
- MEMBERSHIPS
5899258969
OrgGroupListResponse:
5899358970
description: Response containing a list of org groups.
5899458971
properties:
@@ -58997,11 +58974,6 @@ components:
5899758974
items:
5899858975
$ref: "#/components/schemas/OrgGroupData"
5899958976
type: array
59000-
included:
59001-
description: Related resources included in the response when requested with the `include` parameter.
59002-
items:
59003-
$ref: "#/components/schemas/OrgGroupMembershipData"
59004-
type: array
5900558977
links:
5900658978
$ref: "#/components/schemas/OrgGroupPaginationLinks"
5900758979
meta:
@@ -59128,20 +59100,6 @@ components:
5912859100
required:
5912959101
- data
5913059102
type: object
59131-
OrgGroupMembershipRelationshipData:
59132-
description: A reference to an org group membership.
59133-
properties:
59134-
id:
59135-
description: The ID of the membership.
59136-
example: "f1e2d3c4-b5a6-7890-1234-567890abcdef"
59137-
format: uuid
59138-
type: string
59139-
type:
59140-
$ref: "#/components/schemas/OrgGroupMembershipType"
59141-
required:
59142-
- id
59143-
- type
59144-
type: object
5914559103
OrgGroupMembershipRelationships:
5914659104
description: Relationships of an org group membership.
5914759105
properties:
@@ -59212,17 +59170,6 @@ components:
5921259170
required:
5921359171
- data
5921459172
type: object
59215-
OrgGroupMembershipsRelationship:
59216-
description: Relationship to org group memberships.
59217-
properties:
59218-
data:
59219-
description: An array of membership relationship references.
59220-
items:
59221-
$ref: "#/components/schemas/OrgGroupMembershipRelationshipData"
59222-
type: array
59223-
required:
59224-
- data
59225-
type: object
5922659173
OrgGroupPaginationLinks:
5922759174
description: Pagination links for navigating between pages of an org group list response.
5922859175
properties:
@@ -59456,18 +59403,18 @@ components:
5945659403
- attributes
5945759404
type: object
5945859405
OrgGroupPolicyEnforcementTier:
59459-
default: DEFAULT
59406+
default: OVERRIDE_ALLOWED
5946059407
description: >-
59461-
The enforcement tier of the policy. `DEFAULT` means the policy is set but member orgs may mutate it. `ENFORCE` means the policy is strictly controlled and mutations are blocked for affected orgs. `DELEGATE` means each member org controls its own value.
59408+
The enforcement tier of the policy. `OVERRIDE_ALLOWED` means the policy is set but member orgs may mutate it. `GROUP_MANAGED` means the policy is strictly controlled and mutations are blocked for affected orgs. `DELEGATE` means each member org controls its own value.
5946259409
enum:
59463-
- DEFAULT
59464-
- ENFORCE
59410+
- OVERRIDE_ALLOWED
59411+
- GROUP_MANAGED
5946559412
- DELEGATE
59466-
example: DEFAULT
59413+
example: OVERRIDE_ALLOWED
5946759414
type: string
5946859415
x-enum-varnames:
59469-
- DEFAULT
59470-
- ENFORCE
59416+
- OVERRIDE_ALLOWED
59417+
- GROUP_MANAGED
5947159418
- DELEGATE
5947259419
OrgGroupPolicyListResponse:
5947359420
description: Response containing a list of org group policies.
@@ -59808,12 +59755,6 @@ components:
5980859755
- id
5980959756
- type
5981059757
type: object
59811-
OrgGroupRelationships:
59812-
description: Relationships of an org group.
59813-
properties:
59814-
memberships:
59815-
$ref: "#/components/schemas/OrgGroupMembershipsRelationship"
59816-
type: object
5981759758
OrgGroupResponse:
5981859759
description: Response containing a single org group.
5981959760
properties:
@@ -132865,7 +132806,7 @@ paths:
132865132806
- attributes:
132866132807
content:
132867132808
value: "UTC"
132868-
enforcement_tier: "DEFAULT"
132809+
enforcement_tier: "OVERRIDE_ALLOWED"
132869132810
modified_at: "2024-01-15T10:30:00Z"
132870132811
policy_name: "monitor_timezone"
132871132812
policy_type: "org_config"
@@ -132937,7 +132878,7 @@ paths:
132937132878
attributes:
132938132879
content:
132939132880
value: "UTC"
132940-
enforcement_tier: "DEFAULT"
132881+
enforcement_tier: "OVERRIDE_ALLOWED"
132941132882
policy_name: "monitor_timezone"
132942132883
policy_type: "org_config"
132943132884
relationships:
@@ -132960,7 +132901,7 @@ paths:
132960132901
attributes:
132961132902
content:
132962132903
value: "UTC"
132963-
enforcement_tier: "DEFAULT"
132904+
enforcement_tier: "OVERRIDE_ALLOWED"
132964132905
modified_at: "2024-01-15T10:30:00Z"
132965132906
policy_name: "monitor_timezone"
132966132907
policy_type: "org_config"
@@ -133069,7 +133010,7 @@ paths:
133069133010
attributes:
133070133011
content:
133071133012
value: "UTC"
133072-
enforcement_tier: "DEFAULT"
133013+
enforcement_tier: "OVERRIDE_ALLOWED"
133073133014
modified_at: "2024-01-15T10:30:00Z"
133074133015
policy_name: "monitor_timezone"
133075133016
policy_type: "org_config"
@@ -133133,7 +133074,7 @@ paths:
133133133074
attributes:
133134133075
content:
133135133076
value: "US/Eastern"
133136-
enforcement_tier: "ENFORCE"
133077+
enforcement_tier: "GROUP_MANAGED"
133137133078
id: "1a2b3c4d-5e6f-7890-abcd-ef0123456789"
133138133079
type: org_group_policies
133139133080
schema:
@@ -133150,7 +133091,7 @@ paths:
133150133091
attributes:
133151133092
content:
133152133093
value: "US/Eastern"
133153-
enforcement_tier: "ENFORCE"
133094+
enforcement_tier: "GROUP_MANAGED"
133154133095
modified_at: "2024-01-16T14:00:00Z"
133155133096
policy_name: "monitor_timezone"
133156133097
policy_type: "org_config"
@@ -133617,7 +133558,6 @@ paths:
133617133558
- $ref: "#/components/parameters/OrgGroupPageNumber"
133618133559
- $ref: "#/components/parameters/OrgGroupPageSize"
133619133560
- $ref: "#/components/parameters/OrgGroupSort"
133620-
- $ref: "#/components/parameters/OrgGroupInclude"
133621133561
responses:
133622133562
"200":
133623133563
content:

features/v2/org_groups.feature

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,23 +60,23 @@ Feature: Org Groups
6060
Scenario: Create an org group policy returns "Bad Request" response
6161
Given operation "CreateOrgGroupPolicy" enabled
6262
And new "CreateOrgGroupPolicy" request
63-
And body with value {"data": {"attributes": {"content": {"value": "UTC"}, "enforcement_tier": "DEFAULT", "policy_name": "monitor_timezone", "policy_type": "org_config"}, "relationships": {"org_group": {"data": {"id": "a1b2c3d4-e5f6-7890-abcd-ef0123456789", "type": "org_groups"}}}, "type": "org_group_policies"}}
63+
And body with value {"data": {"attributes": {"content": {"value": "UTC"}, "enforcement_tier": "OVERRIDE_ALLOWED", "policy_name": "monitor_timezone", "policy_type": "org_config"}, "relationships": {"org_group": {"data": {"id": "a1b2c3d4-e5f6-7890-abcd-ef0123456789", "type": "org_groups"}}}, "type": "org_group_policies"}}
6464
When the request is sent
6565
Then the response status is 400 Bad Request
6666

6767
@generated @skip @team:DataDog/org-management
6868
Scenario: Create an org group policy returns "Conflict" response
6969
Given operation "CreateOrgGroupPolicy" enabled
7070
And new "CreateOrgGroupPolicy" request
71-
And body with value {"data": {"attributes": {"content": {"value": "UTC"}, "enforcement_tier": "DEFAULT", "policy_name": "monitor_timezone", "policy_type": "org_config"}, "relationships": {"org_group": {"data": {"id": "a1b2c3d4-e5f6-7890-abcd-ef0123456789", "type": "org_groups"}}}, "type": "org_group_policies"}}
71+
And body with value {"data": {"attributes": {"content": {"value": "UTC"}, "enforcement_tier": "OVERRIDE_ALLOWED", "policy_name": "monitor_timezone", "policy_type": "org_config"}, "relationships": {"org_group": {"data": {"id": "a1b2c3d4-e5f6-7890-abcd-ef0123456789", "type": "org_groups"}}}, "type": "org_group_policies"}}
7272
When the request is sent
7373
Then the response status is 409 Conflict
7474

7575
@generated @skip @team:DataDog/org-management
7676
Scenario: Create an org group policy returns "Created" response
7777
Given operation "CreateOrgGroupPolicy" enabled
7878
And new "CreateOrgGroupPolicy" request
79-
And body with value {"data": {"attributes": {"content": {"value": "UTC"}, "enforcement_tier": "DEFAULT", "policy_name": "monitor_timezone", "policy_type": "org_config"}, "relationships": {"org_group": {"data": {"id": "a1b2c3d4-e5f6-7890-abcd-ef0123456789", "type": "org_groups"}}}, "type": "org_group_policies"}}
79+
And body with value {"data": {"attributes": {"content": {"value": "UTC"}, "enforcement_tier": "OVERRIDE_ALLOWED", "policy_name": "monitor_timezone", "policy_type": "org_config"}, "relationships": {"org_group": {"data": {"id": "a1b2c3d4-e5f6-7890-abcd-ef0123456789", "type": "org_groups"}}}, "type": "org_group_policies"}}
8080
When the request is sent
8181
Then the response status is 201 Created
8282

@@ -398,7 +398,7 @@ Feature: Org Groups
398398
Given operation "UpdateOrgGroupPolicy" enabled
399399
And new "UpdateOrgGroupPolicy" request
400400
And request contains "org_group_policy_id" parameter from "REPLACE.ME"
401-
And body with value {"data": {"attributes": {"content": {"value": "UTC"}, "enforcement_tier": "DEFAULT"}, "id": "1a2b3c4d-5e6f-7890-abcd-ef0123456789", "type": "org_group_policies"}}
401+
And body with value {"data": {"attributes": {"content": {"value": "UTC"}, "enforcement_tier": "OVERRIDE_ALLOWED"}, "id": "1a2b3c4d-5e6f-7890-abcd-ef0123456789", "type": "org_group_policies"}}
402402
When the request is sent
403403
Then the response status is 400 Bad Request
404404

@@ -407,7 +407,7 @@ Feature: Org Groups
407407
Given operation "UpdateOrgGroupPolicy" enabled
408408
And new "UpdateOrgGroupPolicy" request
409409
And request contains "org_group_policy_id" parameter from "REPLACE.ME"
410-
And body with value {"data": {"attributes": {"content": {"value": "UTC"}, "enforcement_tier": "DEFAULT"}, "id": "1a2b3c4d-5e6f-7890-abcd-ef0123456789", "type": "org_group_policies"}}
410+
And body with value {"data": {"attributes": {"content": {"value": "UTC"}, "enforcement_tier": "OVERRIDE_ALLOWED"}, "id": "1a2b3c4d-5e6f-7890-abcd-ef0123456789", "type": "org_group_policies"}}
411411
When the request is sent
412412
Then the response status is 404 Not Found
413413

@@ -416,7 +416,7 @@ Feature: Org Groups
416416
Given operation "UpdateOrgGroupPolicy" enabled
417417
And new "UpdateOrgGroupPolicy" request
418418
And request contains "org_group_policy_id" parameter from "REPLACE.ME"
419-
And body with value {"data": {"attributes": {"content": {"value": "UTC"}, "enforcement_tier": "DEFAULT"}, "id": "1a2b3c4d-5e6f-7890-abcd-ef0123456789", "type": "org_group_policies"}}
419+
And body with value {"data": {"attributes": {"content": {"value": "UTC"}, "enforcement_tier": "OVERRIDE_ALLOWED"}, "id": "1a2b3c4d-5e6f-7890-abcd-ef0123456789", "type": "org_group_policies"}}
420420
When the request is sent
421421
Then the response status is 200 OK
422422

private/bdd_runner/src/support/scenarios_model_mapping.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11203,10 +11203,6 @@ export const ScenariosModelMappings: { [key: string]: OperationMapping } = {
1120311203
type: "OrgGroupSortOption",
1120411204
format: "",
1120511205
},
11206-
include: {
11207-
type: "Array<OrgGroupIncludeOption>",
11208-
format: "",
11209-
},
1121011206
operationResponseType: "OrgGroupListResponse",
1121111207
},
1121211208
"OrgGroupsApi.V2.CreateOrgGroup": {

services/org_groups/src/v2/OrgGroupsApi.ts

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import { TypingInfo } from "./models/TypingInfo";
2525
import { APIErrorResponse } from "./models/APIErrorResponse";
2626
import { JSONAPIErrorResponse } from "./models/JSONAPIErrorResponse";
2727
import { OrgGroupCreateRequest } from "./models/OrgGroupCreateRequest";
28-
import { OrgGroupIncludeOption } from "./models/OrgGroupIncludeOption";
2928
import { OrgGroupListResponse } from "./models/OrgGroupListResponse";
3029
import { OrgGroupMembershipBulkUpdateRequest } from "./models/OrgGroupMembershipBulkUpdateRequest";
3130
import { OrgGroupMembershipListResponse } from "./models/OrgGroupMembershipListResponse";
@@ -975,7 +974,6 @@ export class OrgGroupsApiRequestFactory extends BaseAPIRequestFactory {
975974
pageNumber?: number,
976975
pageSize?: number,
977976
sort?: OrgGroupSortOption,
978-
include?: Array<OrgGroupIncludeOption>,
979977
_options?: Configuration,
980978
): Promise<RequestContext> {
981979
const _config = _options || this.configuration;
@@ -1029,13 +1027,6 @@ export class OrgGroupsApiRequestFactory extends BaseAPIRequestFactory {
10291027
"",
10301028
);
10311029
}
1032-
if (include !== undefined) {
1033-
requestContext.setQueryParam(
1034-
"include",
1035-
serialize(include, TypingInfo, "Array<OrgGroupIncludeOption>", ""),
1036-
"csv",
1037-
);
1038-
}
10391030

10401031
// Apply auth methods
10411032
applySecurityAuthentication(_config, requestContext, [
@@ -3105,11 +3096,6 @@ export interface OrgGroupsApiListOrgGroupsRequest {
31053096
* @type OrgGroupSortOption
31063097
*/
31073098
sort?: OrgGroupSortOption;
3108-
/**
3109-
* List of related resources to include.
3110-
* @type Array<OrgGroupIncludeOption>
3111-
*/
3112-
include?: Array<OrgGroupIncludeOption>;
31133099
}
31143100

31153101
export interface OrgGroupsApiUpdateOrgGroupRequest {
@@ -3527,7 +3513,6 @@ export class OrgGroupsApi {
35273513
param.pageNumber,
35283514
param.pageSize,
35293515
param.sort,
3530-
param.include,
35313516
options,
35323517
);
35333518
return requestContextPromise.then((requestContext) => {

services/org_groups/src/v2/index.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ export { OrgGroupCreateAttributes } from "./models/OrgGroupCreateAttributes";
3131
export { OrgGroupCreateData } from "./models/OrgGroupCreateData";
3232
export { OrgGroupCreateRequest } from "./models/OrgGroupCreateRequest";
3333
export { OrgGroupData } from "./models/OrgGroupData";
34-
export { OrgGroupIncludeOption } from "./models/OrgGroupIncludeOption";
3534
export { OrgGroupListResponse } from "./models/OrgGroupListResponse";
3635
export { OrgGroupMembershipAttributes } from "./models/OrgGroupMembershipAttributes";
3736
export { OrgGroupMembershipBulkUpdateAttributes } from "./models/OrgGroupMembershipBulkUpdateAttributes";
@@ -41,11 +40,9 @@ export { OrgGroupMembershipBulkUpdateRequest } from "./models/OrgGroupMembership
4140
export { OrgGroupMembershipBulkUpdateType } from "./models/OrgGroupMembershipBulkUpdateType";
4241
export { OrgGroupMembershipData } from "./models/OrgGroupMembershipData";
4342
export { OrgGroupMembershipListResponse } from "./models/OrgGroupMembershipListResponse";
44-
export { OrgGroupMembershipRelationshipData } from "./models/OrgGroupMembershipRelationshipData";
4543
export { OrgGroupMembershipRelationships } from "./models/OrgGroupMembershipRelationships";
4644
export { OrgGroupMembershipResponse } from "./models/OrgGroupMembershipResponse";
4745
export { OrgGroupMembershipSortOption } from "./models/OrgGroupMembershipSortOption";
48-
export { OrgGroupMembershipsRelationship } from "./models/OrgGroupMembershipsRelationship";
4946
export { OrgGroupMembershipType } from "./models/OrgGroupMembershipType";
5047
export { OrgGroupMembershipUpdateData } from "./models/OrgGroupMembershipUpdateData";
5148
export { OrgGroupMembershipUpdateRelationships } from "./models/OrgGroupMembershipUpdateRelationships";
@@ -89,7 +86,6 @@ export { OrgGroupPolicyType } from "./models/OrgGroupPolicyType";
8986
export { OrgGroupPolicyUpdateAttributes } from "./models/OrgGroupPolicyUpdateAttributes";
9087
export { OrgGroupPolicyUpdateData } from "./models/OrgGroupPolicyUpdateData";
9188
export { OrgGroupPolicyUpdateRequest } from "./models/OrgGroupPolicyUpdateRequest";
92-
export { OrgGroupRelationships } from "./models/OrgGroupRelationships";
9389
export { OrgGroupRelationshipToOne } from "./models/OrgGroupRelationshipToOne";
9490
export { OrgGroupRelationshipToOneData } from "./models/OrgGroupRelationshipToOneData";
9591
export { OrgGroupResponse } from "./models/OrgGroupResponse";

services/org_groups/src/v2/models/OrgGroupData.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { AttributeTypeMap } from "@datadog/datadog-api-client";
22

33
import { OrgGroupAttributes } from "./OrgGroupAttributes";
4-
import { OrgGroupRelationships } from "./OrgGroupRelationships";
54
import { OrgGroupType } from "./OrgGroupType";
65

76
/**
@@ -16,10 +15,6 @@ export class OrgGroupData {
1615
* The ID of the org group.
1716
*/
1817
"id": string;
19-
/**
20-
* Relationships of an org group.
21-
*/
22-
"relationships"?: OrgGroupRelationships;
2318
/**
2419
* Org groups resource type.
2520
*/
@@ -50,10 +45,6 @@ export class OrgGroupData {
5045
required: true,
5146
format: "uuid",
5247
},
53-
relationships: {
54-
baseName: "relationships",
55-
type: "OrgGroupRelationships",
56-
},
5748
type: {
5849
baseName: "type",
5950
type: "OrgGroupType",

services/org_groups/src/v2/models/OrgGroupIncludeOption.ts

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)