From: sanfrancrisko <55992494+sanfrancrisko@users.noreply.github.com> Date: Thu, 14 May 2020 09:14:28 +0000 (+0100) Subject: Merge pull request #933 from puppetlabs/pdksync_PDK_UPDATE X-Git-Tag: v7.4.2~2 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=15a9db1d198f727ea78aac7ecec483a3b00b9165;hp=2df4e59aad25864f7d674f598d95628f68dfd4e1;p=puppet-modules%2Fpuppetlabs-apt.git Merge pull request #933 from puppetlabs/pdksync_PDK_UPDATE pdksync - (maint) - Pdk Update --- diff --git a/.rubocop.yml b/.rubocop.yml index 33688a7..2006754 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 6177782..2f1e4f7 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/metadata.json b/metadata.json index e370dab..6018278 100644 --- a/metadata.json +++ b/metadata.json @@ -42,6 +42,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 bc023f5..16764b6 100644 --- 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