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

[Haw Loeung]

Allow overriding Nginx's 'location' modifier

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

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

[Joel Sing (jsing)]

LGTM

review: Approve (+1)

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

Change successfully merged at revision 950bb86f185e83c5214bde20c74c14b5099d8c06

diff --git a/reactive/content_cache.py b/reactive/content_cache.py
index d40c75a..7f4f3a3 100644
--- a/reactive/content_cache.py
+++ b/reactive/content_cache.py
@@ -99,6 +99,7 @@ def configure_nginx(conf_path=None):
         for location, loc_conf in site_conf.get('locations', {}).items():
             conf['locations'][location] = {}
             lc = conf['locations'][location]
+            lc['modifier'] = loc_conf.get('modifier')
 
             backend_port = loc_conf.get('backend_port')
             if backend_port:
diff --git a/templates/nginx_cfg.tmpl b/templates/nginx_cfg.tmpl
index 25c6805..f84c6cc 100644
--- a/templates/nginx_cfg.tmpl
+++ b/templates/nginx_cfg.tmpl
@@ -6,7 +6,7 @@ server {
 
 {%- for location, conf in locations.items() %}
 
-    location {{ location }} {
+    location {% if conf['modifier'] %}{{conf['modifier']}} {% endif %}{{ location }} {
 {%- if conf['backend'] %}
         proxy_pass {{conf['backend']}};
         proxy_set_header Host "{{site}}";
diff --git a/tests/unit/files/config_test_config.txt b/tests/unit/files/config_test_config.txt
index 256217c..e074496 100644
--- a/tests/unit/files/config_test_config.txt
+++ b/tests/unit/files/config_test_config.txt
@@ -63,5 +63,6 @@ site5:
       backends:
         - 127.0.1.10:80
     /auth:
+      modifier: '='
       backends:
         - 127.0.1.11:80
diff --git a/tests/unit/files/nginx_config_rendered_test_output-site5.txt b/tests/unit/files/nginx_config_rendered_test_output-site5.txt
index 3ff24d3..9425247 100644
--- a/tests/unit/files/nginx_config_rendered_test_output-site5.txt
+++ b/tests/unit/files/nginx_config_rendered_test_output-site5.txt
@@ -17,7 +17,7 @@ server {
     }
 
 
-    location /auth {
+    location = /auth {
         proxy_pass http://localhost:8084;
         proxy_set_header Host "site5.local";
         proxy_cache site5-cache;
diff --git a/tests/unit/test_nginx.py b/tests/unit/test_nginx.py
index f9ceb23..a58ef7e 100644
--- a/tests/unit/test_nginx.py
+++ b/tests/unit/test_nginx.py
@@ -55,6 +55,7 @@ class TestLibNginx(unittest.TestCase):
             for location, loc_conf in site_conf.get('locations', {}).items():
                 conf['locations'][location] = {}
                 lc = conf['locations'][location]
+                lc['modifier'] = loc_conf.get('modifier')
 
                 if loc_conf.get('backends'):
                     backend_port += 1