Skip to content

Commit 9349cb9

Browse files
gavindidrichsengavindidrichsen
authored
Merge pull request #142 from puppetlabs/CAT-2394-Puppetcore_update
(CAT-2394) Puppetcore update
2 parents aaa0281 + 9158e5e commit 9349cb9

File tree

10 files changed

+120
-70
lines changed

10 files changed

+120
-70
lines changed

‎.fixtures.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
fixtures:
22
repositories:
33
facts: 'https://github.com/puppetlabs/puppetlabs-facts.git'
4-
puppet_agent:
5-
repo: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
6-
ref: v4.13.0
4+
puppet_agent: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
75
stdlib: https://github.com/puppetlabs/puppetlabs-stdlib.git
86
powershell: https://github.com/puppetlabs/puppetlabs-powershell.git
97
provision: 'https://github.com/puppetlabs/provision.git'

‎.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/nightly.yml‎

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

‎.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: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
---
22
inherit_from: .rubocop_todo.yml
33

4-
require:
4+
plugins:
55
- rubocop-performance
66
- rubocop-rspec
7+
- rubocop-rspec_rails
8+
- rubocop-factory_bot
9+
- rubocop-capybara
710
AllCops:
811
NewCops: enable
912
DisplayCopNames: true
10-
TargetRubyVersion: '2.7'
13+
TargetRubyVersion: 3.1
1114
Include:
1215
- "**/*.rb"
1316
Exclude:
@@ -122,6 +125,12 @@ Capybara/CurrentPathExpectation:
122125
Enabled: false
123126
Capybara/VisibilityMatcher:
124127
Enabled: false
128+
FactoryBot/AttributeDefinedStatically:
129+
Enabled: false
130+
FactoryBot/CreateList:
131+
Enabled: false
132+
FactoryBot/FactoryClassName:
133+
Enabled: false
125134
Gemspec/DuplicatedAssignment:
126135
Enabled: false
127136
Gemspec/OrderedDependencies:
@@ -296,8 +305,6 @@ Performance/UriDefaultParser:
296305
Enabled: false
297306
RSpec/Be:
298307
Enabled: false
299-
RSpec/Capybara/FeatureMethods:
300-
Enabled: false
301308
RSpec/ContainExactly:
302309
Enabled: false
303310
RSpec/ContextMethod:
@@ -306,6 +313,8 @@ RSpec/ContextWording:
306313
Enabled: false
307314
RSpec/DescribeClass:
308315
Enabled: false
316+
RSpec/Dialect:
317+
Enabled: false
309318
RSpec/EmptyHook:
310319
Enabled: false
311320
RSpec/EmptyLineAfterExample:
@@ -322,12 +331,6 @@ RSpec/ExpectChange:
322331
Enabled: false
323332
RSpec/ExpectInHook:
324333
Enabled: false
325-
RSpec/FactoryBot/AttributeDefinedStatically:
326-
Enabled: false
327-
RSpec/FactoryBot/CreateList:
328-
Enabled: false
329-
RSpec/FactoryBot/FactoryClassName:
330-
Enabled: false
331334
RSpec/HooksBeforeExamples:
332335
Enabled: false
333336
RSpec/ImplicitBlockExpectation:
@@ -502,6 +505,12 @@ Capybara/SpecificFinders:
502505
Enabled: false
503506
Capybara/SpecificMatcher:
504507
Enabled: false
508+
FactoryBot/ConsistentParenthesesStyle:
509+
Enabled: false
510+
FactoryBot/FactoryNameStyle:
511+
Enabled: false
512+
FactoryBot/SyntaxMethods:
513+
Enabled: false
505514
Gemspec/DeprecatedAttributeAssignment:
506515
Enabled: false
507516
Gemspec/DevelopmentDependencies:
@@ -602,28 +611,12 @@ RSpec/DuplicatedMetadata:
602611
Enabled: false
603612
RSpec/ExcessiveDocstringSpacing:
604613
Enabled: false
605-
RSpec/FactoryBot/ConsistentParenthesesStyle:
606-
Enabled: false
607-
RSpec/FactoryBot/FactoryNameStyle:
608-
Enabled: false
609-
RSpec/FactoryBot/SyntaxMethods:
610-
Enabled: false
611614
RSpec/IdenticalEqualityAssertion:
612615
Enabled: false
613616
RSpec/NoExpectationExample:
614617
Enabled: false
615618
RSpec/PendingWithoutReason:
616619
Enabled: false
617-
RSpec/Rails/AvoidSetupHook:
618-
Enabled: false
619-
RSpec/Rails/HaveHttpStatus:
620-
Enabled: false
621-
RSpec/Rails/InferredSpecType:
622-
Enabled: false
623-
RSpec/Rails/MinitestAssertions:
624-
Enabled: false
625-
RSpec/Rails/TravelAround:
626-
Enabled: false
627620
RSpec/RedundantAround:
628621
Enabled: false
629622
RSpec/SkipBlockInsideExample:
@@ -634,6 +627,16 @@ RSpec/SubjectDeclaration:
634627
Enabled: false
635628
RSpec/VerifiedDoubleReference:
636629
Enabled: false
630+
RSpecRails/AvoidSetupHook:
631+
Enabled: false
632+
RSpecRails/HaveHttpStatus:
633+
Enabled: false
634+
RSpecRails/InferredSpecType:
635+
Enabled: false
636+
RSpecRails/MinitestAssertions:
637+
Enabled: false
638+
RSpecRails/TravelAround:
639+
Enabled: false
637640
Security/CompoundHash:
638641
Enabled: false
639642
Security/IoMethods:

‎.rubocop_todo.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config`
3-
# on 2024-01-18 06:45:21 UTC using RuboCop version 1.50.0.
3+
# on 2025-11-19 07:48:21 UTC using RuboCop version 1.73.2.
44
# The point is for the user to remove these configuration records
55
# one by one as the offenses are removed from the code base.
66
# Note that changes in the inspected code, or installation of new

‎Gemfile‎

Lines changed: 64 additions & 36 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))
2342
gem "deep_merge", '~> 1.2.2', require: false
2443
gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
25-
gem "facterdb", '~> 2.1', 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))
2646
gem "metadata-json-lint", '~> 4.0', require: false
27-
gem "rspec-puppet-facts", '~> 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))
2850
gem "dependency_checker", '~> 1.0.0', require: false
2951
gem "parallel_tests", '= 3.12.1', require: false
3052
gem "pry", '~> 0.10', require: false
3153
gem "simplecov-console", '~> 0.9', require: false
32-
gem "puppet-debugger", '~> 1.0', require: false
33-
gem "rubocop", '~> 1.50.0', require: false
34-
gem "rubocop-performance", '= 1.16.0', require: false
35-
gem "rubocop-rspec", '= 2.19.0', 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
3661
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
37-
gem "rexml", '>= 3.3.9', require: false
62+
gem "bigdecimal", '< 3.2.2', require: false, platforms: [:mswin, :mingw, :x64_mingw]
3863
end
3964
group :development, :release_prep do
4065
gem "puppet-strings", '~> 4.0', require: false
41-
gem "puppetlabs_spec_helper", '~> 7.0', require: false
66+
gem "puppetlabs_spec_helper", '~> 8.0', require: false
67+
gem "puppet-blacksmith", '~> 7.0', require: false
4268
end
4369
group :system_tests do
44-
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
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?
4572
gem "CFPropertyList", '< 3.0.7', require: false, platforms: [:mswin, :mingw, :x64_mingw]
4673
gem "serverspec", '~> 2.41', require: false
4774
end
4875

49-
puppet_version = ENV['PUPPET_GEM_VERSION']
50-
facter_version = ENV['FACTER_GEM_VERSION']
51-
hiera_version = ENV['HIERA_GEM_VERSION']
52-
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: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,12 @@ 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+

‎metadata.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
"requirements": [
3131
{
3232
"name": "puppet",
33-
"version_requirement": ">= 7.0.0 < 9.0.0"
33+
"version_requirement": ">= 8.0.0 < 9.0.0"
3434
}
3535
],
36-
"pdk-version": "3.2.0",
36+
"pdk-version": "3.5.0",
3737
"template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
38-
"template-ref": "tags/3.2.0.4-0-g5d17ec1"
38+
"template-ref": "tags/3.5.1.2-0-gfa96b82"
3939
}

‎spec/spec_helper.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
begin
2828
require 'deep_merge'
29-
default_facts.deep_merge!(YAML.safe_load(File.read(f), permitted_classes: [], permitted_symbols: [], aliases: true))
29+
default_facts.deep_merge!(YAML.safe_load_file(f, permitted_classes: [], permitted_symbols: [], aliases: true))
3030
rescue StandardError => e
3131
RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
3232
end

0 commit comments

Comments
 (0)