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

[Haw Loeung]

Fixed passing through HAProxy backend options

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

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

[Barry Price (barryprice)]

+1

review: Approve

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

Change successfully merged at revision 68515ed2ee86f8b5f1e1b4bb5a8f0397b5249d9f

diff --git a/reactive/content_cache.py b/reactive/content_cache.py
index c3487d6..42c0997 100644
--- a/reactive/content_cache.py
+++ b/reactive/content_cache.py
@@ -298,6 +298,9 @@ def configure_haproxy():  # NOQA: C901 LP#1825084
             if backend_check_path:
                 new_cached_loc_conf['backend-check-path'] = backend_check_path
                 new_loc_conf['backend-check-path'] = backend_check_path
+            backend_options = loc_conf.get('backend-options')
+            if backend_options:
+                new_loc_conf['backend-options'] = backend_options
             new_cached_loc_conf['signed-url-hmac-key'] = loc_conf.get('signed-url-hmac-key')
             # Pass through selected backend location configs, if defined.
             for key in ('site-name', 'backend-inter-time', 'backend-tls'):
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 b09d77e..bd1bd1e 100644
--- a/tests/unit/files/content_cache_rendered_haproxy_test_output.txt
+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output.txt
@@ -177,6 +177,8 @@ backend backend-cached-site3-local
     server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096
 
 backend backend-site3-local
+    option forwardfor except 127.0.0.1
+    option forceclose
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
     http-request set-header Host site3.local
     balance leastconn
diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt
index 0b8a9f4..d7c2c0a 100644
--- a/tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt
+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_auto_maxconns.txt
@@ -177,6 +177,8 @@ backend backend-cached-site3-local
     server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096
 
 backend backend-site3-local
+    option forwardfor except 127.0.0.1
+    option forceclose
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
     http-request set-header Host site3.local
     balance leastconn
diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output_load_balancing_algorithm.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output_load_balancing_algorithm.txt
index b2958cb..486f3a2 100644
--- a/tests/unit/files/content_cache_rendered_haproxy_test_output_load_balancing_algorithm.txt
+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_load_balancing_algorithm.txt
@@ -177,6 +177,8 @@ backend backend-cached-site3-local
     server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096
 
 backend backend-site3-local
+    option forwardfor except 127.0.0.1
+    option forceclose
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
     http-request set-header Host site3.local
     balance roundrobin
diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt
index 52e9cdd..4e64b08 100644
--- a/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt
+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output_processes_and_threads.txt
@@ -178,6 +178,8 @@ backend backend-cached-site3-local
     server server_1 127.0.0.1:6082 check inter 2s rise 2 fall 60 maxconn 4096
 
 backend backend-site3-local
+    option forwardfor except 127.0.0.1
+    option forceclose
     option httpchk HEAD / HTTP/1.0\r\nHost:\ site3.local\r\nUser-Agent:\ haproxy/httpchk\r\nCache-Control:\ no-cache
     http-request set-header Host site3.local
     balance leastconn