Merge #1845

1845: chore: use secret name as the key name r=dsharma-dc a=dsharma-dc



Co-authored-by: Diwakar Sharma <[email protected]>

Author: mayastor-bors

io-engine/src/bdev/crypto.rs

@@ -68,6 +68,7 @@ pub enum Cipher {
 /// A struct that represents the parameters required to create a key.
 pub struct EncryptionKey {
     pub cipher: Cipher,
+    #[serde(default)]
     pub key_name: String,
     pub key: String,
     pub key_len: u32,

io-engine/src/grpc/v1/pool.rs

@@ -82,10 +82,12 @@ async fn util_fetch_secret_params(
                         .map_err(|e: LvsError| Status::invalid_argument(e.to_string()))?,
                 ),
                 create_pool_request::Encryption::Secret(cks) => {
-                    let secret_params = secret_data(cks.secret.as_str())
+                    let mut secret_params: PoolEncKey = secret_data(cks.secret.as_str())
                         .await
                         .map_err(|e| Status::invalid_argument(e.to_string()))?;
                     trace!("[create pool] Received encryption params: {secret_params:?}");
+                    // Use secret name as key name.
+                    secret_params.key_name = cks.secret.to_string();
                     Some(secret_params)
                 }
             }
@@ -96,10 +98,12 @@ async fn util_fetch_secret_params(
                     .map_err(|e: LvsError| Status::invalid_argument(e.to_string()))?,
             ),
             import_pool_request::Encryption::Secret(iks) => {
-                let secret_params = secret_data(iks.secret.as_str())
+                let mut secret_params: PoolEncKey = secret_data(iks.secret.as_str())
                     .await
                     .map_err(|e| Status::invalid_argument(e.to_string()))?;
                 trace!("[import pool] Received encryption params: {secret_params:?}");
+                // Use secret file name as key name.
+                secret_params.key_name = iks.secret.to_string();
                 Some(secret_params)
             }
         },

io-engine/src/lvs/lvs_store.rs

@@ -783,7 +783,7 @@ impl Lvs {
                 .await
                 .map_err(|e| {
                     error!(
-                        "failed to delete crypto vbdev {:?} after failed pool creation. {e}",
+                        "failed to delete crypto vbdev {:?} during pool destroy. {e}",
                         base_bdev.name()
                     );
                 });