Skip to content

Commit 42b74e2

Browse files
authored
Merge pull request #73 from mhashizume/PA-5810/main/pdk-update
Update to PDK template 3.0.1
2 parents 6914fb3 + 557620d commit 42b74e2

File tree

10 files changed

+248
-36
lines changed

10 files changed

+248
-36
lines changed

.github/workflows/auto_release.yml renamed to .github/workflows/release_prep.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Auto release"
1+
name: "Release Prep"
22

33
on:
44
workflow_dispatch:

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/log/
1717
/pkg/
1818
/spec/fixtures/manifests/
19-
/spec/fixtures/modules/
19+
/spec/fixtures/modules/*
2020
/tmp/
2121
/vendor/
2222
/convert_report.txt

.pdkignore

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/log/
1717
/pkg/
1818
/spec/fixtures/manifests/
19-
/spec/fixtures/modules/
19+
/spec/fixtures/modules/*
2020
/tmp/
2121
/vendor/
2222
/convert_report.txt
@@ -26,20 +26,17 @@
2626
.envrc
2727
/inventory.yaml
2828
/spec/fixtures/litmus_inventory.yaml
29-
/appveyor.yml
30-
/.editorconfig
3129
/.fixtures.yml
3230
/Gemfile
3331
/.gitattributes
32+
/.github/
3433
/.gitignore
35-
/.gitlab-ci.yml
3634
/.pdkignore
3735
/.puppet-lint.rc
3836
/Rakefile
3937
/rakelib/
4038
/.rspec
41-
/.rubocop.yml
42-
/.travis.yml
39+
/..yml
4340
/.yardopts
4441
/spec/
4542
/.vscode/

.rubocop.yml

Lines changed: 210 additions & 6 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:
@@ -130,8 +130,14 @@ Style/MethodCalledOnDoEndBlock:
130130
Enabled: true
131131
Style/StringMethods:
132132
Enabled: true
133+
Bundler/GemFilename:
134+
Enabled: false
133135
Bundler/InsecureProtocolSource:
134136
Enabled: false
137+
Capybara/CurrentPathExpectation:
138+
Enabled: false
139+
Capybara/VisibilityMatcher:
140+
Enabled: false
135141
Gemspec/DuplicatedAssignment:
136142
Enabled: false
137143
Gemspec/OrderedDependencies:
@@ -300,11 +306,9 @@ Performance/UriDefaultParser:
300306
Enabled: false
301307
RSpec/Be:
302308
Enabled: false
303-
RSpec/Capybara/CurrentPathExpectation:
304-
Enabled: false
305309
RSpec/Capybara/FeatureMethods:
306310
Enabled: false
307-
RSpec/Capybara/VisibilityMatcher:
311+
RSpec/ContainExactly:
308312
Enabled: false
309313
RSpec/ContextMethod:
310314
Enabled: false
@@ -344,6 +348,8 @@ RSpec/LeakyConstantDeclaration:
344348
Enabled: false
345349
RSpec/LetBeforeExamples:
346350
Enabled: false
351+
RSpec/MatchArray:
352+
Enabled: false
347353
RSpec/MissingExampleGroupArgument:
348354
Enabled: false
349355
RSpec/MultipleExpectations:
@@ -386,8 +392,6 @@ Style/AccessModifierDeclarations:
386392
Enabled: false
387393
Style/AccessorGrouping:
388394
Enabled: false
389-
Style/AsciiComments:
390-
Enabled: false
391395
Style/BisectedAttrAccessor:
392396
Enabled: false
393397
Style/CaseLikeIf:
@@ -496,35 +500,235 @@ Style/TrailingMethodEndStatement:
496500
Enabled: false
497501
Style/UnpackFirst:
498502
Enabled: false
503+
Capybara/MatchStyle:
504+
Enabled: false
505+
Capybara/NegationMatcher:
506+
Enabled: false
507+
Capybara/SpecificActions:
508+
Enabled: false
509+
Capybara/SpecificFinders:
510+
Enabled: false
511+
Capybara/SpecificMatcher:
512+
Enabled: false
513+
Gemspec/DeprecatedAttributeAssignment:
514+
Enabled: false
515+
Gemspec/DevelopmentDependencies:
516+
Enabled: false
517+
Gemspec/RequireMFA:
518+
Enabled: false
519+
Layout/LineContinuationLeadingSpace:
520+
Enabled: false
521+
Layout/LineContinuationSpacing:
522+
Enabled: false
523+
Layout/LineEndStringConcatenationIndentation:
524+
Enabled: false
525+
Layout/SpaceBeforeBrackets:
526+
Enabled: false
527+
Lint/AmbiguousAssignment:
528+
Enabled: false
529+
Lint/AmbiguousOperatorPrecedence:
530+
Enabled: false
531+
Lint/AmbiguousRange:
532+
Enabled: false
533+
Lint/ConstantOverwrittenInRescue:
534+
Enabled: false
535+
Lint/DeprecatedConstants:
536+
Enabled: false
499537
Lint/DuplicateBranch:
500538
Enabled: false
539+
Lint/DuplicateMagicComment:
540+
Enabled: false
501541
Lint/DuplicateRegexpCharacterClassElement:
502542
Enabled: false
503543
Lint/EmptyBlock:
504544
Enabled: false
505545
Lint/EmptyClass:
506546
Enabled: false
547+
Lint/EmptyInPattern:
548+
Enabled: false
549+
Lint/IncompatibleIoSelectWithFiberScheduler:
550+
Enabled: false
551+
Lint/LambdaWithoutLiteralBlock:
552+
Enabled: false
507553
Lint/NoReturnInBeginEndBlocks:
508554
Enabled: false
555+
Lint/NonAtomicFileOperation:
556+
Enabled: false
557+
Lint/NumberedParameterAssignment:
558+
Enabled: false
559+
Lint/OrAssignmentToConstant:
560+
Enabled: false
561+
Lint/RedundantDirGlobSort:
562+
Enabled: false
563+
Lint/RefinementImportMethods:
564+
Enabled: false
565+
Lint/RequireRangeParentheses:
566+
Enabled: false
567+
Lint/RequireRelativeSelfPath:
568+
Enabled: false
569+
Lint/SymbolConversion:
570+
Enabled: false
509571
Lint/ToEnumArguments:
510572
Enabled: false
573+
Lint/TripleQuotes:
574+
Enabled: false
511575
Lint/UnexpectedBlockArity:
512576
Enabled: false
513577
Lint/UnmodifiedReduceAccumulator:
514578
Enabled: false
579+
Lint/UselessRescue:
580+
Enabled: false
581+
Lint/UselessRuby2Keywords:
582+
Enabled: false
583+
Metrics/CollectionLiteralLength:
584+
Enabled: false
585+
Naming/BlockForwarding:
586+
Enabled: false
515587
Performance/CollectionLiteralInLoop:
516588
Enabled: false
589+
Performance/ConcurrentMonotonicTime:
590+
Enabled: false
591+
Performance/MapCompact:
592+
Enabled: false
593+
Performance/RedundantEqualityComparisonBlock:
594+
Enabled: false
595+
Performance/RedundantSplitRegexpArgument:
596+
Enabled: false
597+
Performance/StringIdentifierArgument:
598+
Enabled: false
599+
RSpec/BeEq:
600+
Enabled: false
601+
RSpec/BeNil:
602+
Enabled: false
603+
RSpec/ChangeByZero:
604+
Enabled: false
605+
RSpec/ClassCheck:
606+
Enabled: false
607+
RSpec/DuplicatedMetadata:
608+
Enabled: false
609+
RSpec/ExcessiveDocstringSpacing:
610+
Enabled: false
611+
RSpec/FactoryBot/ConsistentParenthesesStyle:
612+
Enabled: false
613+
RSpec/FactoryBot/FactoryNameStyle:
614+
Enabled: false
615+
RSpec/FactoryBot/SyntaxMethods:
616+
Enabled: false
617+
RSpec/IdenticalEqualityAssertion:
618+
Enabled: false
619+
RSpec/NoExpectationExample:
620+
Enabled: false
621+
RSpec/PendingWithoutReason:
622+
Enabled: false
623+
RSpec/Rails/AvoidSetupHook:
624+
Enabled: false
625+
RSpec/Rails/HaveHttpStatus:
626+
Enabled: false
627+
RSpec/Rails/InferredSpecType:
628+
Enabled: false
629+
RSpec/Rails/MinitestAssertions:
630+
Enabled: false
631+
RSpec/Rails/TravelAround:
632+
Enabled: false
633+
RSpec/RedundantAround:
634+
Enabled: false
635+
RSpec/SkipBlockInsideExample:
636+
Enabled: false
637+
RSpec/SortMetadata:
638+
Enabled: false
639+
RSpec/SubjectDeclaration:
640+
Enabled: false
641+
RSpec/VerifiedDoubleReference:
642+
Enabled: false
643+
Security/CompoundHash:
644+
Enabled: false
645+
Security/IoMethods:
646+
Enabled: false
517647
Style/ArgumentsForwarding:
518648
Enabled: false
649+
Style/ArrayIntersect:
650+
Enabled: false
519651
Style/CollectionCompact:
520652
Enabled: false
653+
Style/ComparableClamp:
654+
Enabled: false
655+
Style/ConcatArrayLiterals:
656+
Enabled: false
657+
Style/DirEmpty:
658+
Enabled: false
521659
Style/DocumentDynamicEvalDefinition:
522660
Enabled: false
661+
Style/EmptyHeredoc:
662+
Enabled: false
663+
Style/EndlessMethod:
664+
Enabled: false
665+
Style/EnvHome:
666+
Enabled: false
667+
Style/FetchEnvVar:
668+
Enabled: false
669+
Style/FileEmpty:
670+
Enabled: false
671+
Style/FileRead:
672+
Enabled: false
673+
Style/FileWrite:
674+
Enabled: false
675+
Style/HashConversion:
676+
Enabled: false
677+
Style/HashExcept:
678+
Enabled: false
679+
Style/IfWithBooleanLiteralBranches:
680+
Enabled: false
681+
Style/InPatternThen:
682+
Enabled: false
683+
Style/MagicCommentFormat:
684+
Enabled: false
685+
Style/MapCompactWithConditionalBlock:
686+
Enabled: false
687+
Style/MapToHash:
688+
Enabled: false
689+
Style/MapToSet:
690+
Enabled: false
691+
Style/MinMaxComparison:
692+
Enabled: false
693+
Style/MultilineInPatternThen:
694+
Enabled: false
523695
Style/NegatedIfElseCondition:
524696
Enabled: false
697+
Style/NestedFileDirname:
698+
Enabled: false
525699
Style/NilLambda:
526700
Enabled: false
701+
Style/NumberedParameters:
702+
Enabled: false
703+
Style/NumberedParametersLimit:
704+
Enabled: false
705+
Style/ObjectThen:
706+
Enabled: false
707+
Style/OpenStructUse:
708+
Enabled: false
709+
Style/OperatorMethodCall:
710+
Enabled: false
711+
Style/QuotedSymbols:
712+
Enabled: false
527713
Style/RedundantArgument:
528714
Enabled: false
715+
Style/RedundantConstantBase:
716+
Enabled: false
717+
Style/RedundantDoubleSplatHashBraces:
718+
Enabled: false
719+
Style/RedundantEach:
720+
Enabled: false
721+
Style/RedundantHeredocDelimiterQuotes:
722+
Enabled: false
723+
Style/RedundantInitialize:
724+
Enabled: false
725+
Style/RedundantSelfAssignmentBranch:
726+
Enabled: false
727+
Style/RedundantStringEscape:
728+
Enabled: false
729+
Style/SelectByRegexp:
730+
Enabled: false
731+
Style/StringChars:
732+
Enabled: false
529733
Style/SwapValues:
530734
Enabled: false

.sync.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,13 @@ appveyor.yml:
4949
delete: true
5050
.travis.yml:
5151
delete: true
52-
.github/workflows/auto_release.yml:
53-
unmanaged: false
5452
.github/workflows/release.yml:
5553
unmanaged: false
54+
.github/workflows/release_prep.yml:
55+
unmanaged: false
5656
.gitlab-ci.yml:
5757
delete: true
58+
# We still use the Vox acceptance Rake task instead of Litmus
59+
Rakefile:
60+
requires:
61+
- voxpupuli/acceptance/rake

0 commit comments

Comments
 (0)