(CONT-776) - Correct Style/SoleNestedConditional

Author: jordanbreen28

.rubocop_todo.yml

@@ -156,16 +156,6 @@ RSpec/StubbedMock:
   Exclude:
     - 'spec/unit/lib/facter/docker_spec.rb'
 
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowModifier.
-Style/SoleNestedConditional:
-  Exclude:
-    - 'lib/puppet/provider/docker_network/ruby.rb'
-    - 'spec/classes/compose_spec.rb'
-    - 'spec/classes/machine_spec.rb'
-    - 'spec/defines/services_spec.rb'
-
 # Offense count: 4
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, AllowSafeAssignment.

lib/puppet/provider/docker_network/ruby.rb

@@ -54,9 +54,7 @@ def self.instances
       inspect = docker(['network', 'inspect', name])
       obj = JSON.parse(inspect).first
       ipam_driver = (obj['IPAM']['Driver'] unless obj['IPAM']['Driver'].nil?)
-      subnet = unless obj['IPAM']['Config'].nil? || obj['IPAM']['Config'].empty?
-                 obj['IPAM']['Config'].first['Subnet'] if obj['IPAM']['Config'].first.key? 'Subnet'
-               end
+      subnet = (obj['IPAM']['Config'].first['Subnet'] if !(obj['IPAM']['Config'].nil? || obj['IPAM']['Config'].empty?) && (obj['IPAM']['Config'].first.key? 'Subnet'))
       new(
         name: name,
         id: obj['Id'],

spec/classes/compose_spec.rb

@@ -73,14 +73,12 @@
             params
           end
 
-          if params['proxy'] != :undef
-            unless %r{^((https?)?://)?([^:^@]+:[^:^@]+@|)([\da-z.-]+)\.([\da-z.]{2,6})(:\d)?([/\w .-]*)*/?$}.match?(params['proxy'])
-              it {
-                expect(subject).to compile.and_raise_error(%r{does not match})
-              }
+          if params['proxy'] != :undef && !%r{^((https?)?://)?([^:^@]+:[^:^@]+@|)([\da-z.-]+)\.([\da-z.]{2,6})(:\d)?([/\w .-]*)*/?$}.match?(params['proxy'])
+            it {
+              expect(subject).to compile.and_raise_error(%r{does not match})
+            }
 
-              next
-            end
+            next
           end
 
           include_examples 'compose', params, facts

spec/classes/machine_spec.rb

@@ -42,14 +42,12 @@
             params
           end
 
-          if params['proxy'] != :undef
-            unless '^((http[s]?)?:\/\/)?([^:^@]+:[^:^@]+@|)([\da-z\.-]+)\.([\da-z\.]{2,6})(:[\d])?([\/\w \.-]*)*\/?$'.match?(params['proxy'])
-              it {
-                expect(subject).to compile.and_raise_error(%r{})
-              }
+          if params['proxy'] != :undef && !'^((http[s]?)?:\/\/)?([^:^@]+:[^:^@]+@|)([\da-z\.-]+)\.([\da-z\.]{2,6})(:[\d])?([\/\w \.-]*)*\/?$'.match?(params['proxy'])
+            it {
+              expect(subject).to compile.and_raise_error(%r{})
+            }
 
-              next
-            end
+            next
           end
 
           include_examples 'machine', params, facts, defaults

spec/defines/services_spec.rb

@@ -102,14 +102,12 @@
             'rspec_services'
           end
 
-          if params['ensure'] == 'absent'
-            if params['update'] || params['scale']
-              it {
-                expect(subject).to compile.and_raise_error('When removing a service you can not update it.')
-              }
+          if params['ensure'] == 'absent' && (params['update'] || params['scale'])
+            it {
+              expect(subject).to compile.and_raise_error('When removing a service you can not update it.')
+            }
 
-              next
-            end
+            next
           end
 
           include_examples 'services', 'rspec_services', params, facts, defaults