Skip to content

Commit 2e7beb5

Browse files
Ramesh7Ramesh7
committed
PDK update
1 parent 06fed75 commit 2e7beb5

File tree

8 files changed

+39
-123
lines changed

8 files changed

+39
-123
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/log/
1717
/pkg/
1818
/spec/fixtures/manifests/
19-
/spec/fixtures/modules/
19+
/spec/fixtures/modules/*
2020
/tmp/
2121
/vendor/
2222
/convert_report.txt

‎.pdkignore

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/log/
1717
/pkg/
1818
/spec/fixtures/manifests/
19-
/spec/fixtures/modules/
19+
/spec/fixtures/modules/*
2020
/tmp/
2121
/vendor/
2222
/convert_report.txt
@@ -26,21 +26,17 @@
2626
.envrc
2727
/inventory.yaml
2828
/spec/fixtures/litmus_inventory.yaml
29-
/appveyor.yml
30-
/.editorconfig
3129
/.fixtures.yml
3230
/Gemfile
3331
/.gitattributes
3432
/.github/
3533
/.gitignore
36-
/.gitlab-ci.yml
3734
/.pdkignore
3835
/.puppet-lint.rc
3936
/Rakefile
4037
/rakelib/
4138
/.rspec
42-
/.rubocop.yml
43-
/.travis.yml
39+
/..yml
4440
/.yardopts
4541
/spec/
4642
/.vscode/

‎.sync.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44
appveyor.yml:
55
delete: true
66

7-
Gemfile:
8-
optional:
9-
":development":
10-
- gem: github_changelog_generator
11-
version: '= 1.15.2'
127
spec/spec_helper.rb:
138
mock_with: ":rspec"
149
coverage_report: true

‎Gemfile

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,36 @@ 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))
20-
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))
21-
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))
22-
gem "voxpupuli-puppet-lint-plugins", '~> 4.0', require: false
23-
gem "facterdb", '~> 1.18', require: false
24-
gem "metadata-json-lint", '>= 2.0.2', '< 4.0.0', require: false
25-
gem "puppetlabs_spec_helper", '~> 5.0', require: false
26-
gem "rspec-puppet-facts", '~> 2.0', require: false
27-
gem "codecov", '~> 0.2', require: false
28-
gem "dependency_checker", '~> 0.2', require: false
29-
gem "parallel_tests", '= 3.12.1', require: false
30-
gem "pry", '~> 0.10', require: false
31-
gem "simplecov-console", '~> 0.5', require: false
32-
gem "puppet-debugger", '~> 1.0', require: false
33-
gem "rubocop", '= 1.48.1', require: false
34-
gem "rubocop-performance", '= 1.16.0', require: false
35-
gem "rubocop-rspec", '= 2.19.0', require: false
36-
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
37-
gem "github_changelog_generator", '= 1.15.2', require: false
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))
20+
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))
21+
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))
22+
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 "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
29+
gem "dependency_checker", '~> 1.0.0', require: false
30+
gem "parallel_tests", '= 3.12.1', require: false
31+
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
38+
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
3839
end
3940
group :system_tests do
4041
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
41-
gem "serverspec", '~> 2.41', require: false
42+
gem "serverspec", '~> 2.41', require: false
43+
end
44+
group :release_prep do
45+
gem "puppet-strings", '~> 4.0', require: false
46+
gem "puppetlabs_spec_helper", '~> 6.0', require: false
4247
end
4348

4449
puppet_version = ENV['PUPPET_GEM_VERSION']

‎Rakefile

Lines changed: 2 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,9 @@
11
# frozen_string_literal: true
22

33
require 'bundler'
4-
require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any?
4+
require 'puppet_litmus/rake_tasks' if Gem.loaded_specs.key? 'puppet_litmus'
55
require 'puppetlabs_spec_helper/rake_tasks'
66
require 'puppet-syntax/tasks/puppet-syntax'
7-
require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
8-
require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any?
9-
require 'puppet-strings/tasks' if Bundler.rubygems.find_name('puppet-strings').any?
10-
11-
def changelog_user
12-
return unless Rake.application.top_level_tasks.include? "changelog"
13-
returnVal = nil || JSON.load(File.read('metadata.json'))['author']
14-
raise "unable to find the changelog_user in .sync.yml, or the author in metadata.json" if returnVal.nil?
15-
puts "GitHubChangelogGenerator user:#{returnVal}"
16-
returnVal
17-
end
18-
19-
def changelog_project
20-
return unless Rake.application.top_level_tasks.include? "changelog"
21-
22-
returnVal = nil
23-
returnVal ||= begin
24-
metadata_source = JSON.load(File.read('metadata.json'))['source']
25-
metadata_source_match = metadata_source && metadata_source.match(%r{.*\/([^\/]*?)(?:\.git)?\Z})
26-
27-
metadata_source_match && metadata_source_match[1]
28-
end
29-
30-
raise "unable to find the changelog_project in .sync.yml or calculate it from the source in metadata.json" if returnVal.nil?
31-
32-
puts "GitHubChangelogGenerator project:#{returnVal}"
33-
returnVal
34-
end
35-
36-
def changelog_future_release
37-
return unless Rake.application.top_level_tasks.include? "changelog"
38-
returnVal = "v%s" % JSON.load(File.read('metadata.json'))['version']
39-
raise "unable to find the future_release (version) in metadata.json" if returnVal.nil?
40-
puts "GitHubChangelogGenerator future_release:#{returnVal}"
41-
returnVal
42-
end
7+
require 'puppet-strings/tasks' if Gem.loaded_specs.key? 'puppet-strings'
438

449
PuppetLint.configuration.send('disable_relative')
45-
46-
47-
if Bundler.rubygems.find_name('github_changelog_generator').any?
48-
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
49-
raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?
50-
config.user = "#{changelog_user}"
51-
config.project = "#{changelog_project}"
52-
config.future_release = "#{changelog_future_release}"
53-
config.exclude_labels = ['maintenance']
54-
config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)."
55-
config.add_pr_wo_labels = true
56-
config.issues = false
57-
config.merge_prefix = "### UNCATEGORIZED PRS; LABEL THEM ON GITHUB"
58-
config.configure_sections = {
59-
"Changed" => {
60-
"prefix" => "### Changed",
61-
"labels" => ["backwards-incompatible"],
62-
},
63-
"Added" => {
64-
"prefix" => "### Added",
65-
"labels" => ["enhancement", "feature"],
66-
},
67-
"Fixed" => {
68-
"prefix" => "### Fixed",
69-
"labels" => ["bug", "documentation", "bugfix"],
70-
},
71-
}
72-
end
73-
else
74-
desc 'Generate a Changelog from GitHub'
75-
task :changelog do
76-
raise <<EOM
77-
The changelog tasks depends on recent features of the github_changelog_generator gem.
78-
Please manually add it to your .sync.yml for now, and run `pdk update`:
79-
---
80-
Gemfile:
81-
optional:
82-
':development':
83-
- gem: 'github_changelog_generator'
84-
version: '~> 1.15'
85-
condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')"
86-
EOM
87-
end
88-
end
89-

‎metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,6 @@
8181
}
8282
],
8383
"template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
84-
"template-ref": "heads/main-0-gc6d4446",
85-
"pdk-version": "2.7.1"
84+
"template-ref": "heads/main-0-g79a2f93",
85+
"pdk-version": "3.0.0"
8686
}

‎spec/default_facts.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Facts specified here will override the values provided by rspec-puppet-facts.
44
---
55
networking:
6-
ip: "172.16.254.254"
7-
ip6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA"
8-
mac: "AA:AA:AA:AA:AA:AA"
6+
ip: "172.16.254.254"
7+
ip6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA"
8+
mac: "AA:AA:AA:AA:AA:AA"
99
is_pe: false

‎spec/spec_helper.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
default_facts = {
1515
puppetversion: Puppet.version,
16-
facterversion: Facter.version
16+
facterversion: Facter.version,
1717
}
1818

1919
default_fact_files = [
@@ -25,7 +25,7 @@
2525
next unless File.exist?(f) && File.readable?(f) && File.size?(f)
2626

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

0 commit comments

Comments
 (0)