diff options
| author | Josh Barker <josh.barker.developer@gmail.com> | 2018-10-24 07:45:34 +1100 |
|---|---|---|
| committer | Josh Barker <josh.barker@au1.ibm.com> | 2018-10-24 09:27:51 +1100 |
| commit | 5f76daac96db499617b47785dea6d43ad442b5c1 (patch) | |
| tree | 8c9b8943cd19b3f9e674c76ba044a43745171ed9 /lib/chef/provider/registry_key.rb | |
| parent | c6f0eb055601ac50c9b1c24ba815329bccfc7605 (diff) | |
| download | chef-5f76daac96db499617b47785dea6d43ad442b5c1.tar.gz | |
Fix the registry_key resource so the correct value is set when sensitive is true
Signed-off-by: Josh Barker <josh.barker.developer@gmail.com>
Diffstat (limited to 'lib/chef/provider/registry_key.rb')
| -rw-r--r-- | lib/chef/provider/registry_key.rb | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/lib/chef/provider/registry_key.rb b/lib/chef/provider/registry_key.rb index 7c7b190b95..6b226cc991 100644 --- a/lib/chef/provider/registry_key.rb +++ b/lib/chef/provider/registry_key.rb @@ -126,16 +126,22 @@ class Chef value[:data] = value[:data].to_i end unless current_value[:type] == value[:type] && current_value[:data] == value[:data] - converge_by_value = value - converge_by_value[:data] = "*sensitive value suppressed*" if new_resource.sensitive + converge_by_value = if new_resource.sensitive + value.merge(data: "*sensitive value suppressed*") + else + value + end converge_by("set value #{converge_by_value}") do registry.set_value(new_resource.key, value) end end else - converge_by_value = value - converge_by_value[:data] = "*sensitive value suppressed*" if new_resource.sensitive + converge_by_value = if new_resource.sensitive + value.merge(data: "*sensitive value suppressed*") + else + value + end converge_by("set value #{converge_by_value}") do registry.set_value(new_resource.key, value) @@ -152,8 +158,11 @@ class Chef end new_resource.unscrubbed_values.each do |value| unless @name_hash.key?(value[:name].downcase) - converge_by_value = value - converge_by_value[:data] = "*sensitive value suppressed*" if new_resource.sensitive + converge_by_value = if new_resource.sensitive + value.merge(data: "*sensitive value suppressed*") + else + value + end converge_by("create value #{converge_by_value}") do registry.set_value(new_resource.key, value) |