Fix remaining rubocop offenses

voxpupuli · Jul 3, 2022 · 9eaaec7 · 9eaaec7
1 parent b742519
commit 9eaaec7
Show file tree

Hide file tree

Showing 6 changed files with 591 additions and 599 deletions.
diff --git a/lib/puppet/type/splunk_config.rb b/lib/puppet/type/splunk_config.rb
@@ -10,6 +10,7 @@
     desc 'splunk config'
   end
 
+  # rubocop:disable Lint/EmptyBlock
   newparam(:forwarder_installdir) do
   end
 
@@ -21,6 +22,7 @@
 
   newparam(:server_confdir) do
   end
+  # rubocop:enable Lint/EmptyBlock
 
   ## Generate purge parameters for the splunk_config type
   %i[

diff --git a/spec/classes/enterprise_spec.rb b/spec/classes/enterprise_spec.rb
diff --git a/spec/classes/forwarder_spec.rb b/spec/classes/forwarder_spec.rb
diff --git a/spec/classes/splunk_spec.rb b/spec/classes/splunk_spec.rb
@@ -5,18 +5,16 @@
 describe 'splunk' do
   context 'supported operating systems' do
     on_supported_os.each do |os, facts|
-      if os.start_with?('windows')
-        # Splunk Server not used supported on windows
-      else
-        context "on #{os}" do
-          let(:facts) do
-            facts
-          end
+      next if facts[:os]['name'] == 'windows' # Splunk Server not used supported on windows
 
-          context 'splunk class without any parameters' do
-            it { is_expected.to compile.with_all_deps }
-            it { is_expected.to contain_class('splunk') }
-          end
+      context "on #{os}" do
+        let(:facts) do
+          facts
+        end
+
+        context 'splunk class without any parameters' do
+          it { is_expected.to compile.with_all_deps }
+          it { is_expected.to contain_class('splunk') }
         end
       end
     end

diff --git a/spec/defines/addon_spec.rb b/spec/defines/addon_spec.rb
@@ -5,18 +5,16 @@
 describe 'splunk::addon' do
   context 'fail if class prerequisit not declared' do
     on_supported_os.each do |os, facts|
-      if os.start_with?('windows')
-        # Splunk Server not used supported on windows
-      else
-        context "on #{os}" do
-          let(:facts) do
-            facts
-          end
-          let(:title) { 'Splunk_TA' }
-          let(:params) { { 'splunkbase_source' => 'puppet:///modules/profiles/splunk-add-on.tgz' } }
+      next if facts[:os]['name'] == 'windows' # Splunk Server not used supported on windows
 
-          it { is_expected.to compile.and_raise_error(%r{Error while evaluating a Function Call}) }
+      context "on #{os}" do
+        let(:facts) do
+          facts
         end
+        let(:title) { 'Splunk_TA' }
+        let(:params) { { 'splunkbase_source' => 'puppet:///modules/profiles/splunk-add-on.tgz' } }
+
+        it { is_expected.to compile.and_raise_error(%r{Error while evaluating a Function Call}) }
       end
     end
   end
@@ -27,32 +25,30 @@
     end
 
     on_supported_os.each do |os, facts|
-      if os.start_with?('windows')
-        # Splunk Server not used supported on windows
-      else
-        context "on #{os}" do
-          let(:facts) do
-            facts
-          end
+      next if facts[:os]['name'] == 'windows' # Splunk Server not used supported on windows
 
-          context 'basic addon' do
-            let(:title) { 'Splunk_TA' }
-            let(:params) { { 'splunkbase_source' => 'puppet:///modules/profiles/splunk-add-on.tgz' } }
+      context "on #{os}" do
+        let(:facts) do
+          facts
+        end
 
-            it { is_expected.to compile.with_all_deps }
-            it { is_expected.to contain_archive('Splunk_TA').with(source: 'puppet:///modules/profiles/splunk-add-on.tgz') }
-          end
+        context 'basic addon' do
+          let(:title) { 'Splunk_TA' }
+          let(:params) { { 'splunkbase_source' => 'puppet:///modules/profiles/splunk-add-on.tgz' } }
 
-          context 'addon requiring extract_command' do
-            let(:title) { 'Splunk_TA' }
-            let(:params) do
-              { 'splunkbase_source' => 'puppet:///modules/profiles/splunk-add-on.spl',
-                'extract_command' => 'tar zxf %s' }
-            end
+          it { is_expected.to compile.with_all_deps }
+          it { is_expected.to contain_archive('Splunk_TA').with(source: 'puppet:///modules/profiles/splunk-add-on.tgz') }
+        end
 
-            it { is_expected.to compile.with_all_deps }
-            it { is_expected.to contain_archive('Splunk_TA').with(source: 'puppet:///modules/profiles/splunk-add-on.spl', extract_command: 'tar zxf %s') }
+        context 'addon requiring extract_command' do
+          let(:title) { 'Splunk_TA' }
+          let(:params) do
+            { 'splunkbase_source' => 'puppet:///modules/profiles/splunk-add-on.spl',
+              'extract_command' => 'tar zxf %s' }
           end
+
+          it { is_expected.to compile.with_all_deps }
+          it { is_expected.to contain_archive('Splunk_TA').with(source: 'puppet:///modules/profiles/splunk-add-on.spl', extract_command: 'tar zxf %s') }
         end
       end
     end

diff --git a/spec/unit/puppet/type/splunk_config_spec.rb b/spec/unit/puppet/type/splunk_config_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Puppet::Type.type(:splunk_config) do
-  let(:subject) do
+  let(:subject) do # rubocop:disable RSpec/SubjectDeclaration
     described_class.new(
       name: 'config',
       server_confdir: '/opt/splunk/etc',