Skip to content

Commit fc5d64c

Browse files
committed
Pdk update to 3.4.0
1 parent 8036a6e commit fc5d64c

7 files changed

+40
-12
lines changed

.gitignore

+7
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,19 @@
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
/.vscode/
3037
/.devcontainer/

.pdkignore

+7
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

+8
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

.sync.yml

-2
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,3 @@ Gemfile:
2424
optional:
2525
':system_tests':
2626
- gem: 'voxpupuli-acceptance'
27-
':release':
28-
- gem: 'puppet-blacksmith'

Gemfile

+6-7
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ group :development do
2020
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))
2121
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))
2222
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))
23-
gem "deep_merge", '~> 1.0', require: false
23+
gem "deep_merge", '~> 1.2.2', require: false
2424
gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
25-
gem "facterdb", '~> 1.18', require: false
25+
gem "facterdb", '~> 2.1', require: false
2626
gem "metadata-json-lint", '~> 4.0', require: false
27-
gem "rspec-puppet-facts", '~> 3.0', require: false
27+
gem "rspec-puppet-facts", '~> 4.0', require: false
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
@@ -34,20 +34,19 @@ group :development do
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.0.0', '< 3.2.7', require: false
3738
end
3839
group :development, :release_prep do
3940
gem "puppet-strings", '~> 4.0', require: false
40-
gem "puppetlabs_spec_helper", '~> 7.0', require: false
41+
gem "puppetlabs_spec_helper", '~> 8.0', require: false
42+
gem "puppet-blacksmith", '~> 7.0', require: false
4143
end
4244
group :system_tests do
4345
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
4446
gem "CFPropertyList", '< 3.0.7', require: false, platforms: [:mswin, :mingw, :x64_mingw]
4547
gem "serverspec", '~> 2.41', require: false
4648
gem "voxpupuli-acceptance", require: false
4749
end
48-
group :release do
49-
gem "puppet-blacksmith", require: false
50-
end
5150

5251
puppet_version = ENV['PUPPET_GEM_VERSION']
5352
facter_version = ENV['FACTER_GEM_VERSION']

Rakefile

+9
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

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
"version_requirement": ">= 7.24 < 9.0.0"
7979
}
8080
],
81-
"pdk-version": "3.2.0",
82-
"template-url": "pdk-default#3.2.0",
83-
"template-ref": "tags/3.2.0-0-gb257ef1"
81+
"pdk-version": "3.4.0",
82+
"template-url": "pdk-default#3.4.0",
83+
"template-ref": "tags/3.4.0-0-gd3cc13f"
8484
}

0 commit comments

Comments
 (0)