puppet 8.2.0-x86-mingw32 → 8.4.0-x86-mingw32

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/error'
 
 Puppet::Type.type(:user).provide :openbsd, :parent => :useradd do
@@ -6,9 +7,9 @@ Puppet::Type.type(:user).provide :openbsd, :parent => :useradd do
     will need to install Ruby's shadow password library (package known as
     `ruby-shadow`) if you wish to manage user passwords."
 
-  commands :add      => "useradd",
-           :delete   => "userdel",
-           :modify   => "usermod",
+  commands :add => "useradd",
+           :delete => "userdel",
+           :modify => "usermod",
            :password => "passwd"
 
   defaultfor 'os.name' => :openbsd
@@ -20,22 +21,22 @@ Puppet::Type.type(:user).provide :openbsd, :parent => :useradd do
   options :password, :method => :sp_pwdp
   options :loginclass, :flag => '-L', :method => :sp_loginclass
   options :expiry, :method => :sp_expire,
-    :munge => proc { |value|
-      if value == :absent
-        ''
-      else
-        # OpenBSD uses a format like "january 1 1970"
-        Time.parse(value).strftime('%B %d %Y')
-      end
-    },
-    :unmunge => proc { |value|
-      if value == -1
-        :absent
-      else
-        # Expiry is days after 1970-01-01
-        (Date.new(1970,1,1) + value).strftime('%Y-%m-%d')
-      end
-    }
+                   :munge => proc { |value|
+                               if value == :absent
+                                 ''
+                               else
+                                 # OpenBSD uses a format like "january 1 1970"
+                                 Time.parse(value).strftime('%B %d %Y')
+                               end
+                             },
+                   :unmunge => proc { |value|
+                                 if value == -1
+                                   :absent
+                                 else
+                                   # Expiry is days after 1970-01-01
+                                   (Date.new(1970,1,1) + value).strftime('%Y-%m-%d')
+                                 end
+                               }
 
   [:expiry, :password, :loginclass].each do |shadow_property|
     define_method(shadow_property) do
@@ -48,7 +49,7 @@ Puppet::Type.type(:user).provide :openbsd, :parent => :useradd do
           begin
             return unmunge(shadow_property, ent.send(method))
           rescue
-            #TRANSLATORS 'ruby-shadow' is a Ruby gem library
+            # TRANSLATORS 'ruby-shadow' is a Ruby gem library
             Puppet.warning _("ruby-shadow doesn't support %{method}") % { method: method }
           end
         end

data/lib/puppet/provider/user/pw.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/provider/nameservice/pw'
 require 'open3'
 
@@ -19,7 +20,6 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::
     value.split("-").reverse.join("-")
   }
 
-
   verify :gid, "GID must be an integer" do |value|
     value.is_a? Integer
   end
@@ -32,6 +32,7 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::
     cmd = [command(:pw), "useradd", @resource[:name]]
     @resource.class.validproperties.each do |property|
       next if property == :ensure or property == :password
+
       value = @resource.should(property)
       if value and value != ""
         cmd << flag(property) << munge(property,value)
@@ -85,7 +86,7 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::
   end
 
   def has_sensitive_data?(property = nil)
-    #Check for sensitive values?
+    # Check for sensitive values?
     properties = property ? [property] : Puppet::Type.type(:user).validproperties
     properties.any? do |prop|
       p = @resource.parameter(prop)

data/lib/puppet/provider/user/user_role_add.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/util'
 require_relative '../../../puppet/util/user_attr'
 require 'date'
 
 Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source => :useradd do
-
   desc "User and role management on Solaris, via `useradd` and `roleadd`."
 
   defaultfor 'os.family' => :solaris
@@ -45,12 +45,13 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
     end
   end
 
-  #must override this to hand the keyvalue pairs
+  # must override this to hand the keyvalue pairs
   def add_properties
     cmd = []
     Puppet::Type.type(:user).validproperties.each do |property|
-      #skip the password because we can't create it with the solaris useradd
+      # skip the password because we can't create it with the solaris useradd
       next if [:ensure, :password, :password_min_age, :password_max_age, :password_warn_days].include?(property)
+
       # 1680 Now you can set the hashed passwords on solaris:lib/puppet/provider/user/user_role_add.rb
       # the value needs to be quoted, mostly because -c might
       # have spaces in it
@@ -84,9 +85,9 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
   end
 
   def run(cmd, msg)
-      execute(cmd)
+    execute(cmd)
   rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error, "Could not #{msg} #{@resource.class.name} #{@resource.name}: #{detail}", detail.backtrace
+    raise Puppet::Error, "Could not #{msg} #{@resource.class.name} #{@resource.name}: #{detail}", detail.backtrace
   end
 
   def transition(type)
@@ -144,12 +145,12 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
 
   def remove_managed_attributes
     managed = managed_attributes
-    user_attributes.select { |k,v| !managed.include?(k) }.inject({}) { |hash, array| hash[array[0]] = array[1]; hash }
+    user_attributes.select { |k,_v| !managed.include?(k) }.inject({}) { |hash, array| hash[array[0]] = array[1]; hash }
   end
 
   def keys
     if user_attributes
-      #we have to get rid of all the keys we are managing another way
+      # we have to get rid of all the keys we are managing another way
       remove_managed_attributes
     end
   end
@@ -166,7 +167,6 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
     run([command(:modify)] + build_keys_cmd(keys_hash) << @resource[:name], "modify attribute key pairs")
   end
 
-
   # This helper makes it possible to test this on stub data without having to
   # do too many crazy things!
   def target_file_path
@@ -174,34 +174,39 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
   end
   private :target_file_path
 
-  #Read in /etc/shadow, find the line for this user (skipping comments, because who knows) and return it
-  #No abstraction, all esoteric knowledge of file formats, yay
+  # Read in /etc/shadow, find the line for this user (skipping comments, because who knows) and return it
+  # No abstraction, all esoteric knowledge of file formats, yay
   def shadow_entry
     return @shadow_entry if defined? @shadow_entry
-    @shadow_entry = File.readlines(target_file_path).
-      reject { |r| r =~ /^[^\w]/ }.
+
+    @shadow_entry = File.readlines(target_file_path)
+      .reject { |r| r =~ /^[^\w]/ }.
       # PUP-229: don't suppress the empty fields
-      collect { |l| l.chomp.split(':', -1) }.
-      find { |user, _| user == @resource[:name] }
+      collect { |l| l.chomp.split(':', -1) }
+      .find { |user, _| user == @resource[:name] }
   end
 
   def password
     return :absent unless shadow_entry
+
     shadow_entry[1]
   end
 
   def password_min_age
     return :absent unless shadow_entry
+
     shadow_entry[3].empty? ? -1 : shadow_entry[3]
   end
 
   def password_max_age
     return :absent unless shadow_entry
+
     shadow_entry[4].empty? ? -1 : shadow_entry[4]
   end
 
   def password_warn_days
     return :absent unless shadow_entry
+
     shadow_entry[5].empty? ? -1 : shadow_entry[5]
   end
 

data/lib/puppet/provider/user/useradd.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/provider/nameservice/objectadd'
 require 'date'
 require_relative '../../../puppet/util/libuser'
@@ -13,7 +14,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     To use the `forcelocal` parameter, you need to install the `libuser` package (providing
     `/usr/sbin/lgroupadd` and `/usr/sbin/luseradd`)."
 
-  commands :add => "useradd", :delete => "userdel", :modify => "usermod", :password => "chage", :chpasswd  => "chpasswd"
+  commands :add => "useradd", :delete => "userdel", :modify => "usermod", :password => "chage", :chpasswd => "chpasswd"
 
   options :home, :flag => "-d", :method => :dir
   options :comment, :method => :gecos
@@ -23,69 +24,76 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
   options :password_warn_days, :flag => "-W", :method => :sp_warn
   options :password, :method => :sp_pwdp
   options :expiry, :method => :sp_expire,
-    :munge => proc { |value|
-      if value == :absent
-        if Puppet.runtime[:facter].value('os.name')=='SLES' && Puppet.runtime[:facter].value('os.release.major') == "11"
-          -1
-        else
-          ''
-        end
-      else
-        case Puppet.runtime[:facter].value('os.name')
-        when 'Solaris'
-          # Solaris uses %m/%d/%Y for useradd/usermod
-          expiry_year, expiry_month, expiry_day = value.split('-')
-          [expiry_month, expiry_day, expiry_year].join('/')
-        else
-          value
-        end
-      end
-    },
-    :unmunge => proc { |value|
-      if value == -1
-        :absent
-      else
-        # Expiry is days after 1970-01-01
-        (Date.new(1970,1,1) + value).strftime('%Y-%m-%d')
-      end
-    }
+                   :munge => proc { |value|
+                               if value == :absent
+                                 if Puppet.runtime[:facter].value('os.name')=='SLES' && Puppet.runtime[:facter].value('os.release.major') == "11"
+                                   -1
+                                 else
+                                   ''
+                                 end
+                               else
+                                 case Puppet.runtime[:facter].value('os.name')
+                                 when 'Solaris'
+                                   # Solaris uses %m/%d/%Y for useradd/usermod
+                                   expiry_year, expiry_month, expiry_day = value.split('-')
+                                   [expiry_month, expiry_day, expiry_year].join('/')
+                                 else
+                                   value
+                                 end
+                               end
+                             },
+                   :unmunge => proc { |value|
+                                 if value == -1
+                                   :absent
+                                 else
+                                   # Expiry is days after 1970-01-01
+                                   (Date.new(1970,1,1) + value).strftime('%Y-%m-%d')
+                                 end
+                               }
 
   optional_commands :localadd => "luseradd", :localdelete => "luserdel", :localmodify => "lusermod", :localpassword => "lchage"
   has_feature :manages_local_users_and_groups if Puppet.features.libuser?
 
   def exists?
     return !!localuid if @resource.forcelocal?
+
     super
   end
 
   def uid
-     return localuid if @resource.forcelocal?
-     get(:uid)
+    return localuid if @resource.forcelocal?
+
+    get(:uid)
   end
 
   def gid
-     return localgid if @resource.forcelocal?
-     get(:gid)
+    return localgid if @resource.forcelocal?
+
+    get(:gid)
   end
 
   def comment
-     return localcomment if @resource.forcelocal?
-     get(:comment)
+    return localcomment if @resource.forcelocal?
+
+    get(:comment)
   end
 
   def shell
     return localshell if @resource.forcelocal?
+
     get(:shell)
   end
 
   def home
     return localhome if @resource.forcelocal?
+
     get(:home)
   end
 
   def groups
-     return localgroups if @resource.forcelocal?
-     super
+    return localgroups if @resource.forcelocal?
+
+    super
   end
 
   def finduser(key, value)
@@ -113,6 +121,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
   def localuid
     user = finduser(:account, resource[:name])
     return user[:uid] if user
+
     false
   end
 
@@ -196,7 +205,6 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
         :sensitive => has_sensitive_data?
       }
       output = execute(cmd, execute_options)
-
     rescue => detail
       tempfile.close
       tempfile.delete
@@ -228,11 +236,11 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     # to ensure consistent behaviour of the useradd provider when
     # using both useradd and luseradd
     if (!@resource.allowdupe?) && @resource.forcelocal?
-       if @resource.should(:uid) && finduser(:uid, @resource.should(:uid).to_s)
-           raise(Puppet::Error, "UID #{@resource.should(:uid)} already exists, use allowdupe to force user creation")
-       end
+      if @resource.should(:uid) && finduser(:uid, @resource.should(:uid).to_s)
+        raise(Puppet::Error, "UID #{@resource.should(:uid)} already exists, use allowdupe to force user creation")
+      end
     elsif @resource.allowdupe? && (!@resource.forcelocal?)
-       return ["-o"]
+      return ["-o"]
     end
     []
   end
@@ -280,6 +288,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     Puppet::Type.type(:user).validproperties.sort.each do |property|
       value = get_value_for_property(property)
       next if value.nil? || property == :password
+
       # the value needs to be quoted, mostly because -c might
       # have spaces in it
       cmd << flag(property) << munge(property, value)
@@ -292,6 +301,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     return nil if property_manages_password_age?(property)
     return nil if property == :groups and @resource.forcelocal?
     return nil if property == :expiry and @resource.forcelocal?
+
     value = @resource.should(property)
     return nil if !value || value == ""
 
@@ -299,7 +309,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
   end
 
   def has_sensitive_data?(property = nil)
-    #Check for sensitive values?
+    # Check for sensitive values?
     properties = property ? [property] : Puppet::Type.type(:user).validproperties
     properties.any? do |prop|
       p = @resource.parameter(prop)

data/lib/puppet/provider/user/windows_adsi.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/util/windows'
 
 Puppet::Type.type(:user).provide :windows_adsi do
@@ -69,6 +70,7 @@ Puppet::Type.type(:user).provide :windows_adsi do
 
   def groups_to_s(groups)
     return '' if groups.nil? || !groups.kind_of?(Array)
+
     groups = groups.map do |group_name|
       sid = Puppet::Util::Windows::SID.name_to_principal(group_name)
       if sid.account =~ /\\/
@@ -138,6 +140,7 @@ Puppet::Type.type(:user).provide :windows_adsi do
     # avoid a LogonUserW style password check when the resource is not yet
     # populated with a password (as is the case with `puppet resource user`)
     return nil if @resource[:password].nil?
+
     user.password_is?( @resource[:password] ) ? @resource[:password] : nil
   end
 
@@ -162,7 +165,7 @@ Puppet::Type.type(:user).provide :windows_adsi do
 
   [:gid, :shell].each do |prop|
     define_method(prop) { nil }
-    define_method("#{prop}=") do |v|
+    define_method("#{prop}=") do |_v|
       fail "No support for managing property #{prop} of user #{@resource[:name]} on Windows"
     end
   end

data/lib/puppet/provider.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # A Provider is an implementation of the actions that manage resources (of some type) on a system.
 # This class is the base class for all implementation of a Puppet Provider.
 #
@@ -198,7 +199,7 @@ class Puppet::Provider
   # @note the name ´has_command´ looks odd in an API context, but makes more sense when seen in the internal
   #   DSL context where a Provider is declaratively defined.
   # @api public
-  #
+  # rubocop:disable Naming/PredicateName
   def self.has_command(name, path, &block)
     name = name.intern
     command = CommandDefiner.define(name, path, self, &block)
@@ -210,6 +211,7 @@ class Puppet::Provider
       return command.execute(*args)
     end
   end
+  # rubocop:enable Naming/PredicateName
 
   # Internal helper class when creating commands - undocumented.
   # @api private
@@ -230,7 +232,7 @@ class Puppet::Provider
       @custom_environment = {}
     end
 
-    def is_optional
+    def is_optional # rubocop:disable Naming/PredicateName
       @optional = true
     end
 
@@ -266,18 +268,14 @@ class Puppet::Provider
   # @api private
   def self.default_match
     return nil if some_default_match(@notdefaults) # Blacklist means this provider cannot be a default
+
     some_default_match(@defaults)
   end
 
   def self.some_default_match(defaultlist)
     defaultlist.find do |default|
       default.all? do |key, values|
-        case key
-          when :feature
-            feature_match(values)
-          else
-            fact_match(key, values)
-        end
+        key == :feature ? feature_match(values) : fact_match(key, values)
       end
     end
   end
@@ -402,6 +400,7 @@ class Puppet::Provider
     [resource_type.validproperties, resource_type.parameters].flatten.each do |attr|
       attr = attr.intern
       next if attr == :name
+
       define_method(attr) do
         if @property_hash[attr].nil?
           :absent
@@ -476,7 +475,7 @@ class Puppet::Provider
 
   dochook(:commands) do
     if @commands.length > 0
-      return "Required binaries: " + @commands.collect do |n, c|
+      return "Required binaries: " + @commands.collect do |_n, c|
         "`#{c}`"
       end.sort.join(", ") + "."
     end
@@ -578,6 +577,7 @@ class Puppet::Provider
   def <=>(other)
     # We can only have ordering against other providers.
     return nil unless other.is_a? Puppet::Provider
+
     # Otherwise, order by the providers class name.
     return self.class.name <=> other.class.name
   end

data/lib/puppet/reference/configuration.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+
 config = Puppet::Util::Reference.newreference(:configuration, :depth => 1, :doc => "A reference for all settings") do
   docs = {}
   Puppet.settings.each do |name, object|
     docs[name] = object
   end
 
-  str = String.new
+  str = ''.dup
   docs.sort { |a, b|
     a[0].to_s <=> b[0].to_s
   }.each do |name, object|
@@ -44,7 +45,7 @@ config = Puppet::Util::Reference.newreference(:configuration, :depth => 1, :doc
     end
 
     # Leave out the section information; it was apparently confusing people.
-    #str << "- **Section**: #{object.section}\n"
+    # str << "- **Section**: #{object.section}\n"
     unless val == ""
       str << "- *Default*: `#{val}`\n"
     end
@@ -54,45 +55,45 @@ config = Puppet::Util::Reference.newreference(:configuration, :depth => 1, :doc
   return str
 end
 
-config.header = <<EOT
-## Configuration settings
-
-* Each of these settings can be specified in `puppet.conf` or on the
-  command line.
-* Puppet Enterprise (PE) and open source Puppet share the configuration settings
-  documented here. However, PE defaults differ from open source defaults for some
-  settings, such as `node_terminus`, `storeconfigs`, `always_retry_plugins`,
-  `disable18n`, `environment_timeout` (when Code Manager is enabled), and the
-  Puppet Server JRuby `max-active-instances` setting. To verify PE configuration
-  defaults, check the `puppet.conf` or `pe-puppet-server.conf` file after
-  installation.
-* When using boolean settings on the command line, use `--setting` and
-  `--no-setting` instead of `--setting (true|false)`. (Using `--setting false`
-  results in "Error: Could not parse application options: needless argument".)
-* Settings can be interpolated as `$variables` in other settings; `$environment`
-  is special, in that puppet master will interpolate each agent node's
-  environment instead of its own.
-* Multiple values should be specified as comma-separated lists; multiple
-  directories should be separated with the system path separator (usually
-  a colon).
-* Settings that represent time intervals should be specified in duration format:
-  an integer immediately followed by one of the units 'y' (years of 365 days),
-  'd' (days), 'h' (hours), 'm' (minutes), or 's' (seconds). The unit cannot be
-  combined with other units, and defaults to seconds when omitted. Examples are
-  '3600' which is equivalent to '1h' (one hour), and '1825d' which is equivalent
-  to '5y' (5 years).
-* If you use the `splay` setting, note that the period that it waits changes
-  each time the Puppet agent is restarted.
-* Settings that take a single file or directory can optionally set the owner,
-  group, and mode for their value: `rundir = $vardir/run { owner = puppet,
-  group = puppet, mode = 644 }`
-* The Puppet executables ignores any setting that isn't relevant to
-  their function.
-
-See the [configuration guide][confguide] for more details.
-
-[confguide]: https://puppet.com/docs/puppet/latest/config_about_settings.html
-
-* * *
-
+config.header = <<~EOT
+  ## Configuration settings
+  
+  * Each of these settings can be specified in `puppet.conf` or on the
+    command line.
+  * Puppet Enterprise (PE) and open source Puppet share the configuration settings
+    documented here. However, PE defaults differ from open source defaults for some
+    settings, such as `node_terminus`, `storeconfigs`, `always_retry_plugins`,
+    `disable18n`, `environment_timeout` (when Code Manager is enabled), and the
+    Puppet Server JRuby `max-active-instances` setting. To verify PE configuration
+    defaults, check the `puppet.conf` or `pe-puppet-server.conf` file after
+    installation.
+  * When using boolean settings on the command line, use `--setting` and
+    `--no-setting` instead of `--setting (true|false)`. (Using `--setting false`
+    results in "Error: Could not parse application options: needless argument".)
+  * Settings can be interpolated as `$variables` in other settings; `$environment`
+    is special, in that puppet master will interpolate each agent node's
+    environment instead of its own.
+  * Multiple values should be specified as comma-separated lists; multiple
+    directories should be separated with the system path separator (usually
+    a colon).
+  * Settings that represent time intervals should be specified in duration format:
+    an integer immediately followed by one of the units 'y' (years of 365 days),
+    'd' (days), 'h' (hours), 'm' (minutes), or 's' (seconds). The unit cannot be
+    combined with other units, and defaults to seconds when omitted. Examples are
+    '3600' which is equivalent to '1h' (one hour), and '1825d' which is equivalent
+    to '5y' (5 years).
+  * If you use the `splay` setting, note that the period that it waits changes
+    each time the Puppet agent is restarted.
+  * Settings that take a single file or directory can optionally set the owner,
+    group, and mode for their value: `rundir = $vardir/run { owner = puppet,
+    group = puppet, mode = 644 }`
+  * The Puppet executables ignores any setting that isn't relevant to
+    their function.
+  
+  See the [configuration guide][confguide] for more details.
+  
+  [confguide]: https://puppet.com/docs/puppet/latest/config_about_settings.html
+  
+  * * *
+  
 EOT

data/lib/puppet/reference/function.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 function = Puppet::Util::Reference.newreference :function, :doc => "All functions available in the parser" do
   Puppet::Parser::Functions.functiondocs
 end