From edda7d8d703c0bcdcbe4f3209443577bb3559ef8 Mon Sep 17 00:00:00 2001
From: Tobi Lehman <tobi.lehman@perforce.com>
Date: Tue, 20 Aug 2024 15:08:45 -0700
Subject: [PATCH 1/2] Update to latest modules for next bolt release.

!feature

* **Update puppet modules shipped with bolt packages**

  Modules shipped with bolt packages have been updated to latest.
---
 Puppetfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Puppetfile b/Puppetfile
index d541ada66..88861ac77 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -6,15 +6,15 @@ moduledir File.join(File.dirname(__FILE__), 'modules')
 
 # Core modules used by 'apply'
 mod 'puppetlabs-service', '3.0.0'
-mod 'puppetlabs-puppet_agent', '4.19.0'
-mod 'puppetlabs-facts', '1.4.0'
+mod 'puppetlabs-puppet_agent', '4.20.1'
+mod 'puppetlabs-facts', '1.6.0'
 
 # Core types and providers for Puppet 6
 mod 'puppetlabs-augeas_core', '1.5.0'
 mod 'puppetlabs-host_core', '1.3.0'
 mod 'puppetlabs-scheduled_task', '4.0.0'
 mod 'puppetlabs-sshkeys_core', '2.5.0'
-mod 'puppetlabs-zfs_core', '1.5.0'
+mod 'puppetlabs-zfs_core', '1.6.1'
 mod 'puppetlabs-cron_core', '1.3.0'
 mod 'puppetlabs-mount_core', '1.3.0'
 mod 'puppetlabs-selinux_core', '1.4.0'
@@ -32,7 +32,7 @@ mod 'puppetlabs-powershell_task_helper', '0.1.0'
 mod 'puppetlabs-ruby_task_helper', '0.6.1'
 mod 'puppetlabs-ruby_plugin_helper', '0.2.0'
 mod 'puppetlabs-python_task_helper', '0.5.0'
-mod 'puppetlabs-bash_task_helper', '2.0.0'
+mod 'puppetlabs-bash_task_helper', '2.1.1'
 
 # Plugin modules
 mod 'puppetlabs-aws_inventory', '0.7.0'

From fd49b7aa51db03d6cbdb2b0e527af5bb40a0f203 Mon Sep 17 00:00:00 2001
From: Tobi Lehman <tobi.lehman@perforce.com>
Date: Tue, 20 Aug 2024 15:35:59 -0700
Subject: [PATCH 2/2] Add bump_mods.rb script to upgrade modules

---
 dev-resources/bump_mods.rb | 65 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 dev-resources/bump_mods.rb

diff --git a/dev-resources/bump_mods.rb b/dev-resources/bump_mods.rb
new file mode 100644
index 000000000..925218b35
--- /dev/null
+++ b/dev-resources/bump_mods.rb
@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+# Bump the module versions in the Puppetfile to the latest version
+# published on https://forge.puppet.com
+require 'open-uri'
+require 'pry'
+require 'rss'
+
+def parse_puppetfile_get_mod_versions
+  module_re = /^mod 'puppetlabs-([a-z_\-]+)', *'([0-9.]+)'$/i
+  versions = {}
+  File.foreach('Puppetfile') do |line|
+    match = module_re.match(line)
+    if match
+      versions[match[1].strip] = match[2].strip
+    end
+  end
+  versions
+end
+
+def latest_version_for_module(mod)
+  url = "https://forge.puppet.com/modules/puppetlabs/#{mod}/rss"
+  # rubocop:disable Security/Open
+  feed = RSS::Parser.parse(URI.open(url))
+  # rubocop:enable Security/Open
+
+  feed.items&.first&.description
+end
+
+# get modules to update
+versions_old = parse_puppetfile_get_mod_versions
+versions_new = {}
+
+versions_old.each do |mod, ver|
+  ver_new = latest_version_for_module(mod)
+
+  if !ver_new.nil? && (ver != ver_new)
+    versions_new[mod] = ver_new
+  end
+end
+
+def puppetfile_set_mod_versions!(versions_new)
+  module_re = /^mod 'puppetlabs-([a-z_\-]+)', *'([0-9.]+)'$/i
+  lines = File.open('Puppetfile').readlines
+
+  # update lines
+  lines.each do |line|
+    next unless line.start_with?("mod 'puppetlabs")
+    match = module_re.match(line)
+    next unless match
+    mod = match[1].strip
+    ver_old = match[2].strip
+    ver_new = versions_new[mod]
+    unless ver_new.nil?
+      line.gsub!(/'([0-9.]+)'/, "'#{ver_new}'")
+      puts "Updated #{mod} from #{ver_old} to #{ver_new}"
+    end
+  end
+
+  # update Puppetfile
+  File.open('Puppetfile', 'w').puts(lines.join)
+end
+
+# Update the Puppetfile with the new versions
+puppetfile_set_mod_versions!(versions_new)