puppet 8.3.1-x86-mingw32 → 8.5.0-x86-mingw32

data/lib/puppet/type/file/mode.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
+
 # Manage file modes.  This state should support different formats
 # for specification (e.g., u+rwx, or -0011), but for now only supports
 # specifying the full mode.
 
-
 module Puppet
   Puppet::Type.type(:file).newproperty(:mode) do
     require_relative '../../../puppet/util/symbolic_file_mode'
@@ -126,6 +126,7 @@ module Puppet
       if provider.respond_to?(:munge_windows_system_group)
         munged_mode = provider.munge_windows_system_group(currentvalue, @should)
         return false if munged_mode.nil?
+
         currentvalue = munged_mode
       end
       stat = @resource.stat
@@ -139,6 +140,7 @@ module Puppet
 
     def property_matches?(current, desired)
       return false unless current
+
       current_bits = normalize_symbolic_mode(current)
       desired_bits = desired_mode_from_current(desired, current).to_s(8)
       current_bits == desired_bits
@@ -177,7 +179,7 @@ module Puppet
       "'#{should_value.rjust(4, '0')}'"
     end
 
-    def is_to_s(currentvalue)
+    def is_to_s(currentvalue) # rubocop:disable Naming/PredicateName
       if currentvalue == :absent
         # This can occur during audits---if a file is transitioning from
         # present to absent the mode will have a value of `:absent`.

data/lib/puppet/type/file/mtime.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet
   Puppet::Type.type(:file).newproperty(:mtime) do
     desc %q{A read-only state to check the file mtime. On \*nix-like systems, this
@@ -13,7 +14,7 @@ module Puppet
       current_value.to_s
     end
 
-    validate do |val|
+    validate do |_val|
       fail "mtime is read-only"
     end
   end

data/lib/puppet/type/file/owner.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet
   Puppet::Type.type(:file).newproperty(:owner) do
     include Puppet::Util::Warnings
@@ -40,7 +41,7 @@ module Puppet
     end
 
     # We want to print names, not numbers
-    def is_to_s(currentvalue)
+    def is_to_s(currentvalue) # rubocop:disable Naming/PredicateName
       super(provider.uid2name(currentvalue) || currentvalue)
     end
 
@@ -49,4 +50,3 @@ module Puppet
     end
   end
 end
-

data/lib/puppet/type/file/selcontext.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Manage SELinux context of files.
 #
 # This code actually manages three pieces of data in the context.
@@ -20,7 +21,6 @@
 #
 # See https://www.nsa.gov/selinux/ for complete docs on SELinux.
 
-
 module Puppet
   require_relative '../../../puppet/util/selinux'
 
@@ -29,6 +29,7 @@ module Puppet
 
     def retrieve
       return :absent unless @resource.stat
+
       context = self.get_selinux_current_context(@resource[:path])
       is = parse_selinux_context(name, context)
       if name == :selrange and selinux_support?
@@ -138,6 +139,4 @@ module Puppet
     @event = :file_changed
     defaultto { self.retrieve_default_context(:selrange) }
   end
-
 end
-

data/lib/puppet/type/file/source.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/content'
 require_relative '../../../puppet/file_serving/metadata'
 require_relative '../../../puppet/file_serving/terminus_helper'
@@ -12,8 +13,8 @@ module Puppet
   # this state, during retrieval, modifies the appropriate other states
   # so that things get taken care of appropriately.
   Puppet::Type.type(:file).newparam(:source) do
-
     attr_accessor :source, :local
+
     desc <<-'EOT'
       A source file, which will be copied into place on the local system. This
       attribute is mutually exclusive with `content` and `target`. Allowed
@@ -186,13 +187,14 @@ module Puppet
       return @metadata if @metadata
 
       return nil unless value
+
       value.each do |source|
         begin
           options = {
-            :environment          => resource.catalog.environment_instance,
-            :links                => resource[:links],
-            :checksum_type        => resource[:checksum],
-            :source_permissions   => resource[:source_permissions]
+            :environment => resource.catalog.environment_instance,
+            :links => resource[:links],
+            :checksum_type => resource[:checksum],
+            :source_permissions => resource[:source_permissions]
           }
 
           data = Puppet::FileServing::Metadata.indirection.find(source, options)
@@ -218,7 +220,7 @@ module Puppet
     end
 
     def server?
-       uri && uri.host && !uri.host.empty?
+      uri && uri.host && !uri.host.empty?
     end
 
     def server
@@ -249,7 +251,7 @@ module Puppet
     end
 
     def found?
-      ! (metadata.nil? or metadata.ftype.nil?)
+      !(metadata.nil? or metadata.ftype.nil?)
     end
 
     def copy_source_value(metadata_method)
@@ -283,7 +285,7 @@ module Puppet
 
     def chunk_file_from_disk(local_path)
       File.open(local_path, "rb") do |src|
-        while chunk = src.read(8192) #rubocop:disable Lint/AssignmentInCondition
+        while chunk = src.read(8192) # rubocop:disable Lint/AssignmentInCondition
           yield chunk
         end
       end
@@ -314,7 +316,7 @@ module Puppet
 
     def get_from_http_source(url, &block)
       client = Puppet.runtime[:http]
-      client.get(url, options: {include_system_store: true}) do |response|
+      client.get(url, options: { include_system_store: true }) do |response|
         raise Puppet::HTTP::ResponseError.new(response) unless response.success?
 
         response.read_body(&block)
@@ -367,14 +369,14 @@ module Puppet
 
     defaultto :ignore
     newvalues(:use, :use_when_creating, :ignore)
-     munge do |value|
+    munge do |value|
       value = value ? value.to_sym : :ignore
       if @resource.file && @resource.line && value != :ignore
-        #TRANSLATORS "source_permissions" is a parameter name and should not be translated
+        # TRANSLATORS "source_permissions" is a parameter name and should not be translated
         Puppet.puppet_deprecation_warning(_("The `source_permissions` parameter is deprecated. Explicitly set `owner`, `group`, and `mode`."), file: @resource.file, line: @resource.line)
       end
 
       value
-     end
+    end
   end
 end

data/lib/puppet/type/file/target.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet
   Puppet::Type.type(:file).newproperty(:target) do
     desc "The target for creating a link.  Currently, symlinks are the
@@ -24,10 +25,10 @@ module Puppet
 
     # Anything else, basically
     newvalue(/./) do
-      @resource[:ensure] = :link if ! @resource.should(:ensure)
+      @resource[:ensure] = :link if !@resource.should(:ensure)
 
       # Only call mklink if ensure didn't call us in the first place.
-      currentensure  = @resource.property(:ensure).retrieve
+      currentensure = @resource.property(:ensure).retrieve
       mklink if @resource.property(:ensure).safe_insync?(currentensure)
     end
 
@@ -64,14 +65,13 @@ module Puppet
     def insync?(currentvalue)
       if [:nochange, :notlink].include?(self.should) or @resource.recurse?
         return true
-      elsif ! @resource.replace? and Puppet::FileSystem.exist?(@resource[:path])
+      elsif !@resource.replace? and Puppet::FileSystem.exist?(@resource[:path])
         return true
       else
         return super(currentvalue)
       end
     end
 
-
     def retrieve
       stat = @resource.stat
       if stat
@@ -86,4 +86,3 @@ module Puppet
     end
   end
 end
-

data/lib/puppet/type/file/type.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet
   Puppet::Type.type(:file).newproperty(:type) do
     require 'etc'
@@ -13,9 +14,8 @@ module Puppet
       current_value
     end
 
-    validate do |val|
+    validate do |_val|
       fail "type is read-only"
     end
   end
 end
-

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,12 +40,12 @@ 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
     # for example "/" or "C:/"
-    [ [ %r{^(/|.+:/|.*[^/])/*\Z}m, [ [ :path ] ] ] ]
+    [[%r{^(/|.+:/|.*[^/])/*\Z}m, [[:path]]]]
   end
 
   newparam(:path) do
@@ -110,17 +110,17 @@ Puppet::Type.newtype(:file) do
       something like an out-of-band rsync task to synchronize the content on all
       primary servers.
 
-      > **Note**: Enabling and using the backup option, and by extension the 
-        filebucket resource, requires appropriate planning and management to ensure 
-        that sufficient disk space is available for the file backups. Generally, you 
+      > **Note**: Enabling and using the backup option, and by extension the
+        filebucket resource, requires appropriate planning and management to ensure
+        that sufficient disk space is available for the file backups. Generally, you
         can implement this using one of the following two options:
-        - Use a `find` command and `crontab` entry to retain only the last X days 
+        - Use a `find` command and `crontab` entry to retain only the last X days
         of file backups. For example:
-        
+
         ```
         find /opt/puppetlabs/server/data/puppetserver/bucket -type f -mtime +45 -atime +45 -print0 | xargs -0 rm
         ```
-        
+
         - Restrict the directory to a maximum size after which the oldest items are removed.
     EOT
 
@@ -401,12 +401,13 @@ Puppet::Type.newtype(:file) do
   end
 
   # Autorequire the owner and group of the file.
-  {:user => :owner, :group => :group}.each do |type, property|
+  { :user => :owner, :group => :group }.each do |type, property|
     autorequire(type) do
       if @parameters.include?(property)
         # 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
@@ -431,7 +432,7 @@ Puppet::Type.newtype(:file) do
     end
     creator_count += 1 if @parameters.include?(:source)
 
-    self.fail _("You cannot specify more than one of %{creators}") % { creators: CREATORS.collect { |p| p.to_s}.join(", ") } if creator_count > 1
+    self.fail _("You cannot specify more than one of %{creators}") % { creators: CREATORS.collect { |p| p.to_s }.join(", ") } if creator_count > 1
 
     self.fail _("You cannot specify a remote recursion without a source") if !self[:source] && self[:recurse] == :remote
 
@@ -459,6 +460,7 @@ Puppet::Type.newtype(:file) do
 
   def self.[](path)
     return nil unless path
+
     super(path.gsub(/\/+/, '/').sub(/\/$/, ''))
   end
 
@@ -468,7 +470,7 @@ Puppet::Type.newtype(:file) do
 
   # Determine the user to write files as.
   def asuser
-    if self.should(:owner) && ! self.should(:owner).is_a?(Symbol)
+    if self.should(:owner) && !self.should(:owner).is_a?(Symbol)
       writeable = Puppet::Util::SUIDManager.asuser(self.should(:owner)) {
         FileTest.writable?(::File.dirname(self[:path]))
       }
@@ -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).compact
 
     # 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 }
-      }
+      other_paths.any? { |p| path[0, p.length] == p }
+    }
   end
 
   # A simple method for determining whether we should be recursing.
@@ -697,11 +700,11 @@ Puppet::Type.newtype(:file) do
   def recurse_local
     result = perform_recursion(self[:path])
     return {} unless result
-    result.inject({}) do |hash, meta|
+
+    result.each_with_object({}) do |meta, hash|
       next hash if meta.relative_path == "."
 
       hash[meta.relative_path] = newchild(meta.relative_path)
-      hash
     end
   end
 
@@ -736,8 +739,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
@@ -746,7 +751,8 @@ Puppet::Type.newtype(:file) do
           data.source = "#{source}/#{data.relative_path}"
         end
       end
-      break result if result and ! result.empty? and sourceselect == :first
+      break result if result and !result.empty? and sourceselect == :first
+
       result
     end.flatten.compact
 
@@ -818,8 +824,8 @@ Puppet::Type.newtype(:file) do
     # metadata in `copy_source_values`, but so it only fails the resource and not
     # 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
+       [:use, :use_when_creating].include?(self[:source_permissions])
+      # 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 +873,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)
+
+      return(stat.ftype == "file")
     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
 
@@ -890,7 +898,7 @@ Puppet::Type.newtype(:file) do
     method = :stat
 
     # Files are the only types that support links
-    if (self.class.name == :file and self[:links] != :follow) or self.class.name == :tidy
+    if (self.instance_of?(Puppet::Type::File) and self[:links] != :follow)
       method = :lstat
     end
 
@@ -955,7 +963,7 @@ Puppet::Type.newtype(:file) do
       end
     else
       umask = mode ? 000 : 022
-      Puppet::Util.withumask(umask) { ::File.open(self[:path], 'wb', mode_int ) { |f| property.write(f) if property } }
+      Puppet::Util.withumask(umask) { ::File.open(self[:path], 'wb', mode_int) { |f| property.write(f) if property } }
     end
 
     # make sure all of the modes are actually correct
@@ -1015,11 +1023,8 @@ Puppet::Type.newtype(:file) do
       # (#18110) Directories cannot be removed without :force,
       # so it doesn't make sense to back them up unless removing with :force.
       true
-    elsif type == "file" or type == "link"
-      true
     else
-      # Including: “blockSpecial”, “characterSpecial”, "fifo", "socket", “unknown”
-      false
+      type == "file" or type == "link"
     end
   end
 
@@ -1056,7 +1061,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 +1093,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 +1119,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(',')
@@ -125,7 +125,7 @@ module Puppet
         newvalue = munge_members_value(newvalue)
 
         if @resource[:auth_membership]
-          newvalue.uniq.sort 
+          newvalue.uniq.sort
         else
           (currentvalue + newvalue).uniq.sort
         end
@@ -214,11 +214,11 @@ 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.
-            
+
             This option relies on your operating system's implementation of `luser*` commands, such as `luseradd` , `lgroupadd`, and `lusermod`. The `forcelocal` option could behave unpredictably in some circumstances. If the tools it depends on are not available, it might have no effect at all."
       defaultto false
     end

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."