Handle multiple modules coming from sibling layers config (#188)

* Handle multiple modules coming from sibling layers config * fixup! Handle multiple modules coming from sibling layers config
seddonym · Aug 21, 2023 · 6a0c78f · 6a0c78f
1 parent 3743e09
commit 6a0c78f
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 7 deletions.
diff --git a/src/importlinter/contracts/layers.py b/src/importlinter/contracts/layers.py
@@ -222,13 +222,14 @@ def _get_undeclared_modules(self, graph: grimp.ImportGraph) -> set[str]:
         return undeclared_modules
 
     def _check_all_containerless_layers_exist(self, graph: grimp.ImportGraph) -> None:
-        for layer in self.layers:  # type: ignore
-            if layer.is_optional:
-                continue
-            if layer.name not in graph.modules:
-                raise ValueError(
-                    f"Missing layer '{layer.name}': module {layer.name} does not exist."
-                )
+        for layers in self.layers:  # type: ignore
+            for layer in {layers} if isinstance(layers, Layer) else layers:
+                if layer.is_optional:
+                    continue
+                if layer.name not in graph.modules:
+                    raise ValueError(
+                        f"Missing layer '{layer.name}': module {layer.name} does not exist."
+                    )
 
     def _module_from_layer(self, layer: Layer, container: str | None = None) -> Module:
         if container:

diff --git a/tests/unit/contracts/test_layers.py b/tests/unit/contracts/test_layers.py
@@ -152,6 +152,36 @@ def test_illegal_imports(self):
             "undeclared_modules": set(),
         }
 
+    def test_is_valid_with_minimal_config(self):
+        contract = LayersContract(
+            name="Layer contract",
+            session_options={"root_packages": ["mypackage"]},
+            contract_options={
+                "layers": [
+                    "mypackage.high",
+                    "mypackage.medium_a | mypackage.medium_b | mypackage.medium_c",
+                    "mypackage.low",
+                ]
+            },
+        )
+        graph = ImportGraph()
+        for module in (
+            "mypackage",
+            "mypackage.high",
+            "mypackage.medium_a",
+            "mypackage.medium_b",
+            "mypackage.medium_c",
+            "mypackage.low",
+        ):
+            graph.add_module(module)
+        # Add some 'legal' imports.
+        graph.add_import(importer="mypackage.high.green", imported="mypackage.medium.orange")
+        graph.add_import(importer="mypackage.utils", imported="mypackage.medium.red")
+
+        contract_check = contract.check(graph=graph, verbose=False)
+
+        assert contract_check.kept is True
+
 
 class TestLayerMultipleContainers:
     def test_no_illegal_imports_means_contract_is_kept(self):