Rubocop bump and safe corrections

Author: LukasAud

Gemfile

@@ -27,7 +27,7 @@ group :development do
   gem "pry", '~> 0.10',                          require: false
   gem "simplecov-console", '~> 0.9',             require: false
   gem "puppet-debugger", '~> 1.0',               require: false
-  gem "rubocop", '~> 1.50.0',                    require: false
+  gem "rubocop", '~> 1.70.0',                    require: false
   gem "rubocop-performance", '1.22.1',         require: false
   gem "rubocop-rspec", '= 2.19.0',               require: false
   gem "rb-readline", '= 0.5.5',                  require: false, platforms: [:mswin, :mingw, :x64_mingw]

lib/puppet/provider/dsc_base_provider/dsc_base_provider.rb

@@ -368,7 +368,7 @@ def insync?(context, name, _property_name, _is_hash, should_hash)
   # @param context [Object] the Puppet runtime context to operate in and send feedback to
   # @param name_hash [Hash] the hash of namevars to be passed as properties to `Invoke-DscResource`
   # @return [Hash] returns a hash representing the DSC resource munged to the representation the Puppet Type expects
-  def invoke_get_method(context, name_hash) # rubocop:disable Metrics/AbcSize
+  def invoke_get_method(context, name_hash)
     context.debug("retrieving #{name_hash.inspect}")
 
     query_props = name_hash.select { |k, v| mandatory_get_attributes(context).include?(k) || (k == :dsc_psdscrunascredential && !v.nil?) }
@@ -384,8 +384,8 @@ def invoke_get_method(context, name_hash) # rubocop:disable Metrics/AbcSize
     # Canonicalize the results to match the type definition representation;
     # failure to do so will prevent the resource_api from comparing the result
     # to the should hash retrieved from the resource definition in the manifest.
-    data.keys.each do |key| # rubocop:disable Style/HashEachMethods
-      type_key = "dsc_#{key.downcase}".to_sym
+    data.keys.each do |key|
+      type_key = :"dsc_#{key.downcase}"
       data[type_key] = data.delete(key)
 
       # Special handling for CIM Instances
@@ -557,7 +557,7 @@ def puppetize_name(name)
     # Puppet module names must only include lowercase letters, digits and underscores
     name = name.gsub(/[^a-z0-9_]/, '_')
     # Puppet module names must not start with a number so if it does, append the letter 'a' to the name. Eg: '7zip' becomes 'a7zip'
-    name = name.match?(/^\d/) ? "a#{name}" : name # rubocop:disable Lint/UselessAssignment
+    name = "a#{name}" if name.match?(/^\d/) # rubocop:disable Lint/UselessAssignment
   end
 
   # Return a UUID with the dashes turned into underscores to enable the specifying of guaranteed-unique
@@ -598,7 +598,7 @@ def logon_failed_already?(credential_hash)
   # @param enumerable [Enumerable] a string, array, hash, or other object to attempt to recursively downcase
   def downcase_hash_keys!(enumerable)
     if enumerable.is_a?(Hash)
-      enumerable.keys.each do |key| # rubocop:disable Style/HashEachMethods
+      enumerable.keys.each do |key|
         name = key.dup.downcase
         enumerable[name] = enumerable.delete(key)
         downcase_hash_keys!(enumerable[name]) if enumerable[name].is_a?(Enumerable)
@@ -1063,7 +1063,7 @@ def escape_quotes(text)
   # With multiple methods which need to discover secrets it is necessary to keep a single regex
   # which can discover them. This will lazily match everything in a single-quoted string which
   # ends with the secret postfix id and mark the actual contents of the string as the secret.
-  SECRET_DATA_REGEX = /'(?<secret>[^']+)+?#{Regexp.quote(SECRET_POSTFIX)}'/.freeze
+  SECRET_DATA_REGEX = /'(?<secret>[^']+)+?#{Regexp.quote(SECRET_POSTFIX)}'/
 
   # Strings containing sensitive data have a secrets postfix. These strings cannot be passed
   # directly either to debug streams or to PowerShell and must be handled; this method contains

lib/pwsh.rb

@@ -68,9 +68,9 @@ def self.instance(cmd, args, options = {})
     #
     # @return [Bool] true if enabled
     def self.win32console_enabled?
-      @win32console_enabled ||= defined?(Win32) &&
-                                defined?(Win32::Console) &&
-                                Win32::Console.instance_of?(Class)
+      @win32console_enabled ||=
+        defined?(Win32::Console) &&
+        Win32::Console.instance_of?(Class)
     end
 
     # TODO: This thing isn't called anywhere and the variable it sets is never referenced...
@@ -511,7 +511,7 @@ def write_pipe(input)
     # @param timeout [Float] The number of seconds to wait for the pipe to be readable
     # @yield [String] a binary encoded string chunk
     # @return nil
-    def read_from_pipe(pipe, timeout = 0.1, &_block)
+    def read_from_pipe(pipe, timeout = 0.1, &)
       if self.class.readable?(pipe, timeout)
         l = pipe.readpartial(4096)
         # TODO: Log a debug for "#{Time.now} PIPE> #{l}"

spec/unit/pwsh_spec.rb

@@ -610,7 +610,7 @@ def output_cmdlet(ps_command, ps_args)
         expect(result[:stdout]).to match(/200 OK Glenn/)
         expect(result[:stdout]).to match(/DEBUG: 304 Not Modified James/)
         # then command may have \r\n injected, so remove those for comparison
-        expect(result[:stdout].gsub(/\r\n/, '')).to include(command)
+        expect(result[:stdout].gsub("\r\n", '')).to include(command)
         # and it should end with the Write-Error content
         expect(result[:stdout]).to match(/404 Craig Not Found/)
       end