Merge pull request #445 from element-hq/bbz/corectly-attribute-sidecar-resources

Correctly link sidecar resources again

Author: benbz

newsfragments/430.changed.md renamed to newsfragments/445.changed.md

@@ -159,7 +159,7 @@ def owns_manifest_named(self, manifest_name: str) -> bool:
         pass
 
     @abc.abstractmethod
-    def deployable_details_for_container(self, container_name: str | None) -> "DeployableDetails | None":
+    def deployable_details_for_container(self, container_name: str) -> "DeployableDetails | None":
         pass
 
 
@@ -194,8 +194,8 @@ def owns_manifest_named(self, manifest_name: str) -> bool:
 
         return manifest_name.startswith(self.name)
 
-    def deployable_details_for_container(self, container_name: str | None) -> DeployableDetails | None:
-        return self if container_name is not None and container_name.startswith(self.name) else None
+    def deployable_details_for_container(self, container_name: str) -> DeployableDetails | None:
+        return self if container_name.startswith(self.name) else None
 
 
 @dataclass(unsafe_hash=True)
@@ -211,7 +211,7 @@ def __post_init__(self):
     def owns_manifest_named(self, manifest_name: str) -> bool:
         return manifest_name.startswith(self.name)
 
-    def deployable_details_for_container(self, container_name: str | None) -> DeployableDetails:
+    def deployable_details_for_container(self, container_name: str) -> DeployableDetails:
         for sidecar in self.sidecars:
             if sidecar.deployable_details_for_container(container_name) is not None:
                 return sidecar
@@ -281,7 +281,7 @@ def owns_manifest_named(self, manifest_name: str) -> bool:
 
         return manifest_name.startswith(self.name)
 
-    def deployable_details_for_container(self, container_name: str | None) -> DeployableDetails:
+    def deployable_details_for_container(self, container_name: str) -> DeployableDetails:
         for sidecar in self.sidecars:
             if sidecar.deployable_details_for_container(container_name) is not None:
                 return sidecar

tests/manifests/__init__.py

@@ -319,10 +319,13 @@ def _template_to_deployable_details(
                 match = deployable_details
 
         assert match is not None, f"{template_id(template)} can't be linked to any (sub-)component"
-        match = match.deployable_details_for_container(container_name)
-        assert match is not None, (
-            f"{template_id(template)} can't be linked to any (sub-)component or specific container"
-        )
+        # If this is a template that has multiple containers, the containers could have different ownership
+        # e.g. a sidecar. For everything else we don't need to check further as there's no shared ownership
+        if container_name is not None:
+            match = match.deployable_details_for_container(container_name)
+            assert match is not None, (
+                f"{template_id(template)} can't be linked to any (sub-)component or specific container"
+            )
         return match
 
     return _template_to_deployable_details