Remove mobile device ids and make all device ids simple string (#384)

api-clients-generation-pipeline[bot] · ci.datadog-api-spec · web-flow · commit 2774b7902720 · 2024-11-20T20:58:53.000Z
Co-authored-by: ci.datadog-api-spec &lt;packages@datadoghq.com&gt;
diff --git a/.apigentools-info b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-11-19 21:12:03.890814",
-            "spec_repo_commit": "2e48953d"
+            "regenerated": "2024-11-20 20:14:15.868911",
+            "spec_repo_commit": "ebf27b5e"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-11-19 21:12:03.909789",
-            "spec_repo_commit": "2e48953d"
+            "regenerated": "2024-11-20 20:14:15.887480",
+            "spec_repo_commit": "ebf27b5e"
         }
     }
 }
diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml
@@ -15178,34 +15178,8 @@ components:
       type: object
     SyntheticsDeviceID:
       description: The device ID.
-      enum:
-      - laptop_large
-      - tablet
-      - mobile_small
-      - chrome.laptop_large
-      - chrome.tablet
-      - chrome.mobile_small
-      - firefox.laptop_large
-      - firefox.tablet
-      - firefox.mobile_small
-      - edge.laptop_large
-      - edge.tablet
-      - edge.mobile_small
       example: chrome.laptop_large
       type: string
-      x-enum-varnames:
-      - LAPTOP_LARGE
-      - TABLET
-      - MOBILE_SMALL
-      - CHROME_LAPTOP_LARGE
-      - CHROME_TABLET
-      - CHROME_MOBILE_SMALL
-      - FIREFOX_LAPTOP_LARGE
-      - FIREFOX_TABLET
-      - FIREFOX_MOBILE_SMALL
-      - EDGE_LAPTOP_LARGE
-      - EDGE_TABLET
-      - EDGE_MOBILE_SMALL
     SyntheticsFetchUptimesPayload:
       description: Object containing IDs of Synthetic tests and a timeframe.
       properties:
@@ -15508,10 +15482,6 @@ components:
             $ref: '#/components/schemas/SyntheticsLocation'
           type: array
       type: object
-    SyntheticsMobileDeviceID:
-      description: The device ID.
-      example: synthetics:mobile:device:apple_ipad_10th_gen_2022_ios_16
-      type: string
     SyntheticsMobileStep:
       description: The steps used in a Synthetic mobile test.
       properties:
@@ -15787,7 +15757,7 @@ components:
         device_ids:
           description: Array with the different device IDs used to run the test.
           items:
-            $ref: '#/components/schemas/SyntheticsMobileDeviceID'
+            $ref: '#/components/schemas/SyntheticsDeviceID'
           type: array
         message:
           description: Notification message associated with the test.
@@ -15876,7 +15846,7 @@ components:
           example:
           - synthetics:mobile:device:apple_ipad_10th_gen_2022_ios_16
           items:
-            $ref: '#/components/schemas/SyntheticsMobileDeviceID'
+            $ref: '#/components/schemas/SyntheticsDeviceID'
           type: array
         disableAutoAcceptAlert:
           description: A boolean to disable auto accepting alerts.
diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv
@@ -136,7 +136,7 @@ tracing-attributes,https://github.com/tokio-rs/tracing,MIT,"Tokio Contributors <
 tracing-core,https://github.com/tokio-rs/tracing,MIT,Tokio Contributors <team@tokio.rs>
 try-lock,https://github.com/seanmonstar/try-lock,MIT,Sean McArthur <sean@seanmonstar.com>
 unicase,https://github.com/seanmonstar/unicase,MIT OR Apache-2.0,Sean McArthur <sean@seanmonstar.com>
-unicode-ident,https://github.com/dtolnay/unicode-ident,(MIT OR Apache-2.0) AND Unicode-DFS-2016,David Tolnay <dtolnay@gmail.com>
+unicode-ident,https://github.com/dtolnay/unicode-ident,(MIT OR Apache-2.0) AND Unicode-3.0,David Tolnay <dtolnay@gmail.com>
 url,https://github.com/servo/rust-url,MIT OR Apache-2.0,The rust-url developers
 utf16_iter,https://github.com/hsivonen/utf16_iter,Apache-2.0 OR MIT,Henri Sivonen <hsivonen@hsivonen.fi>
 utf8_iter,https://github.com/hsivonen/utf8_iter,Apache-2.0 OR MIT,Henri Sivonen <hsivonen@hsivonen.fi>
diff --git a/examples/v1_synthetics_CreateSyntheticsAPITest.rs b/examples/v1_synthetics_CreateSyntheticsAPITest.rs
@@ -9,7 +9,6 @@ use datadog_api_client::datadogV1::model::SyntheticsAssertionOperator;
 use datadog_api_client::datadogV1::model::SyntheticsAssertionTarget;
 use datadog_api_client::datadogV1::model::SyntheticsAssertionType;
 use datadog_api_client::datadogV1::model::SyntheticsBrowserTestRumSettings;
-use datadog_api_client::datadogV1::model::SyntheticsDeviceID;
 use datadog_api_client::datadogV1::model::SyntheticsTestCiOptions;
 use datadog_api_client::datadogV1::model::SyntheticsTestDetailsSubType;
 use datadog_api_client::datadogV1::model::SyntheticsTestExecutionRule;
@@ -47,7 +46,7 @@ async fn main() {
             .ci(SyntheticsTestCiOptions::new(
                 SyntheticsTestExecutionRule::BLOCKING,
             ))
-            .device_ids(vec![SyntheticsDeviceID::CHROME_LAPTOP_LARGE])
+            .device_ids(vec!["chrome.laptop_large".to_string()])
             .http_version(SyntheticsTestOptionsHTTPVersion::HTTP1)
             .monitor_options(
                 SyntheticsTestOptionsMonitorOptions::new().notification_preset_name(
diff --git a/examples/v1_synthetics_CreateSyntheticsBrowserTest.rs b/examples/v1_synthetics_CreateSyntheticsBrowserTest.rs
@@ -8,7 +8,6 @@ use datadog_api_client::datadogV1::model::SyntheticsBrowserVariable;
 use datadog_api_client::datadogV1::model::SyntheticsBrowserVariableType;
 use datadog_api_client::datadogV1::model::SyntheticsConfigVariable;
 use datadog_api_client::datadogV1::model::SyntheticsConfigVariableType;
-use datadog_api_client::datadogV1::model::SyntheticsDeviceID;
 use datadog_api_client::datadogV1::model::SyntheticsStep;
 use datadog_api_client::datadogV1::model::SyntheticsStepType;
 use datadog_api_client::datadogV1::model::SyntheticsTestOptions;
@@ -46,7 +45,7 @@ async fn main() {
         SyntheticsTestOptions::new()
             .accept_self_signed(false)
             .allow_insecure(true)
-            .device_ids(vec![SyntheticsDeviceID::CHROME_LAPTOP_LARGE])
+            .device_ids(vec!["chrome.laptop_large".to_string()])
             .disable_cors(true)
             .enable_profiling(true)
             .enable_security_testing(true)
diff --git a/examples/v1_synthetics_CreateSyntheticsBrowserTest_2932742688.rs b/examples/v1_synthetics_CreateSyntheticsBrowserTest_2932742688.rs
@@ -7,7 +7,6 @@ use datadog_api_client::datadogV1::model::SyntheticsBrowserTestRumSettings;
 use datadog_api_client::datadogV1::model::SyntheticsBrowserTestType;
 use datadog_api_client::datadogV1::model::SyntheticsConfigVariable;
 use datadog_api_client::datadogV1::model::SyntheticsConfigVariableType;
-use datadog_api_client::datadogV1::model::SyntheticsDeviceID;
 use datadog_api_client::datadogV1::model::SyntheticsStep;
 use datadog_api_client::datadogV1::model::SyntheticsStepType;
 use datadog_api_client::datadogV1::model::SyntheticsTestCiOptions;
@@ -43,7 +42,7 @@ async fn main() {
             .ci(SyntheticsTestCiOptions::new(
                 SyntheticsTestExecutionRule::SKIPPED,
             ))
-            .device_ids(vec![SyntheticsDeviceID::TABLET])
+            .device_ids(vec!["tablet".to_string()])
             .disable_cors(true)
             .disable_csp(true)
             .follow_redirects(true)
diff --git a/examples/v1_synthetics_CreateSyntheticsBrowserTest_397420811.rs b/examples/v1_synthetics_CreateSyntheticsBrowserTest_397420811.rs
@@ -7,7 +7,6 @@ use datadog_api_client::datadogV1::model::SyntheticsBrowserTestConfig;
 use datadog_api_client::datadogV1::model::SyntheticsBrowserTestType;
 use datadog_api_client::datadogV1::model::SyntheticsConfigVariable;
 use datadog_api_client::datadogV1::model::SyntheticsConfigVariableType;
-use datadog_api_client::datadogV1::model::SyntheticsDeviceID;
 use datadog_api_client::datadogV1::model::SyntheticsStep;
 use datadog_api_client::datadogV1::model::SyntheticsStepType;
 use datadog_api_client::datadogV1::model::SyntheticsTestOptions;
@@ -39,7 +38,7 @@ async fn main() {
         SyntheticsTestOptions::new()
             .accept_self_signed(false)
             .allow_insecure(true)
-            .device_ids(vec![SyntheticsDeviceID::TABLET])
+            .device_ids(vec!["tablet".to_string()])
             .disable_cors(true)
             .follow_redirects(true)
             .min_failure_duration(10)
diff --git a/examples/v1_synthetics_TriggerCITests.rs b/examples/v1_synthetics_TriggerCITests.rs
@@ -11,7 +11,6 @@ use datadog_api_client::datadogV1::model::SyntheticsCIBatchMetadataPipeline;
 use datadog_api_client::datadogV1::model::SyntheticsCIBatchMetadataProvider;
 use datadog_api_client::datadogV1::model::SyntheticsCITest;
 use datadog_api_client::datadogV1::model::SyntheticsCITestBody;
-use datadog_api_client::datadogV1::model::SyntheticsDeviceID;
 use datadog_api_client::datadogV1::model::SyntheticsTestOptionsRetry;
 
 #[tokio::main]
@@ -22,7 +21,7 @@ async fn main() {
                 SyntheticsBasicAuthWeb::new("PaSSw0RD!".to_string(), "my_username".to_string())
                     .type_(SyntheticsBasicAuthWebType::WEB),
             )))
-            .device_ids(vec![SyntheticsDeviceID::CHROME_LAPTOP_LARGE])
+            .device_ids(vec!["chrome.laptop_large".to_string()])
             .locations(vec!["aws:eu-west-3".to_string()])
             .metadata(
                 SyntheticsCIBatchMetadata::new()
diff --git a/examples/v1_synthetics_UpdateBrowserTest.rs b/examples/v1_synthetics_UpdateBrowserTest.rs
@@ -12,7 +12,6 @@ use datadog_api_client::datadogV1::model::SyntheticsBrowserVariable;
 use datadog_api_client::datadogV1::model::SyntheticsBrowserVariableType;
 use datadog_api_client::datadogV1::model::SyntheticsConfigVariable;
 use datadog_api_client::datadogV1::model::SyntheticsConfigVariableType;
-use datadog_api_client::datadogV1::model::SyntheticsDeviceID;
 use datadog_api_client::datadogV1::model::SyntheticsStep;
 use datadog_api_client::datadogV1::model::SyntheticsStepType;
 use datadog_api_client::datadogV1::model::SyntheticsTestCallType;
@@ -75,7 +74,7 @@ async fn main() {
             .ci(SyntheticsTestCiOptions::new(
                 SyntheticsTestExecutionRule::BLOCKING,
             ))
-            .device_ids(vec![SyntheticsDeviceID::CHROME_LAPTOP_LARGE])
+            .device_ids(vec!["chrome.laptop_large".to_string()])
             .http_version(SyntheticsTestOptionsHTTPVersion::HTTP1)
             .monitor_options(
                 SyntheticsTestOptionsMonitorOptions::new().notification_preset_name(
diff --git a/src/datadogV1/model/mod.rs b/src/datadogV1/model/mod.rs
@@ -1270,8 +1270,6 @@ pub mod model_synthetics_ci_batch_metadata_git;
 pub use self::model_synthetics_ci_batch_metadata_git::SyntheticsCIBatchMetadataGit;
 pub mod model_synthetics_batch_result;
 pub use self::model_synthetics_batch_result::SyntheticsBatchResult;
-pub mod model_synthetics_device_id;
-pub use self::model_synthetics_device_id::SyntheticsDeviceID;
 pub mod model_synthetics_test_execution_rule;
 pub use self::model_synthetics_test_execution_rule::SyntheticsTestExecutionRule;
 pub mod model_synthetics_batch_status;
diff --git a/src/datadogV1/model/model_synthetics_batch_result.rs b/src/datadogV1/model/model_synthetics_batch_result.rs
@@ -13,7 +13,7 @@ use std::fmt::{self, Formatter};
 pub struct SyntheticsBatchResult {
     /// The device ID.
     #[serde(rename = "device")]
-    pub device: Option<crate::datadogV1::model::SyntheticsDeviceID>,
+    pub device: Option<String>,
     /// Total duration in millisecond of the test.
     #[serde(rename = "duration")]
     pub duration: Option<f64>,
@@ -66,7 +66,7 @@ impl SyntheticsBatchResult {
         }
     }
 
-    pub fn device(mut self, value: crate::datadogV1::model::SyntheticsDeviceID) -> Self {
+    pub fn device(mut self, value: String) -> Self {
         self.device = Some(value);
         self
     }
@@ -151,7 +151,7 @@ impl<'de> Deserialize<'de> for SyntheticsBatchResult {
             where
                 M: MapAccess<'a>,
             {
-                let mut device: Option<crate::datadogV1::model::SyntheticsDeviceID> = None;
+                let mut device: Option<String> = None;
                 let mut duration: Option<f64> = None;
                 let mut execution_rule: Option<
                     crate::datadogV1::model::SyntheticsTestExecutionRule,
@@ -177,16 +177,6 @@ impl<'de> Deserialize<'de> for SyntheticsBatchResult {
                                 continue;
                             }
                             device = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
-                            if let Some(ref _device) = device {
-                                match _device {
-                                    crate::datadogV1::model::SyntheticsDeviceID::UnparsedObject(
-                                        _device,
-                                    ) => {
-                                        _unparsed = true;
-                                    }
-                                    _ => {}
-                                }
-                            }
                         }
                         "duration" => {
                             if v.is_null() {
diff --git a/src/datadogV1/model/model_synthetics_ci_test.rs b/src/datadogV1/model/model_synthetics_ci_test.rs
@@ -28,7 +28,7 @@ pub struct SyntheticsCITest {
     pub cookies: Option<String>,
     /// For browser test, array with the different device IDs used to run the test.
     #[serde(rename = "deviceIds")]
-    pub device_ids: Option<Vec<crate::datadogV1::model::SyntheticsDeviceID>>,
+    pub device_ids: Option<Vec<String>>,
     /// For API HTTP test, whether or not the test should follow redirects.
     #[serde(rename = "followRedirects")]
     pub follow_redirects: Option<bool>,
@@ -107,7 +107,7 @@ impl SyntheticsCITest {
         self
     }
 
-    pub fn device_ids(mut self, value: Vec<crate::datadogV1::model::SyntheticsDeviceID>) -> Self {
+    pub fn device_ids(mut self, value: Vec<String>) -> Self {
         self.device_ids = Some(value);
         self
     }
@@ -178,7 +178,7 @@ impl<'de> Deserialize<'de> for SyntheticsCITest {
                 let mut body: Option<String> = None;
                 let mut body_type: Option<String> = None;
                 let mut cookies: Option<String> = None;
-                let mut device_ids: Option<Vec<crate::datadogV1::model::SyntheticsDeviceID>> = None;
+                let mut device_ids: Option<Vec<String>> = None;
                 let mut follow_redirects: Option<bool> = None;
                 let mut headers: Option<std::collections::BTreeMap<String, String>> = None;
                 let mut locations: Option<Vec<String>> = None;
diff --git a/src/datadogV1/model/model_synthetics_device.rs b/src/datadogV1/model/model_synthetics_device.rs
@@ -16,7 +16,7 @@ pub struct SyntheticsDevice {
     pub height: i64,
     /// The device ID.
     #[serde(rename = "id")]
-    pub id: crate::datadogV1::model::SyntheticsDeviceID,
+    pub id: String,
     /// Whether or not the device is a mobile.
     #[serde(rename = "isMobile")]
     pub is_mobile: Option<bool>,
@@ -34,12 +34,7 @@ pub struct SyntheticsDevice {
 }
 
 impl SyntheticsDevice {
-    pub fn new(
-        height: i64,
-        id: crate::datadogV1::model::SyntheticsDeviceID,
-        name: String,
-        width: i64,
-    ) -> SyntheticsDevice {
+    pub fn new(height: i64, id: String, name: String, width: i64) -> SyntheticsDevice {
         SyntheticsDevice {
             height,
             id,
@@ -83,7 +78,7 @@ impl<'de> Deserialize<'de> for SyntheticsDevice {
                 M: MapAccess<'a>,
             {
                 let mut height: Option<i64> = None;
-                let mut id: Option<crate::datadogV1::model::SyntheticsDeviceID> = None;
+                let mut id: Option<String> = None;
                 let mut is_mobile: Option<bool> = None;
                 let mut name: Option<String> = None;
                 let mut width: Option<i64> = None;
@@ -100,16 +95,6 @@ impl<'de> Deserialize<'de> for SyntheticsDevice {
                         }
                         "id" => {
                             id = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
-                            if let Some(ref _id) = id {
-                                match _id {
-                                    crate::datadogV1::model::SyntheticsDeviceID::UnparsedObject(
-                                        _id,
-                                    ) => {
-                                        _unparsed = true;
-                                    }
-                                    _ => {}
-                                }
-                            }
                         }
                         "isMobile" => {
                             if v.is_null() {
diff --git a/src/datadogV1/model/model_synthetics_device_id.rs b/src/datadogV1/model/model_synthetics_device_id.rs
diff --git a/src/datadogV1/model/model_synthetics_test_options.rs b/src/datadogV1/model/model_synthetics_test_options.rs
diff --git a/src/datadogV1/model/model_synthetics_trigger_ci_test_run_result.rs b/src/datadogV1/model/model_synthetics_trigger_ci_test_run_result.rs
diff --git a/tests/scenarios/features/v1/synthetics.feature b/tests/scenarios/features/v1/synthetics.feature

Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,13 @@`
`4`	`4`	`"spec_versions": {`
`5`	`5`	`"v1": {`
`6`	`6`	`"apigentools_version": "1.6.6",`
`7`		`- "regenerated": "2024-11-19 21:12:03.890814",`
`8`		`- "spec_repo_commit": "2e48953d"`
	`7`	`+ "regenerated": "2024-11-20 20:14:15.868911",`
	`8`	`+ "spec_repo_commit": "ebf27b5e"`
`9`	`9`	`},`
`10`	`10`	`"v2": {`
`11`	`11`	`"apigentools_version": "1.6.6",`
`12`		`- "regenerated": "2024-11-19 21:12:03.909789",`
`13`		`- "spec_repo_commit": "2e48953d"`
	`12`	`+ "regenerated": "2024-11-20 20:14:15.887480",`
	`13`	`+ "spec_repo_commit": "ebf27b5e"`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`}`
-Original file line number
+Diff line change
 tracing-core,https://github.com/tokio-rs/tracing,MIT,Tokio Contributors <[email protected]>
 try-lock,https://github.com/seanmonstar/try-lock,MIT,Sean McArthur <[email protected]>
 unicase,https://github.com/seanmonstar/unicase,MIT OR Apache-2.0,Sean McArthur <[email protected]>
 -unicode-ident,https://github.com/dtolnay/unicode-ident,(MIT OR Apache-2.0) AND Unicode-DFS-2016,David Tolnay <[email protected]>
 +unicode-ident,https://github.com/dtolnay/unicode-ident,(MIT OR Apache-2.0) AND Unicode-3.0,David Tolnay <[email protected]>
 url,https://github.com/servo/rust-url,MIT OR Apache-2.0,The rust-url developers
 utf16_iter,https://github.com/hsivonen/utf16_iter,Apache-2.0 OR MIT,Henri Sivonen <[email protected]>
 utf8_iter,https://github.com/hsivonen/utf8_iter,Apache-2.0 OR MIT,Henri Sivonen <[email protected]>