puppet 8.3.1 → 8.4.0

data/lib/puppet/type/file.rb

@@ -1,11 +1,11 @@
 # coding: utf-8
 # frozen_string_literal: true
+
 require 'digest/md5'
 require 'cgi'
 require 'etc'
 require 'uri'
 require 'fileutils'
-require 'enumerator'
 require 'pathname'
 require_relative '../../puppet/parameter/boolean'
 require_relative '../../puppet/util/diff'
@@ -40,7 +40,7 @@ Puppet::Type.newtype(:file) do
      or `recursive_file_permissions` modules from the Forge."
 
   feature :manages_symlinks,
-    "The provider can manage symbolic links."
+          "The provider can manage symbolic links."
 
   def self.title_patterns
     # strip trailing slashes from path but allow the root directory, including
@@ -407,6 +407,7 @@ Puppet::Type.newtype(:file) do
         # The user/group property automatically converts to IDs
         should = @parameters[property].shouldorig
         next unless should
+
         val = should[0]
         if val.is_a?(Integer) or val =~ /^\d+$/
           nil
@@ -459,6 +460,7 @@ Puppet::Type.newtype(:file) do
 
   def self.[](path)
     return nil unless path
+
     super(path.gsub(/\/+/, '/').sub(/\/$/, ''))
   end
 
@@ -542,7 +544,7 @@ Puppet::Type.newtype(:file) do
 
   def flush
     # We want to make sure we retrieve metadata anew on each transaction.
-    @parameters.each do |name, param|
+    @parameters.each do |_name, param|
       param.flush if param.respond_to?(:flush)
     end
     @stat = :needs_stat
@@ -569,8 +571,9 @@ Puppet::Type.newtype(:file) do
 
   # Configure discovered resources to be purged.
   def mark_children_for_purging(children)
-    children.each do |name, child|
+    children.each do |_name, child|
       next if child[:source]
+
       child[:ensure] = :absent
     end
   end
@@ -589,7 +592,7 @@ Puppet::Type.newtype(:file) do
     # or so.  Unfortunately, we don't have a straightforward way to manage
     # the different lifetimes of this data, so we kludge it like this.
     # The right-side hash wins in the merge.
-    options = @original_parameters.merge(:path => full_path).reject { |param, value| value.nil? }
+    options = @original_parameters.merge(:path => full_path).reject { |_param, value| value.nil? }
 
     # These should never be passed to our children.
     [:parent, :ensure, :recurse, :recurselimit, :max_files, :target, :alias, :source].each do |param|
@@ -656,17 +659,17 @@ Puppet::Type.newtype(:file) do
   def self.remove_less_specific_files(files, parent_path, existing_files, &block)
     # REVISIT: is this Windows safe?  AltSeparator?
     mypath = parent_path.split(::File::Separator)
-    other_paths = existing_files.
-      select { |r| (yield r) != parent_path}.
-      collect { |r| (yield r).split(::File::Separator) }.
-      select  { |p| p[0,mypath.length]  == mypath }
+    other_paths = existing_files
+      .select { |r| (yield r) != parent_path}
+      .collect { |r| (yield r).split(::File::Separator) }
+      .select  { |p| p[0,mypath.length] == mypath }
 
     return files if other_paths.empty?
 
     files.reject { |file|
       path = (yield file).split(::File::Separator)
       other_paths.any? { |p| path[0,p.length] == p }
-      }
+    }
   end
 
   # A simple method for determining whether we should be recursing.
@@ -697,6 +700,7 @@ Puppet::Type.newtype(:file) do
   def recurse_local
     result = perform_recursion(self[:path])
     return {} unless result
+
     result.inject({}) do |hash, meta|
       next hash if meta.relative_path == "."
 
@@ -736,8 +740,10 @@ Puppet::Type.newtype(:file) do
       end
 
       next unless result
+
       top = result.find { |r| r.relative_path == "." }
       return [] if top && top.ftype != "directory"
+
       result.each do |data|
         if data.relative_path == '.'
           data.source = source
@@ -747,6 +753,7 @@ Puppet::Type.newtype(:file) do
         end
       end
       break result if result and ! result.empty? and sourceselect == :first
+
       result
     end.flatten.compact
 
@@ -819,7 +826,7 @@ Puppet::Type.newtype(:file) do
     # catalog validation (because that would be a breaking change from Puppet 4).
     if Puppet::Util::Platform.windows? && parameter(:source) &&
       [:use, :use_when_creating].include?(self[:source_permissions])
-      #TRANSLATORS "source_permissions => ignore" should not be translated
+      # TRANSLATORS "source_permissions => ignore" should not be translated
       err_msg = _("Copying owner/mode/group from the source file on Windows is not supported; use source_permissions => ignore.")
       if self[:owner] == nil || self[:group] == nil || self[:mode] == nil
         # Fail on Windows if source permissions are being used and the file resource
@@ -867,12 +874,14 @@ Puppet::Type.newtype(:file) do
     # The user doesn't really care, apparently
     if self[:ensure] == :present
       return true unless stat
+
       return(stat.ftype == "file" ? true : false)
     end
 
     # If we've gotten here, then :ensure isn't set
     return true if self[:content]
     return true if stat and stat.ftype == "file"
+
     false
   end
 
@@ -1056,7 +1065,7 @@ Puppet::Type.newtype(:file) do
   # @return [void]
   def backup_existing
     unless perform_backup
-      #TRANSLATORS refers to a file which could not be backed up
+      # TRANSLATORS refers to a file which could not be backed up
       raise Puppet::Error, _("Could not back up; will not remove")
     end
   end
@@ -1088,6 +1097,7 @@ Puppet::Type.newtype(:file) do
 
       # due to HttpMetadata the checksum type may fallback to mtime, so recheck
       return if SOURCE_ONLY_CHECKSUMS.include?(meta.checksum_type)
+
       meta.checksum
     elsif property && property.name == :content
       str = property.actual_content
@@ -1113,7 +1123,6 @@ Puppet::Type.newtype(:file) do
       thing.sync unless thing.safe_insync?(currentvalue)
     end
   end
-
 end
 
 # We put all of the properties in separate files, because there are so many

data/lib/puppet/type/filebucket.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet
   require_relative '../../puppet/file_bucket/dipper'
 

data/lib/puppet/type/group.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'etc'
 require_relative '../../puppet/property/keyvalue'
 require_relative '../../puppet/parameter/boolean'
@@ -14,16 +15,16 @@ module Puppet
       a group record."
 
     feature :manages_members,
-      "For directories where membership is an attribute of groups not users."
+            "For directories where membership is an attribute of groups not users."
 
     feature :manages_aix_lam,
-      "The provider can manage AIX Loadable Authentication Module (LAM) system."
+            "The provider can manage AIX Loadable Authentication Module (LAM) system."
 
     feature :system_groups,
-      "The provider allows you to create system groups with lower GIDs."
+            "The provider allows you to create system groups with lower GIDs."
 
     feature :manages_local_users_and_groups,
-      "Allows local groups to be managed on systems that also use some other
+            "Allows local groups to be managed on systems that also use some other
        remote Name Switch Service (NSS) method of managing accounts."
 
     ensurable do
@@ -38,7 +39,6 @@ module Puppet
       end
 
       defaultto :present
-
     end
 
     newproperty(:gid) do
@@ -102,7 +102,7 @@ module Puppet
         super(current)
       end
 
-      def is_to_s(currentvalue)
+      def is_to_s(currentvalue) # rubocop:disable Naming/PredicateName
         if provider.respond_to?(:members_to_s)
           currentvalue = '' if currentvalue.nil?
           currentvalue = currentvalue.is_a?(Array) ? currentvalue : currentvalue.split(',')
@@ -214,8 +214,8 @@ module Puppet
     end
 
     newparam(:forcelocal, :boolean => true,
-             :required_features => :manages_local_users_and_groups,
-             :parent => Puppet::Parameter::Boolean) do
+                          :required_features => :manages_local_users_and_groups,
+                          :parent => Puppet::Parameter::Boolean) do
       desc "Forces the management of local accounts when accounts are also
             being managed by some other Name Switch Service (NSS). For AIX, refer to the `ia_load_module` parameter.
             

data/lib/puppet/type/notify.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
+
 #
 # Simple module for logging messages on the client-side
 
-
 module Puppet
   Type.newtype(:notify) do
     @doc = "Sends an arbitrary message, specified as a string, to the agent run-time log. It's important to note that the notify resource type is not idempotent. As a result, notifications are shown as a change on every Puppet run."

data/lib/puppet/type/package.rb

@@ -1,5 +1,6 @@
 # coding: utf-8
 # frozen_string_literal: true
+
 # Define the different packaging systems.  Each package system is implemented
 # in a module, which then gets used to individually extend each package object.
 # This allows packages to exist on the same machine using different packaging
@@ -34,20 +35,20 @@ module Puppet
       resource will autorequire those files."
 
     feature :reinstallable, "The provider can reinstall packages.",
-      :methods => [:reinstall]
+            :methods => [:reinstall]
     feature :installable, "The provider can install packages.",
-      :methods => [:install]
+            :methods => [:install]
     feature :uninstallable, "The provider can uninstall packages.",
-      :methods => [:uninstall]
+            :methods => [:uninstall]
     feature :upgradeable, "The provider can upgrade to the latest version of a
         package.  This feature is used by specifying `latest` as the
         desired value for the package.",
-      :methods => [:update, :latest]
+            :methods => [:update, :latest]
     feature :purgeable, "The provider can purge packages.  This generally means
         that all traces of the package are removed, including
         existing configuration files.  This feature is thus destructive
         and should be used with the utmost care.",
-      :methods => [:purge]
+            :methods => [:purge]
     feature :versionable, "The provider is capable of interrogating the
         package database for installed version(s), and can select
         which out of a set of available versions of a package to
@@ -57,7 +58,7 @@ module Puppet
         such that they are not automatically upgraded as a result of
         other package dependencies unless explicit action is taken by
         a user or another package.",
-      :methods => [:hold, :unhold]
+            :methods => [:hold, :unhold]
     feature :install_only, "The provider accepts options to only install packages never update (kernels, etc.)"
     feature :install_options, "The provider accepts options to be
       passed to the installer command."
@@ -65,12 +66,12 @@ module Puppet
       passed to the uninstaller command."
     feature :disableable, "The provider can disable packages. This feature is used by specifying `disabled` as the
       desired value for the package.",
-      :methods => [:disable]
+            :methods => [:disable]
     feature :supports_flavors, "The provider accepts flavors, which are specific variants of packages."
     feature :package_settings, "The provider accepts package_settings to be
       ensured for the given package. The meaning and format of these settings is
       provider-specific.",
-      :methods => [:package_settings_insync?, :package_settings, :package_settings=]
+            :methods => [:package_settings_insync?, :package_settings, :package_settings=]
     feature :virtual_packages, "The provider accepts virtual package names for install and uninstall."
 
     feature :targetable, "The provider accepts a targeted package management command."
@@ -165,7 +166,7 @@ module Puppet
 
             # Don't run 'latest' more than about every 5 minutes
             if @latest and ((Time.now.to_i - @lateststamp) / 60) < 5
-              #self.debug "Skipping latest check"
+              # self.debug "Skipping latest check"
             else
               begin
                 @latest = provider.latest
@@ -178,19 +179,18 @@ module Puppet
             end
 
             case
-              when is.is_a?(Array) && is.include?(@latest)
-                return true
-              when is == @latest
-                return true
-              when is == :present
-                # This will only happen on packaging systems
-                # that can't query versions.
-                return true
-              else
-                self.debug "#{@resource.name} #{is.inspect} is installed, latest is #{@latest.inspect}"
+            when is.is_a?(Array) && is.include?(@latest)
+              return true
+            when is == @latest
+              return true
+            when is == :present
+              # This will only happen on packaging systems
+              # that can't query versions.
+              return true
+            else
+              self.debug "#{@resource.name} #{is.inspect} is installed, latest is #{@latest.inspect}"
             end
 
-
           when :absent
             return true if is == :absent || is == :purged
           when :purged
@@ -395,7 +395,7 @@ module Puppet
         end
       end
 
-      def is_to_s(currentvalue)
+      def is_to_s(currentvalue) # rubocop:disable Naming/PredicateName
         if provider.respond_to?(:package_settings_is_to_s)
           provider.package_settings_is_to_s(should, currentvalue)
         else

data/lib/puppet/type/resources.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet'
 require_relative '../../puppet/parameter/boolean'
 
@@ -8,6 +9,7 @@ Puppet::Type.newtype(:resources) do
     so you can purge unmanaged resources but set `noop` to true so the
     purging is only logged and does not actually happen."
 
+  apply_to_all
 
   newparam(:name) do
     desc "The name of the type to be managed."
@@ -77,22 +79,22 @@ Puppet::Type.newtype(:resources) do
       value = [value] unless value.is_a? Array
       value.flatten.collect do |v|
         case v
-          when Integer
-            v
-          when String
-            Integer(v)
-          else
-            raise ArgumentError, _("Invalid value %{value}.") % { value: v.inspect }
+        when Integer
+          v
+        when String
+          Integer(v)
+        else
+          raise ArgumentError, _("Invalid value %{value}.") % { value: v.inspect }
         end
       end
     end
   end
 
   WINDOWS_SYSTEM_SID_REGEXES =
-      # Administrator, Guest, Domain Admins, Schema Admins, Enterprise Admins.
-      # https://support.microsoft.com/en-us/help/243330/well-known-security-identifiers-in-windows-operating-systems
-      [/S-1-5-21.+-500/, /S-1-5-21.+-501/, /S-1-5-21.+-512/, /S-1-5-21.+-518/,
-       /S-1-5-21.+-519/]
+    # Administrator, Guest, Domain Admins, Schema Admins, Enterprise Admins.
+    # https://support.microsoft.com/en-us/help/243330/well-known-security-identifiers-in-windows-operating-systems
+    [/S-1-5-21.+-500/, /S-1-5-21.+-501/, /S-1-5-21.+-512/, /S-1-5-21.+-518/,
+     /S-1-5-21.+-519/]
 
   def check(resource)
     @checkmethod ||= "#{self[:name]}_check"
@@ -105,22 +107,23 @@ Puppet::Type.newtype(:resources) do
   end
 
   def able_to_ensure_absent?(resource)
-      resource[:ensure] = :absent
+    resource[:ensure] = :absent
   rescue ArgumentError, Puppet::Error
-      err _("The 'ensure' attribute on %{name} resources does not accept 'absent' as a value") % { name: self[:name] }
-      false
+    err _("The 'ensure' attribute on %{name} resources does not accept 'absent' as a value") % { name: self[:name] }
+    false
   end
 
   # Generate any new resources we need to manage.  This is pretty hackish
   # right now, because it only supports purging.
   def generate
     return [] unless self.purge?
-    resource_type.instances.
-      reject { |r| catalog.resource_refs.include? r.ref }.
-      select { |r| check(r) }.
-      select { |r| r.class.validproperty?(:ensure) }.
-      select { |r| able_to_ensure_absent?(r) }.
-      each { |resource|
+
+    resource_type.instances
+      .reject { |r| catalog.resource_refs.include? r.ref }
+      .select { |r| check(r) }
+      .select { |r| r.class.validproperty?(:ensure) }
+      .select { |r| able_to_ensure_absent?(r) }
+      .each { |resource|
         resource.copy_metaparams(@parameters)
         resource.purging
       }
@@ -132,6 +135,7 @@ Puppet::Type.newtype(:resources) do
       unless type
         raise Puppet::DevError, _("Could not find resource type")
       end
+
       @resource_type = type
     end
     @resource_type
@@ -141,6 +145,7 @@ Puppet::Type.newtype(:resources) do
   def user_check(resource)
     return true unless self[:name] == "user"
     return true unless self[:unless_system_user]
+
     resource[:audit] = :uid
     current_values = resource.retrieve_resource
     current_uid = current_values[resource.property(:uid)]
@@ -148,6 +153,7 @@ Puppet::Type.newtype(:resources) do
 
     return false if system_users.include?(resource[:name])
     return false if unless_uids && unless_uids.include?(current_uid)
+
     if current_uid.is_a?(String)
       # Windows user; is a system user if any regex matches.
       WINDOWS_SYSTEM_SID_REGEXES.none? { |regex| current_uid =~ regex }
@@ -171,12 +177,11 @@ Puppet::Type.newtype(:resources) do
     end
 
     # Otherwise, use a sensible default based on the OS family
-    @system_users_max_uid ||= case Puppet.runtime[:facter].value('os.family')
-      when 'OpenBSD', 'FreeBSD'
-        999
-      else
-        499
-    end
+    @system_users_max_uid ||=
+      case Puppet.runtime[:facter].value('os.family')
+      when 'OpenBSD', 'FreeBSD' then 999
+      else                           499
+      end
 
     @system_users_max_uid
   end

data/lib/puppet/type/schedule.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet
   Type.newtype(:schedule) do
     @doc = <<-'EOT'
@@ -54,7 +55,7 @@ module Puppet
       resource could be checked & applied multiple times in the schedule as
       the information about when the resource was last checked will have
       expired from the cache.
-      EOT
+    EOT
 
     apply_to_all
 
@@ -72,7 +73,7 @@ module Puppet
               schedule => 'everyday',
             }
 
-        EOT
+      EOT
       isnamevar
     end
 
@@ -99,7 +100,7 @@ module Puppet
       validate do |values|
         values = [values] unless values.is_a?(Array)
         values.each { |value|
-          unless  value.is_a?(String) and
+          unless value.is_a?(String) and
               value =~ /\d+(:\d+){0,2}\s*-\s*\d+(:\d+){0,2}/
             self.fail _("Invalid range value '%{value}'") % { value: value }
           end
@@ -280,7 +281,7 @@ module Puppet
       validate do |value|
         unless value.is_a?(Integer) or value =~ /^\d+$/
           raise Puppet::Error,
-            _("Repeat must be a number")
+                _("Repeat must be a number")
         end
 
         # This implicitly assumes that 'periodmatch' is distance -- that
@@ -289,7 +290,7 @@ module Puppet
 
         if value != 1 and @resource[:periodmatch] != :distance
           raise Puppet::Error,
-            _("Repeat must be 1 unless periodmatch is 'distance', not '%{period}'") % { period: @resource[:periodmatch] }
+                _("Repeat must be 1 unless periodmatch is 'distance', not '%{period}'") % { period: @resource[:periodmatch] }
         end
       end
 
@@ -382,6 +383,7 @@ module Puppet
         return true if @resource[:range]
 
         return true if value.has_key?(now.wday)
+
         false
       end
     end
@@ -399,8 +401,7 @@ module Puppet
 
       Puppet.debug "Creating default schedules"
 
-            result << self.new(
-
+      result << self.new(
         :name => "puppet",
         :period => :hourly,
 
@@ -409,8 +410,7 @@ module Puppet
 
       # And then one for every period
       @parameters.find { |p| p.name == :period }.value_collection.values.each { |value|
-
-              result << self.new(
+        result << self.new(
           :name => value.to_s,
           :period => value
         )
@@ -420,7 +420,6 @@ module Puppet
     end
 
     def match?(previous = nil, now = nil)
-
       # If we've got a value, then convert it to a Time instance
       previous &&= Time.at(previous)
 

data/lib/puppet/type/service.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
+
 # This is our main way of managing processes right now.
 #
 # a service is distinct from a process in that services
 # can only be managed through the interface of an init script
 # which is why they have a search path for initscripts and such
 
-
 module Puppet
-
   Type.newtype(:service) do
     @doc = "Manage running services.  Service support unfortunately varies
       widely by platform --- some platforms have very little if any concept of a
@@ -34,23 +33,23 @@ module Puppet
       * If you do neither, the service's stop and start commands will be used."
 
     feature :refreshable, "The provider can restart the service.",
-      :methods => [:restart]
+            :methods => [:restart]
 
     feature :enableable, "The provider can enable and disable the service.",
-      :methods => [:disable, :enable, :enabled?]
+            :methods => [:disable, :enable, :enabled?]
 
     feature :delayed_startable, "The provider can set service to delayed start",
-      :methods => [:delayed_start]
+            :methods => [:delayed_start]
 
     feature :manual_startable, "The provider can set service to manual start",
-      :methods => [:manual_start]
+            :methods => [:manual_start]
 
     feature :controllable, "The provider uses a control variable."
 
     feature :flaggable, "The provider can pass flags to the service."
 
     feature :maskable, "The provider can 'mask' the service.",
-      :methods => [:mask]
+            :methods => [:mask]
 
     feature :configurable_timeout, "The provider can specify a minumum timeout for syncing service properties"
 
@@ -94,6 +93,7 @@ module Puppet
 
       def insync?(current)
         return provider.enabled_insync?(current) if provider.respond_to?(:enabled_insync?)
+
         super(current)
       end
     end
@@ -141,6 +141,7 @@ module Puppet
 
       def insync?(current)
         return provider.logonaccount_insync?(current) if provider.respond_to?(:logonaccount_insync?)
+
         super(current)
       end
     end
@@ -279,6 +280,7 @@ module Puppet
         begin
           value = value.to_i
           raise if value < 1
+
           value
         rescue
           raise Puppet::Error.new(_("\"%{value}\" is not a positive integer: the timeout parameter must be specified as a positive integer") % { value: value })

data/lib/puppet/type/stage.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Type.newtype(:stage) do
   desc "A resource type for creating new run stages.  Once a stage is available,
     classes can be assigned to it by declaring them with the resource-like syntax