diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml index 22fc24351728..ae382a0be9a4 100644 --- a/.generator/schemas/v2/openapi.yaml +++ b/.generator/schemas/v2/openapi.yaml @@ -1051,20 +1051,6 @@ components: example: "a1b2c3d4-e5f6-7890-abcd-ef0123456789" format: uuid type: string - OrgGroupInclude: - description: >- - List of related resources to include. - explode: false - in: query - name: include - required: false - schema: - example: - - memberships - items: - $ref: "#/components/schemas/OrgGroupIncludeOption" - type: array - style: form OrgGroupMembershipFilterOrgGroupId: description: Filter memberships by org group ID. Required when `filter[org_uuid]` is not provided. in: query @@ -59225,8 +59211,6 @@ components: example: "a1b2c3d4-e5f6-7890-abcd-ef0123456789" format: uuid type: string - relationships: - $ref: "#/components/schemas/OrgGroupRelationships" type: $ref: "#/components/schemas/OrgGroupType" required: @@ -59234,13 +59218,6 @@ components: - type - attributes type: object - OrgGroupIncludeOption: - description: Allowed include options for org group endpoints. - enum: - - memberships - type: string - x-enum-varnames: - - MEMBERSHIPS OrgGroupListResponse: description: Response containing a list of org groups. properties: @@ -59249,11 +59226,6 @@ components: items: $ref: "#/components/schemas/OrgGroupData" type: array - included: - description: Related resources included in the response when requested with the `include` parameter. - items: - $ref: "#/components/schemas/OrgGroupMembershipData" - type: array links: $ref: "#/components/schemas/OrgGroupPaginationLinks" meta: @@ -59380,20 +59352,6 @@ components: required: - data type: object - OrgGroupMembershipRelationshipData: - description: A reference to an org group membership. - properties: - id: - description: The ID of the membership. - example: "f1e2d3c4-b5a6-7890-1234-567890abcdef" - format: uuid - type: string - type: - $ref: "#/components/schemas/OrgGroupMembershipType" - required: - - id - - type - type: object OrgGroupMembershipRelationships: description: Relationships of an org group membership. properties: @@ -59464,17 +59422,6 @@ components: required: - data type: object - OrgGroupMembershipsRelationship: - description: Relationship to org group memberships. - properties: - data: - description: An array of membership relationship references. - items: - $ref: "#/components/schemas/OrgGroupMembershipRelationshipData" - type: array - required: - - data - type: object OrgGroupPaginationLinks: description: Pagination links for navigating between pages of an org group list response. properties: @@ -59708,18 +59655,18 @@ components: - attributes type: object OrgGroupPolicyEnforcementTier: - default: DEFAULT + default: OVERRIDE_ALLOWED description: >- - 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. + 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. enum: - - DEFAULT - - ENFORCE + - OVERRIDE_ALLOWED + - GROUP_MANAGED - DELEGATE - example: DEFAULT + example: OVERRIDE_ALLOWED type: string x-enum-varnames: - - DEFAULT - - ENFORCE + - OVERRIDE_ALLOWED + - GROUP_MANAGED - DELEGATE OrgGroupPolicyListResponse: description: Response containing a list of org group policies. @@ -60060,12 +60007,6 @@ components: - id - type type: object - OrgGroupRelationships: - description: Relationships of an org group. - properties: - memberships: - $ref: "#/components/schemas/OrgGroupMembershipsRelationship" - type: object OrgGroupResponse: description: Response containing a single org group. properties: @@ -133887,7 +133828,7 @@ paths: - attributes: content: value: "UTC" - enforcement_tier: "DEFAULT" + enforcement_tier: "OVERRIDE_ALLOWED" modified_at: "2024-01-15T10:30:00Z" policy_name: "monitor_timezone" policy_type: "org_config" @@ -133959,7 +133900,7 @@ paths: attributes: content: value: "UTC" - enforcement_tier: "DEFAULT" + enforcement_tier: "OVERRIDE_ALLOWED" policy_name: "monitor_timezone" policy_type: "org_config" relationships: @@ -133982,7 +133923,7 @@ paths: attributes: content: value: "UTC" - enforcement_tier: "DEFAULT" + enforcement_tier: "OVERRIDE_ALLOWED" modified_at: "2024-01-15T10:30:00Z" policy_name: "monitor_timezone" policy_type: "org_config" @@ -134091,7 +134032,7 @@ paths: attributes: content: value: "UTC" - enforcement_tier: "DEFAULT" + enforcement_tier: "OVERRIDE_ALLOWED" modified_at: "2024-01-15T10:30:00Z" policy_name: "monitor_timezone" policy_type: "org_config" @@ -134155,7 +134096,7 @@ paths: attributes: content: value: "US/Eastern" - enforcement_tier: "ENFORCE" + enforcement_tier: "GROUP_MANAGED" id: "1a2b3c4d-5e6f-7890-abcd-ef0123456789" type: org_group_policies schema: @@ -134172,7 +134113,7 @@ paths: attributes: content: value: "US/Eastern" - enforcement_tier: "ENFORCE" + enforcement_tier: "GROUP_MANAGED" modified_at: "2024-01-16T14:00:00Z" policy_name: "monitor_timezone" policy_type: "org_config" @@ -134639,7 +134580,6 @@ paths: - $ref: "#/components/parameters/OrgGroupPageNumber" - $ref: "#/components/parameters/OrgGroupPageSize" - $ref: "#/components/parameters/OrgGroupSort" - - $ref: "#/components/parameters/OrgGroupInclude" responses: "200": content: diff --git a/examples/v2/org-groups/CreateOrgGroupPolicy.ts b/examples/v2/org-groups/CreateOrgGroupPolicy.ts index d01c5c2eea73..c807e7941eb3 100644 --- a/examples/v2/org-groups/CreateOrgGroupPolicy.ts +++ b/examples/v2/org-groups/CreateOrgGroupPolicy.ts @@ -15,7 +15,7 @@ const params: v2.OrgGroupsApiCreateOrgGroupPolicyRequest = { content: { value: "UTC", }, - enforcementTier: "DEFAULT", + enforcementTier: "OVERRIDE_ALLOWED", policyName: "monitor_timezone", policyType: "org_config", }, diff --git a/examples/v2/org-groups/UpdateOrgGroupPolicy.ts b/examples/v2/org-groups/UpdateOrgGroupPolicy.ts index 9aa0ee43d23b..ddec4f53608a 100644 --- a/examples/v2/org-groups/UpdateOrgGroupPolicy.ts +++ b/examples/v2/org-groups/UpdateOrgGroupPolicy.ts @@ -15,7 +15,7 @@ const params: v2.OrgGroupsApiUpdateOrgGroupPolicyRequest = { content: { value: "UTC", }, - enforcementTier: "DEFAULT", + enforcementTier: "OVERRIDE_ALLOWED", }, id: "1a2b3c4d-5e6f-7890-abcd-ef0123456789", type: "org_group_policies", diff --git a/features/support/scenarios_model_mapping.ts b/features/support/scenarios_model_mapping.ts index 7aec55ed945d..09621d59c93e 100644 --- a/features/support/scenarios_model_mapping.ts +++ b/features/support/scenarios_model_mapping.ts @@ -11336,10 +11336,6 @@ export const ScenariosModelMappings: {[key: string]: {[key: string]: any}} = { "type": "OrgGroupSortOption", "format": "", }, - "include": { - "type": "Array", - "format": "", - }, "operationResponseType": "OrgGroupListResponse", }, "v2.CreateOrgGroup": { diff --git a/features/v2/org_groups.feature b/features/v2/org_groups.feature index b8c5fe1b61d1..58065ea87fc7 100644 --- a/features/v2/org_groups.feature +++ b/features/v2/org_groups.feature @@ -60,7 +60,7 @@ Feature: Org Groups Scenario: Create an org group policy returns "Bad Request" response Given operation "CreateOrgGroupPolicy" enabled And new "CreateOrgGroupPolicy" request - 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"}} + 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"}} When the request is sent Then the response status is 400 Bad Request @@ -68,7 +68,7 @@ Feature: Org Groups Scenario: Create an org group policy returns "Conflict" response Given operation "CreateOrgGroupPolicy" enabled And new "CreateOrgGroupPolicy" request - 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"}} + 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"}} When the request is sent Then the response status is 409 Conflict @@ -76,7 +76,7 @@ Feature: Org Groups Scenario: Create an org group policy returns "Created" response Given operation "CreateOrgGroupPolicy" enabled And new "CreateOrgGroupPolicy" request - 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"}} + 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"}} When the request is sent Then the response status is 201 Created @@ -398,7 +398,7 @@ Feature: Org Groups Given operation "UpdateOrgGroupPolicy" enabled And new "UpdateOrgGroupPolicy" request And request contains "org_group_policy_id" parameter from "REPLACE.ME" - And body with value {"data": {"attributes": {"content": {"value": "UTC"}, "enforcement_tier": "DEFAULT"}, "id": "1a2b3c4d-5e6f-7890-abcd-ef0123456789", "type": "org_group_policies"}} + And body with value {"data": {"attributes": {"content": {"value": "UTC"}, "enforcement_tier": "OVERRIDE_ALLOWED"}, "id": "1a2b3c4d-5e6f-7890-abcd-ef0123456789", "type": "org_group_policies"}} When the request is sent Then the response status is 400 Bad Request @@ -407,7 +407,7 @@ Feature: Org Groups Given operation "UpdateOrgGroupPolicy" enabled And new "UpdateOrgGroupPolicy" request And request contains "org_group_policy_id" parameter from "REPLACE.ME" - And body with value {"data": {"attributes": {"content": {"value": "UTC"}, "enforcement_tier": "DEFAULT"}, "id": "1a2b3c4d-5e6f-7890-abcd-ef0123456789", "type": "org_group_policies"}} + And body with value {"data": {"attributes": {"content": {"value": "UTC"}, "enforcement_tier": "OVERRIDE_ALLOWED"}, "id": "1a2b3c4d-5e6f-7890-abcd-ef0123456789", "type": "org_group_policies"}} When the request is sent Then the response status is 404 Not Found @@ -416,7 +416,7 @@ Feature: Org Groups Given operation "UpdateOrgGroupPolicy" enabled And new "UpdateOrgGroupPolicy" request And request contains "org_group_policy_id" parameter from "REPLACE.ME" - And body with value {"data": {"attributes": {"content": {"value": "UTC"}, "enforcement_tier": "DEFAULT"}, "id": "1a2b3c4d-5e6f-7890-abcd-ef0123456789", "type": "org_group_policies"}} + And body with value {"data": {"attributes": {"content": {"value": "UTC"}, "enforcement_tier": "OVERRIDE_ALLOWED"}, "id": "1a2b3c4d-5e6f-7890-abcd-ef0123456789", "type": "org_group_policies"}} When the request is sent Then the response status is 200 OK diff --git a/packages/datadog-api-client-v2/apis/OrgGroupsApi.ts b/packages/datadog-api-client-v2/apis/OrgGroupsApi.ts index 722a155c897c..17d6f3a5b757 100644 --- a/packages/datadog-api-client-v2/apis/OrgGroupsApi.ts +++ b/packages/datadog-api-client-v2/apis/OrgGroupsApi.ts @@ -19,7 +19,6 @@ import { ApiException } from "../../datadog-api-client-common/exception"; import { APIErrorResponse } from "../models/APIErrorResponse"; import { JSONAPIErrorResponse } from "../models/JSONAPIErrorResponse"; import { OrgGroupCreateRequest } from "../models/OrgGroupCreateRequest"; -import { OrgGroupIncludeOption } from "../models/OrgGroupIncludeOption"; import { OrgGroupListResponse } from "../models/OrgGroupListResponse"; import { OrgGroupMembershipBulkUpdateRequest } from "../models/OrgGroupMembershipBulkUpdateRequest"; import { OrgGroupMembershipListResponse } from "../models/OrgGroupMembershipListResponse"; @@ -794,7 +793,6 @@ export class OrgGroupsApiRequestFactory extends BaseAPIRequestFactory { pageNumber?: number, pageSize?: number, sort?: OrgGroupSortOption, - include?: Array, _options?: Configuration ): Promise { const _config = _options || this.configuration; @@ -836,13 +834,6 @@ export class OrgGroupsApiRequestFactory extends BaseAPIRequestFactory { "" ); } - if (include !== undefined) { - requestContext.setQueryParam( - "include", - ObjectSerializer.serialize(include, "Array", ""), - "csv" - ); - } // Apply auth methods applySecurityAuthentication(_config, requestContext, [ @@ -2964,11 +2955,6 @@ export interface OrgGroupsApiListOrgGroupsRequest { * @type OrgGroupSortOption */ sort?: OrgGroupSortOption; - /** - * List of related resources to include. - * @type Array - */ - include?: Array; } export interface OrgGroupsApiUpdateOrgGroupRequest { @@ -3384,7 +3370,6 @@ export class OrgGroupsApi { param.pageNumber, param.pageSize, param.sort, - param.include, options ); return requestContextPromise.then((requestContext) => { diff --git a/packages/datadog-api-client-v2/index.ts b/packages/datadog-api-client-v2/index.ts index 2b849cbe2fbb..cbb4f700a24f 100644 --- a/packages/datadog-api-client-v2/index.ts +++ b/packages/datadog-api-client-v2/index.ts @@ -5120,7 +5120,6 @@ export { OrgGroupCreateAttributes } from "./models/OrgGroupCreateAttributes"; export { OrgGroupCreateData } from "./models/OrgGroupCreateData"; export { OrgGroupCreateRequest } from "./models/OrgGroupCreateRequest"; export { OrgGroupData } from "./models/OrgGroupData"; -export { OrgGroupIncludeOption } from "./models/OrgGroupIncludeOption"; export { OrgGroupListResponse } from "./models/OrgGroupListResponse"; export { OrgGroupMembershipAttributes } from "./models/OrgGroupMembershipAttributes"; export { OrgGroupMembershipBulkUpdateAttributes } from "./models/OrgGroupMembershipBulkUpdateAttributes"; @@ -5130,11 +5129,9 @@ export { OrgGroupMembershipBulkUpdateRequest } from "./models/OrgGroupMembership export { OrgGroupMembershipBulkUpdateType } from "./models/OrgGroupMembershipBulkUpdateType"; export { OrgGroupMembershipData } from "./models/OrgGroupMembershipData"; export { OrgGroupMembershipListResponse } from "./models/OrgGroupMembershipListResponse"; -export { OrgGroupMembershipRelationshipData } from "./models/OrgGroupMembershipRelationshipData"; export { OrgGroupMembershipRelationships } from "./models/OrgGroupMembershipRelationships"; export { OrgGroupMembershipResponse } from "./models/OrgGroupMembershipResponse"; export { OrgGroupMembershipSortOption } from "./models/OrgGroupMembershipSortOption"; -export { OrgGroupMembershipsRelationship } from "./models/OrgGroupMembershipsRelationship"; export { OrgGroupMembershipType } from "./models/OrgGroupMembershipType"; export { OrgGroupMembershipUpdateData } from "./models/OrgGroupMembershipUpdateData"; export { OrgGroupMembershipUpdateRelationships } from "./models/OrgGroupMembershipUpdateRelationships"; @@ -5178,7 +5175,6 @@ export { OrgGroupPolicyType } from "./models/OrgGroupPolicyType"; export { OrgGroupPolicyUpdateAttributes } from "./models/OrgGroupPolicyUpdateAttributes"; export { OrgGroupPolicyUpdateData } from "./models/OrgGroupPolicyUpdateData"; export { OrgGroupPolicyUpdateRequest } from "./models/OrgGroupPolicyUpdateRequest"; -export { OrgGroupRelationships } from "./models/OrgGroupRelationships"; export { OrgGroupRelationshipToOne } from "./models/OrgGroupRelationshipToOne"; export { OrgGroupRelationshipToOneData } from "./models/OrgGroupRelationshipToOneData"; export { OrgGroupResponse } from "./models/OrgGroupResponse"; diff --git a/packages/datadog-api-client-v2/models/ObjectSerializer.ts b/packages/datadog-api-client-v2/models/ObjectSerializer.ts index 1ae37c251779..50754e64a45c 100644 --- a/packages/datadog-api-client-v2/models/ObjectSerializer.ts +++ b/packages/datadog-api-client-v2/models/ObjectSerializer.ts @@ -2759,13 +2759,11 @@ import { OrgGroupMembershipBulkUpdateRelationships } from "./OrgGroupMembershipB import { OrgGroupMembershipBulkUpdateRequest } from "./OrgGroupMembershipBulkUpdateRequest"; import { OrgGroupMembershipData } from "./OrgGroupMembershipData"; import { OrgGroupMembershipListResponse } from "./OrgGroupMembershipListResponse"; -import { OrgGroupMembershipRelationshipData } from "./OrgGroupMembershipRelationshipData"; import { OrgGroupMembershipRelationships } from "./OrgGroupMembershipRelationships"; import { OrgGroupMembershipResponse } from "./OrgGroupMembershipResponse"; import { OrgGroupMembershipUpdateData } from "./OrgGroupMembershipUpdateData"; import { OrgGroupMembershipUpdateRelationships } from "./OrgGroupMembershipUpdateRelationships"; import { OrgGroupMembershipUpdateRequest } from "./OrgGroupMembershipUpdateRequest"; -import { OrgGroupMembershipsRelationship } from "./OrgGroupMembershipsRelationship"; import { OrgGroupPaginationLinks } from "./OrgGroupPaginationLinks"; import { OrgGroupPaginationMeta } from "./OrgGroupPaginationMeta"; import { OrgGroupPaginationMetaPage } from "./OrgGroupPaginationMetaPage"; @@ -2800,7 +2798,6 @@ import { OrgGroupPolicyUpdateData } from "./OrgGroupPolicyUpdateData"; import { OrgGroupPolicyUpdateRequest } from "./OrgGroupPolicyUpdateRequest"; import { OrgGroupRelationshipToOne } from "./OrgGroupRelationshipToOne"; import { OrgGroupRelationshipToOneData } from "./OrgGroupRelationshipToOneData"; -import { OrgGroupRelationships } from "./OrgGroupRelationships"; import { OrgGroupResponse } from "./OrgGroupResponse"; import { OrgGroupUpdateAttributes } from "./OrgGroupUpdateAttributes"; import { OrgGroupUpdateData } from "./OrgGroupUpdateData"; @@ -5928,12 +5925,15 @@ const enumsMap: { [key: string]: any[] } = { OrgConnectionType: ["org_connection"], OrgConnectionTypeEnum: ["logs", "metrics", "audit"], OrgConnectionUserRelationshipDataType: ["users"], - OrgGroupIncludeOption: ["memberships"], OrgGroupMembershipBulkUpdateType: ["org_group_membership_bulk_updates"], OrgGroupMembershipSortOption: ["name", "-name", "uuid", "-uuid"], OrgGroupMembershipType: ["org_group_memberships"], OrgGroupPolicyConfigType: ["org_group_policy_configs"], - OrgGroupPolicyEnforcementTier: ["DEFAULT", "ENFORCE", "DELEGATE"], + OrgGroupPolicyEnforcementTier: [ + "OVERRIDE_ALLOWED", + "GROUP_MANAGED", + "DELEGATE", + ], OrgGroupPolicyOverrideSortOption: ["id", "-id", "org_uuid", "-org_uuid"], OrgGroupPolicyOverrideType: ["org_group_policy_overrides"], OrgGroupPolicyPolicyType: ["org_config"], @@ -10263,13 +10263,11 @@ const typeMap: { [index: string]: any } = { OrgGroupMembershipBulkUpdateRequest: OrgGroupMembershipBulkUpdateRequest, OrgGroupMembershipData: OrgGroupMembershipData, OrgGroupMembershipListResponse: OrgGroupMembershipListResponse, - OrgGroupMembershipRelationshipData: OrgGroupMembershipRelationshipData, OrgGroupMembershipRelationships: OrgGroupMembershipRelationships, OrgGroupMembershipResponse: OrgGroupMembershipResponse, OrgGroupMembershipUpdateData: OrgGroupMembershipUpdateData, OrgGroupMembershipUpdateRelationships: OrgGroupMembershipUpdateRelationships, OrgGroupMembershipUpdateRequest: OrgGroupMembershipUpdateRequest, - OrgGroupMembershipsRelationship: OrgGroupMembershipsRelationship, OrgGroupPaginationLinks: OrgGroupPaginationLinks, OrgGroupPaginationMeta: OrgGroupPaginationMeta, OrgGroupPaginationMetaPage: OrgGroupPaginationMetaPage, @@ -10307,7 +10305,6 @@ const typeMap: { [index: string]: any } = { OrgGroupPolicyUpdateRequest: OrgGroupPolicyUpdateRequest, OrgGroupRelationshipToOne: OrgGroupRelationshipToOne, OrgGroupRelationshipToOneData: OrgGroupRelationshipToOneData, - OrgGroupRelationships: OrgGroupRelationships, OrgGroupResponse: OrgGroupResponse, OrgGroupUpdateAttributes: OrgGroupUpdateAttributes, OrgGroupUpdateData: OrgGroupUpdateData, diff --git a/packages/datadog-api-client-v2/models/OrgGroupData.ts b/packages/datadog-api-client-v2/models/OrgGroupData.ts index a4eb0426c884..e29136c2ea2a 100644 --- a/packages/datadog-api-client-v2/models/OrgGroupData.ts +++ b/packages/datadog-api-client-v2/models/OrgGroupData.ts @@ -4,7 +4,6 @@ * Copyright 2020-Present Datadog, Inc. */ import { OrgGroupAttributes } from "./OrgGroupAttributes"; -import { OrgGroupRelationships } from "./OrgGroupRelationships"; import { OrgGroupType } from "./OrgGroupType"; import { AttributeTypeMap } from "../../datadog-api-client-common/util"; @@ -21,10 +20,6 @@ export class OrgGroupData { * The ID of the org group. */ "id": string; - /** - * Relationships of an org group. - */ - "relationships"?: OrgGroupRelationships; /** * Org groups resource type. */ @@ -57,10 +52,6 @@ export class OrgGroupData { required: true, format: "uuid", }, - relationships: { - baseName: "relationships", - type: "OrgGroupRelationships", - }, type: { baseName: "type", type: "OrgGroupType", diff --git a/packages/datadog-api-client-v2/models/OrgGroupIncludeOption.ts b/packages/datadog-api-client-v2/models/OrgGroupIncludeOption.ts deleted file mode 100644 index c472dba2ad7c..000000000000 --- a/packages/datadog-api-client-v2/models/OrgGroupIncludeOption.ts +++ /dev/null @@ -1,14 +0,0 @@ -/** - * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License. - * This product includes software developed at Datadog (https://www.datadoghq.com/). - * Copyright 2020-Present Datadog, Inc. - */ - -import { UnparsedObject } from "../../datadog-api-client-common/util"; - -/** - * Allowed include options for org group endpoints. - */ - -export type OrgGroupIncludeOption = typeof MEMBERSHIPS | UnparsedObject; -export const MEMBERSHIPS = "memberships"; diff --git a/packages/datadog-api-client-v2/models/OrgGroupListResponse.ts b/packages/datadog-api-client-v2/models/OrgGroupListResponse.ts index 1324327bd1f0..91350af59e93 100644 --- a/packages/datadog-api-client-v2/models/OrgGroupListResponse.ts +++ b/packages/datadog-api-client-v2/models/OrgGroupListResponse.ts @@ -4,7 +4,6 @@ * Copyright 2020-Present Datadog, Inc. */ import { OrgGroupData } from "./OrgGroupData"; -import { OrgGroupMembershipData } from "./OrgGroupMembershipData"; import { OrgGroupPaginationLinks } from "./OrgGroupPaginationLinks"; import { OrgGroupPaginationMeta } from "./OrgGroupPaginationMeta"; @@ -18,10 +17,6 @@ export class OrgGroupListResponse { * An array of org groups. */ "data": Array; - /** - * Related resources included in the response when requested with the `include` parameter. - */ - "included"?: Array; /** * Pagination links for navigating between pages of an org group list response. */ @@ -52,10 +47,6 @@ export class OrgGroupListResponse { type: "Array", required: true, }, - included: { - baseName: "included", - type: "Array", - }, links: { baseName: "links", type: "OrgGroupPaginationLinks", diff --git a/packages/datadog-api-client-v2/models/OrgGroupMembershipRelationshipData.ts b/packages/datadog-api-client-v2/models/OrgGroupMembershipRelationshipData.ts deleted file mode 100644 index eb2d6a58ad49..000000000000 --- a/packages/datadog-api-client-v2/models/OrgGroupMembershipRelationshipData.ts +++ /dev/null @@ -1,64 +0,0 @@ -/** - * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License. - * This product includes software developed at Datadog (https://www.datadoghq.com/). - * Copyright 2020-Present Datadog, Inc. - */ -import { OrgGroupMembershipType } from "./OrgGroupMembershipType"; - -import { AttributeTypeMap } from "../../datadog-api-client-common/util"; - -/** - * A reference to an org group membership. - */ -export class OrgGroupMembershipRelationshipData { - /** - * The ID of the membership. - */ - "id": string; - /** - * Org group memberships resource type. - */ - "type": OrgGroupMembershipType; - - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - "additionalProperties"?: { [key: string]: any }; - - /** - * @ignore - */ - "_unparsed"?: boolean; - - /** - * @ignore - */ - static readonly attributeTypeMap: AttributeTypeMap = { - id: { - baseName: "id", - type: "string", - required: true, - format: "uuid", - }, - type: { - baseName: "type", - type: "OrgGroupMembershipType", - required: true, - }, - additionalProperties: { - baseName: "additionalProperties", - type: "{ [key: string]: any; }", - }, - }; - - /** - * @ignore - */ - static getAttributeTypeMap(): AttributeTypeMap { - return OrgGroupMembershipRelationshipData.attributeTypeMap; - } - - public constructor() {} -} diff --git a/packages/datadog-api-client-v2/models/OrgGroupMembershipsRelationship.ts b/packages/datadog-api-client-v2/models/OrgGroupMembershipsRelationship.ts deleted file mode 100644 index c3b0a4f0ae45..000000000000 --- a/packages/datadog-api-client-v2/models/OrgGroupMembershipsRelationship.ts +++ /dev/null @@ -1,54 +0,0 @@ -/** - * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License. - * This product includes software developed at Datadog (https://www.datadoghq.com/). - * Copyright 2020-Present Datadog, Inc. - */ -import { OrgGroupMembershipRelationshipData } from "./OrgGroupMembershipRelationshipData"; - -import { AttributeTypeMap } from "../../datadog-api-client-common/util"; - -/** - * Relationship to org group memberships. - */ -export class OrgGroupMembershipsRelationship { - /** - * An array of membership relationship references. - */ - "data": Array; - - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - "additionalProperties"?: { [key: string]: any }; - - /** - * @ignore - */ - "_unparsed"?: boolean; - - /** - * @ignore - */ - static readonly attributeTypeMap: AttributeTypeMap = { - data: { - baseName: "data", - type: "Array", - required: true, - }, - additionalProperties: { - baseName: "additionalProperties", - type: "{ [key: string]: any; }", - }, - }; - - /** - * @ignore - */ - static getAttributeTypeMap(): AttributeTypeMap { - return OrgGroupMembershipsRelationship.attributeTypeMap; - } - - public constructor() {} -} diff --git a/packages/datadog-api-client-v2/models/OrgGroupPolicyAttributes.ts b/packages/datadog-api-client-v2/models/OrgGroupPolicyAttributes.ts index 1b48069e3618..f77dd0a471da 100644 --- a/packages/datadog-api-client-v2/models/OrgGroupPolicyAttributes.ts +++ b/packages/datadog-api-client-v2/models/OrgGroupPolicyAttributes.ts @@ -17,7 +17,7 @@ export class OrgGroupPolicyAttributes { */ "content"?: { [key: string]: any }; /** - * 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. + * 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. */ "enforcementTier": OrgGroupPolicyEnforcementTier; /** diff --git a/packages/datadog-api-client-v2/models/OrgGroupPolicyCreateAttributes.ts b/packages/datadog-api-client-v2/models/OrgGroupPolicyCreateAttributes.ts index 000a37bb8565..58818a41848b 100644 --- a/packages/datadog-api-client-v2/models/OrgGroupPolicyCreateAttributes.ts +++ b/packages/datadog-api-client-v2/models/OrgGroupPolicyCreateAttributes.ts @@ -17,7 +17,7 @@ export class OrgGroupPolicyCreateAttributes { */ "content": { [key: string]: any }; /** - * 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. + * 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. */ "enforcementTier"?: OrgGroupPolicyEnforcementTier; /** diff --git a/packages/datadog-api-client-v2/models/OrgGroupPolicyEnforcementTier.ts b/packages/datadog-api-client-v2/models/OrgGroupPolicyEnforcementTier.ts index 3d6aebe453ae..89e0b9a9f7a8 100644 --- a/packages/datadog-api-client-v2/models/OrgGroupPolicyEnforcementTier.ts +++ b/packages/datadog-api-client-v2/models/OrgGroupPolicyEnforcementTier.ts @@ -7,14 +7,14 @@ import { UnparsedObject } from "../../datadog-api-client-common/util"; /** - * 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. + * 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. */ export type OrgGroupPolicyEnforcementTier = - | typeof DEFAULT - | typeof ENFORCE + | typeof OVERRIDE_ALLOWED + | typeof GROUP_MANAGED | typeof DELEGATE | UnparsedObject; -export const DEFAULT = "DEFAULT"; -export const ENFORCE = "ENFORCE"; +export const OVERRIDE_ALLOWED = "OVERRIDE_ALLOWED"; +export const GROUP_MANAGED = "GROUP_MANAGED"; export const DELEGATE = "DELEGATE"; diff --git a/packages/datadog-api-client-v2/models/OrgGroupPolicyUpdateAttributes.ts b/packages/datadog-api-client-v2/models/OrgGroupPolicyUpdateAttributes.ts index 72c461b09a3e..41a6f636919b 100644 --- a/packages/datadog-api-client-v2/models/OrgGroupPolicyUpdateAttributes.ts +++ b/packages/datadog-api-client-v2/models/OrgGroupPolicyUpdateAttributes.ts @@ -16,7 +16,7 @@ export class OrgGroupPolicyUpdateAttributes { */ "content"?: { [key: string]: any }; /** - * 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. + * 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. */ "enforcementTier"?: OrgGroupPolicyEnforcementTier; diff --git a/packages/datadog-api-client-v2/models/OrgGroupRelationships.ts b/packages/datadog-api-client-v2/models/OrgGroupRelationships.ts deleted file mode 100644 index 4a3324077009..000000000000 --- a/packages/datadog-api-client-v2/models/OrgGroupRelationships.ts +++ /dev/null @@ -1,53 +0,0 @@ -/** - * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License. - * This product includes software developed at Datadog (https://www.datadoghq.com/). - * Copyright 2020-Present Datadog, Inc. - */ -import { OrgGroupMembershipsRelationship } from "./OrgGroupMembershipsRelationship"; - -import { AttributeTypeMap } from "../../datadog-api-client-common/util"; - -/** - * Relationships of an org group. - */ -export class OrgGroupRelationships { - /** - * Relationship to org group memberships. - */ - "memberships"?: OrgGroupMembershipsRelationship; - - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - "additionalProperties"?: { [key: string]: any }; - - /** - * @ignore - */ - "_unparsed"?: boolean; - - /** - * @ignore - */ - static readonly attributeTypeMap: AttributeTypeMap = { - memberships: { - baseName: "memberships", - type: "OrgGroupMembershipsRelationship", - }, - additionalProperties: { - baseName: "additionalProperties", - type: "{ [key: string]: any; }", - }, - }; - - /** - * @ignore - */ - static getAttributeTypeMap(): AttributeTypeMap { - return OrgGroupRelationships.attributeTypeMap; - } - - public constructor() {} -}