(PA-7897) pdk update --template-ref 3.6.1.1

Notable pdk template changes:

* bumps rubocop to 1.73.x and updates rubocop.yml based on ruby 3.1 target
  version.

* If PUPPET_FORGE_TOKEN env variable is defined, install bolt dependency from
  puppetcore rubygem source. BOLT_GEM_VERSION can also be used to constrain
  the gem, like PUPPET_GEM_VERSION.

* puppet_litmus 1.6.1 added a minimum bolt 4 requirement. Exclude 1.6.1 until
  we're ready for bolt 4 in a separate ticket.

* drops orchestrator_client pin

Author: joshcooper

.rubocop.yml

@@ -1,7 +1,10 @@
 ---
-require:
+plugins:
 - rubocop-performance
 - rubocop-rspec
+- rubocop-rspec_rails
+- rubocop-factory_bot
+- rubocop-capybara
 AllCops:
   NewCops: enable
   DisplayCopNames: true
@@ -123,6 +126,12 @@ Capybara/CurrentPathExpectation:
   Enabled: false
 Capybara/VisibilityMatcher:
   Enabled: false
+FactoryBot/AttributeDefinedStatically:
+  Enabled: false
+FactoryBot/CreateList:
+  Enabled: false
+FactoryBot/FactoryClassName:
+  Enabled: false
 Gemspec/DuplicatedAssignment:
   Enabled: false
 Gemspec/OrderedDependencies:
@@ -297,8 +306,6 @@ Performance/UriDefaultParser:
   Enabled: false
 RSpec/Be:
   Enabled: false
-RSpec/Capybara/FeatureMethods:
-  Enabled: false
 RSpec/ContainExactly:
   Enabled: false
 RSpec/ContextMethod:
@@ -307,6 +314,8 @@ RSpec/ContextWording:
   Enabled: false
 RSpec/DescribeClass:
   Enabled: false
+RSpec/Dialect:
+  Enabled: false
 RSpec/EmptyHook:
   Enabled: false
 RSpec/EmptyLineAfterExample:
@@ -323,12 +332,6 @@ RSpec/ExpectChange:
   Enabled: false
 RSpec/ExpectInHook:
   Enabled: false
-RSpec/FactoryBot/AttributeDefinedStatically:
-  Enabled: false
-RSpec/FactoryBot/CreateList:
-  Enabled: false
-RSpec/FactoryBot/FactoryClassName:
-  Enabled: false
 RSpec/HooksBeforeExamples:
   Enabled: false
 RSpec/ImplicitBlockExpectation:
@@ -503,6 +506,12 @@ Capybara/SpecificFinders:
   Enabled: false
 Capybara/SpecificMatcher:
   Enabled: false
+FactoryBot/ConsistentParenthesesStyle:
+  Enabled: false
+FactoryBot/FactoryNameStyle:
+  Enabled: false
+FactoryBot/SyntaxMethods:
+  Enabled: false
 Gemspec/DeprecatedAttributeAssignment:
   Enabled: false
 Gemspec/DevelopmentDependencies:
@@ -603,28 +612,12 @@ RSpec/DuplicatedMetadata:
   Enabled: false
 RSpec/ExcessiveDocstringSpacing:
   Enabled: false
-RSpec/FactoryBot/ConsistentParenthesesStyle:
-  Enabled: false
-RSpec/FactoryBot/FactoryNameStyle:
-  Enabled: false
-RSpec/FactoryBot/SyntaxMethods:
-  Enabled: false
 RSpec/IdenticalEqualityAssertion:
   Enabled: false
 RSpec/NoExpectationExample:
   Enabled: false
 RSpec/PendingWithoutReason:
   Enabled: false
-RSpec/Rails/AvoidSetupHook:
-  Enabled: false
-RSpec/Rails/HaveHttpStatus:
-  Enabled: false
-RSpec/Rails/InferredSpecType:
-  Enabled: false
-RSpec/Rails/MinitestAssertions:
-  Enabled: false
-RSpec/Rails/TravelAround:
-  Enabled: false
 RSpec/RedundantAround:
   Enabled: false
 RSpec/SkipBlockInsideExample:
@@ -635,6 +628,16 @@ RSpec/SubjectDeclaration:
   Enabled: false
 RSpec/VerifiedDoubleReference:
   Enabled: false
+RSpecRails/AvoidSetupHook:
+  Enabled: false
+RSpecRails/HaveHttpStatus:
+  Enabled: false
+RSpecRails/InferredSpecType:
+  Enabled: false
+RSpecRails/MinitestAssertions:
+  Enabled: false
+RSpecRails/TravelAround:
+  Enabled: false
 Security/CompoundHash:
   Enabled: false
 Security/IoMethods:

.sync.yml

@@ -29,17 +29,9 @@ Gemfile:
       - gem: beaker-module_install_helper
       - gem: beaker-puppet_install_helper
       - gem: nokogiri
-      - gem: 'bolt'
-        version: '~> 3.0'
-        condition: 'ENV["GEM_BOLT"]'
       - gem: 'beaker-task_helper'
         version: '~> 1.9'
         condition: 'ENV["GEM_BOLT"]'
-      # The Faraday requirements in orchestrator_client 0.7.1 causes Bundler to
-      # resolve the dependency in unexpected ways and causes issues in CI
-      - gem: 'orchestrator_client'
-        version: '< 0.7.1'
-        condition: 'ENV["GEM_BOLT"]'
     ":system_tests":
       - gem: voxpupuli-acceptance
         version: '~> 3'

Gemfile

@@ -52,9 +52,13 @@ group :development do
   gem "pry", '~> 0.10',                                                                      require: false
   gem "simplecov-console", '~> 0.9',                                                         require: false
   gem "puppet-debugger", '~> 1.6',                                                           require: false
-  gem "rubocop", '~> 1.50.0',                                                                require: false
-  gem "rubocop-performance", '= 1.16.0',                                                     require: false
-  gem "rubocop-rspec", '= 2.19.0',                                                           require: false
+  gem "rubocop", '~> 1.73.0',                                                                require: false
+  gem "rubocop-performance", '~> 1.24.0',                                                    require: false
+  gem "rubocop-rspec", '~> 3.5.0',                                                           require: false
+  gem "rubocop-rspec_rails", '~> 2.31.0',                                                    require: false
+  gem "rubocop-factory_bot", '~> 2.27.0',                                                    require: false
+  gem "rubocop-capybara", '~> 2.22.0',                                                       require: false
+  gem "rubocop-ast", '< 1.43.0',                                                             require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "rb-readline", '= 0.5.5',                                                              require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "bigdecimal", '< 3.2.2',                                                               require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 6.0')
@@ -65,9 +69,7 @@ group :development do
   gem "beaker-module_install_helper",                                                        require: false
   gem "beaker-puppet_install_helper",                                                        require: false
   gem "nokogiri",                                                                            require: false
-  gem "bolt", '~> 3.0',                                                                      require: false if ENV["GEM_BOLT"]
   gem "beaker-task_helper", '~> 1.9',                                                        require: false if ENV["GEM_BOLT"]
-  gem "orchestrator_client", '< 0.7.1',                                                      require: false if ENV["GEM_BOLT"]
 end
 group :development, :release_prep do
   gem "puppet-strings", '~> 4.0',         require: false
@@ -76,17 +78,19 @@ group :development, :release_prep do
 end
 group :system_tests do
   gem "puppet_litmus", '~> 2.0',             require: false, platforms: [:ruby, :x64_mingw] if !ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
-  gem "puppet_litmus", '~> 1.0',             require: false, platforms: [:ruby, :x64_mingw] if ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
+  gem "puppet_litmus", '~> 1.0', '!= 1.6.1', require: false, platforms: [:ruby, :x64_mingw] if ENV["PUPPET_FORGE_TOKEN"].to_s.empty?
   gem "CFPropertyList", '< 3.0.7',           require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "serverspec", '~> 2.41',               require: false
   gem "voxpupuli-acceptance", '~> 3',        require: false
 end
 
 gems = {}
+bolt_version = ENV.fetch('BOLT_GEM_VERSION', nil)
 puppet_version = ENV.fetch('PUPPET_GEM_VERSION', nil)
 facter_version = ENV.fetch('FACTER_GEM_VERSION', nil)
 hiera_version = ENV.fetch('HIERA_GEM_VERSION', nil)
 
+gems['bolt'] = location_for(bolt_version, nil, { source: gemsource_puppetcore })
 gems['puppet'] = location_for(puppet_version, nil, { source: gemsource_puppetcore })
 gems['facter'] = location_for(facter_version, nil, { source: gemsource_puppetcore })
 gems['hiera'] = location_for(hiera_version, nil, {}) if hiera_version

lib/facter/env_temp_variable.rb

@@ -2,6 +2,6 @@
 
 Facter.add(:env_temp_variable) do
   setcode do
-    (ENV['TEMP'] || Dir.tmpdir)
+    ENV['TEMP'] || Dir.tmpdir
   end
 end

metadata.json

@@ -83,6 +83,6 @@
     }
   ],
   "pdk-version": "3.6.1",
-  "template-url": "https://github.com/puppetlabs/pdk-templates#3.5.1",
-  "template-ref": "tags/3.5.1-0-g9d5b193"
+  "template-url": "https://github.com/puppetlabs/pdk-templates#3.6.1.1",
+  "template-ref": "tags/3.6.1.1-0-g5fe78cc"
 }

spec/spec_helper.rb

@@ -27,7 +27,7 @@
 
   begin
     require 'deep_merge'
-    default_facts.deep_merge!(YAML.safe_load(File.read(f), permitted_classes: [], permitted_symbols: [], aliases: true))
+    default_facts.deep_merge!(YAML.safe_load_file(f, permitted_classes: [], permitted_symbols: [], aliases: true))
   rescue StandardError => e
     RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
   end

spec/spec_helper_local.rb

@@ -1,4 +1,4 @@
-location = File.expand_path('/dev/null')
+location = File::NULL
 
 @default_module_facts = {
   aio_agent_version: '5.5.10',

spec/unit/facter/settings_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'settings' do
-  let(:location) { File.expand_path('/dev/null') }
+  let(:location) { File::NULL }
 
   describe 'puppet_digest_algorithm fact' do
     subject { Facter.fact(:puppet_digest_algorithm).value }