Address PR feedback

Author: shayancanonical

poetry.lock

@@ -11,16 +11,15 @@ authors = []
 [tool.poetry.dependencies]
 python = "^3.8.1"  # ^3.8.1 required by flake8
 # there is a breaking change in ops 2.10.0: https://github.com/canonical/operator/pull/1091#issuecomment-1888644075
-ops = "<2.10.0"
+ops = "^2.6.0,<2.10.0"
 tenacity = "^8.2.3"
 poetry-core = "^1.7.0"
 jinja2 = "^3.1.2"
 requests = "^2.31.0"
 
 [tool.poetry.group.charm-libs.dependencies]
 # data_platform_libs/v0/data_interfaces.py
-# there is a breaking change in ops 2.10.0: https://github.com/canonical/operator/pull/1091#issuecomment-1888644075
-ops = "<2.10.0"
+ops = ">=2.0.0"
 # tls_certificates_interface/v2/tls_certificates.py
 # tls_certificates lib v2 uses a feature only available in cryptography >=42.0.5
 cryptography = ">=42.0.5"

pyproject.toml

@@ -111,7 +111,7 @@ def _exposed_read_only_endpoint(self) -> str:
 
     @abc.abstractmethod
     def is_externally_accessible(self, event=None) -> typing.Optional[bool]:
-        """Whether router is externally accessible"""
+        """Whether endpoints should be externally accessible"""
 
     @property
     def _tls_certificate_saved(self) -> bool:
@@ -215,14 +215,14 @@ def wait_until_mysql_router_ready(self) -> None:
         """
 
     @abc.abstractmethod
-    def _reconcile_node_port(self, event) -> None:
+    def _reconcile_node_port(self, *, event) -> None:
         """Reconcile node port.
 
         Only applies to Kubernetes charm
         """
 
     @abc.abstractmethod
-    def _reconcile_ports(self) -> None:
+    def _reconcile_ports(self, *, event) -> None:
         """Reconcile exposed ports.
 
         Only applies to Machine charm
@@ -320,7 +320,7 @@ def reconcile(self, event=None) -> None:  # noqa: C901
                 if not self._upgrade.in_progress and isinstance(
                     workload_, workload.AuthenticatedWorkload
                 ):
-                    self._reconcile_ports()
+                    self._reconcile_ports(event=event)
 
             # Empty waiting status means we're waiting for database requires relation before
             # starting workload

src/abstract_charm.py

@@ -86,12 +86,12 @@ def _exposed_read_only_endpoint(self) -> str:
     def is_externally_accessible(self, event=None) -> typing.Optional[bool]:
         return self._database_provides.external_connectivity(event)
 
-    def _reconcile_node_port(self, event) -> None:
+    def _reconcile_node_port(self, *, event) -> None:
         """Only applies to Kubernetes charm, so no-op."""
         pass
 
-    def _reconcile_ports(self) -> None:
-        if self.is_externally_accessible():
+    def _reconcile_ports(self, *, event) -> None:
+        if self.is_externally_accessible(event):
             ports = [self._READ_WRITE_PORT, self._READ_ONLY_PORT]
         else:
             ports = []

src/machine_charm.py

@@ -51,8 +51,6 @@ def enable(self) -> None:
 
     def disable(self) -> None:
         logger.debug("Removing cron job for log rotation of mysqlrouter")
-        if self._logrotate_config.exists():
-            self._logrotate_config.unlink()
-        if self._cron_file.exists():
-            self._cron_file.unlink()
+        self._logrotate_config.unlink(missing_ok=True)
+        self._cron_file.unlink(missing_ok=True)
         logger.debug("Removed cron job for log rotation of mysqlrouter")

src/machine_logrotate.py

@@ -228,6 +228,10 @@ def update_mysql_router_exporter_service(
                         "mysqlrouter.tls-key-path": key_filename,
                     }
                 )
+            else:
+                _snap.unset("mysqlrouter.tls-cacert-path")
+                _snap.unset("mysqlrouter.tls-cert-path")
+                _snap.unset("mysqlrouter.tls-key-path")
             _snap.start([self._EXPORTER_SERVICE_NAME], enable=True)
         else:
             _snap.stop([self._EXPORTER_SERVICE_NAME], disable=True)