(CONT-792) - Correct Layout/EmptyLineAfterGuardClause

Author: jordanbreen28

.rubocop_todo.yml

@@ -1,13 +1,3 @@
-# Offense count: 6
-# This cop supports safe autocorrection (--autocorrect).
-Layout/EmptyLineAfterGuardClause:
-  Exclude:
-    - 'lib/puppet/functions/postgresql/postgresql_password.rb'
-    - 'lib/puppet/provider/postgresql_replication_slot/ruby.rb'
-    - 'lib/puppet/type/postgresql_psql.rb'
-    - 'tasks/sql.rb'
-
-# Offense count: 80
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
 # SupportedHashRocketStyles: key, separator, table

lib/puppet/functions/postgresql/postgresql_password.rb

@@ -31,6 +31,7 @@ def default_impl(username, password, sensitive = false, hash = 'md5', salt = nil
     if password.is_a?(String) && password.match?(%r{^(md5|SCRAM-SHA-256).+})
       return password
     end
+
     password = password.unwrap if password.respond_to?(:unwrap)
     pass = if hash == 'md5'
              'md5' + Digest::MD5.hexdigest(password.to_s + username.to_s)

lib/puppet/provider/postgresql_replication_slot/ruby.rb

@@ -28,12 +28,14 @@ def exists?
   def create
     output = self.class.run_sql_command("SELECT * FROM pg_create_physical_replication_slot('#{resource[:name]}');")
     raise Puppet::Error, "Failed to create replication slot #{resource[:name]}:\n#{output[0]}" unless output[1].success?
+
     @property_hash[:ensure] = :present
   end
 
   def destroy
     output = self.class.run_sql_command("SELECT pg_drop_replication_slot('#{resource[:name]}');")
     raise Puppet::Error, "Failed to destroy replication slot #{resource[:name]}:\n#{output[0]}" unless output[1].success?
+
     @property_hash[:ensure] = :absent
   end
 

lib/puppet/type/postgresql_psql.rb

@@ -61,6 +61,7 @@ def matches(value)
       status = output.exitcode if status.nil?
 
       raise("Error evaluating 'onlyif' clause, returned #{status}: '#{output}'") unless status.zero?
+
       result_count = output.strip.to_i
       debug("Found #{result_count} row(s) executing 'onlyif' clause")
       result_count.positive?
@@ -140,6 +141,7 @@ def should_run_sql(refreshing = false)
     return false if !onlyif_param.nil? && !onlyif_param.value.nil? && !onlyif_param.matches(onlyif_param.value)
     return false if !unless_param.nil? && !unless_param.value.nil? && unless_param.matches(unless_param.value)
     return false if !refreshing && @parameters[:refreshonly].value == :true
+
     true
   end
 

tasks/sql.rb

@@ -15,6 +15,7 @@ def get(sql, database, user, port, password, host)
   cmd_string << "--host=#{host}" unless host.nil?
   stdout, stderr, status = Open3.capture3(env_hash, *cmd_string)
   raise Puppet::Error, stderr if status != 0
+
   { status: stdout.strip }
 end