puppet 8.4.0 → 8.5.0

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

@@ -16,6 +16,10 @@ Puppet::Type.type(:package).provide :tdnf, :parent => :dnf do
   # never try to use RPM on a machine without it. We think this
   # has probably become obsolete with the way `commands` work, so
   # we should investigate removing it at some point.
+  #
+  # Mixing confine statements, control expressions, and exception handling
+  # confuses Rubocop's Layout cops, so we disable them entirely.
+  # rubocop:disable Layout
   if command('rpm')
     confine :true => begin
       rpm('--version')
@@ -25,6 +29,7 @@ Puppet::Type.type(:package).provide :tdnf, :parent => :dnf do
         true
       end
   end
+  # rubocop:enable Layout
 
-  defaultfor 'os.name' => "PhotonOS" 
+  defaultfor 'os.name' => "PhotonOS"
 end

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

@@ -64,7 +64,7 @@ class Puppet::Provider::Package::Windows
     def self.install_command(resource)
       file_location = resource[:source]
       if file_location.start_with?('http://', 'https://')
-        tempfile = Tempfile.new(['','.exe'])
+        tempfile = Tempfile.new(['', '.exe'])
         begin
           uri = URI(Puppet::Util.uri_encode(file_location))
           client = Puppet.runtime[:http]
@@ -78,7 +78,7 @@ class Puppet::Provider::Package::Windows
             end
           end
         rescue => detail
-          raise Puppet::Error.new(_("Error when installing %{package}: %{detail}") % { package: resource[:name] ,detail: detail.message}, detail)
+          raise Puppet::Error.new(_("Error when installing %{package}: %{detail}") % { package: resource[:name], detail: detail.message }, detail)
         ensure
           self.register(tempfile.path)
           tempfile.close()

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

@@ -13,12 +13,12 @@ class Puppet::Provider::Package::Windows
 
     attr_reader :name, :version
 
-    REG_DISPLAY_VALUE_NAMES = [ 'DisplayName', 'QuietDisplayName' ]
+    REG_DISPLAY_VALUE_NAMES = ['DisplayName', 'QuietDisplayName']
 
     def self.reg_value_names_to_load
       REG_DISPLAY_VALUE_NAMES |
-      MsiPackage::REG_VALUE_NAMES |
-      ExePackage::REG_VALUE_NAMES
+        MsiPackage::REG_VALUE_NAMES |
+        ExePackage::REG_VALUE_NAMES
     end
 
     # Enumerate each package. The appropriate package subclass

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

@@ -42,7 +42,7 @@ Puppet::Type.type(:package).provide(:windows, :parent => Puppet::Provider::Packa
       begin
         Puppet::FileSystem.unlink(path)
       rescue => detail
-        raise Puppet::Error.new(_("Error when unlinking %{path}: %{detail}") % { path: path ,detail: detail.message}, detail)
+        raise Puppet::Error.new(_("Error when unlinking %{path}: %{detail}") % { path: path, detail: detail.message }, detail)
       end
     end if @paths
   end

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

@@ -24,6 +24,9 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
 
   commands :cmd => "yum", :rpm => "rpm"
 
+  # Mixing confine statements, control expressions, and exception handling
+  # confuses Rubocop's Layout cops, so we disable them entirely.
+  # rubocop:disable Layout
   if command('rpm')
     confine :true => begin
       rpm('--version')
@@ -33,6 +36,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
         true
       end
   end
+  # rubocop:enable Layout
 
   defaultfor 'os.name' => :amazon
   defaultfor 'os.family' => :redhat, 'os.release.major' => (4..7).to_a
@@ -108,6 +112,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
   # @param disableexcludes [Array<String>] A list of repository excludes to disable for this query
   # @return [Hash<String, Array<Hash<String, String>>>] All packages that were
   #   found with a list of found versions for each package.
+  # rubocop:disable Layout/SingleLineBlockChain
   def self.check_updates(disablerepo, enablerepo, disableexcludes)
     args = [command(:cmd), 'check-update']
     args.concat(disablerepo.map { |repo| ["--disablerepo=#{repo}"] }.flatten)
@@ -117,15 +122,17 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
     output = Puppet::Util::Execution.execute(args, :failonfail => false, :combine => false)
 
     updates = {}
-    if output.exitstatus == 100
+    case output.exitstatus
+    when 100
       updates = parse_updates(output)
-    elsif output.exitstatus == 0
+    when 0
       self.debug "#{command(:cmd)} check-update exited with 0; no package updates available."
     else
       self.warning _("Could not check for updates, '%{cmd} check-update' exited with %{status}") % { cmd: command(:cmd), status: output.exitstatus }
     end
     updates
   end
+  # rubocop:enable Layout/SingleLineBlockChain
 
   def self.parse_updates(str)
     # Strip off all content that contains Obsoleting, Security: or Update
@@ -226,6 +233,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
     end
   end
 
+  # rubocop:disable Layout/SingleLineBlockChain
   def available_versions(package_name, disablerepo, enablerepo, disableexcludes)
     args = [command(:cmd), 'list', package_name, '--showduplicates']
     args.concat(disablerepo.map { |repo| ["--disablerepo=#{repo}"] }.flatten)
@@ -235,6 +243,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
     output = execute("#{args.compact.join(' ')} | sed -e '1,/Available Packages/ d' | awk '{print $2}'")
     output.split("\n")
   end
+  # rubocop:enable Layout/SingleLineBlockChain
 
   def install
     wanted = @resource[:name]
@@ -268,7 +277,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
         self.debug "Installing directly from #{wanted}"
       end
       should = nil
-    when false,:absent
+    when false, :absent
       # pass
       should = nil
     else
@@ -284,7 +293,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
         wanted += "-#{should}"
         if wanted.scan(self.class::ARCH_REGEX)
           self.debug "Detected Arch argument in package! - Moving arch to end of version string"
-          wanted.gsub!(/(.+)(#{self.class::ARCH_REGEX})(.+)/,'\1\3\2')
+          wanted.gsub!(/(.+)(#{self.class::ARCH_REGEX})(.+)/, '\1\3\2')
         end
       end
       current_package = self.query
@@ -376,16 +385,18 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
   def scan_options(options, key)
     return [] unless options.is_a?(Enumerable)
 
-    values = options.map do | repo |
-      value = if repo.is_a?(String)
-                next unless repo.include?('=')
-
-                Hash[*repo.strip.split('=')] # make it a hash
-              else
-                repo
-              end
-      value[key]
-    end
+    values =
+      options.map do |repo|
+        value =
+          if repo.is_a?(String)
+            next unless repo.include?('=')
+
+            Hash[*repo.strip.split('=')] # make it a hash
+          else
+            repo
+          end
+        value[key]
+      end
     values.compact.uniq
   end
 end

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

@@ -49,8 +49,8 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
   # on zypper versions <1.0, the version option returns 1
   # some versions of zypper output on stderr
   def zypper_version
-    cmd = [self.class.command(:zypper),"--version"]
-    execute(cmd, { :failonfail => false, :combine => true})
+    cmd = [self.class.command(:zypper), "--version"]
+    execute(cmd, { :failonfail => false, :combine => true })
   end
 
   def best_version(should)
@@ -112,7 +112,7 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
     # Assume that this will work on newer zypper versions
 
     # extract version numbers and convert to integers
-    major, minor, patch = zypper_version.scan(/\d+/).map{ |x| x.to_i }
+    major, minor, patch = zypper_version.scan(/\d+/).map { |x| x.to_i }
     self.debug "Detected zypper version #{major}.#{minor}.#{patch}"
 
     # zypper version < 1.0 does not support --quiet flag
@@ -154,9 +154,9 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
   # What's the latest package version available?
   def latest
     return self.class.latest_package_version(@resource[:name]) ||
-      # zypper didn't find updates, pretend the current
-      # version is the latest
-      @property_hash[:ensure]
+           # zypper didn't find updates, pretend the current
+           # version is the latest
+           @property_hash[:ensure]
   end
 
   def update
@@ -166,7 +166,7 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
 
   def uninstall
     # extract version numbers and convert to integers
-    major, minor, _ = zypper_version.scan(/\d+/).map{ |x| x.to_i }
+    major, minor, _ = zypper_version.scan(/\d+/).map { |x| x.to_i }
 
     if major < 1
       super

data/lib/puppet/provider/package.rb

@@ -25,7 +25,7 @@ class Puppet::Provider::Package < Puppet::Provider
       # Purged is the "most uninstalled" a package can be, so a purged package will be in-sync with
       # either `ensure => absent` or `ensure => purged`; an absent package will be out of sync with `ensure => purged`.
       default_status = self.class.feature?(:purgeable) ? :purged : :absent
-      @property_hash = query || { :ensure => ( default_status )}
+      @property_hash = query || { :ensure => (default_status) }
       @property_hash[:ensure] = default_status if @property_hash.empty?
     end
     @property_hash.dup

data/lib/puppet/provider/package_targetable.rb

@@ -27,8 +27,8 @@ require_relative '../../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 }
-    package_commands = catalog_packages.map { |catalog_package| catalog_package::original_parameters[:command] }.uniq
+    catalog_packages = packages.values.first.catalog.resources.select { |p| p.provider.instance_of?(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|

data/lib/puppet/provider/parsedfile.rb

@@ -72,7 +72,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
       modified(record[:target] || default_target)
     end
 
-    return unless defined?(@modified) and ! @modified.empty?
+    return unless defined?(@modified) and !@modified.empty?
 
     flushed = []
     begin
@@ -187,12 +187,10 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
         # return the should value, so the resource shuts up.
         if @property_hash[attr] or self.class.valid_attr?(self.class.name, attr)
           @property_hash[attr] || :absent
+        elsif defined?(@resource)
+          @resource.should(attr)
         else
-          if defined?(@resource)
-            @resource.should(attr)
-          else
-            nil
-          end
+          nil
         end
       end
 
@@ -469,7 +467,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
     # The 'record' could be a resource or a record, depending on how the provider
     # is initialized.  If we got an empty property hash (probably because the resource
     # is just being initialized), then we want to set up some defaults.
-    @property_hash = self.class.record?(resource[:name]) || {:record_type => self.class.name, :ensure => :absent} if @property_hash.empty?
+    @property_hash = self.class.record?(resource[:name]) || { :record_type => self.class.name, :ensure => :absent } if @property_hash.empty?
   end
 
   # Retrieve the current state from disk.

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

@@ -138,4 +138,3 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
   def stopcmd
   end
 end
-

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

@@ -74,7 +74,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
     # or don't contain a run file
     Dir.entries(path).reject { |e|
       fullpath = File.join(path, e)
-      e =~ /^\./ or ! FileTest.directory?(fullpath) or ! Puppet::FileSystem.exist?(File.join(fullpath,"run"))
+      e =~ /^\./ or !FileTest.directory?(fullpath) or !Puppet::FileSystem.exist?(File.join(fullpath, "run"))
     }.collect do |name|
       new(:name => name, :path => path)
     end
@@ -88,7 +88,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
   # find the service dir on this node
   def servicedir
     unless @servicedir
-      ["/service", "/etc/service","/var/lib/svscan"].each do |path|
+      ["/service", "/etc/service", "/var/lib/svscan"].each do |path|
         if Puppet::FileSystem.exist?(path)
           @servicedir = path
           break
@@ -122,7 +122,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
         return :running
       end
     rescue Puppet::ExecutionFailure => detail
-      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
     :stopped
   end
@@ -130,11 +130,11 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
   def setupservice
     if resource[:manifest]
       Puppet.notice "Configuring #{resource[:name]}"
-      command = [ resource[:manifest], resource[:name] ]
+      command = [resource[:manifest], resource[:name]]
       system("#{command}")
     end
   rescue Puppet::ExecutionFailure => detail
-    raise Puppet::Error.new( "Cannot config #{self.service} to enable it: #{detail}", detail)
+    raise Puppet::Error.new("Cannot config #{self.service} to enable it: #{detail}", detail)
   end
 
   def enabled?
@@ -149,23 +149,23 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
   end
 
   def enable
-    if ! FileTest.directory?(self.daemon)
+    if !FileTest.directory?(self.daemon)
       Puppet.notice "No daemon dir, calling setupservice for #{resource[:name]}"
       self.setupservice
     end
     if self.daemon
-      if ! Puppet::FileSystem.symlink?(self.service)
+      if !Puppet::FileSystem.symlink?(self.service)
         Puppet.notice "Enabling #{self.service}: linking #{self.daemon} -> #{self.service}"
         Puppet::FileSystem.symlink(self.daemon, self.service)
       end
     end
   rescue Puppet::ExecutionFailure
-    raise Puppet::Error.new( "No daemon directory found for #{self.service}", $!)
+    raise Puppet::Error.new("No daemon directory found for #{self.service}", $!)
   end
 
   def disable
     begin
-      if ! FileTest.directory?(self.daemon)
+      if !FileTest.directory?(self.daemon)
         Puppet.notice "No daemon dir, calling setupservice for #{resource[:name]}"
         self.setupservice
       end
@@ -176,7 +176,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
         end
       end
     rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new( "No daemon directory found for #{self.service}", $!)
+      raise Puppet::Error.new("No daemon directory found for #{self.service}", $!)
     end
     self.stop
   end

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

@@ -21,8 +21,8 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
 
   confine :false => Puppet::FileSystem.exist?('/proc/1/comm') && Puppet::FileSystem.read('/proc/1/comm').include?('systemd')
 
-  defaultfor 'os.name' => :cumuluslinux, 'os.release.major' => ['1','2']
-  defaultfor 'os.name' => :debian, 'os.release.major' => ['5','6','7']
+  defaultfor 'os.name' => :cumuluslinux, 'os.release.major' => ['1', '2']
+  defaultfor 'os.name' => :debian, 'os.release.major' => ['5', '6', '7']
   defaultfor 'os.name' => :devuan
 
   # Remove the symlinks

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

@@ -23,7 +23,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
   def rcvar
     rcvar = execute([self.initscript, :rcvar], :failonfail => true, :combine => false, :squelch => false)
     rcvar = rcvar.split("\n")
-    rcvar.delete_if {|str| str =~ /^#\s*$/}
+    rcvar.delete_if { |str| str =~ /^#\s*$/ }
     rcvar[1] = rcvar[1].gsub(/^\$/, '')
     rcvar
   end
@@ -89,24 +89,22 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
     append = "\# Added by Puppet\n#{rcvar}_enable=\"#{yesno}\"\n"
     # First, try the one-file-per-service style
     if Puppet::FileSystem.exist?(rcconf_dir)
-      File.open(rcconf_dir + "/#{service}", File::WRONLY | File::APPEND | File::CREAT, 0644) {
-        |f| f << append
-            self.debug("Appended to #{f.path}")
+      File.open(rcconf_dir + "/#{service}", File::WRONLY | File::APPEND | File::CREAT, 0644) { |f|
+        f << append
+        self.debug("Appended to #{f.path}")
       }
-    else
+    elsif Puppet::FileSystem.exist?(rcconf_local)
       # Else, check the local rc file first, but don't create it
-      if Puppet::FileSystem.exist?(rcconf_local)
-        File.open(rcconf_local, File::WRONLY | File::APPEND) {
-          |f| f << append
-              self.debug("Appended to #{f.path}")
-        }
-      else
-        # At last use the standard rc.conf file
-        File.open(rcconf, File::WRONLY | File::APPEND | File::CREAT, 0644) {
-          |f| f << append
-              self.debug("Appended to #{f.path}")
-        }
-      end
+      File.open(rcconf_local, File::WRONLY | File::APPEND) { |f|
+        f << append
+        self.debug("Appended to #{f.path}")
+      }
+    else
+      # At last use the standard rc.conf file
+      File.open(rcconf, File::WRONLY | File::APPEND | File::CREAT, 0644) { |f|
+        f << append
+        self.debug("Appended to #{f.path}")
+      }
     end
   end
 

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

@@ -138,7 +138,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
 
   def search(name)
     paths.each do |path|
-      fqname = File.join(path,name)
+      fqname = File.join(path, name)
       if Puppet::FileSystem.exist? fqname
         return fqname
       else
@@ -147,7 +147,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     end
 
     paths.each do |path|
-      fqname_sh = File.join(path,"#{name}.sh")
+      fqname_sh = File.join(path, "#{name}.sh")
       if Puppet::FileSystem.exist? fqname_sh
         return fqname_sh
       else
@@ -192,4 +192,3 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     !Puppet::FileSystem.symlink?(file) || Puppet::FileSystem.readlink(file) != "/lib/init/upstart-job"
   end
 end
-

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

@@ -134,7 +134,7 @@ 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 = {}
@@ -160,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
@@ -209,7 +209,7 @@ 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

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

@@ -59,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

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

@@ -10,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

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

@@ -52,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
@@ -69,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
@@ -105,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

@@ -67,4 +67,3 @@ Puppet::Type.type(:service).provide :service do
     service_execute(type, cmd, fof)
   end
 end
-

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

@@ -31,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/ }
@@ -45,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
@@ -76,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
@@ -122,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

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

@@ -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
 
@@ -116,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
@@ -145,4 +145,3 @@ Puppet::Type.type(:service).provide :src, :parent => :base do
     return :stopped
   end
 end
-

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

@@ -16,11 +16,13 @@ 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.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
@@ -233,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

@@ -30,7 +30,7 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
   # 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.
@@ -68,7 +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)
@@ -179,8 +179,8 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
 
   def status
     if (@resource[:hasstatus] == :false) ||
-        @resource[:status] ||
-        ! is_upstart?
+       @resource[:status] ||
+       !is_upstart?
       return super
     end
 
@@ -374,9 +374,7 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
   end
 
   def read_script_from(filename)
-    File.open(filename) do |file|
-      file.read
-    end
+    File.read(filename)
   end
 
   def write_script_to(file, text)