puppet 8.6.0-universal-darwin → 8.7.0-universal-darwin

data/ext/project_data.yaml

@@ -1,53 +1,8 @@
 ---
 project: 'puppet'
-author: 'Puppet Labs'
-email: 'info@puppetlabs.com'
-homepage: 'https://github.com/puppetlabs/puppet'
-summary: 'Puppet, an automated configuration management tool'
-description: 'Puppet, an automated configuration management tool'
-version_file: 'lib/puppet/version.rb'
-# files and gem_files are space separated lists
-files: '[A-Z]* install.rb bin lib conf man examples ext tasks locales'
-# Make sure these gem requirements are in sync with the gemspec and Gemfile
-gem_files: '[A-Z]* install.rb bin lib conf man examples ext tasks locales'
-gem_test_files:
-gem_executables: 'puppet'
-gem_default_executables: 'puppet'
-gem_license: 'Apache-2.0'
-gem_forge_project: 'puppet'
-gem_required_ruby_version: '>= 3.1.0'
-gem_required_rubygems_version: '> 1.3.1'
-gem_runtime_dependencies:
-  facter: ['>= 4.3.0', '< 5']
-  semantic_puppet: '~> 1.0'
-  fast_gettext: ['>= 2.1', '< 3']
-  locale: '~> 2.1'
-  multi_json: '~> 1.13'
-  puppet-resource_api: '~>1.5'
-  concurrent-ruby: "~> 1.0"
-  deep_merge: '~> 1.0'
-  scanf: '~> 1.0'
 gem_rdoc_options:
   - --title
   - "Puppet - Configuration Management"
   - --main
   - README.md
   - --line-numbers
-gem_platform_dependencies:
-  universal-darwin:
-    gem_runtime_dependencies:
-      CFPropertyList: '~> 2.2'
-  x86-mingw32:
-    gem_runtime_dependencies:
-      ffi: '1.15.5'
-      minitar: '~> 0.9'
-  x64-mingw32:
-    gem_runtime_dependencies:
-      ffi: '1.15.5'
-      minitar: '~> 0.9'
-bundle_platforms:
-  universal-darwin: all
-  x86-mingw32: mingw
-  x64-mingw32: x64_mingw
-pre_tasks:
-  'package:apple': 'cfpropertylist'

data/lib/puppet/daemon.rb

@@ -165,6 +165,7 @@ class Puppet::Daemon
     reparse_run = Puppet::Scheduler.create_job(Puppet[:filetimeout]) do
       Puppet.settings.reparse_config_files
       agent_run.run_interval = Puppet[:runinterval]
+      agent_run.splay_limit = Puppet[:splaylimit] if Puppet[:splay]
       if Puppet[:filetimeout] == 0
         reparse_run.disable
       else

data/lib/puppet/pops/loader/static_loader.rb

@@ -46,9 +46,9 @@ class StaticLoader < Loader
 
   def discover(type, error_collector = nil, name_authority = Pcore::RUNTIME_NAME_AUTHORITY)
     # Static loader only contains runtime types
-    return EMPTY_ARRAY unless type == :type && name_authority == name_authority = Pcore::RUNTIME_NAME_AUTHORITY
+    return EMPTY_ARRAY unless type == :type && name_authority == Pcore::RUNTIME_NAME_AUTHORITY
 
-    typed_names = type == :type && name_authority == Pcore::RUNTIME_NAME_AUTHORITY ? @loaded.keys : EMPTY_ARRAY
+    typed_names = @loaded.keys
     block_given? ? typed_names.select { |tn| yield(tn) } : typed_names
   end
 

data/lib/puppet/pops/lookup/module_data_provider.rb

@@ -47,16 +47,16 @@ class ModuleDataProvider < ConfiguredDataProvider
   def validate_data_hash(data_hash)
     super
     module_prefix = "#{module_name}::"
-    data_hash.each_key.reduce(data_hash) do |memo, k|
-      next memo if k == LOOKUP_OPTIONS || k.start_with?(module_prefix)
-
-      msg = "#{yield} must use keys qualified with the name of the module"
-      memo = memo.clone if memo.equal?(data_hash)
-      memo.delete(k)
-      Puppet.warning("Module '#{module_name}': #{msg}")
-      memo
+    data_hash_to_return = {}
+    data_hash.keys.each do |k|
+      if k == LOOKUP_OPTIONS || k.start_with?(module_prefix)
+        data_hash_to_return[k] = data_hash[k]
+      else
+        msg = "#{yield} must use keys qualified with the name of the module"
+        Puppet.warning("Module '#{module_name}': #{msg}; got #{k}")
+      end
     end
-    data_hash
+    data_hash_to_return
   end
 
   protected

data/lib/puppet/provider/aix_object.rb

@@ -131,7 +131,7 @@ class Puppet::Provider::AixObject < Puppet::Provider
 
       # AIX will do the right validation to ensure numeric attributes
       # can't be set to non-numeric values, so no need for the extra clutter.
-      info[:attribute_to_property] = lambda do |value|
+      info[:attribute_to_property] = lambda do |value| # rubocop:disable Style/SymbolProc
         value.to_i
       end
 

data/lib/puppet/provider/group/groupadd.rb

@@ -17,11 +17,20 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
     value.is_a? Integer
   end
 
-  optional_commands :localadd => "lgroupadd", :localdelete => "lgroupdel", :localmodify => "lgroupmod"
-
-  has_feature :manages_local_users_and_groups, :manages_members if Puppet.features.libuser?
-
-  options :members, :flag => '-M', :method => :mem
+  optional_commands :localadd => "lgroupadd", :localdelete => "lgroupdel", :localmodify => "lgroupmod", :purgemember => "usermod"
+
+  has_feature :manages_local_users_and_groups if Puppet.features.libuser?
+  has_feature :manages_members if Puppet.features.libuser? ||
+                                  (Puppet.runtime[:facter].value('os.name') == "Fedora" &&
+                                  Puppet.runtime[:facter].value('os.release.major').to_i >= 40)
+
+  # Libuser's modify command 'lgroupmod' requires '-M' flag for member additions.
+  # 'groupmod' command requires the '-aU' flags for it.
+  if Puppet.features.libuser?
+    options :members, :flag => '-M', :method => :mem
+  else
+    options :members, :flag => '-aU', :method => :mem
+  end
 
   def exists?
     return !!localgid if @resource.forcelocal?
@@ -63,7 +72,8 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
   end
 
   def addcmd
-    if @resource.forcelocal?
+    # The localadd command (lgroupadd) must only be called when libuser is supported.
+    if Puppet.features.libuser? && @resource.forcelocal?
       cmd = [command(:localadd)]
       @custom_environment = Puppet::Util::Libuser.getenv
     else
@@ -91,7 +101,8 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
   end
 
   def modifycmd(param, value)
-    if @resource.forcelocal? || @resource[:members]
+    # The localmodify command (lgroupmod) must only be called when libuser is supported.
+    if Puppet.features.libuser? && (@resource.forcelocal? || @resource[:members])
       cmd = [command(:localmodify)]
       @custom_environment = Puppet::Util::Libuser.getenv
     else
@@ -114,7 +125,8 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
   end
 
   def deletecmd
-    if @resource.forcelocal?
+    # The localdelete command (lgroupdel) must only be called when libuser is supported.
+    if Puppet.features.libuser? && @resource.forcelocal?
       @custom_environment = Puppet::Util::Libuser.getenv
       [command(:localdelete), @resource[:name]]
     else
@@ -133,7 +145,16 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
   end
 
   def purge_members
-    localmodify('-m', members_to_s(members), @resource.name)
+    # The groupadd provider doesn't have the ability currently to remove members from a group, libuser does.
+    # Use libuser's lgroupmod command to achieve purging members if libuser is supported.
+    # Otherwise use the 'usermod' command.
+    if Puppet.features.libuser?
+      localmodify('-m', members_to_s(members), @resource.name)
+    else
+      members.each do |member|
+        purgemember('-rG', @resource.name, member)
+      end
+    end
   end
 
   private

data/lib/puppet/provider/package/xbps.rb

@@ -0,0 +1,127 @@
+# frozen_string_literal: true
+
+require_relative "../../../puppet/provider/package"
+
+Puppet::Type.type(:package).provide :xbps, :parent => Puppet::Provider::Package do
+  desc "Support for the Package Manager Utility (xbps) used in VoidLinux.
+
+  This provider supports the `install_options` attribute, which allows command-line flags to be passed to xbps-install.
+  These options should be specified as an array where each element is either a string or a hash."
+
+  commands :xbps_install => "/usr/bin/xbps-install"
+  commands :xbps_remove => "/usr/bin/xbps-remove"
+  commands :xbps_query => "/usr/bin/xbps-query"
+  commands :xbps_pkgdb => "/usr/bin/xbps-pkgdb"
+
+  confine 'os.name' => :void
+  defaultfor 'os.name' => :void
+  has_feature :install_options, :uninstall_options, :upgradeable, :holdable, :virtual_packages
+
+  def self.defaultto_allow_virtual
+    false
+  end
+
+  # Fetch the list of packages that are currently installed on the system.
+  def self.instances
+    packages = []
+    execpipe([command(:xbps_query), "-l"]) do |pipe|
+      # xbps-query -l output is 'ii package-name-version     desc'
+      regex = /^\S+\s(\S+)-(\S+)\s+\S+/
+      pipe.each_line do |line|
+        match = regex.match(line.chomp)
+        if match
+          packages << new({ name: match.captures[0], ensure: match.captures[1], provider: name })
+        else
+          warning(_("Failed to match line '%{line}'") % { line: line })
+        end
+      end
+    end
+
+    packages
+  rescue Puppet::ExecutionFailure
+    fail(_("Error getting installed packages"))
+  end
+
+  # Install a package quietly (without confirmation or progress bar) using 'xbps-install'.
+  def install
+    resource_name = @resource[:name]
+    resource_source = @resource[:source]
+
+    cmd = %w[-S -y]
+    cmd += install_options if @resource[:install_options]
+    cmd << "--repository=#{resource_source}" if resource_source
+    cmd << resource_name
+
+    unhold if properties[:mark] == :hold
+    begin
+      xbps_install(*cmd)
+    ensure
+      hold if @resource[:mark] == :hold
+    end
+  end
+
+  # Because Voidlinux is a rolling release based distro, installing a package
+  # should always result in the newest release.
+  def update
+    install
+  end
+
+  # Removes a package from the system.
+  def uninstall
+    resource_name = @resource[:name]
+
+    cmd = %w[-R -y]
+    cmd += uninstall_options if @resource[:uninstall_options]
+    cmd << resource_name
+
+    xbps_remove(*cmd)
+  end
+
+  # The latest version of a given package
+  def latest
+    query&.[] :ensure
+  end
+
+  # Queries information for a package
+  def query
+    resource_name = @resource[:name]
+    installed_packages = self.class.instances
+
+    installed_packages.each do |pkg|
+      return pkg.properties if @resource[:name].casecmp(pkg.name).zero?
+    end
+
+    return nil unless @resource.allow_virtual?
+
+    # Search for virtual package
+    output = xbps_query("-Rs", resource_name).chomp
+
+    # xbps-query -Rs output is '[*] package-name-version     description'
+    regex = /^\[\*\]+\s(\S+)-(\S+)\s+\S+/
+    match = regex.match(output)
+
+    return nil unless match
+
+    { name: match.captures[0], ensure: match.captures[1], provider: self.class.name }
+  end
+
+  # Puts a package on hold, so it doesn't update by itself on system update
+  def hold
+    xbps_pkgdb("-m", "hold", @resource[:name])
+  end
+
+  # Puts a package out of hold
+  def unhold
+    xbps_pkgdb("-m", "unhold", @resource[:name])
+  end
+
+  private
+
+  def install_options
+    join_options(@resource[:install_options])
+  end
+
+  def uninstall_options
+    join_options(@resource[:uninstall_options])
+  end
+end

data/lib/puppet/scheduler/splay_job.rb

@@ -25,6 +25,15 @@ module Puppet::Scheduler
       end
     end
 
+    # Recalculates splay.
+    #
+    # @param splay_limit [Integer] the maximum time (in seconds) to delay before an agent's first run.
+    # @return @splay [Integer] a random integer less than or equal to the splay limit that represents the seconds to
+    # delay before next agent run.
+    def splay_limit=(splay_limit)
+      @splay = calculate_splay(splay_limit)
+    end
+
     private
 
     def calculate_splay(limit)

data/lib/puppet/type/exec.rb

@@ -436,6 +436,14 @@ module Puppet
         back by re-extracting the tarball. If `important.tar` does **not**
         actually contain `myfile`, the exec will keep running every time
         Puppet runs.
+
+        This parameter can also take an array of files and the command will
+        not run if **any** of these files exist. For example:
+
+            creates => ['/tmp/file1', '/tmp/file2'],
+
+        will only run the command if both files don't exist.
+
       EOT
 
       accept_arrays

data/lib/puppet/util/command_line/trollop.rb

@@ -335,9 +335,27 @@ class CommandLine
               when /^-([^-])$/
                 @short[::Regexp.last_match(1)]
               when /^--no-([^-]\S*)$/
-                @long["[no-]#{::Regexp.last_match(1)}"]
+                possible_match = @long["[no-]#{::Regexp.last_match(1)}"]
+                if !possible_match
+                  partial_match = @long["[no-]#{::Regexp.last_match(1).tr('-', '_')}"] || @long["[no-]#{::Regexp.last_match(1).tr('_', '-')}"]
+                  if partial_match
+                    Puppet.deprecation_warning _("Partial argument match detected: correct argument is %{partial_match}, got %{arg}. Partial argument matching is deprecated and will be removed in a future release.") % { arg: arg, partial_match: partial_match }
+                  end
+                  partial_match
+                else
+                  possible_match
+                end
               when /^--([^-]\S*)$/
-                @long[::Regexp.last_match(1)] || @long["[no-]#{::Regexp.last_match(1)}"]
+                possible_match = @long[::Regexp.last_match(1)] || @long["[no-]#{::Regexp.last_match(1)}"]
+                if !possible_match
+                  partial_match = @long[::Regexp.last_match(1).tr('-', '_')] || @long[::Regexp.last_match(1).tr('_', '-')] || @long["[no-]#{::Regexp.last_match(1).tr('-', '_')}"] || @long["[no-]#{::Regexp.last_match(1).tr('_', '-')}"]
+                  if partial_match
+                    Puppet.deprecation_warning _("Partial argument match detected: correct argument is %{partial_match}, got %{arg}. Partial argument matching is deprecated and will be removed in a future release.") % { arg: arg, partial_match: partial_match }
+                  end
+                  partial_match
+                else
+                  possible_match
+                end
               else
                 raise CommandlineError, _("invalid argument syntax: '%{arg}'") % { arg: arg }
               end

data/lib/puppet/util/rpm_compare.rb

@@ -7,7 +7,7 @@ module Puppet::Util::RpmCompare
     armv5tejl armv6l armv7l m68kmint s390 s390x ia64 x86_64 sh3 sh4
   ].freeze
 
-  ARCH_REGEX = Regexp.new(ARCH_LIST.join('|\.'))
+  ARCH_REGEX = Regexp.new(ARCH_LIST.map { |arch| "\\.#{arch}" }.join('|'))
 
   # This is an attempt at implementing RPM's
   # lib/rpmvercmp.c rpmvercmp(a, b) in Ruby.

data/lib/puppet/util/windows/com.rb

@@ -141,7 +141,7 @@ module Puppet::Util::Windows::COM
 
         self::VTBL.members.each do |name|
           define_method(name) do |*args|
-            if Puppet::Util::Windows::COM.FAILED(result = @vtbl[name].call(self, *args))
+            if Puppet::Util::Windows::COM.FAILED((result = @vtbl[name].call(self, *args)))
               raise Puppet::Util::Windows::Error.new(_("Failed to call %{klass}::%{name} with HRESULT: %{result}.") % { klass: self, name: name, result: result }, result)
             end
 
@@ -183,7 +183,7 @@ module Puppet::Util::Windows::COM
 
         self::VTBL.members.each do |name|
           define_method(name) do |*args|
-            if Puppet::Util::Windows::COM.FAILED(result = @vtbl[name].call(self, *args))
+            if Puppet::Util::Windows::COM.FAILED((result = @vtbl[name].call(self, *args)))
               raise Puppet::Util::Windows::Error.new(_("Failed to call %{klass}::%{name} with HRESULT: %{result}.") % { klass: self, name: name, result: result }, result)
             end
 

data/lib/puppet/version.rb

@@ -8,7 +8,7 @@
 # Raketasks and such to set the version based on the output of `git describe`
 
 module Puppet
-  PUPPETVERSION = '8.6.0'
+  PUPPETVERSION = '8.7.0'
 
   ##
   # version is a public API method intended to always provide a fast and