Merge pull request #1613 from voxpupuli/fix-broken-map-with-include_f…

…iles Fix usage of `include_files` in `nginx::resource::map`
voxpupuli · Sep 10, 2024 · 7d17260 · 7d17260
2 parents 12d6b62 + 04dd721
commit 7d17260
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/spec/defines/resource_map_spec.rb b/spec/defines/resource_map_spec.rb
@@ -15,12 +15,6 @@
       let :default_params do
         {
           string: '$uri',
-          default: 'pool_a',
-          mappings: {
-            'foo' => 'pool_b',
-            'bar' => 'pool_c',
-            'baz' => 'pool_d'
-          }
         }
       end
 

diff --git a/templates/conf.d/map.epp b/templates/conf.d/map.epp
@@ -17,6 +17,7 @@ map <%= $string %> $<%= $name %> {
 <%- $include_files.each |$h| { -%>
   include <%= $h %>;
 <%- } -%>
+<%- unless $mappings.empty { -%>
 
 <%-
 $m = $mappings ? {
@@ -28,4 +29,5 @@ $field_width = $m.map |$x| { $x['key'].length }.max
 <%- $m.each |$h| { -%>
   <%= sprintf("%-*s %s", $field_width, $h['key'], $h['value']) %>;
 <%- } -%>
+<%- } -%>
 }