Fix VFTs and extracted local variables enum types (#218)

api-clients-generation-pipeline[bot] · ci.datadog-api-spec · web-flow · commit 5dabfa4e626c · 2024-09-03T14:27:45.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-08-29 20:01:57.245800",
-            "spec_repo_commit": "518ca9df"
+            "regenerated": "2024-09-03 13:58:40.716012",
+            "spec_repo_commit": "ff772101"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-08-29 20:01:57.263520",
-            "spec_repo_commit": "518ca9df"
+            "regenerated": "2024-09-03 13:58:40.734640",
+            "spec_repo_commit": "ff772101"
         }
     }
 }
diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml
@@ -15267,17 +15267,18 @@ components:
       - type
       type: object
     SyntheticsGlobalVariableParseTestOptionsType:
-      description: Property of the Synthetic Test Response to use for a Synthetic
-        global variable.
+      description: Type of value to extract from a test for a Synthetic global variable.
       enum:
       - http_body
       - http_header
+      - http_status_code
       - local_variable
       example: http_body
       type: string
       x-enum-varnames:
       - HTTP_BODY
       - HTTP_HEADER
+      - HTTP_STATUS_CODE
       - LOCAL_VARIABLE
     SyntheticsGlobalVariableParserType:
       description: Type of parser for a Synthetic global variable from a synthetics
@@ -15396,6 +15397,23 @@ components:
             $ref: '#/components/schemas/SyntheticsTestDetails'
           type: array
       type: object
+    SyntheticsLocalVariableParsingOptionsType:
+      description: Property of the Synthetic Test Response to extract into a local
+        variable.
+      enum:
+      - grpc_message
+      - grpc_metadata
+      - http_body
+      - http_header
+      - http_status_code
+      example: http_body
+      type: string
+      x-enum-varnames:
+      - GRPC_MESSAGE
+      - GRPC_METADATA
+      - HTTP_BODY
+      - HTTP_HEADER
+      - HTTP_STATUS_CODE
     SyntheticsLocation:
       description: 'Synthetic location that can be used when creating or editing a
 
@@ -15422,8 +15440,8 @@ components:
       example: {}
       properties:
         field:
-          description: When type is `http_header`, name of the header to use to extract
-            the value.
+          description: When type is `http_header` or `grpc_metadata`, name of the
+            header or metadatum to extract.
           example: content-type
           type: string
         name:
@@ -15435,7 +15453,7 @@ components:
           description: Determines whether or not the extracted value will be obfuscated.
           type: boolean
         type:
-          $ref: '#/components/schemas/SyntheticsGlobalVariableParseTestOptionsType'
+          $ref: '#/components/schemas/SyntheticsLocalVariableParsingOptionsType'
       type: object
     SyntheticsPatchTestBody:
       description: Wrapper around an array of [JSON Patch](https://jsonpatch.com)
@@ -16010,7 +16028,7 @@ components:
       type: object
     SyntheticsTestMetadata:
       additionalProperties:
-        description: A single Metadatum.
+        description: A single metadatum.
         type: string
       description: Metadata to include when performing the gRPC test.
       type: object
diff --git a/examples/v1_synthetics_CreateSyntheticsAPITest_1279271422.rs b/examples/v1_synthetics_CreateSyntheticsAPITest_1279271422.rs
@@ -16,8 +16,8 @@ use datadog_api_client::datadogV1::model::SyntheticsAssertionTarget;
 use datadog_api_client::datadogV1::model::SyntheticsAssertionType;
 use datadog_api_client::datadogV1::model::SyntheticsConfigVariable;
 use datadog_api_client::datadogV1::model::SyntheticsConfigVariableType;
-use datadog_api_client::datadogV1::model::SyntheticsGlobalVariableParseTestOptionsType;
 use datadog_api_client::datadogV1::model::SyntheticsGlobalVariableParserType;
+use datadog_api_client::datadogV1::model::SyntheticsLocalVariableParsingOptionsType;
 use datadog_api_client::datadogV1::model::SyntheticsParsingOptions;
 use datadog_api_client::datadogV1::model::SyntheticsTestCallType;
 use datadog_api_client::datadogV1::model::SyntheticsTestDetailsSubType;
@@ -77,7 +77,7 @@ async fn main() {
                                                     ),
                                                 )
                                                 .secure(true)
-                                                .type_(SyntheticsGlobalVariableParseTestOptionsType::HTTP_HEADER)
+                                                .type_(SyntheticsLocalVariableParsingOptionsType::HTTP_HEADER)
                                         ],
                                     )
                                     .is_critical(true)
diff --git a/src/datadogV1/model/mod.rs b/src/datadogV1/model/mod.rs
@@ -1394,8 +1394,8 @@ pub mod model_synthetics_variable_parser;
 pub use self::model_synthetics_variable_parser::SyntheticsVariableParser;
 pub mod model_synthetics_global_variable_parser_type;
 pub use self::model_synthetics_global_variable_parser_type::SyntheticsGlobalVariableParserType;
-pub mod model_synthetics_global_variable_parse_test_options_type;
-pub use self::model_synthetics_global_variable_parse_test_options_type::SyntheticsGlobalVariableParseTestOptionsType;
+pub mod model_synthetics_local_variable_parsing_options_type;
+pub use self::model_synthetics_local_variable_parsing_options_type::SyntheticsLocalVariableParsingOptionsType;
 pub mod model_synthetics_api_test_step_subtype;
 pub use self::model_synthetics_api_test_step_subtype::SyntheticsAPITestStepSubtype;
 pub mod model_synthetics_api_wait_step;
@@ -1510,6 +1510,8 @@ pub mod model_synthetics_global_variable_attributes;
 pub use self::model_synthetics_global_variable_attributes::SyntheticsGlobalVariableAttributes;
 pub mod model_synthetics_global_variable_parse_test_options;
 pub use self::model_synthetics_global_variable_parse_test_options::SyntheticsGlobalVariableParseTestOptions;
+pub mod model_synthetics_global_variable_parse_test_options_type;
+pub use self::model_synthetics_global_variable_parse_test_options_type::SyntheticsGlobalVariableParseTestOptionsType;
 pub mod model_synthetics_global_variable_value;
 pub use self::model_synthetics_global_variable_value::SyntheticsGlobalVariableValue;
 pub mod model_synthetics_global_variable_options;
diff --git a/src/datadogV1/model/model_synthetics_global_variable_parse_test_options.rs b/src/datadogV1/model/model_synthetics_global_variable_parse_test_options.rs
@@ -20,7 +20,7 @@ pub struct SyntheticsGlobalVariableParseTestOptions {
     /// Details of the parser to use for the global variable.
     #[serde(rename = "parser")]
     pub parser: Option<crate::datadogV1::model::SyntheticsVariableParser>,
-    /// Property of the Synthetic Test Response to use for a Synthetic global variable.
+    /// Type of value to extract from a test for a Synthetic global variable.
     #[serde(rename = "type")]
     pub type_: crate::datadogV1::model::SyntheticsGlobalVariableParseTestOptionsType,
     #[serde(flatten)]
diff --git a/src/datadogV1/model/model_synthetics_global_variable_parse_test_options_type.rs b/src/datadogV1/model/model_synthetics_global_variable_parse_test_options_type.rs
@@ -9,6 +9,7 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer};
 pub enum SyntheticsGlobalVariableParseTestOptionsType {
     HTTP_BODY,
     HTTP_HEADER,
+    HTTP_STATUS_CODE,
     LOCAL_VARIABLE,
     UnparsedObject(crate::datadog::UnparsedObject),
 }
@@ -18,6 +19,7 @@ impl ToString for SyntheticsGlobalVariableParseTestOptionsType {
         match self {
             Self::HTTP_BODY => String::from("http_body"),
             Self::HTTP_HEADER => String::from("http_header"),
+            Self::HTTP_STATUS_CODE => String::from("http_status_code"),
             Self::LOCAL_VARIABLE => String::from("local_variable"),
             Self::UnparsedObject(v) => v.value.to_string(),
         }
@@ -45,6 +47,7 @@ impl<'de> Deserialize<'de> for SyntheticsGlobalVariableParseTestOptionsType {
         Ok(match s.as_str() {
             "http_body" => Self::HTTP_BODY,
             "http_header" => Self::HTTP_HEADER,
+            "http_status_code" => Self::HTTP_STATUS_CODE,
             "local_variable" => Self::LOCAL_VARIABLE,
             _ => Self::UnparsedObject(crate::datadog::UnparsedObject {
                 value: serde_json::Value::String(s.into()),
diff --git a/src/datadogV1/model/model_synthetics_local_variable_parsing_options_type.rs b/src/datadogV1/model/model_synthetics_local_variable_parsing_options_type.rs
@@ -0,0 +1,60 @@
+// 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::{Deserialize, Deserializer, Serialize, Serializer};
+
+#[non_exhaustive]
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub enum SyntheticsLocalVariableParsingOptionsType {
+    GRPC_MESSAGE,
+    GRPC_METADATA,
+    HTTP_BODY,
+    HTTP_HEADER,
+    HTTP_STATUS_CODE,
+    UnparsedObject(crate::datadog::UnparsedObject),
+}
+
+impl ToString for SyntheticsLocalVariableParsingOptionsType {
+    fn to_string(&self) -> String {
+        match self {
+            Self::GRPC_MESSAGE => String::from("grpc_message"),
+            Self::GRPC_METADATA => String::from("grpc_metadata"),
+            Self::HTTP_BODY => String::from("http_body"),
+            Self::HTTP_HEADER => String::from("http_header"),
+            Self::HTTP_STATUS_CODE => String::from("http_status_code"),
+            Self::UnparsedObject(v) => v.value.to_string(),
+        }
+    }
+}
+
+impl Serialize for SyntheticsLocalVariableParsingOptionsType {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        match self {
+            Self::UnparsedObject(v) => v.serialize(serializer),
+            _ => serializer.serialize_str(self.to_string().as_str()),
+        }
+    }
+}
+
+impl<'de> Deserialize<'de> for SyntheticsLocalVariableParsingOptionsType {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let s: String = String::deserialize(deserializer)?;
+        Ok(match s.as_str() {
+            "grpc_message" => Self::GRPC_MESSAGE,
+            "grpc_metadata" => Self::GRPC_METADATA,
+            "http_body" => Self::HTTP_BODY,
+            "http_header" => Self::HTTP_HEADER,
+            "http_status_code" => Self::HTTP_STATUS_CODE,
+            _ => Self::UnparsedObject(crate::datadog::UnparsedObject {
+                value: serde_json::Value::String(s.into()),
+            }),
+        })
+    }
+}
diff --git a/src/datadogV1/model/model_synthetics_parsing_options.rs b/src/datadogV1/model/model_synthetics_parsing_options.rs
@@ -11,7 +11,7 @@ use std::fmt::{self, Formatter};
 #[skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize)]
 pub struct SyntheticsParsingOptions {
-    /// When type is `http_header`, name of the header to use to extract the value.
+    /// When type is `http_header` or `grpc_metadata`, name of the header or metadatum to extract.
     #[serde(rename = "field")]
     pub field: Option<String>,
     /// Name of the variable to extract.
@@ -23,9 +23,9 @@ pub struct SyntheticsParsingOptions {
     /// Determines whether or not the extracted value will be obfuscated.
     #[serde(rename = "secure")]
     pub secure: Option<bool>,
-    /// Property of the Synthetic Test Response to use for a Synthetic global variable.
+    /// Property of the Synthetic Test Response to extract into a local variable.
     #[serde(rename = "type")]
-    pub type_: Option<crate::datadogV1::model::SyntheticsGlobalVariableParseTestOptionsType>,
+    pub type_: Option<crate::datadogV1::model::SyntheticsLocalVariableParsingOptionsType>,
     #[serde(flatten)]
     pub additional_properties: std::collections::BTreeMap<String, serde_json::Value>,
     #[serde(skip)]
@@ -68,7 +68,7 @@ impl SyntheticsParsingOptions {
 
     pub fn type_(
         mut self,
-        value: crate::datadogV1::model::SyntheticsGlobalVariableParseTestOptionsType,
+        value: crate::datadogV1::model::SyntheticsLocalVariableParsingOptionsType,
     ) -> Self {
         self.type_ = Some(value);
         self
@@ -111,7 +111,7 @@ impl<'de> Deserialize<'de> for SyntheticsParsingOptions {
                 let mut parser: Option<crate::datadogV1::model::SyntheticsVariableParser> = None;
                 let mut secure: Option<bool> = None;
                 let mut type_: Option<
-                    crate::datadogV1::model::SyntheticsGlobalVariableParseTestOptionsType,
+                    crate::datadogV1::model::SyntheticsLocalVariableParsingOptionsType,
                 > = None;
                 let mut additional_properties: std::collections::BTreeMap<
                     String,
@@ -152,7 +152,7 @@ impl<'de> Deserialize<'de> for SyntheticsParsingOptions {
                             type_ = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
                             if let Some(ref _type_) = type_ {
                                 match _type_ {
-                                    crate::datadogV1::model::SyntheticsGlobalVariableParseTestOptionsType::UnparsedObject(_type_) => {
+                                    crate::datadogV1::model::SyntheticsLocalVariableParsingOptionsType::UnparsedObject(_type_) => {
                                         _unparsed = true;
                                     },
                                     _ => {}

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-08-29 20:01:57.245800",`
`8`		`- "spec_repo_commit": "518ca9df"`
	`7`	`+ "regenerated": "2024-09-03 13:58:40.716012",`
	`8`	`+ "spec_repo_commit": "ff772101"`
`9`	`9`	`},`
`10`	`10`	`"v2": {`
`11`	`11`	`"apigentools_version": "1.6.6",`
`12`		`- "regenerated": "2024-08-29 20:01:57.263520",`
`13`		`- "spec_repo_commit": "518ca9df"`
	`12`	`+ "regenerated": "2024-09-03 13:58:40.734640",`
	`13`	`+ "spec_repo_commit": "ff772101"`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`}`