Clean up some CLI arguments, make magic rollback optional

1 files changed, 50 insertions, 34 deletions

diff --git a/src/utils/deploy.rs b/src/utils/deploy.rs
index e3493ba..9b2f685 100644
--- a/src/utils/deploy.rs
+++ b/src/utils/deploy.rs
@@ -13,15 +13,20 @@ fn build_activate_command(
     bootstrap_cmd: &Option<String>,
     auto_rollback: bool,
     temp_path: &Cow<str>,
-    max_time: u16,
+    confirm_timeout: u16,
+    magic_rollback: bool,
 ) -> String {
     let mut self_activate_command = format!(
-        "{} '{}' '{}' {} {}",
-        activate_path_str, profile_path, closure, temp_path, max_time
+        "{} '{}' '{}' --temp-path {} --confirm-timeout {}",
+        activate_path_str, profile_path, closure, temp_path, confirm_timeout
     );
 
-    if let Some(sudo_cmd) = &sudo {
-        self_activate_command = format!("{} {}", sudo_cmd, self_activate_command);
+    if magic_rollback {
+        self_activate_command = format!("{} --magic-rollback", self_activate_command);
+    }
+
+    if auto_rollback {
+        self_activate_command = format!("{} --auto-rollback", self_activate_command);
     }
 
     if let Some(ref bootstrap_cmd) = bootstrap_cmd {
@@ -31,8 +36,8 @@ fn build_activate_command(
         );
     }
 
-    if auto_rollback {
-        self_activate_command = format!("{} --auto-rollback", self_activate_command);
+    if let Some(sudo_cmd) = &sudo {
+        self_activate_command = format!("{} {}", sudo_cmd, self_activate_command);
     }
 
     self_activate_command
@@ -47,7 +52,8 @@ fn test_activation_command_builder() {
     let bootstrap_cmd = None;
     let auto_rollback = true;
     let temp_path = &"/tmp/deploy-rs".into();
-    let max_time = 30;
+    let confirm_timeout = 30;
+    let magic_rollback = true;
 
     assert_eq!(
         build_activate_command(
@@ -58,9 +64,10 @@ fn test_activation_command_builder() {
             &bootstrap_cmd,
             auto_rollback,
             temp_path,
-            max_time
+            confirm_timeout,
+            magic_rollback
         ),
-        "sudo -u test /blah/bin/activate '/blah/profiles/test' '/blah/etc' /tmp/deploy-rs 30 --auto-rollback"
+        "sudo -u test /blah/bin/activate '/blah/profiles/test' '/blah/etc' --temp-path /tmp/deploy-rs --confirm-timeout 30 --magic-rollback --auto-rollback"
             .to_string(),
     );
 }
@@ -76,12 +83,16 @@ pub async fn deploy_profile(
 
     let activate_path_str = super::deploy_path_to_activate_path_str(&deploy_defs.current_exe)?;
 
-    let temp_path: Cow<str> = match &deploy_data.profile.profile_settings.temp_path {
+    let temp_path: Cow<str> = match &deploy_data.merged_settings.temp_path {
         Some(x) => x.into(),
         None => "/tmp/deploy-rs".into(),
     };
 
-    let max_time = deploy_data.profile.profile_settings.max_time.unwrap_or(30);
+    let confirm_timeout = deploy_data.merged_settings.confirm_timeout.unwrap_or(30);
+
+    let magic_rollback = deploy_data.merged_settings.magic_rollback.unwrap_or(false);
+
+    let auto_rollback = deploy_data.merged_settings.auto_rollback.unwrap_or(true);
 
     let self_activate_command = build_activate_command(
         activate_path_str,
@@ -89,9 +100,10 @@ pub async fn deploy_profile(
         &deploy_defs.profile_path,
         &deploy_data.profile.profile_settings.path,
         &deploy_data.profile.profile_settings.bootstrap,
-        deploy_data.merged_settings.auto_rollback,
+        auto_rollback,
         &temp_path,
-        max_time,
+        confirm_timeout,
+        magic_rollback,
     );
 
     let hostname = match deploy_data.cmd_overrides.hostname {
@@ -112,33 +124,37 @@ pub async fn deploy_profile(
         good_panic!("Activation over SSH failed");
     }
 
-    info!("Success, attempting to connect to the node to confirm deployment");
+    info!("Success activating!");
 
-    let mut c = Command::new("ssh");
-    let mut ssh_confirm_command = c.arg(format!("ssh://{}@{}", deploy_defs.ssh_user, hostname));
+    if magic_rollback {
+        info!("Attempting to confirm activation");
 
-    for ssh_opt in &deploy_data.merged_settings.ssh_opts {
-        ssh_confirm_command = ssh_confirm_command.arg(ssh_opt);
-    }
+        let mut c = Command::new("ssh");
+        let mut ssh_confirm_command = c.arg(format!("ssh://{}@{}", deploy_defs.ssh_user, hostname));
 
-    let lock_hash = &deploy_data.profile.profile_settings.path[11 /* /nix/store/ */ ..];
-    let lock_path = format!("{}/activating-{}", temp_path, lock_hash);
+        for ssh_opt in &deploy_data.merged_settings.ssh_opts {
+            ssh_confirm_command = ssh_confirm_command.arg(ssh_opt);
+        }
 
-    let mut confirm_command = format!("rm {}", lock_path);
-    if let Some(sudo_cmd) = &deploy_defs.sudo {
-        confirm_command = format!("{} {}", sudo_cmd, confirm_command);
-    }
+        let lock_hash = &deploy_data.profile.profile_settings.path[11 /* /nix/store/ */ ..];
+        let lock_path = format!("{}/activating-{}", temp_path, lock_hash);
 
-    let ssh_exit_status = ssh_confirm_command.arg(confirm_command).status().await?;
+        let mut confirm_command = format!("rm {}", lock_path);
+        if let Some(sudo_cmd) = &deploy_defs.sudo {
+            confirm_command = format!("{} {}", sudo_cmd, confirm_command);
+        }
 
-    if !ssh_exit_status.success() {
-        good_panic!(
-            "Failed to confirm deployment, the node will roll back in <{} seconds",
-            max_time
-        );
-    }
+        let ssh_exit_status = ssh_confirm_command.arg(confirm_command).status().await?;
 
-    info!("Deployment confirmed.");
+        if !ssh_exit_status.success() {
+            good_panic!(
+                "Failed to confirm deployment, the node will roll back in <{} seconds",
+                confirm_timeout
+            );
+        }
+
+        info!("Deployment confirmed.");
+    }
 
     Ok(())
 }