Merge pull request #232 from reidmv/require-semver-version

Make versions match SemVer pattern

Author: reidmv

plans/install.pp

@@ -26,7 +26,7 @@
 
   # Common Configuration
   String                            $console_password,
-  String                            $version                          = '2019.8.8',
+  Peadm::Pe_version                 $version                          = '2019.8.8',
   Optional[Array[String]]           $dns_alt_names                    = undef,
   Optional[String]                  $compiler_pool_address            = undef,
   Optional[String]                  $internal_compiler_a_pool_address = undef,

plans/subplans/install.pp

@@ -34,7 +34,7 @@
 
   # Common Configuration
   String               $console_password,
-  String               $version       = '2019.8.5',
+  Peadm::Pe_version    $version,
   Array[String]        $dns_alt_names = [ ],
   Hash                 $pe_conf_data  = { },
 

plans/upgrade.pp

@@ -25,10 +25,10 @@
   Optional[Peadm::SingleTargetSpec] $replica_postgresql_host = undef,
 
   # Common Configuration
-  String           $version,
-  Optional[String] $compiler_pool_address            = undef,
-  Optional[String] $internal_compiler_a_pool_address = undef,
-  Optional[String] $internal_compiler_b_pool_address = undef,
+  Peadm::Pe_version $version,
+  Optional[String]  $compiler_pool_address            = undef,
+  Optional[String]  $internal_compiler_a_pool_address = undef,
+  Optional[String]  $internal_compiler_b_pool_address = undef,
 
   # Other
   Optional[String]      $token_file             = undef,

spec/plans/subplans/install_spec.rb

@@ -37,8 +37,9 @@
     ##########
 
     params = {
-      'primary_host' => 'primary',
+      'primary_host'     => 'primary',
       'console_password' => 'puppetlabs',
+      'version'          => '2019.8.10',
     }
 
     expect(run_plan('peadm::subplans::install', params)).to be_ok

types/pe_version.pp

@@ -0,0 +1 @@
+type Peadm::Pe_version = Pattern[/^\d+\.\d+\.\d+(-.+)?$/]