(maint) - Pdk Update

diff --git a/.rubocop.yml b/.rubocop.yml
index bab25db5361fca376f4282262de0554e2f2338d2..5307849e376e270f0305e6c7eed74e0b6f7a1242 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -40,6 +40,10 @@ Style/BlockDelimiters:
   Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to
     be consistent then.
   EnforcedStyle: braces_for_chaining
+Style/BracesAroundHashParameters:
+  Description: Braces are required by Ruby 2.7. Cop removed from RuboCop v0.80.0.
+    See https://github.com/rubocop-hq/rubocop/pull/7643
+  Enabled: true
 Style/ClassAndModuleChildren:
   Description: Compact style reduces the required amount of indentation.
   EnforcedStyle: compact

diff --git a/.travis.yml b/.travis.yml
index 764ec5a0eda8bf88768a18ae14db6d58719dd9da..c03acf40a5164cf5d5f4e1075d9c42808797e29a 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,6 @@ jobs:
       - "bundle exec rake 'litmus:provision_list[travis_deb]'"
       - "bundle exec rake 'litmus:install_agent[puppet5]'"
       - "bundle exec rake litmus:install_module"
-      dist: trusty
       bundler_args:
       env: PLATFORMS=travis_deb_puppet5
       rvm: 2.5.7
@@ -44,7 +43,6 @@ jobs:
       - "bundle exec rake 'litmus:provision_list[travis_ub]'"
       - "bundle exec rake 'litmus:install_agent[puppet5]'"
       - "bundle exec rake litmus:install_module"
-      dist: trusty
       bundler_args:
       env: PLATFORMS=travis_ub_puppet5
       rvm: 2.5.7
@@ -56,7 +54,6 @@ jobs:
       - "bundle exec rake 'litmus:provision_list[travis_el7]'"
       - "bundle exec rake 'litmus:install_agent[puppet5]'"
       - "bundle exec rake litmus:install_module"
-      dist: trusty
       bundler_args:
       env: PLATFORMS=travis_el7_puppet5
       rvm: 2.5.7
@@ -68,7 +65,6 @@ jobs:
       - "bundle exec rake 'litmus:provision_list[travis_deb]'"
       - "bundle exec rake 'litmus:install_agent[puppet6]'"
       - "bundle exec rake litmus:install_module"
-      dist: trusty
       bundler_args:
       env: PLATFORMS=travis_deb_puppet6
       rvm: 2.5.7
@@ -80,7 +76,6 @@ jobs:
       - "bundle exec rake 'litmus:provision_list[travis_ub]'"
       - "bundle exec rake 'litmus:install_agent[puppet6]'"
       - "bundle exec rake litmus:install_module"
-      dist: trusty
       bundler_args:
       env: PLATFORMS=travis_ub_puppet6
       rvm: 2.5.7
@@ -92,7 +87,6 @@ jobs:
       - "bundle exec rake 'litmus:provision_list[travis_el7]'"
       - "bundle exec rake 'litmus:install_agent[puppet6]'"
       - "bundle exec rake litmus:install_module"
-      dist: trusty
       bundler_args:
       env: PLATFORMS=travis_el7_puppet6
       rvm: 2.5.7

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 6177782746993899cff3bba9ca165f39f9d4004e..2f1e4f73a56f0d7cec69242da71c204461ceeee5 100644 (file)
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,6 +1,6 @@
 {
   "recommendations": [
-    "jpogran.puppet-vscode",
+    "puppet.puppet-vscode",
     "rebornix.Ruby"
   ]
 }

diff --git a/Gemfile b/Gemfile
index adbbe6d0a419c8939aebd2e2500a82689f8e76a2..4f6e33b02da9fa39c2b829963894287d9b4f96f4 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -29,8 +29,6 @@ group :development do
   gem "puppet-module-win-default-r#{minor_version}", '~> 0.4',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
   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')
-  gem 'ed25519', '>= 1.2', '< 2.0'
-  gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0'
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']

diff --git a/metadata.json b/metadata.json
index ad78d24e5abd5c7f7a57a945cdc9c6c0da8838cb..0b8b8304c21b0c0c446f06b054545bc260760fe5 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -78,6 +78,6 @@
     }
   ],
   "template-url": "https://github.com/puppetlabs/pdk-templates#master",
-  "template-ref": "1.17.0-0-gd3a4319",
+  "template-ref": "heads/master-0-g095317c",
   "pdk-version": "1.17.0"
 }

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index bc023f51affdd6ac272aeb1b58ae847fd8213304..16764b6ff147ab99bf87cf2f9a86af7fdb864ac2 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -42,6 +42,7 @@ RSpec.configure do |c|
     # set to strictest setting for testing
     # by default Puppet runs at warning level
     Puppet.settings[:strict] = :warning
+    Puppet.settings[:strict_variables] = true
   end
   c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT']
   c.after(:suite) do