puppet 8.3.1-universal-darwin → 8.5.0-universal-darwin

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/util/plist'
 Puppet::Type.type(:service).provide :launchd, :parent => :base do
   desc <<-'EOT'
@@ -45,7 +46,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
 
   defaultfor 'os.name' => :darwin
   confine 'os.name'    => :darwin
-  confine :feature            => :cfpropertylist
+  confine :feature => :cfpropertylist
 
   has_feature :enableable
   has_feature :refreshable
@@ -71,7 +72,9 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
   #
   # @api private
   def self.get_os_version
+    # rubocop:disable Naming/MemoizedInstanceVariableName
     @os_version ||= Facter.value('os.release.major').to_i
+    # rubocop:enable Naming/MemoizedInstanceVariableName
   end
 
   # Defines the path to the overrides plist file where service enabling
@@ -131,18 +134,20 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
   # the cache will be refreshed if refresh is true.
   #
   # @api private
-  def self.make_label_to_path_map(refresh=false)
+  def self.make_label_to_path_map(refresh = false)
     return @label_to_path_map if @label_to_path_map and not refresh
+
     @label_to_path_map = {}
     launchd_paths.each do |path|
       return_globbed_list_of_file_paths(path).each do |filepath|
         Puppet.debug("Reading launchd plist #{filepath}")
         job = read_plist(filepath)
         next if job.nil?
+
         if job.respond_to?(:key) && job.key?("Label")
           @label_to_path_map[job["Label"]] = filepath
         else
-          #TRANSLATORS 'plist' and label' should not be translated
+          # TRANSLATORS 'plist' and label' should not be translated
           Puppet.debug(_("The %{file} plist does not contain a 'label' key; Puppet is skipping it") % { file: filepath })
           next
         end
@@ -155,7 +160,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
   # are found on the system. The key of the hash is the job id and the value
   # is the path to the file. If a label is passed, we return the job id and
   # path for that specific job.
-  def self.jobsearch(label=nil)
+  def self.jobsearch(label = nil)
     by_label = make_label_to_path_map
 
     if label
@@ -183,6 +188,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     begin
       output = launchctl :list
       raise Puppet::Error.new("launchctl list failed to return any data.") if output.nil?
+
       output.split("\n").each do |line|
         @job_list[line.split(/\s/).last] = :running
       end
@@ -203,10 +209,11 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     i = 1
     overrides = nil
     loop do
-      Puppet.debug(_("Reading overrides plist, attempt %{i}") % {i: i}) if i > 1
+      Puppet.debug(_("Reading overrides plist, attempt %{i}") % { i: i }) if i > 1
       overrides = read_plist(launchd_overrides)
       break unless overrides.nil?
       raise Puppet::Error.new(_('Unable to read overrides plist, too many attempts')) if i == 20
+
       Puppet.info(_('Overrides file could not be read, trying again.'))
       Kernel.sleep(0.1)
       i += 1
@@ -274,7 +281,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     # always add -w so it always starts the job, it is a noop if it is not needed, this means we do
     # not have to rescan all launchd plists.
     cmds << "-w"
-    if self.enabled? == :false  || self.status == :stopped # launchctl won't load disabled jobs
+    if self.enabled? == :false || self.status == :stopped # launchctl won't load disabled jobs
       did_enable_job = true
     end
     cmds << job_path
@@ -287,7 +294,6 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     self.disable if did_enable_job and resource[:enable] == :false
   end
 
-
   def stop
     if resource[:stop]
       service_command(:stop)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-Puppet::Type.type(:service).provide :openbsd, :parent => :init do
 
+Puppet::Type.type(:service).provide :openbsd, :parent => :init do
   desc "Provider for OpenBSD's rc.d daemon control scripts"
 
   commands :rcctl => '/usr/sbin/rcctl'
@@ -36,10 +36,10 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :init do
         process.each_line do |line|
           match = /^(.*?)(?:_flags)?=(.*)$/.match(line)
           attributes_hash = {
-            :name      => match[1],
-            :flags     => match[2],
+            :name => match[1],
+            :flags => match[2],
             :hasstatus => true,
-            :provider  => :openbsd,
+            :provider => :openbsd,
           }
 
           instances << new(attributes_hash);

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Gentoo OpenRC
 Puppet::Type.type(:service).provide :openrc, :parent => :base do
   desc <<-EOT
@@ -58,7 +59,7 @@ Puppet::Type.type(:service).provide :openrc, :parent => :base do
   end
 
   def startcmd
-    [command(:rcservice), @resource[:name], :start ]
+    [command(:rcservice), @resource[:name], :start]
   end
 
   def stopcmd
@@ -68,5 +69,4 @@ Puppet::Type.type(:service).provide :openrc, :parent => :base do
   def statuscmd
     ((@resource.provider.get(:hasstatus) == true) || (@resource[:hasstatus] == :true)) && [command(:rcservice), @resource[:name], :status]
   end
-
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:service).provide :openwrt, :parent => :init, :source => :init do
   desc <<-EOT
     Support for OpenWrt flavored init scripts.
@@ -33,5 +34,4 @@ Puppet::Type.type(:service).provide :openwrt, :parent => :init, :source => :init
   # As OpenWrt init script do not have status commands
   def statuscmd
   end
-
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:service).provide :rcng, :parent => :bsd do
   desc <<-EOT
     RCng service management with rc.d

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Manage Red Hat services.  Start/stop uses /sbin/service and enable/disable uses chkconfig
 
 Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init do
@@ -9,7 +10,8 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init
 
   commands :chkconfig => "/sbin/chkconfig", :service => "/sbin/service"
 
-  defaultfor 'os.family' => :redhat
+  defaultfor 'os.name' => :amazon, 'os.release.major' => ["2017", "2018"]
+  defaultfor 'os.name' => :redhat, 'os.release.major' => (4..6).to_a
   defaultfor 'os.family' => :suse, 'os.release.major' => ["10", "11"]
 
   # Remove the symlinks
@@ -44,8 +46,8 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init
   # Don't support them specifying runlevels; always use the runlevels
   # in the init scripts.
   def enable
-      chkconfig("--add", @resource[:name])
-      chkconfig(@resource[:name], :on)
+    chkconfig("--add", @resource[:name])
+    chkconfig(@resource[:name], :on)
   rescue Puppet::ExecutionFailure => detail
     raise Puppet::Error, "Could not enable #{self.name}: #{detail}", detail.backtrace
   end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Daemontools service management
 #
 # author Brice Figureau <brice-puppet@daysofwonder.com>
@@ -51,7 +52,7 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
   # find the service dir on this node
   def servicedir
     unless @servicedir
-      ["/service", "/etc/service","/var/service"].each do |path|
+      ["/service", "/etc/service", "/var/service"].each do |path|
         if Puppet::FileSystem.exist?(path)
           @servicedir = path
           break
@@ -68,7 +69,7 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
       return :running if output =~ /^run: /
     rescue Puppet::ExecutionFailure => detail
       unless detail.message =~ /(warning: |runsv not running$)/
-        raise Puppet::Error.new( "Could not get status for service #{resource.ref}: #{detail}", detail )
+        raise Puppet::Error.new("Could not get status for service #{resource.ref}: #{detail}", detail)
       end
     end
     :stopped
@@ -80,13 +81,13 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
 
   def start
     if enabled? != :true
-        enable
-        # Work around issue #4480
-        # runsvdir takes up to 5 seconds to recognize
-        # the symlink created by this call to enable
-        #TRANSLATORS 'runsvdir' is a linux service name and should not be translated
-        Puppet.info _("Waiting 5 seconds for runsvdir to discover service %{service}") % { service: self.service }
-        sleep 5
+      enable
+      # Work around issue #4480
+      # runsvdir takes up to 5 seconds to recognize
+      # the symlink created by this call to enable
+      # TRANSLATORS 'runsvdir' is a linux service name and should not be translated
+      Puppet.info _("Waiting 5 seconds for runsvdir to discover service %{service}") % { service: self.service }
+      sleep 5
     end
     sv "start", self.service
   end
@@ -104,4 +105,3 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
     Puppet::FileSystem.unlink(self.service) if Puppet::FileSystem.symlink?(self.service)
   end
 end
-

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:service).provide :service do
   desc "The simplest form of service support."
 
@@ -66,4 +67,3 @@ Puppet::Type.type(:service).provide :service do
     service_execute(type, cmd, fof)
   end
 end
-

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'timeout'
 
 # Solaris 10 SMF-style services.
@@ -30,7 +31,7 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
   has_feature :refreshable
 
   def self.instances
-    service_instances = svcs("-H", "-o", "state,fmri" ).split("\n")
+    service_instances = svcs("-H", "-o", "state,fmri").split("\n")
 
     # Puppet does not manage services in the legacy_run state, so filter those out.
     service_instances.reject! { |line| line =~ /^legacy_run/ }
@@ -44,7 +45,7 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
                 when /degraded/; :degraded
                 else :stopped
                 end
-      new({:name => fmri, :ensure => status})
+      new({ :name => fmri, :ensure => status })
     end
 
     service_instances
@@ -75,7 +76,7 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
     Puppet.notice("Importing #{@resource[:manifest]} for #{@resource[:name]}")
     svccfg(:import, @resource[:manifest])
   rescue Puppet::ExecutionFailure => detail
-    raise Puppet::Error.new( "Cannot config #{@resource[:name]} to enable it: #{detail}", detail )
+    raise Puppet::Error.new("Cannot config #{@resource[:name]} to enable it: #{detail}", detail)
   end
 
   # Returns the service's FMRI. We fail if multiple FMRIs correspond to
@@ -121,7 +122,7 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
     # Check if the general/complete property is defined. If it is undefined,
     # then svccfg will not print anything to the console.
     property_defn = svccfg("-s", fmri, "listprop", "general/complete").chomp
-    @complete_service = ! property_defn.empty?
+    @complete_service = !property_defn.empty?
   end
 
   def enable
@@ -130,6 +131,7 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
 
   def enabled?
     return :false unless service_exists?
+
     _property, _type, value = svccfg("-s", self.service_fmri, "listprop", "general/enabled").split(' ')
     value == 'true' ? :true : :false
   end
@@ -168,6 +170,7 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
       loop do
         states = self.service_states
         break if desired_states.include?(states[:current]) && states[:next].nil?
+
         Kernel.sleep(1)
       end
     end
@@ -222,10 +225,10 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
       return :degraded
     when "legacy_run"
       raise Puppet::Error,
-        "Cannot manage legacy services through SMF"
+            "Cannot manage legacy services through SMF"
     else
       raise Puppet::Error,
-        "Unmanageable state '#{state}' on service #{self.name}"
+            "Unmanageable state '#{state}' on service #{self.name}"
     end
   end
 

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
+
 require 'timeout'
 
 # AIX System Resource controller (SRC)
 Puppet::Type.type(:service).provide :src, :parent => :base do
-
   desc "Support for AIX's System Resource controller.
 
   Services are started/stopped based on the `stopsrc` and `startsrc`
@@ -17,14 +17,14 @@ Puppet::Type.type(:service).provide :src, :parent => :base do
   defaultfor 'os.name' => :aix
   confine 'os.name' => :aix
 
-  optional_commands :stopsrc  => "/usr/bin/stopsrc",
+  optional_commands :stopsrc => "/usr/bin/stopsrc",
                     :startsrc => "/usr/bin/startsrc",
-                    :refresh  => "/usr/bin/refresh",
-                    :lssrc    => "/usr/bin/lssrc",
-                    :lsitab   => "/usr/sbin/lsitab",
-                    :mkitab   => "/usr/sbin/mkitab",
-                    :rmitab   => "/usr/sbin/rmitab",
-                    :chitab   => "/usr/sbin/chitab"
+                    :refresh => "/usr/bin/refresh",
+                    :lssrc => "/usr/bin/lssrc",
+                    :lsitab => "/usr/sbin/lsitab",
+                    :mkitab => "/usr/sbin/mkitab",
+                    :rmitab => "/usr/sbin/rmitab",
+                    :chitab => "/usr/sbin/chitab"
 
   has_feature :refreshable
 
@@ -54,7 +54,7 @@ Puppet::Type.type(:service).provide :src, :parent => :base do
   end
 
   def enabled?
-    output = execute([command(:lsitab), @resource[:name]], {:failonfail => false, :combine => true})
+    output = execute([command(:lsitab), @resource[:name]], { :failonfail => false, :combine => true })
     output.exitstatus == 0 ? :true : :false
   end
 
@@ -74,6 +74,7 @@ Puppet::Type.type(:service).provide :src, :parent => :base do
       loop do
         status = self.status
         break if status == desired_state.to_sym
+
         sleep(1)
       end
     end
@@ -101,10 +102,10 @@ Puppet::Type.type(:service).provide :src, :parent => :base do
       # While subsystems with -S (signals) must be stopped/started
       method = args[11]
       do_refresh = case method
-        when "-K" then :true
-        when "-S" then :false
-        else self.fail("Unknown service communication method #{method}")
-      end
+                   when "-K" then :true
+                   when "-S" then :false
+                   else self.fail("Unknown service communication method #{method}")
+                   end
 
       begin
         if do_refresh == :true
@@ -115,12 +116,12 @@ Puppet::Type.type(:service).provide :src, :parent => :base do
         end
         return :true
       rescue Puppet::ExecutionFailure => detail
-        raise Puppet::Error.new("Unable to restart service #{@resource[:name]}, error was: #{detail}", detail )
+        raise Puppet::Error.new("Unable to restart service #{@resource[:name]}, error was: #{detail}", detail)
       end
     end
     self.fail("No such service found")
   rescue Puppet::ExecutionFailure => detail
-    raise Puppet::Error.new("Cannot get status of #{@resource[:name]}, error was: #{detail}", detail )
+    raise Puppet::Error.new("Cannot get status of #{@resource[:name]}, error was: #{detail}", detail)
   end
 
   def status
@@ -133,9 +134,9 @@ Puppet::Type.type(:service).provide :src, :parent => :base do
       # PID is the 3rd field, but inoperative subsystems
       # skip this so split doesn't work right
       state = case args[-1]
-        when "active" then :running
-        when "inoperative" then :stopped
-      end
+              when "active"      then :running
+              when "inoperative" then :stopped
+              end
       Puppet.debug("Service #{@resource[:name]} is #{args[-1]}")
       return state
     end
@@ -143,6 +144,4 @@ Puppet::Type.type(:service).provide :src, :parent => :base do
     self.debug(detail.message)
     return :stopped
   end
-
 end
-

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Manage systemd services using systemctl
 
 require_relative '../../../puppet/file_system'
@@ -15,11 +16,14 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
   confine :true => Puppet::FileSystem.exist?('/proc/1/comm') && Puppet::FileSystem.read('/proc/1/comm').include?('systemd')
 
   defaultfor 'os.family' => [:archlinux]
-  defaultfor 'os.family' => :redhat, 'os.release.major' => ["7", "8", "9"]
+  defaultfor 'os.family' => :redhat
+  notdefaultfor 'os.name' => :redhat, 'os.release.major' => (4..6).to_a # Use the "RedHat" service provider
   defaultfor 'os.family' => :redhat, 'os.name' => :fedora
   defaultfor 'os.family' => :suse
   defaultfor 'os.family' => :coreos
-  defaultfor 'os.name' => :amazon, 'os.release.major' => ["2"]
+  defaultfor 'os.family' => :gentoo
+  notdefaultfor 'os.name' => :amazon, 'os.release.major' => ["2017", "2018"]
+  defaultfor 'os.name' => :amazon, 'os.release.major' => ["2", "2023"]
   defaultfor 'os.name' => :debian
   notdefaultfor 'os.name' => :debian, 'os.release.major' => ["5", "6", "7"] # These are using the "debian" method
   defaultfor 'os.name' => :LinuxMint
@@ -30,7 +34,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
 
   def self.instances
     i = []
-    output = systemctl('list-unit-files', '--type', 'service', '--full', '--all',  '--no-pager')
+    output = systemctl('list-unit-files', '--type', 'service', '--full', '--all', '--no-pager')
     output.scan(/^(\S+)\s+(disabled|enabled|masked|indirect|bad|static)\s*([^-]\S+)?\s*$/i).each do |m|
       Puppet.debug("#{m[0]} marked as bad by `systemctl`. It is recommended to be further checked.") if m[1] == "bad"
       i << new(:name => m[0])
@@ -40,8 +44,8 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
     return []
   end
 
-  # Static services cannot be enabled or disabled manually. Indirect services 
-  # should not be enabled or disabled due to limitations in systemd (see 
+  # Static services cannot be enabled or disabled manually. Indirect services
+  # should not be enabled or disabled due to limitations in systemd (see
   # https://github.com/systemd/systemd/issues/6681).
   def enabled_insync?(current)
     case cached_enabled?[:output]
@@ -91,6 +95,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]]
     result = execute(cmd, :failonfail => false)
     @cached_enabled = { output: result.chomp, exitcode: result.exitstatus }
@@ -111,6 +116,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) && (Puppet.runtime[:facter].value('os.family').casecmp('debian').zero?)
       ret = debian_enabled?
       return ret if ret
@@ -229,4 +235,3 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
     error_return << "journalctl log for #{name}:\n#{journalctl_output}"
   end
 end
-

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

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:service).provide :upstart, :parent => :debian do
   START_ON = /^\s*start\s+on/
   COMMENTED_START_ON = /^\s*#+\s*start\s+on/
-  MANUAL   = /^\s*manual\s*$/
+  MANUAL = /^\s*manual\s*$/
 
   desc "Ubuntu service management with `upstart`.
 
@@ -20,16 +21,16 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
   defaultfor 'os.name' => :ubuntu, 'os.release.major' => ["10.04", "12.04", "14.04", "14.10"]
   defaultfor 'os.name' => :LinuxMint, 'os.release.major' => ["10", "11", "12", "13", "14", "15", "16", "17"]
 
-  commands :start   => "/sbin/start",
-           :stop    => "/sbin/stop",
+  commands :start => "/sbin/start",
+           :stop => "/sbin/stop",
            :restart => "/sbin/restart",
-           :status_exec  => "/sbin/status",
+           :status_exec => "/sbin/status",
            :initctl => "/sbin/initctl"
 
   # We only want to use upstart as our provider if the upstart daemon is running.
   # This can be checked by running `initctl version --quiet` on a machine that has
   # upstart installed.
-  confine :true => lambda { has_initctl? }
+  confine :true => -> { has_initctl? }
 
   def self.has_initctl?
     # Puppet::Util::Execution.execute does not currently work on jRuby.
@@ -67,8 +68,7 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
     excludes
   end
 
-
-  def self.get_services(exclude=[])
+  def self.get_services(exclude = [])
     instances = []
     execpipe("#{command(:initctl)} list") { |process|
       process.each_line { |line|
@@ -104,7 +104,7 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
 
   # Where is our override script?
   def overscript
-    @overscript ||= initscript.gsub(/\.conf$/,".override")
+    @overscript ||= initscript.gsub(/\.conf$/, ".override")
   end
 
   def search(name)
@@ -174,13 +174,13 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
   end
 
   def statuscmd
-    is_upstart? ? nil : super #this is because upstart is broken with its return codes
+    is_upstart? ? nil : super # this is because upstart is broken with its return codes
   end
 
   def status
     if (@resource[:hasstatus] == :false) ||
-        @resource[:status] ||
-        ! is_upstart?
+       @resource[:status] ||
+       !is_upstart?
       return super
     end
 
@@ -192,7 +192,8 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
     end
   end
 
-private
+  private
+
   def is_upstart?(script = initscript)
     Puppet::FileSystem.exist?(script) && script.match(/\/etc\/init\/\S+\.conf/)
   end
@@ -373,9 +374,7 @@ private
   end
 
   def read_script_from(filename)
-    File.open(filename) do |file|
-      file.read
-    end
+    File.read(filename)
   end
 
   def write_script_to(file, text)