Remove validations, use stricter data types instead

Author: Phil Friderici

manifests/init.pp

@@ -60,22 +60,14 @@
   Variant[Enum['true', 'false'], Boolean] $run_in_noop = true, #lint:ignore:quoted_booleans
   String                                  $cron_command = '/opt/puppetlabs/bin/puppet agent --onetime --no-daemonize --no-usecacheonfailure --detailed-exitcodes --no-splay', #lint:ignore:140chars
   Variant[Enum['true', 'false'], Boolean] $run_at_boot = true, #lint:ignore:quoted_booleans
-  String                                  $config_path = '/etc/puppetlabs/puppet/puppet.conf',
+  Stdlib::Absolutepath                    $config_path = '/etc/puppetlabs/puppet/puppet.conf',
   String                                  $server = 'puppet',
   String                                  $ca_server = 'puppet',
   String                                  $env = $environment,
   Variant[Enum['true', 'false'], Boolean] $graph = false, #lint:ignore:quoted_booleans
-  String                                  $agent_sysconfig_path = '/etc/sysconfig/puppet',
+  Stdlib::Absolutepath                    $agent_sysconfig_path = '/etc/sysconfig/puppet',
   Hash                                    $custom_settings = {},
 ) {
-  if $config_path != undef {
-    validate_absolute_path($config_path)
-  }
-
-  if $agent_sysconfig_path != undef {
-    validate_absolute_path($agent_sysconfig_path)
-  }
-
   if is_string($run_every_thirty) == true {
     $run_every_thirty_bool = str2bool($run_every_thirty)
   } else {

manifests/server.pp

@@ -28,19 +28,13 @@
 class puppet::server (
   Variant[Enum['true', 'false'], Boolean] $ca = false, #lint:ignore:quoted_booleans
   Variant[Array[String, 1], Undef]        $autosign_entries = undef,
-  String                                  $sysconfig_path = '/etc/sysconfig/puppetserver',
-  String                                  $memory_size = '2g', # only m and g are appropriate for unit
-  Optional[String]                        $enc = undef,
+  Stdlib::Absolutepath                    $sysconfig_path = '/etc/sysconfig/puppetserver',
+  Pattern[/^\d+(m|g)$/]                   $memory_size = '2g', # only m and g are appropriate for unit
+  Optional[Stdlib::Absolutepath]          $enc = undef,
   Optional[String]                        $dns_alt_names = undef,
 ) {
   include puppet
 
-  if $sysconfig_path != undef {
-    validate_absolute_path($sysconfig_path)
-  }
-
-  validate_re($memory_size, '^\d+(m|g)$', "puppet::memory_size is <${memory_size}> and must be an integer following by the unit 'm' or 'g'.") #lint:ignore:140chars
-
   $ini_defaults = {
     ensure  => 'present',
     path    => $puppet::config_path,
@@ -59,7 +53,6 @@
   }
 
   if $enc != undef {
-    validate_absolute_path($enc)
     $ini_enc_settings = {
       'node_terminus'  => { setting => 'node_terminus', value => 'exec' },
       'external_nodes' => { setting => 'external_nodes', value => $enc },

spec/classes/init_spec.rb

@@ -312,11 +312,11 @@
 
   describe 'parameter type and content validations' do
     validations = {
-      'absolute paths' => {
+      'Stdlib::Absolutepath' => {
         name:    ['config_path', 'agent_sysconfig_path'],
         valid:   ['/absolute/path'],
         invalid: ['not/an/absolute/path'],
-        message: 'is not an absolute path',
+        message: 'expects a Stdlib::Absolutepath',
       },
       'booleans' => {
         name:    ['run_every_thirty', 'run_in_noop', 'run_at_boot', 'graph'],

spec/classes/server_spec.rb

@@ -183,11 +183,11 @@
 
   describe 'parameter type and content validations' do
     validations = {
-      'absolute paths' => {
+      'Stdlib::Absolutepath' => {
         name:    ['sysconfig_path', 'enc'],
         valid:   ['/absolute/path'],
         invalid: ['not/an/absolute/path'],
-        message: 'is not an absolute path',
+        message: 'expects a Stdlib::Absolutepath',
       },
       'booleans' => {
         name:    ['ca'],
@@ -207,11 +207,11 @@
         invalid: [[], [1, 'not_all', 'string'], true, 'string', { 'ha' => 'sh' }, 3, 2.42],
         message: 'Error while evaluating a Resource Statement',
       },
-      'memory size regex' => {
+      'Pattern[/^\d+(m|g)$/]' => {
         name:    ['memory_size'],
         valid:   ['1g', '1m', '1500m', '3g'],
         invalid: ['1g1', 'm', '1k', '2t', 'g3', '1.2g'],
-        message: 'must be an integer following by the unit',
+        message: 'expects a match for Pattern',
       },
     }