(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

@@ -52,13 +52,17 @@ group :release_prep do
   gem "puppetlabs_spec_helper", '~> 6.0', require: false
 end
 
-puppet_version = ENV['PUPPET_GEM_VERSION']
-facter_version = ENV['FACTER_GEM_VERSION']
-hiera_version = ENV['HIERA_GEM_VERSION']
-
 gems = {}
 
-gems['puppet'] = location_for(puppet_version)
+#bolt_version = ENV.fetch('BOLT_GEM_VERSION', nil)
+
+# 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' }]
+else
+  #gems['bolt'] = location_for(bolt_version)
+end
 
 # If facter or hiera versions have been specified via the environment
 # variables

functions/assert_supported_bolt_version.pp

@@ -6,7 +6,7 @@
 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'
   $supported = (peadm::bolt_version() =~ SemVerRange($supported_bolt_version))
 # lint:ignore:strict_indent
   unless $supported {