Enforce stricter data types

Author: Andrew Beresford

manifests/forwarder.pp

@@ -60,11 +60,11 @@
   Optional[String] $package_source      = undef,
   String $package_name                  = $splunk::params::forwarder_pkg_name,
   String $package_ensure                = $splunk::params::forwarder_pkg_ensure,
-  Variant[String,Integer] $logging_port = $splunk::params::logging_port,
-  Variant[String,Integer] $splunkd_port = $splunk::params::splunkd_port,
+  Stdlib::Port $logging_port            = $splunk::params::logging_port,
+  Stdlib::Port $splunkd_port            = $splunk::params::splunkd_port,
   Optional[Array] $install_options      = $splunk::params::forwarder_install_options,
   String $splunk_user                   = $splunk::params::splunk_user,
-  String $splunkd_listen                = '127.0.0.1',
+  Stdlib::Host $splunkd_listen          = '127.0.0.1',
   Boolean $purge_deploymentclient       = false,
   Boolean $purge_inputs                 = false,
   Boolean $purge_outputs                = false,

manifests/init.pp

@@ -53,12 +53,12 @@
   String $package_name                          = $splunk::params::server_pkg_name,
   String $package_ensure                        = $splunk::params::server_pkg_ensure,
   Variant[Array[String],String] $server_service = $splunk::params::server_service,
-  Variant[String,Integer] $logging_port         = $splunk::params::logging_port,
-  Variant[String,Integer] $splunkd_port         = $splunk::params::splunkd_port,
+  Stdlib::Port $logging_port                    = $splunk::params::logging_port,
+  Stdlib::Port $splunkd_port                    = $splunk::params::splunkd_port,
   String $splunk_user                           = $splunk::params::splunk_user,
   Optional[String] $pkg_provider                = $splunk::params::pkg_provider,
-  String $splunkd_listen                        = '127.0.0.1',
-  Variant[String,Integer] $web_port             = '8000',
+  Stdlib::Host $splunkd_listen                  = '127.0.0.1',
+  Stdlib::Port $web_port                        = 8000,
   Boolean $purge_alert_actions                  = false,
   Boolean $purge_authentication                 = false,
   Boolean $purge_authorize                      = false,

manifests/params.pp

@@ -81,15 +81,15 @@
 # Requires: nothing
 #
 class splunk::params (
-  $version              = '7.0.0',
-  $build                = 'c8a78efdd40f',
-  $src_root             = 'https://download.splunk.com',
-  $splunkd_port         = '8089',
-  $logging_port         = '9997',
-  $server               = 'splunk',
-  $forwarder_installdir = undef,
-  $server_installdir    = undef,
-  $splunk_user          = $facts['os']['family'] ? {
+  String $version                        = '7.0.0',
+  String $build                          = 'c8a78efdd40f',
+  String $src_root                       = 'https://download.splunk.com',
+  Stdlib::Port $splunkd_port             = 8089,
+  Stdlib::Port $logging_port             = 9997,
+  String $server                         = 'splunk',
+  Optional[String] $forwarder_installdir = undef,
+  Optional[String] $server_installdir    = undef,
+  String $splunk_user                    = $facts['os']['family'] ? {
     'Windows' => 'Administrator',
     default => 'root'
   }