Made ignore_fails, show_success_output and show_bash_c optional

Author: markcda

deploy-config.yaml

@@ -63,7 +63,7 @@ impl Execute for TestAction {
     let mut output = vec![];
 
     let (status, command_out) = self.command.execute(env)?;
-    if !status && !self.command.ignore_fails {
+    if !status && !self.command.ignore_fails.is_some_and(|v| v) {
       return Ok((false, command_out));
     }
 

src/actions/test.rs

@@ -167,9 +167,9 @@ impl Default for DeployerGlobalConfig {
             bash_c: "cargo build --release".into(),
             placeholders: None,
             replacements: None,
-            ignore_fails: false,
-            show_success_output: false,
-            show_bash_c: true,
+            ignore_fails: None,
+            show_success_output: None,
+            show_bash_c: None,
             only_when_fresh: None,
             remote_exec: None,
             daemon: None,

src/configs.rs

@@ -29,9 +29,9 @@ fn migrate_custom_v3_to_v4(prev_cmd: &CustomCommandV3) -> CustomCommand {
   CustomCommand {
     bash_c: prev_cmd.bash_c.clone(),
     placeholders: prev_cmd.placeholders.clone(),
-    ignore_fails: prev_cmd.ignore_fails,
-    show_success_output: prev_cmd.show_success_output,
-    show_bash_c: prev_cmd.show_bash_c,
+    ignore_fails: if prev_cmd.ignore_fails { Some(true) } else { None },
+    show_success_output: if prev_cmd.show_success_output { Some(true) } else { None },
+    show_bash_c: if !prev_cmd.show_bash_c { Some(false) } else { None },
     only_when_fresh: prev_cmd.only_when_fresh,
     remote_exec: prev_cmd.remote_exec.clone(),
     daemon: None,

src/configs/migrate.rs

@@ -54,13 +54,13 @@ pub fn run_simple(env: &RunEnvironment, bash_c: String) -> anyhow::Result<()> {
       log(format!("Given command: `{}`", bash_c));
       bash_c
     },
-    ignore_fails: false,
+    ignore_fails: None,
     only_when_fresh: None,
     placeholders: None,
     remote_exec: None,
     replacements: None,
-    show_bash_c: true,
-    show_success_output: true,
+    show_bash_c: None,
+    show_success_output: Some(true),
     daemon: None,
     daemon_wait_seconds: None,
   })

src/containered.rs

@@ -31,19 +31,28 @@ pub struct CustomCommand {
   ///
   /// Any status code your command returns which isn't equal zero means fail. But this
   /// flag allows to avoid Pipeline early exit, if needed. Error will be ignored.
-  pub ignore_fails: bool,
+  ///
+  /// Default is `false`.
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub ignore_fails: Option<bool>,
 
   /// Flag to show output if the command was finished successfully.
   ///
   /// E.g., if you don't wanna see `cargo build` output when code is built successfully,
   /// you can set this flag to `true`.
-  pub show_success_output: bool,
+  ///
+  /// Default is `false`.
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub show_success_output: Option<bool>,
 
   /// Flag to show command on screen (during Pipeline execution).
   ///
   /// Allows to hide constructed command (from `bash_c` and replaced variables) to avoid
   /// leaking secrets (keys, tokens, paths to sensitive files, etc.).
-  pub show_bash_c: bool,
+  ///
+  /// Default is `true`.
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub show_bash_c: Option<bool>,
 
   /// Flag to run this command only once on repeateable builds.
   ///
@@ -193,14 +202,14 @@ impl Execute for CustomCommand {
           stdout_strs,
           stderr_strs,
           command_output.status.success(),
-          self.show_success_output,
-          self.show_bash_c,
+          self.show_success_output.is_some_and(|v| v),
+          self.show_bash_c.is_none_or(|v| v),
         ));
 
         command_output.status.success()
       };
 
-      if !self.ignore_fails && !success {
+      if !self.ignore_fails.is_some_and(|v| v) && !success {
         return Ok((false, output));
       }
     }
@@ -277,7 +286,7 @@ impl Execute for CustomCommand {
         res.success()
       };
 
-      if !self.ignore_fails && !success {
+      if !self.ignore_fails.is_some_and(|v| v) && !success {
         return Ok((false, output));
       }
     }
@@ -328,7 +337,7 @@ impl CustomCommand {
       let remote = match globals.remote_hosts.get(hostname) {
         None => {
           output.push(i18n::NO_SUCH_REMOTE.to_string());
-          if !self.ignore_fails {
+          if !self.ignore_fails.is_some_and(|v| v) {
             return Ok((false, output));
           }
           continue;
@@ -346,13 +355,13 @@ impl CustomCommand {
           out,
           String::new(),
           s,
-          self.show_success_output,
-          self.show_bash_c,
+          self.show_success_output.is_some_and(|v| v),
+          self.show_bash_c.is_none_or(|v| v),
         );
         composed.pop();
         output.extend_from_slice(&composed);
 
-        if !self.ignore_fails && !s {
+        if !self.ignore_fails.is_some_and(|v| v) && !s {
           RemoteHost::close_session(&mut session, &rt)?;
           return Ok((false, output));
         }

src/entities/custom_command.rs

@@ -301,9 +301,9 @@ impl TestAction {
         bash_c,
         placeholders,
         replacements: None,
-        ignore_fails,
-        show_success_output: true,
-        show_bash_c: false,
+        ignore_fails: if ignore_fails { Some(true) } else { None },
+        show_success_output: Some(true),
+        show_bash_c: Some(false),
         only_when_fresh: None,
         remote_exec: None,
         daemon: None,
@@ -343,9 +343,9 @@ impl TestAction {
         bash_c,
         placeholders: None,
         replacements: None,
-        ignore_fails,
-        show_success_output: true,
-        show_bash_c: false,
+        ignore_fails: if ignore_fails { Some(true) } else { None },
+        show_success_output: Some(true),
+        show_bash_c: Some(false),
         only_when_fresh: None,
         remote_exec: None,
         daemon: None,
@@ -840,7 +840,7 @@ impl AutoVersionExtractFromRule {
       i18n::AUTO_VER_CMD_STDOUT => AutoVersionExtractFromRule::CmdStdout {
         cmd: {
           let mut cmd = CustomCommand::new_from_prompt_unspecified()?;
-          cmd.show_success_output = true;
+          cmd.show_success_output = Some(true);
           cmd
         },
       },
@@ -870,12 +870,12 @@ impl CustomCommand {
     let ignore_fails = inquire::Confirm::new(i18n::CMD_IGNORE_FAILS)
       .with_default(false)
       .prompt()?;
-    let show_bash_c = inquire::Confirm::new(i18n::CMD_SHOW_BASH_C)
-      .with_default(true)
-      .prompt()?;
     let show_success_output = inquire::Confirm::new(i18n::CMD_SHOW_SUCC_OUT)
       .with_default(false)
       .prompt()?;
+    let show_bash_c = inquire::Confirm::new(i18n::CMD_SHOW_BASH_C)
+      .with_default(true)
+      .prompt()?;
     let only_when_fresh = Some(
       inquire::Confirm::new(i18n::CMD_ONLY_WHEN_FRESH)
         .with_default(false)
@@ -888,9 +888,9 @@ impl CustomCommand {
     Ok(CustomCommand {
       bash_c,
       placeholders,
-      ignore_fails,
-      show_bash_c,
-      show_success_output,
+      ignore_fails: if ignore_fails { Some(true) } else { None },
+      show_success_output: if show_success_output { Some(true) } else { None },
+      show_bash_c: if !show_bash_c { Some(false) } else { None },
       only_when_fresh,
       replacements: None,
       remote_exec,
@@ -912,9 +912,9 @@ impl CustomCommand {
     Ok(CustomCommand {
       bash_c,
       placeholders,
-      ignore_fails: true,
-      show_success_output: true,
-      show_bash_c: false,
+      ignore_fails: Some(true),
+      show_success_output: Some(true),
+      show_bash_c: Some(false),
       only_when_fresh: Some(false),
       replacements: None,
       remote_exec: None,

src/tui/add.rs

@@ -1217,19 +1217,34 @@ impl Edit for CustomCommand {
           };
         }
         i18n::CMD_CHANGE_FAILURE_IGNORANCE => {
-          self.ignore_fails = inquire::Confirm::new(i18n::CMD_IGNORE_FAILS)
+          self.ignore_fails = if inquire::Confirm::new(i18n::CMD_IGNORE_FAILS)
             .with_default(false)
-            .prompt()?;
-        }
-        i18n::CMD_CHANGE_VISIBILITY_AT_BUILD => {
-          self.show_bash_c = inquire::Confirm::new(i18n::CMD_SHOW_BASH_C)
-            .with_default(true)
-            .prompt()?;
+            .prompt()?
+          {
+            Some(true)
+          } else {
+            None
+          };
         }
         i18n::CMD_CHANGE_VISIBILITY_ON_SUCC => {
-          self.show_success_output = inquire::Confirm::new(i18n::CMD_SHOW_SUCC_OUT)
+          self.show_success_output = if inquire::Confirm::new(i18n::CMD_SHOW_SUCC_OUT)
             .with_default(false)
-            .prompt()?;
+            .prompt()?
+          {
+            Some(true)
+          } else {
+            None
+          };
+        }
+        i18n::CMD_CHANGE_VISIBILITY_AT_BUILD => {
+          self.show_bash_c = if !inquire::Confirm::new(i18n::CMD_SHOW_BASH_C)
+            .with_default(true)
+            .prompt()?
+          {
+            Some(false)
+          } else {
+            None
+          };
         }
         i18n::CMD_CHANGE_ON_FRESH => {
           self.only_when_fresh = if inquire::Confirm::new(i18n::CMD_ONLY_WHEN_FRESH)
@@ -1499,7 +1514,7 @@ impl Edit for AddToStorageAction {
         i18n::AUTO_VER_CMD_STDOUT => AutoVersionExtractFromRule::CmdStdout {
           cmd: {
             let mut cmd = CustomCommand::new_from_prompt_unspecified()?;
-            cmd.show_success_output = true;
+            cmd.show_success_output = Some(true);
             cmd
           },
         },

src/tui/edit.rs

@@ -262,7 +262,7 @@ impl CustomCommand {
     let mut r = self.clone();
     r.replacements = Some(replacements);
     r.show_bash_c = if let Some(show) = explicitly_show_bash_c {
-      show
+      if !show { Some(false) } else { None }
     } else {
       r.show_bash_c
     };