Merge pull request puppetlabs#2162 from luchihoratiu/merge-up-6.x-int…

…o-main-2-nov

(maint) Merge up `6.x` into `main`

.rubocop.yml

@@ -9,317 +9,98 @@ AllCops:
     - 'vendor/**/*'
     - 'bundle/**/*'
 
-
-# MAYBE useful - errors when rescue {} happens.
-Lint/HandleExceptions:
-  Enabled: false
-
-# MAYBE useful - catches while 1
-Lint/LiteralInCondition:
+Layout/ArgumentAlignment:
   Enabled: false
 
-# DISABLED really useless. Detects return as last statement.
-Style/RedundantReturn:
+Layout/BlockAlignment:
   Enabled: false
 
-# DISABLED since the instances do not seem to indicate any specific errors.
-Lint/AmbiguousOperator:
+Layout/ClosingHeredocIndentation:
   Enabled: false
 
-# DISABLED - not useful
-Style/SpaceBeforeComment:
+Layout/EmptyLineAfterGuardClause:
   Enabled: false
 
-# DISABLED - not useful
-Style/HashSyntax:
-  Enabled: false
-
-# USES: as shortcut for non nil&valid checking a = x() and a.empty?
-# DISABLED - not useful
-Style/AndOr:
-  Enabled: false
-
-# DISABLED - not useful
-Style/RedundantSelf:
-  Enabled: false
-
-# DISABLED - not useful
-Metrics/MethodLength:
-  Enabled: false
-
-# DISABLED - not useful
-Style/WhileUntilModifier:
-  Enabled: false
-
-# DISABLED - the offender is just haskell envy
-Lint/AmbiguousRegexpLiteral:
-  Enabled: false
-
-# DISABLED
-Lint/Eval:
-  Enabled: false
-# DISABLED
-Lint/BlockAlignment:
+Layout/EmptyLines:
   Enabled: false
 
-# DISABLED
-Lint/DefEndAlignment:
+Layout/EmptyLinesAroundBlockBody:
   Enabled: false
 
-# DISABLED
-Lint/EndAlignment:
+Layout/FirstArrayElementIndentation:
   Enabled: false
 
-# DISABLED
-Lint/DeprecatedClassMethods:
+Layout/FirstHashElementIndentation:
   Enabled: false
 
-# DISABLED
-Lint/Loop:
+Layout/HeredocIndentation:
   Enabled: false
 
-# DISABLED
-Lint/ParenthesesAsGroupedExpression:
+Layout/LeadingCommentSpace:
   Enabled: false
 
-Lint/RescueException:
+Layout/MultilineArrayBraceLayout:
   Enabled: false
 
-Lint/StringConversionInInterpolation:
+Layout/TrailingEmptyLines:
   Enabled: false
 
 Lint/UnusedBlockArgument:
   Enabled: false
 
-Lint/UnusedMethodArgument:
-  Enabled: false
-
-# DISABLED - TODO
-Lint/UselessAccessModifier:
-  Enabled: false
-
-# DISABLED - TODO
-Lint/UselessAssignment:
-  Enabled: false
-
-# DISABLED - TODO
-Lint/Void:
-  Enabled: false
-
-Style/AccessModifierIndentation:
-  Enabled: false
-
-Style/AccessorMethodName:
-  Enabled: false
-
-Style/Alias:
-  Enabled: false
-
-Style/AlignArray:
-  Enabled: false
-
-Style/AlignHash:
-  Enabled: false
-
-Style/AlignParameters:
+Metrics/BlockLength:
   Enabled: false
 
 Metrics/BlockNesting:
   Enabled: false
 
-Style/AsciiComments:
-  Enabled: false
-
-Style/Attr:
-  Enabled: false
-
-Style/BlockDelimiters:
-  Enabled: false
-
-Style/BracesAroundHashParameters:
-  Enabled: false
-
-Style/CaseEquality:
-  Enabled: false
-
-Style/CaseIndentation:
-  Enabled: false
-
-Style/CharacterLiteral:
-  Enabled: false
-
-Style/ClassAndModuleCamelCase:
-  Enabled: false
-
-Style/ClassAndModuleChildren:
+Naming/FileName:
   Enabled: false
 
-Style/ClassCheck:
-  Enabled: false
-
-Metrics/ClassLength:
-  Enabled: false
-
-Style/ClassMethods:
-  Enabled: false
-
-Style/ClassVars:
-  Enabled: false
-
-Style/WhenThen:
-  Enabled: false
-
-
-# DISABLED - not useful
-Style/WordArray:
-  Enabled: false
-
-Style/UnneededPercentQ:
-  Enabled: false
-
-Style/Tab:
-  Enabled: false
-
-Style/TrailingBlankLines:
-  Enabled: false
-
-Style/LeadingCommentSpace:
-  Enabled: false
-
-Style/CollectionMethods:
-  Enabled: false
-
-Style/CommentIndentation:
-  Enabled: false
-
-Style/ColonMethodCall:
+Style/CaseLikeIf:
   Enabled: false
 
 Style/CommentAnnotation:
   Enabled: false
 
-Metrics/CyclomaticComplexity:
-  Enabled: false
-
-Style/ConstantName:
-  Enabled: false
-
-Style/Documentation:
-  Enabled: false
-
-Style/DefWithParentheses:
-  Enabled: false
-
-Style/DeprecatedHashMethods:
+Style/ConditionalAssignment:
   Enabled: false
 
-Style/DotPosition:
+Style/FormatStringToken:
   Enabled: false
 
-# DISABLED - used for converting to bool
-Style/DoubleNegation:
+Style/FrozenStringLiteralComment:
   Enabled: false
 
-Style/EachWithObject:
-  Enabled: false
-
-Style/EmptyLineBetweenDefs:
-  Enabled: false
-
-Style/IndentArray:
-  Enabled: false
-
-Style/IndentHash:
-  Enabled: false
-
-Style/EmptyLines:
-  Enabled: false
-
-Style/EmptyLinesAroundAccessModifier:
-  Enabled: false
-
-Style/EmptyLinesAroundBlockBody:
-  Enabled: false
-
-Style/EmptyLinesAroundClassBody:
-  Enabled: false
-
-Style/EmptyLinesAroundModuleBody:
-  Enabled: false
-
-Style/EmptyLinesAroundMethodBody:
-  Enabled: false
-
-Style/EmptyLiteral:
-  Enabled: false
-
-Metrics/LineLength:
-  Enabled: false
-
-Style/LineEndConcatenation:
-  Enabled: false
-
-Style/StringLiterals:
-  Enabled: false
-
-Style/TrailingComma:
-  Enabled: false
-
-Style/GlobalVars:
-  Enabled: false
-
-Style/GuardClause:
+Style/HashSyntax:
   Enabled: false
 
 Style/IfUnlessModifier:
   Enabled: false
 
-Style/Next:
+Style/PercentLiteralDelimiters:
   Enabled: false
 
-Style/SingleLineBlockParams:
-  Enabled: false
-
-Style/SingleLineMethods:
-  Enabled: false
-
-Style/SpecialGlobalVars:
-  Enabled: false
-
-Style/TrivialAccessors:
-  Enabled: false
-
-# This pushes preference for shell commands as backticks instead of %x
-Style/CommandLiteral:
-  EnforcedStyle: mixed
-
-Style/Lambda:
-  Enabled: false
-
-Style/MethodName:
+Style/RedundantInterpolation:
   Enabled: false
 
 Style/SignalException:
   Enabled: false
 
-Style/PerlBackrefs:
+Style/StringLiterals:
   Enabled: false
 
-Style/PredicateName:
+Style/SymbolProc:
   Enabled: false
 
-Style/RegexpLiteral:
+Style/TrailingCommaInArrayLiteral:
   Enabled: false
 
-Style/ModuleFunction:
+Style/TrailingCommaInHashLiteral:
   Enabled: false
 
-# Excluding 'configs/platforms/*' so rubocop ignores the platforms that just 
-# inherit from default. 
-Style/SymbolProc:
-  Enabled: true
-  Exclude: 
-    - 'configs/platforms/*'
+Style/WordArray:
+  Enabled: false
 
-Lint/Debugger:
+Layout/LineLength:
   Enabled: false

Gemfile

@@ -16,6 +16,6 @@ gem 'artifactory'
 gem 'rake'
 gem 'json'
 gem 'octokit'
-gem 'rubocop', "~> 0.34.2"
+gem 'rubocop', "~> 1.22"
 
 eval_gemfile("#{__FILE__}.local") if File.exist?("#{__FILE__}.local")