Merge ~nick-moffitt/content-cache-charm:per-location-listen-stanzas into content-cache-charm:master

[Nick Moffitt]

Create haproxy listen stanzas to match ALL nginx back-end statements

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Tom Haddon (mthaddon)]

LGTM, thx

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision bcad84d4df6f5a869b1b3ca76ba26aa7f4871a3e

diff --git a/lib/haproxy.py b/lib/haproxy.py
index 8c315e1..6b787eb 100644
--- a/lib/haproxy.py
+++ b/lib/haproxy.py
@@ -63,6 +63,21 @@ class HAProxyConf:
                 new[name] = {}
             new[name][site] = config[site]
             new[name][site]['port'] = port
+
+            for location, loc_conf in config[site].get('locations', {}).items():
+                if 'backend_port' in loc_conf:
+                    port = loc_conf['backend_port']
+                    name = '{}:{}'.format(listen_address, port)
+                    if name not in new:
+                        new[name] = {}
+                    count = 2
+                    new_site = site
+                    while new_site in new[name]:
+                        new_site = '{}-{}'.format(site, count)
+                        count += 1
+                    if site not in new[name] or new[name][site]['port'] != port:
+                        new[name][new_site] = config[site]
+                        new[name][new_site]['port'] = port
         return new
 
     def render_stanza_listen(self, config):
@@ -73,6 +88,7 @@ listen {name}
         backend_conf = '{indent}use_backend backend-{backend} if {{ hdr(Host) -i {site_name} }}\n'
 
         rendered_output = []
+        stanza_names = []
 
         # For listen stanzas, we need to merge them and use 'use_backend' with
         # the 'Host' header to direct to the correct backends.
@@ -84,9 +100,10 @@ listen {name}
                 site_name = site_conf.get('site-name', site)
 
                 if len(config[address_port].keys()) == 1:
-                    name = self._generate_stanza_name(site)
+                    name = self._generate_stanza_name(site, stanza_names)
                 else:
                     name = 'combined-{}'.format(address_port.split(':')[1])
+                stanza_names.append(name)
 
                 tls_path = site_conf.get('tls-cert-bundle-path')
                 if tls_path:
diff --git a/reactive/content_cache.py b/reactive/content_cache.py
index 82d255c..45e1c07 100644
--- a/reactive/content_cache.py
+++ b/reactive/content_cache.py
@@ -210,6 +210,8 @@ def configure_haproxy():
                 }
 
             new_loc_conf = new_conf[site]['locations'][location] = {'backends': loc_conf['backends']}
+            if 'backend_port' in loc_conf:
+                new_loc_conf['backend_port'] = loc_conf['backend_port']
 
             backend_check_method = loc_conf.get('backend-check-method')
             if backend_check_method:
diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output.txt
index f2077ab..1d38f70 100644
--- a/tests/unit/files/content_cache_rendered_haproxy_test_output.txt
+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output.txt
@@ -80,6 +80,10 @@ listen site5
     bind 127.0.0.1:8083
     default_backend backend-site5
 
+listen site5-2
+    bind 127.0.0.1:8084
+    default_backend backend-site5
+
 listen site6-local
     bind 127.0.0.1:8085
     default_backend backend-site6-local
@@ -97,6 +101,10 @@ listen site8-local
     bind 127.0.0.1:8087
     default_backend backend-site8-local
 
+listen site8-local-2
+    bind 127.0.0.1:8088
+    default_backend backend-site8-local
+
 backend backend-cached-site1-local
     option forwardfor
     option httpchk HEAD /?token=1868572800_4eb30fc94f247635f7ed445083a4783862ad58de HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk