(CONT-792) - Correct Style/StringConcatenation

puppetlabs · Apr 19, 2023 · 6c89748 · 6c89748
1 parent ca4c9a7
commit 6c89748
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -168,15 +168,6 @@ Style/OptionalBooleanParameter:
     - 'lib/puppet/functions/postgresql/postgresql_password.rb'
     - 'lib/puppet/type/postgresql_psql.rb'
 
-# Offense count: 3
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Mode.
-Style/StringConcatenation:
-  Exclude:
-    - 'lib/puppet/functions/postgresql/postgresql_acls_to_resources_hash.rb'
-    - 'lib/puppet/functions/postgresql/postgresql_password.rb'
-    - 'lib/puppet/provider/postgresql_psql/ruby.rb'
-
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowMethodsWithArguments, AllowedMethods, AllowedPatterns, AllowComments.

diff --git a/lib/puppet/functions/postgresql/postgresql_acls_to_resources_hash.rb b/lib/puppet/functions/postgresql/postgresql_acls_to_resources_hash.rb
@@ -40,7 +40,7 @@ def default_impl(acls, id, offset)
         resource['auth_method'] = parts[3]
         resource['auth_option'] = parts.last(parts.length - 4).join(' ') if parts.length > 4
       elsif %r{^\d}.match?(parts[4])
-        resource['address'] = parts[3] + ' ' + parts[4]
+        resource['address'] = "#{parts[3]} #{parts[4]}"
         resource['auth_method'] = parts[5]
 
         resource['auth_option'] = parts.last(parts.length - 6).join(' ') if parts.length > 6

diff --git a/lib/puppet/functions/postgresql/postgresql_password.rb b/lib/puppet/functions/postgresql/postgresql_password.rb
@@ -32,7 +32,7 @@ def default_impl(username, password, sensitive = false, hash = 'md5', salt = nil
 
     password = password.unwrap if password.respond_to?(:unwrap)
     pass = if hash == 'md5'
-             'md5' + Digest::MD5.hexdigest(password.to_s + username.to_s)
+             "md5#{Digest::MD5.hexdigest(password.to_s + username.to_s)}"
            else
              pg_sha256(password, (salt || username))
            end

diff --git a/lib/puppet/provider/postgresql_psql/ruby.rb b/lib/puppet/provider/postgresql_psql/ruby.rb
@@ -5,7 +5,7 @@
   def run_unless_sql_command(sql)
     # for the 'unless' queries, we wrap the user's query in a 'SELECT COUNT',
     # which makes it easier to parse and process the output.
-    run_sql_command('SELECT COUNT(*) FROM (' + sql + ') count')
+    run_sql_command("SELECT COUNT(*) FROM (#{sql}) count")
   end
 
   def run_sql_command(sql)