puppet 6.4.5-universal-darwin → 6.5.0-universal-darwin

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

@@ -1,4 +1,4 @@
-require 'puppet/provider/package/gem'
+require 'puppet/provider/package'
 
 Puppet::Type.type(:package).provide :puppet_gem, :parent => :gem do
   desc "Puppet Ruby Gem support. This provider is useful for managing

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

@@ -13,7 +13,6 @@ These options should be specified as an array where each element is either a str
   has_feature :install_options
   has_feature :uninstall_options
   has_feature :virtual_packages
-  has_feature :install_only
 
   # Note: self:: is required here to keep these constants in the context of what will
   # eventually become this Puppet::Type::Package::ProviderRpm class.
@@ -21,7 +20,6 @@ These options should be specified as an array where each element is either a str
   self::NEVRA_FORMAT = %Q{%{NAME} %|EPOCH?{%{EPOCH}}:{0}| %{VERSION} %{RELEASE} %{ARCH}\\n}
   self::NEVRA_REGEX  = %r{^'?(\S+) (\S+) (\S+) (\S+) (\S+)$}
   self::NEVRA_FIELDS = [:name, :epoch, :version, :release, :arch]
-  self::MULTIVERSION_SEPARATOR = "; "
 
   ARCH_LIST = [
     'noarch',
@@ -81,9 +79,12 @@ These options should be specified as an array where each element is either a str
 
     # list out all of the packages
     begin
-      execpipe("#{command(:rpm)} -qa #{nosignature} #{nodigest} --qf '#{self::NEVRA_FORMAT}' | sort") { |process|
+      execpipe("#{command(:rpm)} -qa #{nosignature} #{nodigest} --qf '#{self::NEVRA_FORMAT}'") { |process|
         # now turn each returned line into a package object
-        nevra_to_multiversion_hash(process).each { |hash| packages << new(hash) }
+        process.each_line { |line|
+          hash = nevra_to_hash(line)
+          packages << new(hash) unless hash.empty?
+        }
       }
     rescue Puppet::ExecutionFailure
       raise Puppet::Error, _("Failed to list packages"), $!.backtrace
@@ -99,7 +100,7 @@ These options should be specified as an array where each element is either a str
     #NOTE: Prior to a fix for issue 1243, this method potentially returned a cached value
     #IF YOU CALL THIS METHOD, IT WILL CALL RPM
     #Use get(:property) to check if cached values are available
-    cmd = ["-q",  @resource[:name], "#{self.class.nosignature}", "#{self.class.nodigest}", "--qf", "#{self.class::NEVRA_FORMAT}"]
+    cmd = ["-q",  @resource[:name], "#{self.class.nosignature}", "#{self.class.nodigest}", "--qf", "'#{self.class::NEVRA_FORMAT}'"]
 
     begin
       output = rpm(*cmd)
@@ -116,7 +117,9 @@ These options should be specified as an array where each element is either a str
         return nil
       end
     end
-    @property_hash.update(self.class.nevra_to_multiversion_hash(output))
+    # FIXME: We could actually be getting back multiple packages
+    # for multilib and this will only return the first such package
+    @property_hash.update(self.class.nevra_to_hash(output))
 
     @property_hash.dup
   end
@@ -127,8 +130,8 @@ These options should be specified as an array where each element is either a str
       @resource.fail _("RPMs must specify a package source")
     end
 
-    cmd = [command(:rpm), "-q", "--qf", "#{self.class::NEVRA_FORMAT}", "-p", source]
-    h = self.class.nevra_to_multiversion_hash(execute(cmd))
+    cmd = [command(:rpm), "-q", "--qf", "'#{self.class::NEVRA_FORMAT}'", "-p", source]
+    h = self.class.nevra_to_hash(execute(cmd))
     h[:ensure]
   rescue Puppet::ExecutionFailure => e
     raise Puppet::Error, e.message, e.backtrace
@@ -165,11 +168,7 @@ These options should be specified as an array where each element is either a str
       if @resource[:name].start_with? nav
         identifier = nav
       else
-        if @resource[:install_only]
-          identifier = get(:ensure).split(self.class::MULTIVERSION_SEPARATOR).map { |ver| "#{name}-#{ver}" }
-        else
-          identifier = name
-        end
+        identifier = name
       end
     end
     # If an arch is specified in the resource, uninstall that arch,
@@ -228,14 +227,14 @@ These options should be specified as an array where each element is either a str
       str2 = str2.gsub(front_strip_re, '')
 
       # "handle the tilde separator, it sorts before everything else"
-      if str1 =~ /^~/ && str2 =~ /^~/
+      if /^~/.match(str1) && /^~/.match(str2)
         # if they both have ~, strip it
         str1 = str1[1..-1]
         str2 = str2[1..-1]
         next
-      elsif str1 =~ /^~/
+      elsif /^~/.match(str1)
         return -1
-      elsif str2 =~ /^~/
+      elsif /^~/.match(str2)
         return 1
       end
 
@@ -244,7 +243,7 @@ These options should be specified as an array where each element is either a str
       # "grab first completely alpha or completely numeric segment"
       isnum = false
       # if the first char of str1 is a digit, grab the chunk of continuous digits from each string
-      if str1 =~ /^[0-9]+/
+      if /^[0-9]+/.match(str1)
         if str1 =~ /^[0-9]+/
           segment1 = $~.to_s
           str1 = $~.post_match
@@ -309,12 +308,8 @@ These options should be specified as an array where each element is either a str
 
   def insync?(is)
     return false if [:purged, :absent].include?(is)
-    return false if is.include?(self.class::MULTIVERSION_SEPARATOR) && !@resource[:install_only]
-
     should = resource[:ensure]
-    is.split(self.class::MULTIVERSION_SEPARATOR).any? do |version|
-      0 == self.rpm_compareEVR(rpm_parse_evr(should), rpm_parse_evr(version))
-    end
+    0 == rpm_compareEVR(rpm_parse_evr(should), rpm_parse_evr(is))
   end
 
   # parse a rpm "version" specification
@@ -339,7 +334,7 @@ These options should be specified as an array where each element is either a str
       v = s[0,ri]
       r = s[ri+1,s.length]
       if arch = r.scan(ARCH_REGEX)[0]
-        a = arch.delete('.')
+        a = arch.gsub(/\./, '')
         r.gsub!(ARCH_REGEX, '')
       end
     else
@@ -417,37 +412,4 @@ These options should be specified as an array where each element is either a str
 
     return hash
   end
-
-  # @param line [String] multiple lines of rpm package query information
-  # @return list of [Hash] of NEVRA_FIELDS strings parsed from package info
-  # or an empty list if we failed to parse
-  # @api private
-  def self.nevra_to_multiversion_hash(multiline)
-    list = []
-    multiversion_hash = {}
-    multiline.each_line do |line|
-      hash = self.nevra_to_hash(line)
-      if !hash.empty?
-        if multiversion_hash.empty?
-          multiversion_hash = hash.dup
-          next
-        end
-
-        if multiversion_hash[:name] != hash[:name]
-          list << multiversion_hash
-          multiversion_hash = hash.dup
-          next
-        end
-
-        if !multiversion_hash[:ensure].include?(hash[:ensure])
-          multiversion_hash[:ensure].concat("#{self::MULTIVERSION_SEPARATOR}#{hash[:ensure]}")
-        end
-      end
-    end
-    list << multiversion_hash if multiversion_hash
-    if list.size == 1
-      return list[0]
-    end
-    return list
-  end
 end

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

@@ -79,7 +79,7 @@ class Puppet::Provider::Package::Windows
 
     def self.replace_forward_slashes(value)
       if value.include?('/')
-        value = value.tr('/', "\\")
+        value = value.gsub('/', "\\")
         Puppet.debug('Package source parameter contained /s - replaced with \\s')
       end
       value

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

@@ -8,7 +8,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
   This provider supports the `install_options` attribute, which allows command-line flags to be passed to yum.
   These options should be specified as an array where each element is either a string or a hash."
 
-  has_feature :install_options, :versionable, :virtual_packages, :install_only
+  has_feature :install_options, :versionable, :virtual_packages
 
   commands :cmd => "yum", :rpm => "rpm"
 
@@ -92,7 +92,7 @@ defaultfor :osfamily => :redhat, :operatingsystemmajrelease => (4..7).to_a
     updates = Hash.new { |h, k| h[k] = [] }
     body.split.each_slice(3) do |tuple|
       break if tuple[0] =~ /^(Obsoleting|Security:|Update)/
-      break unless tuple[1] =~ /^(?:(\d+):)?(\S+)-(\S+)$/
+      break unless tuple[1].match(/^(?:(\d+):)?(\S+)-(\S+)$/)
       hash = update_to_hash(*tuple[0..1])
       # Create entries for both the package name without a version and a
       # version since yum considers those as mostly interchangeable.
@@ -203,10 +203,7 @@ defaultfor :osfamily => :redhat, :operatingsystemmajrelease => (4..7).to_a
       end
       current_package = self.query
       if current_package
-        if @resource[:install_only]
-          self.debug "Updating package #{@resource[:name]} from version #{current_package[:ensure]} to #{should} as install_only packages are never downgraded"
-          operation = update_command
-        elsif rpm_compareEVR(rpm_parse_evr(should), rpm_parse_evr(current_package[:ensure])) < 0
+        if rpm_compareEVR(rpm_parse_evr(should), rpm_parse_evr(current_package[:ensure])) < 0
           self.debug "Downgrading package #{@resource[:name]} from version #{current_package[:ensure]} to #{should}"
           operation = :downgrade
         elsif rpm_compareEVR(rpm_parse_evr(should), rpm_parse_evr(current_package[:ensure])) > 0
@@ -231,11 +228,10 @@ defaultfor :osfamily => :redhat, :operatingsystemmajrelease => (4..7).to_a
       is = self.query
       raise Puppet::Error, _("Could not find package %{name}") % { name: self.name } unless is
 
-      version = is[:ensure]
       # FIXME: Should we raise an exception even if should == :latest
       # and yum updated us to a version other than @param_hash[:ensure] ?
-      raise Puppet::Error, _("Failed to update to version %{should}, got version %{version} instead") % { should: should, version: version } unless
-        insync?(version)
+      vercmp_result = rpm_compareEVR(rpm_parse_evr(should), rpm_parse_evr(is[:ensure]))
+      raise Puppet::Error, _("Failed to update to version %{should}, got version %{version} instead") % { should: should, version: is[:ensure] } if vercmp_result != 0
     end
   end
 

data/lib/puppet/provider/package_targetable.rb

@@ -7,8 +7,6 @@
 # possibly via a `prefetchV2` method that could take a better data structure.)
 #
 # In addition, `Puppet::Provider::Package::properties` calls `query` in the provider.
-require 'puppet/provider/package'
-
 # But `query` in the provider depends upon whether a `command` attribute is defined for the resource.
 # This is a Catch-22.
 #
@@ -25,25 +23,24 @@ require 'puppet/provider/package'
 class Puppet::Provider::Package::Targetable < Puppet::Provider::Package
   # Prefetch our package list, yo.
   def self.prefetch(packages)
-    catalog_packages = packages.values.first.catalog.resources.select{ |p| p.provider.class == self }
+    catalog_packages = packages.first[1]::catalog::resources.select{ |p| p.provider.class == self }
     package_commands = catalog_packages.map { |catalog_package| catalog_package::original_parameters[:command] }.uniq
     package_commands.each do |command|
       instances(command).each do |instance|
         catalog_packages.each do |catalog_package|
-          if catalog_package[:name] == instance.name && catalog_package.original_parameters[:command] == command
+          if catalog_package[:name] == instance.name && catalog_package::original_parameters[:command] == command
             catalog_package.provider = instance
-            self.debug "Prefetched instance: %{name} via command: %{cmd}" % { name: instance.name, cmd: (command || :default) }
+            self.debug "Prefetched instance: %{name} via command: %{command}" % { name: instance.name, cmd: (command || :default)}
           end
         end
       end
     end
-    package_commands
   end
 
   # Returns the resource command or provider command.
 
   def resource_or_provider_command
-    resource.original_parameters[:command] || self.class.provider_command
+    resource::original_parameters[:command] || self.class.provider_command
   end
 
   # Targetable providers use has_command/is_optional to defer validation of provider suitability.

data/lib/puppet/provider/parsedfile.rb

@@ -71,7 +71,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
 
     flushed = []
     begin
-      @modified.sort_by(&:to_s).uniq.each do |target|
+      @modified.sort { |a,b| a.to_s <=> b.to_s }.uniq.each do |target|
         Puppet.debug "Flushing #{@resource_type.name} provider target #{target}"
         flushed << target
         flush_target(target)

data/lib/puppet/provider/service/daemontools.rb

@@ -46,8 +46,14 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
 
     # Determine the daemon path.
     def defpath
-      @defpath ||= ["/var/lib/service", "/etc"].find do |path|
-        Puppet::FileSystem.exist?(path) && FileTest.directory?(path)
+      unless @defpath
+        ["/var/lib/service", "/etc"].each do |path|
+          if Puppet::FileSystem.exist?(path)
+            @defpath = path
+            break
+          end
+        end
+        raise "Could not find the daemon directory (tested [/var/lib/service,/etc])" unless @defpath
       end
       @defpath
     end
@@ -59,10 +65,6 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
   # ie enabled or not
   def self.instances
     path = self.defpath
-    unless path
-      Puppet.info("#{self.name} is unsuitable because service directory is nil")
-      return
-    end
     unless FileTest.directory?(path)
       Puppet.notice "Service path #{path} does not exist"
       return
@@ -107,9 +109,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
   # note that this path can be overridden in the resource
   # definition
   def daemon
-    path = resource[:path]
-    raise Puppet::Error.new("#{self.class.name} must specify a path for daemon directory") unless path
-    File.join(path, resource[:name])
+    File.join(resource[:path], resource[:name])
   end
 
   def status

data/lib/puppet/provider/service/launchd.rb

@@ -240,20 +240,12 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
   def status
     if @resource && ((@resource[:hasstatus] == :false) || (@resource[:status]))
       return super
-    elsif @property_hash[:status].nil?
-      # property_hash was flushed so the service changed status
-      service_name = @resource[:name]
-      # Updating services with new statuses
-      job_list = self.class.job_list
-      # if job is present in job_list, return its status
-      if job_list.key?(service_name)
-        job_list[service_name]
-      # if job is no longer present in job_list, it was stopped
+    else
+      if @property_hash[:status].nil?
+        :absent
       else
-        :stopped
+        @property_hash[:status]
       end
-    else
-      @property_hash[:status]
     end
   end
 
@@ -321,14 +313,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     job_plist_disabled = nil
     overrides_disabled = nil
 
-    begin
-      _, job_plist = plist_from_label(resource[:name])
-    rescue Puppet::Error => err
-      # if job does not exist, log the error and return false as on other platforms
-      Puppet.log_exception(err)
-      return :false
-    end
-
+    _, job_plist = plist_from_label(resource[:name])
     job_plist_disabled = job_plist["Disabled"] if job_plist.has_key?("Disabled")
 
     if FileTest.file?(self.class.launchd_overrides) and overrides = self.class.read_overrides

data/lib/puppet/provider/service/openbsd.rb

@@ -79,7 +79,7 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :init do
   def running?
     output = execute([command(:rcctl), "check", @resource[:name]],
                      :failonfail => false, :combine => false, :squelch => false).chomp
-    return true if output =~ /\(ok\)/
+    return true if output.match(/\(ok\)/)
   end
 
   # Uses the wrapper to prevent failure when the service is not running;

data/lib/puppet/provider/service/rcng.rb

@@ -17,7 +17,7 @@ Puppet::Type.type(:service).provide :rcng, :parent => :bsd do
     if Puppet::FileSystem.exist?(rcfile)
       File.open(rcfile).readlines.each do |line|
         # Now look for something that looks like "service=${service:=YES}" or "service=YES"
-        if line =~ /^\s*#{@resource[:name]}=(?:YES|\${#{@resource[:name]}:=YES})/
+        if line.match(/^\s*#{@resource[:name]}=(?:YES|\${#{@resource[:name]}:=YES})/)
           return :true
         end
       end
@@ -34,7 +34,7 @@ Puppet::Type.type(:service).provide :rcng, :parent => :bsd do
     if Puppet::FileSystem.exist?(rcfile)
       newcontents = []
       File.open(rcfile).readlines.each do |line|
-        if line =~ /^\s*#{@resource[:name]}=(NO|\$\{#{@resource[:name]}:NO\})/
+        if line.match(/^\s*#{@resource[:name]}=(NO|\$\{#{@resource[:name]}:NO\})/)
           line = "#{@resource[:name]}=${#{@resource[:name]}:=YES}"
         end
         newcontents.push(line)

data/lib/puppet/provider/service/runit.rb

@@ -40,8 +40,14 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
     # this is necessary to autodetect a valid resource
     # default path, since there is no standard for such directory.
     def defpath
-      @defpath ||= ["/var/lib/service", "/etc/sv"].find do |path|
-        Puppet::FileSystem.exist?(path) && FileTest.directory?(path)
+      unless @defpath
+        ["/etc/sv", "/var/lib/service"].each do |path|
+          if Puppet::FileSystem.exist?(path)
+            @defpath = path
+            break
+          end
+        end
+        raise "Could not find the daemon directory (tested [/etc/sv,/var/lib/service])" unless @defpath
       end
       @defpath
     end

data/lib/puppet/provider/service/systemd.rb

@@ -1,7 +1,5 @@
 # Manage systemd services using systemctl
 
-require 'puppet/file_system'
-
 Puppet::Type.type(:service).provide :systemd, :parent => :base do
   desc "Manages `systemd` services using `systemctl`.
 
@@ -11,7 +9,14 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
 
   commands :systemctl => "systemctl"
 
-  confine :true => Puppet::FileSystem.exist?('/proc/1/comm') && Puppet::FileSystem.read('/proc/1/comm').include?('systemd')
+  if Facter.value(:osfamily).downcase == 'debian'
+    # With multiple init systems on Debian, it is possible to have
+    # pieces of systemd around (e.g. systemctl) but not really be
+    # using systemd.  We do not do this on other platforms as it can
+    # cause issues when running in a chroot without /run mounted
+    # (PUP-5577)
+    confine :exists => "/run/systemd/system"
+  end
 
   defaultfor :osfamily => [:archlinux]
   defaultfor :osfamily => :redhat, :operatingsystemmajrelease => ["7", "8"]
@@ -19,8 +24,8 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
   defaultfor :osfamily => :suse
   defaultfor :osfamily => :coreos
   defaultfor :operatingsystem => :amazon, :operatingsystemmajrelease => ["2"]
-  defaultfor :operatingsystem => :debian
-  notdefaultfor :operatingsystem => :debian, :operatingsystemmajrelease => ["5", "6", "7"] # These are using the "debian" method
+  defaultfor :operatingsystem => :debian, :operatingsystemmajrelease => ["8", "stretch/sid", "9", "buster/sid"]
+
   defaultfor :operatingsystem => :LinuxMint
   notdefaultfor :operatingsystem => :LinuxMint, :operatingsystemmajrelease => ["10", "11", "12", "13", "14", "15", "16", "17"] # These are using upstart
   defaultfor :operatingsystem => :ubuntu
@@ -44,7 +49,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
   # in the provider's believed state of the service and the actual state.
   # @param action [String,Symbol] One of 'enable', 'disable', 'mask' or 'unmask'
   def systemctl_change_enable(action)
-    output = systemctl(action, '--', @resource[:name])
+    output = systemctl(action, @resource[:name])
   rescue
     raise Puppet::Error, "Could not #{action} #{self.name}: #{output}", $!.backtrace
   ensure
@@ -57,7 +62,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
 
   def get_start_link_count
     # Start links don't include '.service'. Just search for the service name.
-    if @resource[:name] =~ /\.service/
+    if @resource[:name].match(/\.service/)
       link_name = @resource[:name].split('.')[0]
     else
       link_name = @resource[:name]
@@ -68,7 +73,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
 
   def cached_enabled?
     return @cached_enabled if @cached_enabled
-    cmd = [command(:systemctl), 'is-enabled', '--', @resource[:name]]
+    cmd = [command(:systemctl), 'is-enabled', @resource[:name]]
     @cached_enabled = execute(cmd, :failonfail => false).strip
   end
 
@@ -87,7 +92,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
     # The indirect state indicates that the unit is not enabled.
     return :false if output == 'indirect'
     return :true if (code == 0)
-    if (output.empty?) && (code > 0) && (Facter.value(:osfamily).casecmp('debian').zero?)
+    if (output.empty?) && (code > 0) && (Facter.value(:osfamily).downcase == 'debian')
       ret = debian_enabled?
       return ret if ret
     end
@@ -127,7 +132,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
   # This function is called only on start & restart unit options.
   # Reference: (PUP-3483) Systemd provider doesn't scan for changed units
   def daemon_reload?
-    cmd = [command(:systemctl), 'show', '--property=NeedDaemonReload', '--', @resource[:name]]
+    cmd = [command(:systemctl), 'show', @resource[:name], '--property=NeedDaemonReload']
     daemon_reload = execute(cmd, :failonfail => false).strip.split('=').last
     if daemon_reload == 'yes'
       daemon_reload_cmd = [command(:systemctl), 'daemon-reload']
@@ -150,20 +155,20 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
   end
 
   def restartcmd
-    [command(:systemctl), "restart", '--', @resource[:name]]
+    [command(:systemctl), "restart", @resource[:name]]
   end
 
   def startcmd
     self.unmask
-    [command(:systemctl), "start", '--', @resource[:name]]
+    [command(:systemctl), "start", @resource[:name]]
   end
 
   def stopcmd
-    [command(:systemctl), "stop", '--', @resource[:name]]
+    [command(:systemctl), "stop", @resource[:name]]
   end
 
   def statuscmd
-    [command(:systemctl), "is-active", '--', @resource[:name]]
+    [command(:systemctl), "is-active", @resource[:name]]
   end
 
   def restart