Allow default values to be a DelayedEvaluator

2 files changed, 11 insertions, 0 deletions

diff --git a/lib/chef/mixin/params_validate.rb b/lib/chef/mixin/params_validate.rb
index a9799f749c..bedc67f357 100644
--- a/lib/chef/mixin/params_validate.rb
+++ b/lib/chef/mixin/params_validate.rb
@@ -95,6 +95,13 @@ class Chef
             val = arg
           else
             val = validate({ symbol => arg }, { symbol => validation })[symbol]
+
+            # Handle the case where the "default" was a DelayedEvaluator. In
+            # this case, the block yields an optional parameter of +self+,
+            # which is the equivalent of "new_resource"
+            if val.is_a?(DelayedEvaluator)
+              val = val.call(self)
+            end
           end
           self.instance_variable_set(iv_symbol, val)
         end
diff --git a/lib/chef/resource/lwrp_base.rb b/lib/chef/resource/lwrp_base.rb
index e91516e6f6..7b4e8bf4f1 100644
--- a/lib/chef/resource/lwrp_base.rb
+++ b/lib/chef/resource/lwrp_base.rb
@@ -119,6 +119,10 @@ class Chef
         run_context.node
       end
 
+      def self.lazy(&block)
+        DelayedEvaluator.new(&block)
+      end
+
       # Default initializer. Sets the default action and allowed actions.
       def initialize(name, run_context=nil)
         super(name, run_context)