diff options
author | Thom May <thom@may.lt> | 2018-02-19 10:10:58 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-19 10:10:58 +0000 |
commit | 7393d2a43c7581f3bf9f93ea0dcc1f1aa9a5a21e (patch) | |
tree | debdc692845991922fc7f9015a1d7a5d47e29206 | |
parent | 01ae5aac80444d6e849bb44ba0f5798e46978c7f (diff) | |
parent | fc70228d6950e023f938ec41cf6de69e8bddd08e (diff) | |
download | chef-7393d2a43c7581f3bf9f93ea0dcc1f1aa9a5a21e.tar.gz |
Merge pull request #6496 from shoekstra/fix_5695
registry_key: Add sensitive property support for suppressing output (fixes #5695)
-rw-r--r-- | lib/chef/provider/registry_key.rb | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/lib/chef/provider/registry_key.rb b/lib/chef/provider/registry_key.rb index f196154986..a4a0465e11 100644 --- a/lib/chef/provider/registry_key.rb +++ b/lib/chef/provider/registry_key.rb @@ -126,12 +126,18 @@ class Chef value[:data] = value[:data].to_i end unless current_value[:type] == value[:type] && current_value[:data] == value[:data] - converge_by("set value #{value}") do + converge_by_value = value + converge_by_value[:data] = "*sensitive value suppressed*" if new_resource.sensitive + + converge_by("set value #{converge_by_value}") do registry.set_value(new_resource.key, value) end end else - converge_by("set value #{value}") do + converge_by_value = value + converge_by_value[:data] = "*sensitive value suppressed*" if new_resource.sensitive + + converge_by("set value #{converge_by_value}") do registry.set_value(new_resource.key, value) end end @@ -146,7 +152,10 @@ class Chef end new_resource.unscrubbed_values.each do |value| unless @name_hash.has_key?(value[:name].downcase) - converge_by("create value #{value}") do + converge_by_value = value + converge_by_value[:data] = "*sensitive value suppressed*" if new_resource.sensitive + + converge_by("create value #{converge_by_value}") do registry.set_value(new_resource.key, value) end end @@ -157,7 +166,10 @@ class Chef if registry.key_exists?(new_resource.key) new_resource.unscrubbed_values.each do |value| if @name_hash.has_key?(value[:name].downcase) - converge_by("delete value #{value}") do + converge_by_value = value + converge_by_value[:data] = "*sensitive value suppressed*" if new_resource.sensitive + + converge_by("delete value #{converge_by_value}") do registry.delete_value(new_resource.key, value) end end |