Skip to content

Commit dcffbb5

Browse files
m0dularm0dular
authored
Merge pull request #196 from MartyEwings/puppet8
(SUP-4200) Puppet 8 compatibility
2 parents b9ebb27 + fc0b00b commit dcffbb5

File tree

13 files changed

+281
-61
lines changed

13 files changed

+281
-61
lines changed

‎.fixtures.yml‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,26 @@
11
---
22
fixtures:
3+
forge_modules:
4+
service: "puppetlabs/service"
5+
package: "puppetlabs/package"
6+
reboot: "puppetlabs/reboot"
37
repositories:
48
cron_core: "https://github.com/puppetlabs/puppetlabs-cron_core"
59
facts: 'https://github.com/puppetlabs/puppetlabs-facts'
610
puppet_agent: 'https://github.com/puppetlabs/puppetlabs-puppet_agent'
711
provision: 'https://github.com/puppetlabs/provision'
8-
bootstrap: "https://github.com/puppetlabs/puppetlabs-bootstrap"
9-
puppet_conf: "https://github.com/puppetlabs/puppetlabs-puppet_conf"
12+
bootstrap: 'https://github.com/puppetlabs/puppetlabs-bootstrap'
13+
puppet_conf: 'https://github.com/puppetlabs/puppetlabs-puppet_conf'
1014
deploy_pe: 'https://github.com/jarretlavallee/puppet-deploy_pe'
11-
ruby_task_helper: "https://git@github.com/puppetlabs/puppetlabs-ruby_task_helper"
12-
stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib"
15+
ruby_task_helper: 'https://git@github.com/puppetlabs/puppetlabs-ruby_task_helper'
16+
stdlib: 'https://github.com/puppetlabs/puppetlabs-stdlib'
17+
bash_task_helper: 'https://github.com/puppetlabs/puppetlabs-bash_task_helper'
18+
node_manager: 'https://github.com/WhatsARanjit/puppet-node_manager'
19+
apply_helpers: 'https://github.com/puppetlabs/puppetlabs-apply_helpers'
20+
debug: 'https://github.com/nwops/puppet-debug'
21+
format: 'https://github.com/voxpupuli/puppet-format'
22+
container_inventory: 'https://gitlab.com/nwops/bolt-container_inventory'
23+
peadm: 'https://github.com/puppetlabs/puppetlabs-peadm.git'
24+
symlinks:
25+
peadm_spec: "#{source_dir}/spec/fixtures/modules/peadm/spec/acceptance/peadm_spec/"
26+
puppetlabs-puppet_metrics_collector: "#{source_dir}"

‎.pdkignore‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,16 @@
2626
.envrc
2727
/inventory.yaml
2828
/spec/fixtures/litmus_inventory.yaml
29-
/appveyor.yml
30-
/.editorconfig
3129
/.fixtures.yml
3230
/Gemfile
3331
/.gitattributes
3432
/.gitignore
35-
/.gitlab-ci.yml
3633
/.pdkignore
3734
/.puppet-lint.rc
3835
/Rakefile
3936
/rakelib/
4037
/.rspec
41-
/.rubocop.yml
42-
/.travis.yml
38+
/..yml
4339
/.yardopts
4440
/spec/
4541
/.vscode/

‎.puppet-lint.rc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
--relative
2+
--no-parameter_documentation-check
3+
--no-selector_inside_resource-check

‎.rubocop.yml‎

Lines changed: 212 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ require:
44
- rubocop-rspec
55
AllCops:
66
DisplayCopNames: true
7-
TargetRubyVersion: '2.5'
7+
TargetRubyVersion: '2.6'
88
Include:
99
- "**/*.rb"
1010
Exclude:
@@ -94,6 +94,8 @@ RSpec/EmptyExampleGroup:
9494
Enabled: false
9595
Style/CollectionMethods:
9696
Enabled: true
97+
Performance/StringInclude:
98+
Enabled: true
9799
RSpec/MessageSpies:
98100
EnforcedStyle: receive
99101
Style/WordArray:
@@ -120,16 +122,20 @@ Performance/SortReverse:
120122
Enabled: true
121123
Performance/Squeeze:
122124
Enabled: true
123-
Performance/StringInclude:
124-
Enabled: true
125125
Performance/Sum:
126126
Enabled: true
127127
Style/MethodCalledOnDoEndBlock:
128128
Enabled: true
129129
Style/StringMethods:
130130
Enabled: true
131+
Bundler/GemFilename:
132+
Enabled: false
131133
Bundler/InsecureProtocolSource:
132134
Enabled: false
135+
Capybara/CurrentPathExpectation:
136+
Enabled: false
137+
Capybara/VisibilityMatcher:
138+
Enabled: false
133139
Gemspec/DuplicatedAssignment:
134140
Enabled: false
135141
Gemspec/OrderedDependencies:
@@ -304,11 +310,9 @@ Performance/UriDefaultParser:
304310
Enabled: false
305311
RSpec/Be:
306312
Enabled: false
307-
RSpec/Capybara/CurrentPathExpectation:
308-
Enabled: false
309313
RSpec/Capybara/FeatureMethods:
310314
Enabled: false
311-
RSpec/Capybara/VisibilityMatcher:
315+
RSpec/ContainExactly:
312316
Enabled: false
313317
RSpec/ContextMethod:
314318
Enabled: false
@@ -348,6 +352,8 @@ RSpec/LeakyConstantDeclaration:
348352
Enabled: false
349353
RSpec/LetBeforeExamples:
350354
Enabled: false
355+
RSpec/MatchArray:
356+
Enabled: false
351357
RSpec/MissingExampleGroupArgument:
352358
Enabled: false
353359
RSpec/MultipleExpectations:
@@ -390,8 +396,6 @@ Style/AccessModifierDeclarations:
390396
Enabled: false
391397
Style/AccessorGrouping:
392398
Enabled: false
393-
Style/AsciiComments:
394-
Enabled: false
395399
Style/BisectedAttrAccessor:
396400
Enabled: false
397401
Style/CaseLikeIf:
@@ -502,35 +506,235 @@ Style/TrailingMethodEndStatement:
502506
Enabled: false
503507
Style/UnpackFirst:
504508
Enabled: false
509+
Capybara/MatchStyle:
510+
Enabled: false
511+
Capybara/NegationMatcher:
512+
Enabled: false
513+
Capybara/SpecificActions:
514+
Enabled: false
515+
Capybara/SpecificFinders:
516+
Enabled: false
517+
Capybara/SpecificMatcher:
518+
Enabled: false
519+
Gemspec/DeprecatedAttributeAssignment:
520+
Enabled: false
521+
Gemspec/DevelopmentDependencies:
522+
Enabled: false
523+
Gemspec/RequireMFA:
524+
Enabled: false
525+
Layout/LineContinuationLeadingSpace:
526+
Enabled: false
527+
Layout/LineContinuationSpacing:
528+
Enabled: false
529+
Layout/LineEndStringConcatenationIndentation:
530+
Enabled: false
531+
Layout/SpaceBeforeBrackets:
532+
Enabled: false
533+
Lint/AmbiguousAssignment:
534+
Enabled: false
535+
Lint/AmbiguousOperatorPrecedence:
536+
Enabled: false
537+
Lint/AmbiguousRange:
538+
Enabled: false
539+
Lint/ConstantOverwrittenInRescue:
540+
Enabled: false
541+
Lint/DeprecatedConstants:
542+
Enabled: false
505543
Lint/DuplicateBranch:
506544
Enabled: false
545+
Lint/DuplicateMagicComment:
546+
Enabled: false
507547
Lint/DuplicateRegexpCharacterClassElement:
508548
Enabled: false
509549
Lint/EmptyBlock:
510550
Enabled: false
511551
Lint/EmptyClass:
512552
Enabled: false
553+
Lint/EmptyInPattern:
554+
Enabled: false
555+
Lint/IncompatibleIoSelectWithFiberScheduler:
556+
Enabled: false
557+
Lint/LambdaWithoutLiteralBlock:
558+
Enabled: false
513559
Lint/NoReturnInBeginEndBlocks:
514560
Enabled: false
561+
Lint/NonAtomicFileOperation:
562+
Enabled: false
563+
Lint/NumberedParameterAssignment:
564+
Enabled: false
565+
Lint/OrAssignmentToConstant:
566+
Enabled: false
567+
Lint/RedundantDirGlobSort:
568+
Enabled: false
569+
Lint/RefinementImportMethods:
570+
Enabled: false
571+
Lint/RequireRangeParentheses:
572+
Enabled: false
573+
Lint/RequireRelativeSelfPath:
574+
Enabled: false
575+
Lint/SymbolConversion:
576+
Enabled: false
515577
Lint/ToEnumArguments:
516578
Enabled: false
579+
Lint/TripleQuotes:
580+
Enabled: false
517581
Lint/UnexpectedBlockArity:
518582
Enabled: false
519583
Lint/UnmodifiedReduceAccumulator:
520584
Enabled: false
585+
Lint/UselessRescue:
586+
Enabled: false
587+
Lint/UselessRuby2Keywords:
588+
Enabled: false
589+
Metrics/CollectionLiteralLength:
590+
Enabled: false
591+
Naming/BlockForwarding:
592+
Enabled: false
521593
Performance/CollectionLiteralInLoop:
522594
Enabled: false
595+
Performance/ConcurrentMonotonicTime:
596+
Enabled: false
597+
Performance/MapCompact:
598+
Enabled: false
599+
Performance/RedundantEqualityComparisonBlock:
600+
Enabled: false
601+
Performance/RedundantSplitRegexpArgument:
602+
Enabled: false
603+
Performance/StringIdentifierArgument:
604+
Enabled: false
605+
RSpec/BeEq:
606+
Enabled: false
607+
RSpec/BeNil:
608+
Enabled: false
609+
RSpec/ChangeByZero:
610+
Enabled: false
611+
RSpec/ClassCheck:
612+
Enabled: false
613+
RSpec/DuplicatedMetadata:
614+
Enabled: false
615+
RSpec/ExcessiveDocstringSpacing:
616+
Enabled: false
617+
RSpec/FactoryBot/ConsistentParenthesesStyle:
618+
Enabled: false
619+
RSpec/FactoryBot/FactoryNameStyle:
620+
Enabled: false
621+
RSpec/FactoryBot/SyntaxMethods:
622+
Enabled: false
623+
RSpec/IdenticalEqualityAssertion:
624+
Enabled: false
625+
RSpec/NoExpectationExample:
626+
Enabled: false
627+
RSpec/PendingWithoutReason:
628+
Enabled: false
629+
RSpec/Rails/AvoidSetupHook:
630+
Enabled: false
631+
RSpec/Rails/HaveHttpStatus:
632+
Enabled: false
633+
RSpec/Rails/InferredSpecType:
634+
Enabled: false
635+
RSpec/Rails/MinitestAssertions:
636+
Enabled: false
637+
RSpec/Rails/TravelAround:
638+
Enabled: false
639+
RSpec/RedundantAround:
640+
Enabled: false
641+
RSpec/SkipBlockInsideExample:
642+
Enabled: false
643+
RSpec/SortMetadata:
644+
Enabled: false
645+
RSpec/SubjectDeclaration:
646+
Enabled: false
647+
RSpec/VerifiedDoubleReference:
648+
Enabled: false
649+
Security/CompoundHash:
650+
Enabled: false
651+
Security/IoMethods:
652+
Enabled: false
523653
Style/ArgumentsForwarding:
524654
Enabled: false
655+
Style/ArrayIntersect:
656+
Enabled: false
525657
Style/CollectionCompact:
526658
Enabled: false
659+
Style/ComparableClamp:
660+
Enabled: false
661+
Style/ConcatArrayLiterals:
662+
Enabled: false
663+
Style/DirEmpty:
664+
Enabled: false
527665
Style/DocumentDynamicEvalDefinition:
528666
Enabled: false
667+
Style/EmptyHeredoc:
668+
Enabled: false
669+
Style/EndlessMethod:
670+
Enabled: false
671+
Style/EnvHome:
672+
Enabled: false
673+
Style/FetchEnvVar:
674+
Enabled: false
675+
Style/FileEmpty:
676+
Enabled: false
677+
Style/FileRead:
678+
Enabled: false
679+
Style/FileWrite:
680+
Enabled: false
681+
Style/HashConversion:
682+
Enabled: false
683+
Style/HashExcept:
684+
Enabled: false
685+
Style/IfWithBooleanLiteralBranches:
686+
Enabled: false
687+
Style/InPatternThen:
688+
Enabled: false
689+
Style/MagicCommentFormat:
690+
Enabled: false
691+
Style/MapCompactWithConditionalBlock:
692+
Enabled: false
693+
Style/MapToHash:
694+
Enabled: false
695+
Style/MapToSet:
696+
Enabled: false
697+
Style/MinMaxComparison:
698+
Enabled: false
699+
Style/MultilineInPatternThen:
700+
Enabled: false
529701
Style/NegatedIfElseCondition:
530702
Enabled: false
703+
Style/NestedFileDirname:
704+
Enabled: false
531705
Style/NilLambda:
532706
Enabled: false
707+
Style/NumberedParameters:
708+
Enabled: false
709+
Style/NumberedParametersLimit:
710+
Enabled: false
711+
Style/ObjectThen:
712+
Enabled: false
713+
Style/OpenStructUse:
714+
Enabled: false
715+
Style/OperatorMethodCall:
716+
Enabled: false
717+
Style/QuotedSymbols:
718+
Enabled: false
533719
Style/RedundantArgument:
534720
Enabled: false
721+
Style/RedundantConstantBase:
722+
Enabled: false
723+
Style/RedundantDoubleSplatHashBraces:
724+
Enabled: false
725+
Style/RedundantEach:
726+
Enabled: false
727+
Style/RedundantHeredocDelimiterQuotes:
728+
Enabled: false
729+
Style/RedundantInitialize:
730+
Enabled: false
731+
Style/RedundantSelfAssignmentBranch:
732+
Enabled: false
733+
Style/RedundantStringEscape:
734+
Enabled: false
735+
Style/SelectByRegexp:
736+
Enabled: false
737+
Style/StringChars:
738+
Enabled: false
535739
Style/SwapValues:
536740
Enabled: false

‎.ruby-version‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.sync.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ spec/spec_helper.rb:
2727
coverage_report: true
2828
Rakefile:
2929
changelog_user: "puppetlabs"
30-
30+
extra_disabled_lint_checks:
31+
- parameter_documentation
32+
- selector_inside_resource
3133
spec/default_facts.yml:
3234
extra_facts:
3335
pe_server_version: '2019.8.6'
@@ -59,6 +61,8 @@ spec/default_facts.yml:
5961
Enabled: False
6062
"Style/CollectionMethods":
6163
Enabled: False
64+
"Performance/StringInclude":
65+
Enabled: False
6266
Gemfile:
6367
optional:
6468
":development":

0 commit comments

Comments
 (0)