Make version verbosity an enum

This follows more idiomatic rust and makes the migration to clap v4 easier. Signed-off-by: Sascha Grunert <[email protected]>
containers · Oct 4, 2022 · 00e345e · 00e345e
1 parent e58ae5a
commit 00e345e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 8 deletions.
diff --git a/conmon-rs/server/src/config.rs b/conmon-rs/server/src/config.rs
@@ -12,9 +12,6 @@ macro_rules! prefix {
     };
 }
 
-/// Specifies the full version output option.
-pub const VERSION_FULL: &str = "full";
-
 #[derive(CopyGetters, Debug, Deserialize, Eq, Getters, Parser, PartialEq, Serialize, Setters)]
 #[serde(rename_all = "kebab-case")]
 #[clap(
@@ -24,17 +21,17 @@ pub const VERSION_FULL: &str = "full";
 
 /// An OCI container runtime monitor.
 pub struct Config {
-    #[get = "pub"]
+    #[get_copy = "pub"]
     #[clap(
         default_missing_value("default"),
         env(concat!(prefix!(), "VERSION")),
         long("version"),
-        possible_values(["default",  VERSION_FULL]),
+        possible_values(Verbosity::iter().map(|x| x.into()).collect::<Vec<&str>>()),
         short('v'),
         value_name("VERBOSITY")
     )]
     /// Show version information, specify "full" for verbose output.
-    version: Option<String>,
+    version: Option<Verbosity>,
 
     #[get = "pub"]
     #[clap(
@@ -112,6 +109,29 @@ pub struct Config {
     cgroup_manager: CgroupManager,
 }
 
+#[derive(
+    Clone,
+    Copy,
+    Debug,
+    Deserialize,
+    EnumIter,
+    EnumString,
+    Eq,
+    IntoStaticStr,
+    Hash,
+    PartialEq,
+    Serialize,
+)]
+#[strum(serialize_all = "lowercase")]
+/// Available verbosity levels.
+pub enum Verbosity {
+    /// The default Verbosity.
+    Default,
+
+    /// Specifies the full version output option.
+    Full,
+}
+
 #[derive(
     Clone,
     Copy,

diff --git a/conmon-rs/server/src/server.rs b/conmon-rs/server/src/server.rs
@@ -2,7 +2,7 @@
 
 use crate::{
     child_reaper::ChildReaper,
-    config::{CgroupManager, Config, LogDriver, VERSION_FULL},
+    config::{CgroupManager, Config, LogDriver, Verbosity},
     container_io::{ContainerIO, ContainerIOType},
     init::{DefaultInit, Init},
     listener::{DefaultListener, Listener},
@@ -54,7 +54,7 @@ impl Server {
         };
 
         if let Some(v) = server.config().version() {
-            Version::new(v == VERSION_FULL).print();
+            Version::new(v == Verbosity::Full).print();
             process::exit(0);
         }