fix: refacto + post-rebase issues

Author: Gu1nness

src/charm.py

@@ -91,10 +91,10 @@
     MissingSecretError,
     NotConfigServerError,
 )
+from gen_cert import gen_certificate
+from service_manager import SERVICE_NAME, generate_mutating_webhook, generate_service
 from upgrades import kubernetes_upgrades
 from upgrades.mongodb_upgrades import MongoDBUpgrade
-from gen_cert import gen_certificate
-from service_manager import generate_mutating_webhook, generate_service
 
 logger = logging.getLogger(__name__)
 
@@ -639,21 +639,17 @@ def _filesystem_handler(self, container: Container) -> None:
     # BEGIN: charm events
     def _on_mongod_pebble_ready(self, event) -> None:
         """Configure MongoDB pebble layer specification."""
-        # Get a reference the container attribute
         container = self.unit.get_container(Config.CONTAINER_NAME)
-        if not container.can_connect():
-            logger.debug("mongod container is not ready yet.")
-            event.defer()
-            return
 
-        # We need to check that the storages are attached before starting the services.
-        # pebble-ready is not guaranteed to run after storage-attached so this check allows
-        # to ensure that the storages are attached before the pebble-ready hook is run.
-        if any(not storage for storage in self.model.storages.values()):
-            logger.debug("Storages are not attached yet")
+        # Just run the configure layers steps on the container and defer if it fails.
+        try:
+            self._configure_container(container)
+        except ContainerNotReadyError:
             event.defer()
             return
 
+        self.upgrade._reconcile_upgrade(event)
+
     # BEGIN: charm events
     def _on_webhook_mutator_pebble_ready(self, event) -> None:
         # still need todo use lightkube register the mutating webhook with
@@ -665,8 +661,8 @@ def _on_webhook_mutator_pebble_ready(self, event) -> None:
             event.defer()
             return
 
-        cert = self.get_secret(APP_SCOPE, "webhook-certificate")
-        private_key = self.get_secret(APP_SCOPE, "webhook-key")
+        cert = self.get_secret(APP_SCOPE, Config.WebhookManager.CRT_SECRET)
+        private_key = self.get_secret(APP_SCOPE, Config.WebhookManager.KEY_SECRET)
 
         if not cert or not private_key:
             logger.debug("Waiting for certificates")
@@ -688,24 +684,6 @@ def _on_webhook_mutator_pebble_ready(self, event) -> None:
         generate_service(client, self.unit, self.model.name)
         generate_mutating_webhook(client, self.unit, self.model.name, cert)
 
-    def _on_mongod_pebble_ready(self, event) -> None:
-        """Configure MongoDB pebble layer specification."""
-        # Get a reference the container attribute
-        container = self.unit.get_container(Config.CONTAINER_NAME)
-        if not container.can_connect():
-            logger.debug("mongod container is not ready yet.")
-            event.defer()
-            return
-
-        # We need to check that the storages are attached before starting the services.
-        # pebble-ready is not guaranteed to run after storage-attached so this check allows
-        # to ensure that the storages are attached before the pebble-ready hook is run.
-        if any(not storage for storage in self.model.storages.values()):
-            logger.debug("Storages are not attached yet")
-            event.defer()
-            return
-
-
     def _configure_layers(self, container: Container) -> None:
         """Configure the layers of the container."""
         modified = False
@@ -788,19 +766,6 @@ def _on_upgrade(self, event: UpgradeCharmEvent) -> None:
             # Post upgrade event verifies the success of the upgrade.
             self.upgrade.post_app_upgrade_event.emit()
 
-    def _on_mongod_pebble_ready(self, event) -> None:
-        """Configure MongoDB pebble layer specification."""
-        container = self.unit.get_container(Config.CONTAINER_NAME)
-
-        # Just run the configure layers steps on the container and defer if it fails.
-        try:
-            self._configure_container(container)
-        except ContainerNotReadyError:
-            event.defer()
-            return
-
-        self.upgrade._reconcile_upgrade(event)
-
     def is_db_service_ready(self) -> bool:
         """Checks if the MongoDB service is ready to accept connections."""
         with MongoDBConnection(self.mongodb_config, "localhost", direct=True) as direct_mongo:
@@ -892,12 +857,12 @@ def _on_start(self, event: StartEvent) -> None:
         if not self.unit.is_leader():
             return
 
-        if not self.get_secret(APP_SCOPE, "webhook-certificate") or not self.get_secret(
-            APP_SCOPE, "webhook-key"
+        if not self.get_secret(APP_SCOPE, Config.WebhookManager.CRT_SECRET) or not self.get_secret(
+            APP_SCOPE, Config.WebhookManager.KEY_SECRET
         ):
-            cert, key = gen_certificate(Config.WebhookManager.SERVICE_NAME, self.model.name)
-            self.set_secret(APP_SCOPE, "webhook-certificate", cert.decode())
-            self.set_secret(APP_SCOPE, "webhook-key", key.decode())
+            cert, key = gen_certificate(SERVICE_NAME, self.model.name)
+            self.set_secret(APP_SCOPE, Config.WebhookManager.CRT_SECRET, cert.decode())
+            self.set_secret(APP_SCOPE, Config.WebhookManager.KEY_SECRET, key.decode())
         self._initialise_replica_set(event)
         try:
             self._initialise_users(event)
@@ -1041,7 +1006,7 @@ def _on_stop(self, event) -> None:
             client.delete(
                 MutatingWebhookConfiguration,
                 namespace=self.model.name,
-                name=Config.WebhookManager.SERVICE_NAME,
+                name=SERVICE_NAME,
             )
         self.__handle_partition_on_stop()
         if self.unit_departed:

src/config.py

@@ -162,6 +162,8 @@ class WebhookManager:
         PORT = 8000
         CRT_PATH = "/app/certificate.crt"
         KEY_PATH = "/app/certificate.key"
+        CRT_SECRET = "webhook-certificate"
+        KEY_SECRET = "webhook-key"
 
     @staticmethod
     def get_license_path(license_name: str) -> str:

src/service_manager.py

@@ -23,6 +23,8 @@
 
 logger = getLogger()
 
+SERVICE_NAME = f"{Config.WebhookManager.SERVICE_NAME}-{Config.WebhookManager.CONTAINER_NAME}"
+
 
 def get_pod(client: Client, pod_name: str) -> Pod:
     """Gets a pod definition from k8s."""
@@ -43,7 +45,7 @@ def generate_service(client: Client, unit: Unit, model_name: str):
     try:
         service = Service(
             metadata=ObjectMeta(
-                name=Config.WebhookManager.SERVICE_NAME,
+                name=SERVICE_NAME,
                 namespace=model_name,
                 ownerReferences=[
                     OwnerReference(
@@ -63,7 +65,7 @@ def generate_service(client: Client, unit: Unit, model_name: str):
                         protocol="TCP",
                         port=Config.WebhookManager.PORT,
                         targetPort=Config.WebhookManager.PORT,
-                        name=f"{Config.WebhookManager.SERVICE_NAME}-port",
+                        name=f"{SERVICE_NAME}-port",
                     ),
                 ],
             ),
@@ -82,7 +84,7 @@ def generate_mutating_webhook(client: Client, unit: Unit, model_name: str, cert:
         webhooks = client.get(
             MutatingWebhookConfiguration,
             namespace=model_name,
-            name=Config.WebhookManager.SERVICE_NAME,
+            name=SERVICE_NAME,
         )
         if webhooks:
             return
@@ -94,7 +96,7 @@ def generate_mutating_webhook(client: Client, unit: Unit, model_name: str, cert:
     logger.debug("Registering our Mutating Wehook.")
     webhook_config = MutatingWebhookConfiguration(
         metadata=ObjectMeta(
-            name=Config.WebhookManager.SERVICE_NAME,
+            name=SERVICE_NAME,
             namespace=model_name,
             ownerReferences=pod.metadata.ownerReferences,
         ),
@@ -105,7 +107,7 @@ def generate_mutating_webhook(client: Client, unit: Unit, model_name: str, cert:
                 clientConfig=WebhookClientConfig(
                     service=ServiceReference(
                         namespace=model_name,
-                        name=Config.WebhookManager.SERVICE_NAME,
+                        name=SERVICE_NAME,
                         port=8000,
                         path="/mutate",
                     ),

tests/integration/backup_tests/test_backups.py

@@ -403,17 +403,11 @@ async def test_restore_new_cluster(
     # deploy a new cluster with a different name
     db_charm = await ops_test.build_charm(".")
     await ops_test.model.deploy(
-<<<<<<< HEAD
         db_charm,
         num_units=3,
-        resources=resources,
+        resources=RESOURCES,
         application_name=new_cluster_app_name,
         trust=True,
-||||||| parent of 0ded9b66 (wip: test part)
-        db_charm, num_units=3, resources=resources, application_name=new_cluster_app_name
-=======
-        db_charm, num_units=3, resources=RESOURCES, application_name=new_cluster_app_name
->>>>>>> 0ded9b66 (wip: test part)
     )
 
     await asyncio.gather(