Allow to set log_format's "escape" parameter

voxpupuli · Aug 19, 2022 · 530337d · 530337d
1 parent 6d59c0e
commit 530337d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -122,7 +122,7 @@
   Enum['on', 'off'] $http_tcp_nopush                         = 'off',
   $keepalive_timeout                                         = '65s',
   $keepalive_requests                                        = '100',
-  $log_format                                                = {},
+  Hash[String[1], Nginx::LogFormat] $log_format              = {},
   Boolean $mail                                              = false,
   Variant[String, Boolean] $mime_types_path                  = 'mime.types',
   Boolean $stream                                            = false,

diff --git a/spec/classes/nginx_spec.rb b/spec/classes/nginx_spec.rb
@@ -557,7 +557,7 @@
                   '  log_format format1 \'FORMAT1\';',
                   '  log_format format2 \'FORMAT2\';',
                   '  log_format format3 \'FORMAT3\';',
-                  '  log_format format4 \'escape=json\' \'{"response": $status, "verb": "$request_method"}\';'
+                  '  log_format format4 escape=json \'{"response": $status, "verb": "$request_method"}\';'
                 ]
               },
               {

diff --git a/templates/conf.d/nginx.conf.erb b/templates/conf.d/nginx.conf.erb
@@ -74,7 +74,11 @@ http {
   default_type  application/octet-stream;
 <% if @log_format -%>
 <% @log_format.sort_by{|k,v| k}.each do |key,value| -%>
-  log_format <%= key %> '<%= value %>';
+  <%- if value.is_a?(String) -%>
+  log_format <%= key %> <%= Puppet::Pops::Types::StringConverter.convert(value, '%p') %>;
+  <%- else -%>
+  log_format <%= key %> <%= "escape=#{value['escape']} " if value['escape'] %><%= Puppet::Pops::Types::StringConverter.convert(value['format'], '%p') %>;
+  <%- end -%>
 <% end -%>
 <% end -%>
 

diff --git a/types/logformat.pp b/types/logformat.pp
@@ -0,0 +1,7 @@
+type Nginx::LogFormat = Variant[
+  String[1],
+  Struct[{
+    Optional[escape] => Enum['default', 'json', 'none'],
+    format           => String[1],
+  }],
+]