feat: Avoid patching private ops testing (#396)

* feat: Avoid patching private ops testing

* feat: Bump single kernel lib

* fix: deploy with trust

* fix: upgrade lib

Author: Gu1nness

poetry.lock

@@ -8,7 +8,7 @@ requires-poetry = ">=2.0.0"
 
 [tool.poetry.dependencies]
 python = "^3.10.12"
-mongo-charms-single-kernel = "~0.0.1"
+mongo-charms-single-kernel = "~0.0.4"
 dacite = "==1.8.0"
 ops = "~2.15.0"
 pymongo = "^4.7.3"
@@ -57,13 +57,13 @@ coverage = {extras = ["toml"], version = "^7.5.0"}
 pytest = "^8.1.1"
 pytest-mock = "*"
 parameterized = "^0.9.0"
-mongo-charms-single-kernel = "~0.0.1"
+mongo-charms-single-kernel = "~0.0.4"
 dacite = "==1.8.0"
 
 [tool.poetry.group.integration.dependencies]
 allure-pytest = "^2.13.5"
 ops = "~2.15.0"
-mongo-charms-single-kernel = "~0.0.1"
+mongo-charms-single-kernel = "~0.0.4"
 dacite = "==1.8.0"
 tenacity = "^8.2.3"
 pymongo = "^4.7.3"

pyproject.toml

@@ -49,6 +49,7 @@ async def test_build_and_deploy(ops_test: OpsTest) -> None:
     await ops_test.model.deploy(
         MONGOS_APP_NAME,
         channel="6/edge",
+        trust=True,
     )
 
     await ops_test.model.wait_for_idle(

tests/integration/sharding_tests/test_mongos.py

@@ -3,27 +3,7 @@
 # See LICENSE file for licensing details.
 
 from pathlib import Path
-from typing import Callable
-from unittest.mock import patch
 
 import yaml
 
 METADATA = yaml.safe_load(Path("./metadata.yaml").read_text())
-
-
-def patch_network_get(private_address="10.1.157.116") -> Callable:
-    def network_get(*args, **kwargs) -> dict:
-        """Patch for the not-yet-implemented testing backend needed for `bind_address`.
-
-        This patch decorator can be used for cases such as:
-        self.model.get_binding(event.relation).network.bind_address
-        """
-        return {
-            "bind-addresses": [
-                {
-                    "addresses": [{"value": private_address}],
-                }
-            ]
-        }
-
-    return patch("ops.testing._TestingModelBackend.network_get", network_get)

tests/unit/helpers.py

@@ -23,8 +23,6 @@
 
 from charm import MongoDBK8sCharm
 
-from .helpers import patch_network_get
-
 PYMONGO_EXCEPTIONS = [
     (ConnectionFailure("error message"), ConnectionFailure),
     (ConfigurationError("error message"), ConfigurationError),
@@ -64,7 +62,6 @@ def patch_is_ready(mocker):
 
 class TestCharm(unittest.TestCase):
     @patch("single_kernel_mongo.managers.mongodb_operator.get_charm_revision")
-    @patch_network_get(private_address="1.1.1.1")
     def setUp(self, *unused):
         self.maxDiff = None
         self.harness = Harness(MongoDBK8sCharm)
@@ -710,7 +707,6 @@ def test_on_other_secret_changed(self, scope, connect_exporter):
 
         connect_exporter.assert_not_called()
 
-    @patch_network_get(private_address="1.1.1.1")
     @patch("single_kernel_mongo.utils.mongo_connection.MongoConnection.set_user_password")
     @patch(
         "single_kernel_mongo.managers.config.MongoDBExporterConfigManager.configure_and_restart"
@@ -724,7 +720,6 @@ def test_connect_to_mongo_exporter_on_set_password(
         self.harness.run_action("set-password", {"username": "monitor"})
         connect_exporter.assert_called()
 
-    @patch_network_get(private_address="1.1.1.1")
     @patch("single_kernel_mongo.utils.mongo_connection.MongoConnection.set_user_password")
     @patch(
         "single_kernel_mongo.managers.config.MongoDBExporterConfigManager.configure_and_restart"
@@ -821,7 +816,6 @@ def test_set_password_provided(self, *unused):
         # verify app data is updated and results are reported to user
         self.assertEqual("canonical123", new_password)
 
-    @patch_network_get(private_address="1.1.1.1")
     @patch("single_kernel_mongo.managers.backups.BackupManager.get_status")
     def test_set_backup_password_pbm_busy(self, pbm_status):
         """Tests changes to passwords fail when pbm is restoring/backing up."""

tests/unit/test_charm.py

@@ -17,8 +17,6 @@
 
 from charm import MongoDBK8sCharm
 
-from .helpers import patch_network_get
-
 RELATION_NAME = "s3-credentials"
 
 
@@ -43,7 +41,6 @@ def patch_upgrades(monkeypatch):
 
 class TestMongoBackups(unittest.TestCase):
     @patch("single_kernel_mongo.managers.mongodb_operator.get_charm_revision")
-    @patch_network_get(private_address="1.1.1.1")
     def setUp(self, *unused):
         self.harness = Harness(MongoDBK8sCharm)
         self.harness.add_relation("database-peers", "database-peers")
@@ -319,7 +316,6 @@ def test_s3_credentials_no_db(self, defer):
             {"bucket": "hat"},
         )
 
-    @patch_network_get(private_address="1.1.1.1")
     @patch(
         "single_kernel_mongo.core.k8s_workload.KubernetesWorkload.active",
         return_value=True,
@@ -346,7 +342,6 @@ def test_s3_credentials_set_pbm_failure(self, _set_config_options, service):
 
         self.assertTrue(isinstance(self.harness.charm.unit.status, BlockedStatus))
 
-    @patch_network_get(private_address="1.1.1.1")
     @patch("single_kernel_mongo.managers.backups.BackupManager.set_config_options")
     @patch("single_kernel_mongo.managers.backups.BackupManager.resync_config_options")
     @patch("ops.framework.EventBase.defer")
@@ -380,7 +375,6 @@ def test_s3_credentials_config_error(
         )
         self.assertTrue(isinstance(self.harness.charm.unit.status, BlockedStatus))
 
-    @patch_network_get(private_address="1.1.1.1")
     @patch("single_kernel_mongo.managers.backups.BackupManager.set_config_options")
     @patch("single_kernel_mongo.managers.backups.BackupManager.resync_config_options")
     @patch("ops.framework.EventBase.defer")
@@ -411,7 +405,6 @@ def test_s3_credentials_syncing(self, pbm_status, service, defer, resync, _set_c
         defer.assert_called()
         self.assertTrue(isinstance(self.harness.charm.unit.status, WaitingStatus))
 
-    @patch_network_get(private_address="1.1.1.1")
     @patch("single_kernel_mongo.managers.backups.BackupManager.set_config_options")
     @patch("single_kernel_mongo.managers.backups.BackupManager.resync_config_options")
     @patch("ops.framework.EventBase.defer")
@@ -445,7 +438,6 @@ def test_s3_credentials_pbm_busy(
         defer.assert_called()
         self.assertTrue(isinstance(self.harness.charm.unit.status, WaitingStatus))
 
-    @patch_network_get(private_address="1.1.1.1")
     @patch("single_kernel_mongo.managers.backups.BackupManager.set_config_options")
     @patch("single_kernel_mongo.managers.backups.BackupManager.resync_config_options")
     @patch("ops.framework.EventBase.defer")

tests/unit/test_mongodb_backups.py

@@ -12,8 +12,6 @@
 
 from charm import MongoDBK8sCharm
 
-from .helpers import patch_network_get
-
 PYMONGO_EXCEPTIONS = [
     (ConnectionFailure("error message"), ConnectionFailure),
     (ConfigurationError("error message"), ConfigurationError),
@@ -49,7 +47,6 @@ def patch_upgrades(monkeypatch):
 
 class TestMongoProvider(unittest.TestCase):
     @patch("single_kernel_mongo.managers.mongodb_operator.get_charm_revision")
-    @patch_network_get(private_address="1.1.1.1")
     def setUp(self, *unused):
         self.harness = Harness(MongoDBK8sCharm)
         mongo_resource = {
@@ -106,7 +103,6 @@ def test_relation_event_db_not_initialised(self, oversee_users, defer, *unused):
         oversee_users.assert_not_called()
         defer.assert_not_called()
 
-    @patch_network_get(private_address="1.1.1.1")
     @patch("single_kernel_mongo.managers.mongodb_operator.get_charm_revision")
     @patch("ops.framework.EventBase.defer")
     @patch("single_kernel_mongo.managers.mongo.MongoManager.reconcile_mongo_users_and_dbs")
@@ -131,7 +127,6 @@ def test_relation_event_oversee_users_mongo_failure(self, oversee_users, defer,
             defer.assert_called()
 
     # oversee_users raises AssertionError when unable to attain users from relation
-    @patch_network_get(private_address="1.1.1.1")
     @patch("single_kernel_mongo.managers.mongodb_operator.get_charm_revision")
     @patch("ops.framework.EventBase.defer")
     @patch("single_kernel_mongo.managers.mongo.MongoManager.reconcile_mongo_users_and_dbs")
@@ -156,7 +151,6 @@ def test_relation_event_oversee_users_fails_to_get_relation(
                 else:
                     self.harness.remove_relation_unit(relation_id, "consumer/0")
 
-    @patch_network_get(private_address="1.1.1.1")
     @patch("single_kernel_mongo.utils.mongo_connection.MongoConnection.user_exists")
     def test_oversee_users_get_users_failure(self, mock_user_exists):
         """Verifies that when unable to retrieve users from mongod an exception is raised."""
@@ -178,7 +172,6 @@ def test_oversee_users_get_users_failure(self, mock_user_exists):
                         relation_changed=True,
                     )
 
-    @patch_network_get(private_address="1.1.1.1")
     @patch(
         "single_kernel_mongo.utils.mongo_connection.MongoConnection.user_exists",
         return_value=False,
@@ -209,7 +202,6 @@ def test_oversee_users_create_user_failure(self, set_credentials, create_user, u
                     )
                 set_credentials.assert_not_called()
 
-    @patch_network_get(private_address="1.1.1.1")
     @patch("single_kernel_mongo.managers.mongo.MongoManager.add_user")
     @patch("single_kernel_mongo.managers.mongo.MongoManager.update_user")
     @patch("single_kernel_mongo.managers.mongo.MongoManager.remove_user")
@@ -231,7 +223,6 @@ def test_oversee_users_no_auto_delete(self, drop_db, *unused):
         )
         drop_db.assert_not_called()
 
-    @patch_network_get(private_address="1.1.1.1")
     @patch("single_kernel_mongo.managers.mongo.MongoManager.add_user")
     @patch("single_kernel_mongo.managers.mongo.MongoManager.update_user")
     @patch("single_kernel_mongo.managers.mongo.MongoManager.remove_user")
@@ -269,7 +260,6 @@ def test_oversee_users_mongo_databases_failure(self, drop_db, get_db, *unused):
             ["database", True, False],
         ]
     )
-    @patch_network_get(private_address="1.1.1.1")
     @patch(
         "single_kernel_mongo.lib.charms.data_platform_libs.v0.data_interfaces.DatabaseProviderData.set_credentials"
     )

tests/unit/test_mongodb_provider.py

@@ -19,8 +19,6 @@
 
 from charm import MongoDBK8sCharm
 
-from .helpers import patch_network_get
-
 
 @pytest.fixture(autouse=True)
 def patch_upgrades(monkeypatch):
@@ -43,7 +41,6 @@ def patch_upgrades(monkeypatch):
 
 class TestUpgrades(unittest.TestCase):
     @patch("single_kernel_mongo.managers.mongodb_operator.get_charm_revision")
-    @patch_network_get(private_address="1.1.1.1")
     def setUp(self, *unused):
         self.harness = Harness(MongoDBK8sCharm)
         self.addCleanup(self.harness.cleanup)