From aa7c7651e59064e5fbfb745fea32c1fa6db6e57b Mon Sep 17 00:00:00 2001
From: Dan Helfman <witten@torsion.org>
Date: Mon, 18 Feb 2019 13:27:35 -0800
Subject: [PATCH] Fix config repositories consumption.

---
 borgmatic/config/validate.py       |  4 ++--
 tests/unit/config/test_validate.py | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/borgmatic/config/validate.py b/borgmatic/config/validate.py
index 8c381c2e..3a275b65 100644
--- a/borgmatic/config/validate.py
+++ b/borgmatic/config/validate.py
@@ -124,7 +124,7 @@ def guard_configuration_contains_repository(repository, configurations):
             tuple(
                 config_repository
                 for config in configurations.values()
-                for config_repository in config['repositories']
+                for config_repository in config['location']['repositories']
             )
         )
 
@@ -141,7 +141,7 @@ def guard_configuration_contains_repository(repository, configurations):
         tuple(
             config_repository
             for config in configurations.values()
-            for config_repository in config['repositories']
+            for config_repository in config['location']['repositories']
             if repository == config_repository
         )
     )
diff --git a/tests/unit/config/test_validate.py b/tests/unit/config/test_validate.py
index 42bb468f..c31d969b 100644
--- a/tests/unit/config/test_validate.py
+++ b/tests/unit/config/test_validate.py
@@ -94,27 +94,29 @@ def test_apply_logical_validation_does_not_raise_otherwise():
 
 def test_guard_configuration_contains_repository_does_not_raise_when_repository_in_config():
     module.guard_configuration_contains_repository(
-        repository='repo', configurations={'config.yaml': {'repositories': ['repo']}}
+        repository='repo', configurations={'config.yaml': {'location': {'repositories': ['repo']}}}
     )
 
 
 def test_guard_configuration_contains_repository_does_not_raise_when_repository_not_given():
     module.guard_configuration_contains_repository(
-        repository=None, configurations={'config.yaml': {'repositories': ['repo']}}
+        repository=None, configurations={'config.yaml': {'location': {'repositories': ['repo']}}}
     )
 
 
 def test_guard_configuration_contains_repository_errors_when_repository_assumed_to_match_config_twice():
     with pytest.raises(ValueError):
         module.guard_configuration_contains_repository(
-            repository=None, configurations={'config.yaml': {'repositories': ['repo', 'repo2']}}
+            repository=None,
+            configurations={'config.yaml': {'location': {'repositories': ['repo', 'repo2']}}},
         )
 
 
 def test_guard_configuration_contains_repository_errors_when_repository_missing_from_config():
     with pytest.raises(ValueError):
         module.guard_configuration_contains_repository(
-            repository='nope', configurations={'config.yaml': {'repositories': ['repo', 'repo2']}}
+            repository='nope',
+            configurations={'config.yaml': {'location': {'repositories': ['repo', 'repo2']}}},
         )
 
 
@@ -123,7 +125,7 @@ def test_guard_configuration_contains_repository_errors_when_repository_matches_
         module.guard_configuration_contains_repository(
             repository='repo',
             configurations={
-                'config.yaml': {'repositories': ['repo', 'repo2']},
-                'other.yaml': {'repositories': ['repo']},
+                'config.yaml': {'location': {'repositories': ['repo', 'repo2']}},
+                'other.yaml': {'location': {'repositories': ['repo']}},
             },
         )