puppet 8.5.0-x64-mingw32 → 8.6.0-x64-mingw32

data/lib/puppet/util/windows/adsi.rb

@@ -24,19 +24,15 @@ module Puppet::Util::Windows::ADSI
     extend FFI::Library
 
     def connectable?(uri)
-      begin
-        !!connect(uri)
-      rescue
-        false
-      end
+      !!connect(uri)
+    rescue
+      false
     end
 
     def connect(uri)
-      begin
-        WIN32OLE.connect(uri)
-      rescue WIN32OLERuntimeError => e
-        raise Puppet::Error.new(_("ADSI connection error: %{e}") % { e: e }, e)
-      end
+      WIN32OLE.connect(uri)
+    rescue WIN32OLERuntimeError => e
+      raise Puppet::Error.new(_("ADSI connection error: %{e}") % { e: e }, e)
     end
 
     def create(name, resource_type)
@@ -58,7 +54,7 @@ module Puppet::Util::Windows::ADSI
             buffer_size.write_dword(max_length) # length in TCHARs
 
             if GetComputerNameW(buffer, buffer_size) == FFI::WIN32_FALSE
-              raise Puppet::Util::Windows::Error.new(_("Failed to get computer name"))
+              raise Puppet::Util::Windows::Error, _("Failed to get computer name")
             end
 
             @computer_name = buffer.read_wide_string(buffer_size.read_dword)
@@ -97,7 +93,7 @@ module Puppet::Util::Windows::ADSI
     # used for IAdsGroup::Add / IAdsGroup::Remove.  These URIs are not useable
     # to resolve an account with WIN32OLE.connect
     def sid_uri(sid)
-      raise Puppet::Error.new(_("Must use a valid SID::Principal")) if !sid.is_a?(Puppet::Util::Windows::SID::Principal)
+      raise Puppet::Error, _("Must use a valid SID::Principal") unless sid.is_a?(Puppet::Util::Windows::SID::Principal)
 
       "WinNT://#{sid.sid}"
     end
@@ -161,15 +157,15 @@ module Puppet::Util::Windows::ADSI
       end
 
       def parse_name(name)
-        if name =~ /\//
-          raise Puppet::Error.new(_("Value must be in DOMAIN\\%{object_class} style syntax") % { object_class: @object_class })
+        if name =~ %r{/}
+          raise Puppet::Error, _("Value must be in DOMAIN\\%{object_class} style syntax") % { object_class: @object_class }
         end
 
         matches = name.scan(/((.*)\\)?(.*)/)
         domain = matches[0][1] || '.'
         account = matches[0][2]
 
-        return account, domain
+        [account, domain]
       end
 
       # returns Puppet::Util::Windows::SID::Principal[]
@@ -195,7 +191,7 @@ module Puppet::Util::Windows::ADSI
 
         sids = names.map do |name|
           sid = Puppet::Util::Windows::SID.name_to_principal(name, allow_unresolved)
-          raise Puppet::Error.new(_("Could not resolve name: %{name}") % { name: name }) if !sid
+          raise Puppet::Error, _("Could not resolve name: %{name}") % { name: name } unless sid
 
           [sid.sid, sid]
         end
@@ -292,9 +288,7 @@ module Puppet::Util::Windows::ADSI
       rescue WIN32OLERuntimeError => e
         # ERROR_BAD_USERNAME 2202L from winerror.h
         if e.message =~ /8007089A/m
-          raise Puppet::Error.new(
-            _("Puppet is not able to create/delete domain %{object_class} objects with the %{object_class} resource.") % { object_class: object_class },
-          )
+          raise Puppet::Error, _("Puppet is not able to create/delete domain %{object_class} objects with the %{object_class} resource.") % { object_class: object_class }
         end
 
         raise Puppet::Error.new(_("%{object_class} update failed: %{error}") % { object_class: object_class.capitalize, error: e }, e)
@@ -323,7 +317,7 @@ module Puppet::Util::Windows::ADSI
 
       def create(name)
         # Windows error 1379: The specified local group already exists.
-        raise Puppet::Error.new(_("Cannot create user if group '%{name}' exists.") % { name: name }) if Puppet::Util::Windows::ADSI::Group.exists? name
+        raise Puppet::Error, _("Cannot create user if group '%{name}' exists.") % { name: name } if Puppet::Util::Windows::ADSI::Group.exists? name
 
         new(name, Puppet::Util::Windows::ADSI.create(name, @object_class))
       end
@@ -334,7 +328,11 @@ module Puppet::Util::Windows::ADSI
     end
 
     def add_flag(flag_name, value)
-      flag = native_object.Get(flag_name) rescue 0
+      flag = begin
+        native_object.Get(flag_name)
+      rescue
+        0
+      end
 
       native_object.Put(flag_name, flag | value)
 
@@ -342,7 +340,7 @@ module Puppet::Util::Windows::ADSI
     end
 
     def password=(password)
-      if !password.nil?
+      unless password.nil?
         native_object.SetPassword(password)
         commit
       end
@@ -356,7 +354,11 @@ module Puppet::Util::Windows::ADSI
       # WIN32OLE objects aren't enumerable, so no map
       groups = []
       # Setting WIN32OLE.codepage ensures values are returned as UTF-8
-      native_object.Groups.each { |g| groups << g.Name } rescue nil
+      begin
+        native_object.Groups.each { |g| groups << g.Name }
+      rescue
+        nil
+      end
       groups
     end
 
@@ -375,12 +377,12 @@ module Puppet::Util::Windows::ADSI
     alias remove_from_group remove_from_groups
 
     def add_group_sids(*sids)
-      group_names = sids.map { |s| s.domain_account }
+      group_names = sids.map(&:domain_account)
       add_to_groups(*group_names)
     end
 
     def remove_group_sids(*sids)
-      group_names = sids.map { |s| s.domain_account }
+      group_names = sids.map(&:domain_account)
       remove_from_groups(*group_names)
     end
 
@@ -397,18 +399,18 @@ module Puppet::Util::Windows::ADSI
 
       desired_groups = desired_groups.split(',').map(&:strip)
 
-      current_hash = self.group_sids.to_h { |sid| [sid.sid, sid] }
+      current_hash = group_sids.to_h { |sid| [sid.sid, sid] }
       desired_hash = self.class.name_sid_hash(desired_groups)
 
       # First we add the user to all the groups it should be in but isn't
-      if !desired_groups.empty?
+      unless desired_groups.empty?
         groups_to_add = (desired_hash.keys - current_hash.keys).map { |sid| desired_hash[sid] }
         add_group_sids(*groups_to_add)
       end
 
       # Then we remove the user from all groups it is in but shouldn't be, if
       # that's been requested
-      if !minimum
+      unless minimum
         if desired_hash.empty?
           groups_to_remove = current_hash.values
         else
@@ -508,7 +510,7 @@ module Puppet::Util::Windows::ADSI
           buffer_size.write_dword(max_length) # length in TCHARs
 
           if GetUserNameW(buffer, buffer_size) == FFI::WIN32_FALSE
-            raise Puppet::Util::Windows::Error.new(_("Failed to get user name"))
+            raise Puppet::Util::Windows::Error, _("Failed to get user name")
           end
 
           # buffer_size includes trailing NULL
@@ -583,17 +585,15 @@ module Puppet::Util::Windows::ADSI
 
   class UserProfile
     def self.delete(sid)
-      begin
-        Puppet::Util::Windows::ADSI.wmi_connection.Delete("Win32_UserProfile.SID='#{sid}'")
-      rescue WIN32OLERuntimeError => e
-        # https://social.technet.microsoft.com/Forums/en/ITCG/thread/0f190051-ac96-4bf1-a47f-6b864bfacee5
-        # Prior to Vista SP1, there's no built-in way to programmatically
-        # delete user profiles (except for delprof.exe). So try to delete
-        # but warn if we fail
-        raise e unless e.message.include?('80041010')
+      Puppet::Util::Windows::ADSI.wmi_connection.Delete("Win32_UserProfile.SID='#{sid}'")
+    rescue WIN32OLERuntimeError => e
+      # https://social.technet.microsoft.com/Forums/en/ITCG/thread/0f190051-ac96-4bf1-a47f-6b864bfacee5
+      # Prior to Vista SP1, there's no built-in way to programmatically
+      # delete user profiles (except for delprof.exe). So try to delete
+      # but warn if we fail
+      raise e unless e.message.include?('80041010')
 
-        Puppet.warning _("Cannot delete user profile for '%{sid}' prior to Vista SP1") % { sid: sid }
-      end
+      Puppet.warning _("Cannot delete user profile for '%{sid}' prior to Vista SP1") % { sid: sid }
     end
   end
 
@@ -609,7 +609,7 @@ module Puppet::Util::Windows::ADSI
 
       def create(name)
         # Windows error 2224: The account already exists.
-        raise Puppet::Error.new(_("Cannot create group if user '%{name}' exists.") % { name: name }) if Puppet::Util::Windows::ADSI::User.exists?(name)
+        raise Puppet::Error, _("Cannot create group if user '%{name}' exists.") % { name: name } if Puppet::Util::Windows::ADSI::User.exists?(name)
 
         new(name, Puppet::Util::Windows::ADSI.create(name, @object_class))
       end
@@ -638,11 +638,11 @@ module Puppet::Util::Windows::ADSI
     def set_members(desired_members, inclusive = true)
       return if desired_members.nil?
 
-      current_hash = self.member_sids.to_h { |sid| [sid.sid, sid] }
+      current_hash = member_sids.to_h { |sid| [sid.sid, sid] }
       desired_hash = self.class.name_sid_hash(desired_members)
 
       # First we add all missing members
-      if !desired_hash.empty?
+      unless desired_hash.empty?
         members_to_add = (desired_hash.keys - current_hash.keys).map { |sid| desired_hash[sid] }
         add_member_sids(*members_to_add)
       end

data/lib/puppet/util/windows/daemon.rb

@@ -74,7 +74,7 @@ module Puppet::Util::Windows
     NO_ERROR = 0
 
     # Wraps SetServiceStatus.
-    SetTheServiceStatus = Proc.new do |dwCurrentState, dwWin32ExitCode, dwCheckPoint, dwWaitHint|
+    SetTheServiceStatus = proc do |dwCurrentState, dwWin32ExitCode, dwCheckPoint, dwWaitHint|
       ss = SERVICE_STATUS.new # Current status of the service.
 
       # Disable control requests until the service is started.
@@ -97,7 +97,7 @@ module Puppet::Util::Windows
       @@dwServiceState = dwCurrentState
 
       # Send status of the service to the Service Controller.
-      if !SetServiceStatus(@@ssh, ss)
+      unless SetServiceStatus(@@ssh, ss)
         SetEvent(@@hStopEvent)
       end
     end
@@ -105,7 +105,7 @@ module Puppet::Util::Windows
     ERROR_CALL_NOT_IMPLEMENTED = 0x78
 
     # Handles control signals from the service control manager.
-    Service_Ctrl_ex = Proc.new do |dwCtrlCode, _dwEventType, _lpEventData, _lpContext|
+    Service_Ctrl_ex = proc do |dwCtrlCode, _dwEventType, _lpEventData, _lpContext|
       @@waiting_control_code = dwCtrlCode;
       return_value = NO_ERROR
 
@@ -145,48 +145,46 @@ module Puppet::Util::Windows
 
     # Called by the service control manager after the call to StartServiceCtrlDispatcher.
     Service_Main = FFI::Function.new(:void, [:ulong, :pointer], :blocking => false) do |dwArgc, lpszArgv|
-      begin
-        # Obtain the name of the service.
-        if lpszArgv.address != 0
-          argv = lpszArgv.get_array_of_string(0, dwArgc)
-          lpszServiceName = argv[0]
-        else
-          lpszServiceName = ''
-        end
+      # Obtain the name of the service.
+      if lpszArgv.address != 0
+        argv = lpszArgv.get_array_of_string(0, dwArgc)
+        lpszServiceName = argv[0]
+      else
+        lpszServiceName = ''
+      end
 
-        # Args passed to Service.start
-        if (dwArgc > 1)
-          @@Argv = argv[1..]
-        else
-          @@Argv = nil
-        end
+      # Args passed to Service.start
+      if dwArgc > 1
+        @@Argv = argv[1..]
+      else
+        @@Argv = nil
+      end
 
-        # Register the service ctrl handler.
-        @@ssh = RegisterServiceCtrlHandlerExW(
-          lpszServiceName,
-          Service_Ctrl_ex,
-          nil
-        )
+      # Register the service ctrl handler.
+      @@ssh = RegisterServiceCtrlHandlerExW(
+        lpszServiceName,
+        Service_Ctrl_ex,
+        nil
+      )
 
-        # No service to stop, no service handle to notify, nothing to do but exit.
-        break if @@ssh == 0
+      # No service to stop, no service handle to notify, nothing to do but exit.
+      break if @@ssh == 0
 
-        # The service has started.
-        SetTheServiceStatus.call(SERVICE_RUNNING, NO_ERROR, 0, 0)
+      # The service has started.
+      SetTheServiceStatus.call(SERVICE_RUNNING, NO_ERROR, 0, 0)
 
-        SetEvent(@@hStartEvent)
+      SetEvent(@@hStartEvent)
 
-        # Main loop for the service.
-        while (WaitForSingleObject(@@hStopEvent, 1000) != WAIT_OBJECT_0) do
-        end
+      # Main loop for the service.
+      while WaitForSingleObject(@@hStopEvent, 1000) != WAIT_OBJECT_0
+      end
 
-        # Main loop for the service.
-        while (WaitForSingleObject(@@hStopCompletedEvent, 1000) != WAIT_OBJECT_0) do
-        end
-      ensure
-        # Stop the service.
-        SetTheServiceStatus.call(SERVICE_STOPPED, NO_ERROR, 0, 0)
+      # Main loop for the service.
+      while WaitForSingleObject(@@hStopCompletedEvent, 1000) != WAIT_OBJECT_0
       end
+    ensure
+      # Stop the service.
+      SetTheServiceStatus.call(SERVICE_STOPPED, NO_ERROR, 0, 0)
     end
 
     ThreadProc = FFI::Function.new(:ulong, [:pointer]) do |lpParameter|
@@ -201,7 +199,7 @@ module Puppet::Util::Windows
       s[:lpServiceProc] = nil
 
       # No service to step, no service handle, no ruby exceptions, just terminate the thread..
-      if !StartServiceCtrlDispatcherW(ste)
+      unless StartServiceCtrlDispatcherW(ste)
         return 1
       end
 
@@ -211,7 +209,7 @@ module Puppet::Util::Windows
     # This is a shortcut for Daemon.new + Daemon#mainloop.
     #
     def self.mainloop
-      self.new.mainloop
+      new.mainloop
     end
 
     # This is the method that actually puts your code into a loop and allows it
@@ -267,7 +265,7 @@ module Puppet::Util::Windows
       events.put_pointer(0, FFI::Pointer.new(hThread))
       events.put_pointer(FFI::Pointer.size, FFI::Pointer.new(@@hStartEvent))
 
-      while ((index = WaitForMultipleObjects(2, events, 0, 1000)) == WAIT_TIMEOUT) do
+      while (index = WaitForMultipleObjects(2, events, 0, 1000)) == WAIT_TIMEOUT
       end
 
       if index == WAIT_FAILED
@@ -280,36 +278,34 @@ module Puppet::Util::Windows
       end
 
       thr = Thread.new do
-        begin
-          while (WaitForSingleObject(@@hStopEvent, 1000) == WAIT_TIMEOUT)
-            # Check to see if anything interesting has been signaled
-            case @@waiting_control_code
-            when SERVICE_CONTROL_PAUSE
-              service_pause() if respond_to?('service_pause')
-            when SERVICE_CONTROL_CONTINUE
-              service_resume() if respond_to?('service_resume')
-            when SERVICE_CONTROL_INTERROGATE
-              service_interrogate() if respond_to?('service_interrogate')
-            when SERVICE_CONTROL_SHUTDOWN
-              service_shutdown() if respond_to?('service_shutdown')
-            when SERVICE_CONTROL_PARAMCHANGE
-              service_paramchange() if respond_to?('service_paramchange')
-            when SERVICE_CONTROL_NETBINDADD
-              service_netbindadd() if respond_to?('service_netbindadd')
-            when SERVICE_CONTROL_NETBINDREMOVE
-              service_netbindremove() if respond_to?('service_netbindremove')
-            when SERVICE_CONTROL_NETBINDENABLE
-              service_netbindenable() if respond_to?('service_netbindenable')
-            when SERVICE_CONTROL_NETBINDDISABLE
-              service_netbinddisable() if respond_to?('service_netbinddisable')
-            end
-            @@waiting_control_code = IDLE_CONTROL_CODE
+        while WaitForSingleObject(@@hStopEvent, 1000) == WAIT_TIMEOUT
+          # Check to see if anything interesting has been signaled
+          case @@waiting_control_code
+          when SERVICE_CONTROL_PAUSE
+            service_pause() if respond_to?('service_pause')
+          when SERVICE_CONTROL_CONTINUE
+            service_resume() if respond_to?('service_resume')
+          when SERVICE_CONTROL_INTERROGATE
+            service_interrogate() if respond_to?('service_interrogate')
+          when SERVICE_CONTROL_SHUTDOWN
+            service_shutdown() if respond_to?('service_shutdown')
+          when SERVICE_CONTROL_PARAMCHANGE
+            service_paramchange() if respond_to?('service_paramchange')
+          when SERVICE_CONTROL_NETBINDADD
+            service_netbindadd() if respond_to?('service_netbindadd')
+          when SERVICE_CONTROL_NETBINDREMOVE
+            service_netbindremove() if respond_to?('service_netbindremove')
+          when SERVICE_CONTROL_NETBINDENABLE
+            service_netbindenable() if respond_to?('service_netbindenable')
+          when SERVICE_CONTROL_NETBINDDISABLE
+            service_netbinddisable() if respond_to?('service_netbinddisable')
           end
-
-          service_stop() if respond_to?('service_stop')
-        ensure
-          SetEvent(@@hStopCompletedEvent)
+          @@waiting_control_code = IDLE_CONTROL_CODE
         end
+
+        service_stop() if respond_to?('service_stop')
+      ensure
+        SetEvent(@@hStopCompletedEvent)
       end
 
       if respond_to?('service_main')

data/lib/puppet/util/windows/error.rb

@@ -42,13 +42,13 @@ class Puppet::Util::Windows::Error < Puppet::Error
 
       if length == FFI::WIN32_FALSE
         # can't raise same error type here or potentially recurse infinitely
-        raise Puppet::Error.new(_("FormatMessageW could not format code %{code}") % { code: code })
+        raise Puppet::Error, _("FormatMessageW could not format code %{code}") % { code: code }
       end
 
       # returns an FFI::Pointer with autorelease set to false, which is what we want
       buffer_ptr.read_win32_local_pointer do |wide_string_ptr|
         if wide_string_ptr.null?
-          raise Puppet::Error.new(_("FormatMessageW failed to allocate buffer for code %{code}") % { code: code })
+          raise Puppet::Error, _("FormatMessageW failed to allocate buffer for code %{code}") % { code: code }
         end
 
         error_string = wide_string_ptr.read_wide_string(length)

data/lib/puppet/util/windows/file.rb

@@ -30,7 +30,7 @@ module Puppet::Util::Windows::File
 
     return true if result != FFI::WIN32_FALSE
 
-    raise Puppet::Util::Windows::Error.new("ReplaceFile(#{target}, #{source})")
+    raise Puppet::Util::Windows::Error, "ReplaceFile(#{target}, #{source})"
   end
   module_function :replace_file
 
@@ -41,8 +41,7 @@ module Puppet::Util::Windows::File
 
     return true if result != FFI::WIN32_FALSE
 
-    raise Puppet::Util::Windows::Error
-      .new("MoveFileEx(#{source}, #{target}, #{flags.to_s(8)})")
+    raise Puppet::Util::Windows::Error, "MoveFileEx(#{source}, #{target}, #{flags.to_s(8)})"
   end
   module_function :move_file_ex
 
@@ -52,9 +51,7 @@ module Puppet::Util::Windows::File
                                  wide_string(target.to_s), flags)
     return true if result != FFI::WIN32_FALSE
 
-    raise Puppet::Util::Windows::Error.new(
-      "CreateSymbolicLink(#{symlink}, #{target}, #{flags.to_s(8)})"
-    )
+    raise Puppet::Util::Windows::Error, "CreateSymbolicLink(#{symlink}, #{target}, #{flags.to_s(8)})"
   end
   module_function :symlink
 
@@ -93,7 +90,7 @@ module Puppet::Util::Windows::File
   def get_attributes(file_name, raise_on_invalid = true)
     result = GetFileAttributesW(wide_string(file_name.to_s))
     if raise_on_invalid && result == INVALID_FILE_ATTRIBUTES
-      raise Puppet::Util::Windows::Error.new("GetFileAttributes(#{file_name})")
+      raise Puppet::Util::Windows::Error, "GetFileAttributes(#{file_name})"
     end
 
     result
@@ -120,7 +117,7 @@ module Puppet::Util::Windows::File
 
   def set_attributes(path, flags)
     success = SetFileAttributesW(wide_string(path), flags) != FFI::WIN32_FALSE
-    raise Puppet::Util::Windows::Error.new(_("Failed to set file attributes")) if !success
+    raise Puppet::Util::Windows::Error, _("Failed to set file attributes") unless success
 
     success
   end
@@ -137,11 +134,9 @@ module Puppet::Util::Windows::File
 
     return result unless result == INVALID_HANDLE_VALUE
 
-    raise Puppet::Util::Windows::Error.new(
-      "CreateFile(#{file_name}, #{desired_access.to_s(8)}, #{share_mode.to_s(8)}, " \
-      "#{security_attributes}, #{creation_disposition.to_s(8)}, " \
-      "#{flags_and_attributes.to_s(8)}, #{template_file_handle})"
-    )
+    raise Puppet::Util::Windows::Error, "CreateFile(#{file_name}, #{desired_access.to_s(8)}, #{share_mode.to_s(8)}, " \
+                                        "#{security_attributes}, #{creation_disposition.to_s(8)}, " \
+                                        "#{flags_and_attributes.to_s(8)}, #{template_file_handle})"
   end
 
   def self.get_reparse_point_data(handle, &block)
@@ -156,10 +151,10 @@ module Puppet::Util::Windows::File
                     when IO_REPARSE_TAG_MOUNT_POINT
                       MOUNT_POINT_REPARSE_DATA_BUFFER
                     when IO_REPARSE_TAG_NFS
-                      raise Puppet::Util::Windows::Error.new("Retrieving NFS reparse point data is unsupported")
+                      raise Puppet::Util::Windows::Error, "Retrieving NFS reparse point data is unsupported"
                     else
-                      raise Puppet::Util::Windows::Error.new("DeviceIoControl(#{handle}, " \
-                                                             "FSCTL_GET_REPARSE_POINT) returned unknown tag 0x#{reparse_tag.to_s(16).upcase}")
+                      raise Puppet::Util::Windows::Error, "DeviceIoControl(#{handle}, " \
+                                                          "FSCTL_GET_REPARSE_POINT) returned unknown tag 0x#{reparse_tag.to_s(16).upcase}"
                     end
 
       yield buffer_type.new(reparse_data_buffer_ptr)
@@ -185,7 +180,7 @@ module Puppet::Util::Windows::File
 
   def self.device_io_control(handle, io_control_code, in_buffer = nil, out_buffer = nil)
     if out_buffer.nil?
-      raise Puppet::Util::Windows::Error.new(_("out_buffer is required"))
+      raise Puppet::Util::Windows::Error, _("out_buffer is required")
     end
 
     FFI::MemoryPointer.new(:dword, 1) do |bytes_returned_ptr|
@@ -199,11 +194,9 @@ module Puppet::Util::Windows::File
       )
 
       if result == FFI::WIN32_FALSE
-        raise Puppet::Util::Windows::Error.new(
-          "DeviceIoControl(#{handle}, #{io_control_code}, " \
-          "#{in_buffer}, #{in_buffer ? in_buffer.size : ''}, " \
-          "#{out_buffer}, #{out_buffer ? out_buffer.size : ''}"
-        )
+        raise Puppet::Util::Windows::Error, "DeviceIoControl(#{handle}, #{io_control_code}, " \
+                                            "#{in_buffer}, #{in_buffer ? in_buffer.size : ''}, " \
+                                            "#{out_buffer}, #{out_buffer ? out_buffer.size : ''}"
       end
     end
 
@@ -213,7 +206,7 @@ module Puppet::Util::Windows::File
   def reparse_point?(file_name)
     attributes = get_attributes(file_name, false)
 
-    return false if (attributes == INVALID_FILE_ATTRIBUTES)
+    return false if attributes == INVALID_FILE_ATTRIBUTES
 
     (attributes & FILE_ATTRIBUTE_REPARSE_POINT) == FILE_ATTRIBUTE_REPARSE_POINT
   end
@@ -261,7 +254,7 @@ module Puppet::Util::Windows::File
       buffer_size = GetLongPathNameW(path_ptr, FFI::Pointer::NULL, 0)
       FFI::MemoryPointer.new(:wchar, buffer_size) do |converted_ptr|
         if GetLongPathNameW(path_ptr, converted_ptr, buffer_size) == FFI::WIN32_FALSE
-          raise Puppet::Util::Windows::Error.new(_("Failed to call GetLongPathName"))
+          raise Puppet::Util::Windows::Error, _("Failed to call GetLongPathName")
         end
 
         converted = converted_ptr.read_wide_string(buffer_size - 1)
@@ -279,7 +272,7 @@ module Puppet::Util::Windows::File
       buffer_size = GetShortPathNameW(path_ptr, FFI::Pointer::NULL, 0)
       FFI::MemoryPointer.new(:wchar, buffer_size) do |converted_ptr|
         if GetShortPathNameW(path_ptr, converted_ptr, buffer_size) == FFI::WIN32_FALSE
-          raise Puppet::Util::Windows::Error.new("Failed to call GetShortPathName")
+          raise Puppet::Util::Windows::Error, "Failed to call GetShortPathName"
         end
 
         converted = converted_ptr.read_wide_string(buffer_size - 1)

data/lib/puppet/util/windows/monkey_patches/process.rb

@@ -197,7 +197,7 @@ module Process
         FFI::WIN32.CloseHandle(handle)
       end
 
-      return 0
+      0
     end
 
     private

data/lib/puppet/util/windows/principal.rb

@@ -19,9 +19,9 @@ module Puppet::Util::Windows::SID
       #   otherwise if domain is available then combine it with parsed account
       #   otherwise when the domain is not available, use the account value directly
       # WinNT naming standard https://msdn.microsoft.com/en-us/library/windows/desktop/aa746534(v=vs.85).aspx
-      if (domain && !domain.empty? && @account_type == :SidTypeDomain)
+      if domain && !domain.empty? && @account_type == :SidTypeDomain
         @domain_account = @domain
-      elsif (domain && !domain.empty?)
+      elsif domain && !domain.empty?
         @domain_account = "#{domain}\\#{@account}"
       else
         @domain_account = account
@@ -65,7 +65,7 @@ module Puppet::Util::Windows::SID
                                                FFI::Pointer::NULL, domain_length_ptr, name_use_enum_ptr)
                   last_error = FFI.errno
 
-                  if (success == FFI::WIN32_FALSE && last_error != ERROR_INSUFFICIENT_BUFFER)
+                  if success == FFI::WIN32_FALSE && last_error != ERROR_INSUFFICIENT_BUFFER
                     raise Puppet::Util::Windows::Error.new(_('Failed to call LookupAccountNameW with account: %{account_name}') % { account_name: account_name }, last_error)
                   end
 
@@ -73,7 +73,7 @@ module Puppet::Util::Windows::SID
                     if LookupAccountNameW(system_name_ptr, account_name_ptr,
                                           sid_ptr, sid_length_ptr,
                                           domain_ptr, domain_length_ptr, name_use_enum_ptr) == FFI::WIN32_FALSE
-                      raise Puppet::Util::Windows::Error.new(_('Failed to call LookupAccountNameW with account: %{account_name}') % { account_name: account_name })
+                      raise Puppet::Util::Windows::Error, _('Failed to call LookupAccountNameW with account: %{account_name}') % { account_name: account_name }
                     end
 
                     # with a SID returned, loop back through lookup_account_sid to retrieve official name
@@ -95,9 +95,9 @@ module Puppet::Util::Windows::SID
 
     def self.lookup_account_sid(system_name = nil, sid_bytes)
       system_name_ptr = FFI::Pointer::NULL
-      if (sid_bytes.nil? || (!sid_bytes.is_a? Array) || (sid_bytes.length == 0))
+      if sid_bytes.nil? || (!sid_bytes.is_a? Array) || (sid_bytes.length == 0)
         # TRANSLATORS `lookup_account_sid` is a variable name and should not be translated
-        raise Puppet::Util::Windows::Error.new(_('Byte array for lookup_account_sid must not be nil and must be at least 1 byte long'))
+        raise Puppet::Util::Windows::Error, _('Byte array for lookup_account_sid must not be nil and must be at least 1 byte long')
       end
 
       begin
@@ -120,7 +120,7 @@ module Puppet::Util::Windows::SID
                                             FFI::Pointer::NULL, domain_length_ptr, name_use_enum_ptr)
                 last_error = FFI.errno
 
-                if (success == FFI::WIN32_FALSE && last_error != ERROR_INSUFFICIENT_BUFFER)
+                if success == FFI::WIN32_FALSE && last_error != ERROR_INSUFFICIENT_BUFFER
                   raise Puppet::Util::Windows::Error.new(_('Failed to call LookupAccountSidW with bytes: %{sid_bytes}') % { sid_bytes: sid_bytes }, last_error)
                 end
 
@@ -128,7 +128,7 @@ module Puppet::Util::Windows::SID
                   FFI::MemoryPointer.new(:lpwstr, domain_length_ptr.read_dword) do |domain_ptr|
                     if LookupAccountSidW(system_name_ptr, sid_ptr, name_ptr, name_length_ptr,
                                          domain_ptr, domain_length_ptr, name_use_enum_ptr) == FFI::WIN32_FALSE
-                      raise Puppet::Util::Windows::Error.new(_('Failed to call LookupAccountSidW with bytes: %{sid_bytes}') % { sid_bytes: sid_bytes })
+                      raise Puppet::Util::Windows::Error, _('Failed to call LookupAccountSidW with bytes: %{sid_bytes}') % { sid_bytes: sid_bytes }
                     end
 
                     return new(