From ea717911bac5ff29d730d80d4b774fe17ed1e851 Mon Sep 17 00:00:00 2001
From: notgne2
Date: Tue, 13 Oct 2020 19:06:40 -0700
Subject: Clean up some CLI arguments, make magic rollback optional

---
 src/utils/data.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/utils/data.rs')

diff --git a/src/utils/data.rs b/src/utils/data.rs
index 351b9ae..5c58e3b 100644
--- a/src/utils/data.rs
+++ b/src/utils/data.rs
@@ -19,11 +19,15 @@ pub struct GenericSettings {
     #[merge(strategy = merge::vec::append)]
     pub ssh_opts: Vec<String>,
     #[serde(rename(deserialize = "fastConnection"), default)]
-    #[merge(strategy = merge::bool::overwrite_false)]
-    pub fast_connection: bool,
+    pub fast_connection: Option<bool>,
     #[serde(rename(deserialize = "autoRollback"), default)]
-    #[merge(strategy = merge::bool::overwrite_false)]
-    pub auto_rollback: bool,
+    pub auto_rollback: Option<bool>,
+    #[serde(rename(deserialize = "confirmTimeout"))]
+    pub confirm_timeout: Option<u16>,
+    #[serde(rename(deserialize = "tempPath"))]
+    pub temp_path: Option<String>,
+    #[serde(rename(deserialize = "magicRollback"))]
+    pub magic_rollback: Option<bool>,
 }
 
 #[derive(Deserialize, Debug, Clone)]
@@ -44,10 +48,6 @@ pub struct ProfileSettings {
     pub bootstrap: Option<String>,
     #[serde(rename(deserialize = "profilePath"))]
     pub profile_path: Option<String>,
-    #[serde(rename(deserialize = "maxTime"))]
-    pub max_time: Option<u16>,
-    #[serde(rename(deserialize = "tempPath"))]
-    pub temp_path: Option<String>,
 }
 
 #[derive(Deserialize, Debug, Clone)]
-- 
cgit v1.2.3