Fix rubocop offenses

Author: smortex

lib/facter/es_facts.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'net/http'
 require 'json'
 require 'yaml'
@@ -27,15 +29,13 @@ def self.get_httpport(config)
 
     return false, false if !config[enabled].nil? && config[enabled] == 'false'
     return config[httpport], ssl?(config) unless config[httpport].nil?
+
     ['9200', ssl?(config)]
   end
 
   # Entrypoint for custom fact populator
   #
   # This is a super old function but works; disable a bunch of checks.
-  # rubocop:disable Lint/HandleExceptions
-  # rubocop:disable Metrics/CyclomaticComplexity
-  # rubocop:disable Metrics/PerceivedComplexity
   def self.run
     dir_prefix = '/etc/elasticsearch'
     # httpports is a hash of port_number => ssl?
@@ -104,24 +104,24 @@ def self.run
           nodes_data['http']['bound_address'].each { |i| http_bound_addresses << i }
           nodes_data['transport']['bound_address'].each { |i| transport_bound_addresses << i }
           transport_publish_addresses << nodes_data['transport']['publish_address'] unless nodes_data['transport']['publish_address'].nil?
-          transportports << nodes_data['settings']['transport']['tcp']['port'] unless nodes_data['settings']['transport']['tcp'].nil? or nodes_data['settings']['transport']['tcp']['port'].nil?
+          transportports << nodes_data['settings']['transport']['tcp']['port'] unless nodes_data['settings']['transport']['tcp'].nil? || nodes_data['settings']['transport']['tcp']['port'].nil?
 
           node = {
-            'http_ports'                  => httpports.keys,
-            'transport_ports'             => transportports,
-            'http_bound_addresses'        => http_bound_addresses,
-            'transport_bound_addresses'   => transport_bound_addresses,
+            'http_ports' => httpports.keys,
+            'transport_ports' => transportports,
+            'http_bound_addresses' => http_bound_addresses,
+            'transport_bound_addresses' => transport_bound_addresses,
             'transport_publish_addresses' => transport_publish_addresses,
-            json_data['name']             => {
-              'settings'  => nodes_data['settings'],
-              'http'      => nodes_data['http'],
+            json_data['name'] => {
+              'settings' => nodes_data['settings'],
+              'http' => nodes_data['http'],
               'transport' => nodes_data['transport']
             }
           }
           nodes.merge! node
         end
       end
-    rescue
+    rescue StandardError
     end
     Facter.add(:elasticsearch) do
       setcode do
@@ -130,8 +130,6 @@ def self.run
       nodes unless nodes.empty?
     end
   end
-  # rubocop:enable Metrics/CyclomaticComplexity
-  # rubocop:enable Metrics/PerceivedComplexity
 end
 
 EsFacts.run

lib/puppet/feature/elasticsearch_shield_users_native.rb

@@ -1,16 +1,22 @@
+# frozen_string_literal: true
+
 require 'puppet/util/feature'
 require 'puppet/util/package'
 
 shield_plugin_dir = '/usr/share/elasticsearch/plugins/shield'
 
-Puppet.features.add(:elasticsearch_shield_users_native) {
-  File.exist? shield_plugin_dir and
-    Dir[shield_plugin_dir + '/*.jar'].map do |file|
-      File.basename(file, '.jar').split('-')
-    end.select do |parts|
-      parts.include? 'shield'
-    end.any? do |parts|
-      parts.last =~ /^[\d.]+$/ and
-        Puppet::Util::Package.versioncmp(parts.last, '2.3') >= 0
-    end
-}
+Puppet.features.add(:elasticsearch_shield_users_native) do
+  return false unless File.exist?(shield_plugin_dir)
+
+  jars = Dir["#{shield_plugin_dir}/*.jar"]
+  jar_parts = jars.map do |file|
+    File.basename(file, '.jar').split('-')
+  end
+  shield_components = jar_parts.select do |parts|
+    parts.include? 'shield'
+  end
+  shield_components.any? do |parts|
+    parts.last =~ %r{^[\d.]+$} &&
+      Puppet::Util::Package.versioncmp(parts.last, '2.3') >= 0
+  end
+end

lib/puppet/parser/functions/array_suffix.rb

@@ -1,40 +1,38 @@
+# frozen_string_literal: true
+
 # Top-level Puppet functions
 module Puppet::Parser::Functions
   newfunction(
     :array_suffix,
-    :type => :rvalue,
-    :doc => <<-EOS
-This function applies a suffix to all elements in an array.
+    type: :rvalue,
+    doc: <<~EOS
+      This function applies a suffix to all elements in an array.
 
-*Examples:*
+      *Examples:*
 
-    array_suffix(['a','b','c'], 'p')
+          array_suffix(['a','b','c'], 'p')
 
-Will return: ['ap','bp','cp']
+      Will return: ['ap','bp','cp']
 
-@return Array
+      @return Array
     EOS
   ) do |arguments|
     # Technically we support two arguments but only first is mandatory ...
-    raise(Puppet::ParseError, 'array_suffix(): Wrong number of arguments ' \
-      "given (#{arguments.size} for 1)") if arguments.empty?
+    if arguments.empty?
+      raise(Puppet::ParseError, 'array_suffix(): Wrong number of arguments ' \
+                                "given (#{arguments.size} for 1)")
+    end
 
     array = arguments[0]
 
-    unless array.is_a?(Array)
-      raise Puppet::ParseError, "array_suffix(): expected first argument to be an Array, got #{array.inspect}"
-    end
+    raise Puppet::ParseError, "array_suffix(): expected first argument to be an Array, got #{array.inspect}" unless array.is_a?(Array)
 
     suffix = arguments[1] if arguments[1]
 
-    if suffix
-      unless suffix.is_a? String
-        raise Puppet::ParseError, "array_suffix(): expected second argument to be a String, got #{suffix.inspect}"
-      end
-    end
+    raise Puppet::ParseError, "array_suffix(): expected second argument to be a String, got #{suffix.inspect}" if suffix && !(suffix.is_a? String)
 
     # Turn everything into string same as join would do ...
-    result = array.collect do |i|
+    result = array.map do |i|
       i = i.to_s
       suffix ? i + suffix : i
     end

lib/puppet/parser/functions/concat_merge.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 # Top-level Puppet functions
 module Puppet::Parser::Functions
   newfunction(
     :concat_merge,
-    :type => :rvalue,
-    :doc => <<-'ENDHEREDOC') do |args|
+    type: :rvalue,
+    doc: <<-'ENDHEREDOC') do |args|
     Merges two or more hashes together concatenating duplicate keys
     with array values and returns the resulting hash.
 
@@ -21,9 +23,7 @@ module Puppet::Parser::Functions
     @return String
     ENDHEREDOC
 
-    if args.length < 2
-      raise Puppet::ParseError, "concat_merge(): wrong number of arguments (#{args.length}; must be at least 2)"
-    end
+    raise Puppet::ParseError, "concat_merge(): wrong number of arguments (#{args.length}; must be at least 2)" if args.length < 2
 
     concat_merge = proc do |hash1, hash2|
       hash1.merge(hash2) do |_key, old_value, new_value|
@@ -37,11 +37,9 @@ module Puppet::Parser::Functions
 
     result = {}
     args.each do |arg|
-      next if arg.is_a? String and arg.empty? # empty string is synonym for puppet's undef
+      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, "concat_merge: unexpected argument type #{arg.class}, only expects hash arguments"
-      end
+      raise Puppet::ParseError, "concat_merge: unexpected argument type #{arg.class}, only expects hash arguments" unless arg.is_a?(Hash)
 
       result = concat_merge.call(result, arg)
     end

lib/puppet/parser/functions/deep_implode.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
 
 require 'puppet_x/elastic/deep_implode'
@@ -6,8 +8,8 @@
 module Puppet::Parser::Functions
   newfunction(
     :deep_implode,
-    :type => :rvalue,
-    :doc => <<-'ENDHEREDOC') do |args|
+    type: :rvalue,
+    doc: <<-'ENDHEREDOC') do |args|
     Recursively flattens all keys of a hash into a dot-notated
     hash, deeply merging duplicate key values by natively combining
     them and returns the resulting hash.
@@ -29,15 +31,11 @@ module Puppet::Parser::Functions
     @return Hash
     ENDHEREDOC
 
-    if args.length != 1
-      raise Puppet::ParseError, "deep_implode(): wrong number of arguments (#{args.length}; must be 1)"
-    end
+    raise Puppet::ParseError, "deep_implode(): wrong number of arguments (#{args.length}; must be 1)" if args.length != 1
 
     arg = args[0]
 
-    unless arg.is_a? Hash
-      raise Puppet::ParseError, 'deep_implode: unexpected argument type, only expects hashes'
-    end
+    raise Puppet::ParseError, 'deep_implode: unexpected argument type, only expects hashes' unless arg.is_a? Hash
 
     return {} if arg.empty?
 

lib/puppet/parser/functions/es_plugin_name.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
 
 require 'puppet_x/elastic/plugin_parsing'
@@ -6,8 +8,8 @@
 module Puppet::Parser::Functions
   newfunction(
     :es_plugin_name,
-    :type => :rvalue,
-    :doc => <<-'ENDHEREDOC') do |args|
+    type: :rvalue,
+    doc: <<-'ENDHEREDOC') do |args|
     Given a string, return the best guess at what the directory name
     will be for the given plugin. Any arguments past the first will
     be fallbacks (using the same logic) should the first fail.
@@ -29,7 +31,7 @@ module Puppet::Parser::Functions
     end
 
     ret = args.select do |arg|
-      arg.is_a? String and not arg.empty?
+      arg.is_a?(String) && !arg.empty?
     end.first
 
     if ret

lib/puppet/parser/functions/plugin_dir.rb

@@ -1,43 +1,38 @@
+# frozen_string_literal: true
+
 # Top-level Puppet functions
 module Puppet::Parser::Functions
   newfunction(
     :plugin_dir,
-    :type => :rvalue,
-    :doc => <<-EOS
+    type: :rvalue,
+    doc: <<-EOS
     Extracts the end plugin directory of the name
 
     @return String
     EOS
   ) do |arguments|
-    if arguments.empty?
-      raise(Puppet::ParseError, 'plugin_dir(): No arguments given')
-    elsif arguments.size > 2
-      raise(Puppet::ParseError, "plugin_dir(): Too many arguments given (#{arguments.size})")
-    else
-
-      unless arguments[0].is_a?(String)
-        raise(Puppet::ParseError, 'plugin_dir(): Requires string as first argument')
-      end
+    raise(Puppet::ParseError, 'plugin_dir(): No arguments given') if arguments.empty?
+    raise(Puppet::ParseError, "plugin_dir(): Too many arguments given (#{arguments.size})") if arguments.size > 2
+    raise(Puppet::ParseError, 'plugin_dir(): Requires string as first argument') unless arguments[0].is_a?(String)
 
-      plugin_name = arguments[0]
-      items = plugin_name.split('/')
+    plugin_name = arguments[0]
+    items = plugin_name.split('/')
 
-      return items[0] if items.count == 1
+    return items[0] if items.count == 1
 
-      plugin = items[1]
-      endname = if plugin.include?('-') # example elasticsearch-head
-                  if plugin.start_with?('elasticsearch-')
-                    plugin.gsub('elasticsearch-', '')
-                  elsif plugin.start_with?('es-')
-                    plugin.gsub('es-', '')
-                  else
-                    plugin
-                  end
+    plugin = items[1]
+    endname = if plugin.include?('-') # example elasticsearch-head
+                if plugin.start_with?('elasticsearch-')
+                  plugin.gsub('elasticsearch-', '')
+                elsif plugin.start_with?('es-')
+                  plugin.gsub('es-', '')
                 else
                   plugin
                 end
+              else
+                plugin
+              end
 
-      return endname
-    end
+    return endname
   end
 end

lib/puppet/provider/elastic_parsedfile.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'puppet/provider/parsedfile'
 
 # Parent class for Elasticsearch-based providers that need to access

lib/puppet/provider/elastic_plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..'))
 
 require 'uri'
@@ -6,7 +8,6 @@
 
 # Generalized parent class for providers that behave like Elasticsearch's plugin
 # command line tool.
-# rubocop:disable Metrics/ClassLength
 class Puppet::Provider::ElasticPlugin < Puppet::Provider
   # Elasticsearch's home directory.
   #
@@ -41,16 +42,20 @@ def exists?
       # in one. Therefore, we need to find the first "sub" plugin that
       # indicates which version of x-pack this is.
       properties = properties_files.sort.map do |prop_file|
-        IO.readlines(prop_file).map(&:strip).reject do |line|
-          line.start_with?('#') or line.empty?
-        end.map do |property|
+        lines = File.readlines(prop_file).map(&:strip).reject do |line|
+          line.start_with?('#') || line.empty?
+        end
+        lines = lines.map do |property|
           property.split('=')
-        end.reject do |pairs|
-          pairs.length != 2
-        end.to_h
-      end.find { |prop| prop.key? 'version' }
+        end
+        lines = lines.select do |pairs|
+          pairs.length == 2
+        end
+        lines.to_h
+      end
+      properties = properties.find { |prop| prop.key? 'version' }
 
-      if properties and properties['version'] != plugin_version
+      if properties && properties['version'] != plugin_version
         debug "Elasticsearch plugin #{@resource[:name]} not version #{plugin_version}, reinstalling"
         destroy
         return false
@@ -90,7 +95,7 @@ def install_args
   def proxy_args(url)
     parsed = URI(url)
     %w[http https].map do |schema|
-      [:host, :port, :user, :password].map do |param|
+      %i[host port user password].map do |param|
         option = parsed.send(param)
         "-D#{schema}.proxy#{param.to_s.capitalize}=#{option}" unless option.nil?
       end
@@ -137,7 +142,7 @@ def with_environment(&block)
     saved_vars = {}
 
     # Use 'java_home' param if supplied, otherwise default to Elasticsearch shipped JDK
-    env_vars['JAVA_HOME'] = if @resource[:java_home].nil? or @resource[:java_home] == ''
+    env_vars['JAVA_HOME'] = if @resource[:java_home].nil? || @resource[:java_home] == ''
                               "#{homedir}/jdk"
                             else
                               @resource[:java_home]