From 77c31c232b528b7dec3fa96d617a43a9b7319584 Mon Sep 17 00:00:00 2001
From: Steven Pritchard <steve@sicura.us>
Date: Thu, 5 Oct 2023 20:11:43 -0500
Subject: [PATCH] [puppetsync] Updates for Puppet 8

These updates may include the following:
* Update Gemfile
* Add support for Puppet 8
* Drop support for Puppet 6
* Update module dependencies
---
 CHANGELOG     |  8 ++++++++
 Gemfile       | 34 +++++++++++++++++-----------------
 metadata.json | 14 +++++++-------
 3 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 021f66f..c7d1847 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+* Thu Oct 05 2023 Steven Pritchard <steve@sicura.us> - 7.7.0
+- [puppetsync] Updates for Puppet 8
+  - These updates may include the following:
+    - Update Gemfile
+    - Add support for Puppet 8
+    - Drop support for Puppet 6
+    - Update module dependencies
+
 * Thu Aug 31 2023 Steven Pritchard <steve@sicura.us> - 7.6.0
 - Add AlmaLinux 8 support
 
diff --git a/Gemfile b/Gemfile
index 57fca16..e74c3da 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,28 +4,28 @@
 # This file is automatically updated as part of a puppet module baseline.
 # The next baseline sync will overwrite any local changes made to this file.
 # ------------------------------------------------------------------------------
-gem_sources = ENV.fetch('GEM_SERVERS','https://rubygems.org').split(/[, ]+/)
+gem_sources = ENV.fetch('GEM_SERVERS', 'https://rubygems.org').split(%r{[, ]+})
 
 ENV['PDK_DISABLE_ANALYTICS'] ||= 'true'
 
 gem_sources.each { |gem_source| source gem_source }
 
 group :test do
-  puppet_version = ENV['PUPPET_VERSION'] || '~> 7'
-  major_puppet_version = puppet_version.scan(/(\d+)(?:\.|\Z)/).flatten.first.to_i
-  gem 'rake'
-  gem 'puppet', puppet_version
-  gem 'rspec'
-  gem 'rspec-puppet'
+  puppet_version = ENV.fetch('PUPPET_VERSION', ['>= 7', '< 9'])
+  major_puppet_version = Array(puppet_version).first.scan(%r{(\d+)(?:\.|\Z)}).flatten.first.to_i
   gem 'hiera-puppet-helper'
-  gem 'puppetlabs_spec_helper'
   gem 'metadata-json-lint'
-  gem 'puppet-strings'
-  gem 'puppet-lint-trailing_comma-check', :require => false
-  gem 'simp-rspec-puppet-facts', ENV['SIMP_RSPEC_PUPPET_FACTS_VERSION'] || '~> 3.1'
-  gem 'simp-rake-helpers', ENV['SIMP_RAKE_HELPERS_VERSION'] || ['>= 5.12.1', '< 6']
-  gem( 'pdk', ENV['PDK_VERSION'] || '~> 2.0', :require => false) if major_puppet_version > 5
   gem 'pathspec', '~> 0.2' if Gem::Requirement.create('< 2.6').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem('pdk', ENV.fetch('PDK_VERSION', ['>= 2.0', '< 4.0']), require: false) if major_puppet_version > 5
+  gem 'puppet', puppet_version
+  gem 'puppetlabs_spec_helper'
+  gem 'puppet-lint-trailing_comma-check', require: false
+  gem 'puppet-strings'
+  gem 'rake'
+  gem 'rspec'
+  gem 'rspec-puppet'
+  gem 'simp-rake-helpers', ENV.fetch('SIMP_RAKE_HELPERS_VERSION', ['>= 5.21.0', '< 6'])
+  gem 'simp-rspec-puppet-facts', ENV.fetch('SIMP_RSPEC_PUPPET_FACTS_VERSION', '~> 3.7')
 end
 
 group :development do
@@ -35,21 +35,21 @@ group :development do
 end
 
 group :system_tests do
+  gem 'bcrypt_pbkdf'
   gem 'beaker'
   gem 'beaker-rspec'
-  gem 'simp-beaker-helpers', ENV['SIMP_BEAKER_HELPERS_VERSION'] || ['>= 1.28.0', '< 2']
-  gem 'bcrypt_pbkdf'
+  gem 'simp-beaker-helpers', ENV.fetch('SIMP_BEAKER_HELPERS_VERSION', ['>= 1.32.1', '< 2'])
 end
 
 # Evaluate extra gemfiles if they exist
 extra_gemfiles = [
-  ENV['EXTRA_GEMFILE'] || '',
+  ENV.fetch('EXTRA_GEMFILE', ''),
   "#{__FILE__}.project",
   "#{__FILE__}.local",
   File.join(Dir.home, '.gemfile'),
 ]
 extra_gemfiles.each do |gemfile|
   if File.file?(gemfile) && File.readable?(gemfile)
-    eval(File.read(gemfile), binding)
+    eval(File.read(gemfile), binding) # rubocop:disable Security/Eval
   end
 end
diff --git a/metadata.json b/metadata.json
index d187ce1..d29b86c 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "simp-sssd",
-  "version": "7.6.0",
+  "version": "7.7.0",
   "author": "SIMP Team",
   "summary": "Manages SSSD",
   "license": "Apache-2.0",
@@ -14,26 +14,26 @@
   "dependencies": [
     {
       "name": "puppet/systemd",
-      "version_requirement": ">= 4.0.2 < 6.0.0"
+      "version_requirement": ">= 4.0.2 < 7.0.0"
     },
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 8.0.0 < 9.0.0"
+      "version_requirement": ">= 8.0.0 < 10.0.0"
     },
     {
       "name": "simp/simplib",
-      "version_requirement": ">= 3.9.0 < 5.0.0"
+      "version_requirement": ">= 4.9.0 < 5.0.0"
     }
   ],
   "simp": {
     "optional_dependencies": [
       {
         "name": "simp/auditd",
-        "version_requirement": ">= 7.0.0 < 9.0.0"
+        "version_requirement": ">= 8.5.0 < 9.0.0"
       },
       {
         "name": "simp/pki",
-        "version_requirement": ">= 6.0.0 < 7.0.0"
+        "version_requirement": ">= 6.2.0 < 7.0.0"
       }
     ]
   },
@@ -75,7 +75,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 6.22.1 < 8.0.0"
+      "version_requirement": ">= 7.0.0 < 9.0.0"
     }
   ]
 }