(CONT-801) Address rebase broken cops

puppetlabs · May 10, 2023 · cf8859b · cf8859b
1 parent 979495c
commit cf8859b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-04-21 08:55:52 UTC using RuboCop version 1.48.1.
+# on 2023-04-24 08:52:31 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
@@ -139,12 +139,12 @@ Lint/SuppressedException:
     - 'lib/puppet/parser/functions/getvar.rb'
     - 'lib/puppet/parser/functions/has_interface_with.rb'
 
-# Offense count: 6
+# Offense count: 7
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 44
 
-# Offense count: 21
+# Offense count: 22
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
 # AllowedMethods: refine
 Metrics/BlockLength:
@@ -205,6 +205,12 @@ Naming/VariableNumber:
   Exclude:
     - 'spec/functions/delete_undef_values_spec.rb'
 
+# Offense count: 2
+# Configuration parameters: MinSize.
+Performance/CollectionLiteralInLoop:
+  Exclude:
+    - 'lib/puppet/functions/ensure_packages.rb'
+
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Performance/MapCompact:
@@ -251,7 +257,7 @@ RSpec/ClassCheck:
   Exclude:
     - 'spec/functions/type_of_spec.rb'
 
-# Offense count: 36
+# Offense count: 38
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
@@ -353,7 +359,7 @@ RSpec/MatchArray:
     - 'spec/functions/keys_spec.rb'
     - 'spec/functions/values_spec.rb'
 
-# Offense count: 77
+# Offense count: 78
 RSpec/MultipleExpectations:
   Max: 5
 
@@ -362,13 +368,13 @@ RSpec/MultipleExpectations:
 RSpec/MultipleMemoizedHelpers:
   Max: 9
 
-# Offense count: 60
+# Offense count: 64
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
 # SupportedStyles: always, named_only
 RSpec/NamedSubject:
   Enabled: false
 
-# Offense count: 25
+# Offense count: 27
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
   Max: 4
@@ -469,7 +475,7 @@ Style/FileWrite:
     - 'spec/unit/puppet/provider/file_line/ruby_spec_alter.rb'
     - 'spec/unit/puppet/provider/file_line/ruby_spec_use_cases.rb'
 
-# Offense count: 3
+# Offense count: 5
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
@@ -478,6 +484,8 @@ Style/FrozenStringLiteralComment:
     - 'lib/puppet_x/stdlib.rb'
     - 'lib/puppet_x/stdlib/toml_dumper.rb'
     - 'spec/functions/stdlib_deferrable_epp_spec.rb'
+    - 'spec/type_aliases/http__method_spec.rb'
+    - 'spec/type_aliases/http__status_spec.rb'
 
 # Offense count: 4
 # This cop supports safe autocorrection (--autocorrect).
@@ -495,7 +503,7 @@ Style/HashTransformKeys:
   Exclude:
     - 'lib/puppet/functions/to_json_pretty.rb'
 
-# Offense count: 156
+# Offense count: 155
 # This cop supports safe autocorrection (--autocorrect).
 Style/IfUnlessModifier:
   Enabled: false

diff --git a/spec/functions/ensure_packages_spec.rb b/spec/functions/ensure_packages_spec.rb
@@ -34,9 +34,9 @@
       subject.execute('ρǻ¢κầģẻ' => { 'ensure' => 'absent' })
       subject.execute(
         {
-          'package_one'   => {},
-          'package_two'   => {},
-          'package_three' => { 'provider' => 'puppetserver_gem' },
+          'package_one' => {},
+          'package_two' => {},
+          'package_three' => { 'provider' => 'puppetserver_gem' }
         },
         { 'provider' => 'puppet_gem' },
       )