Skip to content

Commit 85383bf

Browse files
alvarocabanasalvarocabanas
committed
feat: simplify the host_monitoring tests.
1 parent eff3488 commit 85383bf

File tree

3 files changed

+37
-128
lines changed

3 files changed

+37
-128
lines changed

‎agent-control/src/cli/on_host/host_monitoring_gen/infra_config.rs‎

Lines changed: 14 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -238,54 +238,20 @@ mod tests {
238238
// Parse the YAML content
239239
let parsed_values: serde_yaml::Value = serde_yaml::from_str(&result).unwrap();
240240

241-
let serde_yaml::Value::Mapping(map) = parsed_values else { panic!("Expected a YAML mapping") };
242-
if let Some(serde_yaml::Value::Mapping(config_agent_map)) =
243-
map.get(serde_yaml::Value::String("config_agent".to_string()))
244-
{
245-
assert_eq!(
246-
config_agent_map.get(serde_yaml::Value::String(
247-
"status_server_enabled".to_string()
248-
)),
249-
Some(&serde_yaml::Value::Bool(true))
250-
);
251-
assert_eq!(
252-
config_agent_map.get(serde_yaml::Value::String(
253-
"enable_process_metrics".to_string()
254-
)),
255-
Some(&serde_yaml::Value::Bool(true))
256-
);
257-
assert_eq!(
258-
config_agent_map.get(serde_yaml::Value::String("license_key".to_string())),
259-
Some(&serde_yaml::Value::String(
260-
"{{NEW_RELIC_LICENSE_KEY}}".to_string()
261-
))
262-
);
263-
assert_eq!(
264-
config_agent_map
265-
.get(serde_yaml::Value::String("status_server_port".to_string())),
266-
Some(&serde_yaml::Value::Number(serde_yaml::Number::from(18003)))
267-
);
268-
assert_eq!(
269-
config_agent_map.get(serde_yaml::Value::String("staging".to_string())),
270-
Some(&serde_yaml::Value::Bool(true))
271-
);
272-
assert_eq!(
273-
config_agent_map.get(serde_yaml::Value::String("proxy".to_string())),
274-
Some(&serde_yaml::Value::String(
275-
"http://proxy.example.com".to_string()
276-
))
277-
);
278-
let mut custom_attributes = serde_yaml::Mapping::new();
279-
custom_attributes.insert(
280-
serde_yaml::Value::String("custom_key".to_string()),
281-
serde_yaml::Value::String("custom_value".to_string()),
282-
);
283-
assert_eq!(
284-
config_agent_map
285-
.get(serde_yaml::Value::String("custom_attributes".to_string())),
286-
Some(&serde_yaml::Value::Mapping(custom_attributes))
287-
);
288-
}
241+
let expected = r"#
242+
config_agent:
243+
status_server_enabled: true
244+
enable_process_metrics: true
245+
license_key: '{{NEW_RELIC_LICENSE_KEY}}'
246+
status_server_port: 18003
247+
staging: true
248+
proxy: http://proxy.example.com
249+
custom_attributes:
250+
custom_key: custom_value
251+
#";
252+
let expected_values: serde_yaml::Value = serde_yaml::from_str(expected).unwrap();
253+
assert_eq!(parsed_values, expected_values);
254+
289255

290256
}
291257
}

‎agent-control/src/cli/on_host/host_monitoring_gen/infra_config_gen.rs‎

Lines changed: 22 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -247,58 +247,23 @@ configs:
247247
assert!(result.is_ok());
248248

249249
let values_file = temp_dir.path().join(INFRA_AGENT_VALUES);
250-
251-
// Read the contents of the values.yaml file
252250
let values_content = fs::read_to_string(&values_file).unwrap();
253251

254-
// Parse the YAML content
255252
let parsed_values: serde_yaml::Value = serde_yaml::from_str(&values_content).unwrap();
256253

257-
// Assertions to verify the contents of the values.yaml file
258-
if let serde_yaml::Value::Mapping(map) = parsed_values {
259-
if let Some(serde_yaml::Value::Mapping(config_agent_map)) =
260-
map.get(serde_yaml::Value::String("config_agent".to_string()))
261-
{
262-
assert_eq!(
263-
config_agent_map.get(serde_yaml::Value::String("staging".to_string())),
264-
Some(&serde_yaml::Value::Bool(true))
265-
);
266-
assert_eq!(
267-
config_agent_map.get(serde_yaml::Value::String("extra_config".to_string())),
268-
Some(&serde_yaml::Value::Bool(true))
269-
);
270-
assert_eq!(
271-
config_agent_map.get(serde_yaml::Value::String(
272-
"status_server_enabled".to_string()
273-
)),
274-
Some(&serde_yaml::Value::Bool(true))
275-
);
276-
assert_eq!(
277-
config_agent_map.get(serde_yaml::Value::String(
278-
"enable_process_metrics".to_string()
279-
)),
280-
Some(&serde_yaml::Value::Bool(true))
281-
);
282-
assert_eq!(
283-
config_agent_map.get(serde_yaml::Value::String("license_key".to_string())),
284-
Some(&serde_yaml::Value::String(
285-
"{{NEW_RELIC_LICENSE_KEY}}".to_string()
286-
))
287-
);
288-
assert_eq!(
289-
config_agent_map
290-
.get(serde_yaml::Value::String("status_server_port".to_string())),
291-
Some(&serde_yaml::Value::Number(serde_yaml::Number::from(18003)))
292-
);
293-
// proxy is modified
294-
assert_eq!(
295-
config_agent_map.get(serde_yaml::Value::String("proxy".to_string())),
296-
Some(&serde_yaml::Value::String(new_proxy))
297-
);
298-
}
299-
} else {
300-
panic!("Expected a YAML mapping");
301-
}
254+
let expected = r"#
255+
config_agent:
256+
extra_config: true
257+
status_server_enabled: true
258+
enable_process_metrics: true
259+
license_key: '{{NEW_RELIC_LICENSE_KEY}}'
260+
status_server_port: 18003
261+
staging: true
262+
proxy: https://new-proxy.com
263+
#";
264+
let expected_values: serde_yaml::Value = serde_yaml::from_str(expected).unwrap();
265+
assert_eq!(parsed_values, expected_values);
266+
302267
}
303268

304269
#[cfg(target_family = "unix")] //TODO This should be removed when Windows support is added
@@ -330,37 +295,14 @@ configs:
330295
// Parse the YAML content
331296
let parsed_values: serde_yaml::Value = serde_yaml::from_str(&values_content).unwrap();
332297

333-
// Assertions to verify the contents of the values.yaml file
334-
if let serde_yaml::Value::Mapping(map) = parsed_values {
335-
if let Some(serde_yaml::Value::Mapping(config_agent_map)) =
336-
map.get(serde_yaml::Value::String("config_agent".to_string()))
337-
{
338-
assert_eq!(
339-
config_agent_map.get(serde_yaml::Value::String(
340-
"status_server_enabled".to_string()
341-
)),
342-
Some(&serde_yaml::Value::Bool(true))
343-
);
344-
assert_eq!(
345-
config_agent_map.get(serde_yaml::Value::String(
346-
"enable_process_metrics".to_string()
347-
)),
348-
Some(&serde_yaml::Value::Bool(true))
349-
);
350-
assert_eq!(
351-
config_agent_map.get(serde_yaml::Value::String("license_key".to_string())),
352-
Some(&serde_yaml::Value::String(
353-
"{{NEW_RELIC_LICENSE_KEY}}".to_string()
354-
))
355-
);
356-
assert_eq!(
357-
config_agent_map
358-
.get(serde_yaml::Value::String("status_server_port".to_string())),
359-
Some(&serde_yaml::Value::Number(serde_yaml::Number::from(18003)))
360-
);
361-
}
362-
} else {
363-
panic!("Expected a YAML mapping");
364-
}
298+
let expected = r"#
299+
config_agent:
300+
status_server_enabled: true
301+
enable_process_metrics: true
302+
license_key: '{{NEW_RELIC_LICENSE_KEY}}'
303+
status_server_port: 18003
304+
#";
305+
let expected_values: serde_yaml::Value = serde_yaml::from_str(expected).unwrap();
306+
assert_eq!(parsed_values, expected_values);
365307
}
366308
}

‎agent-control/src/config_migrate/migration/converter.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ fn retrieve_file_mapping_value<F: FileReader>(
8888
map.remove(serde_yaml::Value::String(key.clone()));
8989
}
9090

91+
// Add or overwrite elements based on the overwrites hashmap
9192
for (key, value) in &file_info.overwrites {
9293
map.insert(serde_yaml::Value::String(key.clone()), value.clone());
9394
}

0 commit comments

Comments
 (0)