Skip to content

Commit 4e94cf2

Browse files
author
ci.datadog-api-spec
committed
Regenerate client from commit bdc2d85 of spec repo
1 parent f0976ac commit 4e94cf2

26 files changed

+976
-200
lines changed

‎.generator/schemas/v2/openapi.yaml‎

Lines changed: 199 additions & 65 deletions
Large diffs are not rendered by default.

‎examples/v2_observability-pipelines_CreatePipeline.rs‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ use datadog_api_client::datadogV2::api_observability_pipelines::ObservabilityPip
44
use datadog_api_client::datadogV2::model::ObservabilityPipelineConfig;
55
use datadog_api_client::datadogV2::model::ObservabilityPipelineConfigDestinationItem;
66
use datadog_api_client::datadogV2::model::ObservabilityPipelineConfigProcessorItem;
7+
use datadog_api_client::datadogV2::model::ObservabilityPipelineConfigProcessors;
78
use datadog_api_client::datadogV2::model::ObservabilityPipelineConfigSourceItem;
89
use datadog_api_client::datadogV2::model::ObservabilityPipelineDataAttributes;
910
use datadog_api_client::datadogV2::model::ObservabilityPipelineDatadogAgentSource;
@@ -44,18 +45,19 @@ async fn main() {
4445
)
4546
],
4647
).processors(
47-
vec![
48-
ObservabilityPipelineConfigProcessorItem::ObservabilityPipelineFilterProcessor(
49-
Box::new(
50-
ObservabilityPipelineFilterProcessor::new(
51-
"filter-processor".to_string(),
52-
"service:my-service".to_string(),
53-
vec!["datadog-agent-source".to_string()],
54-
ObservabilityPipelineFilterProcessorType::FILTER,
48+
ObservabilityPipelineConfigProcessors::ObservabilityPipelineConfigProcessorsList(
49+
vec![
50+
ObservabilityPipelineConfigProcessorItem::ObservabilityPipelineFilterProcessor(
51+
Box::new(
52+
ObservabilityPipelineFilterProcessor::new(
53+
"filter-processor".to_string(),
54+
"service:my-service".to_string(),
55+
ObservabilityPipelineFilterProcessorType::FILTER,
56+
).inputs(vec!["datadog-agent-source".to_string()]),
5557
),
56-
),
57-
)
58-
],
58+
)
59+
],
60+
),
5961
),
6062
"Main Observability Pipeline".to_string(),
6163
),

‎examples/v2_observability-pipelines_UpdatePipeline.rs‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use datadog_api_client::datadogV2::model::ObservabilityPipeline;
55
use datadog_api_client::datadogV2::model::ObservabilityPipelineConfig;
66
use datadog_api_client::datadogV2::model::ObservabilityPipelineConfigDestinationItem;
77
use datadog_api_client::datadogV2::model::ObservabilityPipelineConfigProcessorItem;
8+
use datadog_api_client::datadogV2::model::ObservabilityPipelineConfigProcessors;
89
use datadog_api_client::datadogV2::model::ObservabilityPipelineConfigSourceItem;
910
use datadog_api_client::datadogV2::model::ObservabilityPipelineData;
1011
use datadog_api_client::datadogV2::model::ObservabilityPipelineDataAttributes;
@@ -46,18 +47,19 @@ async fn main() {
4647
)
4748
],
4849
).processors(
49-
vec![
50-
ObservabilityPipelineConfigProcessorItem::ObservabilityPipelineFilterProcessor(
51-
Box::new(
52-
ObservabilityPipelineFilterProcessor::new(
53-
"filter-processor".to_string(),
54-
"service:my-service".to_string(),
55-
vec!["datadog-agent-source".to_string()],
56-
ObservabilityPipelineFilterProcessorType::FILTER,
50+
ObservabilityPipelineConfigProcessors::ObservabilityPipelineConfigProcessorsList(
51+
vec![
52+
ObservabilityPipelineConfigProcessorItem::ObservabilityPipelineFilterProcessor(
53+
Box::new(
54+
ObservabilityPipelineFilterProcessor::new(
55+
"filter-processor".to_string(),
56+
"service:my-service".to_string(),
57+
ObservabilityPipelineFilterProcessorType::FILTER,
58+
).inputs(vec!["datadog-agent-source".to_string()]),
5759
),
58-
),
59-
)
60-
],
60+
)
61+
],
62+
),
6163
),
6264
"Updated Pipeline Name".to_string(),
6365
),

‎examples/v2_observability-pipelines_ValidatePipeline.rs‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ use datadog_api_client::datadogV2::api_observability_pipelines::ObservabilityPip
44
use datadog_api_client::datadogV2::model::ObservabilityPipelineConfig;
55
use datadog_api_client::datadogV2::model::ObservabilityPipelineConfigDestinationItem;
66
use datadog_api_client::datadogV2::model::ObservabilityPipelineConfigProcessorItem;
7+
use datadog_api_client::datadogV2::model::ObservabilityPipelineConfigProcessors;
78
use datadog_api_client::datadogV2::model::ObservabilityPipelineConfigSourceItem;
89
use datadog_api_client::datadogV2::model::ObservabilityPipelineDataAttributes;
910
use datadog_api_client::datadogV2::model::ObservabilityPipelineDatadogAgentSource;
@@ -44,18 +45,19 @@ async fn main() {
4445
)
4546
],
4647
).processors(
47-
vec![
48-
ObservabilityPipelineConfigProcessorItem::ObservabilityPipelineFilterProcessor(
49-
Box::new(
50-
ObservabilityPipelineFilterProcessor::new(
51-
"filter-processor".to_string(),
52-
"service:my-service".to_string(),
53-
vec!["datadog-agent-source".to_string()],
54-
ObservabilityPipelineFilterProcessorType::FILTER,
48+
ObservabilityPipelineConfigProcessors::ObservabilityPipelineConfigProcessorsList(
49+
vec![
50+
ObservabilityPipelineConfigProcessorItem::ObservabilityPipelineFilterProcessor(
51+
Box::new(
52+
ObservabilityPipelineFilterProcessor::new(
53+
"filter-processor".to_string(),
54+
"service:my-service".to_string(),
55+
ObservabilityPipelineFilterProcessorType::FILTER,
56+
).inputs(vec!["datadog-agent-source".to_string()]),
5557
),
56-
),
57-
)
58-
],
58+
)
59+
],
60+
),
5961
),
6062
"Main Observability Pipeline".to_string(),
6163
),

‎src/datadogV2/model/mod.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5030,6 +5030,10 @@ pub mod model_observability_pipeline_datadog_tags_processor_type;
50305030
pub use self::model_observability_pipeline_datadog_tags_processor_type::ObservabilityPipelineDatadogTagsProcessorType;
50315031
pub mod model_observability_pipeline_config_processor_item;
50325032
pub use self::model_observability_pipeline_config_processor_item::ObservabilityPipelineConfigProcessorItem;
5033+
pub mod model_observability_pipeline_config_processor_group;
5034+
pub use self::model_observability_pipeline_config_processor_group::ObservabilityPipelineConfigProcessorGroup;
5035+
pub mod model_observability_pipeline_config_processors;
5036+
pub use self::model_observability_pipeline_config_processors::ObservabilityPipelineConfigProcessors;
50335037
pub mod model_observability_pipeline_kafka_source;
50345038
pub use self::model_observability_pipeline_kafka_source::ObservabilityPipelineKafkaSource;
50355039
pub mod model_observability_pipeline_kafka_source_librdkafka_option;

‎src/datadogV2/model/model_observability_pipeline_add_env_vars_processor.rs‎

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,18 @@ use std::fmt::{self, Formatter};
1111
#[skip_serializing_none]
1212
#[derive(Clone, Debug, PartialEq, Serialize)]
1313
pub struct ObservabilityPipelineAddEnvVarsProcessor {
14+
/// Whether this processor is enabled.
15+
#[serde(rename = "enabled")]
16+
pub enabled: Option<bool>,
1417
/// The unique identifier for this component. Used to reference this processor in the pipeline.
1518
#[serde(rename = "id")]
1619
pub id: String,
1720
/// A Datadog search query used to determine which logs this processor targets.
1821
#[serde(rename = "include")]
1922
pub include: String,
20-
/// A list of component IDs whose output is used as the input for this processor.
23+
/// A list of component IDs whose output is used as input for this processor. Required when used as a standalone processor, omit when used within a processor group.
2124
#[serde(rename = "inputs")]
22-
pub inputs: Vec<String>,
25+
pub inputs: Option<Vec<String>>,
2326
/// The processor type. The value should always be `add_env_vars`.
2427
#[serde(rename = "type")]
2528
pub type_: crate::datadogV2::model::ObservabilityPipelineAddEnvVarsProcessorType,
@@ -37,21 +40,31 @@ impl ObservabilityPipelineAddEnvVarsProcessor {
3740
pub fn new(
3841
id: String,
3942
include: String,
40-
inputs: Vec<String>,
4143
type_: crate::datadogV2::model::ObservabilityPipelineAddEnvVarsProcessorType,
4244
variables: Vec<crate::datadogV2::model::ObservabilityPipelineAddEnvVarsProcessorVariable>,
4345
) -> ObservabilityPipelineAddEnvVarsProcessor {
4446
ObservabilityPipelineAddEnvVarsProcessor {
47+
enabled: None,
4548
id,
4649
include,
47-
inputs,
50+
inputs: None,
4851
type_,
4952
variables,
5053
additional_properties: std::collections::BTreeMap::new(),
5154
_unparsed: false,
5255
}
5356
}
5457

58+
pub fn enabled(mut self, value: bool) -> Self {
59+
self.enabled = Some(value);
60+
self
61+
}
62+
63+
pub fn inputs(mut self, value: Vec<String>) -> Self {
64+
self.inputs = Some(value);
65+
self
66+
}
67+
5568
pub fn additional_properties(
5669
mut self,
5770
value: std::collections::BTreeMap<String, serde_json::Value>,
@@ -78,6 +91,7 @@ impl<'de> Deserialize<'de> for ObservabilityPipelineAddEnvVarsProcessor {
7891
where
7992
M: MapAccess<'a>,
8093
{
94+
let mut enabled: Option<bool> = None;
8195
let mut id: Option<String> = None;
8296
let mut include: Option<String> = None;
8397
let mut inputs: Option<Vec<String>> = None;
@@ -95,13 +109,22 @@ impl<'de> Deserialize<'de> for ObservabilityPipelineAddEnvVarsProcessor {
95109

96110
while let Some((k, v)) = map.next_entry::<String, serde_json::Value>()? {
97111
match k.as_str() {
112+
"enabled" => {
113+
if v.is_null() {
114+
continue;
115+
}
116+
enabled = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
117+
}
98118
"id" => {
99119
id = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
100120
}
101121
"include" => {
102122
include = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
103123
}
104124
"inputs" => {
125+
if v.is_null() {
126+
continue;
127+
}
105128
inputs = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
106129
}
107130
"type" => {
@@ -127,11 +150,11 @@ impl<'de> Deserialize<'de> for ObservabilityPipelineAddEnvVarsProcessor {
127150
}
128151
let id = id.ok_or_else(|| M::Error::missing_field("id"))?;
129152
let include = include.ok_or_else(|| M::Error::missing_field("include"))?;
130-
let inputs = inputs.ok_or_else(|| M::Error::missing_field("inputs"))?;
131153
let type_ = type_.ok_or_else(|| M::Error::missing_field("type_"))?;
132154
let variables = variables.ok_or_else(|| M::Error::missing_field("variables"))?;
133155

134156
let content = ObservabilityPipelineAddEnvVarsProcessor {
157+
enabled,
135158
id,
136159
include,
137160
inputs,

‎src/datadogV2/model/model_observability_pipeline_add_fields_processor.rs‎

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ use std::fmt::{self, Formatter};
1111
#[skip_serializing_none]
1212
#[derive(Clone, Debug, PartialEq, Serialize)]
1313
pub struct ObservabilityPipelineAddFieldsProcessor {
14+
/// Whether this processor is enabled.
15+
#[serde(rename = "enabled")]
16+
pub enabled: Option<bool>,
1417
/// A list of static fields (key-value pairs) that is added to each log event processed by this component.
1518
#[serde(rename = "fields")]
1619
pub fields: Vec<crate::datadogV2::model::ObservabilityPipelineFieldValue>,
@@ -20,9 +23,9 @@ pub struct ObservabilityPipelineAddFieldsProcessor {
2023
/// A Datadog search query used to determine which logs this processor targets.
2124
#[serde(rename = "include")]
2225
pub include: String,
23-
/// A list of component IDs whose output is used as the `input` for this component.
26+
/// A list of component IDs whose output is used as input for this processor. Required when used as a standalone processor, omit when used within a processor group.
2427
#[serde(rename = "inputs")]
25-
pub inputs: Vec<String>,
28+
pub inputs: Option<Vec<String>>,
2629
/// The processor type. The value should always be `add_fields`.
2730
#[serde(rename = "type")]
2831
pub type_: crate::datadogV2::model::ObservabilityPipelineAddFieldsProcessorType,
@@ -38,20 +41,30 @@ impl ObservabilityPipelineAddFieldsProcessor {
3841
fields: Vec<crate::datadogV2::model::ObservabilityPipelineFieldValue>,
3942
id: String,
4043
include: String,
41-
inputs: Vec<String>,
4244
type_: crate::datadogV2::model::ObservabilityPipelineAddFieldsProcessorType,
4345
) -> ObservabilityPipelineAddFieldsProcessor {
4446
ObservabilityPipelineAddFieldsProcessor {
47+
enabled: None,
4548
fields,
4649
id,
4750
include,
48-
inputs,
51+
inputs: None,
4952
type_,
5053
additional_properties: std::collections::BTreeMap::new(),
5154
_unparsed: false,
5255
}
5356
}
5457

58+
pub fn enabled(mut self, value: bool) -> Self {
59+
self.enabled = Some(value);
60+
self
61+
}
62+
63+
pub fn inputs(mut self, value: Vec<String>) -> Self {
64+
self.inputs = Some(value);
65+
self
66+
}
67+
5568
pub fn additional_properties(
5669
mut self,
5770
value: std::collections::BTreeMap<String, serde_json::Value>,
@@ -78,6 +91,7 @@ impl<'de> Deserialize<'de> for ObservabilityPipelineAddFieldsProcessor {
7891
where
7992
M: MapAccess<'a>,
8093
{
94+
let mut enabled: Option<bool> = None;
8195
let mut fields: Option<
8296
Vec<crate::datadogV2::model::ObservabilityPipelineFieldValue>,
8397
> = None;
@@ -95,6 +109,12 @@ impl<'de> Deserialize<'de> for ObservabilityPipelineAddFieldsProcessor {
95109

96110
while let Some((k, v)) = map.next_entry::<String, serde_json::Value>()? {
97111
match k.as_str() {
112+
"enabled" => {
113+
if v.is_null() {
114+
continue;
115+
}
116+
enabled = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
117+
}
98118
"fields" => {
99119
fields = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
100120
}
@@ -105,6 +125,9 @@ impl<'de> Deserialize<'de> for ObservabilityPipelineAddFieldsProcessor {
105125
include = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
106126
}
107127
"inputs" => {
128+
if v.is_null() {
129+
continue;
130+
}
108131
inputs = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
109132
}
110133
"type" => {
@@ -128,10 +151,10 @@ impl<'de> Deserialize<'de> for ObservabilityPipelineAddFieldsProcessor {
128151
let fields = fields.ok_or_else(|| M::Error::missing_field("fields"))?;
129152
let id = id.ok_or_else(|| M::Error::missing_field("id"))?;
130153
let include = include.ok_or_else(|| M::Error::missing_field("include"))?;
131-
let inputs = inputs.ok_or_else(|| M::Error::missing_field("inputs"))?;
132154
let type_ = type_.ok_or_else(|| M::Error::missing_field("type_"))?;
133155

134156
let content = ObservabilityPipelineAddFieldsProcessor {
157+
enabled,
135158
fields,
136159
id,
137160
include,

‎src/datadogV2/model/model_observability_pipeline_config.rs‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ pub struct ObservabilityPipelineConfig {
1414
/// A list of destination components where processed logs are sent.
1515
#[serde(rename = "destinations")]
1616
pub destinations: Vec<crate::datadogV2::model::ObservabilityPipelineConfigDestinationItem>,
17-
/// A list of processors that transform or enrich log data.
17+
/// A list of processors that transform or enrich log data, or a grouped processor configuration.
1818
#[serde(rename = "processors")]
19-
pub processors: Option<Vec<crate::datadogV2::model::ObservabilityPipelineConfigProcessorItem>>,
19+
pub processors: Option<crate::datadogV2::model::ObservabilityPipelineConfigProcessors>,
2020
/// A list of configured data sources for the pipeline.
2121
#[serde(rename = "sources")]
2222
pub sources: Vec<crate::datadogV2::model::ObservabilityPipelineConfigSourceItem>,
@@ -43,7 +43,7 @@ impl ObservabilityPipelineConfig {
4343

4444
pub fn processors(
4545
mut self,
46-
value: Vec<crate::datadogV2::model::ObservabilityPipelineConfigProcessorItem>,
46+
value: crate::datadogV2::model::ObservabilityPipelineConfigProcessors,
4747
) -> Self {
4848
self.processors = Some(value);
4949
self
@@ -79,7 +79,7 @@ impl<'de> Deserialize<'de> for ObservabilityPipelineConfig {
7979
Vec<crate::datadogV2::model::ObservabilityPipelineConfigDestinationItem>,
8080
> = None;
8181
let mut processors: Option<
82-
Vec<crate::datadogV2::model::ObservabilityPipelineConfigProcessorItem>,
82+
crate::datadogV2::model::ObservabilityPipelineConfigProcessors,
8383
> = None;
8484
let mut sources: Option<
8585
Vec<crate::datadogV2::model::ObservabilityPipelineConfigSourceItem>,
@@ -101,6 +101,14 @@ impl<'de> Deserialize<'de> for ObservabilityPipelineConfig {
101101
continue;
102102
}
103103
processors = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
104+
if let Some(ref _processors) = processors {
105+
match _processors {
106+
crate::datadogV2::model::ObservabilityPipelineConfigProcessors::UnparsedObject(_processors) => {
107+
_unparsed = true;
108+
},
109+
_ => {}
110+
}
111+
}
104112
}
105113
"sources" => {
106114
sources = Some(serde_json::from_value(v).map_err(M::Error::custom)?);

0 commit comments

Comments
 (0)