Skip to content

Commit 6a7347b

Browse files
author
David Swan
committed
(maint) - Pdk Update
1 parent db30274 commit 6a7347b

File tree

5 files changed

+7
-4
lines changed

5 files changed

+7
-4
lines changed

.rubocop.yml

+4
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ Style/BlockDelimiters:
4040
Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to
4141
be consistent then.
4242
EnforcedStyle: braces_for_chaining
43+
Style/BracesAroundHashParameters:
44+
Description: Braces are required by Ruby 2.7. Cop removed from RuboCop v0.80.0.
45+
See https://github.com/rubocop-hq/rubocop/pull/7643
46+
Enabled: true
4347
Style/ClassAndModuleChildren:
4448
Description: Compact style reduces the required amount of indentation.
4549
EnforcedStyle: compact

.vscode/extensions.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"recommendations": [
3-
"jpogran.puppet-vscode",
3+
"puppet.puppet-vscode",
44
"rebornix.Ruby"
55
]
66
}

Gemfile

-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ group :development do
3030
gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw]
3131
gem "puppet-lint-i18n", require: false
3232
gem "github_changelog_generator", require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
33-
gem 'ed25519', '>= 1.2', '< 2.0'
34-
gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0'
3533
end
3634

3735
puppet_version = ENV['PUPPET_GEM_VERSION']

metadata.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,6 @@
8484
],
8585
"description": "MySQL module",
8686
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
87-
"template-ref": "1.17.0-0-gd3a4319",
87+
"template-ref": "heads/master-0-g095317c",
8888
"pdk-version": "1.17.0"
8989
}

spec/spec_helper.rb

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
# set to strictest setting for testing
3939
# by default Puppet runs at warning level
4040
Puppet.settings[:strict] = :warning
41+
Puppet.settings[:strict_variables] = true
4142
end
4243
c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT']
4344
c.after(:suite) do

0 commit comments

Comments
 (0)