Merge pull request #45 from MindFlavor/issue/27/sudo_wg_optional

Added optional sudo to wg command

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name                     = "prometheus_wireguard_exporter"
-version                  = "3.4.0"
+version                  = "3.4.1"
 authors                  = ["Francesco Cogno <francesco.cogno@outlook.com>"]
 description              = "Prometheus WireGuard Exporter"
 edition                  = "2018"

src/main.rs

@@ -47,11 +47,21 @@ async fn perform_request(
     let mut wg_accumulator: Option<WireGuard> = None;
 
     for interface_to_handle in interfaces_to_handle {
-        let output = Command::new("wg")
+        let output = if options.prepend_sudo {
-            .arg("show")
+            Command::new("sudo")
-            .arg(&interface_to_handle)
+                .arg("wg")
-            .arg("dump")
+                .arg("show")
-            .output()?;
+                .arg(&interface_to_handle)
+                .arg("dump")
+                .output()?
+        } else {
+            Command::new("wg")
+                .arg("show")
+                .arg(&interface_to_handle)
+                .arg("dump")
+                .output()?
+        };
+
         let output_stdout_str = String::from_utf8(output.stdout)?;
         trace!(
             "wg show {} dump stdout == {}",
@@ -125,6 +135,12 @@ async fn main() {
                 .help("verbose logging")
                 .takes_value(false),
         )
+        .arg(
+            Arg::with_name("prepend_sudo")
+                .short("a")
+                .help("Prepend sudo to the wg show commands")
+                .takes_value(false),
+        )
         .arg(
             Arg::with_name("separate_allowed_ips")
                 .short("s")

src/options.rs

@@ -1,6 +1,7 @@
 #[derive(Debug, Clone)]
 pub(crate) struct Options {
     pub verbose: bool,
+    pub prepend_sudo: bool,
     pub separate_allowed_ips: bool,
     pub extract_names_config_file: Option<String>,
     pub interfaces: Option<Vec<String>>,
@@ -11,6 +12,7 @@ impl Options {
     pub fn from_claps(matches: &clap::ArgMatches<'_>) -> Options {
         let options = Options {
             verbose: matches.is_present("verbose"),
+            prepend_sudo: matches.is_present("prepend_sudo"),
             separate_allowed_ips: matches.is_present("separate_allowed_ips"),
             extract_names_config_file: matches
                 .value_of("extract_names_config_files")
@@ -29,8 +31,3 @@ impl Options {
         options
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-}