(CONT-772) Correct cop group 3

Author: LukasAud

.rubocop_todo.yml

@@ -97,20 +97,6 @@ RSpec/FilePath:
 RSpec/ImplicitSubject:
   Enabled: false
 
-# Offense count: 16
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/LetBeforeExamples:
-  Exclude:
-    - 'spec/classes/mod/auth_kerb_spec.rb'
-    - 'spec/classes/mod/auth_openidc_spec.rb'
-    - 'spec/classes/mod/cluster_spec.rb'
-    - 'spec/classes/mod/disk_cache_spec.rb'
-    - 'spec/classes/mod/jk_spec.rb'
-    - 'spec/classes/mod/proxy_balancer_spec.rb'
-    - 'spec/classes/mod/ssl_spec.rb'
-    - 'spec/classes/mod/wsgi_spec.rb'
-    - 'spec/classes/service_spec.rb'
-
 # Offense count: 17
 RSpec/MultipleExpectations:
   Max: 8
@@ -217,40 +203,9 @@ Style/RedundantRegexpEscape:
     - 'spec/classes/mod/wsgi_spec.rb'
     - 'spec/defines/vhost_spec.rb'
 
-# Offense count: 22
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantStringEscape:
-  Exclude:
-    - 'spec/acceptance/apache_parameters_spec.rb'
-    - 'spec/acceptance/vhost_spec.rb'
-    - 'spec/classes/mod/auth_mellon_spec.rb'
-    - 'spec/defines/vhost_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: implicit, explicit
-Style/RescueStandardError:
-  Exclude:
-    - 'spec/spec_helper.rb'
-
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-Style/StderrPuts:
-  Exclude:
-    - 'util/apache_mod_platform_support.rb'
-
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Mode.
 Style/StringConcatenation:
   Exclude:
     - 'lib/puppet/functions/apache/pw_hash.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, AllowSafeAssignment.
-# SupportedStyles: require_parentheses, require_no_parentheses, require_parentheses_when_complex
-Style/TernaryParentheses:
-  Exclude:
-    - 'spec/defines/vhost_spec.rb'

spec/acceptance/apache_parameters_spec.rb

@@ -367,8 +367,8 @@ class { 'apache':
       pp = <<-MANIFEST
           class { 'apache':
             log_formats => {
-              'vhost_common'   => '%v %h %l %u %t \\\"%r\\\" %>s %b',
-              'vhost_combined' => '%v %h %l %u %t \\\"%r\\\" %>s %b \\\"%{Referer}i\\\" \\\"%{User-agent}i\\\"',
+              'vhost_common'   => '%v %h %l %u %t \\"%r\\" %>s %b',
+              'vhost_combined' => '%v %h %l %u %t \\"%r\\" %>s %b \\"%{Referer}i\\" \\"%{User-agent}i\\"',
             }
           }
       MANIFEST

spec/acceptance/vhost_spec.rb

@@ -125,7 +125,7 @@ class { 'apache': }
       it { is_expected.to contain 'ProxyPreserveHost On' }
       it { is_expected.to contain 'ProxyErrorOverride On' }
       it { is_expected.not_to contain 'ProxyAddHeaders' }
-      it { is_expected.not_to contain "<Proxy \*>" }
+      it { is_expected.not_to contain '<Proxy *>' }
     end
   end
 
@@ -153,7 +153,7 @@ class { 'apache': }
       it { is_expected.to contain 'ProxyPreserveHost On' }
       it { is_expected.to contain 'ProxyErrorOverride On' }
       it { is_expected.not_to contain 'ProxyAddHeaders' }
-      it { is_expected.not_to contain "<Proxy \*>" }
+      it { is_expected.not_to contain '<Proxy *>' }
     end
   end
 
@@ -276,9 +276,9 @@ class { 'apache':
       class { 'apache': }
 
       if versioncmp('#{apache_hash['version']}', '2.4') >= 0 {
-        $_files_match_directory = { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'require' => 'all denied', }
+        $_files_match_directory = { 'path' => '(.swp|.bak|~)$', 'provider' => 'filesmatch', 'require' => 'all denied', }
       } else {
-        $_files_match_directory = { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'deny' => 'from all', }
+        $_files_match_directory = { 'path' => '(.swp|.bak|~)$', 'provider' => 'filesmatch', 'deny' => 'from all', }
       }
 
       $_directories = [
@@ -785,14 +785,14 @@ class { 'apache': }
       apache::vhost { 'test.setenv_setenvif':
         docroot  => '/tmp',
         setenv   => ['TEST /test'],
-        setenvif => ['Request_URI "\.gif$" object_is_image=gif']
+        setenvif => ['Request_URI ".gif$" object_is_image=gif']
       }
       apache::vhost { 'test.rewrite':
         docroot          => '/tmp',
         rewrites => [
           { comment => 'test',
             rewrite_cond => '%{HTTP_USER_AGENT} ^Lynx/ [OR]',
-            rewrite_rule => ['^index\.html$ welcome.html'],
+            rewrite_rule => ['^index.html$ welcome.html'],
             rewrite_map  => ['lc int:tolower'],
           }
         ],

spec/classes/mod/auth_mellon_spec.rb

@@ -13,7 +13,7 @@
       it { is_expected.to contain_apache__mod('auth_mellon') }
       it { is_expected.to contain_package('libapache2-mod-auth-mellon') }
       it { is_expected.to contain_file('auth_mellon.conf').with_path('/etc/apache2/mods-available/auth_mellon.conf') }
-      it { is_expected.to contain_file('auth_mellon.conf').with_content("MellonPostDirectory \"\/var\/cache\/apache2\/mod_auth_mellon\/\"\n") }
+      it { is_expected.to contain_file('auth_mellon.conf').with_content("MellonPostDirectory \"/var/cache/apache2/mod_auth_mellon/\"\n") }
     end
 
     describe 'with parameters' do

spec/defines/vhost_spec.rb

@@ -5,7 +5,7 @@
 describe 'apache::vhost', type: :define do
   describe 'os-independent items' do
     on_supported_os.each do |os, os_facts|
-      let(:apache_name) { facts[:os]['family'] == 'RedHat' ? 'httpd' : 'apache2' }
+      let(:apache_name) { (facts[:os]['family'] == 'RedHat') ? 'httpd' : 'apache2' }
 
       let :pre_condition do
         "class {'apache': default_vhost => false, default_mods => false, vhost_enable_dir => '/etc/#{apache_name}/sites-enabled'}"
@@ -2033,7 +2033,7 @@
             let(:params) { super().merge(port: 84) }
 
             context 'dest and regexp' do
-              let(:params) { super().merge(redirectmatch_dest: 'http://other.example.com$1.jpg', redirectmatch_regexp: "(.*)\.gif$") }
+              let(:params) { super().merge(redirectmatch_dest: 'http://other.example.com$1.jpg', redirectmatch_regexp: '(.*).gif$') }
 
               it { is_expected.to contain_concat__fragment('rspec.example.com-redirect') }
               it { is_expected.to contain_class('apache::mod::alias') }

spec/spec_helper.rb

@@ -26,7 +26,7 @@
 
   begin
     default_facts.merge!(YAML.safe_load(File.read(f), [], [], true))
-  rescue => e
+  rescue StandardError => e
     RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
   end
 end

util/apache_mod_platform_support.rb

@@ -60,12 +60,12 @@ def initialize(manifest, line_num, error_type, error_detail)
   def print_parsing_errors
     return if @manifest_errors.empty?
 
-    $stderr.puts "The following errors were encountered when trying to parse the 'Unsupported platforms' tag(s) in 'manifests/mod':\n"
+    warn "The following errors were encountered when trying to parse the 'Unsupported platforms' tag(s) in 'manifests/mod':\n"
     @manifest_errors.each do |manifest_error|
-      $stderr.puts " * #{manifest_error.manifest} (line #{manifest_error.line_num}): #{ERROR_MSG[manifest_error.error_type]} #{manifest_error.error_detail}"
+      warn " * #{manifest_error.manifest} (line #{manifest_error.line_num}): #{ERROR_MSG[manifest_error.error_type]} #{manifest_error.error_detail}"
     end
     File.readlines('util/_resources/tag_format_help_msg.txt').each do |line|
-      $stderr.puts line
+      warn line
     end
   end