From 963fbb08ed594af9fa18f9ac59bfa64aeceff0a9 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Wed, 8 Nov 2017 11:25:16 -0800 Subject: Suppress values on converge when a property is marked sensitive Signed-off-by: Tim Smith --- lib/chef/provider.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/chef/provider.rb b/lib/chef/provider.rb index 1ebdfa6feb..0b85f5784c 100644 --- a/lib/chef/provider.rb +++ b/lib/chef/provider.rb @@ -247,7 +247,7 @@ class Chef specified_properties = properties.select { |property| new_resource.property_is_set?(property) } modified = specified_properties.select { |p| new_resource.send(p) != current_resource.send(p) } if modified.empty? - properties_str = if new_resource.sensitive + properties_str = if new_resource.sensitive || new_resource.class.properties[p].sensitive? specified_properties.join(", ") else specified_properties.map { |p| "#{p}=#{new_resource.send(p).inspect}" }.join(", ") @@ -259,7 +259,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 +274,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[p].sensitive? "(suppressed sensitive property)" else new_resource.send(property).inspect -- cgit v1.2.1