puppet 8.3.1-x64-mingw32 → 8.4.0-x64-mingw32

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

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

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Manage systemd services using systemctl
 
 require_relative '../../../puppet/file_system'
@@ -19,7 +20,8 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
   defaultfor 'os.family' => :redhat, 'os.name' => :fedora
   defaultfor 'os.family' => :suse
   defaultfor 'os.family' => :coreos
-  defaultfor 'os.name' => :amazon, 'os.release.major' => ["2"]
+  defaultfor 'os.family' => :gentoo
+  defaultfor 'os.name' => :amazon, 'os.release.major' => ["2", "2023"]
   defaultfor 'os.name' => :debian
   notdefaultfor 'os.name' => :debian, 'os.release.major' => ["5", "6", "7"] # These are using the "debian" method
   defaultfor 'os.name' => :LinuxMint
@@ -30,7 +32,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
 
   def self.instances
     i = []
-    output = systemctl('list-unit-files', '--type', 'service', '--full', '--all',  '--no-pager')
+    output = systemctl('list-unit-files', '--type', 'service', '--full', '--all', '--no-pager')
     output.scan(/^(\S+)\s+(disabled|enabled|masked|indirect|bad|static)\s*([^-]\S+)?\s*$/i).each do |m|
       Puppet.debug("#{m[0]} marked as bad by `systemctl`. It is recommended to be further checked.") if m[1] == "bad"
       i << new(:name => m[0])
@@ -40,8 +42,8 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
     return []
   end
 
-  # Static services cannot be enabled or disabled manually. Indirect services 
-  # should not be enabled or disabled due to limitations in systemd (see 
+  # Static services cannot be enabled or disabled manually. Indirect services
+  # should not be enabled or disabled due to limitations in systemd (see
   # https://github.com/systemd/systemd/issues/6681).
   def enabled_insync?(current)
     case cached_enabled?[:output]
@@ -91,6 +93,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
 
   def cached_enabled?
     return @cached_enabled if @cached_enabled
+
     cmd = [command(:systemctl), 'is-enabled', '--', @resource[:name]]
     result = execute(cmd, :failonfail => false)
     @cached_enabled = { output: result.chomp, exitcode: result.exitstatus }
@@ -111,6 +114,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
     # The indirect state indicates that the unit is not enabled.
     return :false if output == 'indirect'
     return :true if (code == 0)
+
     if (output.empty?) && (code > 0) && (Puppet.runtime[:facter].value('os.family').casecmp('debian').zero?)
       ret = debian_enabled?
       return ret if ret

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

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:service).provide :upstart, :parent => :debian do
   START_ON = /^\s*start\s+on/
   COMMENTED_START_ON = /^\s*#+\s*start\s+on/
-  MANUAL   = /^\s*manual\s*$/
+  MANUAL = /^\s*manual\s*$/
 
   desc "Ubuntu service management with `upstart`.
 
@@ -20,10 +21,10 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
   defaultfor 'os.name' => :ubuntu, 'os.release.major' => ["10.04", "12.04", "14.04", "14.10"]
   defaultfor 'os.name' => :LinuxMint, 'os.release.major' => ["10", "11", "12", "13", "14", "15", "16", "17"]
 
-  commands :start   => "/sbin/start",
-           :stop    => "/sbin/stop",
+  commands :start => "/sbin/start",
+           :stop => "/sbin/stop",
            :restart => "/sbin/restart",
-           :status_exec  => "/sbin/status",
+           :status_exec => "/sbin/status",
            :initctl => "/sbin/initctl"
 
   # We only want to use upstart as our provider if the upstart daemon is running.
@@ -67,7 +68,6 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
     excludes
   end
 
-
   def self.get_services(exclude=[])
     instances = []
     execpipe("#{command(:initctl)} list") { |process|
@@ -174,7 +174,7 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
   end
 
   def statuscmd
-    is_upstart? ? nil : super #this is because upstart is broken with its return codes
+    is_upstart? ? nil : super # this is because upstart is broken with its return codes
   end
 
   def status
@@ -192,7 +192,8 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
     end
   end
 
-private
+  private
+
   def is_upstart?(script = initscript)
     Puppet::FileSystem.exist?(script) && script.match(/\/etc\/init\/\S+\.conf/)
   end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
+
 # Windows Service Control Manager (SCM) provider
 
 Puppet::Type.type(:service).provide :windows, :parent => :service do
-
   desc <<-EOT
     Support for Windows Service Control Manager (SCM). This provider can
     start, stop, enable, and disable services, and the SCM provides working
@@ -47,18 +47,16 @@ Puppet::Type.type(:service).provide :windows, :parent => :service do
     start_type = Puppet::Util::Windows::Service.service_start_type(@resource[:name])
     debug("Service #{@resource[:name]} start type is #{start_type}")
     case start_type
-      when :SERVICE_AUTO_START,
-           :SERVICE_BOOT_START,
-           :SERVICE_SYSTEM_START
-        :true
-      when :SERVICE_DEMAND_START
-        :manual
-      when :SERVICE_DELAYED_AUTO_START
-        :delayed
-      when :SERVICE_DISABLED
-        :false
-      else
-        raise Puppet::Error.new(_("Unknown start type: %{start_type}") % { start_type: start_type })
+    when :SERVICE_AUTO_START, :SERVICE_BOOT_START, :SERVICE_SYSTEM_START
+      :true
+    when :SERVICE_DEMAND_START
+      :manual
+    when :SERVICE_DELAYED_AUTO_START
+      :delayed
+    when :SERVICE_DISABLED
+      :false
+    else
+      raise Puppet::Error.new(_("Unknown start type: %{start_type}") % { start_type: start_type })
     end
   rescue => detail
     raise Puppet::Error.new(_("Cannot get start type %{resource_name}, error was: %{detail}") % { resource_name: @resource[:name], detail: detail }, detail )
@@ -96,19 +94,15 @@ Puppet::Type.type(:service).provide :windows, :parent => :service do
 
     current_state = Puppet::Util::Windows::Service.service_state(@resource[:name])
     state = case current_state
-      when :SERVICE_STOPPED,
-           :SERVICE_STOP_PENDING
-        :stopped
-      when :SERVICE_PAUSED,
-           :SERVICE_PAUSE_PENDING
-        :paused
-      when :SERVICE_RUNNING,
-           :SERVICE_CONTINUE_PENDING,
-           :SERVICE_START_PENDING
-        :running
-      else
-        raise Puppet::Error.new(_("Unknown service state '%{current_state}' for service '%{resource_name}'") % { current_state: current_state, resource_name: @resource[:name] })
-    end
+            when :SERVICE_STOPPED, :SERVICE_STOP_PENDING
+              :stopped
+            when :SERVICE_PAUSED, :SERVICE_PAUSE_PENDING
+              :paused
+            when :SERVICE_RUNNING, :SERVICE_CONTINUE_PENDING, :SERVICE_START_PENDING
+              :running
+            else
+              raise Puppet::Error.new(_("Unknown service state '%{current_state}' for service '%{resource_name}'") % { current_state: current_state, resource_name: @resource[:name] })
+            end
     debug("Service #{@resource[:name]} is #{current_state}")
     state
   rescue => detail
@@ -140,6 +134,7 @@ Puppet::Type.type(:service).provide :windows, :parent => :service do
 
   def logonaccount
     return unless Puppet::Util::Windows::Service.exists?(@resource[:name])
+
     Puppet::Util::Windows::Service.logon_account(@resource[:name])
   end
 
@@ -163,6 +158,7 @@ Puppet::Type.type(:service).provide :windows, :parent => :service do
     @logonaccount_information ||= Puppet::Util::Windows::SID.name_to_principal(logon_account)
     return logon_account unless @logonaccount_information
     return ".\\#{@logonaccount_information.account}" if @logonaccount_information.domain == Puppet::Util::Windows::ADSI.computer_name
+
     @logonaccount_information.domain_account
   end
 

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # User Puppet provider for AIX. It uses standard commands to manage users:
 #  mkuser, rmuser, lsuser, chuser
 #
@@ -66,7 +67,7 @@ Puppet::Type.type(:user).provide :aix, :parent => Puppet::Provider::AixObject do
       return :absent if expires == '0'
 
       unless (match_obj = /\A(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)\z/.match(expires))
-        #TRANSLATORS 'AIX' is the name of an operating system and should not be translated
+        # TRANSLATORS 'AIX' is the name of an operating system and should not be translated
         Puppet.warning(_("Could not convert AIX expires date '%{expires}' on %{class_name}[%{resource_name}]") % { expires: expires, class_name: provider.resource.class.name, resource_name: provider.resource.name })
         return :absent
       end
@@ -230,7 +231,7 @@ Puppet::Type.type(:user).provide :aix, :parent => Puppet::Provider::AixObject do
       if output != ""
         raise Puppet::ExecutionFailure, "chpasswd said #{output}"
       end
-    rescue Puppet::ExecutionFailure  => detail
+    rescue Puppet::ExecutionFailure => detail
       raise Puppet::Error, "Could not set password on #{@resource.class.name}[#{@resource.name}]: #{detail}", detail.backtrace
     ensure
       if tempfile

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet'
 require_relative '../../../puppet/util/plist' if Puppet.features.cfpropertylist?
 require 'base64'
@@ -6,9 +7,9 @@ require 'base64'
 Puppet::Type.type(:user).provide :directoryservice do
   desc "User management on OS X."
 
-##                   ##
-## Provider Settings ##
-##                   ##
+  ##                   ##
+  ## Provider Settings ##
+  ##                   ##
 
   # Provider command declarations
   commands :uuidgen      => '/usr/bin/uuidgen'
@@ -18,7 +19,7 @@ Puppet::Type.type(:user).provide :directoryservice do
 
   # Provider confines and defaults
   confine    'os.name' => :darwin
-  confine    :feature         => :cfpropertylist
+  confine    :feature => :cfpropertylist
   defaultfor 'os.name' => :darwin
 
   # Need this to create getter/setter methods automagically
@@ -31,29 +32,29 @@ Puppet::Type.type(:user).provide :directoryservice do
   # 10.8 Passwords use a PBKDF2 salt value
   has_features :manages_password_salt
 
-  #provider can set the user's shell
+  # provider can set the user's shell
   has_feature :manages_shell
 
-##               ##
-## Class Methods ##
-##               ##
+  ##               ##
+  ## Class Methods ##
+  ##               ##
 
   # This method exists to map the dscl values to the correct Puppet
   # properties. This stays relatively consistent, but who knows what
   # Apple will do next year...
   def self.ds_to_ns_attribute_map
     {
-      'RecordName'       => :name,
-      'PrimaryGroupID'   => :gid,
+      'RecordName' => :name,
+      'PrimaryGroupID' => :gid,
       'NFSHomeDirectory' => :home,
-      'UserShell'        => :shell,
-      'UniqueID'         => :uid,
-      'RealName'         => :comment,
-      'Password'         => :password,
-      'GeneratedUID'     => :guid,
-      'IPAddress'        => :ip_address,
-      'ENetAddress'      => :en_address,
-      'GroupMembership'  => :members,
+      'UserShell' => :shell,
+      'UniqueID' => :uid,
+      'RealName' => :comment,
+      'Password' => :password,
+      'GeneratedUID' => :guid,
+      'IPAddress' => :ip_address,
+      'ENetAddress' => :en_address,
+      'GroupMembership' => :members,
     }
   end
 
@@ -105,19 +106,20 @@ Puppet::Type.type(:user).provide :directoryservice do
     input_hash.each_key do |key|
       ds_attribute = key.sub("dsAttrTypeStandard:", "")
       next unless ds_to_ns_attribute_map.keys.include?(ds_attribute)
+
       ds_value = input_hash[key]
       case ds_to_ns_attribute_map[ds_attribute]
-        when :gid, :uid
-          # OS X stores objects like uid/gid as strings.
-          # Try casting to an integer for these cases to be
-          # consistent with the other providers and the group type
-          # validation
-          begin
-            ds_value = Integer(ds_value[0])
-          rescue ArgumentError
-            ds_value = ds_value[0]
-          end
-        else ds_value = ds_value[0]
+      when :gid, :uid
+        # OS X stores objects like uid/gid as strings.
+        # Try casting to an integer for these cases to be
+        # consistent with the other providers and the group type
+        # validation
+        begin
+          ds_value = Integer(ds_value[0])
+        rescue ArgumentError
+          ds_value = ds_value[0]
+        end
+      else ds_value = ds_value[0]
       end
       attribute_hash[ds_to_ns_attribute_map[ds_attribute]] = ds_value
     end
@@ -160,13 +162,17 @@ Puppet::Type.type(:user).provide :directoryservice do
   end
 
   def self.get_os_version
+    # rubocop:disable Naming/MemoizedInstanceVariableName
     @os_version ||= Puppet.runtime[:facter].value('os.macosx.version.major')
+    # rubocop:enable Naming/MemoizedInstanceVariableName
   end
 
   # Use dscl to retrieve an array of hashes containing attributes about all
   # of the local groups on the machine.
   def self.get_list_of_groups
+    # rubocop:disable Naming/MemoizedInstanceVariableName
     @groups ||= Puppet::Util::Plist.parse_plist(dscl '-plist', '.', 'readall', '/Groups')
+    # rubocop:enable Naming/MemoizedInstanceVariableName
   end
 
   # Perform a dscl lookup at the path specified for the specific keyname
@@ -213,6 +219,7 @@ Puppet::Type.type(:user).provide :directoryservice do
       if value == nil
         raise Puppet::Error, "Invalid #{field} given for user #{user_name}"
       end
+
       value.unpack('H*').first
     when 'iterations'
       Integer(embedded_binary_plist['SALTED-SHA512-PBKDF2'][field])
@@ -228,6 +235,7 @@ Puppet::Type.type(:user).provide :directoryservice do
     password_hash_file = "#{password_hash_dir}/#{guid}"
     if Puppet::FileSystem.exist?(password_hash_file) and File.file?(password_hash_file)
       raise Puppet::Error, "Could not read password hash file at #{password_hash_file}" if not File.readable?(password_hash_file)
+
       f = File.new(password_hash_file)
       password_hash = f.read
       f.close
@@ -235,10 +243,9 @@ Puppet::Type.type(:user).provide :directoryservice do
     password_hash
   end
 
-
-##                   ##
-## Ensurable Methods ##
-##                   ##
+  ##                   ##
+  ## Ensurable Methods ##
+  ##                   ##
 
   def exists?
     begin
@@ -265,6 +272,7 @@ Puppet::Type.type(:user).provide :directoryservice do
     # Iterate through valid User type properties
     valid_properties.each do |attribute|
       next if attribute == :ensure
+
       value = @resource.should(attribute)
 
       # Value defaults
@@ -318,9 +326,9 @@ Puppet::Type.type(:user).provide :directoryservice do
     dscl '.', '-delete', "/Users/#{@resource.name}"
   end
 
-##                       ##
-## Getter/Setter Methods ##
-##                       ##
+  ##                       ##
+  ## Getter/Setter Methods ##
+  ##                       ##
 
   # In the setter method we're only going to take action on groups for which
   # the user is not currently a member.
@@ -350,7 +358,7 @@ Puppet::Type.type(:user).provide :directoryservice do
       end
     else
       if value.length != 256
-         raise Puppet::Error, "OS X versions > 10.7 require a Salted SHA512 PBKDF2 password hash of 256 characters. Please check your password and try again."
+        raise Puppet::Error, "OS X versions > 10.7 require a Salted SHA512 PBKDF2 password hash of 256 characters. Please check your password and try again."
       end
 
       assert_full_pbkdf2_password
@@ -446,6 +454,7 @@ Puppet::Type.type(:user).provide :directoryservice do
         if %w(home uid).include?(setter_method)
           raise Puppet::Error, "OS X version #{self.class.get_os_version} does not allow changing #{setter_method} using puppet"
         end
+
         begin
           dscl '.', '-change', "/Users/#{resource.name}", self.class.ns_to_ds_attribute_map[setter_method.intern], @property_hash[setter_method.intern], value
         rescue Puppet::ExecutionFailure => e
@@ -463,7 +472,6 @@ Puppet::Type.type(:user).provide :directoryservice do
     end
   end
 
-
   ##                ##
   ## Helper Methods ##
   ##                ##
@@ -472,7 +480,7 @@ Puppet::Type.type(:user).provide :directoryservice do
     missing = [:password, :salt, :iterations].select { |parameter| @resource[parameter].nil? }
 
     if !missing.empty?
-       raise Puppet::Error, "OS X versions > 10\.7 use PBKDF2 password hashes, which requires all three of salt, iterations, and password hash. This resource is missing: #{missing.join(', ')}."
+      raise Puppet::Error, "OS X versions > 10\.7 use PBKDF2 password hashes, which requires all three of salt, iterations, and password hash. This resource is missing: #{missing.join(', ')}."
     end
   end
 
@@ -504,7 +512,7 @@ Puppet::Type.type(:user).provide :directoryservice do
 
   # Create the new user with dscl
   def create_new_user(username)
-    dscl '.', '-create',  "/Users/#{username}"
+    dscl '.', '-create', "/Users/#{username}"
   end
 
   # Get the next available uid on the system by getting a list of user ids,
@@ -571,7 +579,7 @@ Puppet::Type.type(:user).provide :directoryservice do
   # ShadowHashData key of a user's plist, or false if it doesn't exist.
   def get_shadow_hash_data(users_plist)
     if users_plist['ShadowHashData']
-      password_hash_plist  = users_plist['ShadowHashData'][0]
+      password_hash_plist = users_plist['ShadowHashData'][0]
       self.class.convert_binary_to_hash(password_hash_plist)
     else
       false
@@ -612,9 +620,9 @@ Puppet::Type.type(:user).provide :directoryservice do
   # for information regarding the dsimport syntax
   def write_and_import_shadow_hash_data(data_plist)
     Tempfile.create("dsimport_#{@resource.name}", :encoding => Encoding::ASCII) do |dsimport_file|
-      dsimport_file.write <<-DSIMPORT
-0x0A 0x5C 0x3A 0x2C dsRecTypeStandard:Users 2 dsAttrTypeStandard:RecordName base64:dsAttrTypeNative:ShadowHashData
-#{@resource.name}:#{Base64.strict_encode64(data_plist)}
+      dsimport_file.write <<~DSIMPORT
+        0x0A 0x5C 0x3A 0x2C dsRecTypeStandard:Users 2 dsAttrTypeStandard:RecordName base64:dsAttrTypeNative:ShadowHashData
+        #{@resource.name}:#{Base64.strict_encode64(data_plist)}
       DSIMPORT
       dsimport_file.flush
       # Delete the user's existing ShadowHashData, since dsimport appends, not replaces

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:user).provide :hpuxuseradd, :parent => :useradd do
   desc "User management for HP-UX. This provider uses the undocumented `-F`
     switch to HP-UX's special `usermod` binary to work around the fact that
@@ -29,24 +30,24 @@ Puppet::Type.type(:user).provide :hpuxuseradd, :parent => :useradd do
   end
 
   def modifycmd(param,value)
-     cmd = super(param, value)
-     cmd.insert(1,"-F")
-     if trusted then
-       # Append an additional command to reset the password age to 0
-       # until a workaround with expiry module can be found for trusted
-       # computing.
-       cmd << ";"
-       cmd << "/usr/lbin/modprpw"
-       cmd << "-v"
-       cmd << "-l"
-       cmd << "#{resource.name}"
-     end
-     cmd
+    cmd = super(param, value)
+    cmd.insert(1,"-F")
+    if trusted then
+      # Append an additional command to reset the password age to 0
+      # until a workaround with expiry module can be found for trusted
+      # computing.
+      cmd << ";"
+      cmd << "/usr/lbin/modprpw"
+      cmd << "-v"
+      cmd << "-l"
+      cmd << "#{resource.name}"
+    end
+    cmd
   end
 
   def password
     # Password management routine for trusted and non-trusted systems
-    #temp=""
+    # temp=""
     while ent = Etc.getpwent() do # rubocop:disable Lint/AssignmentInCondition
       if ent.name == resource.name
         temp=ent.name

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/provider/ldap'
 
 Puppet::Type.type(:user).provide :ldap, :parent => Puppet::Provider::Ldap do
@@ -18,12 +19,12 @@ Puppet::Type.type(:user).provide :ldap, :parent => Puppet::Provider::Ldap do
   has_feature :manages_passwords, :manages_shell
 
   manages(:posixAccount, :person).at("ou=People").named_by(:uid).and.maps :name => :uid,
-    :password => :userPassword,
-    :comment => :cn,
-    :uid => :uidNumber,
-    :gid => :gidNumber,
-    :home => :homeDirectory,
-    :shell => :loginShell
+                                                                          :password => :userPassword,
+                                                                          :comment => :cn,
+                                                                          :uid => :uidNumber,
+                                                                          :gid => :gidNumber,
+                                                                          :home => :homeDirectory,
+                                                                          :shell => :loginShell
 
   # Use the last field of a space-separated array as
   # the sn.  LDAP requires a surname, for some stupid reason.
@@ -40,6 +41,7 @@ Puppet::Type.type(:user).provide :ldap, :parent => Puppet::Provider::Ldap do
       existing.each do |hash|
         value = hash[:uid]
         next unless value
+
         num = value[0].to_i
         largest = num if num > largest
       end

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