f

Author: KrisMagjistari

manifests/haproxy/autoload.pp

@@ -32,7 +32,7 @@
         replace => false,
       }
 
-      $http_edge_services.each | $service | {
+      $http_edge_rules_all_placeholder = $http_edge_services.map | $service | {
         $http_edge_rules = flatten($http_edge_domains_envs.map |$domain, $options| {
           $match_type = pick($options['match_type'], 'str')
           $hdr_match = $match_type ? {
@@ -80,43 +80,47 @@
           }
         })
 
-        case $service {
-          'redirects': { $http_edge_redirect_rules =  $http_edge_rules }
-          'nofollow': { $http_edge_nofollow_rules =  $http_edge_rules  }
-          'status410': { $http_edge_status410_rules =  $http_edge_rules  }
-          'canonicals': { $http_edge_canonicals_rules =  $http_edge_rules  }
-        }
+        #case $service {
+        #  'redirects': { $http_edge_redirect_rules =  $http_edge_rules }
+        #  'nofollow': { $http_edge_nofollow_rules =  $http_edge_rules  }
+        #  'status410': { $http_edge_status410_rules =  $http_edge_rules  }
+        #  'canonicals': { $http_edge_canonicals_rules =  $http_edge_rules  }
+        #}
+        [$service, $http_edge_rules]
       }
 
+      $http_edge_rules_all = Hash($http_edge_rules_all_placeholder)
+      $http_edge_rules_all_real = $http_edge_rules_all.filter |$key $value| { $value != "" }
+
       if 'canonicals' in $http_edge_services {
-        $http_edge_canonicals_rules_real = flatten($http_edge_canonicals_rules, '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_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_rules = $ducktape::haproxy::frontends[$http_edge_frontend]['options']['http-response']
         $http_response_rules_real = concat($http_response_rules, 'set-header link %[var(txn.canonical_custom)] if { var(txn.canonical_custom) -m found }')
         $http_response_rules_hash = {$http_edge_frontend => {'options' => {'http-response' => $http_response_rules_real}}}
-        $frontends_real = deep_merge($ducktape::haproxy::frontends, $http_request_rules_hash)
+        #$frontends_real = deep_merge($ducktape::haproxy::frontends, $http_request_rules_hash)
       }
 
       # Insert http-edge redirect 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 grep($http_request_rules, $http_edge_redirect_marker) == [] {
-        $http_request_rules_with_redirects = concat($http_request_rules, $http_edge_redirect_rules)
+        $http_request_rules_with_redirects = concat($http_request_rules, $http_edge_rules_all_real['redirects'])
       }
       else {
-        $http_request_rules_with_redirects = split(regsubst(join($http_request_rules, "\n"), $http_edge_redirect_marker, join($http_edge_redirect_rules, "\n")), "\n")
+        $http_request_rules_with_redirects = split(regsubst(join($http_request_rules, "\n"), $http_edge_redirect_marker, join($http_edge_rules_all_real['redirects'], "\n")), "\n")
       }
 
       if grep($http_request_rules_with_redirects, $http_edge_status410_marker) == [] {
-        $http_request_rules_with_status410 = concat($http_request_rules_with_redirects, $http_edge_status410_rules)
+        $http_request_rules_with_status410 = concat($http_request_rules_with_redirects, $http_edge_rules_all_real['status410'])
       }
       else {
-        $http_request_rules_with_status410 = split(regsubst(join($http_request_rules_with_redirects, "\n"), $http_edge_status410_marker, join($http_edge_status410_rules, "\n")), "\n")
+        $http_request_rules_with_status410 = split(regsubst(join($http_request_rules_with_redirects, "\n"), $http_edge_status410_marker, join($http_edge_rules_all_real['status410'], "\n")), "\n")
       }
 
       if grep($http_request_rules_with_status410, $http_edge_nofollow_marker) == [] {
-        $http_request_rules_with_nofollow = concat($http_request_rules_with_status410, $http_edge_nofollow_rules)
+        $http_request_rules_with_nofollow = concat($http_request_rules_with_status410, $http_edge_rules_all_real['nofollow'])
       }
       else {
-        $http_request_rules_with_nofollow = split(regsubst(join($http_request_rules_with_status410, "\n"), $http_edge_nofollow_marker, join($http_edge_nofollow_rules, "\n")), "\n")
+        $http_request_rules_with_nofollow = split(regsubst(join($http_request_rules_with_status410, "\n"), $http_edge_nofollow_marker, join($http_edge_rules_all_real['nofollow'], "\n")), "\n")
       }
 
       if grep($http_request_rules_with_nofollow, $http_edge_canonical_marker) == [] {