(CONT-801) Autocorrect safe group 6

Author: LukasAud

.rubocop.yml

@@ -5,7 +5,7 @@ require:
 AllCops:
   DisplayCopNames: true
   NewCops: enable
-  TargetRubyVersion: '2.7'
+  TargetRubyVersion: '2.6'
   ExtraDetails: true
   DisplayStyleGuide: true
   Include:

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-05-17 10:10:18 UTC using RuboCop version 1.48.1.
+# on 2023-05-17 10:40:49 UTC using RuboCop version 1.48.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -59,7 +59,7 @@ Metrics/AbcSize:
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 162
+  Max: 152
 
 # Offense count: 5
 # Configuration parameters: AllowedMethods, AllowedPatterns.
@@ -69,7 +69,7 @@ Metrics/CyclomaticComplexity:
 # Offense count: 9
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 37
+  Max: 35
 
 # Offense count: 4
 # Configuration parameters: AllowedMethods, AllowedPatterns.
@@ -105,12 +105,6 @@ Performance/CollectionLiteralInLoop:
   Exclude:
     - 'lib/puppet/functions/ensure_packages.rb'
 
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Performance/MapCompact:
-  Exclude:
-    - 'lib/puppet/parser/functions/values_at.rb'
-
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowRegexpMatch.
@@ -168,7 +162,7 @@ RSpec/MultipleExpectations:
 RSpec/MultipleMemoizedHelpers:
   Max: 9
 
-# Offense count: 55
+# Offense count: 253
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
 # SupportedStyles: always, named_only
 RSpec/NamedSubject:
@@ -241,26 +235,12 @@ Style/FrozenStringLiteralComment:
     - 'spec/type_aliases/http__method_spec.rb'
     - 'spec/type_aliases/http__status_spec.rb'
 
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowSplatArgument.
-Style/HashConversion:
-  Exclude:
-    - 'lib/puppet/functions/to_json_pretty.rb'
-    - 'lib/puppet/parser/functions/prefix.rb'
-    - 'lib/puppet/parser/functions/suffix.rb'
-
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/HashTransformKeys:
   Exclude:
     - 'lib/puppet/functions/to_json_pretty.rb'
 
-# Offense count: 85
-# This cop supports safe autocorrection (--autocorrect).
-Style/IfUnlessModifier:
-  Enabled: false
-
 # Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedMethods.
@@ -272,24 +252,19 @@ Style/IfWithBooleanLiteralBranches:
     - 'lib/puppet/parser/functions/shuffle.rb'
     - 'lib/puppet/provider/file_line/ruby.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowedMethods, AllowedPatterns.
-Style/MethodCallWithoutArgsParentheses:
+# Offense count: 3
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/MapToHash:
   Exclude:
-    - 'lib/puppet/functions/deprecation.rb'
+    - 'lib/puppet/functions/to_json_pretty.rb'
+    - 'lib/puppet/parser/functions/prefix.rb'
+    - 'lib/puppet/parser/functions/suffix.rb'
 
 # Offense count: 1
 Style/MixinUsage:
   Exclude:
     - 'spec/spec_helper.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Style/NegatedIfElseCondition:
-  Exclude:
-    - 'lib/puppet/parser/functions/pw_hash.rb'
-
 # Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.
@@ -315,12 +290,6 @@ Style/RedundantArgument:
   Exclude:
     - 'lib/puppet/provider/file_line/ruby.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantConstantBase:
-  Exclude:
-    - 'lib/puppet/functions/to_json_pretty.rb'
-
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 Style/RedundantFileExtensionInRequire:

lib/facter/pe_version.rb

@@ -43,9 +43,7 @@
   confine is_pe: true
   setcode do
     pe_version = Facter.value(:pe_version)
-    if pe_version
-      pe_version.to_s.split('.')[0]
-    end
+    pe_version.to_s.split('.')[0] if pe_version
   end
 end
 
@@ -54,9 +52,7 @@
   confine is_pe: true
   setcode do
     pe_version = Facter.value(:pe_version)
-    if pe_version
-      pe_version.to_s.split('.')[1]
-    end
+    pe_version.to_s.split('.')[1] if pe_version
   end
 end
 
@@ -65,8 +61,6 @@
   confine is_pe: true
   setcode do
     pe_version = Facter.value(:pe_version)
-    if pe_version
-      pe_version.to_s.split('.')[2]
-    end
+    pe_version.to_s.split('.')[2] if pe_version
   end
 end

lib/puppet/functions/deprecation.rb

@@ -20,7 +20,7 @@
 
   def deprecation(key, message)
     if defined? Puppet::Pops::PuppetStack.stacktrace
-      stacktrace = Puppet::Pops::PuppetStack.stacktrace()
+      stacktrace = Puppet::Pops::PuppetStack.stacktrace
       file = stacktrace[0]
       line = stacktrace[1]
       message = "#{message} at #{file}:#{line}"
@@ -32,9 +32,7 @@ def deprecation(key, message)
     when :error
       raise("deprecation. #{key}. #{message}")
     else
-      unless ENV['STDLIB_LOG_DEPRECATIONS'] == 'false'
-        Puppet.deprecation_warning(message, key)
-      end
+      Puppet.deprecation_warning(message, key) unless ENV['STDLIB_LOG_DEPRECATIONS'] == 'false'
     end
   end
 end

lib/puppet/functions/stdlib/str2resource.rb

@@ -28,9 +28,7 @@ def str2resource(res_string)
 
     resource = closure_scope.findresource(type_name, title)
 
-    if resource.nil?
-      raise(Puppet::ParseError, "stdlib::str2resource(): could not find #{type_name}[#{title}], this is parse order dependent and values should not be quoted")
-    end
+    raise(Puppet::ParseError, "stdlib::str2resource(): could not find #{type_name}[#{title}], this is parse order dependent and values should not be quoted") if resource.nil?
 
     resource
   end

lib/puppet/functions/to_json_pretty.rb

@@ -61,11 +61,9 @@ def to_json_pretty(data, skip_undef = false, opts = nil)
     # It's not possible to make an abstract type that can be either a boolean
     # false or an integer, so we use -1 as the falsey value
     if opts
-      opts = Hash[opts.map { |k, v| [k.to_sym, v] }]
+      opts = opts.map { |k, v| [k.to_sym, v] }.to_h
 
-      if opts[:max_nesting] == -1
-        opts[:max_nesting] = false
-      end
+      opts[:max_nesting] = false if opts[:max_nesting] == -1
     end
 
     if skip_undef
@@ -77,6 +75,6 @@ def to_json_pretty(data, skip_undef = false, opts = nil)
     end
     # Call ::JSON to ensure it references the JSON library from Ruby's standard library
     # instead of a random JSON namespace that might be in scope due to user code.
-    ::JSON.pretty_generate(data, opts) << "\n"
+    JSON.pretty_generate(data, opts) << "\n"
   end
 end

lib/puppet/parser/functions/any2array.rb

@@ -36,9 +36,7 @@ module Puppet::Parser::Functions
     @return [Array] The new array containing the given object
   DOC
   ) do |arguments|
-    if arguments.empty?
-      return []
-    end
+    return [] if arguments.empty?
 
     return arguments unless arguments.length == 1
     return arguments[0] if arguments[0].is_a?(Array)

lib/puppet/parser/functions/any2bool.rb

@@ -25,29 +25,21 @@ module Puppet::Parser::Functions
     raise(Puppet::ParseError, "any2bool(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.empty?
 
     # If argument is already Boolean, return it
-    if !!arguments[0] == arguments[0] # rubocop:disable Style/DoubleNegation : Could not find a better way to check if a boolean
-      return arguments[0]
-    end
+    return arguments[0] if !!arguments[0] == arguments[0] # rubocop:disable Style/DoubleNegation : Could not find a better way to check if a boolean
 
     arg = arguments[0]
 
-    if arg.nil?
-      return false
-    end
+    return false if arg.nil?
 
-    if arg == :undef
-      return false
-    end
+    return false if arg == :undef
 
     valid_float = begin
       !!Float(arg) # rubocop:disable Style/DoubleNegation : Could not find a better way to check if a boolean
     rescue
       false
     end
 
-    if arg.is_a?(Numeric)
-      return function_num2bool([arguments[0]])
-    end
+    return function_num2bool([arguments[0]]) if arg.is_a?(Numeric)
 
     if arg.is_a?(String)
       return function_num2bool([arguments[0]]) if valid_float

lib/puppet/parser/functions/base64.rb

@@ -41,13 +41,9 @@ module Puppet::Parser::Functions
 
     actions = ['encode', 'decode']
 
-    unless actions.include?(args[0])
-      raise Puppet::ParseError, "base64(): the first argument must be one of 'encode' or 'decode'"
-    end
+    raise Puppet::ParseError, "base64(): the first argument must be one of 'encode' or 'decode'" unless actions.include?(args[0])
 
-    unless args[1].is_a?(String)
-      raise Puppet::ParseError, 'base64(): the second argument must be a string to base64'
-    end
+    raise Puppet::ParseError, 'base64(): the second argument must be a string to base64' unless args[1].is_a?(String)
 
     method = ['default', 'strict', 'urlsafe']
 
@@ -57,9 +53,7 @@ module Puppet::Parser::Functions
                       args[2]
                     end
 
-    unless method.include?(chosen_method)
-      raise Puppet::ParseError, "base64(): the third argument must be one of 'default', 'strict', or 'urlsafe'"
-    end
+    raise Puppet::ParseError, "base64(): the third argument must be one of 'default', 'strict', or 'urlsafe'" unless method.include?(chosen_method)
 
     case args[0]
     when 'encode'

lib/puppet/parser/functions/bool2str.rb

@@ -39,23 +39,17 @@ module Puppet::Parser::Functions
       ```
   DOC
   ) do |arguments|
-    unless arguments.size == 1 || arguments.size == 3
-      raise(Puppet::ParseError, "bool2str(): Wrong number of arguments given (#{arguments.size} for 3)")
-    end
+    raise(Puppet::ParseError, "bool2str(): Wrong number of arguments given (#{arguments.size} for 3)") unless arguments.size == 1 || arguments.size == 3
 
     value = arguments[0]
     true_string = arguments[1] || 'true'
     false_string = arguments[2] || 'false'
     klass = value.class
 
     # We can have either true or false, and nothing else
-    unless [FalseClass, TrueClass].include?(klass)
-      raise(Puppet::ParseError, 'bool2str(): Requires a boolean to work with')
-    end
+    raise(Puppet::ParseError, 'bool2str(): Requires a boolean to work with') unless [FalseClass, TrueClass].include?(klass)
 
-    unless [true_string, false_string].all? { |x| x.is_a?(String) }
-      raise(Puppet::ParseError, 'bool2str(): Requires strings to convert to')
-    end
+    raise(Puppet::ParseError, 'bool2str(): Requires strings to convert to') unless [true_string, false_string].all? { |x| x.is_a?(String) }
 
     return value ? true_string : false_string
   end

lib/puppet/parser/functions/concat.rb

@@ -30,9 +30,7 @@ module Puppet::Parser::Functions
     a = arguments[0]
 
     # Check that the first parameter is an array
-    unless a.is_a?(Array)
-      raise(Puppet::ParseError, 'concat(): Requires array to work with')
-    end
+    raise(Puppet::ParseError, 'concat(): Requires array to work with') unless a.is_a?(Array)
 
     result = a
     arguments.shift

lib/puppet/parser/functions/count.rb

@@ -27,9 +27,7 @@ module Puppet::Parser::Functions
     @return [Integer] The amount of elements counted within the array
   DOC
   ) do |args|
-    if args.size > 2
-      raise(ArgumentError, "count(): Wrong number of arguments given #{args.size} for 1 or 2.")
-    end
+    raise(ArgumentError, "count(): Wrong number of arguments given #{args.size} for 1 or 2.") if args.size > 2
 
     collection, item = args
 

lib/puppet/parser/functions/deep_merge.rb

@@ -24,9 +24,7 @@ module Puppet::Parser::Functions
     @return [Hash] The merged hash
   DOC
 
-    if args.length < 2
-      raise Puppet::ParseError, "deep_merge(): wrong number of arguments (#{args.length}; must be at least 2)"
-    end
+    raise Puppet::ParseError, "deep_merge(): wrong number of arguments (#{args.length}; must be at least 2)" if args.length < 2
 
     deep_merge = proc do |hash1, hash2|
       hash1.merge(hash2) do |_key, old_value, new_value|
@@ -42,9 +40,7 @@ module Puppet::Parser::Functions
     args.each do |arg|
       next if arg.is_a?(String) && arg.empty? # empty string is synonym for puppet's undef
       # If the argument was not a hash, skip it.
-      unless arg.is_a?(Hash)
-        raise Puppet::ParseError, "deep_merge: unexpected argument type #{arg.class}, only expects hash arguments"
-      end
+      raise Puppet::ParseError, "deep_merge: unexpected argument type #{arg.class}, only expects hash arguments" unless arg.is_a?(Hash)
 
       result = deep_merge.call(result, arg)
     end

lib/puppet/parser/functions/defined_with_params.rb

@@ -27,9 +27,7 @@
   reference, params = vals
   raise(ArgumentError, 'Must specify a reference') unless reference
 
-  if !params || params == ''
-    params = {}
-  end
+  params = {} if !params || params == ''
   ret = false
 
   if Puppet::Util::Package.versioncmp(Puppet.version, '4.6.0') >= 0

lib/puppet/parser/functions/delete_at.rb

@@ -35,24 +35,18 @@ module Puppet::Parser::Functions
 
     array = arguments[0]
 
-    unless array.is_a?(Array)
-      raise(Puppet::ParseError, 'delete_at(): Requires array to work with')
-    end
+    raise(Puppet::ParseError, 'delete_at(): Requires array to work with') unless array.is_a?(Array)
 
     index = arguments[1]
 
-    if index.is_a?(String) && !index.match(%r{^\d+$})
-      raise(Puppet::ParseError, 'delete_at(): You must provide non-negative numeric index')
-    end
+    raise(Puppet::ParseError, 'delete_at(): You must provide non-negative numeric index') if index.is_a?(String) && !index.match(%r{^\d+$})
 
     result = array.clone
 
     # Numbers in Puppet are often string-encoded which is troublesome ...
     index = index.to_i
 
-    if index > result.size - 1 # First element is at index 0 is it not?
-      raise(Puppet::ParseError, 'delete_at(): Given index exceeds size of array given')
-    end
+    raise(Puppet::ParseError, 'delete_at(): Given index exceeds size of array given') if index > result.size - 1 # First element is at index 0 is it not?
 
     result.delete_at(index) # We ignore the element that got deleted ...