Some fixes to the manifest tests involving shared components

newsfragments/152.internal.md

@@ -0,0 +1 @@
+Fix manifest tests issues with shared components, specifically initSecrets.

tests/manifests/test_basic.py

@@ -4,7 +4,7 @@
 
 import pytest
 
-from . import component_details, values_files_to_test
+from . import component_details, shared_components_details, values_files_to_test
 
 
 @pytest.mark.parametrize("values_file", ["nothing-enabled-values.yaml"])
@@ -23,6 +23,8 @@ async def test_values_file_renders_only_itself(release_name, component, template
         f"{release_name}-{component_details[component]['hyphened_name']}",
     ]
     for shared_component in component_details[component].get("shared_components", []):
-        allowed_starts_with.append(f"{release_name}-{shared_component}")
+        allowed_starts_with.append(f"{release_name}-{shared_components_details[shared_component]['hyphened_name']}")
     for template in templates:
-        assert any(template["metadata"]["name"].startswith(allowed_start) for allowed_start in allowed_starts_with)
+        assert any(template["metadata"]["name"].startswith(allowed_start) for allowed_start in allowed_starts_with), (
+            f"{[template['metadata']['name']]} does not start with one of {allowed_starts_with}"
+        )

tests/manifests/test_service_monitors.py

@@ -96,6 +96,8 @@ async def test_service_monitored_as_appropriate(component, values: dict, make_te
     for shared_component in component_details[component].get("shared_components", []):
         if shared_components_details[shared_component]["has_service_monitor"]:
             values.setdefault(shared_component, {}).setdefault("serviceMonitors", {}).setdefault("enabled", False)
+        else:
+            values.setdefault(shared_component, {}).setdefault("labels", {}).setdefault("servicemonitor", "none")
 
     # We should now have no ServiceMonitors rendered
     workloads_to_cover = set()