Merge membership from mcnulty

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-09-30 14:37:33.047156",
-            "spec_repo_commit": "60bc9127"
+            "regenerated": "2024-09-30 16:06:27.890143",
+            "spec_repo_commit": "3c5d6057"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-09-30 14:37:33.070295",
-            "spec_repo_commit": "60bc9127"
+            "regenerated": "2024-09-30 16:06:27.904509",
+            "spec_repo_commit": "3c5d6057"
         }
     }
 }

.generator/schemas/v2/openapi.yaml

@@ -950,6 +950,64 @@ components:
             $ref: '#/components/schemas/AWSRelatedAccount'
           type: array
       type: object
+    AbbreviatedTeam:
+      description: The definition of `AbbreviatedTeam` object.
+      properties:
+        attributes:
+          $ref: '#/components/schemas/AbbreviatedTeamAttributes'
+        id:
+          description: ID of the team
+          type: string
+        type:
+          $ref: '#/components/schemas/AbbreviatedTeamType'
+      required:
+      - attributes
+      - type
+      type: object
+    AbbreviatedTeamAttributes:
+      description: The definition of `AbbreviatedTeamAttributes` object.
+      properties:
+        avatar:
+          description: Unicode representation of the avatar for the team, limited
+            to a single grapheme
+          nullable: true
+          type: string
+        banner:
+          description: Banner selection for the team
+          format: int64
+          type: integer
+        handle:
+          description: The team's identifier
+          example: ''
+          type: string
+        handles:
+          description: The `AbbreviatedTeamAttributes` `handles`.
+          type: string
+        is_open_membership:
+          description: The `AbbreviatedTeamAttributes` `is_open_membership`.
+          readOnly: true
+          type: boolean
+        name:
+          description: The name of the team
+          example: ''
+          type: string
+        summary:
+          description: A brief summary of the team
+          readOnly: true
+          type: string
+      required:
+      - handle
+      - name
+      type: object
+    AbbreviatedTeamType:
+      default: team
+      description: The definition of `AbbreviatedTeamType` object.
+      enum:
+      - team
+      example: team
+      type: string
+      x-enum-varnames:
+      - TEAM
     ActiveBillingDimensionsAttributes:
       description: List of active billing dimensions.
       properties:
@@ -17812,27 +17870,6 @@ components:
       - id
       - type
       type: object
-    RelationshipToUserTeamTeam:
-      description: Relationship between team membership and team
-      properties:
-        data:
-          $ref: '#/components/schemas/RelationshipToUserTeamTeamData'
-      required:
-      - data
-      type: object
-    RelationshipToUserTeamTeamData:
-      description: The team associated with the membership
-      properties:
-        id:
-          description: The ID of the team associated with the membership
-          example: d7e15d9d-d346-43da-81d8-3d9e71d9a5e9
-          type: string
-        type:
-          $ref: '#/components/schemas/UserTeamTeamType'
-      required:
-      - id
-      - type
-      type: object
     RelationshipToUserTeamUser:
       description: Relationship between team membership and user
       properties:
@@ -24823,8 +24860,8 @@ components:
     UserTeamIncluded:
       description: Included resources related to the team membership
       oneOf:
-      - $ref: '#/components/schemas/User'
-      - $ref: '#/components/schemas/Team'
+      - $ref: '#/components/schemas/AbbreviatedTeam'
+      - $ref: '#/components/schemas/UserTeamUser'
     UserTeamPermission:
       description: A user's permissions for a given team
       properties:
@@ -24861,8 +24898,6 @@ components:
     UserTeamRelationships:
       description: Relationship between membership and a user
       properties:
-        team:
-          $ref: '#/components/schemas/RelationshipToUserTeamTeam'
         user:
           $ref: '#/components/schemas/RelationshipToUserTeamUser'
       type: object
@@ -24893,15 +24928,6 @@ components:
       type: string
       x-enum-varnames:
       - ADMIN
-    UserTeamTeamType:
-      default: team
-      description: User team team type
-      enum:
-      - team
-      example: team
-      type: string
-      x-enum-varnames:
-      - TEAM
     UserTeamType:
       default: team_memberships
       description: Team membership type
@@ -24929,6 +24955,42 @@ components:
       required:
       - data
       type: object
+    UserTeamUser:
+      description: The definition of `UserTeamUser` object.
+      properties:
+        attributes:
+          $ref: '#/components/schemas/UserTeamUserAttributes'
+        id:
+          description: The `UserTeamUser` ID.
+          type: string
+        type:
+          $ref: '#/components/schemas/UserTeamUserType'
+      required:
+      - type
+      type: object
+    UserTeamUserAttributes:
+      description: The definition of `UserTeamUserAttributes` object.
+      properties:
+        disabled:
+          description: The `UserTeamUserAttributes` `disabled`.
+          type: boolean
+        email:
+          description: The `UserTeamUserAttributes` `email`.
+          type: string
+        handle:
+          description: The `UserTeamUserAttributes` `handle`.
+          type: string
+        icon:
+          description: The `UserTeamUserAttributes` `icon`.
+          type: string
+        name:
+          description: The `UserTeamUserAttributes` `name`.
+          nullable: true
+          type: string
+        service_account:
+          description: The `UserTeamUserAttributes` `service_account`.
+          type: boolean
+      type: object
     UserTeamUserType:
       default: users
       description: User team user type
@@ -38900,6 +38962,7 @@ paths:
         name: filter[keyword]
         required: false
         schema:
+          description: Search query, can be user email or name.
           type: string
       responses:
         '200':

examples/v2/teams/CreateTeamMembership.java

@@ -3,8 +3,6 @@
 import com.datadog.api.client.ApiClient;
 import com.datadog.api.client.ApiException;
 import com.datadog.api.client.v2.api.TeamsApi;
-import com.datadog.api.client.v2.model.RelationshipToUserTeamTeam;
-import com.datadog.api.client.v2.model.RelationshipToUserTeamTeamData;
 import com.datadog.api.client.v2.model.RelationshipToUserTeamUser;
 import com.datadog.api.client.v2.model.RelationshipToUserTeamUserData;
 import com.datadog.api.client.v2.model.UserTeamAttributes;
@@ -13,7 +11,6 @@
 import com.datadog.api.client.v2.model.UserTeamRequest;
 import com.datadog.api.client.v2.model.UserTeamResponse;
 import com.datadog.api.client.v2.model.UserTeamRole;
-import com.datadog.api.client.v2.model.UserTeamTeamType;
 import com.datadog.api.client.v2.model.UserTeamType;
 import com.datadog.api.client.v2.model.UserTeamUserType;
 
@@ -29,12 +26,6 @@ public static void main(String[] args) {
                     .attributes(new UserTeamAttributes().role(UserTeamRole.ADMIN))
                     .relationships(
                         new UserTeamRelationships()
-                            .team(
-                                new RelationshipToUserTeamTeam()
-                                    .data(
-                                        new RelationshipToUserTeamTeamData()
-                                            .id("d7e15d9d-d346-43da-81d8-3d9e71d9a5e9")
-                                            .type(UserTeamTeamType.TEAM)))
                             .user(
                                 new RelationshipToUserTeamUser()
                                     .data(