Merge pull request #8983 from AriaXLi/PUP-11526

(PUP-11526) Evaluate deferred functions lazily by default

Author: AriaXLi

lib/puppet/defaults.rb

@@ -2037,7 +2037,7 @@ def self.initialize_default_settings!(settings)
         what is being done.",
     },
     :preprocess_deferred => {
-      :default => true,
+      :default => false,
       :type => :boolean,
       :desc => "Whether puppet should call deferred functions before applying
         the catalog. If set to `true`, then all prerequisites needed for the

spec/integration/application/agent_spec.rb

@@ -155,6 +155,8 @@
     end
 
     it "fails to apply a deferred function with an unsatified prerequisite" do
+      Puppet[:preprocess_deferred] = true
+
       catalog_handler = -> (req, res) {
         catalog = compile_to_catalog(deferred_manifest, node)
         res.body = formatter.render(catalog)
@@ -173,8 +175,6 @@
     end
 
     it "applies a deferred function and its prerequisite in the same run" do
-      Puppet[:preprocess_deferred] = false
-
       catalog_handler = -> (req, res) {
         catalog = compile_to_catalog(deferred_manifest, node)
         res.body = formatter.render(catalog)

spec/integration/application/apply_spec.rb

@@ -695,6 +695,8 @@ def bogus()
     end
 
     it "fails to apply a deferred function with an unsatified prerequisite" do
+      Puppet[:preprocess_deferred] = true
+
       apply.command_line.args = ['-e', deferred_manifest]
       expect {
         apply.run
@@ -704,8 +706,6 @@ def bogus()
     end
 
     it "applies a deferred function and its prerequisite in the same run" do
-      Puppet[:preprocess_deferred] = false
-
       apply.command_line.args = ['-e', deferred_manifest]
       expect {
         apply.run
@@ -714,6 +714,7 @@ def bogus()
     end
 
     it "validates the deferred resource before applying any resources" do
+      Puppet[:preprocess_deferred] = true
       undeferred_file = tmpfile('undeferred')
 
       manifest = <<~END
@@ -738,8 +739,6 @@ def bogus()
     end
 
     it "evaluates resources before validating the deferred resource" do
-      Puppet[:preprocess_deferred] = false
-
       manifest = <<~END
         notify { 'runs before file': } ->
         file { '#{deferred_file}':