add TypedDict

src/cosl/coordinated_workers/coordinator.py

@@ -29,7 +29,7 @@
 import yaml
 
 import cosl
-from cosl.coordinated_workers.interface import ClusterProvider
+from cosl.coordinated_workers.interface import ClusterProvider, RemoteWriteEndpoint
 from cosl.coordinated_workers.nginx import (
     Nginx,
     NginxMappingOverrides,
@@ -175,7 +175,7 @@ def __init__(
         resources_limit_options: Optional[_ResourceLimitOptionsMapping] = None,
         resources_requests: Optional[Callable[["Coordinator"], Dict[str, str]]] = None,
         container_name: Optional[str] = None,
-        remote_write_endpoints: Optional[Callable[[], List[Dict[str, str]]]] = None,
+        remote_write_endpoints: Optional[Callable[[], List[RemoteWriteEndpoint]]] = None,
     ):
         """Constructor for a Coordinator object.
 

src/cosl/coordinated_workers/interface.py

@@ -31,6 +31,7 @@
 import yaml
 from ops import EventSource, Object, ObjectEvents, RelationCreatedEvent
 from pydantic import ConfigDict
+from typing_extensions import TypedDict
 
 import cosl
 
@@ -122,6 +123,12 @@ def dump(self, databag: Optional[_RawDatabag] = None, clear: bool = True) -> _Ra
 # =============
 
 
+class RemoteWriteEndpoint(TypedDict):
+    """Type of the remote write endpoints to be passed to the worker through cluster relation data."""
+
+    url: str
+
+
 class ConfigReceivedEvent(ops.EventBase):
     """Event emitted when the "-cluster" provider has shared a new  config."""
 
@@ -188,7 +195,7 @@ class ClusterProviderAppData(DatabagModel):
     """Endpoints to which the workload (and the worker charm) can push logs to."""
     tracing_receivers: Optional[Dict[str, str]] = None
     """Endpoints to which the workload (and the worker charm) can push traces to."""
-    remote_write_endpoints: Optional[List[Dict[str, str]]] = None
+    remote_write_endpoints: Optional[List[RemoteWriteEndpoint]] = None
     """Endpoints to which the workload (and the worker charm) can push metrics to."""
 
     ### TLS stuff
@@ -277,7 +284,7 @@ def publish_data(
         privkey_secret_id: Optional[str] = None,
         loki_endpoints: Optional[Dict[str, str]] = None,
         tracing_receivers: Optional[Dict[str, str]] = None,
-        remote_write_endpoints: Optional[List[Dict[str, str]]] = None,
+        remote_write_endpoints: Optional[List[RemoteWriteEndpoint]] = None,
     ) -> None:
         """Publish the config to all related worker clusters."""
         for relation in self._relations:
@@ -545,7 +552,7 @@ def get_tracing_receivers(self) -> Optional[Dict[str, str]]:
             return data.tracing_receivers or {}
         return {}
 
-    def get_remote_write_endpoints(self) -> List[Dict[str, str]]:
+    def get_remote_write_endpoints(self) -> List[RemoteWriteEndpoint]:
         """Fetch the remote write endpoints from the coordinator databag."""
         data = self._get_data_from_coordinator()
         if data:

src/cosl/coordinated_workers/worker.py

@@ -287,6 +287,9 @@ def status(self) -> ServiceEndpointStatus:
             return ServiceEndpointStatus.down
 
     def _on_collect_status(self, e: ops.CollectStatusEvent):
+        if self.resources_patch and self.resources_patch.get_status().name != "active":
+            e.add_status(self.resources_patch.get_status())
+
         if not self._container.can_connect():
             e.add_status(WaitingStatus(f"Waiting for `{self._name}` container"))
         if not self.model.get_relation(self._endpoints["cluster"]):
@@ -317,9 +320,6 @@ def _on_collect_status(self, e: ops.CollectStatusEvent):
             )
         )
 
-        if self.resources_patch:
-            e.add_status(self.resources_patch.get_status())
-
     # Utility functions
     @property
     def roles(self) -> List[str]:

tests/test_coordinated_workers/test_worker.py

@@ -288,6 +288,15 @@ def raise_change_error(*args):
             [{"url": "test-url.com"}],
         ),
         ({"remote_write_endpoints": json.dumps(None), "worker_config": json.dumps("test")}, []),
+        (
+            {
+                "remote_write_endpoints": json.dumps(
+                    [{"url": "test-url.com"}, {"url": "test2-url.com"}]
+                ),
+                "worker_config": json.dumps("test"),
+            },
+            [{"url": "test-url.com"}, {"url": "test2-url.com"}],
+        ),
     ),
 )
 def test_get_remote_write_endpoints(remote_databag, expected):