Don't fail if first element of is not an hash before flattening

The template is using [@rewrites].flatten.compact which maps to Puppet's delete_undef_values(flatten([]))
puppetlabs · Nov 22, 2016 · 4222c50 · 4222c50
1 parent 2d70ca8
commit 4222c50
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
@@ -192,7 +192,8 @@
   if $rewrites {
     validate_array($rewrites)
     unless empty($rewrites) {
-      validate_hash($rewrites[0])
+      $rewrites_flattened = delete_undef_values(flatten([$rewrites]))
+      validate_hash($rewrites_flattened[0])
     }
   }
 

diff --git a/templates/vhost/_rewrite.erb b/templates/vhost/_rewrite.erb
@@ -5,7 +5,7 @@
   RewriteBase <%= @rewrite_base %>
   <%- end -%>
 
-  <%- [@rewrites].flatten.compact.each do |rewrite_details| -%>
+  <%- @rewrites_flattened.each do |rewrite_details| -%>
     <%- if rewrite_details['comment'] -%>
   #<%= rewrite_details['comment'] %>
     <%- end -%>