Chef-13: properly deep dup Node#to_hash

previously to_hash allowed mutating non-container elements, now
they get properly dup'd.

fixes a 2.5 year old pending spec test.

also fills out the API so that there is to_h/to_hash/to_a/to_array
instead of the weird mix-and-match we had before.

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>

1 files changed, 16 insertions, 5 deletions

diff --git a/lib/chef/node/immutable_collections.rb b/lib/chef/node/immutable_collections.rb
index 12ee2e5dd8..08bd9c9c77 100644
--- a/lib/chef/node/immutable_collections.rb
+++ b/lib/chef/node/immutable_collections.rb
@@ -77,14 +77,16 @@ class Chef
             when ImmutableArray
               v.to_a
             when ImmutableMash
-              v.to_hash
+              v.to_h
             else
-              v
+              safe_dup(v)
             end
         end
         a
       end
 
+      alias_method :to_array, :to_a
+
       # for consistency's sake -- integers 'converted' to integers
       def convert_key(key)
         key
@@ -140,22 +142,31 @@ class Chef
         Mash.new(self)
       end
 
-      def to_hash
+      def to_h
         h = Hash.new
         each_pair do |k, v|
           h[k] =
             case v
             when ImmutableMash
-              v.to_hash
+              v.to_h
             when ImmutableArray
               v.to_a
             else
-              v
+              safe_dup(v)
             end
         end
         h
       end
 
+      alias_method :to_hash, :to_h
+
+      # For elements like Fixnums, true, nil...
+      def safe_dup(e)
+        e.dup
+      rescue TypeError
+        e
+      end
+
       prepend Chef::Node::Mixin::StateTracking
       prepend Chef::Node::Mixin::ImmutablizeHash
     end