diff options
author | Jeremy J. Miller <jm@chef.io> | 2018-05-15 15:15:17 -0400 |
---|---|---|
committer | Jeremy J. Miller <jm@chef.io> | 2018-05-15 18:31:57 -0400 |
commit | 7acbb49f913e7064e8736b0e56eff8ecf5acf10a (patch) | |
tree | 1bb228333671c4bdf2044e6d5bdfd217676157b5 /lib/chef | |
parent | c0609e449135fae43d436136a4f0fd3889a9b8f1 (diff) | |
download | chef-7acbb49f913e7064e8736b0e56eff8ecf5acf10a.tar.gz |
object validation for DataHandlerBase#normalize_hash
Signed-off-by: Jeremy J. Miller <jm@chef.io>
Diffstat (limited to 'lib/chef')
-rw-r--r-- | lib/chef/chef_fs/data_handler/data_handler_base.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/chef/chef_fs/data_handler/data_handler_base.rb b/lib/chef/chef_fs/data_handler/data_handler_base.rb index 4b4696ce5e..9fdc5579f2 100644 --- a/lib/chef/chef_fs/data_handler/data_handler_base.rb +++ b/lib/chef/chef_fs/data_handler/data_handler_base.rb @@ -64,10 +64,14 @@ class Chef # Make a normalized result in the specified order for diffing result = {} defaults.each_pair do |key, default| - result[key] = object.has_key?(key) ? object[key] : default + result[key] = object.is_a?(Hash) && object.key?(key) ? object[key] : default end - object.each_pair do |key, value| - result[key] = value if !result.has_key?(key) + if object.is_a?(Hash) + object.each_pair do |key, value| + result[key] = value unless result.key?(key) + end + else + Chef::Log.warn "Encountered invalid object during normalization. Using these defaults #{defaults}" end result end |