Prefer String#inspect to private API

voxpupuli · Aug 22, 2022 · 0e80d3e · 0e80d3e
1 parent 530337d
commit 0e80d3e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/spec/classes/nginx_spec.rb b/spec/classes/nginx_spec.rb
@@ -554,10 +554,10 @@
                   },
                 },
                 match: [
-                  '  log_format format1 \'FORMAT1\';',
-                  '  log_format format2 \'FORMAT2\';',
-                  '  log_format format3 \'FORMAT3\';',
-                  '  log_format format4 escape=json \'{"response": $status, "verb": "$request_method"}\';'
+                  '  log_format format1 "FORMAT1";',
+                  '  log_format format2 "FORMAT2";',
+                  '  log_format format3 "FORMAT3";',
+                  '  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
@@ -75,9 +75,9 @@ http {
 <% if @log_format -%>
 <% @log_format.sort_by{|k,v| k}.each do |key,value| -%>
   <%- if value.is_a?(String) -%>
-  log_format <%= key %> <%= Puppet::Pops::Types::StringConverter.convert(value, '%p') %>;
+  log_format <%= key %> <%= value.inspect %>;
   <%- else -%>
-  log_format <%= key %> <%= "escape=#{value['escape']} " if value['escape'] %><%= Puppet::Pops::Types::StringConverter.convert(value['format'], '%p') %>;
+  log_format <%= key %> <%= "escape=#{value['escape']} " if value['escape'] %><%= value['format'].inspect %>;
   <%- end -%>
 <% end -%>
 <% end -%>