(CONT-789) Rubocop Unsafe Autocorrect 4-6

- RSpec/VerifiedDoubleReference
- Style/CaseLikeIf
- Style/CommentedKeyword

Author: david22swan

.rubocop_todo.yml

@@ -155,27 +155,6 @@ RSpec/StubbedMock:
     - 'spec/unit/puppet/provider/mysql_plugin/mysql_spec.rb'
     - 'spec/unit/puppet/provider/mysql_user/mysql_spec.rb'
 
-# Offense count: 3
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: .
-# SupportedStyles: constant, string
-RSpec/VerifiedDoubleReference:
-  EnforcedStyle: string
-
-# Offense count: 3
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: MinBranchesCount.
-Style/CaseLikeIf:
-  Exclude:
-    - 'lib/puppet/provider/mysql_user/mysql.rb'
-    - 'spec/acceptance/types/mysql_plugin_spec.rb'
-
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/CommentedKeyword:
-  Exclude:
-    - 'lib/puppet/provider/mysql_login_path/inifile.rb'
-
 # Offense count: 2
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/GlobalStdStream:

lib/puppet/provider/mysql_login_path/inifile.rb

@@ -643,4 +643,4 @@ def unescape_value(value)
       value
     end
   end
-end # IniFile
+end

lib/puppet/provider/mysql_user/mysql.rb

@@ -23,9 +23,8 @@ def self.instances
       else
         query = "SELECT MAX_USER_CONNECTIONS, MAX_CONNECTIONS, MAX_QUESTIONS, MAX_UPDATES, SSL_TYPE, SSL_CIPHER, X509_ISSUER, X509_SUBJECT, PASSWORD /*!50508 , PLUGIN */ FROM mysql.user WHERE CONCAT(user, '@', host) = '#{name}'"
       end
-      @max_user_connections, @max_connections_per_hour, @max_queries_per_hour,
-      @max_updates_per_hour, ssl_type, ssl_cipher, x509_issuer, x509_subject,
-      @password, @plugin, @authentication_string = mysql_caller(query, 'regular').chomp.split(%r{\t})
+      @max_user_connections, @max_connections_per_hour, @max_queries_per_hour, @max_updates_per_hour, ssl_type, ssl_cipher,
+      x509_issuer, x509_subject, @password, @plugin, @authentication_string = mysql_caller(query, 'regular').chomp.split(%r{\t})
       @tls_options = parse_tls_options(ssl_type, ssl_cipher, x509_issuer, x509_subject)
       if newer_than('mariadb' => '10.1.21') && (@plugin == 'ed25519' || @plugin == 'mysql_native_password')
         # Some auth plugins (e.g. ed25519) use authentication_string
@@ -256,11 +255,12 @@ def tls_options=(array)
   end
 
   def self.parse_tls_options(ssl_type, ssl_cipher, x509_issuer, x509_subject)
-    if ssl_type == 'ANY'
+    case ssl_type
+    when 'ANY'
       ['SSL']
-    elsif ssl_type == 'X509'
+    when 'X509'
       ['X509']
-    elsif ssl_type == 'SPECIFIED'
+    when 'SPECIFIED'
       options = []
       options << "CIPHER '#{ssl_cipher}'" if !ssl_cipher.nil? && !ssl_cipher.empty?
       options << "ISSUER '#{x509_issuer}'" if !x509_issuer.nil? && !x509_issuer.empty?

spec/acceptance/types/mysql_plugin_spec.rb

@@ -6,17 +6,19 @@
 # of mysql) have varying levels of support for plugins and have
 # different plugins available. Choose a plugin that works or don't try
 # to test plugins if not available.
-if os[:family] == 'redhat'
-  if os[:release].to_i == 5
+case os[:family]
+when 'redhat'
+  case os[:release].to_i
+  when 5
     plugin = nil # Plugins not supported on mysql on RHEL 5
-  elsif os[:release].to_i == 6
+  when 6
     plugin     = 'example'
     plugin_lib = 'ha_example.so'
-  elsif os[:release].to_i == 7
+  when 7
     plugin     = 'pam'
     plugin_lib = 'auth_pam.so'
   end
-elsif os[:family] == 'debian'
+when 'debian'
   if os[:family] == 'ubuntu'
     if %r{^16\.04|^18\.04}.match?(os[:release])
       # On Xenial running 5.7.12, the example plugin does not appear to be available.
@@ -27,7 +29,7 @@
       plugin_lib = 'ha_example.so'
     end
   end
-elsif os[:family] == 'suse'
+when 'suse'
   plugin = nil # Plugin library path is broken on Suse http://lists.opensuse.org/opensuse-bugs/2013-08/msg01123.html
 end
 

spec/unit/puppet/provider/mysql_login_path/mysql_login_path_spec.rb

@@ -8,9 +8,9 @@
 RSpec.describe Puppet::Provider::MysqlLoginPath::MysqlLoginPath do
   subject(:provider) { described_class.new }
 
-  let(:context) { instance_double('Puppet::ResourceApi::BaseContext') }
-  let(:wait_thr) { instance_double('wait_thr') }
-  let(:wait_thr_value) { instance_double('wait_thr_value') }
+  let(:context) { instance_double(Puppet::ResourceApi::BaseContext) }
+  let(:wait_thr) { instance_double(wait_thr) }
+  let(:wait_thr_value) { instance_double(wait_thr_value) }
   let(:sensitive_secure) { Puppet::Provider::MysqlLoginPath::Sensitive.new('secure') }
   let(:sensitive_more_secure) { Puppet::Provider::MysqlLoginPath::Sensitive.new('more_secure') }