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

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:

api/datadogV2/api_org_groups.go

@@ -1623,7 +1623,6 @@ type ListOrgGroupsOptionalParameters struct {
 	PageNumber *int64
 	PageSize   *int64
 	Sort       *OrgGroupSortOption
-	Include    *[]OrgGroupIncludeOption
 }
 
 // NewListOrgGroupsOptionalParameters creates an empty struct for parameters.
@@ -1650,12 +1649,6 @@ func (r *ListOrgGroupsOptionalParameters) WithSort(sort OrgGroupSortOption) *Lis
 	return r
 }
 
-// WithInclude sets the corresponding parameter name and returns the struct.
-func (r *ListOrgGroupsOptionalParameters) WithInclude(include []OrgGroupIncludeOption) *ListOrgGroupsOptionalParameters {
-	r.Include = &include
-	return r
-}
-
 // ListOrgGroups List org groups.
 // List all organization groups that the requesting organization has access to.
 func (a *OrgGroupsApi) ListOrgGroups(ctx _context.Context, o ...ListOrgGroupsOptionalParameters) (OrgGroupListResponse, *_nethttp.Response, error) {
@@ -1701,9 +1694,6 @@ func (a *OrgGroupsApi) ListOrgGroups(ctx _context.Context, o ...ListOrgGroupsOpt
 	if optionalParams.Sort != nil {
 		localVarQueryParams.Add("sort", datadog.ParameterToString(*optionalParams.Sort, ""))
 	}
-	if optionalParams.Include != nil {
-		localVarQueryParams.Add("include", datadog.ParameterToString(*optionalParams.Include, "csv"))
-	}
 	localVarHeaderParams["Accept"] = "application/json"
 
 	if a.Client.Cfg.DelegatedTokenConfig != nil {

api/datadogV2/model_org_group_data.go

@@ -18,8 +18,6 @@ type OrgGroupData struct {
 	Attributes OrgGroupAttributes `json:"attributes"`
 	// The ID of the org group.
 	Id uuid.UUID `json:"id"`
-	// Relationships of an org group.
-	Relationships *OrgGroupRelationships `json:"relationships,omitempty"`
 	// Org groups resource type.
 	Type OrgGroupType `json:"type"`
 	// UnparsedObject contains the raw value of the object if there was an error when deserializing into the struct
@@ -93,34 +91,6 @@ func (o *OrgGroupData) SetId(v uuid.UUID) {
 	o.Id = v
 }
 
-// GetRelationships returns the Relationships field value if set, zero value otherwise.
-func (o *OrgGroupData) GetRelationships() OrgGroupRelationships {
-	if o == nil || o.Relationships == nil {
-		var ret OrgGroupRelationships
-		return ret
-	}
-	return *o.Relationships
-}
-
-// GetRelationshipsOk returns a tuple with the Relationships field value if set, nil otherwise
-// and a boolean to check if the value has been set.
-func (o *OrgGroupData) GetRelationshipsOk() (*OrgGroupRelationships, bool) {
-	if o == nil || o.Relationships == nil {
-		return nil, false
-	}
-	return o.Relationships, true
-}
-
-// HasRelationships returns a boolean if a field has been set.
-func (o *OrgGroupData) HasRelationships() bool {
-	return o != nil && o.Relationships != nil
-}
-
-// SetRelationships gets a reference to the given OrgGroupRelationships and assigns it to the Relationships field.
-func (o *OrgGroupData) SetRelationships(v OrgGroupRelationships) {
-	o.Relationships = &v
-}
-
 // GetType returns the Type field value.
 func (o *OrgGroupData) GetType() OrgGroupType {
 	if o == nil {
@@ -152,9 +122,6 @@ func (o OrgGroupData) MarshalJSON() ([]byte, error) {
 	}
 	toSerialize["attributes"] = o.Attributes
 	toSerialize["id"] = o.Id
-	if o.Relationships != nil {
-		toSerialize["relationships"] = o.Relationships
-	}
 	toSerialize["type"] = o.Type
 
 	for key, value := range o.AdditionalProperties {
@@ -166,10 +133,9 @@ func (o OrgGroupData) MarshalJSON() ([]byte, error) {
 // UnmarshalJSON deserializes the given payload.
 func (o *OrgGroupData) UnmarshalJSON(bytes []byte) (err error) {
 	all := struct {
-		Attributes    *OrgGroupAttributes    `json:"attributes"`
-		Id            *uuid.UUID             `json:"id"`
-		Relationships *OrgGroupRelationships `json:"relationships,omitempty"`
-		Type          *OrgGroupType          `json:"type"`
+		Attributes *OrgGroupAttributes `json:"attributes"`
+		Id         *uuid.UUID          `json:"id"`
+		Type       *OrgGroupType       `json:"type"`
 	}{}
 	if err = datadog.Unmarshal(bytes, &all); err != nil {
 		return datadog.Unmarshal(bytes, &o.UnparsedObject)
@@ -185,7 +151,7 @@ func (o *OrgGroupData) UnmarshalJSON(bytes []byte) (err error) {
 	}
 	additionalProperties := make(map[string]interface{})
 	if err = datadog.Unmarshal(bytes, &additionalProperties); err == nil {
-		datadog.DeleteKeys(additionalProperties, &[]string{"attributes", "id", "relationships", "type"})
+		datadog.DeleteKeys(additionalProperties, &[]string{"attributes", "id", "type"})
 	} else {
 		return err
 	}
@@ -196,10 +162,6 @@ func (o *OrgGroupData) UnmarshalJSON(bytes []byte) (err error) {
 	}
 	o.Attributes = *all.Attributes
 	o.Id = *all.Id
-	if all.Relationships != nil && all.Relationships.UnparsedObject != nil && o.UnparsedObject == nil {
-		hasInvalidField = true
-	}
-	o.Relationships = all.Relationships
 	if !all.Type.IsValid() {
 		hasInvalidField = true
 	} else {