Skip to content

Commit

Permalink
Use on[] instead of getattr()
Browse files Browse the repository at this point in the history
  • Loading branch information
carlcsaposs-canonical committed Jul 5, 2023
1 parent b440dfe commit 01e4be1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/kubernetes_charm.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def __init__(self, *args) -> None:
super().__init__(*args)
self.framework.observe(self.on.install, self._on_install)
self.framework.observe(
getattr(self.on, "mysql_router_pebble_ready"), self._on_mysql_router_pebble_ready
self.on[rock.CONTAINER_NAME].pebble_ready, self._on_workload_container_pebble_ready
)
# TODO VM TLS: Move to super class
self.tls = relations.tls.RelationEndpoint(self)
Expand Down Expand Up @@ -132,7 +132,7 @@ def _on_install(self, _) -> None:
logger.exception("Failed to patch k8s service")
raise

def _on_mysql_router_pebble_ready(self, _) -> None:
def _on_workload_container_pebble_ready(self, _) -> None:
self.unit.set_workload_version(self.get_workload(event=None).version)
self.reconcile_database_relations()

Expand Down
3 changes: 2 additions & 1 deletion src/rock.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

logger = logging.getLogger(__name__)

CONTAINER_NAME = "mysql-router"
_UNIX_USERNAME = "mysql"


Expand Down Expand Up @@ -68,7 +69,7 @@ class Rock(container.Container):

def __init__(self, *, unit: ops.Unit) -> None:
super().__init__(mysql_router_command="mysqlrouter", mysql_shell_command="mysqlsh")
self._container = unit.get_container("mysql-router")
self._container = unit.get_container(CONTAINER_NAME)

@property
def ready(self) -> bool:
Expand Down

0 comments on commit 01e4be1

Please sign in to comment.