(CONT-801) Autocorrect safe group 3

Author: LukasAud

.rubocop_todo.yml

@@ -34,12 +34,6 @@ Lint/MissingCopEnableDirective:
     - 'spec/functions/merge_spec.rb'
     - 'spec/unit/puppet/provider/file_line/ruby_spec_alter.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Lint/RedundantCopEnableDirective:
-  Exclude:
-    - 'spec/functions/validate_x509_rsa_key_pair_spec.rb'
-
 # Offense count: 2
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedMethods.
@@ -97,18 +91,6 @@ Naming/MethodParameterName:
   Exclude:
     - 'spec/functions/pick_default_spec.rb'
 
-# Offense count: 9
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: PreferredName.
-Naming/RescuedExceptionsVariableName:
-  Exclude:
-    - 'lib/puppet/functions/parsehocon.rb'
-    - 'lib/puppet/functions/parsepson.rb'
-    - 'lib/puppet/parser/functions/loadjson.rb'
-    - 'lib/puppet/parser/functions/loadyaml.rb'
-    - 'lib/puppet/parser/functions/num2bool.rb'
-    - 'lib/puppet/parser/functions/validate_cmd.rb'
-
 # Offense count: 1
 # Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
 # SupportedStyles: snake_case, normalcase, non_integer
@@ -136,14 +118,6 @@ Performance/RedundantEqualityComparisonBlock:
   Exclude:
     - 'lib/puppet/parser/functions/bool2str.rb'
 
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-Performance/StringIdentifierArgument:
-  Exclude:
-    - 'lib/facter/util/puppet_settings.rb'
-    - 'lib/puppet/parser/functions/member.rb'
-    - 'lib/puppet/parser/functions/validate_cmd.rb'
-
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Performance/UnfreezeString:
@@ -155,23 +129,6 @@ Performance/UnfreezeString:
 RSpec/BeEq:
   Enabled: false
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: be, be_nil
-RSpec/BeNil:
-  Exclude:
-    - 'spec/functions/seeded_rand_string_spec.rb'
-    - 'spec/unit/facter/root_home_spec.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: be_a, be_kind_of
-RSpec/ClassCheck:
-  Exclude:
-    - 'spec/functions/type_of_spec.rb'
-
 # Offense count: 36
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without

lib/facter/util/puppet_settings.rb

@@ -9,7 +9,7 @@ module Facter::Util::PuppetSettings
   # facter without the --puppet flag and they happen to be working in a lib
   # directory of a module.
   def self.with_puppet
-    Module.const_get('Puppet')
+    Module.const_get(:Puppet)
   rescue NameError
     nil
   else

lib/puppet/functions/parsehocon.rb

@@ -22,9 +22,9 @@ def parsehocon(hocon_string, default = :no_default_provided)
     begin
       data = Hocon::ConfigFactory.parse_string(hocon_string)
       data.resolve.root.unwrapped
-    rescue Hocon::ConfigError::ConfigParseError => err
-      Puppet.debug("Parsing hocon failed with error: #{err.message}")
-      raise err if default == :no_default_provided
+    rescue Hocon::ConfigError::ConfigParseError => e
+      Puppet.debug("Parsing hocon failed with error: #{e.message}")
+      raise e if default == :no_default_provided
 
       default
     end

lib/puppet/functions/parsepson.rb

@@ -21,9 +21,9 @@
 
   def parsepson(pson_string, default = :no_default_provided)
     PSON.load(pson_string)
-  rescue StandardError => err
-    Puppet.debug("Parsing PSON failed with error: #{err.message}")
-    raise err if default == :no_default_provided
+  rescue StandardError => e
+    Puppet.debug("Parsing PSON failed with error: #{e.message}")
+    raise e if default == :no_default_provided
 
     default
   end

lib/puppet/parser/functions/loadjson.rb

@@ -46,17 +46,17 @@ module Puppet::Parser::Functions
         if Puppet::Util::Package.versioncmp(Puppet.version, '8.0.0').negative?
           begin
             contents = OpenURI.open_uri(url, **http_options)
-          rescue OpenURI::HTTPError => err
-            res = err.io
+          rescue OpenURI::HTTPError => e
+            res = e.io
             warning("Can't load '#{url}' HTTP Error Code: '#{res.status[0]}'")
             args[1]
           end
           PSON.load(contents) || args[1]
         else
           begin
             contents = URI.open(url, **http_options) # rubocop:disable Security/Open  : Temporarily disabling this cop. This is a security risk and must be addressed before release.
-          rescue URI::Error => err
-            res = err.io
+          rescue URI::Error => e
+            res = e.io
             warning("Can't load '#{url}' HTTP Error Code: '#{res.status[0]}'")
             args[1]
           end

lib/puppet/parser/functions/loadyaml.rb

@@ -44,8 +44,8 @@ module Puppet::Parser::Functions
         end
         begin
           contents = OpenURI.open_uri(url, http_basic_authentication: [username, password])
-        rescue OpenURI::HTTPError => err
-          res = err.io
+        rescue OpenURI::HTTPError => e
+          res = e.io
           warning("Can't load '#{url}' HTTP Error Code: '#{res.status[0]}'")
           args[1]
         end

lib/puppet/parser/functions/member.rb

@@ -55,7 +55,7 @@ module Puppet::Parser::Functions
              arguments[1]
            end
 
-    raise(Puppet::ParseError, 'member(): You must provide item to search for within array given') if item.respond_to?('empty?') && item.empty?
+    raise(Puppet::ParseError, 'member(): You must provide item to search for within array given') if item.respond_to?(:empty?) && item.empty?
 
     result = (item - array).empty?
 

lib/puppet/parser/functions/num2bool.rb

@@ -27,14 +27,14 @@ module Puppet::Parser::Functions
     when String
       begin
         number = Float(number)
-      rescue ArgumentError => ex
-        raise(Puppet::ParseError, "num2bool(): '#{number}' does not look like a number: #{ex.message}")
+      rescue ArgumentError => e
+        raise(Puppet::ParseError, "num2bool(): '#{number}' does not look like a number: #{e.message}")
       end
     else
       begin
         number = number.to_s
-      rescue NoMethodError => ex
-        raise(Puppet::ParseError, "num2bool(): Unable to parse argument: #{ex.message}")
+      rescue NoMethodError => e
+        raise(Puppet::ParseError, "num2bool(): Unable to parse argument: #{e.message}")
       end
     end
 

lib/puppet/parser/functions/validate_cmd.rb

@@ -55,16 +55,16 @@ module Puppet::Parser::Functions
                                       "#{checkscript} #{tmpfile.path}"
                                     end
 
-      if Puppet::Util::Execution.respond_to?('execute')
+      if Puppet::Util::Execution.respond_to?(:execute)
         Puppet::Util::Execution.execute(check_with_correct_location)
       else
         Puppet::Util.execute(check_with_correct_location)
       end
-    rescue Puppet::ExecutionFailure => detail
-      msg += "\n#{detail}"
+    rescue Puppet::ExecutionFailure => e
+      msg += "\n#{e}"
       raise Puppet::ParseError, msg
-    rescue StandardError => detail
-      msg += "\n#{detail.class.name} #{detail}"
+    rescue StandardError => e
+      msg += "\n#{e.class.name} #{e}"
       raise Puppet::ParseError, msg
     ensure
       tmpfile.unlink

spec/functions/seeded_rand_string_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'seeded_rand_string' do
-  it { is_expected.not_to be(nil) }
+  it { is_expected.not_to be_nil }
 
   # Test for erroneous params
   it { is_expected.to run.with_params.and_raise_error(ArgumentError, %r{expects between.+got none}i) }