Make it possible to link a specific container to a Sidecar in the manifest tests

Author: benbz

tests/manifests/__init__.py

@@ -155,6 +155,10 @@ def set_helm_values(self, all_values: dict[str, Any], propertyType: PropertyType
     def owns_manifest_named(self, manifest_name: str) -> bool:
         pass
 
+    @abc.abstractmethod
+    def deployable_details_for_container(self, container_name: str | None) -> "DeployableDetails | None":
+        pass
+
 
 @dataclass(unsafe_hash=True)
 class SidecarDetails(DeployableDetails):
@@ -187,6 +191,9 @@ 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
+
 
 @dataclass(unsafe_hash=True)
 class SubComponentDetails(DeployableDetails):
@@ -201,6 +208,12 @@ 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:
+        for sidecar in self.sidecars:
+            if sidecar.deployable_details_for_container(container_name) is not None:
+                return sidecar
+        return self
+
 
 @dataclass(unsafe_hash=True)
 class ComponentDetails(DeployableDetails):
@@ -265,6 +278,12 @@ 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:
+        for sidecar in self.sidecars:
+            if sidecar.deployable_details_for_container(container_name) is not None:
+                return sidecar
+        return self
+
 
 all_components_details = [
     ComponentDetails(

tests/manifests/utils.py

@@ -295,7 +295,9 @@ def iterate_synapse_workers_parts(
 
 @pytest.fixture
 def template_to_deployable_details(deployables_details: tuple[DeployableDetails]):
-    def _template_to_deployable_details(template: dict[str, Any]) -> DeployableDetails:
+    def _template_to_deployable_details(
+        template: dict[str, Any], container_name: str | None = None
+    ) -> DeployableDetails:
         # As per test_labels this doesn't have the release_name prefixed to it
         manifest_name: str = template["metadata"]["labels"]["app.kubernetes.io/name"]
 
@@ -317,6 +319,10 @@ def _template_to_deployable_details(template: dict[str, Any]) -> DeployableDetai
                 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"
+        )
         return match
 
     return _template_to_deployable_details