Merge pull request #8918 from ekohl/PUP-11552-erb-ruby-3.1

(PUP-11552) Pass ERB arguments as keywords

Author: joshcooper

lib/puppet/face/help.rb

@@ -140,7 +140,7 @@ def template_for(face, action)
 
   def erb(name)
     template = (Pathname(__FILE__).dirname + "help" + name)
-    erb = ERB.new(template.read, nil, '-')
+    erb = Puppet::Util.create_erb(template.read)
     erb.filename = template.to_s
     return erb
   end

lib/puppet/generate/type.rb

@@ -167,7 +167,7 @@ def self.generate(inputs, outputdir = nil, force = false)
         templates = {}
         templates.default_proc = lambda { |hash, key|
           raise _("template was not found at '%{key}'.") % { key: key } unless Puppet::FileSystem.file?(key)
-          template = ERB.new(File.read(key), nil, '-')
+          template = Puppet::Util.create_erb(File.read(key))
           template.filename = key
           template
         }

lib/puppet/parser/templatewrapper.rb

@@ -90,7 +90,7 @@ def result(string = nil)
 
     result = nil
     benchmark(:debug, _("Interpolated template %{template_source} in %%{seconds} seconds") % { template_source: escaped_template_source }) do
-      template = ERB.new(string, 0, "-")
+      template = Puppet::Util.create_erb(string)
       template.filename = @__file__
       result = template.result(binding)
     end

lib/puppet/util.rb

@@ -34,6 +34,17 @@ def default_env
   end
   module_function :default_env
 
+  if RUBY_VERSION >= "2.6"
+    def create_erb(content)
+      ERB.new(content, trim_mode: '-')
+    end
+  else
+    def create_erb(content)
+      ERB.new(content, 0, '-')
+    end
+  end
+  module_function :create_erb
+
   # @param name [String] The name of the environment variable to retrieve
   # @param mode [Symbol] Which operating system mode to use e.g. :posix or :windows.  Use nil to autodetect
   # @return [String] Value of the specified environment variable.  nil if it does not exist

lib/puppet/util/resource_template.rb

@@ -40,7 +40,7 @@ class Puppet::Util::ResourceTemplate
 
   def evaluate
     set_resource_variables
-    ERB.new(Puppet::FileSystem.read(@file, :encoding => 'utf-8'), 0, "-").result(binding)
+    Puppet::Util.create_erb(Puppet::FileSystem.read(@file, :encoding => 'utf-8')).result(binding)
   end
 
   def initialize(file, resource)

spec/unit/util/resource_template_spec.rb

@@ -39,7 +39,7 @@
 
     it "should create a template instance with the contents of the file" do
       expect(Puppet::FileSystem).to receive(:read).with("/my/template", :encoding => 'utf-8').and_return("yay")
-      expect(ERB).to receive(:new).with("yay", 0, "-").and_return(@template)
+      expect(Puppet::Util).to receive(:create_erb).with("yay").and_return(@template)
 
       allow(@wrapper).to receive(:set_resource_variables)