From 8173a68a83cfb5b72d0565565e4f6fb30ae29f5f Mon Sep 17 00:00:00 2001 From: Pedro Guimaraes Date: Fri, 15 Sep 2023 14:14:26 +0200 Subject: [PATCH] Moving from mongo to mongosh cli --- lib/charms/mongodb/v0/helpers.py | 2 +- tests/integration/relation_tests/legacy_relations/helpers.py | 2 +- tests/integration/test_charm.py | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/charms/mongodb/v0/helpers.py b/lib/charms/mongodb/v0/helpers.py index c57357403..2232545e8 100644 --- a/lib/charms/mongodb/v0/helpers.py +++ b/lib/charms/mongodb/v0/helpers.py @@ -50,7 +50,7 @@ # noinspection GrazieInspection def get_create_user_cmd( - config: MongoDBConfiguration, mongo_path="charmed-mongodb.mongo" + config: MongoDBConfiguration, mongo_path="charmed-mongodb.mongosh" ) -> List[str]: """Creates initial admin user for MongoDB. diff --git a/tests/integration/relation_tests/legacy_relations/helpers.py b/tests/integration/relation_tests/legacy_relations/helpers.py index 9bb27b3fe..ccde5c01d 100644 --- a/tests/integration/relation_tests/legacy_relations/helpers.py +++ b/tests/integration/relation_tests/legacy_relations/helpers.py @@ -136,7 +136,7 @@ async def mongo_tls_command(ops_test: OpsTest) -> str: replica_set_uri = f"mongodb://{hosts}/admin?replicaSet={app}" return ( - f"charmed-mongodb.mongo '{replica_set_uri}' --eval 'rs.status()'" + f"charmed-mongodb.mongosh '{replica_set_uri}' --eval 'rs.status()'" f" --tls --tlsCAFile {EXTERNAL_CERT_PATH}" f" --tlsCertificateKeyFile {EXTERNAL_PEM_PATH}" ) diff --git a/tests/integration/test_charm.py b/tests/integration/test_charm.py index 0f75d43ce..56da305c5 100644 --- a/tests/integration/test_charm.py +++ b/tests/integration/test_charm.py @@ -180,7 +180,8 @@ async def test_monitor_user(ops_test: OpsTest) -> None: ] hosts = ",".join(replica_set_hosts) replica_set_uri = f"mongodb://monitor:{password}@{hosts}/admin?replicaSet=mongodb" - admin_mongod_cmd = f"charmed-mongodb.mongo '{replica_set_uri}' --eval 'rs.conf()'" + + admin_mongod_cmd = f"charmed-mongodb.mongosh '{replica_set_uri}' --eval 'rs.conf()'" check_monitor_cmd = f"exec --unit {unit.name} -- {admin_mongod_cmd}" return_code, _, _ = await ops_test.juju(*check_monitor_cmd.split()) assert return_code == 0, "command rs.conf() on monitor user does not work"