Skip to content

Commit 0c2d67e

Browse files
LukasAudLukasAud
authored
Merge pull request #580 from puppetlabs/CAT-2396
(CAT-2396) Prepare module for Puppetcore / Drop Support for Puppet 7
2 parents 5717abd + fdd7e07 commit 0c2d67e

File tree

14 files changed

+135
-85
lines changed

14 files changed

+135
-85
lines changed

‎.fixtures.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ fixtures:
55
archive: "https://github.com/voxpupuli/puppet-archive.git"
66
augeas_core: "https://github.com/puppetlabs/puppetlabs-augeas_core.git"
77
facts: 'https://github.com/puppetlabs/puppetlabs-facts.git'
8-
puppet_agent:
9-
repo: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
10-
ref: v4.21.0
8+
puppet_agent: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
119
provision: 'https://github.com/puppetlabs/provision.git'
1210

1311
symlinks:

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ jobs:
1414
Acceptance:
1515
needs: Spec
1616
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
17-
secrets: "inherit"
1817
with:
19-
runs_on: "ubuntu-24.04"
18+
flags: "--nightly --platform-exclude centos-7 --platform-exclude oraclelinux-7 --platform-exclude scientific-7"
19+
secrets: "inherit"

‎.github/workflows/nightly.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ jobs:
1313
Acceptance:
1414
needs: Spec
1515
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
16-
secrets: "inherit"
1716
with:
18-
runs_on: "ubuntu-24.04"
17+
flags: "--nightly --platform-exclude centos-7 --platform-exclude oraclelinux-7 --platform-exclude scientific-7"
18+
secrets: "inherit"

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
workflow_dispatch:
55

66
jobs:
7-
release:
8-
name: "Release"
7+
release:
98
uses: "puppetlabs/cat-github-actions/.github/workflows/module_release.yml@main"
109
secrets: "inherit"

‎.puppet-lint.rc‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,9 @@
1+
--fail-on-warnings
12
--relative
2-
--ignore-paths=examples/*.pp,vendor/**/*.pp,bundle/**/*.pp,pkg/**/*.pp,spec/**/*.pp
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,examples/*.pp,bundle/**/*.pp

‎.rubocop.yml‎

Lines changed: 29 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.6'
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:
@@ -601,28 +610,12 @@ RSpec/DuplicatedMetadata:
601610
Enabled: false
602611
RSpec/ExcessiveDocstringSpacing:
603612
Enabled: false
604-
RSpec/FactoryBot/ConsistentParenthesesStyle:
605-
Enabled: false
606-
RSpec/FactoryBot/FactoryNameStyle:
607-
Enabled: false
608-
RSpec/FactoryBot/SyntaxMethods:
609-
Enabled: false
610613
RSpec/IdenticalEqualityAssertion:
611614
Enabled: false
612615
RSpec/NoExpectationExample:
613616
Enabled: false
614617
RSpec/PendingWithoutReason:
615618
Enabled: false
616-
RSpec/Rails/AvoidSetupHook:
617-
Enabled: false
618-
RSpec/Rails/HaveHttpStatus:
619-
Enabled: false
620-
RSpec/Rails/InferredSpecType:
621-
Enabled: false
622-
RSpec/Rails/MinitestAssertions:
623-
Enabled: false
624-
RSpec/Rails/TravelAround:
625-
Enabled: false
626619
RSpec/RedundantAround:
627620
Enabled: false
628621
RSpec/SkipBlockInsideExample:
@@ -633,6 +626,16 @@ RSpec/SubjectDeclaration:
633626
Enabled: false
634627
RSpec/VerifiedDoubleReference:
635628
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
636639
Security/CompoundHash:
637640
Enabled: false
638641
Security/IoMethods:

‎.rubocop_todo.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config`
3-
# on 2023-11-28 17:42:38 UTC using RuboCop version 1.48.1.
3+
# on 2025-10-01 10:09:02 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
77
# versions of RuboCop, may require this file to be generated again.
88

9+
# Offense count: 4
10+
RSpec/ExpectInLet:
11+
Exclude:
12+
- 'spec/defines/config/server/service_spec.rb'
13+
914
# Offense count: 128
1015
# Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
1116
# SupportedStyles: always, named_only

‎Gemfile‎

Lines changed: 62 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,105 @@
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
gem "rspec-retry", '= 0.4.5', require: false, platforms: [:ruby]
3964
end
4065
group :development, :release_prep do
4166
gem "puppet-strings", '~> 4.0', require: false
42-
gem "puppetlabs_spec_helper", '~> 7.0', require: false
67+
gem "puppetlabs_spec_helper", '~> 8.0', require: false
68+
gem "puppet-blacksmith", '~> 7.0', require: false
4369
end
4470
group :system_tests do
45-
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
71+
gem "puppet_litmus", '~> 2.0', require: false, platforms: [:ruby, :x64_mingw] if !ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
72+
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw] if ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
4673
gem "CFPropertyList", '< 3.0.7', require: false, platforms: [:mswin, :mingw, :x64_mingw]
4774
gem "serverspec", '~> 2.41', require: false
4875
end
4976

50-
puppet_version = ENV['PUPPET_GEM_VERSION']
51-
facter_version = ENV['FACTER_GEM_VERSION']
52-
hiera_version = ENV['HIERA_GEM_VERSION']
53-
5477
gems = {}
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)
5581

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

86+
# Generate the gem definitions
87+
print_gem_statement_for(gems) if ENV['DEBUG']
6488
gems.each do |gem_name, gem_params|
6589
gem gem_name, *gem_params
6690
end
6791

6892
# Evaluate Gemfile.local and ~/.gemfile if they exist
6993
extra_gemfiles = [
7094
"#{__FILE__}.local",
71-
File.join(Dir.home, '.gemfile'),
95+
File.join(Dir.home, '.gemfile')
7296
]
7397

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

‎Rakefile‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +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.ignore_paths = ["examples/*.pp", "vendor/**/*.pp", "bundle/**/*.pp", "pkg/**/*.pp", "spec/**/*.pp"]
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", "examples/*.pp", "bundle/**/*.pp"]
18+

‎metadata.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
},
1919
{
2020
"name": "puppet/archive",
21-
"version_requirement": ">= 1.0.0 < 8.0.0"
21+
"version_requirement": ">= 1.0.0 < 9.0.0"
2222
}
2323
],
2424
"operatingsystem_support": [
@@ -88,10 +88,10 @@
8888
"requirements": [
8989
{
9090
"name": "puppet",
91-
"version_requirement": ">= 7.0.0 < 9.0.0"
91+
"version_requirement": ">= 8.0.0 < 9.0.0"
9292
}
9393
],
9494
"template-url": "https://github.com/puppetlabs/pdk-templates#main",
95-
"pdk-version": "3.2.0",
96-
"template-ref": "tags/3.2.0.4-0-g5d17ec1"
95+
"pdk-version": "3.5.0 (ga43db72)",
96+
"template-ref": "heads/main-0-g5c7dd04"
9797
}

0 commit comments

Comments
 (0)