Merge ~nick-moffitt/content-cache-charm:snapstore-cache-bug into content-cache-charm:master

[Nick Moffitt]

Make secrets yaml layout match config layout

[🤖 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)]

The config.yaml entry for site_secrets will need udpating too.

[Nick Moffitt (nick-moffitt)]

review: Needs Resubmitting

[Tom Haddon (mthaddon)]

LGTM

review: Approve

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

Change successfully merged at revision 6fa85fc947dbeddda6aff4d705481925af50130e

diff --git a/config.yaml b/config.yaml
index 7a2e6ee..cbd0b29 100644
--- a/config.yaml
+++ b/config.yaml
@@ -23,6 +23,8 @@ options:
     description: |
       YAML-formatted dictionary of secrets/keys. e.g.
       site1.local:
-        origin-headers:
-          X-Origin-Key: my-origin-secret-key
-        signed-url-hmac-key: my-signed-url-secret-key
+        locations:
+          "/":
+            origin-headers:
+              X-Origin-Key: my-origin-secret-key
+            signed-url-hmac-key: my-signed-url-secret-key
diff --git a/reactive/content_cache.py b/reactive/content_cache.py
index be5663a..a648087 100644
--- a/reactive/content_cache.py
+++ b/reactive/content_cache.py
@@ -396,7 +396,7 @@ def interpolate_secrets(sites, secrets):
         if not secrets or not secrets.get(site):
             continue
         for location, loc_conf in site_conf.get('locations', {}).items():
-            location_secrets = secrets.get(site).get(location)
+            location_secrets = secrets.get(site).get('locations').get(location)
 
             signed_url_hmac_key = loc_conf.get('signed-url-hmac-key')
             if signed_url_hmac_key == '${secret}':
diff --git a/tests/unit/files/config_test_secrets.txt b/tests/unit/files/config_test_secrets.txt
index d28f0f8..ac0fb2b 100644
--- a/tests/unit/files/config_test_secrets.txt
+++ b/tests/unit/files/config_test_secrets.txt
@@ -1,5 +1,6 @@
 site1.local:
-  /:
-    origin-headers:
-      X-Origin-Key: Sae6oob2aethuosh
-    signed-url-hmac-key: xooBaLemenae6voopooz
+  locations:
+    /:
+      origin-headers:
+        X-Origin-Key: Sae6oob2aethuosh
+      signed-url-hmac-key: xooBaLemenae6voopooz
diff --git a/tests/unit/test_content_cache.py b/tests/unit/test_content_cache.py
index d937c4b..00df816 100644
--- a/tests/unit/test_content_cache.py
+++ b/tests/unit/test_content_cache.py
@@ -454,15 +454,18 @@ site5.local:
     def test_secrets_from_config(self):
         secrets_yaml = '''
 site1.local:
-  /:
-    origin-headers:
-      X-Some-Header: myvalue
+  locations:
+    /:
+      origin-headers:
+        X-Some-Header: myvalue
 '''
         want = {
             'site1.local': {
-                '/': {
-                    'origin-headers': {
-                        'X-Some-Header': 'myvalue',
+                'locations': {
+                    '/': {
+                        'origin-headers': {
+                          'X-Some-Header': 'myvalue',
+                        }
                     }
                 }
             }
@@ -475,14 +478,17 @@ site1.local:
     def test_interpolate_secrets(self):
         secrets = {
             'site1.local': {
-                '/': {
-                    'origin-headers': {
-                        'X-Origin-Key': 'Sae6oob2aethuosh'
-                    },
-                    'signed-url-hmac-key': 'Maiqu7ohmeiSh6ooroa0'
+                'locations': {
+                    '/': {
+                        'origin-headers': {
+                            'X-Origin-Key': 'Sae6oob2aethuosh'
+                        },
+                        'signed-url-hmac-key': 'Maiqu7ohmeiSh6ooroa0'
+                    }
                 }
             }
         }
+
         config = {
             'site1.local': {
                 'locations': {