From 1995d05a1528f9124bc2be6b20eac8c207805f2d Mon Sep 17 00:00:00 2001
From: David Mallon <david.mallon@perforce.com>
Date: Tue, 30 Sep 2025 11:55:41 +0100
Subject: [PATCH] (PE-42498) Update to support Bolt v5

---
 .github/workflows/test-add-compiler-matrix.yml | 2 ++
 Gemfile                                        | 1 +
 functions/assert_supported_bolt_version.pp     | 6 ++++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-add-compiler-matrix.yml b/.github/workflows/test-add-compiler-matrix.yml
index 71d0c1907..213124a52 100644
--- a/.github/workflows/test-add-compiler-matrix.yml
+++ b/.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:
diff --git a/Gemfile b/Gemfile
index baa66333d..98684989e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -55,6 +55,7 @@ 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 = {}
 
diff --git a/functions/assert_supported_bolt_version.pp b/functions/assert_supported_bolt_version.pp
index 9063e4d3a..6f68eab66 100644
--- a/functions/assert_supported_bolt_version.pp
+++ b/functions/assert_supported_bolt_version.pp
@@ -6,14 +6,16 @@
 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))
+
 # lint:ignore:strict_indent
   unless $supported {
     fail(@("REASON"/L))
       This version of puppetlabs-peadm requires Bolt version ${supported_bolt_version}.
 
-      You are using Bolt version ${peadm::bolt_version()}.
+      You are using Bolt version ${current_bolt_version}.
 
       Please make sure you have a compatible Bolt version and try again.