Rename kubernetes_charm.py to charm.py

Needed for upcoming charmcraft 3 migration because of canonical/charmcraft#1994

charmcraft.yaml

@@ -52,4 +52,4 @@ parts:
       - -charm_version
     charm-strict-dependencies: true
     charm-requirements: [requirements.txt]
-    charm-entrypoint: src/kubernetes_charm.py
+    charm-entrypoint: src/charm.py

src/relations/tls.py

@@ -17,7 +17,7 @@
 import relations.secrets
 
 if typing.TYPE_CHECKING:
-    import kubernetes_charm
+    import charm
 
 logger = logging.getLogger(__name__)
 
@@ -48,7 +48,7 @@ def _generate_private_key() -> str:
 class _Relation:
     """Relation to TLS certificate provider"""
 
-    _charm: "kubernetes_charm.KubernetesRouterCharm"
+    _charm: "charm.KubernetesRouterCharm"
     _interface: tls_certificates.TLSCertificatesRequiresV2
     _secrets: relations.secrets.RelationSecrets
 
@@ -181,7 +181,7 @@ class RelationEndpoint(ops.Object):
 
     NAME = "certificates"
 
-    def __init__(self, charm_: "kubernetes_charm.KubernetesRouterCharm") -> None:
+    def __init__(self, charm_: "charm.KubernetesRouterCharm") -> None:
         super().__init__(charm_, self.NAME)
         self._charm = charm_
         self._interface = tls_certificates.TLSCertificatesRequiresV2(self._charm, self.NAME)

tests/unit/conftest.py

@@ -28,7 +28,7 @@ def disable_tenacity_retry(monkeypatch):
 @pytest.fixture(autouse=True)
 def patch(monkeypatch):
     monkeypatch.setattr(
-        "kubernetes_charm.KubernetesRouterCharm.wait_until_mysql_router_ready",
+        "charm.KubernetesRouterCharm.wait_until_mysql_router_ready",
         lambda *args, **kwargs: None,
     )
     monkeypatch.setattr("workload.AuthenticatedWorkload._router_username", "")
@@ -45,7 +45,7 @@ def patch(monkeypatch):
 @pytest.fixture(autouse=True)
 def kubernetes_patch(monkeypatch):
     monkeypatch.setattr(
-        "kubernetes_charm.KubernetesRouterCharm.model_service_domain", "my-model.svc.cluster.local"
+        "charm.KubernetesRouterCharm.model_service_domain", "my-model.svc.cluster.local"
     )
     monkeypatch.setattr(
         "rock.Rock._run_command",
@@ -58,20 +58,20 @@ def kubernetes_patch(monkeypatch):
     monkeypatch.setattr("rock._Path.rmtree", lambda *args, **kwargs: None)
     monkeypatch.setattr("lightkube.Client", lambda *args, **kwargs: None)
     monkeypatch.setattr(
-        "kubernetes_charm.KubernetesRouterCharm._reconcile_service", lambda *args, **kwargs: None
+        "charm.KubernetesRouterCharm._reconcile_service", lambda *args, **kwargs: None
     )
     monkeypatch.setattr(
-        "kubernetes_charm.KubernetesRouterCharm._get_hosts_ports",
+        "charm.KubernetesRouterCharm._get_hosts_ports",
         lambda _, port_type: "mysql-router-k8s-service.my-model.svc.cluster.local:6446"
         if port_type == "rw"
         else "mysql-router-k8s-service.my-model.svc.cluster.local:6447",
     )
     monkeypatch.setattr(
-        "kubernetes_charm.KubernetesRouterCharm._check_service_connectivity",
+        "charm.KubernetesRouterCharm._check_service_connectivity",
         lambda *args, **kwargs: True,
     )
     monkeypatch.setattr(
-        "kubernetes_charm.KubernetesRouterCharm.get_all_k8s_node_hostnames_and_ips",
+        "charm.KubernetesRouterCharm.get_all_k8s_node_hostnames_and_ips",
         lambda *args, **kwargs: None,
     )
     monkeypatch.setattr("kubernetes_upgrade._Partition.get", lambda *args, **kwargs: 0)

tests/unit/scenario_/database_relations/test_database_relations.py

@@ -9,18 +9,16 @@
 import pytest
 import scenario
 
-import kubernetes_charm
+import charm
 
 from . import combinations
 
 
 @pytest.fixture(params=["my-model.svc.cluster.local", "foo.svc.cluster.local"])
 def model_service_domain(monkeypatch, request):
+    monkeypatch.setattr("charm.KubernetesRouterCharm.model_service_domain", request.param)
     monkeypatch.setattr(
-        "kubernetes_charm.KubernetesRouterCharm.model_service_domain", request.param
-    )
-    monkeypatch.setattr(
-        "kubernetes_charm.KubernetesRouterCharm._get_hosts_ports",
+        "charm.KubernetesRouterCharm._get_hosts_ports",
         lambda _, port_type: f"mysql-router-k8s-service.{request.param}:6446"
         if port_type == "rw"
         else f"mysql-router-k8s-service.{request.param}:6447",
@@ -35,7 +33,7 @@ def output_states(*, relations: list[scenario.Relation]) -> typing.Iterable[scen
 
     The output state of each test should be identical for all events.
     """
-    context = scenario.Context(kubernetes_charm.KubernetesRouterCharm)
+    context = scenario.Context(charm.KubernetesRouterCharm)
     container = scenario.Container("mysql-router", can_connect=True)
     input_state = scenario.State(
         relations=[

tests/unit/scenario_/database_relations/test_database_relations_breaking.py

@@ -7,15 +7,15 @@
 import pytest
 import scenario
 
-import kubernetes_charm
+import charm
 
 from . import combinations
 
 
 def output_state(
     *, relations: list[scenario.Relation], secrets: list[scenario.Secret], event: scenario.Event
 ) -> scenario.State:
-    context = scenario.Context(kubernetes_charm.KubernetesRouterCharm)
+    context = scenario.Context(charm.KubernetesRouterCharm)
     container = scenario.Container("mysql-router", can_connect=True)
     input_state = scenario.State(
         relations=[

tests/unit/scenario_/test_start.py

@@ -5,7 +5,7 @@
 import pytest
 import scenario
 
-import kubernetes_charm
+import charm
 
 
 @pytest.mark.parametrize(
@@ -14,7 +14,7 @@
 )
 @pytest.mark.parametrize("leader", [False, True])
 def test_start_sets_status_if_no_relations(leader, can_connect, unit_status):
-    context = scenario.Context(kubernetes_charm.KubernetesRouterCharm)
+    context = scenario.Context(charm.KubernetesRouterCharm)
     input_state = scenario.State(
         containers=[scenario.Container("mysql-router", can_connect=can_connect)],
         leader=leader,