Freeze default constants

2 files changed, 7 insertions, 1 deletions

diff --git a/lib/chef/mixin/params_validate.rb b/lib/chef/mixin/params_validate.rb
index c5836122a2..8b5df37186 100644
--- a/lib/chef/mixin/params_validate.rb
+++ b/lib/chef/mixin/params_validate.rb
@@ -322,6 +322,7 @@ class Chef
       def _pv_default(opts, key, default_value)
         value = _pv_opts_lookup(opts, key)
         if value.nil?
+          default_value = default_value.freeze if !default_value.is_a?(DelayedEvaluator)
           opts[key] = default_value
         end
       end
diff --git a/spec/unit/property_spec.rb b/spec/unit/property_spec.rb
index f048355269..04a542ea2c 100644
--- a/spec/unit/property_spec.rb
+++ b/spec/unit/property_spec.rb
@@ -367,9 +367,14 @@ describe "Chef::Resource.property" do
           expect(resource.x.object_id).to eq(value.object_id)
         end
         it "Multiple instances of x receive the exact same value" do
-          # Bleagh.  But it's what we do.
           expect(resource.x.object_id).to eq(resource_class.new('blah2').x.object_id)
         end
+        it "The default value is frozen" do
+          expect(resource.x).to be_frozen
+        end
+        it "The default value cannot be written to" do
+          expect { resource.x[:a] = 1 }.to raise_error RuntimeError, /frozen/
+        end
       end
 
       with_property ':x, default: lazy { {} }' do