Remove user fields that are unsupported by the Incidents API

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-10-02 20:43:00.348465",
-            "spec_repo_commit": "76b7b19d"
+            "regenerated": "2024-10-03 13:53:52.224483",
+            "spec_repo_commit": "2c46d95c"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-10-02 20:43:00.363246",
-            "spec_repo_commit": "76b7b19d"
+            "regenerated": "2024-10-03 13:53:52.241054",
+            "spec_repo_commit": "2c46d95c"
         }
     }
 }

.generator/schemas/v2/openapi.yaml

@@ -10930,7 +10930,7 @@ components:
     IncidentResponseIncludedItem:
       description: An object related to an incident that is included in the response.
       oneOf:
-      - $ref: '#/components/schemas/User'
+      - $ref: '#/components/schemas/IncidentUserData'
       - $ref: '#/components/schemas/IncidentAttachmentData'
     IncidentResponseMeta:
       description: The metadata object containing pagination metadata.
@@ -11869,6 +11869,37 @@ components:
       required:
       - data
       type: object
+    IncidentUserAttributes:
+      description: Attributes of user object returned by the API.
+      properties:
+        email:
+          description: Email of the user.
+          type: string
+        handle:
+          description: Handle of the user.
+          type: string
+        icon:
+          description: URL of the user's icon.
+          type: string
+        name:
+          description: Name of the user.
+          nullable: true
+          type: string
+        uuid:
+          description: UUID of the user.
+          type: string
+      type: object
+    IncidentUserData:
+      description: User object returned by the API.
+      properties:
+        attributes:
+          $ref: '#/components/schemas/IncidentUserAttributes'
+        id:
+          description: ID of the user.
+          type: string
+        type:
+          $ref: '#/components/schemas/UsersType'
+      type: object
     IncidentUserDefinedFieldType:
       description: The incident user defined fields type.
       enum:

api/datadogV2/model_incident_response_included_item.go

@@ -10,16 +10,16 @@ import (
 
 // IncidentResponseIncludedItem - An object related to an incident that is included in the response.
 type IncidentResponseIncludedItem struct {
-	User                   *User
+	IncidentUserData       *IncidentUserData
 	IncidentAttachmentData *IncidentAttachmentData
 
 	// UnparsedObject contains the raw value of the object if there was an error when deserializing into the struct
 	UnparsedObject interface{}
 }
 
-// UserAsIncidentResponseIncludedItem is a convenience function that returns User wrapped in IncidentResponseIncludedItem.
-func UserAsIncidentResponseIncludedItem(v *User) IncidentResponseIncludedItem {
-	return IncidentResponseIncludedItem{User: v}
+// IncidentUserDataAsIncidentResponseIncludedItem is a convenience function that returns IncidentUserData wrapped in IncidentResponseIncludedItem.
+func IncidentUserDataAsIncidentResponseIncludedItem(v *IncidentUserData) IncidentResponseIncludedItem {
+	return IncidentResponseIncludedItem{IncidentUserData: v}
 }
 
 // IncidentAttachmentDataAsIncidentResponseIncludedItem is a convenience function that returns IncidentAttachmentData wrapped in IncidentResponseIncludedItem.
@@ -31,21 +31,21 @@ func IncidentAttachmentDataAsIncidentResponseIncludedItem(v *IncidentAttachmentD
 func (obj *IncidentResponseIncludedItem) UnmarshalJSON(data []byte) error {
 	var err error
 	match := 0
-	// try to unmarshal data into User
-	err = datadog.Unmarshal(data, &obj.User)
+	// try to unmarshal data into IncidentUserData
+	err = datadog.Unmarshal(data, &obj.IncidentUserData)
 	if err == nil {
-		if obj.User != nil && obj.User.UnparsedObject == nil {
-			jsonUser, _ := datadog.Marshal(obj.User)
-			if string(jsonUser) == "{}" && string(data) != "{}" { // empty struct
-				obj.User = nil
+		if obj.IncidentUserData != nil && obj.IncidentUserData.UnparsedObject == nil {
+			jsonIncidentUserData, _ := datadog.Marshal(obj.IncidentUserData)
+			if string(jsonIncidentUserData) == "{}" && string(data) != "{}" { // empty struct
+				obj.IncidentUserData = nil
 			} else {
 				match++
 			}
 		} else {
-			obj.User = nil
+			obj.IncidentUserData = nil
 		}
 	} else {
-		obj.User = nil
+		obj.IncidentUserData = nil
 	}
 
 	// try to unmarshal data into IncidentAttachmentData
@@ -67,7 +67,7 @@ func (obj *IncidentResponseIncludedItem) UnmarshalJSON(data []byte) error {
 
 	if match != 1 { // more than 1 match
 		// reset to nil
-		obj.User = nil
+		obj.IncidentUserData = nil
 		obj.IncidentAttachmentData = nil
 		return datadog.Unmarshal(data, &obj.UnparsedObject)
 	}
@@ -76,8 +76,8 @@ func (obj *IncidentResponseIncludedItem) UnmarshalJSON(data []byte) error {
 
 // MarshalJSON turns data from the first non-nil pointers in the struct to JSON.
 func (obj IncidentResponseIncludedItem) MarshalJSON() ([]byte, error) {
-	if obj.User != nil {
-		return datadog.Marshal(&obj.User)
+	if obj.IncidentUserData != nil {
+		return datadog.Marshal(&obj.IncidentUserData)
 	}
 
 	if obj.IncidentAttachmentData != nil {
@@ -92,8 +92,8 @@ func (obj IncidentResponseIncludedItem) MarshalJSON() ([]byte, error) {
 
 // GetActualInstance returns the actual instance.
 func (obj *IncidentResponseIncludedItem) GetActualInstance() interface{} {
-	if obj.User != nil {
-		return obj.User
+	if obj.IncidentUserData != nil {
+		return obj.IncidentUserData
 	}
 
 	if obj.IncidentAttachmentData != nil {