Use stricter data types

Author: ekohl

manifests/init.pp

@@ -573,13 +573,13 @@
   Optional[String] $package_provider = $puppet::params::package_provider,
   Optional[Variant[String,Hash]] $package_install_options = undef,
   Optional[Variant[Stdlib::Absolutepath, Stdlib::HTTPUrl]] $package_source = undef,
-  Integer[0, 65535] $port = 8140,
+  Stdlib::Port $port = 8140,
   Boolean $pluginsync = true,
   Boolean $splay = false,
   Variant[Integer[0],Pattern[/^\d+[smhdy]?$/]] $splaylimit = 1800,
   Variant[Boolean, Stdlib::Absolutepath] $autosign = $puppet::params::autosign,
   Array[String] $autosign_entries = [],
-  Pattern[/^[0-9]{3,4}$/] $autosign_mode = '0664',
+  Stdlib::Filemode $autosign_mode = '0664',
   Optional[String] $autosign_content = undef,
   Optional[String] $autosign_source = undef,
   Variant[Integer[0],Pattern[/^\d+[smhdy]?$/]] $runinterval = 1800,
@@ -597,7 +597,7 @@
   Optional[Integer[0]] $http_connect_timeout = undef,
   Optional[Integer[0]] $http_read_timeout = undef,
   Optional[Variant[String, Boolean]] $ca_server = undef,
-  Optional[Integer[0, 65535]] $ca_port = undef,
+  Optional[Stdlib::Port] $ca_port = undef,
   Optional[String] $ca_crl_filepath = undef,
   Optional[String] $prerun_command = undef,
   Optional[String] $postrun_command = undef,
@@ -631,7 +631,7 @@
   String $server_group = $puppet::params::group,
   String $server_dir = $puppet::params::dir,
   String $server_ip = '0.0.0.0',
-  Integer $server_port = 8140,
+  Stdlib::Port $server_port = 8140,
   Boolean $server_ca = $puppet::params::server_ca,
   Boolean $server_ca_crl_sync = $puppet::params::server_ca_crl_sync,
   Optional[Boolean] $server_crl_enable = undef,
@@ -658,11 +658,11 @@
   String $server_default_manifest_content = '' # lint:ignore:empty_string_assignment
   String $server_environments_owner = $puppet::params::server_environments_owner,
   Optional[String] $server_environments_group = $puppet::params::server_environments_group,
-  Pattern[/^[0-9]{3,4}$/] $server_environments_mode = '0755',
+  Stdlib::Filemode $server_environments_mode = '0755',
   Stdlib::Absolutepath $server_envs_dir = $puppet::params::server_envs_dir,
   Optional[Stdlib::Absolutepath] $server_envs_target = undef,
   Variant[Undef, String[0], Array[Stdlib::Absolutepath]] $server_common_modules_path = $puppet::params::server_common_modules_path,
-  Pattern[/^[0-9]{3,4}$/] $server_git_repo_mode = '0755',
+  Stdlib::Filemode $server_git_repo_mode = '0755',
   Stdlib::Absolutepath $server_git_repo_path = $puppet::params::server_git_repo_path,
   String $server_git_repo_group = $puppet::params::server_git_repo_group,
   String $server_git_repo_user = $puppet::params::server_git_repo_user,
@@ -715,7 +715,7 @@
   Boolean $server_metrics_jmx_enable = true,
   Boolean $server_metrics_graphite_enable = false,
   String $server_metrics_graphite_host = '127.0.0.1',
-  Integer $server_metrics_graphite_port = 2003,
+  Stdlib::Port $server_metrics_graphite_port = 2003,
   String $server_metrics_server_id = $puppet::params::server_metrics_server_id,
   Integer $server_metrics_graphite_interval = 5,
   Optional[Array] $server_metrics_allowed = undef,

manifests/server.pp

@@ -334,7 +334,7 @@
 class puppet::server(
   Variant[Boolean, Stdlib::Absolutepath] $autosign = $puppet::autosign,
   Array[String] $autosign_entries = $puppet::autosign_entries,
-  Pattern[/^[0-9]{3,4}$/] $autosign_mode = $puppet::autosign_mode,
+  Stdlib::Filemode $autosign_mode = $puppet::autosign_mode,
   Optional[String] $autosign_content = $puppet::autosign_content,
   Optional[String] $autosign_source = $puppet::autosign_source,
   String $hiera_config = $puppet::hiera_config,
@@ -344,7 +344,7 @@
   String $group = $puppet::server_group,
   String $dir = $puppet::server_dir,
   Stdlib::Absolutepath $codedir = $puppet::codedir,
-  Integer $port = $puppet::server_port,
+  Stdlib::Port $port = $puppet::server_port,
   String $ip = $puppet::server_ip,
   Boolean $ca = $puppet::server_ca,
   Optional[String] $ca_crl_filepath = $puppet::ca_crl_filepath,
@@ -355,7 +355,7 @@
   Array[String] $ca_client_whitelist = $puppet::server_ca_client_whitelist,
   Optional[Puppet::Custom_trusted_oid_mapping] $custom_trusted_oid_mapping = $puppet::server_custom_trusted_oid_mapping,
   Boolean $http = $puppet::server_http,
-  Integer $http_port = $puppet::server_http_port,
+  Stdlib::Port $http_port = $puppet::server_http_port,
   String $reports = $puppet::server_reports,
   Stdlib::Absolutepath $puppetserver_vardir = $puppet::server_puppetserver_vardir,
   Optional[Stdlib::Absolutepath] $puppetserver_rundir = $puppet::server_puppetserver_rundir,
@@ -374,11 +374,11 @@
   String $default_manifest_content = $puppet::server_default_manifest_content,
   String $environments_owner = $puppet::server_environments_owner,
   Optional[String] $environments_group = $puppet::server_environments_group,
-  Pattern[/^[0-9]{3,4}$/] $environments_mode = $puppet::server_environments_mode,
+  Stdlib::Filemode $environments_mode = $puppet::server_environments_mode,
   Stdlib::Absolutepath $envs_dir = $puppet::server_envs_dir,
   Optional[Stdlib::Absolutepath] $envs_target = $puppet::server_envs_target,
   Variant[Undef, String[0], Array[Stdlib::Absolutepath]] $common_modules_path = $puppet::server_common_modules_path,
-  Pattern[/^[0-9]{3,4}$/] $git_repo_mode = $puppet::server_git_repo_mode,
+  Stdlib::Filemode $git_repo_mode = $puppet::server_git_repo_mode,
   Stdlib::Absolutepath $git_repo_path = $puppet::server_git_repo_path,
   String $git_repo_group = $puppet::server_git_repo_group,
   String $git_repo_user = $puppet::server_git_repo_user,
@@ -430,7 +430,7 @@
   Boolean $metrics_jmx_enable = $puppet::server_metrics_jmx_enable,
   Boolean $metrics_graphite_enable = $puppet::server_metrics_graphite_enable,
   String $metrics_graphite_host = $puppet::server_metrics_graphite_host,
-  Integer $metrics_graphite_port = $puppet::server_metrics_graphite_port,
+  Stdlib::Port $metrics_graphite_port = $puppet::server_metrics_graphite_port,
   String $metrics_server_id = $puppet::server_metrics_server_id,
   Integer $metrics_graphite_interval = $puppet::server_metrics_graphite_interval,
   Variant[Undef, Array] $metrics_allowed = $puppet::server_metrics_allowed,