Skip to content

feat: add log-level setting to container-runtime extension #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
youwalther65 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

feat: add log-level setting to container-runtime extension #137

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions bottlerocket-settings-models/settings-extensions/container-runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use std::convert::Infallible;

#[model(impl_default = true)]
pub struct ContainerRuntimeSettingsV1 {
log_level: ContainerdLogLevel,
max_container_log_line_size: i32,
max_concurrent_downloads: i32,
max_concurrent_unpacks: i32,
Expand All @@ -22,6 +23,20 @@ pub struct ContainerRuntimeSettingsV1 {
snapshotter: Snapshotter,
}

/// Log levels supported by containerd (logrus-based).
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Default)]
#[serde(rename_all = "kebab-case")]
pub enum ContainerdLogLevel {
Trace,
Debug,
#[default]
Info,
Warn,
Error,
Fatal,
Panic,
}

#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Default)]
#[serde(rename_all = "kebab-case")]
enum Snapshotter {
Expand Down Expand Up @@ -70,6 +85,7 @@ mod test {
assert_eq!(
ContainerRuntimeSettingsV1::generate(None, None),
Ok(GenerateResult::Complete(ContainerRuntimeSettingsV1 {
log_level: None,
max_container_log_line_size: None,
max_concurrent_downloads: None,
max_concurrent_unpacks: None,
Expand All @@ -84,6 +100,7 @@ mod test {
#[test]
fn test_serde_container_runtime() {
let test_json = json!({
"log-level": "debug",
"max-container-log-line-size": 1024,
"max-concurrent-downloads": 5,
"max-concurrent-unpacks": 5,
Expand All @@ -101,6 +118,7 @@ mod test {
assert_eq!(
container_runtime_settings,
ContainerRuntimeSettingsV1 {
log_level: Some(ContainerdLogLevel::Debug),
max_container_log_line_size: Some(1024),
max_concurrent_downloads: Some(5),
max_concurrent_unpacks: Some(5),
Expand All @@ -116,6 +134,7 @@ mod test {
.unwrap();

let expected_json = json!({
"log-level": "debug",
"max-container-log-line-size": 1024,
"max-concurrent-downloads": 5,
"max-concurrent-unpacks": 5,
Expand All @@ -131,6 +150,7 @@ mod test {
#[test]
fn test_serde_container_runtime_alias() {
let test_json = json!({
"log-level": "warn",
"max-container-log-line-size": 2048,
"max-concurrent-downloads": 10,
"max-concurrent-unpacks": 3,
Expand All @@ -146,6 +166,7 @@ mod test {
assert_eq!(
container_runtime_settings,
ContainerRuntimeSettingsV1 {
log_level: Some(ContainerdLogLevel::Warn),
max_container_log_line_size: Some(2048),
max_concurrent_downloads: Some(10),
max_concurrent_unpacks: Some(3),
Expand All @@ -171,4 +192,29 @@ mod test {
None
);
}

#[test]
fn test_log_level_all_variants() {
for (input, expected) in [
("trace", ContainerdLogLevel::Trace),
("debug", ContainerdLogLevel::Debug),
("info", ContainerdLogLevel::Info),
("warn", ContainerdLogLevel::Warn),
("error", ContainerdLogLevel::Error),
("fatal", ContainerdLogLevel::Fatal),
("panic", ContainerdLogLevel::Panic),
] {
let json_str = format!(r#"{{"log-level": "{}"}}"#, input);
let settings: ContainerRuntimeSettingsV1 = serde_json::from_str(&json_str).unwrap();
assert_eq!(settings.log_level, Some(expected));
}
}

#[test]
fn test_log_level_invalid() {
let json_str = r#"{"log-level": "invalid"}"#;
let result: std::result::Result<ContainerRuntimeSettingsV1, _> =
serde_json::from_str(json_str);
assert!(result.is_err());
}
}