Skip to content

Commit fe31a45

Browse files
Merge pull request #234 from puppetlabs/CAT-2400-Puppetcore_upgrade
(CAT-2400) Puppetcore upgrade
2 parents f6fc2d9 + 7b6924d commit fe31a45

File tree

12 files changed

+153
-80
lines changed

12 files changed

+153
-80
lines changed

.fixtures.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ fixtures:
33
stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
44
registry: "https://github.com/puppetlabs/puppetlabs-registry.git"
55
facts: 'https://github.com/puppetlabs/puppetlabs-facts.git'
6-
puppet_agent:
7-
repo: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
8-
ref: v4.13.0
6+
puppet_agent: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
97
provision: 'https://github.com/puppetlabs/provision.git'
108
symlinks:
119
"wsus_client": "#{source_dir}"

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@ jobs:
1414
Acceptance:
1515
needs: Spec
1616
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
17+
with:
18+
flags: "--latest-agent"
1719
secrets: "inherit"

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: "Publish module"
22

33
on:
44
workflow_dispatch:
5-
5+
66
jobs:
77
release:
88
uses: "puppetlabs/cat-github-actions/.github/workflows/module_release.yml@main"

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,17 @@
1919
/spec/fixtures/modules/*
2020
/tmp/
2121
/vendor/
22+
/.vendor/
2223
/convert_report.txt
2324
/update_report.txt
2425
.DS_Store
2526
.project
2627
.envrc
2728
/inventory.yaml
2829
/spec/fixtures/litmus_inventory.yaml
30+
.resource_types
31+
.modules
32+
.task_cache.json
33+
.plan_cache.json
34+
.rerun.json
35+
bolt-debug.log

.pdkignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,20 @@
1919
/spec/fixtures/modules/*
2020
/tmp/
2121
/vendor/
22+
/.vendor/
2223
/convert_report.txt
2324
/update_report.txt
2425
.DS_Store
2526
.project
2627
.envrc
2728
/inventory.yaml
2829
/spec/fixtures/litmus_inventory.yaml
30+
.resource_types
31+
.modules
32+
.task_cache.json
33+
.plan_cache.json
34+
.rerun.json
35+
bolt-debug.log
2936
/.fixtures.yml
3037
/Gemfile
3138
/.gitattributes

.puppet-lint.rc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,9 @@
1+
--fail-on-warnings
12
--relative
3+
--no-80chars-check
4+
--no-140chars-check
5+
--no-class_inherits_from_params_class-check
6+
--no-autoloader_layout-check
7+
--no-documentation-check
8+
--no-single_quote_string_with_variables-check
9+
--ignore-paths=.vendor/**/*.pp,.bundle/**/*.pp,pkg/**/*.pp,spec/**/*.pp,tests/**/*.pp,types/**/*.pp,vendor/**/*.pp

.rubocop.yml

Lines changed: 35 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
---
2-
require:
2+
plugins:
33
- rubocop-performance
44
- rubocop-rspec
5+
- rubocop-rspec_rails
6+
- rubocop-factory_bot
7+
- rubocop-capybara
58
AllCops:
69
NewCops: enable
710
DisplayCopNames: true
8-
TargetRubyVersion: '2.7'
11+
TargetRubyVersion: 3.1
912
Include:
1013
- "**/*.rb"
1114
Exclude:
@@ -121,6 +124,12 @@ Capybara/CurrentPathExpectation:
121124
Enabled: false
122125
Capybara/VisibilityMatcher:
123126
Enabled: false
127+
FactoryBot/AttributeDefinedStatically:
128+
Enabled: false
129+
FactoryBot/CreateList:
130+
Enabled: false
131+
FactoryBot/FactoryClassName:
132+
Enabled: false
124133
Gemspec/DuplicatedAssignment:
125134
Enabled: false
126135
Gemspec/OrderedDependencies:
@@ -295,8 +304,6 @@ Performance/UriDefaultParser:
295304
Enabled: false
296305
RSpec/Be:
297306
Enabled: false
298-
RSpec/Capybara/FeatureMethods:
299-
Enabled: false
300307
RSpec/ContainExactly:
301308
Enabled: false
302309
RSpec/ContextMethod:
@@ -305,6 +312,8 @@ RSpec/ContextWording:
305312
Enabled: false
306313
RSpec/DescribeClass:
307314
Enabled: false
315+
RSpec/Dialect:
316+
Enabled: false
308317
RSpec/EmptyHook:
309318
Enabled: false
310319
RSpec/EmptyLineAfterExample:
@@ -321,12 +330,6 @@ RSpec/ExpectChange:
321330
Enabled: false
322331
RSpec/ExpectInHook:
323332
Enabled: false
324-
RSpec/FactoryBot/AttributeDefinedStatically:
325-
Enabled: false
326-
RSpec/FactoryBot/CreateList:
327-
Enabled: false
328-
RSpec/FactoryBot/FactoryClassName:
329-
Enabled: false
330333
RSpec/HooksBeforeExamples:
331334
Enabled: false
332335
RSpec/ImplicitBlockExpectation:
@@ -501,6 +504,12 @@ Capybara/SpecificFinders:
501504
Enabled: false
502505
Capybara/SpecificMatcher:
503506
Enabled: false
507+
FactoryBot/ConsistentParenthesesStyle:
508+
Enabled: false
509+
FactoryBot/FactoryNameStyle:
510+
Enabled: false
511+
FactoryBot/SyntaxMethods:
512+
Enabled: false
504513
Gemspec/DeprecatedAttributeAssignment:
505514
Enabled: false
506515
Gemspec/DevelopmentDependencies:
@@ -529,6 +538,8 @@ Lint/DuplicateBranch:
529538
Enabled: false
530539
Lint/DuplicateMagicComment:
531540
Enabled: false
541+
Lint/DuplicateMatchPattern:
542+
Enabled: false
532543
Lint/DuplicateRegexpCharacterClassElement:
533544
Enabled: false
534545
Lint/EmptyBlock:
@@ -599,28 +610,12 @@ RSpec/DuplicatedMetadata:
599610
Enabled: false
600611
RSpec/ExcessiveDocstringSpacing:
601612
Enabled: false
602-
RSpec/FactoryBot/ConsistentParenthesesStyle:
603-
Enabled: false
604-
RSpec/FactoryBot/FactoryNameStyle:
605-
Enabled: false
606-
RSpec/FactoryBot/SyntaxMethods:
607-
Enabled: false
608613
RSpec/IdenticalEqualityAssertion:
609614
Enabled: false
610615
RSpec/NoExpectationExample:
611616
Enabled: false
612617
RSpec/PendingWithoutReason:
613618
Enabled: false
614-
RSpec/Rails/AvoidSetupHook:
615-
Enabled: false
616-
RSpec/Rails/HaveHttpStatus:
617-
Enabled: false
618-
RSpec/Rails/InferredSpecType:
619-
Enabled: false
620-
RSpec/Rails/MinitestAssertions:
621-
Enabled: false
622-
RSpec/Rails/TravelAround:
623-
Enabled: false
624619
RSpec/RedundantAround:
625620
Enabled: false
626621
RSpec/SkipBlockInsideExample:
@@ -631,6 +626,16 @@ RSpec/SubjectDeclaration:
631626
Enabled: false
632627
RSpec/VerifiedDoubleReference:
633628
Enabled: false
629+
RSpecRails/AvoidSetupHook:
630+
Enabled: false
631+
RSpecRails/HaveHttpStatus:
632+
Enabled: false
633+
RSpecRails/InferredSpecType:
634+
Enabled: false
635+
RSpecRails/MinitestAssertions:
636+
Enabled: false
637+
RSpecRails/TravelAround:
638+
Enabled: false
634639
Security/CompoundHash:
635640
Enabled: false
636641
Security/IoMethods:
@@ -645,6 +650,8 @@ Style/ComparableClamp:
645650
Enabled: false
646651
Style/ConcatArrayLiterals:
647652
Enabled: false
653+
Style/DataInheritance:
654+
Enabled: false
648655
Style/DirEmpty:
649656
Enabled: false
650657
Style/DocumentDynamicEvalDefinition:
@@ -713,6 +720,8 @@ Style/RedundantHeredocDelimiterQuotes:
713720
Enabled: false
714721
Style/RedundantInitialize:
715722
Enabled: false
723+
Style/RedundantLineContinuation:
724+
Enabled: false
716725
Style/RedundantSelfAssignmentBranch:
717726
Enabled: false
718727
Style/RedundantStringEscape:

.vscode/extensions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"recommendations": [
33
"puppet.puppet-vscode",
4-
"rebornix.Ruby"
4+
"Shopify.ruby-lsp"
55
]
66
}

Gemfile

Lines changed: 72 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,106 @@
1-
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
1+
# frozen_string_literal: true
22

3-
def location_for(place_or_version, fake_version = nil)
4-
git_url_regex = %r{\A(?<url>(https?|git)[:@][^#]*)(#(?<branch>.*))?}
5-
file_url_regex = %r{\Afile:\/\/(?<path>.*)}
3+
# For puppetcore, set GEM_SOURCE_PUPPETCORE = 'https://rubygems-puppetcore.puppet.com'
4+
gemsource_default = ENV['GEM_SOURCE'] || 'https://rubygems.org'
5+
gemsource_puppetcore = if ENV['PUPPET_FORGE_TOKEN']
6+
'https://rubygems-puppetcore.puppet.com'
7+
else
8+
ENV['GEM_SOURCE_PUPPETCORE'] || gemsource_default
9+
end
10+
source gemsource_default
11+
12+
def location_for(place_or_constraint, fake_constraint = nil, opts = {})
13+
git_url_regex = /\A(?<url>(?:https?|git)[:@][^#]*)(?:#(?<branch>.*))?/
14+
file_url_regex = %r{\Afile://(?<path>.*)}
15+
16+
if place_or_constraint && (git_url = place_or_constraint.match(git_url_regex))
17+
# Git source → ignore :source, keep fake_constraint
18+
[fake_constraint, { git: git_url[:url], branch: git_url[:branch], require: false }].compact
19+
20+
elsif place_or_constraint && (file_url = place_or_constraint.match(file_url_regex))
21+
# File source → ignore :source, keep fake_constraint or default >= 0
22+
[fake_constraint || '>= 0', { path: File.expand_path(file_url[:path]), require: false }]
623

7-
if place_or_version && (git_url = place_or_version.match(git_url_regex))
8-
[fake_version, { git: git_url[:url], branch: git_url[:branch], require: false }].compact
9-
elsif place_or_version && (file_url = place_or_version.match(file_url_regex))
10-
['>= 0', { path: File.expand_path(file_url[:path]), require: false }]
1124
else
12-
[place_or_version, { require: false }]
25+
# Plain version constraint → merge opts (including :source if provided)
26+
[place_or_constraint, { require: false }.merge(opts)]
27+
end
28+
end
29+
30+
# Print debug information if DEBUG_GEMS or VERBOSE is set
31+
def print_gem_statement_for(gems)
32+
puts 'DEBUG: Gem definitions that will be generated:'
33+
gems.each do |gem_name, gem_params|
34+
puts "DEBUG: gem #{([gem_name.inspect] + gem_params.map(&:inspect)).join(', ')}"
1335
end
1436
end
1537

1638
group :development do
17-
gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
18-
gem "json", '= 2.3.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
19-
gem "json", '= 2.5.1', require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2039
gem "json", '= 2.6.1', require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2140
gem "json", '= 2.6.3', require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2241
gem "racc", '~> 1.4.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
42+
gem "deep_merge", '~> 1.2.2', require: false
2343
gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
24-
gem "facterdb", '~> 1.18', require: false
25-
gem "metadata-json-lint", '~> 3.0', require: false
26-
gem "puppetlabs_spec_helper", '~> 6.0', require: false
27-
gem "rspec-puppet-facts", '~> 2.0', require: false
28-
gem "codecov", '~> 0.2', require: false
44+
gem "facterdb", '~> 2.1', require: false if Gem::Requirement.create(['< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
45+
gem "facterdb", '~> 3.0', require: false if Gem::Requirement.create(['>= 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
46+
gem "metadata-json-lint", '~> 4.0', require: false
47+
gem "json-schema", '< 5.1.1', require: false
48+
gem "rspec-puppet-facts", '~> 4.0', require: false if Gem::Requirement.create(['< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
49+
gem "rspec-puppet-facts", '~> 5.0', require: false if Gem::Requirement.create(['>= 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2950
gem "dependency_checker", '~> 1.0.0', require: false
3051
gem "parallel_tests", '= 3.12.1', require: false
3152
gem "pry", '~> 0.10', require: false
32-
gem "simplecov-console", '~> 0.5', require: false
33-
gem "puppet-debugger", '~> 1.0', require: false
34-
gem "rubocop", '= 1.48.1', require: false
35-
gem "rubocop-performance", '= 1.16.0', require: false
36-
gem "rubocop-rspec", '= 2.19.0', require: false
37-
gem "puppet-strings", '~> 4.0', require: false
53+
gem "simplecov-console", '~> 0.9', require: false
54+
gem "puppet-debugger", '~> 1.6', require: false
55+
gem "rubocop", '~> 1.73.0', require: false
56+
gem "rubocop-performance", '~> 1.24.0', require: false
57+
gem "rubocop-rspec", '~> 3.5.0', require: false
58+
gem "rubocop-rspec_rails", '~> 2.31.0', require: false
59+
gem "rubocop-factory_bot", '~> 2.27.0', require: false
60+
gem "rubocop-capybara", '~> 2.22.0', require: false
3861
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
62+
gem "bigdecimal", '< 3.2.2', require: false, platforms: [:mswin, :mingw, :x64_mingw]
3963
end
40-
group :system_tests do
41-
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
42-
gem "serverspec", '~> 2.41', require: false
43-
end
44-
group :release_prep do
64+
group :development, :release_prep do
4565
gem "puppet-strings", '~> 4.0', require: false
46-
gem "puppetlabs_spec_helper", '~> 6.0', require: false
66+
gem "puppetlabs_spec_helper", '~> 8.0', require: false
67+
gem "puppet-blacksmith", '~> 7.0', require: false
68+
end
69+
group :system_tests do
70+
gem "puppet_litmus", '~> 2.0', require: false, platforms: [:ruby, :x64_mingw] if !ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
71+
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw] if ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
72+
gem "CFPropertyList", '< 3.0.7', require: false, platforms: [:mswin, :mingw, :x64_mingw]
73+
gem "serverspec", '~> 2.41', require: false
4774
end
48-
49-
puppet_version = ENV['PUPPET_GEM_VERSION']
50-
facter_version = ENV['FACTER_GEM_VERSION']
51-
hiera_version = ENV['HIERA_GEM_VERSION']
5275

5376
gems = {}
77+
bolt_version = ENV.fetch('BOLT_GEM_VERSION', nil)
78+
puppet_version = ENV.fetch('PUPPET_GEM_VERSION', nil)
79+
facter_version = ENV.fetch('FACTER_GEM_VERSION', nil)
80+
hiera_version = ENV.fetch('HIERA_GEM_VERSION', nil)
5481

55-
gems['puppet'] = location_for(puppet_version)
56-
57-
# If facter or hiera versions have been specified via the environment
58-
# variables
59-
60-
gems['facter'] = location_for(facter_version) if facter_version
61-
gems['hiera'] = location_for(hiera_version) if hiera_version
82+
gems['bolt'] = location_for(bolt_version, nil, { source: gemsource_puppetcore })
83+
gems['puppet'] = location_for(puppet_version, nil, { source: gemsource_puppetcore })
84+
gems['facter'] = location_for(facter_version, nil, { source: gemsource_puppetcore })
85+
gems['hiera'] = location_for(hiera_version, nil, {}) if hiera_version
6286

87+
# Generate the gem definitions
88+
print_gem_statement_for(gems) if ENV['DEBUG']
6389
gems.each do |gem_name, gem_params|
6490
gem gem_name, *gem_params
6591
end
6692

6793
# Evaluate Gemfile.local and ~/.gemfile if they exist
6894
extra_gemfiles = [
6995
"#{__FILE__}.local",
70-
File.join(Dir.home, '.gemfile'),
96+
File.join(Dir.home, '.gemfile')
7197
]
7298

7399
extra_gemfiles.each do |gemfile|
74-
if File.file?(gemfile) && File.readable?(gemfile)
75-
eval(File.read(gemfile), binding)
76-
end
100+
next unless File.file?(gemfile) && File.readable?(gemfile)
101+
102+
# rubocop:disable Security/Eval
103+
eval(File.read(gemfile), binding)
104+
# rubocop:enable Security/Eval
77105
end
78106
# vim: syntax=ruby

Rakefile

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,16 @@ require 'puppet-syntax/tasks/puppet-syntax'
77
require 'puppet-strings/tasks' if Gem.loaded_specs.key? 'puppet-strings'
88

99
PuppetLint.configuration.send('disable_relative')
10+
PuppetLint.configuration.send('disable_80chars')
11+
PuppetLint.configuration.send('disable_140chars')
12+
PuppetLint.configuration.send('disable_class_inherits_from_params_class')
13+
PuppetLint.configuration.send('disable_autoloader_layout')
14+
PuppetLint.configuration.send('disable_documentation')
15+
PuppetLint.configuration.send('disable_single_quote_string_with_variables')
16+
PuppetLint.configuration.fail_on_warnings = true
17+
PuppetLint.configuration.ignore_paths = [".vendor/**/*.pp", ".bundle/**/*.pp", "pkg/**/*.pp", "spec/**/*.pp", "tests/**/*.pp", "types/**/*.pp", "vendor/**/*.pp"]
18+
19+
desc "Run PowerShell unit tests"
20+
task :spec_pester do
21+
exec ("powershell -NoProfile -NoLogo -NonInteractive -Command \". spec/run_pester.ps1 -EnableExit\"")
22+
end

0 commit comments

Comments
 (0)