rubocop: autofix

Author: bastelfreak

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --no-auto-gen-timestamp`
-# using RuboCop version 1.50.2.
+# using RuboCop version 1.85.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
@@ -15,6 +15,7 @@ Lint/MissingCopEnableDirective:
     - 'spec/unit/puppet/type/zabbix_host_spec.rb'
 
 # Offense count: 1
+# Configuration parameters: AllowedParentClasses.
 Lint/MissingSuper:
   Exclude:
     - 'spec/serverspec_type_zabbixapi.rb'
@@ -33,11 +34,22 @@ RSpec/BeEq:
     - 'spec/acceptance/zabbix_proxy_spec.rb'
     - 'spec/unit/puppet/type/zabbix_template_spec.rb'
 
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-RSpec/EmptyExampleGroup:
+# Offense count: 39
+RSpec/LeakyLocalVariable:
   Exclude:
+    - 'spec/acceptance/zabbix_host_spec.rb'
+    - 'spec/acceptance/zabbix_hostgroup_spec.rb'
+    - 'spec/acceptance/zabbix_proxy_spec.rb'
+    - 'spec/acceptance/zabbix_template_spec.rb'
     - 'spec/classes/agent_spec.rb'
+    - 'spec/classes/database_mysql_spec.rb'
+    - 'spec/classes/database_postgresql_spec.rb'
+    - 'spec/classes/proxy_spec.rb'
+    - 'spec/classes/repo_spec.rb'
+    - 'spec/classes/sender_spec.rb'
+    - 'spec/classes/server_spec.rb'
+    - 'spec/defines/userparameters_spec.rb'
+    - 'spec/unit/puppet/type/zabbix_template_spec.rb'
 
 # Offense count: 4
 # Configuration parameters: .
@@ -50,6 +62,13 @@ RSpec/RepeatedExampleGroupDescription:
   Exclude:
     - 'spec/defines/startup_spec.rb'
 
+# Offense count: 3
+RSpec/SpecFilePathSuffix:
+  Exclude:
+    - 'spec/unit/puppet/provider/zabbix_host/ruby.rb'
+    - 'spec/unit/puppet/provider/zabbix_hostgroup/ruby.rb'
+    - 'spec/unit/puppet/provider/zabbix_proxy/ruby.rb'
+
 # Offense count: 4
 RSpec/StubbedMock:
   Exclude:

lib/puppet/provider/zabbix.rb

@@ -47,14 +47,14 @@ def zbx
 
   # Create the api connection
   def self.create_connection
-    protocol = api_config['default']['apache_use_ssl'] == 'true' ? 'https' : 'http'
+    protocol = (api_config['default']['apache_use_ssl'] == 'true') ? 'https' : 'http'
     ZabbixApi.connect(
       url: "#{protocol}://#{api_config['default']['zabbix_url']}/api_jsonrpc.php",
       user: api_config['default']['zabbix_user'],
       password: api_config['default']['zabbix_pass'],
       http_user: api_config['default']['zabbix_user'],
       http_password: api_config['default']['zabbix_pass'],
-      ignore_version: true
+      ignore_version: true,
     )
   end
 
@@ -68,11 +68,11 @@ def check_host(host)
       method: 'host.get',
       params: {
         filter: {
-          'host' => [host]
+          'host' => [host],
         },
         selectParentTemplates: ['host'],
-        output: ['host']
-      }
+        output: ['host'],
+      },
     )
   rescue Puppet::ExecutionFailure
     false

lib/puppet/provider/zabbix_host/ruby.rb

@@ -14,8 +14,8 @@ def self.instances
         selectInterfaces: %w[interfaceid type main ip port useip details],
         selectGroups: ['name'],
         selectMacros: %w[macro value],
-        output: %w[host proxy_hostid tls_accept tls_connect tls_issuer tls_subject]
-      }
+        output: %w[host proxy_hostid tls_accept tls_connect tls_issuer tls_subject],
+      },
     )
 
     api_hosts.map do |h|
@@ -43,7 +43,7 @@ def self.instances
         tls_accept: h['tls_accept'].to_i,
         tls_connect: h['tls_connect'].to_i,
         tls_issuer: h['tls_issuer'].to_s,
-        tls_subject: h['tls_subject'].to_s
+        tls_subject: h['tls_subject'].to_s,
       )
     end
   end
@@ -63,7 +63,7 @@ def create
     gids = get_groupids(@resource[:groups], @resource[:group_create])
     groups = transform_to_array_hash('groupid', gids)
 
-    proxy_hostid = @resource[:proxy].nil? || @resource[:proxy].empty? ? nil : zbx.proxies.get_id(host: @resource[:proxy])
+    proxy_hostid = (@resource[:proxy].nil? || @resource[:proxy].empty?) ? nil : zbx.proxies.get_id(host: @resource[:proxy])
 
     tls_accept = @resource[:tls_accept].nil? ? 1 : @resource[:tls_accept]
     tls_connect = @resource[:tls_connect].nil? ? 1 : @resource[:tls_connect]
@@ -80,15 +80,15 @@ def create
           dns: @resource[:hostname],
           port: @resource[:port],
           useip: @resource[:use_ip] ? 1 : 0,
-          details: @resource[:interfacedetails].nil? ? {} : @resource[:interfacedetails]
-        }
+          details: @resource[:interfacedetails].nil? ? {} : @resource[:interfacedetails],
+        },
       ],
       templates: templates,
       groups: groups,
       tls_connect: tls_connect,
       tls_accept: tls_accept,
       tls_issuer: @resource[:tls_issuer].nil? ? '' : @resource[:tls_issuer],
-      tls_subject: @resource[:tls_subject].nil? ? '' : @resource[:tls_subject]
+      tls_subject: @resource[:tls_subject].nil? ? '' : @resource[:tls_subject],
     )
   end
 
@@ -139,8 +139,8 @@ def ipaddress=(string)
       method: 'hostinterface.update',
       params: {
         interfaceid: @property_hash[:interfaceid],
-        ip: string
-      }
+        ip: string,
+      },
     )
   end
 
@@ -150,8 +150,8 @@ def use_ip=(boolean)
       params: {
         interfaceid: @property_hash[:interfaceid],
         useip: boolean ? 1 : 0,
-        dns: @resource[:hostname]
-      }
+        dns: @resource[:hostname],
+      },
     )
   end
 
@@ -160,8 +160,8 @@ def port=(int)
       method: 'hostinterface.update',
       params: {
         interfaceid: @property_hash[:interfaceid],
-        port: int
-      }
+        port: int,
+      },
     )
   end
 
@@ -170,8 +170,8 @@ def interfacetype=(int)
       method: 'hostinterface.update',
       params: {
         interfaceid: @property_hash[:interfaceid],
-        type: int
-      }
+        type: int,
+      },
     )
   end
 
@@ -180,8 +180,8 @@ def interfacedetails=(hash)
       method: 'hostinterface.update',
       params: {
         interfaceid: @property_hash[:interfaceid],
-        details: hash
-      }
+        details: hash,
+      },
     )
   end
 
@@ -191,7 +191,7 @@ def groups=(hostgroups)
 
     zbx.hosts.create_or_update(
       host: @resource[:hostname],
-      groups: groups
+      groups: groups,
     )
   end
 
@@ -204,8 +204,8 @@ def templates=(array)
       params: {
         hostids: @property_hash[:id],
         selectParentTemplates: ['templateid'],
-        output: ['host']
-      }
+        output: ['host'],
+      },
     ).first['parentTemplates'].map { |t| t['templateid'].to_i }
     templates_clear = is_template_ids - should_template_ids
 
@@ -214,8 +214,8 @@ def templates=(array)
       params: {
         hostid: @property_hash[:id],
         templates: transform_to_array_hash('templateid', should_template_ids),
-        templates_clear: transform_to_array_hash('templateid', templates_clear)
-      }
+        templates_clear: transform_to_array_hash('templateid', templates_clear),
+      },
     )
   end
 
@@ -225,23 +225,23 @@ def macros=(array)
       method: 'host.update',
       params: {
         hostid: @property_hash[:id],
-        macros: macroarray
-      }
+        macros: macroarray,
+      },
     )
   end
 
   def proxy=(string)
     zbx.hosts.create_or_update(
       host: @resource[:hostname],
-      proxy_hostid: zbx.proxies.get_id(host: string)
+      proxy_hostid: zbx.proxies.get_id(host: string),
     )
   end
 
   def tls_connect=(int)
     @property_hash[:tls_connect] = int
     zbx.hosts.create_or_update(
       host: @resource[:hostname],
-      tls_connect: @property_hash[:tls_connect].nil? ? 1 : @property_hash[:tls_connect]
+      tls_connect: @property_hash[:tls_connect].nil? ? 1 : @property_hash[:tls_connect],
     )
   end
 
@@ -250,23 +250,23 @@ def tls_accept=(int)
 
     zbx.hosts.create_or_update(
       host: @resource[:hostname],
-      tls_accept: @property_hash[:tls_accept].nil? ? 1 : @property_hash[:tls_accept]
+      tls_accept: @property_hash[:tls_accept].nil? ? 1 : @property_hash[:tls_accept],
     )
   end
 
   def tls_issuer=(string)
     @property_hash[:tls_issuer] = string
     zbx.hosts.create_or_update(
       host: @resource[:hostname],
-      tls_issuer: @property_hash[:tls_issuer].nil? ? '' : @property_hash[:tls_issuer]
+      tls_issuer: @property_hash[:tls_issuer].nil? ? '' : @property_hash[:tls_issuer],
     )
   end
 
   def tls_subject=(string)
     @property_hash[:tls_subject] = string
     zbx.hosts.create_or_update(
       host: @resource[:hostname],
-      tls_subject: @property_hash[:tls_subject].nil? ? '' : @property_hash[:tls_subject]
+      tls_subject: @property_hash[:tls_subject].nil? ? '' : @property_hash[:tls_subject],
     )
   end
 end

lib/puppet/provider/zabbix_hostgroup/ruby.rb

@@ -10,7 +10,7 @@ def self.instances
     api_hostgroups.map do |group_name, _id|
       new(
         ensure: :present,
-        name: group_name
+        name: group_name,
       )
     end
   end