Fixing typing issues in response to spec failures

Author: JacobHenner

manifests/init.pp

@@ -39,9 +39,9 @@
   Stdlib::Unixpath $log_dir                                                     = $::nginx::params::log_dir,
   String[1] $log_group                                                          = $::nginx::params::log_group,
   Stdlib::Filemode $log_mode                                                    = '0750',
-  Variant[Stdlib::Unixpath, Array[Stdlib::Unixpath]] $http_access_log           = "${log_dir}/${::nginx::params::http_access_log_file}",
+  Variant[String[1], Array[String[1]]] $http_access_log                         = "${log_dir}/${::nginx::params::http_access_log_file}",
   Optional[String[1]] $http_format_log                                          = undef,
-  Variant[Stdlib::Unixpath, Array[Stdlib::Unixpath]] $nginx_error_log           = "${log_dir}/${::nginx::params::nginx_error_log_file}",
+  Variant[String[1], Array[String[1]]] $nginx_error_log                         = "${log_dir}/${::nginx::params::nginx_error_log_file}",
   Nginx::ErrorLogSeverity $nginx_error_log_severity                             = 'error',
   Optional[Stdlib::Unixpath] $pid                                               = $::nginx::params::pid,
   Stdlib::Unixpath $proxy_temp_path                                             = $::nginx::params::proxy_temp_path,
@@ -83,12 +83,12 @@
   String[1] $gzip_proxied                                                       = 'off',
   Optional[Variant[Array[String[1]], String[1]]] $gzip_types                    = undef,
   Nginx::Toggle $gzip_vary                                                      = 'off',
-  Optional[Variant[Hash[String[1],String], Array[String[1]]]] $http_cfg_prepend = undef,
-  Optional[Variant[Hash[String[1],String], Array[String[1]]]] $http_cfg_append  = undef,
-  Optional[Variant[Array[String[1]], String[1]]] $http_raw_prepend              = undef,
-  Optional[Variant[Array[String[1]], String[1]]] $http_raw_append               = undef,
+  Optional[Variant[Hash, Array]] $http_cfg_prepend                              = undef,
+  Optional[Variant[Hash, Array]] $http_cfg_append                               = undef,
+  Optional[Variant[Hash, Array]] $http_raw_prepend              = undef,
+  Optional[Variant[Hash, Array]] $http_raw_append               = undef,
   Nginx::Toggle $http_tcp_nodelay                                               = 'on',
-  Nginx::Toggle $http_tcp_nopush                                                = 'off',
+  Optional[Nginx::Toggle] $http_tcp_nopush                                      =  undef,
   Nginx::Duration $keepalive_timeout                                            = '65s',
   String[1] $keepalive_requests                                                 = '100',
   Hash[String[1],String] $log_format                                            = {},
@@ -97,7 +97,7 @@
   Nginx::Toggle $multi_accept                                                   = 'off',
   Integer $names_hash_bucket_size                                               = 64,
   Integer $names_hash_max_size                                                  = 512,
-  Optional[Variant[Hash[String[1],String], Tuple[String]]] $nginx_cfg_prepend   = undef,
+  Optional[Variant[Hash, Array]] $nginx_cfg_prepend                             = undef,
   String[1] $proxy_buffers                                                      = '32 4k',
   String[1] $proxy_buffer_size                                                  = '8k',
   Nginx::Duration $proxy_cache_inactive                                         = '20m',
@@ -124,7 +124,7 @@
   Array[String[1]] $proxy_hide_header                                           = [],
   Array[String[1]] $proxy_pass_header                                           = [],
   Array[String[1]] $proxy_ignore_header                                         = [],
-  Nginx::Toggle $sendfile                                                       = 'on',
+  Optional[Nginx::Toggle] $sendfile                                             = undef,
   String[1] $server_tokens                                                      = 'on',
   Boolean $spdy                                                                 = false,
   Boolean $http2                                                                = false,

manifests/resource/streamhost.pp

@@ -55,7 +55,7 @@
   Variant[Array[Stdlib::Ipv6], Stdlib::Ipv6] $ipv6_listen_ip  = '::',
   Stdlib::Port $ipv6_listen_port                              = 80,
   String[1] $ipv6_listen_options                              = 'default ipv6only=on',
-  Optional[Stdlib::Httpurl] $proxy                            = undef,
+  Optional[String[1]] $proxy                                  = undef,
   Nginx::Duration $proxy_read_timeout                         = $::nginx::proxy_read_timeout,
   Nginx::Duration $proxy_connect_timeout                      = $::nginx::proxy_connect_timeout,
   Array[String[1]] $resolver                                  = [],

spec/classes/nginx_spec.rb

@@ -425,7 +425,7 @@
               {
                 title: 'should not set pid',
                 attr: 'pid',
-                value: false,
+                value: :undef,
                 notmatch: %r{pid}
               },
               {
@@ -516,15 +516,21 @@
                 match: '  access_log  /var/log/nginx/access.log mycustomformat;'
               },
               {
-                title: 'should set sendfile',
+                title: 'should set sendfile on',
                 attr: 'sendfile',
                 value: 'on',
                 match: '  sendfile    on;'
               },
+              {
+                title: 'should set sendfile off',
+                attr: 'sendfile',
+                value: 'off',
+                match: '  sendfile    off;'
+              },
               {
                 title: 'should not set sendfile',
                 attr: 'sendfile',
-                value: false,
+                value: :undef,
                 notmatch: %r{sendfile}
               },
               {
@@ -827,7 +833,7 @@
               {
                 title: 'should not set proxy_http_version',
                 attr: 'proxy_http_version',
-                value: nil,
+                value: :undef,
                 notmatch: 'proxy_http_version'
               },
               {

templates/conf.d/nginx.conf.erb

@@ -75,12 +75,13 @@ http {
   access_log  <%= @http_access_log %><% if @http_format_log %> <%= @http_format_log%><% end %>;
 <% end -%>
 
-<% if @sendfile == 'on' -%>
-  sendfile    on;
-  <%- if @http_tcp_nopush == 'on' -%>
-  tcp_nopush on;
-  <%- end -%>
+<% if @sendfile -%>
+  sendfile    <%= @sendfile %>;
 <% end -%>
+<%- if @http_tcp_nopush -%>
+tcp_nopush <%= @http_tcp_nopush %>;
+<%- end -%>
+
   server_tokens <%= @server_tokens %>;
 
   types_hash_max_size <%= @types_hash_max_size %>;