puppet 7.6.1 → 7.7.0

data/lib/puppet/file_bucket/file.rb

@@ -1,6 +1,6 @@
-require 'puppet/file_bucket'
-require 'puppet/indirector'
-require 'puppet/util/checksums'
+require_relative '../../puppet/file_bucket'
+require_relative '../../puppet/indirector'
+require_relative '../../puppet/util/checksums'
 require 'digest/md5'
 require 'stringio'
 

data/lib/puppet/file_serving/base.rb

@@ -1,5 +1,5 @@
-require 'puppet/file_serving'
-require 'puppet/util'
+require_relative '../../puppet/file_serving'
+require_relative '../../puppet/util'
 
 # The base class for Content and Metadata; provides common
 # functionality like the behaviour around links.

data/lib/puppet/file_serving/configuration.rb

@@ -1,15 +1,15 @@
-require 'puppet'
-require 'puppet/file_serving'
-require 'puppet/file_serving/mount'
-require 'puppet/file_serving/mount/file'
-require 'puppet/file_serving/mount/modules'
-require 'puppet/file_serving/mount/plugins'
-require 'puppet/file_serving/mount/locales'
-require 'puppet/file_serving/mount/pluginfacts'
-require 'puppet/file_serving/mount/tasks'
+require_relative '../../puppet'
+require_relative '../../puppet/file_serving'
+require_relative '../../puppet/file_serving/mount'
+require_relative '../../puppet/file_serving/mount/file'
+require_relative '../../puppet/file_serving/mount/modules'
+require_relative '../../puppet/file_serving/mount/plugins'
+require_relative '../../puppet/file_serving/mount/locales'
+require_relative '../../puppet/file_serving/mount/pluginfacts'
+require_relative '../../puppet/file_serving/mount/tasks'
 
 class Puppet::FileServing::Configuration
-  require 'puppet/file_serving/configuration/parser'
+  require_relative 'configuration/parser'
 
   def self.configuration
     @configuration ||= new

data/lib/puppet/file_serving/configuration/parser.rb

@@ -1,5 +1,5 @@
-require 'puppet/file_serving/configuration'
-require 'puppet/util/watched_file'
+require_relative '../../../puppet/file_serving/configuration'
+require_relative '../../../puppet/util/watched_file'
 
 class Puppet::FileServing::Configuration::Parser
   Mount = Puppet::FileServing::Mount

data/lib/puppet/file_serving/content.rb

@@ -1,6 +1,6 @@
-require 'puppet/indirector'
-require 'puppet/file_serving'
-require 'puppet/file_serving/base'
+require_relative '../../puppet/indirector'
+require_relative '../../puppet/file_serving'
+require_relative '../../puppet/file_serving/base'
 
 # A class that handles retrieving file contents.
 # It only reads the file when its content is specifically

data/lib/puppet/file_serving/fileset.rb

@@ -1,11 +1,11 @@
 require 'find'
-require 'puppet/file_serving'
-require 'puppet/file_serving/metadata'
+require_relative '../../puppet/file_serving'
+require_relative '../../puppet/file_serving/metadata'
 
 # Operate recursively on a path, returning a set of file paths.
 class Puppet::FileServing::Fileset
   attr_reader :path, :ignore, :links
-  attr_accessor :recurse, :recurselimit, :checksum_type
+  attr_accessor :recurse, :recurselimit, :max_files, :checksum_type
 
   # Produce a hash of files, with merged so that earlier files
   # with the same postfix win.  E.g., /dir1/subfile beats /dir2/subfile.
@@ -40,6 +40,7 @@ class Puppet::FileServing::Fileset
     self.links = :manage
     @recurse = false
     @recurselimit = :infinite
+    @max_files = 0
 
     if options.is_a?(Puppet::Indirector::Request)
       initialize_from_request(options)
@@ -58,6 +59,17 @@ class Puppet::FileServing::Fileset
   # level deep, which Find doesn't do.
   def files
     files = perform_recursion
+    soft_max_files = 1000
+
+    # munged_max_files is needed since puppet http handler is keeping negative numbers as strings
+    # https://github.com/puppetlabs/puppet/blob/main/lib/puppet/network/http/handler.rb#L196-L197
+    munged_max_files = max_files == '-1' ? -1 : max_files
+
+    if munged_max_files > 0 && files.size > munged_max_files
+      raise Puppet::Error.new _("The directory '%{path}' contains %{entries} entries, which exceeds the limit of %{munged_max_files} specified by the max_files parameter for this resource. The limit may be increased, but be aware that large number of file resources can result in excessive resource consumption and degraded performance. Consider using an alternate method to manage large directory trees") % { path: path, entries: files.size, munged_max_files: munged_max_files }
+    elsif munged_max_files == 0 && files.size > soft_max_files
+      Puppet.warning _("The directory '%{path}' contains %{entries} entries, which exceeds the default soft limit %{soft_max_files} and may cause excessive resource consumption and degraded performance. To remove this warning set a value for `max_files` parameter or consider using an alternate method to manage large directory trees") % { path: path, entries: files.size, soft_max_files: soft_max_files }
+    end
 
     # Now strip off the leading path, so each file becomes relative, and remove
     # any slashes that might end up at the beginning of the path.
@@ -96,7 +108,7 @@ class Puppet::FileServing::Fileset
   end
 
   def initialize_from_request(request)
-    [:links, :ignore, :recurse, :recurselimit, :checksum_type].each do |param|
+    [:links, :ignore, :recurse, :recurselimit, :max_files, :checksum_type].each do |param|
       if request.options.include?(param) # use 'include?' so the values can be false
         value = request.options[param]
       elsif request.options.include?(param.to_s)

data/lib/puppet/file_serving/http_metadata.rb

@@ -1,4 +1,4 @@
-require 'puppet/file_serving/metadata'
+require_relative '../../puppet/file_serving/metadata'
 
 # Simplified metadata representation, suitable for the information
 # that is available from HTTP headers.

data/lib/puppet/file_serving/metadata.rb

@@ -1,8 +1,8 @@
-require 'puppet'
-require 'puppet/indirector'
-require 'puppet/file_serving'
-require 'puppet/file_serving/base'
-require 'puppet/util/checksums'
+require_relative '../../puppet'
+require_relative '../../puppet/indirector'
+require_relative '../../puppet/file_serving'
+require_relative '../../puppet/file_serving/base'
+require_relative '../../puppet/util/checksums'
 require 'uri'
 
 # A class that handles retrieving file metadata.
@@ -66,7 +66,7 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
 
   class WindowsStat < MetaStat
     if Puppet::Util::Platform.windows?
-      require 'puppet/util/windows/security'
+      require_relative '../../puppet/util/windows/security'
     end
 
     def initialize(stat, path, source_permissions)

data/lib/puppet/file_serving/mount.rb

@@ -1,7 +1,7 @@
-require 'puppet/util/logging'
-require 'puppet/file_serving'
-require 'puppet/file_serving/metadata'
-require 'puppet/file_serving/content'
+require_relative '../../puppet/util/logging'
+require_relative '../../puppet/file_serving'
+require_relative '../../puppet/file_serving/metadata'
+require_relative '../../puppet/file_serving/content'
 
 # Broker access to the filesystem, converting local URIs into metadata
 # or content objects.

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

@@ -1,4 +1,4 @@
-require 'puppet/file_serving/mount'
+require_relative '../../../puppet/file_serving/mount'
 
 class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
   def self.localmap

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

@@ -1,4 +1,4 @@
-require 'puppet/file_serving/mount'
+require_relative '../../../puppet/file_serving/mount'
 
 # Find files in the modules' locales directories.
 # This is a very strange mount because it merges

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

@@ -1,4 +1,4 @@
-require 'puppet/file_serving/mount'
+require_relative '../../../puppet/file_serving/mount'
 
 # This is the modules-specific mount: it knows how to search through
 # modules for files.  Yay.

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

@@ -1,4 +1,4 @@
-require 'puppet/file_serving/mount'
+require_relative '../../../puppet/file_serving/mount'
 
 # Find files in the modules' pluginfacts directories.
 # This is a very strange mount because it merges

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

@@ -1,4 +1,4 @@
-require 'puppet/file_serving/mount'
+require_relative '../../../puppet/file_serving/mount'
 
 # Find files in the modules' plugins directories.
 # This is a very strange mount because it merges

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

@@ -1,4 +1,4 @@
-require 'puppet/file_serving/mount'
+require_relative '../../../puppet/file_serving/mount'
 
 class Puppet::FileServing::Mount::Tasks < Puppet::FileServing::Mount
   def find(path, request)

data/lib/puppet/file_serving/terminus_helper.rb

@@ -1,5 +1,5 @@
-require 'puppet/file_serving'
-require 'puppet/file_serving/fileset'
+require_relative '../../puppet/file_serving'
+require_relative '../../puppet/file_serving/fileset'
 
 # Define some common methods for FileServing termini.
 

data/lib/puppet/file_serving/terminus_selector.rb

@@ -1,4 +1,4 @@
-require 'puppet/file_serving'
+require_relative '../../puppet/file_serving'
 
 # This module is used to pick the appropriate terminus
 # in file-serving indirections.  This is necessary because

data/lib/puppet/file_system.rb

@@ -1,20 +1,20 @@
 module Puppet::FileSystem
-  require 'puppet/util'
-  require 'puppet/file_system/path_pattern'
-  require 'puppet/file_system/file_impl'
-  require 'puppet/file_system/memory_file'
-  require 'puppet/file_system/memory_impl'
-  require 'puppet/file_system/uniquefile'
+  require_relative '../puppet/util'
+  require_relative 'file_system/path_pattern'
+  require_relative 'file_system/file_impl'
+  require_relative 'file_system/memory_file'
+  require_relative 'file_system/memory_impl'
+  require_relative 'file_system/uniquefile'
 
   # create instance of the file system implementation to use for the current platform
   @impl = if Puppet::Util::Platform.windows?
-           require 'puppet/file_system/windows'
+           require_relative 'file_system/windows'
            Puppet::FileSystem::Windows
           elsif Puppet::Util::Platform.jruby?
-            require 'puppet/file_system/jruby'
+            require_relative 'file_system/jruby'
             Puppet::FileSystem::JRuby
           else
-            require 'puppet/file_system/posix'
+            require_relative 'file_system/posix'
             Puppet::FileSystem::Posix
           end.new()
 

data/lib/puppet/file_system/jruby.rb

@@ -1,4 +1,4 @@
-require 'puppet/file_system/posix'
+require_relative '../../puppet/file_system/posix'
 
 class Puppet::FileSystem::JRuby < Puppet::FileSystem::Posix
   def unlink(*paths)

data/lib/puppet/file_system/path_pattern.rb

@@ -1,5 +1,5 @@
 require 'pathname'
-require 'puppet/error'
+require_relative '../../puppet/error'
 
 module Puppet::FileSystem
   class PathPattern

data/lib/puppet/file_system/uniquefile.rb

@@ -1,4 +1,4 @@
-require 'puppet/file_system'
+require_relative '../../puppet/file_system'
 require 'delegate'
 require 'tmpdir'
 

data/lib/puppet/file_system/windows.rb

@@ -1,5 +1,5 @@
-require 'puppet/file_system/posix'
-require 'puppet/util/windows'
+require_relative '../../puppet/file_system/posix'
+require_relative '../../puppet/util/windows'
 
 class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
   FULL_CONTROL = Puppet::Util::Windows::File::FILE_ALL_ACCESS

data/lib/puppet/forge.rb

@@ -1,17 +1,17 @@
-require 'puppet/vendor'
+require_relative '../puppet/vendor'
 Puppet::Vendor.load_vendored
 
 require 'net/http'
 require 'tempfile'
 require 'uri'
 require 'pathname'
-require 'puppet/util/json'
+require_relative '../puppet/util/json'
 require 'semantic_puppet'
 
 class Puppet::Forge < SemanticPuppet::Dependency::Source
-  require 'puppet/forge/cache'
-  require 'puppet/forge/repository'
-  require 'puppet/forge/errors'
+  require_relative 'forge/cache'
+  require_relative 'forge/repository'
+  require_relative 'forge/errors'
 
   include Puppet::Forge::Errors
 

data/lib/puppet/forge/cache.rb

@@ -1,6 +1,6 @@
 require 'uri'
 
-require 'puppet/forge'
+require_relative '../../puppet/forge'
 
 class Puppet::Forge
   # = Cache

data/lib/puppet/forge/errors.rb

@@ -1,6 +1,6 @@
-require 'puppet/util/json'
-require 'puppet/error'
-require 'puppet/forge'
+require_relative '../../puppet/util/json'
+require_relative '../../puppet/error'
+require_relative '../../puppet/forge'
 
 # Puppet::Forge specific exceptions
 module Puppet::Forge::Errors

data/lib/puppet/forge/repository.rb

@@ -1,9 +1,9 @@
-require 'puppet/ssl/openssl_loader'
+require_relative '../../puppet/ssl/openssl_loader'
 require 'digest/sha1'
 require 'uri'
-require 'puppet/forge'
-require 'puppet/forge/errors'
-require 'puppet/network/http'
+require_relative '../../puppet/forge'
+require_relative '../../puppet/forge/errors'
+require_relative '../../puppet/network/http'
 
 class Puppet::Forge
   # = Repository

data/lib/puppet/functions/all.rb

@@ -51,7 +51,7 @@
 # notice $data.all |$key, $value| { $value % 10 == 0  and $key =~ /^abc/ }
 # ```
 #
-# Would notice true.
+# Would notice `true`.
 #
 # For an general examples that demonstrates iteration, see the Puppet
 # [iteration](https://puppet.com/docs/puppet/latest/lang_iteration.html)

data/lib/puppet/functions/camelcase.rb

@@ -3,7 +3,7 @@
 # This function is compatible with the stdlib function with the same name.
 #
 # The function does the following:
-# * For a `String` the conversion replaces all combinations of *_<char>* with an upcased version of the
+# * For a `String` the conversion replaces all combinations of `*_<char>*` with an upcased version of the
 #   character following the _.  This is done using Ruby system locale which handles some, but not all
 #   special international up-casing rules (for example German double-s ß is upcased to "Ss").
 # * For an `Iterable[Variant[String, Numeric]]` (for example an `Array`) each value is capitalized and the conversion is not recursive.

data/lib/puppet/functions/capitalize.rb

@@ -18,14 +18,14 @@
 # 'hello'.capitalize()
 # upcase('hello')
 # ```
-# Would both result in "Hello"
+# Would both result in `"Hello"`
 #
 # @example Capitalizing strings in an Array
 # ```puppet
 # ['abc', 'bcd'].capitalize()
 # capitalize(['abc', 'bcd'])
 # ```
-# Would both result in ['Abc', 'Bcd']
+# Would both result in `['Abc', 'Bcd']`
 #
 Puppet::Functions.create_function(:capitalize) do
 

data/lib/puppet/functions/downcase.rb

@@ -22,14 +22,14 @@
 # 'HELLO'.downcase()
 # downcase('HEllO')
 # ```
-# Would both result in "hello"
+# Would both result in `"hello"`
 #
 # @example Converting an Array to lower case
 # ```puppet
 # ['A', 'B'].downcase()
 # downcase(['A', 'B'])
 # ```
-# Would both result in ['a', 'b']
+# Would both result in `['a', 'b']`
 #
 # @example Converting a Hash to lower case
 # ```puppet

data/lib/puppet/functions/get.rb

@@ -23,20 +23,20 @@
 # #get($facts, 'os.family')
 # $facts.get('os.family')
 # ```
-# Would both result in the value of $facts['os']['family']
+# Would both result in the value of `$facts['os']['family']`
 #
 # @example Getting the value from an expression
 # ```puppet
 # get([1,2,[{'name' =>'waldo'}]], '2.0.name')
 # ```
-# Would result in 'waldo'
+# Would result in `'waldo'`
 #
 # @example Using a default value
 # ```puppet
 # get([1,2,[{'name' =>'waldo'}]], '2.1.name', 'not waldo')
 #
 # ```
-# Would result in 'not waldo'
+# Would result in `'not waldo'`
 #
 # @example Quoting a key with period
 # ```puppet
@@ -128,8 +128,8 @@ Puppet::Functions.create_function(:get, Puppet::Functions::InternalFunction) do
 
     # Note: split_key always processes the initial segment as a string even if it could be an integer.
     # This since it is designed for lookup keys. For a numeric first segment
-    # like '0.1' the wanted result is [0,1], not ["0", 1]. The workaround here is to
-    # prefix the navigation with "x." thus giving split_key a first segment that is a string.
+    # like '0.1' the wanted result is `[0,1]`, not `["0", 1]`. The workaround here is to
+    # prefix the navigation with `"x."` thus giving split_key a first segment that is a string.
     # The fake segment is then dropped.
     segments = split_key("x." + navigation) {|err| _("Syntax error in dotted-navigation string")}
     segments.shift

data/lib/puppet/functions/group_by.rb

@@ -4,14 +4,22 @@
 # and the values are arrays of elements in the collection that correspond to the key.
 Puppet::Functions.create_function(:group_by) do
   # @param collection A collection of things to group.
-  # @example Group array of strings by length, results in e.g. { 1 => [a, b], 2 => [ab] }
+  # @example Group array of strings by length, results in e.g. `{ 1 => [a, b], 2 => [ab] }`
+  #   ```puppet
   #   [a, b, ab].group_by |$s| { $s.length }
-  # @example Group array of strings by length and index, results in e.g. {1 => ['a'], 2 => ['b', 'ab']}
+  #   ```
+  # @example Group array of strings by length and index, results in e.g. `{1 => ['a'], 2 => ['b', 'ab']}`
+  #   ```puppet
   #   [a, b, ab].group_by |$i, $s| { $i%2 + $s.length }
-  # @example Group hash iterating by key-value pair, results in e.g. { 2 => [['a', [1, 2]]], 1 => [['b', [1]]] }
+  #   ```
+  # @example Group hash iterating by key-value pair, results in e.g. `{ 2 => [['a', [1, 2]]], 1 => [['b', [1]]] }`
+  #   ```puppet
   #   { a => [1, 2], b => [1] }.group_by |$kv| { $kv[1].length }
-  # @example Group hash iterating by key and value, results in e.g. { 2 => [['a', [1, 2]]], 1 => [['b', [1]]] }
-  #   { a => [1, 2], b => [1] }.group_by |$k, $v| { $v.length }
+  #   ```
+  # @example Group hash iterating by key and value, results in e.g. `{ 2 => [['a', [1, 2]]], 1 => [['b', [1]]] }`
+  #   ```puppet
+  #    { a => [1, 2], b => [1] }.group_by |$k, $v| { $v.length }
+  #   ```
   dispatch :group_by_1 do
     required_param 'Collection', :collection
     block_param 'Callable[1,1]', :block