Skip to content

Commit 0e03948

Browse files
committed
fix rebase artifacts
Regenerate lockfile and licenses, apply fmt.
1 parent 7a9b581 commit 0e03948

1 file changed

Lines changed: 7 additions & 8 deletions

File tree

  • lib/agent-data-plane-config-system

lib/agent-data-plane-config-system/build.rs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use std::fmt::Write as _;
22
use std::path::PathBuf;
33

4-
use datadog_agent_config_overlay_model::smoke_test_support::ConfigurationStruct;
54
use datadog_agent_config_overlay_model::schema_gen::{self, FieldInfo, FieldType};
5+
use datadog_agent_config_overlay_model::smoke_test_support::ConfigurationStruct;
66
use datadog_agent_config_overlay_model::{Files, KnownEntry, SchemaOverlay, TestSupport};
77
use indexmap::IndexMap;
88

@@ -66,15 +66,16 @@ fn resolve_test_value(yaml_path: &str, ts: &TestSupport, field_info: &FieldInfo)
6666
return format_json_literal(test_json);
6767
}
6868

69-
let effective_type = ts.value_type_override.as_ref().map_or(&field_info.value_type, |vt| {
70-
match vt {
69+
let effective_type = ts
70+
.value_type_override
71+
.as_ref()
72+
.map_or(&field_info.value_type, |vt| match vt {
7173
datadog_agent_config_overlay_model::ValueType::Boolean => &FieldType::Bool,
7274
datadog_agent_config_overlay_model::ValueType::Integer => &FieldType::Integer,
7375
datadog_agent_config_overlay_model::ValueType::Float => &FieldType::Float,
7476
datadog_agent_config_overlay_model::ValueType::String => &FieldType::String,
7577
datadog_agent_config_overlay_model::ValueType::StringList => &FieldType::StringList,
76-
}
77-
});
78+
});
7879

7980
match effective_type {
8081
FieldType::Bool => {
@@ -91,9 +92,7 @@ fn resolve_test_value(yaml_path: &str, ts: &TestSupport, field_info: &FieldInfo)
9192
}
9293
FieldType::Integer => "serde_json::json!(42i64)".to_string(),
9394
FieldType::Float => "serde_json::json!(1.5f64)".to_string(),
94-
FieldType::String => {
95-
"serde_json::json!(\"http://smoke-test.example.com:3128\")".to_string()
96-
}
95+
FieldType::String => "serde_json::json!(\"http://smoke-test.example.com:3128\")".to_string(),
9796
FieldType::StringList => {
9897
"serde_json::json!([\"smoke-host-1.example.com\", \"smoke-host-2.example.com\"])".to_string()
9998
}

0 commit comments

Comments
 (0)