Skip to content

add arch as an option paramater for the naming template #184

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
swermin wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add arch as an option paramater for the naming template #184

Show file tree
Hide file tree
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
15 changes: 15 additions & 0 deletions core-dump-composer/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ pub struct CoreParams {
pub namespace: Option<String>,
pub podname: Option<String>,
pub uuid: Uuid,
pub arch: String,
}

static DEFAULT_TEMPLATE: &str = "{uuid}-dump-{timestamp}-{hostname}-{exe_name}-{pid}-{signal}";
Expand All @@ -64,6 +65,7 @@ impl CoreConfig {
let pathname = matches.value_of("pathname").unwrap_or("").to_string();

let uuid = Uuid::new_v4();
let arch = std::env::consts::ARCH.to_string();

let params = CoreParams {
limit_size,
Expand All @@ -77,6 +79,7 @@ impl CoreConfig {
namespace: None,
podname: None,
uuid,
arch
};

let mut dot_env_path = env::current_exe()?;
Expand Down Expand Up @@ -376,6 +379,18 @@ mod tests {
assert_eq!(just_namespace, "anamespace".to_string());
}
#[test]
fn arch_is_rendered() {
let mut config = match CoreConfig::new() {
Ok(v) => v,
Err(e) => panic!("Generation of CoreConfig failed. {}", e),
};
let templated_name = config.get_templated_name();
assert!(templated_name.contains("-dump-----"));
config.filename_template = "{arch}".to_string();
let just_arch = config.get_templated_name();
assert_eq!(just_arch, std::env::consts::ARCH);
}
#[test]
fn default_template_test() {
// "{uuid}-dump-{timestamp}-{hostname}-{exe_name}-{pid}-{signal}";
let mut config = match CoreConfig::new() {
Expand Down
4 changes: 4 additions & 0 deletions core-dump-composer/src/events.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ mod tests {
let pathname = "pathname".to_string();
let uuid = Uuid::new_v4();
let podname = "podname".to_string();
let arch = "arch".to_string();

let params = CoreParams {
limit_size,
Expand All @@ -167,6 +168,7 @@ mod tests {
namespace: None,
uuid,
podname: Some(podname),
arch
};
let pod = json!(
{
Expand Down Expand Up @@ -236,6 +238,7 @@ mod tests {
let pathname = "pathname".to_string();
let uuid = Uuid::new_v4();
let podname = "podname".to_string();
let arch = "arch".to_string();

let params = CoreParams {
limit_size,
Expand All @@ -249,6 +252,7 @@ mod tests {
namespace: None,
uuid,
podname: Some(podname),
arch
};
let image1 = json!({
"id": "sha256:3b8adc6c30f4e7e4afb57daef9d1c8af783a4a647a4670780e9df085c0525efa",
Expand Down
Loading