refactor http-response rules addition

Author: KrisMagjistari

manifests/haproxy/autoload.pp

@@ -83,33 +83,32 @@
       }
 
       $http_edge_rules_all = Hash($http_edge_rules_all_placeholder)
+      # Filter undef fields from the http-edge rules
       $http_edge_rules_all_real_without_undef = $http_edge_rules_all.map |$key, $value| {
         $real_rules = $value.filter |$rules| { $rules =~ NotUndef }
         [$key, $real_rules]
       }
       $http_edge_rules_all_real = Hash($http_edge_rules_all_real_without_undef)
 
+      # Insert additional http-edge rules that are service specific
       if 'canonicals' in $http_edge_services or 'status410' in $http_edge_services {
-        $http_response_rules = $ducktape::haproxy::frontends[$http_edge_frontend]['options']['http-response']
         if 'canonicals' in $http_edge_services {
           $http_edge_canonicals_rules_real = flatten($http_edge_rules_all_real['canonicals'], 'set-var(txn.canonical_custom) hdr(X-Canonical-Custom) if { hdr(X-Canonical-Custom) -m found }', 'del-header X-Canonical-Custom if { hdr(X-Canonical-Custom) -m found }')
-          $http_response_canonicals_rules_real = concat($http_response_rules, 'set-header link %[var(txn.canonical_custom)] if { var(txn.canonical_custom) -m found }')
-        }
-        if 'status410' in $http_edge_services {
-          $http_response_status410_rules_real = concat($http_response_rules, 'set-status 410 if { var(txn.status410) -m bool }')
         }
-        if 'canonicals' in $http_edge_services and 'status410' in $http_edge_services {
-          $http_response_rules_real_placeholder = concat($http_response_canonicals_rules_real, $http_response_status410_rules_real)
-          $http_response_rules_real = unique($http_response_rules_real_placeholder)
-        } elsif 'canonicals' in $http_edge_services {
-          $http_response_rules_real = $http_response_canonicals_rules_real
-        } else {
-          $http_response_rules_real = $http_response_status410_rules_real
+        $http_response_rules = $ducktape::haproxy::frontends[$http_edge_frontend]['options']['http-response']
+        $http_response_new_rules = $http_edge_services.map | $service | {
+          if $service == 'canonicals' {
+            'set-header link %[var(txn.canonical_custom)] if { var(txn.canonical_custom) -m found }'
+          } elsif $service == 'canonicals' {
+            'set-status 410 if { var(txn.status410) -m bool }'
+          }
         }
+        $http_response_new_rules_real = $http_response_rules.filter |$rules| { $rules =~ NotUndef }
+        $http_response_rules_real = concat($http_response_rules, $http_response_new_rules_real)
         $http_response_rules_hash = {$http_edge_frontend => {'options' => {'http-response' => $http_response_rules_real}}}
       }
 
-      # Insert http-edge redirect rules at the marker position, or at the end if no marker
+      # Insert http-edge rules at the marker position, or at the end if no marker
       $http_request_rules = $ducktape::haproxy::frontends[$http_edge_frontend]['options']['http-request']
       if 'redirects' in $http_edge_services and grep($http_request_rules, $http_edge_markers['redirects']) == [] {
         $http_request_rules_with_redirects = concat($http_request_rules, $http_edge_rules_all_real['redirects'])