Ensure passed numbers are Integer

These parameters used to be String (not enforced by types). In order to avoid changing the Unit Tests, they were kept as-is. Now that refactoring is done, switch to a better type.
puppetlabs · Apr 17, 2018 · bed0677 · bed0677
1 parent 7c1747f
commit bed0677
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
@@ -152,14 +152,14 @@
   Optional[String] $passenger_user                                                  = undef,
   Optional[String] $passenger_group                                                 = undef,
   Optional[Boolean] $passenger_friendly_error_pages                                 = undef,
-  Optional[String] $passenger_min_instances                                         = undef, # FIXME: Should be Integer, not String
+  Optional[Integer] $passenger_min_instances                                        = undef,
   Optional[Integer] $passenger_max_instances                                        = undef,
   Optional[Integer] $passenger_max_preloader_idle_time                              = undef,
   Optional[Integer] $passenger_force_max_concurrent_requests_per_process            = undef,
-  Optional[String] $passenger_start_timeout                                         = undef, # FIXME: Should be Integer, not String
+  Optional[Integer] $passenger_start_timeout                                        = undef,
   Optional[Enum['process', 'thread']] $passenger_concurrency_model                  = undef,
   Optional[Integer] $passenger_thread_count                                         = undef,
-  Optional[String] $passenger_max_requests                                          = undef, # FIXME: Should be Integer, not String
+  Optional[Integer] $passenger_max_requests                                         = undef,
   Optional[Integer] $passenger_max_request_time                                     = undef,
   Optional[Integer] $passenger_memory_limit                                         = undef,
   Optional[Integer] $passenger_stat_throttle_rate                                   = undef,

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
@@ -459,14 +459,14 @@
           'passenger_user'                        => 'sandbox',
           'passenger_group'                       => 'sandbox',
           'passenger_friendly_error_pages'        => false,
-          'passenger_min_instances'               => '1',
+          'passenger_min_instances'               => 1,
           'passenger_max_instances'               => 30,
           'passenger_max_preloader_idle_time'     => 600,
           'passenger_force_max_concurrent_requests_per_process' => 10,
-          'passenger_start_timeout'               => '600',
+          'passenger_start_timeout'               => 600,
           'passenger_concurrency_model'           => 'thread',
           'passenger_thread_count'                => 5,
-          'passenger_max_requests'                => '1000',
+          'passenger_max_requests'                => 1000,
           'passenger_max_request_time'            => 2,
           'passenger_memory_limit'                => 64,
           'passenger_stat_throttle_rate'          => 5,