Use strum macros to parse UnlockMethod

Signed-off-by: mulhern <[email protected]>
stratis-storage · Nov 14, 2024 · 50abdd9 · 50abdd9
1 parent 565f4eb
commit 50abdd9
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 37 deletions.
diff --git a/src/bin/stratis-min/stratis-min.rs b/src/bin/stratis-min/stratis-min.rs
@@ -13,7 +13,7 @@ use stratisd::{
         CLEVIS_TANG_TRUST_URL,
     },
     jsonrpc::client::{filesystem, key, pool, report},
-    stratis::VERSION,
+    stratis::{StratisError, VERSION},
 };
 
 fn parse_args() -> Command {
@@ -237,7 +237,9 @@ fn main() -> Result<(), String> {
                 };
                 let unlock_method =
                     match args.get_one::<String>("unlock_method").map(|s| s.as_str()) {
-                        Some(um) => Some(UnlockMethod::try_from(um)?),
+                        Some(um) => Some(UnlockMethod::try_from(um).map_err(|_| {
+                            StratisError::Msg(format!("{um} is an invalid unlock method"))
+                        })?),
                         None => None,
                     };
                 let prompt = args.get_flag("prompt");

diff --git a/src/dbus_api/api/manager_3_0/methods.rs b/src/dbus_api/api/manager_3_0/methods.rs
@@ -179,7 +179,9 @@ pub fn unlock_pool(m: &MethodInfo<'_, MTSync<TData>, TData>) -> MethodResult {
     };
     let unlock_method = {
         let unlock_method_str: &str = get_next_arg(&mut iter, 1)?;
-        match UnlockMethod::try_from(unlock_method_str) {
+        match UnlockMethod::try_from(unlock_method_str).map_err(|_| {
+            StratisError::Msg(format!("{unlock_method_str} is an invalid unlock method"))
+        }) {
             Ok(um) => um,
             Err(e) => {
                 let (rc, rs) = engine_to_dbus_err_tuple(&e);

diff --git a/src/dbus_api/api/manager_3_2/methods.rs b/src/dbus_api/api/manager_3_2/methods.rs
@@ -46,13 +46,17 @@ pub fn start_pool(m: &MethodInfo<'_, MTSync<TData>, TData>) -> MethodResult {
     let unlock_method = {
         let unlock_method_tup: (bool, &str) = get_next_arg(&mut iter, 1)?;
         match tuple_to_option(unlock_method_tup) {
-            Some(unlock_method_str) => match UnlockMethod::try_from(unlock_method_str) {
-                Ok(um) => Some(um),
-                Err(e) => {
-                    let (rc, rs) = engine_to_dbus_err_tuple(&e);
-                    return Ok(vec![return_message.append3(default_return, rc, rs)]);
+            Some(unlock_method_str) => {
+                match UnlockMethod::try_from(unlock_method_str).map_err(|_| {
+                    StratisError::Msg(format!("{unlock_method_str} is an invalid unlock method"))
+                }) {
+                    Ok(um) => Some(um),
+                    Err(e) => {
+                        let (rc, rs) = engine_to_dbus_err_tuple(&e);
+                        return Ok(vec![return_message.append3(default_return, rc, rs)]);
+                    }
                 }
-            },
+            }
             None => None,
         }
     };

diff --git a/src/dbus_api/api/manager_3_4/methods.rs b/src/dbus_api/api/manager_3_4/methods.rs
@@ -52,13 +52,17 @@ pub fn start_pool(m: &MethodInfo<'_, MTSync<TData>, TData>) -> MethodResult {
     let unlock_method = {
         let unlock_method_tup: (bool, &str) = get_next_arg(&mut iter, 2)?;
         match tuple_to_option(unlock_method_tup) {
-            Some(unlock_method_str) => match UnlockMethod::try_from(unlock_method_str) {
-                Ok(um) => Some(um),
-                Err(e) => {
-                    let (rc, rs) = engine_to_dbus_err_tuple(&e);
-                    return Ok(vec![return_message.append3(default_return, rc, rs)]);
+            Some(unlock_method_str) => {
+                match UnlockMethod::try_from(unlock_method_str).map_err(|_| {
+                    StratisError::Msg(format!("{unlock_method_str} is an invalid unlock method"))
+                }) {
+                    Ok(um) => Some(um),
+                    Err(e) => {
+                        let (rc, rs) = engine_to_dbus_err_tuple(&e);
+                        return Ok(vec![return_message.append3(default_return, rc, rs)]);
+                    }
                 }
-            },
+            }
             None => None,
         }
     };

diff --git a/src/dbus_api/api/manager_3_8/methods.rs b/src/dbus_api/api/manager_3_8/methods.rs
@@ -52,13 +52,17 @@ pub fn start_pool(m: &MethodInfo<'_, MTSync<TData>, TData>) -> MethodResult {
     let unlock_method = {
         let unlock_method_tup: (bool, &str) = get_next_arg(&mut iter, 2)?;
         match tuple_to_option(unlock_method_tup) {
-            Some(unlock_method_str) => match UnlockMethod::try_from(unlock_method_str) {
-                Ok(um) => Some(um),
-                Err(e) => {
-                    let (rc, rs) = engine_to_dbus_err_tuple(&e);
-                    return Ok(vec![return_message.append3(default_return, rc, rs)]);
+            Some(unlock_method_str) => {
+                match UnlockMethod::try_from(unlock_method_str).map_err(|_| {
+                    StratisError::Msg(format!("{unlock_method_str} is an invalid unlock method"))
+                }) {
+                    Ok(um) => Some(um),
+                    Err(e) => {
+                        let (rc, rs) = engine_to_dbus_err_tuple(&e);
+                        return Ok(vec![return_message.append3(default_return, rc, rs)]);
+                    }
                 }
-            },
+            }
             None => None,
         }
     };

diff --git a/src/engine/types/mod.rs b/src/engine/types/mod.rs
@@ -131,28 +131,14 @@ impl Display for StratisUuid {
 }
 
 /// Use Clevis or keyring to unlock LUKS volume.
-#[derive(Serialize, Deserialize, Clone, Copy, Eq, PartialEq, Debug)]
+#[derive(Serialize, Deserialize, Clone, Copy, Eq, PartialEq, Debug, EnumString)]
+#[strum(serialize_all = "snake_case")]
 pub enum UnlockMethod {
     Clevis,
     Keyring,
     Any,
 }
 
-impl<'a> TryFrom<&'a str> for UnlockMethod {
-    type Error = StratisError;
-
-    fn try_from(s: &str) -> StratisResult<UnlockMethod> {
-        match s {
-            "keyring" => Ok(UnlockMethod::Keyring),
-            "clevis" => Ok(UnlockMethod::Clevis),
-            "any" => Ok(UnlockMethod::Any),
-            _ => Err(StratisError::Msg(format!(
-                "{s} is an invalid unlock method"
-            ))),
-        }
-    }
-}
-
 /// Blockdev tier. Used to distinguish between blockdevs used for
 /// data and blockdevs used for a cache.
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]