move peer app databag to property

peer relation not available in install event
canonical · Jun 29, 2023 · 6a8e044 · 6a8e044
1 parent 74e24f6
commit 6a8e044
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/src/relations/deprecated_shared_db_database_provides.py b/src/relations/deprecated_shared_db_database_provides.py
@@ -162,10 +162,6 @@ def __init__(self, charm_: "abstract_charm.MySQLRouterCharm") -> None:
             logger.warning(
                 "'mysql-shared' relation interface is DEPRECATED and will be removed in a future release. Use 'mysql_client' interface instead."
             )
-        self._unit = charm_.unit
-        self._peer_app_databag = charm_.model.get_relation(
-            self._CREDENTIALS_PEER_RELATION_ENDPOINT_NAME
-        ).data[charm_.app]
         charm_.framework.observe(
             charm_.on[self._NAME].relation_changed,
             charm_.reconcile_database_relations,
@@ -178,6 +174,13 @@ def __init__(self, charm_: "abstract_charm.MySQLRouterCharm") -> None:
             charm_.on[self._CREDENTIALS_PEER_RELATION_ENDPOINT_NAME].relation_changed,
             self._update_unit_databag,
         )
+        self._charm = charm_
+
+    @property
+    def _peer_app_databag(self) -> ops.RelationDataContent:
+        return self._charm.model.get_relation(self._CREDENTIALS_PEER_RELATION_ENDPOINT_NAME).data[
+            self._charm.app
+        ]
 
     def _update_unit_databag(self, event: ops.RelationChangedEvent) -> None:
         """Synchronize shared-db unit databag with peer app databag.
@@ -196,7 +199,7 @@ def _update_unit_databag(self, event: ops.RelationChangedEvent) -> None:
                 requested_users.append(
                     _RelationThatRequestedUser(
                         relation=relation,
-                        unit=self._unit,
+                        unit=self._charm.unit,
                         peer_relation_app_databag=self._peer_app_databag,
                         event=event,
                     )
@@ -221,7 +224,7 @@ def _created_users(self) -> typing.List[_RelationWithCreatedUser]:
                 created_users.append(
                     _RelationWithCreatedUser(
                         relation=relation,
-                        unit=self._unit,
+                        unit=self._charm.unit,
                         peer_relation_app_databag=self._peer_app_databag,
                     )
                 )
@@ -248,7 +251,7 @@ def reconcile_users(
                 requested_users.append(
                     _RelationThatRequestedUser(
                         relation=relation,
-                        unit=self._unit,
+                        unit=self._charm.unit,
                         peer_relation_app_databag=self._peer_app_databag,
                         event=event,
                     )
@@ -294,7 +297,7 @@ def get_status(self, event) -> typing.Optional[ops.StatusBase]:
                 requested_users.append(
                     _RelationThatRequestedUser(
                         relation=relation,
-                        unit=self._unit,
+                        unit=self._charm.unit,
                         peer_relation_app_databag=self._peer_app_databag,
                         event=event,
                     )