(CONT-772) Unsage correct cop group

Author: LukasAud

.rubocop_todo.yml

@@ -91,7 +91,7 @@ RSpec/FilePath:
     - 'spec/classes/mod/proxy_wstunnel.rb'
 
 # Offense count: 16
-# This cop supports safe autocorrection (--autocorrect).
+# This cop supports safe autocorrection.
 RSpec/LetBeforeExamples:
   Exclude:
     - 'spec/classes/mod/auth_kerb_spec.rb'
@@ -157,53 +157,7 @@ RSpec/StubbedMock:
   Exclude:
     - 'spec/util/apache_mod_platform_compatibility_spec.rb'
 
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: MinBranchesCount.
-Style/CaseLikeIf:
-  Exclude:
-    - 'spec/classes/mod/status_spec.rb'
-
-# Offense count: 12
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/CommentedKeyword:
-  Exclude:
-    - 'spec/classes/mod/authnz_ldap_spec.rb'
-    - 'spec/classes/mod/authnz_pam_spec.rb'
-    - 'spec/classes/mod/intercept_form_submit_spec.rb'
-    - 'spec/classes/mod/ldap_spec.rb'
-    - 'spec/classes/mod/lookup_identity.rb'
-    - 'spec/defines/vhost_spec.rb'
-
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: always, always_true, never
-Style/FrozenStringLiteralComment:
-  Exclude:
-    - 'spec/type_aliases/modproxy_spec.rb'
-
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/GlobalStdStream:
-  Exclude:
-    - 'tasks/init.rb'
-
 # Offense count: 1
 Style/MixinUsage:
   Exclude:
     - 'spec/spec_helper.rb'
-
-# Offense count: 3
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Methods.
-Style/RedundantArgument:
-  Exclude:
-    - 'spec/classes/mod/status_spec.rb'
-
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Mode.
-Style/StringConcatenation:
-  Exclude:
-    - 'lib/puppet/functions/apache/pw_hash.rb'

lib/puppet/functions/apache/pw_hash.rb

@@ -18,6 +18,6 @@
 
   def apache_pw_hash(password)
     require 'base64'
-    '{SHA}' + Base64.strict_encode64(Digest::SHA1.digest(password))
+    "{SHA}#{Base64.strict_encode64(Digest::SHA1.digest(password))}"
   end
 end

spec/classes/mod/authnz_ldap_spec.rb

@@ -29,7 +29,7 @@
         expect(subject).to compile.and_raise_error(%r{parameter 'verify_server_cert' expects a Boolean value, got String})
       end
     end
-  end # Debian
+  end
 
   context 'default configuration with parameters on a RedHat OS' do
     on_supported_os.each do |os, os_facts|
@@ -81,5 +81,5 @@
         end
       end
     end
-  end # Redhat
+  end
 end

spec/classes/mod/authnz_pam_spec.rb

@@ -12,14 +12,14 @@
       it { is_expected.to contain_class('apache') }
       it { is_expected.to contain_package('libapache2-mod-authnz-pam') }
       it { is_expected.to contain_apache__mod('authnz_pam') }
-    end # Debian
+    end
 
     context 'on a RedHat OS' do
       include_examples 'RedHat 8'
 
       it { is_expected.to contain_class('apache') }
       it { is_expected.to contain_package('mod_authnz_pam') }
       it { is_expected.to contain_apache__mod('authnz_pam') }
-    end # Redhat
+    end
   end
 end

spec/classes/mod/intercept_form_submit_spec.rb

@@ -12,14 +12,14 @@
       it { is_expected.to contain_class('apache') }
       it { is_expected.to contain_package('libapache2-mod-intercept-form-submit') }
       it { is_expected.to contain_apache__mod('intercept_form_submit') }
-    end # Debian
+    end
 
     context 'on a RedHat OS' do
       include_examples 'RedHat 8'
 
       it { is_expected.to contain_class('apache') }
       it { is_expected.to contain_package('mod_intercept_form_submit') }
       it { is_expected.to contain_apache__mod('intercept_form_submit') }
-    end # Redhat
+    end
   end
 end

spec/classes/mod/ldap_spec.rb

@@ -52,7 +52,7 @@
         "</Location>\n"
       it { is_expected.to contain_file('ldap.conf').with_content(%r{#{expected_ldap_path_re}}m) }
     end
-  end # Debian
+  end
 
   context 'on a RedHat OS' do
     include_examples 'RedHat 8'
@@ -93,5 +93,5 @@
 
       it { is_expected.to contain_package('httpd24-mod_ldap') }
     end
-  end # Redhat
+  end
 end

spec/classes/mod/lookup_identity.rb

@@ -12,14 +12,14 @@
       it { is_expected.to contain_class('apache') }
       it { is_expected.to contain_package('libapache2-mod-lookup-identity') }
       it { is_expected.to contain_apache__mod('lookup_identity') }
-    end # Debian
+    end
 
     context 'on a RedHat OS' do
       include_examples 'RedHat 8'
 
       it { is_expected.to contain_class('apache') }
       it { is_expected.to contain_package('mod_lookup_identity') }
       it { is_expected.to contain_apache__mod('lookup_identity') }
-    end # Redhat
+    end
   end
 end

spec/classes/mod/status_spec.rb

@@ -3,24 +3,25 @@
 require 'spec_helper'
 
 def require_directives(requires)
-  if requires == :undef
+  case requires
+  when :undef
     "    Require ip 127.0.0.1 ::1\n"
-  elsif requires.is_a?(String)
+  when String
     if ['', 'unmanaged'].include? requires.downcase
       ''
     else
       "    Require #{requires}\n"
     end
-  elsif requires.is_a?(Array)
-    requires.map { |req| "    Require #{req}\n" }.join('')
-  elsif requires.is_a?(Hash)
+  when Array
+    requires.map { |req| "    Require #{req}\n" }.join
+  when Hash
     if requires.key?(:enforce)
  \
       "    <Require#{requires[:enforce].capitalize}>\n" + \
-        requires[:requires].map { |req| "        Require #{req}\n" }.join('') + \
+        requires[:requires].map { |req| "        Require #{req}\n" }.join + \
         "    </Require#{requires[:enforce].capitalize}>\n"
     else
-      requires[:requires].map { |req| "    Require #{req}\n" }.join('')
+      requires[:requires].map { |req| "    Require #{req}\n" }.join
     end
   end
 end

spec/defines/vhost_spec.rb

@@ -1814,7 +1814,7 @@
               )
             }
           end
-        end # access logs
+        end
 
         describe 'error logs format' do
           context 'single log format directive as a string' do
@@ -1855,7 +1855,7 @@
                 .with_content(%r{^\s+ErrorLogFormat connection "\[%\{uc\}t\] \[C:%\{c\}L\] local\\ %a remote\\ %A"$})
             }
           end
-        end # error logs format
+        end
 
         describe 'validation' do
           let(:params) do

spec/type_aliases/modproxy_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'Apache::ModProxyProtocol' do