commit aeb1e5ee2d7642f4fcd7f81d808530bde779359e
author sousaedu <eduardo.sousa@canonical.com> Tue Jan 05 14:39:30 2021 +0000
committer beierlm <mark.beierl@canonical.com> Tue Jan 05 21:23:30 2021 +0100
tree 73c57ded11d9b80a27fcfd9264b7976702e25c69
parent 13722ca955cf2dfc9fd7b11a4c11ea5dc63f1e46

Removing pydantic from MON charm

Change-Id: Ice1c19c142f16ad8af6b9bc2ac20295f3b5215b9
Signed-off-by: sousaedu <eduardo.sousa@canonical.com>

installers/charm/mon/src/charm.py

diff --git a/installers/charm/mon/src/charm.py b/installers/charm/mon/src/charm.py
index a6f405f..f51213d 100755
--- a/installers/charm/mon/src/charm.py
+++ b/installers/charm/mon/src/charm.py
@@ -21,7 +21,6 @@
 ##
 
 import logging
-from pydantic import ValidationError
 from typing import Any, Dict, NoReturn
 
 from ops.charm import CharmBase, CharmEvents
@@ -112,10 +111,8 @@
         Args:
             event (EventBase): Kafka relation event.
         """
-        data_loc = event.unit if event.unit else event.app
-
-        message_host = event.relation.data[data_loc].get("host")
-        message_port = event.relation.data[data_loc].get("port")
+        message_host = event.relation.data[event.unit].get("host")
+        message_port = event.relation.data[event.unit].get("port")
 
         if (
             message_host
@@ -145,9 +142,7 @@
         Args:
             event (EventBase): DB relation event.
         """
-        data_loc = event.unit if event.unit else event.app
-
-        database_uri = event.relation.data[data_loc].get("connection_string")
+        database_uri = event.relation.data[event.unit].get("connection_string")
 
         if database_uri and self.state.database_uri != database_uri:
             self.state.database_uri = database_uri
@@ -168,10 +163,8 @@
         Args:
             event (EventBase): Prometheus relation event.
         """
-        data_loc = event.unit if event.unit else event.app
-
-        prometheus_host = event.relation.data[data_loc].get("hostname")
-        prometheus_port = event.relation.data[data_loc].get("port")
+        prometheus_host = event.relation.data[event.unit].get("hostname")
+        prometheus_port = event.relation.data[event.unit].get("port")
 
         if (
             prometheus_host
@@ -265,7 +258,7 @@
                 self.model.app.name,
                 self.port,
             )
-        except ValidationError as exc:
+        except ValueError as exc:
             LOGGER.exception("Config/Relation data validation error")
             self.unit.status = BlockedStatus(str(exc))
             return