use chomp instead of chop

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-02-20 13:57:00 UTC using RuboCop version 1.50.2.
+# on 2024-04-08 21:01:49 UTC using RuboCop version 1.60.2.
 # 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
@@ -15,6 +15,7 @@ Lint/DuplicateBranch:
     - 'spec/spec_helper_corosync.rb'
 
 # Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: CheckForMethodsWithNoSideEffects.
 Lint/Void:
   Exclude:
@@ -51,10 +52,24 @@ RSpec/RepeatedExampleGroupBody:
     - 'spec/acceptance/corosync_class_spec.rb'
 
 # Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 # AllowedMethods: ==, equal?, eql?
 Style/ClassEqualityComparison:
   Exclude:
     - 'lib/puppet/provider/cs_primitive/crm.rb'
     - 'lib/puppet/provider/cs_primitive/pcs.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:
+  Exclude:
+    - 'lib/puppet/provider/cs_group/crm.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantLineContinuation:
+  Exclude:
+    - 'spec/unit/puppet/type/cs_clone_spec.rb'

lib/puppet/provider/cs_clone/pcs.rb

@@ -28,7 +28,7 @@ def change_clone_id(type, primitive, id, cib)
     return unless doc.root.attributes['id'] != id
 
     doc.root.attributes['id'] = id
-    cmd = [command(:cibadmin), '--replace', '--xpath', xpath, '--xml-text', doc.to_s.chop]
+    cmd = [command(:cibadmin), '--replace', '--xpath', xpath, '--xml-text', doc.to_s.chomp]
     self.class.run_command_in_cib(cmd, cib)
   end
 

lib/puppet/provider/cs_group/crm.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 begin
   require 'puppet_x/voxpupuli/corosync/provider/crmsh'
 rescue LoadError

spec/acceptance/cs_commit_spec.rb

@@ -102,7 +102,7 @@ class { 'corosync':
   end
 
   it 'creates the vip resource in the cib' do
-    command = if fact('default_provider') == 'pcs'
+    command = if fact('default_provider') == 'pcs' && fact('os.name') != 'Ubuntu'
                 if Gem::Version.new(fact('pcs_version')) < Gem::Version.new('0.10.0')
                   'pcs resource show'
                 else
@@ -139,7 +139,7 @@ class { 'corosync':
   end
 
   it 'creates the vip resource in the shadow cib' do
-    command = if fact('default_provider') == 'pcs'
+    command = if fact('default_provider') == 'pcs' && fact('os.name') != 'Ubuntu'
                 if Gem::Version.new(fact('pcs_version')) < Gem::Version.new('0.10.0')
                   "pcs resource show -f #{pcs_shadow_cib}"
                 else
@@ -154,7 +154,7 @@ class { 'corosync':
   end
 
   it 'creates the service resource in the shadow cib' do
-    command = if fact('default_provider') == 'pcs'
+    command = if fact('default_provider') == 'pcs' && fact('os.name') != 'Ubuntu'
                 if Gem::Version.new(fact('pcs_version')) < Gem::Version.new('0.10.0')
                   "pcs resource show -f #{pcs_shadow_cib}"
                 else
@@ -169,7 +169,7 @@ class { 'corosync':
   end
 
   it 'creates the colocation in the shadow cib and apache2_vip is the "with" resource' do
-    command = if fact('default_provider') == 'pcs'
+    command = if fact('default_provider') == 'pcs' && fact('os.name') != 'Ubuntu'
                 "pcs cluster cib -f #{pcs_shadow_cib} | grep apache2_vip_with_service"
               else
                 'CIB_shadow=puppet cibadmin --query | grep apache2_vip_with_service'
@@ -180,7 +180,7 @@ class { 'corosync':
   end
 
   it 'creates the colocation in the shadow cib and apache2_service is the main resource' do
-    command = if fact('default_provider') == 'pcs'
+    command = if fact('default_provider') == 'pcs' && fact('os.name') != 'Ubuntu'
                 "pcs cluster cib -f #{pcs_shadow_cib} | grep apache2_vip_with_service"
               else
                 'CIB_shadow=puppet cibadmin --query | grep apache2_vip_with_service'

spec/acceptance/cs_location_spec.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# rubocop:disable Style/FrozenStringLiteralComment
 
 require 'spec_helper_acceptance'
 
@@ -60,7 +60,7 @@
     it { is_expected.to be_running }
   end
 
   it 'creates a location' do
     pp = <<-EOS
       cs_location { 'duncan_vip_there':
         primitive => 'duncan_vip',
@@ -88,7 +88,7 @@
     end
   end
 
   it 'creates a location with resource-discovery parameter' do
     pp = <<-EOS
       cs_location { 'duncan_vip_there':
         primitive          => 'duncan_vip',
@@ -105,14 +105,14 @@
   end
 
   # this requires pacemaker >= 1.1.13. All tested distributions have higher versions than 1.1.13
   it 'creates a location with resource-discovery=exclusive' do
     shell('cibadmin --query | grep duncan_vip_there') do |r|
       expect(r.stdout).to match(%r{resource-discovery="exclusive"})
     end
   end
 
   context 'with one rule' do
     it 'creates a location' do
       pp = <<-EOS
         cs_location { 'duncan_vip_not_in_container':
           primitive => 'duncan_vip',
@@ -135,25 +135,25 @@
     end
 
     # attribute order in XML might be non-deterministic
     it 'contains the score attribute' do
       shell('cibadmin --query --xpath "//rule[@id=\'duncan_vip_not_in_container-rule\']"') do |r|
         expect(r.stdout).to match(%r{<rule .*score="-INFINITY"})
       end
     end
 
     it 'contains the attribute attribute' do
       shell('cibadmin --query --xpath "//rule[@id=\'duncan_vip_not_in_container-rule\']"') do |r|
         expect(r.stdout).to match(%r{<expression .*attribute="#kind"})
       end
     end
 
     it 'contains the operation atribute' do
       shell('cibadmin --query --xpath "//rule[@id=\'duncan_vip_not_in_container-rule\']"') do |r|
         expect(r.stdout).to match(%r{<expression .*operation="eq"})
       end
     end
 
     it 'contains the value attribute' do
       shell('cibadmin --query --xpath "//rule[@id=\'duncan_vip_not_in_container-rule\']"') do |r|
         expect(r.stdout).to match(%r{<expression .*value="container"})
       end
@@ -161,7 +161,7 @@
   end
 
   context 'with two rules' do
     it 'creates a location' do
       pp = <<-EOS
         cs_location { 'duncan_vip_not_in_container':
           primitive => 'duncan_vip',
@@ -194,7 +194,7 @@
     end
 
     # attribute order in XML might be non-deterministic
     it 'contains the value attribute for duncan_vip_not_in_container-rule' do
       shell('cibadmin --query --xpath "//rule[@id=\'duncan_vip_not_in_container-rule\']"') do |r|
         expect(r.stdout).to match(%r{<expression .*value="container"})
       end
@@ -243,3 +243,5 @@
     end
   end
 end
+
+# rubocop:enable Style/FrozenStringLiteralComment

spec/acceptance/cs_order_spec.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# rubocop:disable Style/FrozenStringLiteralComment
 
 require 'spec_helper_acceptance'
 
@@ -173,3 +173,5 @@ class { 'corosync':
     end
   end
 end
+
+# rubocop:enable Style/FrozenStringLiteralComment

spec/spec_helper_acceptance.rb

@@ -26,13 +26,13 @@
   # On Debian-based, service state transitions (restart, stop) hang indefinitely and
   # lead to test timeouts if there is a service unit of Type=notify involved.
   # Use Type=simple as a workaround. See issue 455.
-  if host[:hypervisor] =~ %r{docker} && fact_on(host, 'os.family') == 'Debian'
+  if host[:hypervisor] =~ %r{(vagrant|docker|container_other)} && fact_on(host, 'os.family') == 'Debian'
     on host, 'mkdir /etc/systemd/system/corosync.service.d'
     on host, 'echo -e "[Service]\nType=simple" > /etc/systemd/system/corosync.service.d/10-type-simple.conf'
   end
   # Issue 455: On Centos-based there are recurring problems with the pacemaker systemd service
   # refusing to stop its crmd subprocess leading to test timeouts. Force a fast SigKill here.
-  if host[:hypervisor] =~ %r{docker} && fact_on(host, 'os.family') == 'RedHat' && fact_on(host, 'os.release.major') == '7'
+  if host[:hypervisor] =~ %r{(vagrant|docker|container_other)} && fact_on(host, 'os.family') == 'RedHat' && fact_on(host, 'os.release.major') == '7'
     on host, 'mkdir /etc/systemd/system/pacemaker.service.d'
     on host, 'echo -e "[Service]\nSendSIGKILL=yes\nTimeoutStopSec=60s" > /etc/systemd/system/pacemaker.service.d/10-timeout.conf'
   end

spec/unit/puppet/provider/cs_clone_pcs_spec.rb

@@ -245,7 +245,7 @@ def clone_xml(name)
         Puppet::Util::Execution.expects(:execute).with(['cibadmin', '--query', '--xpath', xpath], failonfail: true, combine: true).at_least_once.returns(
           Puppet::Util::Execution::ProcessOutput.new(clone_xml('apache_service-clone'), 0)
         )
-        Puppet::Util::Execution.expects(:execute).with(['cibadmin', '--replace', '--xpath', xpath, '--xml-text', clone_xml('apache_service-newclone').chop], failonfail: true, combine: true).at_least_once.returns(
+        Puppet::Util::Execution.expects(:execute).with(['cibadmin', '--replace', '--xpath', xpath, '--xml-text', clone_xml('apache_service-newclone').chomp], failonfail: true, combine: true).at_least_once.returns(
           Puppet::Util::Execution::ProcessOutput.new('', 0)
         )
         instance.change_clone_id('primitive', 'apache_service', 'apache_service-newclone', nil)