summaryrefslogtreecommitdiff
path: root/lib/chef/provider.rb
diff options
context:
space:
mode:
authorChris Arnold <cma.arnold@gmail.com>2017-11-08 15:54:03 -0600
committerChris Arnold <cma.arnold@gmail.com>2017-11-27 09:36:22 -0600
commit64682ef126de4717d69d748c3b6204ea7cf5eb0f (patch)
treea40ff79389f1f6b9a97f294f4443d90344b18f0b /lib/chef/provider.rb
parent437594e25b1bdcd5c5b0af3b2dbfcf7dac6749b8 (diff)
downloadchef-64682ef126de4717d69d748c3b6204ea7cf5eb0f.tar.gz
Hide sensitive properties in converge_if_changed.
Signed-off-by: Chris Arnold <cma.arnold@gmail.com>
Diffstat (limited to 'lib/chef/provider.rb')
-rw-r--r--lib/chef/provider.rb12
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/chef/provider.rb b/lib/chef/provider.rb
index 1ebdfa6feb..9e9013b24e 100644
--- a/lib/chef/provider.rb
+++ b/lib/chef/provider.rb
@@ -250,7 +250,13 @@ class Chef
properties_str = if new_resource.sensitive
specified_properties.join(", ")
else
- specified_properties.map { |p| "#{p}=#{new_resource.send(p).inspect}" }.join(", ")
+ specified_properties.map do |property|
+ "#{property}=" << if new_resource.class.properties[property].sensitive?
+ "(suppressed sensitive property)"
+ else
+ new_resource.send(property).inspect
+ end
+ end.join(", ")
end
Chef::Log.debug("Skipping update of #{new_resource}: has not changed any of the specified properties #{properties_str}.")
return false
@@ -259,7 +265,7 @@ class Chef
# Print the pretty green text and run the block
property_size = modified.map { |p| p.size }.max
modified.map! do |p|
- properties_str = if new_resource.sensitive
+ properties_str = if new_resource.sensitive || new_resource.class.properties[p].sensitive?
"(suppressed sensitive property)"
else
"#{new_resource.send(p).inspect} (was #{current_resource.send(p).inspect})"
@@ -274,7 +280,7 @@ class Chef
property_size = properties.map { |p| p.size }.max
created = properties.map do |property|
default = " (default value)" unless new_resource.property_is_set?(property)
- properties_str = if new_resource.sensitive
+ properties_str = if new_resource.sensitive || new_resource.class.properties[property].sensitive?
"(suppressed sensitive property)"
else
new_resource.send(property).inspect