(CONT-792) - Correct Layout/ClosingHeredocIndentation

Author: jordanbreen28

.rubocop_todo.yml

@@ -1,21 +1,3 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2023-04-19 13:27:54 UTC using RuboCop version 1.48.1.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 11
-# This cop supports safe autocorrection (--autocorrect).
-Layout/ClosingHeredocIndentation:
-  Exclude:
-    - 'lib/puppet/type/postgresql_replication_slot.rb'
-    - 'spec/acceptance/alternative_port_spec.rb'
-    - 'spec/acceptance/overridden_settings_spec.rb'
-    - 'spec/acceptance/server/grant_spec.rb'
-    - 'spec/acceptance/utf8_encoding_spec.rb'
-
 # Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
 Layout/EmptyLineAfterGuardClause:

lib/puppet/type/postgresql_psql.rb

@@ -23,7 +23,7 @@ def retrieve
 
     def sync
       output, status = provider.run_sql_command(value)
-      raise("Error executing SQL; psql returned #{status}: '#{output}'") unless status == 0
+      raise("Error executing SQL; psql returned #{status}: '#{output}'") unless status.zero?
     end
   end
 
@@ -38,12 +38,12 @@ def sync
     # Return true if a matching row is found
     def matches(value)
       output, status = provider.run_unless_sql_command(value)
-      fail("Error evaluating 'unless' clause, returned #{status}: '#{output}'") unless status == 0 # rubocop:disable Style/SignalException
+      fail("Error evaluating 'unless' clause, returned #{status}: '#{output}'") unless status.zero? # rubocop:disable Style/SignalException
       # rubocop:enable Style/NumericPredicate
 
       result_count = output.strip.to_i
       debug("Found #{result_count} row(s) executing 'unless' clause")
-      result_count > 0
+      result_count.positive?
     end
   end
 
@@ -60,10 +60,10 @@ def matches(value)
       output, status = provider.run_unless_sql_command(value)
       status = output.exitcode if status.nil?
 
-      raise("Error evaluating 'onlyif' clause, returned #{status}: '#{output}'") unless status == 0
+      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 > 0
+      result_count.positive?
     end
   end
 

lib/puppet/type/postgresql_replication_slot.rb

@@ -7,7 +7,7 @@
 This type allows to create and destroy replication slots
 to register warm standby replication on a Postgresql
 primary server.
-EOS
+  EOS
 
   ensurable
 

spec/acceptance/alternative_port_spec.rb

@@ -8,7 +8,7 @@
   it 'on an alternative port' do
     pp = <<-MANIFEST
     class { 'postgresql::server': port => '55433', manage_selinux => true }
-  MANIFEST
+    MANIFEST
     if os[:family] == 'redhat' && os[:release].start_with?('8')
       apply_manifest(pp, expect_failures: false)
       # GCP failures on redhat8 IAC-1286 - idempotency failing

spec/acceptance/overridden_settings_spec.rb

@@ -31,7 +31,7 @@ class { 'postgresql::server':
     postgresql::server::database { 'testusername':
       owner => 'testusername',
     }
-  MANIFEST
+    MANIFEST
   end
 
   it 'with additional hiera entries' do

spec/acceptance/server/grant_spec.rb

@@ -315,7 +315,7 @@ class { 'postgresql::server': }
               role      => $user,
               require     => [ Postgresql::Server::Role[$user] ],
             }
-          EOS
+        EOS
 
         pp_revoke = pp_setup + <<-EOS.unindent
 
@@ -337,7 +337,7 @@ class { 'postgresql::server': }
               role      => $user,
               require     => [ Postgresql::Server::Role[$user] ],
             }
-          EOS
+        EOS
 
         if Gem::Version.new(postgresql_version) >= Gem::Version.new('9.0')
           idempotent_apply(pp_create_table)
@@ -376,7 +376,7 @@ class { 'postgresql::server': }
               role        => $user,
               require     => [ Postgresql::Server::Role[$user] ],
             }
-          EOS
+        EOS
 
         pp_revoke = pp_setup + <<-EOS.unindent
 
@@ -389,7 +389,7 @@ class { 'postgresql::server': }
               role        => $user,
               require     => [ Postgresql::Server::Role[$user] ],
             }
-          EOS
+        EOS
 
         if Gem::Version.new(postgresql_version) >= Gem::Version.new('9.0')
           ## pp_create_table sets up the permissions that pp_grant 'fixes', so these to steps cannot be rolled into one
@@ -428,7 +428,7 @@ class { 'postgresql::server': }
               role        => $user,
               require     => [ Postgresql::Server::Role[$user] ],
             }
-          EOS
+        EOS
 
         pp_revoke = pp_setup + <<-EOS.unindent
 
@@ -441,7 +441,7 @@ class { 'postgresql::server': }
               role        => $user,
               require     => [ Postgresql::Server::Role[$user] ],
             }
-          EOS
+        EOS
 
         if Gem::Version.new(postgresql_version) >= Gem::Version.new('9.0')
           ## pp_create_table sets up the permissions that pp_grant 'fixes', so these to steps cannot be rolled into one
@@ -484,7 +484,7 @@ class { 'postgresql::server': }
                 db          => '#{db}',
                 role        => '#{user}_does_not_exist',
               }
-            EOS
+          EOS
           idempotent_apply(pp)
         end
       end

spec/acceptance/utf8_encoding_spec.rb

@@ -10,7 +10,7 @@ class { 'postgresql::globals':
         locale   => 'en_NG',
       } ->
       class { 'postgresql::server': }
-  MANIFEST
+    MANIFEST
   end
 
   it 'with defaults' do