Merge pull request #3 from fstnetwork/develop

Release v0.0.3

Author: AtkinsChang

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "istinit"
-version = "0.0.2"
+version = "0.0.3"
 authors = ["FST Network <[email protected]>"]
 edition = "2018"
 autobins = false

Cargo.toml

@@ -11,8 +11,8 @@ pub struct Command {
     #[structopt(long = "enable-process-subreaper", short = "s", env = "ENABLE_PROCESS_SUBREAPER")]
     enable_process_subreaper: bool,
 
-    #[structopt(long = "with-istio", env = "WITH_ISTIO")]
-    with_istio: bool,
+    #[structopt(long = "with-istio", env = "WITH_ISTIO", parse(from_str = parse_bool_str))]
+    with_istio: Option<bool>,
 
     #[structopt(
         long = "pilot-agent-endpoint",
@@ -21,8 +21,8 @@ pub struct Command {
     )]
     pilot_agent_endpoint: String,
 
-    #[structopt(long = "kill-istio", env = "KILL_ISTIO")]
-    kill_istio: bool,
+    #[structopt(long = "kill-istio", env = "KILL_ISTIO", parse(from_str = parse_bool_str))]
+    kill_istio: Option<bool>,
 
     command: String,
 
@@ -49,12 +49,28 @@ impl Into<Config> for Command {
 
         let process = config::Process { command, args };
 
-        let istio = if with_istio {
-            Some(config::Istio { pilot_agent_endpoint, kill_istio })
+        let istio = if let Some(true) = with_istio {
+            Some(config::Istio { pilot_agent_endpoint, kill_istio: kill_istio.unwrap_or(false) })
         } else {
             None
         };
 
         Config { enable_process_subreaper, process, istio }
     }
 }
+
+fn parse_bool_str(s: &str) -> bool { !matches!(s, "" | "false") }
+
+#[cfg(test)]
+mod tests {
+
+    #[test]
+    fn test_parse_bool_str() {
+        use super::parse_bool_str;
+
+        assert_eq!(parse_bool_str(""), false);
+        assert_eq!(parse_bool_str("false"), false);
+        assert_eq!(parse_bool_str("true"), true);
+        assert_eq!(parse_bool_str("any"), true);
+    }
+}