Fix remaining rubocop offences

Author: smortex

lib/facter/es_facts.rb

@@ -122,6 +122,7 @@ def self.run
         end
       end
     rescue StandardError
+      # ignore
     end
     Facter.add(:elasticsearch) do
       setcode do

lib/puppet/provider/elastic_parsedfile.rb

@@ -9,6 +9,6 @@ class Puppet::Provider::ElasticParsedFile < Puppet::Provider::ParsedFile
   #
   # @return String
   def self.xpack_config(val)
-    @default_target ||= "/etc/elasticsearch/#{val}"
+    @xpack_config ||= "/etc/elasticsearch/#{val}"
   end
 end

lib/puppet/provider/elastic_rest.rb

@@ -28,12 +28,12 @@ def query_string
   # Perform a REST API request against the indicated endpoint.
   #
   # @return Net::HTTPResponse
-  def self.rest(http, \
-                req, \
-                validate_tls = true, \
-                timeout = 10, \
-                username = nil, \
-                password = nil)
+  def self.rest(http,
+                req,
+                timeout = 10,
+                username = nil,
+                password = nil,
+                validate_tls: true)
 
     if username && password
       req.basic_auth username, password
@@ -84,15 +84,15 @@ def self.format_uri(resource_path, property_flush = {})
   # @return Array
   #   an array of Hashes representing the found API objects, whether they be
   #   templates, pipelines, et cetera.
-  def self.api_objects(protocol = 'http', \
-                       validate_tls = true, \
-                       host = 'localhost', \
-                       port = 9200, \
-                       timeout = 10, \
-                       username = nil, \
-                       password = nil, \
-                       ca_file = nil, \
-                       ca_path = nil)
+  def self.api_objects(protocol = 'http',
+                       host = 'localhost',
+                       port = 9200,
+                       timeout = 10,
+                       username = nil,
+                       password = nil,
+                       ca_file = nil,
+                       ca_path = nil,
+                       validate_tls: true)
 
     uri = URI("#{protocol}://#{host}:#{port}/#{format_uri(api_discovery_uri)}")
     http = Net::HTTP.new uri.host, uri.port
@@ -103,7 +103,7 @@ def self.api_objects(protocol = 'http', \
       http.send method, arg if arg && http.respond_to?(method)
     end
 
-    response = rest http, req, validate_tls, timeout, username, password
+    response = rest http, req, timeout, username, password, validate_tls: validate_tls
 
     results = []
 
@@ -151,14 +151,14 @@ def self.prefetch(resources)
       p = resource.parameters
       [
         p[:protocol].value,
-        p[:validate_tls].value,
         p[:host].value,
         p[:port].value,
         p[:timeout].value,
         (p.key?(:username) ? p[:username].value : nil),
         (p.key?(:password) ? p[:password].value : nil),
         (p.key?(:ca_file) ? p[:ca_file].value : nil),
-        (p.key?(:ca_path) ? p[:ca_path].value : nil)
+        (p.key?(:ca_path) ? p[:ca_path].value : nil),
+        p[:validate_tls].value,
       ]
       # Deduplicate identical settings, and fetch templates
     end.uniq
@@ -228,10 +228,10 @@ def flush
     response = self.class.rest(
       http,
       req,
-      resource[:validate_tls],
       resource[:timeout],
       resource[:username],
-      resource[:password]
+      resource[:password],
+      validate_tls: resource[:validate_tls]
     )
 
     # Attempt to return useful error output
@@ -257,14 +257,14 @@ def flush
     end
     @property_hash = self.class.api_objects(
       resource[:protocol],
-      resource[:validate_tls],
       resource[:host],
       resource[:port],
       resource[:timeout],
       resource[:username],
       resource[:password],
       resource[:ca_file],
-      resource[:ca_path]
+      resource[:ca_path],
+      validate_tls: resource[:validate_tls]
     ).find do |t|
       t[:name] == resource[:name]
     end

lib/puppet/type/elasticsearch_index.rb

@@ -21,8 +21,8 @@
   newproperty(:settings) do
     desc 'Structured settings for the index in hash form.'
 
-    def insync?(is)
-      Puppet_X::Elastic.asymmetric_compare(should, is)
+    def insync?(value)
+      Puppet_X::Elastic.asymmetric_compare(should, value)
     end
 
     munge do |value|

lib/puppet/type/elasticsearch_keystore.rb

@@ -31,11 +31,11 @@
     # The keystore utility can only retrieve a list of stored settings,
     # so here we only compare the existing settings (sorted) with the
     # desired settings' keys
-    def insync?(is)
+    def insync?(value)
       if resource[:purge]
-        is.sort == @should.first.keys.sort
+        value.sort == @should.first.keys.sort
       else
-        (@should.first.keys - is).empty?
+        (@should.first.keys - value).empty?
       end
     end
 

lib/puppet/type/elasticsearch_license.rb

@@ -21,10 +21,10 @@
   newproperty(:content) do
     desc 'Structured hash for license content data.'
 
-    def insync?(is)
+    def insync?(value)
       Puppet_X::Elastic.asymmetric_compare(
         should.transform_values { |v| v.is_a?(Hash) ? (v.reject { |s, _| s == 'signature' }) : v },
-        is
+        value
       )
     end
 

lib/puppet/type/elasticsearch_template.rb

@@ -64,8 +64,8 @@
       )
     end
 
-    def insync?(is)
-      Puppet_X::Elastic.deep_implode(is) == \
+    def insync?(value)
+      Puppet_X::Elastic.deep_implode(value) == \
         Puppet_X::Elastic.deep_implode(should)
     end
   end
@@ -113,4 +113,5 @@ def insync?(is)
       self[:content] = PSON.load(tmp.content)
     end
   end
+  # rubocop:enable Style/SignalException
 end

lib/puppet/type/elasticsearch_user_roles.rb

@@ -11,8 +11,8 @@
 
   newproperty(:roles, array_matching: :all) do
     desc 'Array of roles that the user should belong to.'
-    def insync?(is)
-      is.sort == should.sort
+    def insync?(value)
+      value.sort == should.sort
     end
   end
 

lib/puppet_x/elastic/plugin_parsing.rb

@@ -17,7 +17,7 @@ def self.plugin_version(raw_name)
     end
 
     # Attempt to guess at the plugin's final directory name
-    def self.plugin_split(original_string, position, soft_fail = true)
+    def self.plugin_split(original_string, position, soft_fail: true)
       # Try both colon (maven) and slash-delimited (github/elastic.co) names
       %w[/ :].each do |delimiter|
         parts = original_string.split(delimiter)

spec/classes/000_elasticsearch_init_spec.rb

@@ -7,6 +7,7 @@
     config: { 'node.name' => 'foo' }
   }
 
+  # rubocop:disable RSpec/MultipleMemoizedHelpers
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       case facts[:os]['family']
@@ -293,6 +294,7 @@
       end
     end
   end
+  # rubocop:enable RSpec/MultipleMemoizedHelpers
 
   on_supported_os(
     hardwaremodels: ['x86_64'],
@@ -465,14 +467,14 @@
       # This check helps catch dependency cycles.
       context 'create_resource' do
         # Helper for these tests
-        def singular(s)
-          case s
+        def singular(string)
+          case string
           when 'indices'
             'index'
           when 'snapshot_repositories'
             'snapshot_repository'
           else
-            s[0..-2]
+            string[0..-2]
           end
         end