Merge lp:~sajoupa/landscape-charm/op-framework-fixes into lp:~mitchburton/landscape-charm/op-framework

[Laurent Sesquès]

_db_relation_changed: check that we have all needed keys from the db relation

[lp:~sajoupa/landscape-charm/op-framework-fixes]

427. By Laurent Sesquès on 2023-01-05

_db_relation_changed: typo fix

[Mitch Burton (mitchburton)]

+1 LGTM

review: Approve

=== modified file 'src/charm.py'
--- src/charm.py	2023-01-03 22:46:42 +0000
+++ src/charm.py	2023-01-05 09:22:56 +0000
@@ -257,9 +257,10 @@
     def _db_relation_changed(self, event: RelationChangedEvent) -> None:
         unit_data = event.relation.data[event.unit]
 
-        # Using "master" key as a quick indicator of readiness.
-        if "master" not in unit_data:
-            logger.info("db relation not yet ready")
+        required_relation_data = ["master", "allowed-units", "port", "user"]
+        missing_relation_data = [i for i in required_relation_data if i not in unit_data]
+        if missing_relation_data:
+            logger.info("db relation not yet ready. Missing keys: {}".format(missing_relation_data))
             self.unit.status = ActiveStatus("Unit is ready")
             self._update_ready_status()
             return