From f2ba60f4f8c4be24a1d642025c8f9200eed412c2 Mon Sep 17 00:00:00 2001
From: "av.novikov1" <av.novikov1@tensor.ru>
Date: Fri, 27 May 2022 11:08:03 +0300
Subject: [PATCH 1/2] add podname parameter to allow use it in the filename
 template

---
 core-dump-composer/src/config.rs | 6 ++++++
 core-dump-composer/src/main.rs   | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/core-dump-composer/src/config.rs b/core-dump-composer/src/config.rs
index eedc7ee..58ba12c 100644
--- a/core-dump-composer/src/config.rs
+++ b/core-dump-composer/src/config.rs
@@ -36,6 +36,7 @@ pub struct CoreParams {
     pub hostname: String,
     pub pathname: String,
     pub namespace: Option<String>,
+    pub podname: Option<String>,
     pub uuid: Uuid,
 }
 
@@ -64,6 +65,7 @@ impl CoreConfig {
             hostname,
             pathname,
             namespace: None,
+            podname: None,
             uuid,
         };
 
@@ -165,6 +167,10 @@ impl CoreConfig {
         self.params.namespace = Some(namespace)
     }
 
+    pub fn set_podname(&mut self, podname: String) {
+        self.params.podname = Some(podname)
+    }
+
     pub fn get_dump_info_filename(&self) -> String {
         format!("{}-dump-info.json", self.get_templated_name())
     }
diff --git a/core-dump-composer/src/main.rs b/core-dump-composer/src/main.rs
index 7bdafee..5aee340 100644
--- a/core-dump-composer/src/main.rs
+++ b/core-dump-composer/src/main.rs
@@ -69,6 +69,13 @@ fn main() -> Result<(), anyhow::Error> {
         .unwrap_or("unknown");
 
     cc.set_namespace(namespace.to_string());
+
+    let podname = pod_object["metadata"]["name"]
+        .as_str()
+        .unwrap_or("unknown");
+
+    cc.set_podname(podname.to_string());
+
     // Create the base zip file that we are going to put everything into
     let options = FileOptions::default()
         .compression_method(zip::CompressionMethod::Deflated)

From 24315f4a26e23696d7edd71b04207bf6b665acc6 Mon Sep 17 00:00:00 2001
From: "av.novikov1" <av.novikov1@tensor.ru>
Date: Fri, 27 May 2022 16:32:26 +0300
Subject: [PATCH 2/2] make rustfmt happy

---
 core-dump-composer/src/main.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/core-dump-composer/src/main.rs b/core-dump-composer/src/main.rs
index 5aee340..8ddbd4b 100644
--- a/core-dump-composer/src/main.rs
+++ b/core-dump-composer/src/main.rs
@@ -70,9 +70,7 @@ fn main() -> Result<(), anyhow::Error> {
 
     cc.set_namespace(namespace.to_string());
 
-    let podname = pod_object["metadata"]["name"]
-        .as_str()
-        .unwrap_or("unknown");
+    let podname = pod_object["metadata"]["name"].as_str().unwrap_or("unknown");
 
     cc.set_podname(podname.to_string());