Skip to content

Commit 6fd4be2

Browse files
pdk update
1 parent 87a1354 commit 6fd4be2

File tree

5 files changed

+41
-16
lines changed

5 files changed

+41
-16
lines changed

.puppet-lint.rc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
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
210
--no-anchor_resource-check
311
--no-params_empty_string_assignment-check

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require:
66
AllCops:
77
NewCops: enable
88
DisplayCopNames: true
9-
TargetRubyVersion: '2.6'
9+
TargetRubyVersion: 3.1
1010
Include:
1111
- "**/*.rb"
1212
Exclude:

Gemfile

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,35 @@ def location_for(place_or_version, fake_version = nil)
1414
end
1515

1616
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))
2017
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))
2118
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))
2219
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))
2320
gem "deep_merge", '~> 1.2.2', require: false
2421
gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
25-
gem "facterdb", '~> 2.1', require: false
22+
gem "facterdb", '~> 2.1', require: false if Gem::Requirement.create(['< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
23+
gem "facterdb", '~> 3.0', require: false if Gem::Requirement.create(['>= 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2624
gem "metadata-json-lint", '~> 4.0', require: false
27-
gem "rspec-puppet-facts", '~> 4.0', require: false
25+
gem "json-schema", '< 5.1.1', require: false
26+
gem "rspec-puppet-facts", '~> 4.0', require: false if Gem::Requirement.create(['< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
27+
gem "rspec-puppet-facts", '~> 5.0', require: false if Gem::Requirement.create(['>= 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
2828
gem "dependency_checker", '~> 1.0.0', require: false
2929
gem "parallel_tests", '= 3.12.1', require: false
3030
gem "pry", '~> 0.10', require: false
3131
gem "simplecov-console", '~> 0.9', require: false
32-
gem "puppet-debugger", '~> 1.0', require: false
32+
gem "puppet-debugger", '~> 1.6', require: false
3333
gem "rubocop", '~> 1.50.0', require: false
3434
gem "rubocop-performance", '= 1.16.0', require: false
3535
gem "rubocop-rspec", '= 2.19.0', require: false
3636
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
37-
gem "rexml", '>= 3.3.9', require: false
37+
gem "bigdecimal", '< 3.2.2', require: false, platforms: [:mswin, :mingw, :x64_mingw]
3838
end
3939
group :development, :release_prep do
4040
gem "puppet-strings", '~> 4.0', require: false
41-
gem "puppetlabs_spec_helper", '~> 7.0', require: false
41+
gem "puppetlabs_spec_helper", '~> 8.0', require: false
4242
end
4343
group :system_tests do
44-
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
44+
gem "puppet_litmus", '~> 2.0', require: false, platforms: [:ruby, :x64_mingw] if !ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
45+
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw] if ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
4546
gem "CFPropertyList", '< 3.0.7', require: false, platforms: [:mswin, :mingw, :x64_mingw]
4647
gem "serverspec", '~> 2.41', require: false
4748
end
@@ -52,12 +53,20 @@ hiera_version = ENV['HIERA_GEM_VERSION']
5253

5354
gems = {}
5455

55-
gems['puppet'] = location_for(puppet_version)
56+
puppet_version = ENV.fetch('PUPPET_GEM_VERSION', nil)
57+
facter_version = ENV.fetch('FACTER_GEM_VERSION', nil)
58+
hiera_version = ENV.fetch('HIERA_GEM_VERSION', nil)
5659

57-
# If facter or hiera versions have been specified via the environment
58-
# variables
60+
# If PUPPET_FORGE_TOKEN is set then use authenticated source for both puppet and facter, since facter is a transitive dependency of puppet
61+
# Otherwise, do as before and use location_for to fetch gems from the default source
62+
if !ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
63+
gems['puppet'] = ['~> 8.11', { require: false, source: 'https://rubygems-puppetcore.puppet.com' }]
64+
gems['facter'] = ['~> 4.11', { require: false, source: 'https://rubygems-puppetcore.puppet.com' }]
65+
else
66+
gems['puppet'] = location_for(puppet_version)
67+
gems['facter'] = location_for(facter_version) if facter_version
68+
end
5969

60-
gems['facter'] = location_for(facter_version) if facter_version
6170
gems['hiera'] = location_for(hiera_version) if hiera_version
6271

6372
gems.each do |gem_name, gem_params|

Rakefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,11 @@ require 'puppet-strings/tasks' if Gem.loaded_specs.key? 'puppet-strings'
99
PuppetLint.configuration.send('disable_relative')
1010
PuppetLint.configuration.send('disable_anchor_resource')
1111
PuppetLint.configuration.send('disable_params_empty_string_assignment')
12+
PuppetLint.configuration.send('disable_80chars')
13+
PuppetLint.configuration.send('disable_140chars')
14+
PuppetLint.configuration.send('disable_class_inherits_from_params_class')
15+
PuppetLint.configuration.send('disable_autoloader_layout')
16+
PuppetLint.configuration.send('disable_documentation')
17+
PuppetLint.configuration.send('disable_single_quote_string_with_variables')
18+
PuppetLint.configuration.fail_on_warnings = true
19+
PuppetLint.configuration.ignore_paths = [".vendor/**/*.pp", ".bundle/**/*.pp", "pkg/**/*.pp", "spec/**/*.pp", "tests/**/*.pp", "types/**/*.pp", "vendor/**/*.pp"]

metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
}
2929
],
3030
"description": "MySQL module",
31+
"pdk-version": "3.5.0 (ga43db72)",
3132
"template-url": "https://github.com/puppetlabs/pdk-templates#main",
32-
"template-ref": "tags/3.2.0.4-0-g5d17ec1",
33-
"pdk-version": "3.2.0"
33+
"template-ref": "heads/main-0-g11c0f3d"
3434
}

0 commit comments

Comments
 (0)