Merge pull request #1220 from puppetlabs/pdksync

Update to puppet-module-gems 1.0, pdk-templates and new rubocop

Author: sheenaajay

.github/workflows/nightly.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
     - name: "Honeycomb: Start recording"
-      uses: kvrhdn/gha-buildevents@5be4636b81803713c94d7cb7e3a4b85d759df112 # pin@v1.0.2
+      uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
       with:
         apikey: ${{ env.HONEYCOMB_WRITEKEY }}
         dataset: ${{ env.HONEYCOMB_DATASET }}
@@ -90,7 +90,7 @@ jobs:
         echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
 
     - name: "Honeycomb: Start recording"
-      uses: kvrhdn/gha-buildevents@5be4636b81803713c94d7cb7e3a4b85d759df112 # pin@v1.0.2
+      uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
       with:
         apikey: ${{ env.HONEYCOMB_WRITEKEY }}
         dataset: ${{ env.HONEYCOMB_DATASET }}
@@ -207,7 +207,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Slack Workflow Notification
-        uses: Gamesight/slack-workflow-status@88ee95b73b4669825883ddf22747966204663e58 # pin@master
+        uses: puppetlabs/Gamesight-slack-workflow-status@pdk-templates-v1
         with:
           # Required Input
           repo_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pr_test.yml

@@ -15,7 +15,7 @@ jobs:
 
     steps:
     - name: "Honeycomb: Start recording"
-      uses: kvrhdn/gha-buildevents@5be4636b81803713c94d7cb7e3a4b85d759df112 # pin@v1.0.2
+      uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
       with:
         apikey: ${{ env.HONEYCOMB_WRITEKEY }}
         dataset: ${{ env.HONEYCOMB_DATASET }}
@@ -57,7 +57,6 @@ jobs:
 
     - name: Setup Acceptance Test Matrix
       id: get-matrix
-      if: ${{ github.repository_owner == 'puppetlabs' }}
       run: |
         if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
           buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata
@@ -73,6 +72,7 @@ jobs:
   Acceptance:
     needs:
       - setup_matrix
+    if: ${{ needs.setup_matrix.outputs.matrix != '{}' }}
 
     runs-on: ubuntu-20.04
     strategy:
@@ -88,7 +88,7 @@ jobs:
         echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
 
     - name: "Honeycomb: Start recording"
-      uses: kvrhdn/gha-buildevents@5be4636b81803713c94d7cb7e3a4b85d759df112 # pin@v1.0.2
+      uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
       with:
         apikey: ${{ env.HONEYCOMB_WRITEKEY }}
         dataset: ${{ env.HONEYCOMB_DATASET }}

.rubocop.yml

@@ -68,7 +68,6 @@ Style/TrailingCommaInArrayLiteral:
 Style/SymbolArray:
   Description: Using percent style obscures symbolic intent of array's contents.
   EnforcedStyle: brackets
-inherit_from: ".rubocop_todo.yml"
 RSpec/MessageSpies:
   EnforcedStyle: receive
 Style/Documentation:
@@ -83,66 +82,26 @@ Performance/BigDecimalWithNumericArgument:
   Enabled: true
 Performance/BlockGivenWithExplicitBlock:
   Enabled: true
-Performance/Caller:
-  Enabled: true
 Performance/CaseWhenSplat:
   Enabled: true
-Performance/Casecmp:
-  Enabled: true
-Performance/CollectionLiteralInLoop:
-  Enabled: true
-Performance/CompareWithBlock:
-  Enabled: true
 Performance/ConstantRegexp:
   Enabled: true
-Performance/Count:
-  Enabled: true
-Performance/Detect:
-  Enabled: true
-Performance/DoubleStartEndWith:
-  Enabled: true
-Performance/EndWith:
-  Enabled: true
-Performance/FixedSize:
-  Enabled: true
-Performance/FlatMap:
-  Enabled: true
 Performance/MethodObjectAsBlock:
   Enabled: true
-Performance/RangeInclude:
-  Enabled: true
-Performance/RedundantBlockCall:
-  Enabled: true
-Performance/RedundantMatch:
-  Enabled: true
-Performance/RedundantMerge:
-  Enabled: true
 Performance/RedundantSortBlock:
   Enabled: true
 Performance/RedundantStringChars:
   Enabled: true
-Performance/RegexpMatch:
-  Enabled: true
-Performance/ReverseEach:
-  Enabled: true
 Performance/ReverseFirst:
   Enabled: true
-Performance/Size:
-  Enabled: true
 Performance/SortReverse:
   Enabled: true
 Performance/Squeeze:
   Enabled: true
-Performance/StartWith:
-  Enabled: true
 Performance/StringInclude:
   Enabled: true
-Performance/StringReplacement:
-  Enabled: true
 Performance/Sum:
   Enabled: true
-Performance/TimesMap:
-  Enabled: true
 Style/CollectionMethods:
   Enabled: true
 Style/MethodCalledOnDoEndBlock:
@@ -199,20 +158,12 @@ Lint/DeprecatedOpenSSLConstant:
   Enabled: false
 Lint/DisjunctiveAssignmentInConstructor:
   Enabled: false
-Lint/DuplicateBranch:
-  Enabled: false
 Lint/DuplicateElsifCondition:
   Enabled: false
-Lint/DuplicateRegexpCharacterClassElement:
-  Enabled: false
 Lint/DuplicateRequire:
   Enabled: false
 Lint/DuplicateRescueException:
   Enabled: false
-Lint/EmptyBlock:
-  Enabled: false
-Lint/EmptyClass:
-  Enabled: false
 Lint/EmptyConditionalBody:
   Enabled: false
 Lint/EmptyFile:
@@ -233,8 +184,6 @@ Lint/MixedRegexpCaptureTypes:
   Enabled: false
 Lint/NestedPercentLiteral:
   Enabled: false
-Lint/NoReturnInBeginEndBlocks:
-  Enabled: false
 Lint/NonDeterministicRequireOrder:
   Enabled: false
 Lint/OrderedMagicComments:
@@ -269,18 +218,12 @@ Lint/ShadowedArgument:
   Enabled: false
 Lint/StructNewOverride:
   Enabled: false
-Lint/ToEnumArguments:
-  Enabled: false
 Lint/ToJSON:
   Enabled: false
 Lint/TopLevelReturnWithArgument:
   Enabled: false
 Lint/TrailingCommaInAttributeDeclaration:
   Enabled: false
-Lint/UnexpectedBlockArity:
-  Enabled: false
-Lint/UnmodifiedReduceAccumulator:
-  Enabled: false
 Lint/UnreachableLoop:
   Enabled: false
 Lint/UriEscapeUnescape:
@@ -295,6 +238,8 @@ Metrics/AbcSize:
   Enabled: false
 Metrics/BlockLength:
   Enabled: false
+Metrics/BlockNesting:
+  Enabled: false
 Metrics/ClassLength:
   Enabled: false
 Metrics/CyclomaticComplexity:
@@ -309,6 +254,8 @@ Metrics/PerceivedComplexity:
   Enabled: false
 Migration/DepartmentName:
   Enabled: false
+Naming/AccessorMethodName:
+  Enabled: false
 Naming/BlockParameterName:
   Enabled: false
 Naming/HeredocDelimiterCase:
@@ -321,6 +268,20 @@ Naming/MethodParameterName:
   Enabled: false
 Naming/RescuedExceptionsVariableName:
   Enabled: false
+Naming/VariableNumber:
+  Enabled: false
+Performance/BindCall:
+  Enabled: false
+Performance/DeletePrefix:
+  Enabled: false
+Performance/DeleteSuffix:
+  Enabled: false
+Performance/InefficientHashSearch:
+  Enabled: false
+Performance/UnfreezeString:
+  Enabled: false
+Performance/UriDefaultParser:
+  Enabled: false
 RSpec/Be:
   Enabled: false
 RSpec/Capybara/CurrentPathExpectation:
@@ -409,8 +370,6 @@ Style/AccessModifierDeclarations:
   Enabled: false
 Style/AccessorGrouping:
   Enabled: false
-Style/ArgumentsForwarding:
-  Enabled: false
 Style/AsciiComments:
   Enabled: false
 Style/BisectedAttrAccessor:
@@ -419,8 +378,6 @@ Style/CaseLikeIf:
   Enabled: false
 Style/ClassEqualityComparison:
   Enabled: false
-Style/CollectionCompact:
-  Enabled: false
 Style/ColonMethodDefinition:
   Enabled: false
 Style/CombinableLoops:
@@ -429,8 +386,6 @@ Style/CommentedKeyword:
   Enabled: false
 Style/Dir:
   Enabled: false
-Style/DocumentDynamicEvalDefinition:
-  Enabled: false
 Style/DoubleCopDisableDirective:
   Enabled: false
 Style/EmptyBlockParameter:
@@ -469,12 +424,8 @@ Style/MixinUsage:
   Enabled: false
 Style/MultilineWhenThen:
   Enabled: false
-Style/NegatedIfElseCondition:
-  Enabled: false
 Style/NegatedUnless:
   Enabled: false
-Style/NilLambda:
-  Enabled: false
 Style/NumericPredicate:
   Enabled: false
 Style/OptionalBooleanParameter:
@@ -483,8 +434,6 @@ Style/OrAssignment:
   Enabled: false
 Style/RandomWithOffset:
   Enabled: false
-Style/RedundantArgument:
-  Enabled: false
 Style/RedundantAssignment:
   Enabled: false
 Style/RedundantCondition:
@@ -517,8 +466,6 @@ Style/StringConcatenation:
   Enabled: false
 Style/Strip:
   Enabled: false
-Style/SwapValues:
-  Enabled: false
 Style/SymbolProc:
   Enabled: false
 Style/TrailingBodyOnClass:
@@ -533,3 +480,35 @@ Style/TrailingMethodEndStatement:
   Enabled: false
 Style/UnpackFirst:
   Enabled: false
+Lint/DuplicateBranch:
+  Enabled: false
+Lint/DuplicateRegexpCharacterClassElement:
+  Enabled: false
+Lint/EmptyBlock:
+  Enabled: false
+Lint/EmptyClass:
+  Enabled: false
+Lint/NoReturnInBeginEndBlocks:
+  Enabled: false
+Lint/ToEnumArguments:
+  Enabled: false
+Lint/UnexpectedBlockArity:
+  Enabled: false
+Lint/UnmodifiedReduceAccumulator:
+  Enabled: false
+Performance/CollectionLiteralInLoop:
+  Enabled: false
+Style/ArgumentsForwarding:
+  Enabled: false
+Style/CollectionCompact:
+  Enabled: false
+Style/DocumentDynamicEvalDefinition:
+  Enabled: false
+Style/NegatedIfElseCondition:
+  Enabled: false
+Style/NilLambda:
+  Enabled: false
+Style/RedundantArgument:
+  Enabled: false
+Style/SwapValues:
+  Enabled: false

.rubocop_todo.yml

@@ -1,11 +1,6 @@
 ---
 ".gitlab-ci.yml":
   delete: true
-".rubocop.yml":
-  default_configs:
-    inherit_from: ".rubocop_todo.yml"
-    require:
-    - rubocop-rspec
 ".travis.yml":
   global_env:
     - HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
@@ -43,12 +38,7 @@ Gemfile:
   optional:
     ":development":
     - gem: github_changelog_generator
-      git: https://github.com/skywinder/github-changelog-generator
-      ref: 20ee04ba1234e9e83eb2ffb5056e23d641c7a018
-      condition: Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
 Rakefile:
-  extras:
-    "FastGettext.default_text_domain = 'default-text-domain'"
   changelog_user: puppetlabs
 spec/spec_helper.rb:
   mock_with: ":rspec"