Merge ~hloeung/content-cache-charm:haproxy-config into content-cache-charm:master

[Haw Loeung]

Fixed to support multiple server template configs

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

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

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

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

[Joel Sing (jsing)]

LGTM

review: Approve (+1)

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

Change successfully merged at revision 0b9452a319d89ca7f6686ea5980b1720d27b1dc3

diff --git a/lib/haproxy.py b/lib/haproxy.py
index cfbabfd..60e9660 100644
--- a/lib/haproxy.py
+++ b/lib/haproxy.py
@@ -272,7 +272,7 @@ backend backend-{name}
                     for flag in flags:
                         # https://www.haproxy.com/documentation/hapee/1-8r2/traffic-management/dns-service-discovery/dns-srv-records/
                         if flag == 'srv':
-                            name = 'server-template server_ {}'.format(flags[flags.index(flag) + 1])
+                            name = 'server-template server_{}_ {}'.format(count, flags[flags.index(flag) + 1])
                         elif flag == 'backup':
                             backup = ' backup'
 
diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output_backup.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output_backup.txt
index 244fc2e..06670cd 100644
--- a/tests/unit/files/content_cache_rendered_haproxy_test_output_backup.txt
+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_backup.txt
@@ -76,20 +76,19 @@ listen  stats
 	stats refresh 3
 
 
-listen redirect-site1-local
+listen cached-site1-local
     bind 0.0.0.0:80
     bind :::80
-    redirect prefix https://site1.local
-
-listen cached-site1-local
-    bind 0.0.0.0:443 ssl crt /var/lib/haproxy/certs alpn h2,http/1.1
-    bind :::443 ssl crt /var/lib/haproxy/certs alpn h2,http/1.1
     default_backend backend-cached-site1-local
 
 listen site1-local
     bind 127.0.0.1:8080
     default_backend backend-site1-local
 
+listen site1-local-2
+    bind 127.0.0.1:8081
+    default_backend backend-site1-local-2
+
 backend backend-cached-site1-local
     option forwardfor
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
@@ -98,8 +97,16 @@ backend backend-cached-site1-local
     server server_1 127.0.0.1:6080 check inter 2s rise 2 fall 60 maxconn 2048
 
 backend backend-site1-local
+    option allbackups
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
     http-request set-header Host site1.local
     balance leastconn
     server server_1 192.168.1.1:8080 check inter 5s rise 2 fall 5 maxconn 2048
     server server_2 192.168.1.2:8080 backup check inter 5s rise 2 fall 5 maxconn 2048
+
+backend backend-site1-local-2
+    option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
+    http-request set-header Host site1.local
+    balance leastconn
+    server server_1 192.168.1.1:8080 check inter 5s rise 2 fall 5 maxconn 2048
+    server server_2 192.168.1.2:8080 check inter 5s rise 2 fall 5 maxconn 2048
diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output_srv_template.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output_srv_template.txt
index 8c24f8d..5037a1e 100644
--- a/tests/unit/files/content_cache_rendered_haproxy_test_output_srv_template.txt
+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_srv_template.txt
@@ -96,4 +96,5 @@ backend backend-site1-local
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site1.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
     http-request set-header Host site1.local
     balance leastconn
-    server-template server_ 4 _http._tcp.uk.archive.ubuntu.com:80 resolvers dns init-addr none check inter 5s rise 2 fall 5 maxconn 2048
+    server-template server_1_ 2 _http._tcp.us.archive.ubuntu.com:80 resolvers dns init-addr none check inter 5s rise 2 fall 5 maxconn 2048
+    server-template server_2_ 2 _http._tcp.gb.archive.ubuntu.com:80 backup resolvers dns init-addr none check inter 5s rise 2 fall 5 maxconn 2048
diff --git a/tests/unit/test_content_cache.py b/tests/unit/test_content_cache.py
index 073eb8b..1c11a30 100644
--- a/tests/unit/test_content_cache.py
+++ b/tests/unit/test_content_cache.py
@@ -472,10 +472,10 @@ site1.local:
 site1.local:
   locations:
     /:
-      backend-tls: false
+      backend-options: ['allbackups']
       backends: ['192.168.1.1:8080', '192.168.1.2:8080 backup']
-  redirect-http-to-https: True
-  tls-cert-bundle-path: /var/lib/haproxy/certs
+    /some-path:
+      backends: ['192.168.1.1:8080', '192.168.1.2:8080']
 '''
         self.mock_config.return_value = {'haproxy_hard_stop_after': '15m', 'max_connections': 8192, 'sites': config}
         with mock.patch('lib.haproxy.HAProxyConf.conf_file', new_callable=mock.PropertyMock) as mock_conf_file:
@@ -500,7 +500,9 @@ site1.local:
 site1.local:
   locations:
     /:
-      backends: ['_http._tcp.uk.archive.ubuntu.com:80 srv 4']
+      backends:
+        - _http._tcp.us.archive.ubuntu.com:80 srv 2
+        - _http._tcp.gb.archive.ubuntu.com:80 srv 2 backup
 '''
         self.mock_config.return_value = {'haproxy_hard_stop_after': '15m', 'max_connections': 8192, 'sites': config}
         with mock.patch('lib.haproxy.HAProxyConf.conf_file', new_callable=mock.PropertyMock) as mock_conf_file: