Merge pull request #1169 from puppetlabs/pdksync_PDK_UPDATE

sheenaajay · web-flow · commit e4232da26ffe · 2020-05-14T12:00:22.000+01:00
pdksync - (maint) - Pdk Update
diff --git 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
@@ -1,6 +1,6 @@
 {
   "recommendations": [
-    "jpogran.puppet-vscode",
+    "puppet.puppet-vscode",
     "rebornix.Ruby"
   ]
 }
diff --git a/metadata.json b/metadata.json
@@ -88,5 +88,5 @@
   ],
   "pdk-version": "1.17.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates#master",
-  "template-ref": "1.17.0-0-gd3a4319"
+  "template-ref": "heads/master-0-g095317c"
 }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -42,6 +42,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

Original file line number	Diff line number	Diff line change
`@@ -88,5 +88,5 @@`
`88`	`88`	`],`
`89`	`89`	`"pdk-version": "1.17.0",`
`90`	`90`	`"template-url": "https://github.com/puppetlabs/pdk-templates#master",`
`91`		`- "template-ref": "1.17.0-0-gd3a4319"`
	`91`	`+ "template-ref": "heads/master-0-g095317c"`
`92`	`92`	`}`