puppet 4.10.12-universal-darwin → 5.0.0-universal-darwin

data/lib/puppet/file_serving/http_metadata.rb

@@ -23,7 +23,7 @@ class Puppet::FileServing::HttpMetadata < Puppet::FileServing::Metadata
 
     if last_modified = http_response['last-modified']
       mtime = DateTime.httpdate(last_modified).to_time
-      @checksums[:mtime] = "{mtime}#{mtime}"
+      @checksums[:mtime] = "{mtime}#{mtime.utc}"
     end
 
     @ftype = 'file'

data/lib/puppet/file_serving/metadata.rb

@@ -18,13 +18,13 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
   PARAM_ORDER = [:mode, :ftype, :owner, :group]
 
   def checksum_type=(type)
-    raise(ArgumentError, "Unsupported checksum type #{type}") unless Puppet::Util::Checksums.respond_to?("#{type}_file")
+    raise(ArgumentError, _("Unsupported checksum type %{type}") % { type: type }) unless Puppet::Util::Checksums.respond_to?("#{type}_file")
 
     @checksum_type = type
   end
 
   def source_permissions=(source_permissions)
-    raise(ArgumentError, "Unsupported source_permission #{source_permissions}") unless [:use, :use_when_creating, :ignore].include?(source_permissions.intern)
+    raise(ArgumentError, _("Unsupported source_permission %{source_permissions}") % { source_permissions: source_permissions }) unless [:use, :use_when_creating, :ignore].include?(source_permissions.intern)
 
     @source_permissions = source_permissions.intern
   end
@@ -33,10 +33,10 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
     begin
       uri = URI.parse(Puppet::Util.uri_encode(path))
     rescue URI::InvalidURIError => detail
-      raise(ArgumentError, "Could not understand URI #{path}: #{detail}")
+      raise(ArgumentError, _("Could not understand URI %{path}: %{detail}") % { path: path, detail: detail })
     end
-    raise(ArgumentError, "Cannot use opaque URLs '#{path}'") unless uri.hierarchical?
-    raise(ArgumentError, "Must use URLs of type puppet as content URI") if uri.scheme != "puppet"
+    raise(ArgumentError, _("Cannot use opaque URLs '%{path}'") % { path: path }) unless uri.hierarchical?
+    raise(ArgumentError, _("Must use URLs of type puppet as content URI")) if uri.scheme != "puppet"
 
     @content_uri = path.encode(Encoding::UTF_8)
   end
@@ -72,7 +72,7 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
     def initialize(stat, path, source_permissions)
       super(stat, source_permissions)
       @path = path
-      raise(ArgumentError, "Unsupported Windows source permissions option #{source_permissions}") unless @source_permissions_ignore
+      raise(ArgumentError, _("Unsupported Windows source permissions option %{source_permissions}") % { source_permissions: source_permissions }) unless @source_permissions_ignore
     end
 
     { :owner => 'S-1-5-32-544',
@@ -119,7 +119,7 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
       @destination = Puppet::FileSystem.readlink(real_path)
       @checksum = ("{#{@checksum_type}}") + send("#{@checksum_type}_file", real_path).to_s rescue nil
     else
-      raise ArgumentError, "Cannot manage files of type #{stat.ftype}"
+      raise ArgumentError, _("Cannot manage files of type %{file_type}") % { file_type: stat.ftype }
     end
   end
 

data/lib/puppet/file_serving/mount.rb

@@ -18,7 +18,7 @@ class Puppet::FileServing::Mount < Puppet::Network::AuthStore
   # Create our object.  It must have a name.
   def initialize(name)
     unless name =~ %r{^[-\w]+$}
-      raise ArgumentError, "Invalid mount name format '#{name}'"
+      raise ArgumentError, _("Invalid mount name format '%{name}'") % { name: name }
     end
     @name = name
 

data/lib/puppet/file_serving/mount/file.rb

@@ -15,7 +15,7 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
   def complete_path(relative_path, node)
     full_path = path(node)
 
-    raise ArgumentError.new("Mounts without paths are not usable") unless full_path
+    raise ArgumentError.new(_("Mounts without paths are not usable")) unless full_path
 
     # If there's no relative path name, then we're serving the mount itself.
     return full_path unless relative_path
@@ -23,7 +23,7 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
     file = ::File.join(full_path, relative_path)
 
     if !(Puppet::FileSystem.exist?(file) or Puppet::FileSystem.symlink?(file))
-      Puppet.info("File does not exist or is not accessible: #{file}")
+      Puppet.info(_("File does not exist or is not accessible: %{file}") % { file: file })
       return nil
     end
 
@@ -52,8 +52,8 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
       # Mark that we're expandable.
       @expandable = true
     else
-      raise ArgumentError, "#{path} does not exist or is not a directory" unless FileTest.directory?(path)
-      raise ArgumentError, "#{path} is not readable" unless FileTest.readable?(path)
+      raise ArgumentError, _("%{path} does not exist or is not a directory") % { path: path } unless FileTest.directory?(path)
+      raise ArgumentError, _("%{path} is not readable") % { path: path } unless FileTest.readable?(path)
       @expandable = false
     end
     @path = path
@@ -67,7 +67,7 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
   # Verify our configuration is valid.  This should really check to
   # make sure at least someone will be allowed, but, eh.
   def validate
-    raise ArgumentError.new("Mounts without paths are not usable") if @path.nil?
+    raise ArgumentError.new(_("Mounts without paths are not usable")) if @path.nil?
   end
 
   private
@@ -89,7 +89,7 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
     if node
       map = clientmap(node)
     else
-      Puppet.notice "No client; expanding '#{path}' with local host"
+      Puppet.notice _("No client; expanding '%{path}' with local host") % { path: path }
       # Else, use the local information
       map = localmap
     end

data/lib/puppet/file_serving/mount/modules.rb

@@ -5,7 +5,7 @@ require 'puppet/file_serving/mount'
 class Puppet::FileServing::Mount::Modules < Puppet::FileServing::Mount
   # Return an instance of the appropriate class.
   def find(path, request)
-    raise "No module specified" if path.to_s.empty?
+    raise _("No module specified") if path.to_s.empty?
     module_name, relative_path = path.split("/", 2)
     return nil unless mod = request.environment.module(module_name)
 

data/lib/puppet/file_serving/terminus_selector.rb

@@ -26,7 +26,7 @@ module Puppet::FileServing::TerminusSelector
     when nil
       :file_server
     else
-      raise ArgumentError, "URI protocol '#{request.protocol}' is not currently supported for file serving"
+      raise ArgumentError, _("URI protocol '%{protocol}' is not currently supported for file serving") % { protocol: request.protocol }
     end
   end
 end

data/lib/puppet/file_system/file_impl.rb

@@ -14,7 +14,7 @@ class Puppet::FileSystem::FileImpl
     if path.respond_to?(:to_str)
       Pathname.new(path)
     else
-      raise ArgumentError, "FileSystem implementation expected Pathname, got: '#{path.class}'"
+      raise ArgumentError, _("FileSystem implementation expected Pathname, got: '%{klass}'") % { klass: path.class }
     end
   end
 
@@ -61,7 +61,7 @@ class Puppet::FileSystem::FileImpl
           timeout -= wait
           wait *= 2
           if timeout < 0
-            raise Timeout::Error, "Timeout waiting for exclusive lock on #{@path}"
+            raise Timeout::Error, _("Timeout waiting for exclusive lock on %{path}") % { path: @path }
           end
         end
       end

data/lib/puppet/file_system/memory_impl.rb

@@ -65,7 +65,7 @@ class Puppet::FileSystem::MemoryImpl
     if path.is_a?(Puppet::FileSystem::MemoryFile)
       path
     else
-      find(path) or raise ArgumentError, "Unable to find registered object for #{path.inspect}"
+      find(path) or raise ArgumentError, _("Unable to find registered object for %{path}") % { path: path.inspect }
     end
   end
 

data/lib/puppet/file_system/path_pattern.rb

@@ -48,12 +48,12 @@ module Puppet::FileSystem
     def validate
       @pathname.each_filename do |e|
         if e =~ TRAVERSAL
-          raise(InvalidPattern, "PathPatterns cannot be created with directory traversals.")
+          raise(InvalidPattern, _("PathPatterns cannot be created with directory traversals."))
         end
       end
       case @pathname.to_s
       when CURRENT_DRIVE_RELATIVE_WINDOWS
-        raise(InvalidPattern, "A PathPattern cannot be a Windows current drive relative path.")
+        raise(InvalidPattern, _("A PathPattern cannot be a Windows current drive relative path."))
       end
     end
 
@@ -61,7 +61,7 @@ module Puppet::FileSystem
       begin
         @pathname = Pathname.new(pattern.strip)
       rescue ArgumentError => error
-        raise InvalidPattern.new("PathPatterns cannot be created with a zero byte.", error)
+        raise InvalidPattern.new(_("PathPatterns cannot be created with a zero byte."), error)
       end
       validate
     end
@@ -76,9 +76,9 @@ module Puppet::FileSystem
       super
       case @pathname.to_s
       when ABSOLUTE_WINDOWS
-        raise(InvalidPattern, "A relative PathPattern cannot be prefixed with a drive.")
+        raise(InvalidPattern, _("A relative PathPattern cannot be prefixed with a drive."))
       when ABSOLUTE_UNIX
-        raise(InvalidPattern, "A relative PathPattern cannot be an absolute path.")
+        raise(InvalidPattern, _("A relative PathPattern cannot be an absolute path."))
       end
     end
   end
@@ -91,7 +91,7 @@ module Puppet::FileSystem
     def validate
       super
       if @pathname.to_s !~ ABSOLUTE_UNIX and @pathname.to_s !~ ABSOLUTE_WINDOWS
-        raise(InvalidPattern, "An absolute PathPattern cannot be a relative path.")
+        raise(InvalidPattern, _("An absolute PathPattern cannot be a relative path."))
       end
     end
   end

data/lib/puppet/file_system/uniquefile.rb

@@ -106,7 +106,7 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
         prefix = prefix_suffix[0]
         suffix = prefix_suffix[1]
       else
-        raise ArgumentError, "unexpected prefix_suffix: #{prefix_suffix.inspect}"
+        raise ArgumentError, _("unexpected prefix_suffix: %{value}") % { value: prefix_suffix.inspect }
     end
     t = Time.now.strftime("%Y%m%d")
     path = "#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"
@@ -136,7 +136,7 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
       n ||= 0
       n += 1
       retry if !max_try or n < max_try
-      raise "cannot generate temporary name using `#{basename}' under `#{tmpdir}'"
+      raise _("cannot generate temporary name using `%{basename}' under `%{tmpdir}'") % { basename: basename, tmpdir: tmpdir }
     end
     path
   end

data/lib/puppet/file_system/windows.rb

@@ -44,7 +44,7 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
     return 0 if dest_exists && dest_stat.ftype == 'directory'
 
     if dest_exists && dest_stat.ftype == 'file' && options[:force] != true
-      raise(Errno::EEXIST, "#{dest} already exists and the :force option was not specified")
+      raise(Errno::EEXIST, _("%{dest} already exists and the :force option was not specified") % { dest: dest })
     end
 
     if options[:noop] != true
@@ -118,12 +118,12 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
 
   def raise_if_symlinks_unsupported
     if ! Puppet.features.manages_symlinks?
-      msg = "This version of Windows does not support symlinks.  Windows Vista / 2008 or higher is required."
+      msg = _("This version of Windows does not support symlinks.  Windows Vista / 2008 or higher is required.")
       raise Puppet::Util::Windows::Error.new(msg)
     end
 
     if ! Puppet::Util::Windows::Process.process_privilege_symlink?
-      Puppet.warning "The current user does not have the necessary permission to manage symlinks."
+      Puppet.warning _("The current user does not have the necessary permission to manage symlinks.")
     end
   end
 

data/lib/puppet/forge.rb

@@ -64,7 +64,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
 
       if response.code == '200'
         result = JSON.parse(response.body)
-        uri = decode_uri(result['pagination']['next'])
+        uri = result['pagination']['next']
         matches.concat result['results']
       else
         raise ResponseError.new(:uri => URI.parse(@host).merge(uri), :response => response)
@@ -89,7 +89,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
   # @see SemanticPuppet::Dependency::Source#fetch
   def fetch(input)
     name = input.tr('/', '-')
-    uri = "/v3/releases?module=#{name}&sort_by=version"
+    uri = "/v3/releases?module=#{name}"
     if Puppet[:module_groups]
       uri += "&module_groups=#{Puppet[:module_groups].gsub('+', ' ')}"
     end
@@ -106,7 +106,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
       end
 
       releases.concat(process(response['results']))
-      uri = decode_uri(response['pagination']['next'])
+      uri = response['pagination']['next']
     end
 
     return releases
@@ -119,7 +119,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
   class ModuleRelease < SemanticPuppet::Dependency::ModuleRelease
     attr_reader :install_dir, :metadata
 
-    def initialize(source, data)
+    def initialize(source, data, strict_semver = true)
       @data = data
       @metadata = meta = data['metadata']
 
@@ -131,7 +131,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
         dependencies = meta['dependencies'].collect do |dep|
           begin
             Puppet::ModuleTool::Metadata.new.add_dependency(dep['name'], dep['version_requirement'], dep['repository'])
-            Puppet::ModuleTool.parse_module_dependency(release, dep)[0..1]
+            Puppet::ModuleTool.parse_module_dependency(release, dep, strict_semver)[0..1]
           rescue ArgumentError => e
             raise ArgumentError, "Malformed dependency: #{dep['name']}. Exception was: #{e}"
           end
@@ -197,7 +197,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
 
     def validate_checksum(file, checksum)
       if Digest::MD5.file(file.path).hexdigest != checksum
-        raise RuntimeError, "Downloaded release for #{name} did not match expected checksum"
+        raise RuntimeError, _("Downloaded release for %{name} did not match expected checksum") % { name: name }
       end
     end
 
@@ -205,7 +205,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
       begin
         Puppet::ModuleTool::Applications::Unpacker.unpack(file.path, destination)
       rescue Puppet::ExecutionFailure => e
-        raise RuntimeError, "Could not extract contents of module archive: #{e.message}"
+        raise RuntimeError, _("Could not extract contents of module archive: %{message}") % { message: e.message }
       end
     end
   end
@@ -218,17 +218,11 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
       begin
         ModuleRelease.new(self, release)
       rescue ArgumentError => e
-        Puppet.warning "Cannot consider release #{metadata['name']}-#{metadata['version']}: #{e}"
+        Puppet.warning _("Cannot consider release %{name}-%{version}: %{error}") % { name: metadata['name'], version: metadata['version'], error: e }
         false
       end
     end
 
     l.select { |r| r }
   end
-
-  def decode_uri(uri)
-    return if uri.nil?
-
-    URI.decode(uri.gsub('+', ' '))
-  end
 end

data/lib/puppet/forge/errors.rb

@@ -25,15 +25,15 @@ module Puppet::Forge::Errors
       @uri     = options[:uri]
       original = options[:original]
 
-      super("Unable to verify the SSL certificate at #{@uri}", original)
+      super(_("Unable to verify the SSL certificate at %{uri}") % { uri: @uri }, original)
     end
 
     # Return a multiline version of the error message
     #
     # @return [String] the multiline version of the error message
     def multiline
-      <<-EOS.chomp
-Could not connect via HTTPS to #{@uri}
+      _(<<-EOS).chomp % { uri: @uri }
+Could not connect via HTTPS to %{uri}
   Unable to verify the SSL certificate
     The certificate may not be signed by a valid CA
     The CA bundle included with OpenSSL may not be valid or up to date
@@ -51,7 +51,7 @@ Could not connect via HTTPS to #{@uri}
       original = options[:original]
       @detail  = original.message
 
-      message = "Unable to connect to the server at #{@uri}. Detail: #{@detail}."
+      message = _("Unable to connect to the server at %{uri}. Detail: %{detail}.") % { uri: @uri, detail: @detail }
       super(message, original)
     end
 
@@ -59,10 +59,10 @@ Could not connect via HTTPS to #{@uri}
     #
     # @return [String] the multiline version of the error message
     def multiline
-      <<-EOS.chomp
-Could not connect to #{@uri}
+      _(<<-EOS).chomp % { uri: @uri, detail: @detail }
+Could not connect to %{uri}
   There was a network communications problem
-    The error we caught said '#{@detail}'
+    The error we caught said '%{detail}'
     Check your network connection and try again
       EOS
     end
@@ -89,7 +89,7 @@ Could not connect to #{@uri}
       rescue JSON::ParserError
       end
 
-      message = "Request to Puppet Forge failed. Detail: "
+      message = _("Request to Puppet Forge failed. Detail: ")
       message << @message << " / " if @message
       message << @response << "."
       super(message, original)
@@ -99,12 +99,12 @@ Could not connect to #{@uri}
     #
     # @return [String] the multiline version of the error message
     def multiline
-      message = <<-EOS.chomp
+      message = _(<<-EOS).chomp % { uri: @uri, response: @response }
 Request to Puppet Forge failed.
-  The server being queried was #{@uri}
-  The HTTP response we received was '#{@response}'
+  The server being queried was %{uri}
+  The HTTP response we received was '%{response}'
       EOS
-      message << "\n  The message we received said '#{@message}'" if @message
+      message << _("\n  The message we received said '%{message}'") % { message: @message } if @message
       message
     end
   end

data/lib/puppet/forge/repository.rb

@@ -44,8 +44,8 @@ class Puppet::Forge
 
     # Return a Net::HTTPResponse read for this +path+.
     def make_http_request(path, io = nil)
+      Puppet.debug "HTTP GET #{@host}#{path}"
       request = get_request_object(@uri.path.chomp('/')+path)
-      Puppet.debug "HTTP GET #{@host}#{request.path}"
       return read_response(request, io)
     end
 

data/lib/puppet/functions.rb

@@ -205,7 +205,7 @@ module Puppet::Functions
   # @api public
   def self.create_loaded_function(func_name, loader, function_base = Function, &block)
     if function_base.ancestors.none? { |s| s == Puppet::Pops::Functions::Function }
-      raise ArgumentError, "Functions must be based on Puppet::Pops::Functions::Function. Got #{function_base}"
+      raise ArgumentError, _("Functions must be based on Puppet::Pops::Functions::Function. Got %{function_base}") % { function_base: function_base }
     end
 
     func_name = func_name.to_s
@@ -265,7 +265,7 @@ module Puppet::Functions
   # @api private
   def self.default_dispatcher(the_class, func_name)
     unless the_class.method_defined?(func_name)
-      raise ArgumentError, "Function Creation Error, cannot create a default dispatcher for function '#{func_name}', no method with this name found"
+      raise ArgumentError, _("Function Creation Error, cannot create a default dispatcher for function '%{func_name}', no method with this name found") % { func_name: func_name }
     end
     any_signature(*min_max_param(the_class.instance_method(func_name)))
   end
@@ -343,7 +343,7 @@ module Puppet::Functions
     #
     def self.local_types(&block)
       if loader.nil?
-        raise ArgumentError, "No loader present. Call create_loaded_function(:myname, loader,...), instead of 'create_function' if running tests"
+        raise ArgumentError, _("No loader present. Call create_loaded_function(:myname, loader,...), instead of 'create_function' if running tests")
       end
       aliases = LocalTypeAliasesBuilder.new(loader, name)
       aliases.instance_eval(&block)
@@ -407,7 +407,7 @@ module Puppet::Functions
     # @api public
     def param(type, name)
       internal_param(type, name)
-      raise ArgumentError, 'A required parameter cannot be added after an optional parameter' if @min != @max
+      raise ArgumentError, _('A required parameter cannot be added after an optional parameter') if @min != @max
       @min += 1
       @max += 1
     end
@@ -456,7 +456,7 @@ module Puppet::Functions
     # @api public
     def required_repeated_param(type, name)
       internal_param(type, name, true)
-      raise ArgumentError, 'A required repeated parameter cannot be added after an optional parameter' if @min != @max
+      raise ArgumentError, _('A required repeated parameter cannot be added after an optional parameter') if @min != @max
       @min += 1
       @max = :default
     end
@@ -478,22 +478,22 @@ module Puppet::Functions
         type_string, name = type_and_name
         type = @type_parser.parse(type_string, loader)
       else
-        raise ArgumentError, "block_param accepts max 2 arguments (type, name), got #{type_and_name.size}."
+        raise ArgumentError, _("block_param accepts max 2 arguments (type, name), got %{size}.") % { size: type_and_name.size }
       end
 
       unless Puppet::Pops::Types::TypeCalculator.is_kind_of_callable?(type, false)
-        raise ArgumentError, "Expected PCallableType or PVariantType thereof, got #{type.class}"
+        raise ArgumentError, _("Expected PCallableType or PVariantType thereof, got %{type_class}") % { type_class: type.class }
       end
 
       unless name.is_a?(Symbol)
-        raise ArgumentError, "Expected block_param name to be a Symbol, got #{name.class}"
+        raise ArgumentError, _("Expected block_param name to be a Symbol, got %{name_class}") % { name_class: name.class }
       end
 
       if @block_type.nil?
         @block_type = type
         @block_name = name
       else
-        raise ArgumentError, 'Attempt to redefine block'
+        raise ArgumentError, _('Attempt to redefine block')
       end
     end
     alias required_block_param block_param
@@ -514,7 +514,7 @@ module Puppet::Functions
     #
     # @api public
     def return_type(type)
-      raise ArgumentError, "Argument to 'return_type' must be a String reference to a Puppet Data Type. Got #{type.class}" unless type.is_a?(String)
+      raise ArgumentError, _("Argument to 'return_type' must be a String reference to a Puppet Data Type. Got %{type_class}") % { type_class: type.class } unless type.is_a?(String)
       @return_type = type
     end
 
@@ -522,11 +522,11 @@ module Puppet::Functions
 
     # @api private
     def internal_param(type, name, repeat = false)
-      raise ArgumentError, 'Parameters cannot be added after a block parameter' unless @block_type.nil?
-      raise ArgumentError, 'Parameters cannot be added after a repeated parameter' if @max == :default
+      raise ArgumentError, _('Parameters cannot be added after a block parameter') unless @block_type.nil?
+      raise ArgumentError, _('Parameters cannot be added after a repeated parameter') if @max == :default
 
       if name.is_a?(String)
-        raise ArgumentError, "Parameter name argument must be a Symbol. Got #{name.class}"
+        raise ArgumentError, _("Parameter name argument must be a Symbol. Got %{name_class}") % { name_class: name.class }
       end
 
       if type.is_a?(String)
@@ -539,7 +539,7 @@ module Puppet::Functions
           @weaving << @names.size()-1
         end
       else
-        raise ArgumentError, "Parameter 'type' must be a String reference to a Puppet Data Type. Got #{type.class}"
+        raise ArgumentError, _("Parameter 'type' must be a String reference to a Puppet Data Type. Got %{type_class}") % { type_class: type.class }
       end
     end
 
@@ -604,7 +604,7 @@ module Puppet::Functions
     def type(assignment_string)
       result = parser.parse_string("type #{assignment_string}", nil) # no file source :-(
       unless result.body.kind_of?(Puppet::Pops::Model::TypeAlias)
-        raise ArgumentError, "Expected a type alias assignment on the form 'AliasType = T', got '#{assignment_string}'"
+        raise ArgumentError, _("Expected a type alias assignment on the form 'AliasType = T', got '%{assignment_string}'") % { assignment_string: assignment_string }
       end
       @local_types << result.body
     end
@@ -649,34 +649,6 @@ module Puppet::Functions
       InternalDispatchBuilder.new(dispatcher, Puppet::Pops::Types::TypeParser.singleton, Puppet::Pops::Types::PCallableType::DEFAULT, loader)
     end
 
-    # Defines class level injected attribute with reader method
-    #
-    # @api private
-    def self.attr_injected(type, attribute_name, injection_name = nil)
-      define_method(attribute_name) do
-        ivar = :"@#{attribute_name.to_s}"
-        unless instance_variable_defined?(ivar)
-          injector = Puppet.lookup(:injector)
-          instance_variable_set(ivar, injector.lookup(closure_scope, type, injection_name))
-        end
-        instance_variable_get(ivar)
-      end
-    end
-
-    # Defines class level injected producer attribute with reader method
-    #
-    # @api private
-    def self.attr_injected_producer(type, attribute_name, injection_name = nil)
-      define_method(attribute_name) do
-        ivar = :"@#{attribute_name.to_s}"
-        unless instance_variable_defined?(ivar)
-          injector = Puppet.lookup(:injector)
-          instance_variable_set(ivar, injector.lookup_producer(closure_scope, type, injection_name))
-        end
-        instance_variable_get(ivar)
-      end
-    end
-
     # Allows the implementation of a function to call other functions by name and pass the caller
     # scope. The callable functions are those visible to the same loader that loaded this function
     # (the calling function).
@@ -687,8 +659,8 @@ module Puppet::Functions
     # @return [Object] The result returned by the called function
     #
     # @api public
-    def call_function_with_scope(scope, function_name, *args)
-      internal_call_function(scope, function_name, args)
+    def call_function_with_scope(scope, function_name, *args, &block)
+      internal_call_function(scope, function_name, args, &block)
     end
   end