From 6a7347b894ec33ee2ef07a34799aacd21b2e93fc Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.co.uk>
Date: Tue, 12 May 2020 15:39:48 +0100
Subject: [PATCH 1/2] (maint) - Pdk Update

---
 .rubocop.yml            | 4 ++++
 .vscode/extensions.json | 2 +-
 Gemfile                 | 2 --
 metadata.json           | 2 +-
 spec/spec_helper.rb     | 1 +
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 33688a79e..200675437 100644
--- 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/.vscode/extensions.json b/.vscode/extensions.json
index 617778274..2f1e4f73a 100644
--- 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 5e7cd45ff..eb8fb9455 100644
--- a/Gemfile
+++ b/Gemfile
@@ -30,8 +30,6 @@ group :development do
   gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-lint-i18n",                                        require: false
   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 57a64df70..57cdf36e0 100644
--- a/metadata.json
+++ b/metadata.json
@@ -84,6 +84,6 @@
   ],
   "description": "MySQL module",
   "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 1fbf08018..4ee263f9e 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -38,6 +38,7 @@
     # 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

From d6c5363cef9831dd9e0ddc70515127d61e610bba Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Wed, 13 May 2020 10:39:03 +0100
Subject: [PATCH 2/2] (maint) - add back gems removed by pdk update

---
 Gemfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Gemfile b/Gemfile
index eb8fb9455..5e7cd45ff 100644
--- a/Gemfile
+++ b/Gemfile
@@ -30,6 +30,8 @@ group :development do
   gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-lint-i18n",                                        require: false
   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']