Add user status to schema and fix escalation policy included (#629)

Co-authored-by: ci.datadog-api-spec <[email protected]>

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

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-05-01 18:50:08.747675",
-            "spec_repo_commit": "7eb88f6a"
+            "regenerated": "2025-05-02 04:31:12.514459",
+            "spec_repo_commit": "272cce39"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-05-01 18:50:08.763839",
-            "spec_repo_commit": "7eb88f6a"
+            "regenerated": "2025-05-02 04:31:12.530271",
+            "spec_repo_commit": "272cce39"
         }
     }
 }

.generator/schemas/v2/openapi.yaml

@@ -13547,9 +13547,8 @@ components:
       oneOf:
       - $ref: '#/components/schemas/TeamReference'
       - $ref: '#/components/schemas/EscalationPolicyStep'
-      - $ref: '#/components/schemas/UserTarget'
-      - $ref: '#/components/schemas/ScheduleTarget'
-      - $ref: '#/components/schemas/TeamTarget'
+      - $ref: '#/components/schemas/EscalationPolicyUser'
+      - $ref: '#/components/schemas/ScheduleData'
     EscalationPolicyStep:
       description: Represents a single step in an escalation policy, including its
         attributes, relationships, and resource type.
@@ -13795,6 +13794,44 @@ components:
       type: string
       x-enum-varnames:
       - POLICIES
+    EscalationPolicyUser:
+      description: Represents a user object in the context of an escalation policy,
+        including their `id`, type, and basic attributes.
+      properties:
+        attributes:
+          $ref: '#/components/schemas/EscalationPolicyUserAttributes'
+        id:
+          description: The unique user identifier.
+          type: string
+        type:
+          $ref: '#/components/schemas/EscalationPolicyUserType'
+      required:
+      - type
+      type: object
+    EscalationPolicyUserAttributes:
+      description: Provides basic user information for an escalation policy, including
+        a name and email address.
+      properties:
+        email:
+          description: The user's email address.
+          example: [email protected]
+          type: string
+        name:
+          description: The user's name.
+          example: Jane Doe
+          type: string
+        status:
+          $ref: '#/components/schemas/UserAttributesStatus'
+      type: object
+    EscalationPolicyUserType:
+      default: users
+      description: Users resource type.
+      enum:
+      - users
+      example: users
+      type: string
+      x-enum-varnames:
+      - USERS
     EscalationTarget:
       description: Represents an escalation target, which can be a team, user, or
         schedule.
@@ -31730,6 +31767,8 @@ components:
           description: The user's name.
           example: Jane Doe
           type: string
+        status:
+          $ref: '#/components/schemas/UserAttributesStatus'
       type: object
     ScheduleUserType:
       default: users
@@ -38564,6 +38603,17 @@ components:
           description: Whether the user is verified.
           type: boolean
       type: object
+    UserAttributesStatus:
+      description: The user's status.
+      enum:
+      - active
+      - deactivated
+      - pending
+      type: string
+      x-enum-varnames:
+      - ACTIVE
+      - DEACTIVATED
+      - PENDING
     UserCreateAttributes:
       description: Attributes of the created user.
       properties:

src/datadogV2/model/mod.rs

@@ -2628,6 +2628,34 @@ pub mod model_escalation_target;
 pub use self::model_escalation_target::EscalationTarget;
 pub mod model_escalation_policy_step_type;
 pub use self::model_escalation_policy_step_type::EscalationPolicyStepType;
+pub mod model_escalation_policy_user;
+pub use self::model_escalation_policy_user::EscalationPolicyUser;
+pub mod model_escalation_policy_user_attributes;
+pub use self::model_escalation_policy_user_attributes::EscalationPolicyUserAttributes;
+pub mod model_user_attributes_status;
+pub use self::model_user_attributes_status::UserAttributesStatus;
+pub mod model_escalation_policy_user_type;
+pub use self::model_escalation_policy_user_type::EscalationPolicyUserType;
+pub mod model_schedule_data;
+pub use self::model_schedule_data::ScheduleData;
+pub mod model_schedule_data_attributes;
+pub use self::model_schedule_data_attributes::ScheduleDataAttributes;
+pub mod model_schedule_data_relationships;
+pub use self::model_schedule_data_relationships::ScheduleDataRelationships;
+pub mod model_schedule_data_relationships_layers;
+pub use self::model_schedule_data_relationships_layers::ScheduleDataRelationshipsLayers;
+pub mod model_schedule_data_relationships_layers_data_items;
+pub use self::model_schedule_data_relationships_layers_data_items::ScheduleDataRelationshipsLayersDataItems;
+pub mod model_schedule_data_relationships_layers_data_items_type;
+pub use self::model_schedule_data_relationships_layers_data_items_type::ScheduleDataRelationshipsLayersDataItemsType;
+pub mod model_schedule_data_relationships_teams;
+pub use self::model_schedule_data_relationships_teams::ScheduleDataRelationshipsTeams;
+pub mod model_schedule_data_relationships_teams_data_items;
+pub use self::model_schedule_data_relationships_teams_data_items::ScheduleDataRelationshipsTeamsDataItems;
+pub mod model_schedule_data_relationships_teams_data_items_type;
+pub use self::model_schedule_data_relationships_teams_data_items_type::ScheduleDataRelationshipsTeamsDataItemsType;
+pub mod model_schedule_data_type;
+pub use self::model_schedule_data_type::ScheduleDataType;
 pub mod model_escalation_policy_included;
 pub use self::model_escalation_policy_included::EscalationPolicyIncluded;
 pub mod model_escalation_policy_update_request;
@@ -2686,26 +2714,6 @@ pub mod model_schedule_create_request_data_type;
 pub use self::model_schedule_create_request_data_type::ScheduleCreateRequestDataType;
 pub mod model_schedule;
 pub use self::model_schedule::Schedule;
-pub mod model_schedule_data;
-pub use self::model_schedule_data::ScheduleData;
-pub mod model_schedule_data_attributes;
-pub use self::model_schedule_data_attributes::ScheduleDataAttributes;
-pub mod model_schedule_data_relationships;
-pub use self::model_schedule_data_relationships::ScheduleDataRelationships;
-pub mod model_schedule_data_relationships_layers;
-pub use self::model_schedule_data_relationships_layers::ScheduleDataRelationshipsLayers;
-pub mod model_schedule_data_relationships_layers_data_items;
-pub use self::model_schedule_data_relationships_layers_data_items::ScheduleDataRelationshipsLayersDataItems;
-pub mod model_schedule_data_relationships_layers_data_items_type;
-pub use self::model_schedule_data_relationships_layers_data_items_type::ScheduleDataRelationshipsLayersDataItemsType;
-pub mod model_schedule_data_relationships_teams;
-pub use self::model_schedule_data_relationships_teams::ScheduleDataRelationshipsTeams;
-pub mod model_schedule_data_relationships_teams_data_items;
-pub use self::model_schedule_data_relationships_teams_data_items::ScheduleDataRelationshipsTeamsDataItems;
-pub mod model_schedule_data_relationships_teams_data_items_type;
-pub use self::model_schedule_data_relationships_teams_data_items_type::ScheduleDataRelationshipsTeamsDataItemsType;
-pub mod model_schedule_data_type;
-pub use self::model_schedule_data_type::ScheduleDataType;
 pub mod model_layer;
 pub use self::model_layer::Layer;
 pub mod model_layer_attributes;

src/datadogV2/model/model_escalation_policy_included.rs

@@ -10,9 +10,8 @@ use serde::{Deserialize, Deserializer, Serialize};
 pub enum EscalationPolicyIncluded {
     TeamReference(Box<crate::datadogV2::model::TeamReference>),
     EscalationPolicyStep(Box<crate::datadogV2::model::EscalationPolicyStep>),
-    UserTarget(Box<crate::datadogV2::model::UserTarget>),
-    ScheduleTarget(Box<crate::datadogV2::model::ScheduleTarget>),
-    TeamTarget(Box<crate::datadogV2::model::TeamTarget>),
+    EscalationPolicyUser(Box<crate::datadogV2::model::EscalationPolicyUser>),
+    ScheduleData(Box<crate::datadogV2::model::ScheduleData>),
     UnparsedObject(crate::datadog::UnparsedObject),
 }
 
@@ -36,25 +35,18 @@ impl<'de> Deserialize<'de> for EscalationPolicyIncluded {
                 return Ok(EscalationPolicyIncluded::EscalationPolicyStep(_v));
             }
         }
-        if let Ok(_v) =
-            serde_json::from_value::<Box<crate::datadogV2::model::UserTarget>>(value.clone())
-        {
-            if !_v._unparsed {
-                return Ok(EscalationPolicyIncluded::UserTarget(_v));
-            }
-        }
-        if let Ok(_v) =
-            serde_json::from_value::<Box<crate::datadogV2::model::ScheduleTarget>>(value.clone())
-        {
+        if let Ok(_v) = serde_json::from_value::<Box<crate::datadogV2::model::EscalationPolicyUser>>(
+            value.clone(),
+        ) {
             if !_v._unparsed {
-                return Ok(EscalationPolicyIncluded::ScheduleTarget(_v));
+                return Ok(EscalationPolicyIncluded::EscalationPolicyUser(_v));
             }
         }
         if let Ok(_v) =
-            serde_json::from_value::<Box<crate::datadogV2::model::TeamTarget>>(value.clone())
+            serde_json::from_value::<Box<crate::datadogV2::model::ScheduleData>>(value.clone())
         {
             if !_v._unparsed {
-                return Ok(EscalationPolicyIncluded::TeamTarget(_v));
+                return Ok(EscalationPolicyIncluded::ScheduleData(_v));
             }
         }
 

src/datadogV2/model/model_escalation_policy_user.rs

@@ -0,0 +1,139 @@
+// 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 2019-Present Datadog, Inc.
+use serde::de::{Error, MapAccess, Visitor};
+use serde::{Deserialize, Deserializer, Serialize};
+use serde_with::skip_serializing_none;
+use std::fmt::{self, Formatter};
+
+/// Represents a user object in the context of an escalation policy, including their `id`, type, and basic attributes.
+#[non_exhaustive]
+#[skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize)]
+pub struct EscalationPolicyUser {
+    /// Provides basic user information for an escalation policy, including a name and email address.
+    #[serde(rename = "attributes")]
+    pub attributes: Option<crate::datadogV2::model::EscalationPolicyUserAttributes>,
+    /// The unique user identifier.
+    #[serde(rename = "id")]
+    pub id: Option<String>,
+    /// Users resource type.
+    #[serde(rename = "type")]
+    pub type_: crate::datadogV2::model::EscalationPolicyUserType,
+    #[serde(flatten)]
+    pub additional_properties: std::collections::BTreeMap<String, serde_json::Value>,
+    #[serde(skip)]
+    #[serde(default)]
+    pub(crate) _unparsed: bool,
+}
+
+impl EscalationPolicyUser {
+    pub fn new(type_: crate::datadogV2::model::EscalationPolicyUserType) -> EscalationPolicyUser {
+        EscalationPolicyUser {
+            attributes: None,
+            id: None,
+            type_,
+            additional_properties: std::collections::BTreeMap::new(),
+            _unparsed: false,
+        }
+    }
+
+    pub fn attributes(
+        mut self,
+        value: crate::datadogV2::model::EscalationPolicyUserAttributes,
+    ) -> Self {
+        self.attributes = Some(value);
+        self
+    }
+
+    pub fn id(mut self, value: String) -> Self {
+        self.id = Some(value);
+        self
+    }
+
+    pub fn additional_properties(
+        mut self,
+        value: std::collections::BTreeMap<String, serde_json::Value>,
+    ) -> Self {
+        self.additional_properties = value;
+        self
+    }
+}
+
+impl<'de> Deserialize<'de> for EscalationPolicyUser {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        struct EscalationPolicyUserVisitor;
+        impl<'a> Visitor<'a> for EscalationPolicyUserVisitor {
+            type Value = EscalationPolicyUser;
+
+            fn expecting(&self, f: &mut Formatter<'_>) -> fmt::Result {
+                f.write_str("a mapping")
+            }
+
+            fn visit_map<M>(self, mut map: M) -> Result<Self::Value, M::Error>
+            where
+                M: MapAccess<'a>,
+            {
+                let mut attributes: Option<
+                    crate::datadogV2::model::EscalationPolicyUserAttributes,
+                > = None;
+                let mut id: Option<String> = None;
+                let mut type_: Option<crate::datadogV2::model::EscalationPolicyUserType> = None;
+                let mut additional_properties: std::collections::BTreeMap<
+                    String,
+                    serde_json::Value,
+                > = std::collections::BTreeMap::new();
+                let mut _unparsed = false;
+
+                while let Some((k, v)) = map.next_entry::<String, serde_json::Value>()? {
+                    match k.as_str() {
+                        "attributes" => {
+                            if v.is_null() {
+                                continue;
+                            }
+                            attributes = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
+                        }
+                        "id" => {
+                            if v.is_null() {
+                                continue;
+                            }
+                            id = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
+                        }
+                        "type" => {
+                            type_ = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
+                            if let Some(ref _type_) = type_ {
+                                match _type_ {
+                                    crate::datadogV2::model::EscalationPolicyUserType::UnparsedObject(_type_) => {
+                                        _unparsed = true;
+                                    },
+                                    _ => {}
+                                }
+                            }
+                        }
+                        &_ => {
+                            if let Ok(value) = serde_json::from_value(v.clone()) {
+                                additional_properties.insert(k, value);
+                            }
+                        }
+                    }
+                }
+                let type_ = type_.ok_or_else(|| M::Error::missing_field("type_"))?;
+
+                let content = EscalationPolicyUser {
+                    attributes,
+                    id,
+                    type_,
+                    additional_properties,
+                    _unparsed,
+                };
+
+                Ok(content)
+            }
+        }
+
+        deserializer.deserialize_any(EscalationPolicyUserVisitor)
+    }
+}