Merge pull request #1650 from rgarifullin-bank131/proxy_redirect

Change proxy_redirect parameter to Optional[Variant[Array[String],Str…

Author: jay7x

REFERENCE.md

@@ -1130,7 +1130,7 @@ Default value: `'90s'`
 
 ##### <a name="-nginx--proxy_redirect"></a>`proxy_redirect`
 
-Data type: `Optional[String]`
+Data type: `Optional[Variant[Array[String],String]]`
 
 
 
@@ -2096,7 +2096,7 @@ Default value: `undef`
 
 ##### <a name="-nginx--resource--location--proxy_redirect"></a>`proxy_redirect`
 
-Data type: `Optional[String]`
+Data type: `Optional[Variant[Array[String],String]]`
 
 sets the text, which must be changed in response-header "Location" and
 "Refresh" in the response of the proxied server.
@@ -3622,7 +3622,7 @@ Default value: `$nginx::proxy_send_timeout`
 
 ##### <a name="-nginx--resource--server--proxy_redirect"></a>`proxy_redirect`
 
-Data type: `Optional[String]`
+Data type: `Optional[Variant[Array[String],String]]`
 
 Override the default proxy_redirect value of off.
 

manifests/init.pp

@@ -322,7 +322,7 @@
   Integer $proxy_headers_hash_bucket_size                    = 64,
   Optional[String] $proxy_http_version                       = undef,
   Nginx::Time $proxy_read_timeout                            = '90s',
-  Optional[String] $proxy_redirect                           = undef,
+  Optional[Variant[Array[String],String]] $proxy_redirect    = undef,
   Nginx::Time $proxy_send_timeout                            = '90s',
   Array $proxy_set_header                                    = [
     'Host $host',

manifests/resource/location.pp

@@ -264,7 +264,7 @@
     'index.php',
   ],
   Optional[String] $proxy                                          = undef,
-  Optional[String] $proxy_redirect                                 = $nginx::proxy_redirect,
+  Optional[Variant[Array[String],String]] $proxy_redirect          = $nginx::proxy_redirect,
   String $proxy_read_timeout                                       = $nginx::proxy_read_timeout,
   String $proxy_connect_timeout                                    = $nginx::proxy_connect_timeout,
   String $proxy_send_timeout                                       = $nginx::proxy_send_timeout,

manifests/resource/server.pp

@@ -331,7 +331,7 @@
   Enum['on', 'off'] $spdy                                                        = $nginx::spdy,
   Enum['on', 'off'] $http2                                                       = $nginx::http2,
   Optional[String] $proxy                                                        = undef,
-  Optional[String] $proxy_redirect                                               = undef,
+  Optional[Variant[Array[String],String]] $proxy_redirect                        = undef,
   String $proxy_read_timeout                                                     = $nginx::proxy_read_timeout,
   String $proxy_send_timeout                                                     = $nginx::proxy_send_timeout,
   $proxy_connect_timeout                                                         = $nginx::proxy_connect_timeout,

spec/defines/resource_location_spec.rb

@@ -935,6 +935,15 @@
               value: 'value',
               match: %r{^\s+proxy_redirect\s+value;}
             },
+            {
+              title: 'should set proxy_redirect array',
+              attr: 'proxy_redirect',
+              value: %w[value1 value2],
+              match: [
+                %r{^\s+proxy_redirect\s+value1;},
+                %r{^\s+proxy_redirect\s+value2;},
+              ],
+            },
             {
               title: 'should not set proxy_redirect',
               attr: 'proxy_redirect',

templates/conf.d/nginx.conf.erb

@@ -184,8 +184,8 @@ http {
 <% if @client_body_buffer_size -%>
   client_body_buffer_size <%= @client_body_buffer_size %>;
 <% end -%>
-<% if @proxy_redirect -%>
-  proxy_redirect          <%= @proxy_redirect %>;
+<% Array(@proxy_redirect).each do |value| -%>
+  proxy_redirect          <%= value %>;
 <% end -%>
 <% if @_proxy_temp_path -%>
   proxy_temp_path         <%= @_proxy_temp_path.join(' ') %>;

templates/server/locations/proxy.erb

@@ -3,8 +3,8 @@
     proxy_read_timeout    <%= @proxy_read_timeout %>;
     proxy_connect_timeout <%= @proxy_connect_timeout %>;
     proxy_send_timeout    <%= @proxy_send_timeout %>;
-<% if @proxy_redirect -%>
-    proxy_redirect        <%= @proxy_redirect %>;
+<% Array(@proxy_redirect).each do |value| -%>
+    proxy_redirect          <%= value %>;
 <% end -%>
 <% if @proxy_http_version -%>
     proxy_http_version    <%= @proxy_http_version %>;