Merge pull request #6627 from MsysTechnologiesllc/vasundhara/issue_6073_allow_forcing_sensitive_to_false_on_execute_or_batch_resource

[MSYS-725] [chef#6073] allow forcing sensitive to false on execute and batch resource if password is set.

2 files changed, 10 insertions, 2 deletions

diff --git a/lib/chef/resource/execute.rb b/lib/chef/resource/execute.rb
index de927ec06e..616195deee 100644
--- a/lib/chef/resource/execute.rb
+++ b/lib/chef/resource/execute.rb
@@ -133,7 +133,8 @@ class Chef
 
       property :password, String, sensitive: true
 
-      property :sensitive, [ TrueClass, FalseClass ], default: false, coerce: proc { |x| password ? true : x }
+      # lazy used to set default value of sensitive to true if password is set
+      property :sensitive, [ TrueClass, FalseClass ], default: lazy { |r| r.password ? true : false }
 
       property :elevated, [ TrueClass, FalseClass ], default: false
 
diff --git a/spec/support/shared/unit/execute_resource.rb b/spec/support/shared/unit/execute_resource.rb
index ae56a9697d..c15b02612e 100644
--- a/spec/support/shared/unit/execute_resource.rb
+++ b/spec/support/shared/unit/execute_resource.rb
@@ -139,7 +139,14 @@ shared_examples_for "an execute resource" do
     it "should be true if the password is non-nil but the value is explicitly set to false" do
       @resource.password("we.funk!")
       @resource.sensitive false
-      expect(@resource.sensitive).to eq(true)
+      expect(@resource.sensitive).to eq(false)
+    end
+
+    # added this test to ensure setting of password property after or before sensitive does not matter
+    it "should be false if the sensitive is set before password property" do
+      @resource.sensitive false
+      @resource.password("we.funk!")
+      expect(@resource.sensitive).to eq(false)
     end
 
   end