Skip to content

Commit 33d40e5

Browse files
author
ci.datadog-api-spec
committed
Regenerate client from commit 5d4dec2 of spec repo
1 parent 99a5572 commit 33d40e5

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
@@ -59113,22 +59099,13 @@ components:
5911359099
example: "a1b2c3d4-e5f6-7890-abcd-ef0123456789"
5911459100
format: uuid
5911559101
type: string
59116-
relationships:
59117-
$ref: "#/components/schemas/OrgGroupRelationships"
5911859102
type:
5911959103
$ref: "#/components/schemas/OrgGroupType"
5912059104
required:
5912159105
- id
5912259106
- type
5912359107
- attributes
5912459108
type: object
59125-
OrgGroupIncludeOption:
59126-
description: Allowed include options for org group endpoints.
59127-
enum:
59128-
- memberships
59129-
type: string
59130-
x-enum-varnames:
59131-
- MEMBERSHIPS
5913259109
OrgGroupListResponse:
5913359110
description: Response containing a list of org groups.
5913459111
properties:
@@ -59137,11 +59114,6 @@ components:
5913759114
items:
5913859115
$ref: "#/components/schemas/OrgGroupData"
5913959116
type: array
59140-
included:
59141-
description: Related resources included in the response when requested with the `include` parameter.
59142-
items:
59143-
$ref: "#/components/schemas/OrgGroupMembershipData"
59144-
type: array
5914559117
links:
5914659118
$ref: "#/components/schemas/OrgGroupPaginationLinks"
5914759119
meta:
@@ -59268,20 +59240,6 @@ components:
5926859240
required:
5926959241
- data
5927059242
type: object
59271-
OrgGroupMembershipRelationshipData:
59272-
description: A reference to an org group membership.
59273-
properties:
59274-
id:
59275-
description: The ID of the membership.
59276-
example: "f1e2d3c4-b5a6-7890-1234-567890abcdef"
59277-
format: uuid
59278-
type: string
59279-
type:
59280-
$ref: "#/components/schemas/OrgGroupMembershipType"
59281-
required:
59282-
- id
59283-
- type
59284-
type: object
5928559243
OrgGroupMembershipRelationships:
5928659244
description: Relationships of an org group membership.
5928759245
properties:
@@ -59352,17 +59310,6 @@ components:
5935259310
required:
5935359311
- data
5935459312
type: object
59355-
OrgGroupMembershipsRelationship:
59356-
description: Relationship to org group memberships.
59357-
properties:
59358-
data:
59359-
description: An array of membership relationship references.
59360-
items:
59361-
$ref: "#/components/schemas/OrgGroupMembershipRelationshipData"
59362-
type: array
59363-
required:
59364-
- data
59365-
type: object
5936659313
OrgGroupPaginationLinks:
5936759314
description: Pagination links for navigating between pages of an org group list response.
5936859315
properties:
@@ -59596,18 +59543,18 @@ components:
5959659543
- attributes
5959759544
type: object
5959859545
OrgGroupPolicyEnforcementTier:
59599-
default: DEFAULT
59546+
default: OVERRIDE_ALLOWED
5960059547
description: >-
59601-
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.
59548+
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.
5960259549
enum:
59603-
- DEFAULT
59604-
- ENFORCE
59550+
- OVERRIDE_ALLOWED
59551+
- GROUP_MANAGED
5960559552
- DELEGATE
59606-
example: DEFAULT
59553+
example: OVERRIDE_ALLOWED
5960759554
type: string
5960859555
x-enum-varnames:
59609-
- DEFAULT
59610-
- ENFORCE
59556+
- OVERRIDE_ALLOWED
59557+
- GROUP_MANAGED
5961159558
- DELEGATE
5961259559
OrgGroupPolicyListResponse:
5961359560
description: Response containing a list of org group policies.
@@ -59948,12 +59895,6 @@ components:
5994859895
- id
5994959896
- type
5995059897
type: object
59951-
OrgGroupRelationships:
59952-
description: Relationships of an org group.
59953-
properties:
59954-
memberships:
59955-
$ref: "#/components/schemas/OrgGroupMembershipsRelationship"
59956-
type: object
5995759898
OrgGroupResponse:
5995859899
description: Response containing a single org group.
5995959900
properties:
@@ -133677,7 +133618,7 @@ paths:
133677133618
- attributes:
133678133619
content:
133679133620
value: "UTC"
133680-
enforcement_tier: "DEFAULT"
133621+
enforcement_tier: "OVERRIDE_ALLOWED"
133681133622
modified_at: "2024-01-15T10:30:00Z"
133682133623
policy_name: "monitor_timezone"
133683133624
policy_type: "org_config"
@@ -133749,7 +133690,7 @@ paths:
133749133690
attributes:
133750133691
content:
133751133692
value: "UTC"
133752-
enforcement_tier: "DEFAULT"
133693+
enforcement_tier: "OVERRIDE_ALLOWED"
133753133694
policy_name: "monitor_timezone"
133754133695
policy_type: "org_config"
133755133696
relationships:
@@ -133772,7 +133713,7 @@ paths:
133772133713
attributes:
133773133714
content:
133774133715
value: "UTC"
133775-
enforcement_tier: "DEFAULT"
133716+
enforcement_tier: "OVERRIDE_ALLOWED"
133776133717
modified_at: "2024-01-15T10:30:00Z"
133777133718
policy_name: "monitor_timezone"
133778133719
policy_type: "org_config"
@@ -133881,7 +133822,7 @@ paths:
133881133822
attributes:
133882133823
content:
133883133824
value: "UTC"
133884-
enforcement_tier: "DEFAULT"
133825+
enforcement_tier: "OVERRIDE_ALLOWED"
133885133826
modified_at: "2024-01-15T10:30:00Z"
133886133827
policy_name: "monitor_timezone"
133887133828
policy_type: "org_config"
@@ -133945,7 +133886,7 @@ paths:
133945133886
attributes:
133946133887
content:
133947133888
value: "US/Eastern"
133948-
enforcement_tier: "ENFORCE"
133889+
enforcement_tier: "GROUP_MANAGED"
133949133890
id: "1a2b3c4d-5e6f-7890-abcd-ef0123456789"
133950133891
type: org_group_policies
133951133892
schema:
@@ -133962,7 +133903,7 @@ paths:
133962133903
attributes:
133963133904
content:
133964133905
value: "US/Eastern"
133965-
enforcement_tier: "ENFORCE"
133906+
enforcement_tier: "GROUP_MANAGED"
133966133907
modified_at: "2024-01-16T14:00:00Z"
133967133908
policy_name: "monitor_timezone"
133968133909
policy_type: "org_config"
@@ -134429,7 +134370,6 @@ paths:
134429134370
- $ref: "#/components/parameters/OrgGroupPageNumber"
134430134371
- $ref: "#/components/parameters/OrgGroupPageSize"
134431134372
- $ref: "#/components/parameters/OrgGroupSort"
134432-
- $ref: "#/components/parameters/OrgGroupInclude"
134433134373
responses:
134434134374
"200":
134435134375
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
@@ -11333,10 +11333,6 @@ export const ScenariosModelMappings: { [key: string]: OperationMapping } = {
1133311333
type: "OrgGroupSortOption",
1133411334
format: "",
1133511335
},
11336-
include: {
11337-
type: "Array<OrgGroupIncludeOption>",
11338-
format: "",
11339-
},
1134011336
operationResponseType: "OrgGroupListResponse",
1134111337
},
1134211338
"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)