Removing pydantic from LCM charm
Change-Id: I08e4acff8b84f4f9a36846cc0f7973d06c4abc1c
Signed-off-by: sousaedu <eduardo.sousa@canonical.com>
diff --git a/installers/charm/lcm/src/charm.py b/installers/charm/lcm/src/charm.py
index d65bdcf..52b6964 100755
--- a/installers/charm/lcm/src/charm.py
+++ b/installers/charm/lcm/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): Keystone relation event.
"""
- data_loc = event.unit if event.unit else event.app
-
- ro_host = event.relation.data[data_loc].get("host")
- ro_port = event.relation.data[data_loc].get("port")
+ ro_host = event.relation.data[event.unit].get("host")
+ ro_port = event.relation.data[event.unit].get("port")
if (
ro_host
@@ -262,7 +255,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
diff --git a/installers/charm/lcm/src/pod_spec.py b/installers/charm/lcm/src/pod_spec.py
index c0e9624..dc21453 100644
--- a/installers/charm/lcm/src/pod_spec.py
+++ b/installers/charm/lcm/src/pod_spec.py
@@ -21,43 +21,60 @@
##
import logging
-from pydantic import BaseModel, constr, PositiveInt, validator
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, NoReturn
logger = logging.getLogger(__name__)
-class ConfigData(BaseModel):
- """Configuration data model."""
+def _validate_data(
+ config_data: Dict[str, Any], relation_data: Dict[str, Any]
+) -> NoReturn:
+ """Validate input data.
- database_commonkey: constr(min_length=1)
- log_level: constr(regex=r"^(INFO|DEBUG)$")
- vca_host: constr(min_length=1)
- vca_port: PositiveInt
- vca_user: constr(min_length=1)
- vca_pubkey: constr(min_length=1)
- vca_password: constr(min_length=1)
- vca_cacert: str
- vca_cloud: constr(min_length=1)
- vca_k8s_cloud: constr(min_length=1)
- vca_apiproxy: Optional[constr(min_length=1)]
+ Args:
+ config_data (Dict[str, Any]): configuration data.
+ relation_data (Dict[str, Any]): relation data.
+ """
+ config_validators = {
+ "database_commonkey": lambda value, _: isinstance(value, str)
+ and len(value) > 1,
+ "log_level": lambda value, _: isinstance(value, str)
+ and value in ("INFO", "DEBUG"),
+ "vca_host": lambda value, _: isinstance(value, str) and len(value) > 1,
+ "vca_port": lambda value, _: isinstance(value, int) and value > 0,
+ "vca_user": lambda value, _: isinstance(value, str) and len(value) > 1,
+ "vca_pubkey": lambda value, _: isinstance(value, str) and len(value) > 1,
+ "vca_password": lambda value, _: isinstance(value, str) and len(value) > 1,
+ "vca_cacert": lambda value, _: isinstance(value, str),
+ "vca_cloud": lambda value, _: isinstance(value, str) and len(value) > 1,
+ "vca_k8s_cloud": lambda value, _: isinstance(value, str) and len(value) > 1,
+ "vca_apiproxy": lambda value, _: (isinstance(value, str) and len(value) > 1)
+ if value
+ else True,
+ }
+ relation_validators = {
+ "ro_host": lambda value, _: isinstance(value, str) and len(value) > 1,
+ "ro_port": lambda value, _: isinstance(value, int) and value > 0,
+ "message_host": lambda value, _: isinstance(value, str) and len(value) > 1,
+ "message_port": lambda value, _: isinstance(value, int) and value > 0,
+ "database_uri": lambda value, _: isinstance(value, str) and len(value) > 1,
+ }
+ problems = []
- @validator("vca_apiproxy", pre=True, always=True)
- def validate_vca_apiproxy(cls, value, values, **kwargs):
- if not value:
- return None
+ for key, validator in config_validators.items():
+ valid = validator(config_data.get(key), config_data)
- return value
+ if not valid:
+ problems.append(key)
+ for key, validator in relation_validators.items():
+ valid = validator(relation_data.get(key), relation_data)
-class RelationData(BaseModel):
- """Relation data model."""
+ if not valid:
+ problems.append(key)
- ro_host: constr(min_length=1)
- ro_port: PositiveInt
- message_host: constr(min_length=1)
- message_port: PositiveInt
- database_uri: constr(regex=r"^(mongodb://)")
+ if len(problems) > 0:
+ raise ValueError("Errors found in: {}".format(", ".join(problems)))
def _make_pod_ports(port: int) -> List[Dict[str, Any]]:
@@ -196,8 +213,7 @@
if not image_info:
return None
- ConfigData(**(config))
- RelationData(**(relation_state))
+ _validate_data(config, relation_state)
ports = _make_pod_ports(port)
env_config = _make_pod_envconfig(config, relation_state)