From ff9c0c52cd09c0faa562ff269edf335ac646af24 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Wed, 16 Nov 2022 16:20:05 +0100 Subject: [PATCH] fix broken code --- .rubocop_todo.yml | 43 ++++++++++++++----------- lib/puppet/provider/cs_primitive/crm.rb | 6 ++-- lib/puppet/provider/cs_primitive/pcs.rb | 6 ++-- lib/puppet/type/cs_primitive.rb | 2 +- 4 files changed, 32 insertions(+), 25 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index c4a09799..4d51cc4e 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,6 +1,6 @@ # This configuration was generated by # `rubocop --auto-gen-config` -# on 2022-11-16 15:12:16 UTC using RuboCop version 1.22.3. +# on 2022-11-16 15:26:02 UTC using RuboCop version 1.22.3. # 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 @@ -26,30 +26,12 @@ Lint/RedundantCopDisableDirective: Exclude: - 'lib/puppet/provider/cs_colocation/pcs.rb' -# Offense count: 2 -# Cop supports --auto-correct. -# Configuration parameters: AllowedMethods. -# AllowedMethods: instance_of?, kind_of?, is_a?, eql?, respond_to?, equal? -Lint/RedundantSafeNavigation: - Exclude: - - 'lib/puppet/provider/cs_primitive/crm.rb' - - 'lib/puppet/provider/cs_primitive/pcs.rb' - # Offense count: 1 # Cop supports --auto-correct. Lint/RedundantStringCoercion: Exclude: - 'lib/puppet/provider/cs_rsc_defaults/pcs.rb' -# Offense count: 2 -# Cop supports --auto-correct. -# Configuration parameters: AllowedMethods. -# AllowedMethods: present?, blank?, presence, try, try! -Lint/SafeNavigationConsistency: - Exclude: - - 'lib/puppet/provider/cs_primitive/crm.rb' - - 'lib/puppet/provider/cs_primitive/pcs.rb' - # Offense count: 1 # Configuration parameters: CheckForMethodsWithNoSideEffects. Lint/Void: @@ -91,3 +73,26 @@ RSpec/RepeatedExampleGroupBody: Style/CaseLikeIf: Exclude: - 'lib/puppet/provider/cs_colocation/pcs.rb' + +# Offense count: 2 +# Cop supports --auto-correct. +# Configuration parameters: IgnoredMethods. +# IgnoredMethods: ==, equal?, eql? +Style/ClassEqualityComparison: + Exclude: + - 'lib/puppet/provider/cs_primitive/crm.rb' + - 'lib/puppet/provider/cs_primitive/pcs.rb' + +# Offense count: 1 +# Cop supports --auto-correct. +Style/IfUnlessModifier: + Exclude: + - 'lib/puppet/provider/cs_primitive/crm.rb' + +# Offense count: 1 +# Cop supports --auto-correct. +# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods. +# AllowedMethods: present?, blank?, presence, try, try! +Style/SafeNavigation: + Exclude: + - 'lib/puppet/provider/cs_primitive/pcs.rb' diff --git a/lib/puppet/provider/cs_primitive/crm.rb b/lib/puppet/provider/cs_primitive/crm.rb index 4bc5a15f..308adb0f 100644 --- a/lib/puppet/provider/cs_primitive/crm.rb +++ b/lib/puppet/provider/cs_primitive/crm.rb @@ -159,9 +159,11 @@ def flush end end end - if @resource&.instance_of?(:cs_primitive) && @resource[:unmanaged_metadata] + if @resource && @resource.class.name == :cs_primitive && @resource[:unmanaged_metadata] @resource[:unmanaged_metadata].each do |parameter_name| - @property_hash[:metadata][parameter_name] = @property_hash[:existing_metadata]['target-role'] if @property_hash[:existing_metadata] && @property_hash[:existing_metadata][parameter_name] + if @property_hash[:existing_metadata] && @property_hash[:existing_metadata][parameter_name] + @property_hash[:metadata][parameter_name] = @property_hash[:existing_metadata]['target-role'] + end end end unless @property_hash[:parameters].empty? diff --git a/lib/puppet/provider/cs_primitive/pcs.rb b/lib/puppet/provider/cs_primitive/pcs.rb index 6fd8557b..62b96df3 100644 --- a/lib/puppet/provider/cs_primitive/pcs.rb +++ b/lib/puppet/provider/cs_primitive/pcs.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: true +# frozen_string_literal: false begin require 'puppet_x/voxpupuli/corosync/provider/pcs' @@ -266,10 +266,10 @@ def flush end # Clear all metadata structures when specified - if @resource&.instance_of?(:cs_primitive) && @resource[:unmanaged_metadata] + if @resource && @resource.class.name == :cs_primitive && @resource[:unmanaged_metadata] @resource[:unmanaged_metadata].each do |parameter_name| @property_hash[:metadata].delete(parameter_name) - @property_hash[:existing_metadata]&.delete(parameter_name) + @property_hash[:existing_metadata].delete(parameter_name) if @property_hash[:existing_metadata] end end diff --git a/lib/puppet/type/cs_primitive.rb b/lib/puppet/type/cs_primitive.rb index 94df97c4..ae0ee935 100644 --- a/lib/puppet/type/cs_primitive.rb +++ b/lib/puppet/type/cs_primitive.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: true +# frozen_string_literal: false require 'puppet/parameter/boolean'