(PE-42498) Update to support Bolt v5

Author: davidmalloncares

.github/workflows/test-add-compiler-matrix.yml

@@ -32,6 +32,8 @@ jobs:
       BOLT_GEM: true
       BOLT_DISABLE_ANALYTICS: true
       LANG: en_US.UTF-8
+      PUPPET_FORGE_TOKEN: ${{ secrets.PUPPET_FORGE_API_TOKEN }}
+      BUNDLE_RUBYGEMS___PUPPETCORE__PUPPET__COM: forge-key:${{ secrets.PUPPET_FORGE_API_TOKEN }}
     strategy:
       fail-fast: false
       matrix:

Gemfile

@@ -38,7 +38,7 @@ group :development do
   gem "rubocop-factory_bot", '~> 2.27.1',        require: false
   gem "rubocop-capybara", '~> 2.22.1',           require: false
   gem "rb-readline", '= 0.5.5',                  require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "bolt", '>= 4.0.0',                        require: false
+  #gem "bolt", '>= 4.0.0',                        require: false
   gem "github_changelog_generator", '1.16.4',    require: false
   gem "octokit", '4.21.0',                       require: false
   gem "orchestrator_client", '< 0.7.1',          require: false
@@ -55,14 +55,24 @@ end
 puppet_version = ENV['PUPPET_GEM_VERSION']
 facter_version = ENV['FACTER_GEM_VERSION']
 hiera_version = ENV['HIERA_GEM_VERSION']
+bolt_version = ENV.fetch('BOLT_GEM_VERSION', nil)
 
 gems = {}
 
-gems['puppet'] = location_for(puppet_version)
+# If PUPPET_FORGE_TOKEN is set then use authenticated source for both puppet and facter, since facter is a transitive dependency of puppet
+# Otherwise, do as before and use location_for to fetch gems from the default source
+if !ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
+  gems['bolt'] = [bolt_version || '~> 5.0', { require: false, source: 'https://rubygems-puppetcore.puppet.com' }]
+  gems['puppet'] = [puppet_version || '~> 8.11', { require: false, source: 'https://rubygems-puppetcore.puppet.com' }]
+  gems['facter'] = [facter_version || '~> 4.0', { require: false, source: 'https://rubygems-puppetcore.puppet.com' }]
+else
+  gems['bolt'] = location_for(bolt_version)
+  gems['puppet'] = location_for(puppet_version)
+  gems['facter'] = location_for(facter_version) if facter_version  
+end
 
-# If facter or hiera versions have been specified via the environment
+# If hiera version have been specified via the environment
 # variables
-gems['facter'] = location_for(facter_version) if facter_version
 gems['hiera'] = location_for(hiera_version) if hiera_version
 
 gems.each do |gem_name, gem_params|

functions/assert_supported_bolt_version.pp

@@ -6,8 +6,10 @@
 function peadm::assert_supported_bolt_version (
   # No arguments
 ) >> Struct[{ 'supported' => Boolean }] {
-  $supported_bolt_version = '>= 3.17.0 < 5.0.0'
+  $supported_bolt_version = '>= 3.17.0 < 6.0.0'
+  $current_bolt_version = peadm::bolt_version()
   $supported = (peadm::bolt_version() =~ SemVerRange($supported_bolt_version))
+  out::message("Bolt version: ${current_bolt_version}")
 # lint:ignore:strict_indent
   unless $supported {
     fail(@("REASON"/L))