Use more datatypes

theforeman · Sep 14, 2018 · 2ba38fb · 2ba38fb
1 parent 0b6d723
commit 2ba38fb
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/manifests/config/passenger.pp b/manifests/config/passenger.pp
@@ -66,17 +66,17 @@
   Optional[String] $listen_on_interface = $::foreman::passenger_interface,
   Optional[String] $ruby = $::foreman::passenger_ruby,
   String $priority = $::foreman::vhost_priority,
-  String $servername = $::foreman::servername,
-  Array[String] $serveraliases = $::foreman::serveraliases,
-  Integer[0, 65535] $server_port = $::foreman::server_port,
-  Integer[0, 65535] $server_ssl_port = $::foreman::server_ssl_port,
+  Stdlib::Fqdn $servername = $::foreman::servername,
+  Array[Stdlib::Fqdn] $serveraliases = $::foreman::serveraliases,
+  Stdlib::Port $server_port = $::foreman::server_port,
+  Stdlib::Port $server_ssl_port = $::foreman::server_ssl_port,
   Boolean $ssl = $::foreman::ssl,
   Stdlib::Absolutepath $ssl_ca = $::foreman::server_ssl_ca,
   Stdlib::Absolutepath $ssl_chain = $::foreman::server_ssl_chain,
   Stdlib::Absolutepath $ssl_cert = $::foreman::server_ssl_cert,
-  Variant[String[0], Stdlib::Absolutepath] $ssl_certs_dir = $::foreman::server_ssl_certs_dir,
+  Variant[Enum[''], Stdlib::Absolutepath] $ssl_certs_dir = $::foreman::server_ssl_certs_dir,
   Stdlib::Absolutepath $ssl_key = $::foreman::server_ssl_key,
-  Optional[Variant[String[0], Stdlib::Absolutepath]] $ssl_crl = $::foreman::server_ssl_crl,
+  Variant[Enum[''], Stdlib::Absolutepath] $ssl_crl = $::foreman::server_ssl_crl,
   Optional[String] $ssl_protocol = $::foreman::server_ssl_protocol,
   Boolean $use_vhost = $::foreman::use_vhost,
   String $user = $::foreman::user,

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -226,8 +226,8 @@
   Optional[String] $passenger_ruby_package = $::foreman::params::passenger_ruby_package,
   String $plugin_prefix = $::foreman::params::plugin_prefix,
   Boolean $use_vhost = $::foreman::params::use_vhost,
-  String $servername = $::foreman::params::servername,
-  Array[String] $serveraliases = $::foreman::params::serveraliases,
+  Stdlib::Fqdn $servername = $::foreman::params::servername,
+  Array[Stdlib::Fqdn] $serveraliases = $::foreman::params::serveraliases,
   Boolean $ssl = $::foreman::params::ssl,
   Boolean $custom_repo = $::foreman::params::custom_repo,
   String $repo = $::foreman::params::repo,
@@ -240,8 +240,8 @@
   Boolean $db_manage = $::foreman::params::db_manage,
   Enum['mysql', 'postgresql', 'sqlite'] $db_type = $::foreman::params::db_type,
   Optional[Enum['mysql2', 'postgresql', 'sqlite3', 'UNSET']] $db_adapter = 'UNSET',
-  Optional[String] $db_host = 'UNSET',
-  Variant[Undef, Enum['UNSET'], Integer[0, 65535]] $db_port = 'UNSET',
+  Optional[Stdlib::Host] $db_host = 'UNSET',
+  Variant[Undef, Enum['UNSET'], Stdlib::Port] $db_port = 'UNSET',
   Optional[String] $db_database = 'UNSET',
   Optional[String] $db_username = $::foreman::params::db_username,
   Optional[String] $db_password = $::foreman::params::db_password,
@@ -259,14 +259,14 @@
   Boolean $organizations_enabled = $::foreman::params::organizations_enabled,
   Optional[String] $passenger_interface = $::foreman::params::passenger_interface,
   String $vhost_priority = $::foreman::params::vhost_priority,
-  Integer[0, 65535] $server_port = $::foreman::params::server_port,
-  Integer[0, 65535] $server_ssl_port = $::foreman::params::server_ssl_port,
+  Stdlib::Port $server_port = $::foreman::params::server_port,
+  Stdlib::Port $server_ssl_port = $::foreman::params::server_ssl_port,
   Stdlib::Absolutepath $server_ssl_ca = $::foreman::params::server_ssl_ca,
   Stdlib::Absolutepath $server_ssl_chain = $::foreman::params::server_ssl_chain,
   Stdlib::Absolutepath $server_ssl_cert = $::foreman::params::server_ssl_cert,
-  Variant[String[0], Stdlib::Absolutepath] $server_ssl_certs_dir = $::foreman::params::server_ssl_certs_dir,
+  Variant[Enum[''], Stdlib::Absolutepath] $server_ssl_certs_dir = $::foreman::params::server_ssl_certs_dir,
   Stdlib::Absolutepath $server_ssl_key = $::foreman::params::server_ssl_key,
-  Optional[Variant[String[0], Stdlib::Absolutepath]] $server_ssl_crl = $::foreman::params::server_ssl_crl,
+  Variant[Enum[''], Stdlib::Absolutepath] $server_ssl_crl = $::foreman::params::server_ssl_crl,
   Optional[String] $server_ssl_protocol = $::foreman::params::server_ssl_protocol,
   Stdlib::Absolutepath $client_ssl_ca = $::foreman::params::client_ssl_ca,
   Stdlib::Absolutepath $client_ssl_cert = $::foreman::params::client_ssl_cert,
@@ -300,9 +300,9 @@
   Enum['pattern', 'multiline_pattern', 'json'] $logging_layout = $::foreman::params::logging_layout,
   Hash[String, Boolean] $loggers = $::foreman::params::loggers,
   Optional[Enum['sendmail', 'smtp']] $email_delivery_method = $::foreman::params::email_delivery_method,
-  Optional[String] $email_smtp_address = $::foreman::params::email_smtp_address,
-  Integer[0, 65535] $email_smtp_port = $::foreman::params::email_smtp_port,
-  Optional[String] $email_smtp_domain = $::foreman::params::email_smtp_domain,
+  Optional[Stdlib::Host] $email_smtp_address = $::foreman::params::email_smtp_address,
+  Stdlib::Port $email_smtp_port = $::foreman::params::email_smtp_port,
+  Optional[Stdlib::Fqdn] $email_smtp_domain = $::foreman::params::email_smtp_domain,
   Enum['none', 'plain', 'login', 'cram-md5'] $email_smtp_authentication = $::foreman::params::email_smtp_authentication,
   Optional[String] $email_smtp_user_name = $::foreman::params::email_smtp_user_name,
   Optional[String] $email_smtp_password = $::foreman::params::email_smtp_password,
@@ -313,7 +313,7 @@
   Enum['statsd', 'statsite', 'datadog'] $telemetry_statsd_protocol = $::foreman::params::telemetry_statsd_protocol,
   Boolean $telemetry_logger_enabled = $::foreman::params::telemetry_logger_enabled,
   Enum['DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL'] $telemetry_logger_level = $::foreman::params::telemetry_logger_level,
-  Integer[0, 65535] $dynflow_pool_size = $::foreman::params::dynflow_pool_size,
+  Stdlib::Port $dynflow_pool_size = $::foreman::params::dynflow_pool_size,
   String $jobs_service = $::foreman::params::jobs_service,
   Boolean $hsts_enabled = $::foreman::params::hsts_enabled,
 ) inherits foreman::params {

diff --git a/manifests/service.pp b/manifests/service.pp
@@ -4,7 +4,7 @@
   Stdlib::Absolutepath $app_root = $::foreman::app_root,
   Boolean $ssl = $::foreman::ssl,
   String $jobs_service = $::foreman::jobs_service,
-  Enum['running', 'stopped'] $jobs_service_ensure = $::foreman::jobs_service_ensure,
+  Stdlib::Ensure::Service $jobs_service_ensure = $::foreman::jobs_service_ensure,
   Boolean $jobs_service_enable = $::foreman::jobs_service_enable,
 ) {
   anchor { ['foreman::service_begin', 'foreman::service_end']: }

diff --git a/metadata.json b/metadata.json
@@ -30,7 +30,7 @@
     },
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.13.0 < 6.0.0"
+      "version_requirement": ">= 4.25.0 < 6.0.0"
     },
     {
       "name": "puppet/extlib",