Rename Tiers for Org Group Policies and Remove Include Memberships Support (#4240)

Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com>

Author: api-clients-generation-pipeline[bot]

.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
@@ -59532,22 +59518,13 @@ components:
           example: "a1b2c3d4-e5f6-7890-abcd-ef0123456789"
           format: uuid
           type: string
-        relationships:
-          $ref: "#/components/schemas/OrgGroupRelationships"
         type:
           $ref: "#/components/schemas/OrgGroupType"
       required:
         - id
         - 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:
@@ -59556,11 +59533,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:
@@ -59687,20 +59659,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:
@@ -59771,17 +59729,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:
@@ -60015,18 +59962,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.
@@ -60367,12 +60314,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:
@@ -134194,7 +134135,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"
@@ -134266,7 +134207,7 @@ paths:
                     attributes:
                       content:
                         value: "UTC"
-                      enforcement_tier: "DEFAULT"
+                      enforcement_tier: "OVERRIDE_ALLOWED"
                       policy_name: "monitor_timezone"
                       policy_type: "org_config"
                     relationships:
@@ -134289,7 +134230,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"
@@ -134398,7 +134339,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"
@@ -134462,7 +134403,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:
@@ -134479,7 +134420,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"
@@ -134946,7 +134887,6 @@ paths:
         - $ref: "#/components/parameters/OrgGroupPageNumber"
         - $ref: "#/components/parameters/OrgGroupPageSize"
         - $ref: "#/components/parameters/OrgGroupSort"
-        - $ref: "#/components/parameters/OrgGroupInclude"
       responses:
         "200":
           content:

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",
       },

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",

features/support/scenarios_model_mapping.ts

@@ -11336,10 +11336,6 @@ export const ScenariosModelMappings: {[key: string]: {[key: string]: any}} = {
             "type": "OrgGroupSortOption",
             "format": "",
             },
-        "include": {
-            "type": "Array<OrgGroupIncludeOption>",
-            "format": "",
-            },
         "operationResponseType": "OrgGroupListResponse",
     },
     "v2.CreateOrgGroup": {

features/v2/org_groups.feature

@@ -60,23 +60,23 @@ 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
 
   @generated @skip @team:DataDog/org-management
   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
 
   @generated @skip @team:DataDog/org-management
   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
 

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<OrgGroupIncludeOption>,
     _options?: Configuration
   ): Promise<RequestContext> {
     const _config = _options || this.configuration;
@@ -836,13 +834,6 @@ export class OrgGroupsApiRequestFactory extends BaseAPIRequestFactory {
         ""
       );
     }
-    if (include !== undefined) {
-      requestContext.setQueryParam(
-        "include",
-        ObjectSerializer.serialize(include, "Array<OrgGroupIncludeOption>", ""),
-        "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<OrgGroupIncludeOption>
-   */
-  include?: Array<OrgGroupIncludeOption>;
 }
 
 export interface OrgGroupsApiUpdateOrgGroupRequest {
@@ -3384,7 +3370,6 @@ export class OrgGroupsApi {
       param.pageNumber,
       param.pageSize,
       param.sort,
-      param.include,
       options
     );
     return requestContextPromise.then((requestContext) => {

packages/datadog-api-client-v2/index.ts

@@ -5135,7 +5135,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";
@@ -5145,11 +5144,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";
@@ -5193,7 +5190,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";