Use a better (read: working) technique because I was totally wrong about $!.pr-6203

Signed-off-by: Noah Kantrowitz <noah@coderanger.net>

1 files changed, 6 insertions, 3 deletions

diff --git a/lib/chef/provider/execute.rb b/lib/chef/provider/execute.rb
index 11c84eaf9e..0e9acb4028 100644
--- a/lib/chef/provider/execute.rb
+++ b/lib/chef/provider/execute.rb
@@ -58,9 +58,12 @@ class Chef
             shell_out_with_systems_locale!(command, opts)
           rescue Mixlib::ShellOut::ShellCommandFailed
             if sensitive?
-              $! = nil
-              raise Mixlib::ShellOut::ShellCommandFailed,
-                "Command execution failed. STDOUT/STDERR suppressed for sensitive resource"
+              ex = Mixlib::ShellOut::ShellCommandFailed.new("Command execution failed. STDOUT/STDERR suppressed for sensitive resource")
+              # Forcibly hide the exception cause chain here so we don't log the unredacted version
+              def ex.cause
+                nil
+              end
+              raise ex
             else
               raise
             end