(CONT-801) Autocorrect safe group 8

Author: LukasAud

.rubocop_todo.yml

@@ -302,17 +302,6 @@ Style/SlicingWithRange:
   Exclude:
     - 'spec/functions/validate_x509_rsa_key_pair_spec.rb'
 
-# Offense count: 6
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowModifier.
-Style/SoleNestedConditional:
-  Exclude:
-    - 'lib/puppet/parser/functions/convert_base.rb'
-    - 'lib/puppet/parser/functions/getparam.rb'
-    - 'lib/puppet/parser/functions/prefix.rb'
-    - 'lib/puppet/parser/functions/suffix.rb'
-    - 'lib/puppet/type/file_line.rb'
-
 # Offense count: 2
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/StringChars:
@@ -339,36 +328,3 @@ Style/SymbolProc:
     - 'lib/puppet/parser/functions/fqdn_uuid.rb'
     - 'lib/puppet/parser/functions/shell_join.rb'
     - 'lib/puppet/parser/functions/squeeze.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, AllowSafeAssignment.
-# SupportedStyles: require_parentheses, require_no_parentheses, require_parentheses_when_complex
-Style/TernaryParentheses:
-  Exclude:
-    - 'spec/unit/facter/root_home_spec.rb'
-
-# Offense count: 31
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInHashLiteral:
-  Exclude:
-    - 'lib/puppet/parser/functions/pw_hash.rb'
-    - 'lib/puppet/parser/functions/str2saltedpbkdf2.rb'
-    - 'spec/classes/manage_spec.rb'
-    - 'spec/functions/has_interface_with_spec.rb'
-    - 'spec/functions/has_ip_address_spec.rb'
-    - 'spec/functions/has_ip_network_spec.rb'
-    - 'spec/functions/os_version_gte_spec.rb'
-    - 'spec/spec_helper.rb'
-    - 'spec/unit/puppet/provider/file_line/ruby_spec.rb'
-    - 'spec/unit/puppet/provider/file_line/ruby_spec_alter.rb'
-    - 'spec/unit/puppet/provider/file_line/ruby_spec_use_cases.rb'
-
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-Style/UnpackFirst:
-  Exclude:
-    - 'lib/puppet/parser/functions/str2saltedpbkdf2.rb'
-    - 'lib/puppet/parser/functions/str2saltedsha512.rb'

lib/puppet/parser/functions/convert_base.rb

@@ -32,13 +32,9 @@ module Puppet::Parser::Functions
     raise Puppet::ParseError, 'convert_base(): First argument must be either a string or an integer' unless args[0].is_a?(Integer) || args[0].is_a?(String)
     raise Puppet::ParseError, 'convert_base(): Second argument must be either a string or an integer' unless args[1].is_a?(Integer) || args[1].is_a?(String)
 
-    if args[0].is_a?(String)
-      raise Puppet::ParseError, 'convert_base(): First argument must be an integer or a string corresponding to an integer in base 10' unless %r{^[0-9]+$}.match?(args[0])
-    end
+    raise Puppet::ParseError, 'convert_base(): First argument must be an integer or a string corresponding to an integer in base 10' if args[0].is_a?(String) && !%r{^[0-9]+$}.match?(args[0])
 
-    if args[1].is_a?(String)
-      raise Puppet::ParseError, 'convert_base(): First argument must be an integer or a string corresponding to an integer in base 10' unless %r{^[0-9]+$}.match?(args[1])
-    end
+    raise Puppet::ParseError, 'convert_base(): First argument must be an integer or a string corresponding to an integer in base 10' if args[1].is_a?(String) && !%r{^[0-9]+$}.match?(args[1])
 
     number_to_convert = args[0]
     new_base = args[1]

lib/puppet/parser/functions/getparam.rb

@@ -51,9 +51,7 @@
   return '' if param.empty?
 
   resource = findresource(reference.to_s)
-  if resource
-    return resource[param] unless resource[param].nil?
-  end
+  return resource[param] if resource && !resource[param].nil?
 
   return ''
 end

lib/puppet/parser/functions/prefix.rb

@@ -29,9 +29,7 @@ module Puppet::Parser::Functions
 
     prefix = arguments[1] if arguments[1]
 
-    if prefix
-      raise Puppet::ParseError, "prefix(): expected second argument to be a String, got #{prefix.inspect}" unless prefix.is_a?(String)
-    end
+    raise Puppet::ParseError, "prefix(): expected second argument to be a String, got #{prefix.inspect}" if prefix && !prefix.is_a?(String)
 
     result = if enumerable.is_a?(Array)
                # Turn everything into string same as join would do ...

lib/puppet/parser/functions/pw_hash.rb

@@ -54,7 +54,7 @@
     'bcrypt' => { prefix: '2b', salt: %r{^(0[4-9]|[12][0-9]|3[01])\$[./A-Za-z0-9]{22}} },
     'bcrypt-a' => { prefix: '2a', salt: %r{^(0[4-9]|[12][0-9]|3[01])\$[./A-Za-z0-9]{22}} },
     'bcrypt-x' => { prefix: '2x', salt: %r{^(0[4-9]|[12][0-9]|3[01])\$[./A-Za-z0-9]{22}} },
-    'bcrypt-y' => { prefix: '2y', salt: %r{^(0[4-9]|[12][0-9]|3[01])\$[./A-Za-z0-9]{22}} },
+    'bcrypt-y' => { prefix: '2y', salt: %r{^(0[4-9]|[12][0-9]|3[01])\$[./A-Za-z0-9]{22}} }
   }
 
   raise ArgumentError, 'pw_hash(): first argument must be a string' unless args[0].is_a?(String) || args[0].nil?

lib/puppet/parser/functions/str2saltedpbkdf2.rb

@@ -62,9 +62,9 @@ module Puppet::Parser::Functions
     hash       = OpenSSL::PKCS5.pbkdf2_hmac(password, salt, iterations, keylen, digest)
 
     {
-      'password_hex' => hash.unpack('H*').first,
-      'salt_hex' => salt.unpack('H*').first,
-      'iterations' => iterations,
+      'password_hex' => hash.unpack1('H*'),
+      'salt_hex' => salt.unpack1('H*'),
+      'iterations' => iterations
     }
   end
 end

lib/puppet/parser/functions/str2saltedsha512.rb

@@ -29,7 +29,7 @@ module Puppet::Parser::Functions
     seedint    = rand((2**31) - 1)
     seedstring = Array(seedint).pack('L')
     saltedpass = Digest::SHA512.digest(seedstring + password)
-    (seedstring + saltedpass).unpack('H*')[0]
+    (seedstring + saltedpass).unpack1('H*')
   end
 end
 

lib/puppet/parser/functions/suffix.rb

@@ -33,9 +33,7 @@ module Puppet::Parser::Functions
 
     suffix = arguments[1] if arguments[1]
 
-    if suffix
-      raise Puppet::ParseError, "suffix(): expected second argument to be a String, got #{suffix.inspect}" unless suffix.is_a? String
-    end
+    raise Puppet::ParseError, "suffix(): expected second argument to be a String, got #{suffix.inspect}" if suffix && !(suffix.is_a? String)
 
     result = if enumerable.is_a?(Array)
                # Turn everything into string same as join would do ...

lib/puppet/type/file_line.rb

@@ -188,9 +188,7 @@ def retrieve
     raise(Puppet::Error, 'multiple must be true when replace_all_matches_not_matching_line is true') if self[:replace_all_matches_not_matching_line].to_s == 'true' && self[:multiple].to_s == 'false'
     raise(Puppet::Error, 'replace must be true when replace_all_matches_not_matching_line is true') if self[:replace_all_matches_not_matching_line].to_s == 'true' && self[:replace].to_s == 'false'
 
-    unless self[:line]
-      raise(Puppet::Error, 'line is a required attribute') unless (self[:ensure].to_s == 'absent') && (self[:match_for_absence].to_s == 'true') && self[:match]
-    end
+    raise(Puppet::Error, 'line is a required attribute') if !self[:line] && !((self[:ensure].to_s == 'absent') && (self[:match_for_absence].to_s == 'true') && self[:match])
     raise(Puppet::Error, 'path is a required attribute') unless self[:path]
   end
 end

spec/classes/manage_spec.rb

@@ -24,13 +24,13 @@
           'file' => {
             '/etc/motd.d/hello' => {
               'content' => 'I say Hi',
-              'notify' => 'Service[sshd]',
+              'notify' => 'Service[sshd]'
             }
           },
           'package' => {
             'example' => {
               'ensure' => 'installed',
-              'subscribe' => ['Service[sshd]', 'File[/etc/motd.d]'],
+              'subscribe' => ['Service[sshd]', 'File[/etc/motd.d]']
             }
           }
         }