(CONT-971) - Correct Style/IfUnlessModifier

Author: jordanbreen28

.rubocop_todo.yml

@@ -191,22 +191,6 @@ Style/ClassAndModuleChildren:
   Exclude:
     - 'lib/puppet_x/lvm/output.rb'
 
-# Offense count: 56
-# This cop supports safe autocorrection (--autocorrect).
-Style/IfUnlessModifier:
-  Exclude:
-    - 'lib/facter/lvm_support.rb'
-    - 'lib/puppet/provider/filesystem/aix.rb'
-    - 'lib/puppet/provider/filesystem/lvm.rb'
-    - 'lib/puppet/provider/logical_volume/aix.rb'
-    - 'lib/puppet/provider/logical_volume/lvm.rb'
-    - 'lib/puppet/provider/physical_volume/lvm.rb'
-    - 'lib/puppet/type/filesystem.rb'
-    - 'lib/puppet/type/logical_volume.rb'
-    - 'lib/puppet/type/physical_volume.rb'
-    - 'spec/lib/helpers.rb'
-    - 'spec/spec_helper_acceptance_local.rb'
-    - 'tests/beaker/lib/lvm_helper.rb'
 
 # Offense count: 2
 # Configuration parameters: AllowedMethods.

lib/facter/lvm_support.rb

@@ -17,9 +17,7 @@
   confine lvm_support: true
 
   setcode do
-    if Facter.value(:lvm_support)
-      vgs = Facter::Core::Execution.execute('vgs -o name --noheadings 2>/dev/null', timeout: 30)
-    end
+    vgs = Facter::Core::Execution.execute('vgs -o name --noheadings 2>/dev/null', timeout: 30) if Facter.value(:lvm_support)
 
     if vgs.nil?
       0
@@ -34,9 +32,7 @@
           setcode do
             pvs = Facter::Core::Execution.execute("vgs -o pv_name #{vg} 2>/dev/null", timeout: 30)
             res = nil
-            unless pvs.nil?
-              res = pvs.split("\n").grep(%r{^\s+/}).collect(&:strip).sort.join(',')
-            end
+            res = pvs.split("\n").grep(%r{^\s+/}).collect(&:strip).sort.join(',') unless pvs.nil?
             res
           end
         end
@@ -53,9 +49,7 @@
   confine lvm_support: true
 
   setcode do
-    if Facter.value(:lvm_support)
-      pvs = Facter::Core::Execution.execute('pvs -o name --noheadings 2>/dev/null', timeout: 30)
-    end
+    pvs = Facter::Core::Execution.execute('pvs -o name --noheadings 2>/dev/null', timeout: 30) if Facter.value(:lvm_support)
 
     if pvs.nil?
       0

lib/puppet/provider/filesystem/aix.rb

@@ -104,9 +104,7 @@ def size
     Open3.popen3("lsfs -q #{@resource[:name]}") do |_stdin, stdout, _stderr|
       stdout.each do |line|
         elements = line.split(%r{\s+})
-        if elements[2] == @resource[:name]
-          cursize = elements[4].to_i
-        end
+        cursize = elements[4].to_i if elements[2] == @resource[:name]
       end
     end
 

lib/puppet/provider/filesystem/lvm.rb

@@ -41,9 +41,7 @@ def mkfs(fs_type, name)
 
     mkfs_cmd << name
 
-    if mkfs_params[fs_type]
-      mkfs_cmd << mkfs_params[fs_type]
-    end
+    mkfs_cmd << mkfs_params[fs_type] if mkfs_params[fs_type]
 
     if resource[:options]
       mkfs_options = Array.new(resource[:options].split)

lib/puppet/provider/logical_volume/aix.rb

@@ -22,9 +22,7 @@ def create
       end
     end
 
-    if @resource[:type]
-      args.push('-t', @resource[:type])
-    end
+    args.push('-t', @resource[:type]) if @resource[:type]
 
     args.push(@resource[:volume_group], @resource[:initial_size])
 

lib/puppet/provider/logical_volume/lvm.rb

@@ -71,68 +71,42 @@ def create
     args.push('-n', @resource[:name]) unless @resource[:thinpool] == true
 
     size_option = '--size'
-    if @resource[:thinpool].is_a? String
-      size_option = '--virtualsize'
-    end
+    size_option = '--virtualsize' if @resource[:thinpool].is_a? String
 
     if @resource[:size]
       args.push(size_option, @resource[:size])
     elsif @resource[:initial_size]
       args.push(size_option, @resource[:initial_size])
     end
-    if @resource[:extents]
-      args.push('--extents', @resource[:extents])
-    end
+    args.push('--extents', @resource[:extents]) if @resource[:extents]
 
-    if !@resource[:extents] && !@resource[:size] && !@resource[:initial_size]
-      args.push('--extents', '100%FREE')
-    end
+    args.push('--extents', '100%FREE') if !@resource[:extents] && !@resource[:size] && !@resource[:initial_size]
 
-    if @resource[:stripes]
-      args.push('--stripes', @resource[:stripes])
-    end
+    args.push('--stripes', @resource[:stripes]) if @resource[:stripes]
 
-    if @resource[:stripesize]
-      args.push('--stripesize', @resource[:stripesize])
-    end
+    args.push('--stripesize', @resource[:stripesize]) if @resource[:stripesize]
 
-    if @resource[:poolmetadatasize]
-      args.push('--poolmetadatasize', @resource[:poolmetadatasize])
-    end
+    args.push('--poolmetadatasize', @resource[:poolmetadatasize]) if @resource[:poolmetadatasize]
 
     if @resource[:mirror]
       args.push('--mirrors', @resource[:mirror])
-      if @resource[:mirrorlog]
-        args.push('--mirrorlog', @resource[:mirrorlog])
-      end
-      if @resource[:region_size]
-        args.push('--regionsize', @resource[:region_size])
-      end
-      if @resource[:no_sync]
-        args.push('--nosync')
-      end
+      args.push('--mirrorlog', @resource[:mirrorlog]) if @resource[:mirrorlog]
+      args.push('--regionsize', @resource[:region_size]) if @resource[:region_size]
+      args.push('--nosync') if @resource[:no_sync]
     end
 
-    if @resource[:alloc]
-      args.push('--alloc', @resource[:alloc])
-    end
+    args.push('--alloc', @resource[:alloc]) if @resource[:alloc]
 
-    if @resource[:readahead]
-      args.push('--readahead', @resource[:readahead])
-    end
+    args.push('--readahead', @resource[:readahead]) if @resource[:readahead]
 
     if @resource[:persistent]
       # if persistent param is true, set arg to "y", otherwise set to "n"
       args.push('--persistent', [:true, true, 'true'].include?(@resource[:persistent]) ? 'y' : 'n')
     end
 
-    if @resource[:minor]
-      args.push('--minor', @resource[:minor])
-    end
+    args.push('--minor', @resource[:minor]) if @resource[:minor]
 
-    if @resource[:type]
-      args.push('--type', @resource[:type])
-    end
+    args.push('--type', @resource[:type]) if @resource[:type]
 
     if @resource[:thinpool]
       args.push('--thin')
@@ -149,9 +123,7 @@ def create
 
   def destroy
     name_escaped = "#{@resource[:volume_group].gsub('-', '--')}-#{@resource[:name].gsub('-', '--')}"
-    if %r{\bTYPE="(swap)"}.match?(blkid(path))
-      swapoff(path)
-    end
+    swapoff(path) if %r{\bTYPE="(swap)"}.match?(blkid(path))
     dmsetup('remove', name_escaped)
     lvremove('-f', path)
   end
@@ -199,21 +171,15 @@ def size=(new_size)
     end
 
     ## Get the extend size
-    if lvs('--noheading', '-o', 'vg_extent_size', '--units', 'k', path) =~ %r{\s+(\d+)\.\d+k}i
-      vg_extent_size = Regexp.last_match(1).to_i
-    end
+    vg_extent_size = Regexp.last_match(1).to_i if lvs('--noheading', '-o', 'vg_extent_size', '--units', 'k', path) =~ %r{\s+(\d+)\.\d+k}i
 
     ## Verify that it's a extension: Reduce is potentially dangerous and should be done manually
     if lvm_size_units[current_size_unit] < lvm_size_units[new_size_unit]
       resizeable = true
     elsif lvm_size_units[current_size_unit] > lvm_size_units[new_size_unit]
-      if (current_size_bytes * lvm_size_units[current_size_unit]) < (new_size_bytes * lvm_size_units[new_size_unit])
-        resizeable = true
-      end
+      resizeable = true if (current_size_bytes * lvm_size_units[current_size_unit]) < (new_size_bytes * lvm_size_units[new_size_unit])
     elsif lvm_size_units[current_size_unit] == lvm_size_units[new_size_unit]
-      if new_size_bytes > current_size_bytes
-        resizeable = true
-      end
+      resizeable = true if new_size_bytes > current_size_bytes
     end
 
     if resizeable
@@ -236,9 +202,7 @@ def size=(new_size)
           end
         rescue Puppet::ExecutionFailure => e
           ## If blkid returned 2, there is no filesystem present or the file doesn't exist.  This should not be a failure.
-          if e.message.include?(' returned 2:') # rubocop:disable Metrics/BlockNesting
-            Puppet.debug(e.message)
-          end
+          Puppet.debug(e.message) if e.message.include?(' returned 2:') # rubocop:disable Metrics/BlockNesting
         end
       end
 
@@ -271,15 +235,11 @@ def mirror=(new_mirror_count)
 
     puts "Change mirror from #{current_mirrors} to #{new_mirror_count}..."
     args = ['-m', new_mirror_count]
-    if @resource[:mirrorlog]
-      args.push('--mirrorlog', @resource[:mirrorlog])
-    end
+    args.push('--mirrorlog', @resource[:mirrorlog]) if @resource[:mirrorlog]
 
     # Region size cannot be changed on an existing mirror (not even when changing to zero mirrors).
 
-    if @resource[:alloc]
-      args.push('--alloc', @resource[:alloc])
-    end
+    args.push('--alloc', @resource[:alloc]) if @resource[:alloc]
     args.push(path)
     lvconvert(*args)
   end
@@ -310,9 +270,7 @@ def mirrorlog=(new_mirror_log_location)
 
     # puts "Change mirror log location to #{new_mirror_log_location}..."
     args = ['--mirrorlog', new_mirror_log_location]
-    if @resource[:alloc]
-      args.push('--alloc', @resource[:alloc])
-    end
+    args.push('--alloc', @resource[:alloc]) if @resource[:alloc]
     args.push(path)
     lvconvert(*args)
   end

lib/puppet/provider/physical_volume/lvm.rb

@@ -77,9 +77,7 @@ def self.get_physical_volume_properties(physical_volumes_line)
 
   def create_physical_volume(path)
     args = []
-    if @resource[:force] == :true
-      args.push('--force')
-    end
+    args.push('--force') if @resource[:force] == :true
     args << path
     pvcreate(*args)
   end

lib/puppet/type/filesystem.rb

@@ -14,9 +14,7 @@
   newparam(:name) do
     isnamevar
     validate do |value|
-      unless Pathname.new(value).absolute?
-        raise ArgumentError, 'Filesystem names must be fully qualified'
-      end
+      raise ArgumentError, 'Filesystem names must be fully qualified' unless Pathname.new(value).absolute?
     end
   end