Support PE 2021.0

Author: reidmv

Diff for: .gitignore

@@ -29,5 +29,6 @@ bolt-debug.log
 .envrc
 /inventory.yaml
 .rerun.json
+.plan_cache.json
 *.tar.gz
-Puppetfile
+Puppetfile

Diff for: CHANGELOG.md

@@ -5,8 +5,10 @@
 
 ### Improvements
 
+- Support PE 2021.0
 - Handle exit code 11 from replica upgrade task gracefully. Code 11 means "PuppetDB sync in progress but not yet complete".
 - Further remediate the bug fixed in 2.4.2, by ensuring that all peadm-managed node groups preserve existing data or class parameters not explicitly being managed. This is accomplished by requiring a new version of WhatsARanjit-node\_manager, v0.7.4.
+- Switch dependency enumeration from in-project Puppetfile to bolt-project.yaml modules setting
 
 ## 2.4.5
 ### Summary

Diff for: README.md

@@ -49,8 +49,8 @@ The normal usage pattern for peadm is as follows.
 
 ### Requirements
 
-* Puppet Enterprise 2019.8.1 or newer (tested with PE 2019.8.1)
-* Bolt 2.27.0 or newer (tested with Bolt 2.27.0)
+* Puppet Enterprise 2019.8.1 or newer (tested with PE 2021.0)
+* Bolt 2.27.0 or newer (tested with Bolt 3.0.1)
 * EL 7, EL 8, Ubuntu 18.04, or Ubuntu 20.04
 * Classifier Data enabled. This PE feature is enabled by default on new installs, but can be disabled by users if they remove the relevant configuration from their global hiera.yaml file. See the [PE docs](https://puppet.com/docs/pe/latest/config_console.html#task-5039) for more information.
 

Diff for: functions/check_bolt_version.pp

@@ -2,16 +2,16 @@
 # Fails the calling plan if false, does nothing if true.
 # Accepts a parameter for the $supported_bolt_version for unit testing purposes
 function peadm::check_bolt_version(
-  $supported_bolt_version = '>= 2.42.0 < 3.0.0'
+  $supported_bolt_version = '>= 2.42.0 < 4.0.0'
 ) {
   $supported = (peadm::bolt_version() =~ SemVerRange($supported_bolt_version))
 
   unless $supported {
     fail(@("REASON"/L))
       This version of puppetlabs-peadm requires Bolt version ${supported_bolt_version}.
-      
+
       You are using Bolt version ${peadm::bolt_version()}.
-      
+
       Please make sure you have a compatible Bolt version and try again.
 
       | REASON

Diff for: functions/validate_version.pp

@@ -3,7 +3,7 @@
 function peadm::validate_version(
   String $version,
 ) >> Boolean {
-  $supported = ($version =~ SemVerRange('>= 2019.7.0 <= 2019.9.0'))
+  $supported = ($version =~ SemVerRange('>= 2019.7.0 <= 2021.0.0'))
 
   unless $supported {
     fail(@("REASON"/L))
@@ -12,7 +12,7 @@ function peadm::validate_version(
       For PE versions older than 2019.7, please use version 1.x of the \
       puppetlabs-peadm module.
 
-      For PE versions newer than 2019.8, check to see if a new version of peadm \
+      For PE versions newer than 2021.0, check to see if a new version of peadm \
       exists which supports that version of PE.
 
       | REASON

Diff for: spec/functions/validate_version_spec.rb

@@ -2,27 +2,27 @@
 require 'spec_helper'
 
 describe 'peadm::validate_version' do
-  it '2020.3.0' do
-    is_expected.to run.with_params('2020.3.0').and_raise_error(Puppet::ParseError, /This\ version\ of\ the/)
-  end
+  context 'invalide PE versions' do
+    it 'rejects PE versions that are too new' do
+      is_expected.to run.with_params('2021.1.0').and_raise_error(Puppet::ParseError, /This\ version\ of\ the/)
+    end
 
-  it '2019.9.0' do
-    is_expected.to run.with_params('2019.9.0').and_return(true)
+    it 'rejects PE versions that are too old' do
+      is_expected.to run.with_params('2018.1.9').and_raise_error(Puppet::ParseError, /This\ version\ of\ the/)
+    end
   end
 
-  it '2019.8.4' do
-    is_expected.to run.with_params('2019.8.4').and_return(true)
-  end
+  context 'valid PE versions' do
+    it 'accepts the minimum supported version' do
+      is_expected.to run.with_params('2019.7.0').and_return(true)
+    end
 
-  it '2019.8.0' do
-    is_expected.to run.with_params('2019.8.0').and_return(true)
-  end
-
-  it '2019.7.1' do
-    is_expected.to run.with_params('2019.7.1').and_return(true)
-  end
+    it 'accepts the newest supported version number' do
+      is_expected.to run.with_params('2021.0.0').and_return(true)
+    end
 
-  it '2018.1' do
-    is_expected.to run.with_params('2018.1').and_raise_error(Puppet::ParseError, /This\ version\ of\ the/)
+    it 'accepts a version in the middle' do
+      is_expected.to run.with_params('2019.8.4').and_return(true)
+    end
   end
 end