(CONT-971) - Correct Style/StringConcatenation

Author: jordanbreen28

.rubocop_todo.yml

@@ -217,19 +217,6 @@ Style/OptionalBooleanParameter:
     - 'tests/beaker/lib/lvm_helper.rb'
 
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowModifier.
-Style/SoleNestedConditional:
-  Exclude:
-    - 'lib/puppet/provider/filesystem/aix.rb'
-
-# Offense count: 68
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Mode.
-Style/StringConcatenation:
-  Enabled: false
-
 # Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowMethodsWithArguments, AllowedMethods, AllowedPatterns, AllowComments.

lib/puppet/provider/logical_volume/lvm.rb

@@ -137,9 +137,9 @@ def create
     if @resource[:thinpool]
       args.push('--thin')
       args << if @resource[:thinpool].is_a? String
-                @resource[:volume_group] + '/' + @resource[:thinpool]
+                "#{@resource[:volume_group]}/#{@resource[:thinpool]}"
               else
-                @resource[:volume_group] + '/' + @resource[:name]
+                "#{@resource[:volume_group]}/#{@resource[:name]}"
               end
     else
       args << @resource[:volume_group]
@@ -179,7 +179,7 @@ def size
     return unless raw =~ %r{\s+(\d+)\.(\d+)#{unit}}i
     return Regexp.last_match(1) + unit.capitalize if Regexp.last_match(2).to_i.zero?
 
-    Regexp.last_match(1) + '.' + Regexp.last_match(2).sub(%r{0+$}, '') + unit.capitalize
+    "#{Regexp.last_match(1)}.#{Regexp.last_match(2).sub(%r{0+$}, '')}#{unit.capitalize}"
   end
 
   def size=(new_size)

lib/puppet/type/logical_volume.rb

@@ -206,9 +206,7 @@ def insync?(is)
     desc 'An optimization in lvcreate, at least on Linux.'
   end
   newparam(:region_size) do
-    desc 'A mirror is divided into regions of this size (in MB), the mirror log uses this granularity to track which regions are in sync. ' \
-      +'CAN NOT BE CHANGED on already mirrored volume. Take your mirror size in terabytes and round up that number to the next power of 2, ' \
-      +'using that number as the -R argument.'
+    desc 'A mirror is divided into regions of this size (in MB), the mirror log uses this granularity to track which regions are in sync. CAN NOT BE CHANGED on already mirrored volume. Take your mirror size in terabytes and round up that number to the next power of 2, using that number as the -R argument.'
     validate do |value|
       unless %r{^[0-9]+$}i.match?(value.to_s)
         raise ArgumentError, "#{value} is not a valid region size in MB."

lib/puppet/type/volume_group.rb

@@ -20,7 +20,7 @@ def insync?(is)
         should.each do |s|
           if File.symlink?(s)
             device = File.expand_path(File.readlink(s), File.dirname(s))
-            debug("resolved symlink '" + s + "' to device '" + device + "'")
+            debug("resolved symlink '#{s}' to device '#{device}'")
             real_should.push device
           else
             real_should.push s
@@ -29,7 +29,7 @@ def insync?(is)
         is.each do |s|
           if File.symlink?(s)
             device = File.expand_path(File.readlink(s), File.dirname(s))
-            debug("resolved symlink '" + s + "' to device '" + device + "'")
+            debug("resolved symlink '#{s}' to device '#{device}'")
             real_is.push device
           else
             real_is.push s

spec/lib/helpers.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Helpers
-  TEST_DIR = Pathname.new(__FILE__).parent + '..'
+  TEST_DIR = "#{Pathname.new(__FILE__).parent}.."
 
   TYPES = {
     pv: :physical_volume,
@@ -58,6 +58,6 @@ def stub_default_provider!
   end
 
   def fixture(name, ext = '.txt')
-    (TEST_DIR + 'fixtures' + "#{name}#{ext}").read
+    "#{TEST_DIR}fixtures#{name}#{ext}".read
   end
 end

tests/beaker/tests/aix/create_lv_with_param_max_range.rb

@@ -8,8 +8,8 @@
 
 # initilize
 pv = 'hdisk1'
-vg = 'VG_' + SecureRandom.hex(2)
-lv = 'LV_' + SecureRandom.hex(3)
+vg = "VG_#{SecureRandom.hex(2)}"
+lv = "LV_#{SecureRandom.hex(3)}"
 
 # Teardown
 teardown do

tests/beaker/tests/aix/create_lv_with_param_min_range.rb

@@ -8,8 +8,8 @@
 
 # initilize
 pv = 'hdisk1'
-vg = 'VG_' + SecureRandom.hex(2)
-lv = 'LV_' + SecureRandom.hex(3)
+vg = "VG_#{SecureRandom.hex(2)}"
+lv = "LV_#{SecureRandom.hex(3)}"
 
 # Teardown
 teardown do

tests/beaker/tests/aix/create_lv_with_param_type.rb

@@ -8,8 +8,8 @@
 
 # initilize
 pv = 'hdisk1'
-vg = 'VG_' + SecureRandom.hex(2)
-lv = 'LV_' + SecureRandom.hex(3)
+vg = "VG_#{SecureRandom.hex(2)}"
+lv = "LV_#{SecureRandom.hex(3)}"
 
 # Teardown
 teardown do

tests/beaker/tests/aix/create_volume_group_on_aix.rb

@@ -8,7 +8,7 @@
 
 # initilize
 pv = 'hdisk1'
-vg = 'VG_' + SecureRandom.hex(2)
+vg = "VG_#{SecureRandom.hex(2)}"
 
 # Teardown
 teardown do

tests/beaker/tests/create_filesystem_non-existing-format.rb

@@ -8,8 +8,8 @@
 
 # initilize
 pv = '/dev/sdc'
-vg = ('VolumeGroup_' + SecureRandom.hex(2))
-lv = ('LogicalVolume_' + SecureRandom.hex(3))
+vg = "VolumeGroup_#{SecureRandom.hex(2)}"
+lv = "LogicalVolume_#{SecureRandom.hex(3)}"
 
 # Teardown
 teardown do