diff --git a/arcee/arcee_receiver/server.py b/arcee/arcee_receiver/server.py index 12cbf15cf..8476e522a 100644 --- a/arcee/arcee_receiver/server.py +++ b/arcee/arcee_receiver/server.py @@ -1,7 +1,8 @@ +import asyncio import time from collections import OrderedDict, defaultdict from datetime import datetime, timezone, timedelta -import asyncio +from urllib.parse import urlparse from etcd import Lock as EtcdLock, Client as EtcdClient from typing import Tuple @@ -60,7 +61,7 @@ async def add_spent_time(request, response): spend_time)) -def get_arcee_db_params() -> Tuple[str, str, str, str, str]: +def get_arcee_db_params() -> Tuple[str, str]: arcee_db_params = config_client.arcee_params() return asyncio.run(arcee_db_params) @@ -69,9 +70,12 @@ async def get_cluster_secret() -> str: return await config_client.cluster_secret() -name, password, host, port, db_name = get_arcee_db_params() -uri = "mongodb://{u}:{p}@{host}:{port}/admin".format( - u=name, p=password, host=host, port=port) +conn_url, db_name = get_arcee_db_params() +components = urlparse(conn_url) +user_data, host_data = components.netloc.split("@", 1) +name, password = user_data.split(":", 1) +host, port = host_data.split(":", 1) +uri = f"{components.scheme}://{components.netloc}/admin?{components.query}" client = motor.motor_asyncio.AsyncIOMotorClient(uri) # https://stackoverflow.com/a/69065287 client.get_io_loop = asyncio.get_running_loop @@ -2699,11 +2703,11 @@ async def delete_artifact(request, id_: str): # trick to lock migrations with EtcdLock( EtcdClient(host=etcd_host, port=etcd_port), 'arcee_migrations'): + config_params = { 'mongo_username': name, 'mongo_password': password, - 'mongo_url': "mongodb://{host}:{port}/admin".format( - host=host, port=port), + 'mongo_url': uri, 'mongo_database': db_name, 'mongo_migrations_path': os.path.join( os.path.dirname(os.path.abspath(__file__)), 'migrations') diff --git a/arcee/arcee_receiver/tests/base.py b/arcee/arcee_receiver/tests/base.py index 42b002448..332496cfe 100644 --- a/arcee/arcee_receiver/tests/base.py +++ b/arcee/arcee_receiver/tests/base.py @@ -14,7 +14,7 @@ class AConfigClMock(AConfigCl): async def arcee_params(self): - return 'name', 'password', '127.0.0.1', 80, 'arcee' + return 'mongodb://name:password@127.0.0.1:80', 'arcee' async def cluster_secret(self): return SECRET diff --git a/bi_exporter/bumblebi/exporter/exporter.py b/bi_exporter/bumblebi/exporter/exporter.py index 56359acb3..e05aba890 100644 --- a/bi_exporter/bumblebi/exporter/exporter.py +++ b/bi_exporter/bumblebi/exporter/exporter.py @@ -45,8 +45,7 @@ def rest_cl(self) -> RestClient: @cached_property def mongo_cl(self) -> MongoClient: mongo_params = self._config_cl.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - return MongoClient(mongo_conn_string) + return MongoClient(mongo_params[0]) @cached_property def clickhouse_cl(self) -> ClickHouseClient: diff --git a/bulldozer/bulldozer_api/server.py b/bulldozer/bulldozer_api/server.py index d69ae1a4f..30be9db35 100644 --- a/bulldozer/bulldozer_api/server.py +++ b/bulldozer/bulldozer_api/server.py @@ -1,6 +1,7 @@ import datetime import asyncio from typing import Tuple +from urllib.parse import urlparse from enum import Enum import os import uuid @@ -56,7 +57,7 @@ class RunsetState(int, Enum): MAX_RUNNER_NUM = 15 -def get_db_params() -> Tuple[str, str, str, str, str]: +def get_db_params() -> Tuple[str, str]: db_params = config_client.bulldozer_params() return asyncio.run(db_params) @@ -65,8 +66,12 @@ async def get_cluster_secret() -> str: return await config_client.cluster_secret() -name, password, host, port, db_name = get_db_params() -uri = f"mongodb://{name}:{password}@{host}:{port}/admin" +conn_url, db_name = get_db_params() +components = urlparse(conn_url) +user_data, host_data = components.netloc.split("@", 1) +name, password = user_data.split(":", 1) +host, port = host_data.split(":", 1) +uri = f"{components.scheme}://{components.netloc}/admin?{components.query}" client = motor.motor_asyncio.AsyncIOMotorClient(uri) db = client[db_name] @@ -930,8 +935,7 @@ async def update_runner(request, id_: str): config_params = { 'mongo_username': name, 'mongo_password': password, - 'mongo_url': "mongodb://{host}:{port}/admin".format( - host=host, port=port), + 'mongo_url': uri, 'mongo_database': db_name } manager = MigrationManager(config=Configuration(config=config_params)) diff --git a/bumiworker/bumiworker/modules/base.py b/bumiworker/bumiworker/modules/base.py index 4980eb9aa..9c2105376 100644 --- a/bumiworker/bumiworker/modules/base.py +++ b/bumiworker/bumiworker/modules/base.py @@ -70,8 +70,7 @@ def rest_client(self): def mongo_client(self): if not self._mongo_client: mongo_params = self.config_cl.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - self._mongo_client = MongoClient(mongo_conn_string) + self._mongo_client = MongoClient(mongo_params[0]) return self._mongo_client def get_options(self): diff --git a/bumiworker/bumiworker/tasks.py b/bumiworker/bumiworker/tasks.py index 854ad745e..def94a5a6 100644 --- a/bumiworker/bumiworker/tasks.py +++ b/bumiworker/bumiworker/tasks.py @@ -80,8 +80,7 @@ def s3_client(self): def mongo_cl(self): if not self._mongo_cl: mongo_params = self.config_cl.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - self._mongo_cl = MongoClient(mongo_conn_string) + self._mongo_cl = MongoClient(mongo_params[0]) return self._mongo_cl def _execute(self): diff --git a/diworker/diworker/main.py b/diworker/diworker/main.py index bb263fc05..1be6358d4 100755 --- a/diworker/diworker/main.py +++ b/diworker/diworker/main.py @@ -70,8 +70,7 @@ def rest_cl(self): def mongo_cl(self): if self._mongo_cl is None: mongo_params = self.config_cl.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - self._mongo_cl = MongoClient(mongo_conn_string) + self._mongo_cl = MongoClient(mongo_params[0]) return self._mongo_cl @property diff --git a/diworker/diworker/migrator.py b/diworker/diworker/migrator.py index 01d3b7f25..c9f600ab8 100644 --- a/diworker/diworker/migrator.py +++ b/diworker/diworker/migrator.py @@ -32,8 +32,7 @@ def __init__(self, config_cl, database_name, migrations_path): self.migrations_path = migrations_path mongo_params = self.config_cl.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - self._mongo_cl = MongoClient(mongo_conn_string) + self._mongo_cl = MongoClient(mongo_params[0]) @property def _mongo_migrations(self): diff --git a/diworker/diworker/regenerator.py b/diworker/diworker/regenerator.py index 5c26379ba..45a43fa42 100644 --- a/diworker/diworker/regenerator.py +++ b/diworker/diworker/regenerator.py @@ -26,8 +26,7 @@ def rest_cl(self): def mongo_cl(self): if self._mongo_cl is None: mongo_params = self.config_cl.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - self._mongo_cl = MongoClient(mongo_conn_string) + self._mongo_cl = MongoClient(mongo_params[0]) return self._mongo_cl @property diff --git a/docker_images/booking_observer/worker.py b/docker_images/booking_observer/worker.py index 5062b1964..1ed0f3d72 100644 --- a/docker_images/booking_observer/worker.py +++ b/docker_images/booking_observer/worker.py @@ -51,8 +51,7 @@ def rest_cl(self): def mongo_cl(self): if not self._mongo_cl: mongo_params = self.config_cl.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - self._mongo_cl = MongoClient(mongo_conn_string) + self._mongo_cl = MongoClient(mongo_params[0]) return self._mongo_cl def get_consumers(self, consumer, channel): diff --git a/docker_images/cleanmongodb/clean-mongo-db.py b/docker_images/cleanmongodb/clean-mongo-db.py index 9a0056277..8a66da319 100644 --- a/docker_images/cleanmongodb/clean-mongo-db.py +++ b/docker_images/cleanmongodb/clean-mongo-db.py @@ -71,8 +71,7 @@ def config_client(self): def mongo_client(self): if not self._mongo_client: mongo_params = self.config_client.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - self._mongo_client = MongoClient(mongo_conn_string) + self._mongo_client = MongoClient(mongo_params[0]) return self._mongo_client def get_settings(self): diff --git a/docker_images/configurator/configurator.py b/docker_images/configurator/configurator.py index 9ed6c262d..770022dcf 100644 --- a/docker_images/configurator/configurator.py +++ b/docker_images/configurator/configurator.py @@ -35,10 +35,14 @@ def __init__(self, config_path='config.yml', host='etcd', port=2379): host=config['restdb']['host'], port=config['restdb']['port']) ) - self.mongo_client = MongoClient("mongodb://%s:%s@%s:%s" % ( - config['mongo']['user'], config['mongo']['pass'], - config['mongo']['host'], config['mongo']['port'] - )) + if "url" in config["mongo"]: + mongo_url = config["mongo"]["url"] + else: + mongo_url = "mongodb://%s:%s@%s:%s" % ( + config['mongo']['user'], config['mongo']['pass'], + config['mongo']['host'], config['mongo']['port'] + ) + self.mongo_client = MongoClient(mongo_url) rabbit_config = config['rabbit'] credentials = pika.PlainCredentials(rabbit_config['user'], diff --git a/docker_images/live_demo_generator/scheduler.py b/docker_images/live_demo_generator/scheduler.py index a229fb774..7a33ea176 100644 --- a/docker_images/live_demo_generator/scheduler.py +++ b/docker_images/live_demo_generator/scheduler.py @@ -36,8 +36,7 @@ def publish_tasks(config_client, count): def main(config_client): mongo_params = config_client.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - mongo_cl = MongoClient(mongo_conn_string) + mongo_cl = MongoClient(mongo_params[0]) live_demos_collection = mongo_cl.restapi.live_demos dt = utcnow() - timedelta(days=DEMO_LIFETIME_DAYS) count = DEMO_COUNT - live_demos_collection.count_documents({ diff --git a/docker_images/live_demo_generator/worker.py b/docker_images/live_demo_generator/worker.py index ae42cb04a..bdfe276b7 100644 --- a/docker_images/live_demo_generator/worker.py +++ b/docker_images/live_demo_generator/worker.py @@ -46,8 +46,7 @@ def rest_cl(self): def mongo_cl(self): if not self._mongo_cl: mongo_params = self.config_cl.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - self._mongo_cl = MongoClient(mongo_conn_string) + self._mongo_cl = MongoClient(mongo_params[0]) return self._mongo_cl def get_consumers(self, Consumer, channel): diff --git a/docker_images/power_schedule/worker.py b/docker_images/power_schedule/worker.py index 4c8a5ab51..2d404f89f 100644 --- a/docker_images/power_schedule/worker.py +++ b/docker_images/power_schedule/worker.py @@ -64,8 +64,7 @@ def rest_cl(self): @cached_property def mongo_cl(self): mongo_params = self.config_cl.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - return MongoClient(mongo_conn_string) + return MongoClient(mongo_params[0]) def get_consumers(self, consumer, channel): return [consumer(queues=[TASK_QUEUE], accept=['json'], diff --git a/docker_images/users_dataset_generator/users_dataset_generator.py b/docker_images/users_dataset_generator/users_dataset_generator.py index d504a1fce..0f36ebf4c 100644 --- a/docker_images/users_dataset_generator/users_dataset_generator.py +++ b/docker_images/users_dataset_generator/users_dataset_generator.py @@ -42,10 +42,8 @@ def _get_session_to_my_db(config_cl): def _get_mongo_client(config_cl): - user, password, host, port, db_name = config_cl.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % ( - user, password, host, port) - return MongoClient(mongo_conn_string) + mongo_params = config_cl.mongo_params() + return MongoClient(mongo_params[0]) def _get_clickhouse_client(config_cl): diff --git a/docker_images/webhook_executor/worker.py b/docker_images/webhook_executor/worker.py index ebe4ef7e7..e35dafcf7 100644 --- a/docker_images/webhook_executor/worker.py +++ b/docker_images/webhook_executor/worker.py @@ -82,8 +82,7 @@ def rest_cl(self): def mongo_cl(self): if not self._mongo_cl: mongo_params = self.config_cl.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - self._mongo_cl = MongoClient(mongo_conn_string) + self._mongo_cl = MongoClient(mongo_params[0]) return self._mongo_cl def get_consumers(self, consumer, channel): diff --git a/gemini/gemini_worker/main.py b/gemini/gemini_worker/main.py index 41b2e1f96..214769b5c 100644 --- a/gemini/gemini_worker/main.py +++ b/gemini/gemini_worker/main.py @@ -60,8 +60,7 @@ def clickhouse_client(self) -> ClickHouseClient: def mongo_client(self) -> MongoClient: if self._mongo_client is None: mongo_params = self.config_client.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - self._mongo_client = MongoClient(mongo_conn_string) + self._mongo_client = MongoClient(mongo_params[0]) return self._mongo_client @property diff --git a/insider/insider_api/controllers/base.py b/insider/insider_api/controllers/base.py index eb0a64a7a..e20267ecf 100644 --- a/insider/insider_api/controllers/base.py +++ b/insider/insider_api/controllers/base.py @@ -65,8 +65,7 @@ def __init__(self, config=None): def mongo_client(self): if not self._mongo_client: mongo_params = self._config.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - self._mongo_client = MongoClient(mongo_conn_string) + self._mongo_client = MongoClient(mongo_params[0]) return self._mongo_client @property diff --git a/insider/insider_api/controllers/flavor_price.py b/insider/insider_api/controllers/flavor_price.py index d6f617986..1d444084a 100644 --- a/insider/insider_api/controllers/flavor_price.py +++ b/insider/insider_api/controllers/flavor_price.py @@ -29,8 +29,7 @@ def __init__(self, config_cl): def mongo_client(self): if not self._mongo_client: mongo_params = self._config_cl.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - self._mongo_client = MongoClient(mongo_conn_string) + self._mongo_client = MongoClient(mongo_params[0]) return self._mongo_client @property diff --git a/insider/insider_api/controllers/relevant_flavor.py b/insider/insider_api/controllers/relevant_flavor.py index 26f96bf57..c6b60fa99 100644 --- a/insider/insider_api/controllers/relevant_flavor.py +++ b/insider/insider_api/controllers/relevant_flavor.py @@ -30,8 +30,7 @@ def __init__(self, config_cl): def mongo_client(self): if not self._mongo_client: mongo_params = self._config_cl.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - self._mongo_client = MongoClient(mongo_conn_string) + self._mongo_client = MongoClient(mongo_params[0]) return self._mongo_client @property diff --git a/insider/insider_worker/main.py b/insider/insider_worker/main.py index 83177ed7e..260f8c4ce 100644 --- a/insider/insider_worker/main.py +++ b/insider/insider_worker/main.py @@ -33,8 +33,7 @@ def __init__(self, connection, config_cl): def mongo_client(self): if not self._mongo_client: mongo_params = self.config_cl.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - self._mongo_client = MongoClient(mongo_conn_string) + self._mongo_client = MongoClient(mongo_params[0]) return self._mongo_client @property diff --git a/insider/insider_worker/migrator.py b/insider/insider_worker/migrator.py index 74279e2e9..1c7ebc280 100644 --- a/insider/insider_worker/migrator.py +++ b/insider/insider_worker/migrator.py @@ -32,8 +32,7 @@ def __init__(self, config_cl, database_name, migrations_path): self.migrations_path = migrations_path mongo_params = self.config_cl.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - self._mongo_cl = MongoClient(mongo_conn_string) + self._mongo_cl = MongoClient(mongo_params[0]) @property def _mongo_migrations(self): diff --git a/metroculus/metroculus_worker/processor.py b/metroculus/metroculus_worker/processor.py index 141150e16..c1f10ebe7 100644 --- a/metroculus/metroculus_worker/processor.py +++ b/metroculus/metroculus_worker/processor.py @@ -115,8 +115,7 @@ def clickhouse_client(self): def mongo_client(self): if not self._mongo_client: mongo_params = self.config_cl.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - self._mongo_client = MongoClient(mongo_conn_string) + self._mongo_client = MongoClient(mongo_params[0]) return self._mongo_client @property diff --git a/optscale-deploy/optscale/templates/tpl/_config.tpl b/optscale-deploy/optscale/templates/tpl/_config.tpl index 872164d93..743724a89 100644 --- a/optscale-deploy/optscale/templates/tpl/_config.tpl +++ b/optscale-deploy/optscale/templates/tpl/_config.tpl @@ -156,10 +156,11 @@ etcd: db: jira-bus port: {{ .Values.mariadb.service.externalPort }} mongo: - host: {{ .Values.mongo.service.host }} - port: {{ .Values.mongo.service.externalPort }} - user: {{ .Values.mongo.credentials.username }} - pass: {{ .Values.mongo.credentials.password }} + {{ if .Values.mongo.url }} + url: {{ .Values.mongo.url }} + {{ else }} + url: mongodb://{{ .Values.mongo.credentials.username }}:{{ .Values.mongo.credentials.password }}@{{ .Values.mongo.service.host }}:{{ .Values.mongo.service.externalPort }} + {{ end }} database: keeper influxdb: host: {{ .Values.influxdb.service.name }} diff --git a/optscale_client/aconfig_cl/aconfig_cl.py b/optscale_client/aconfig_cl/aconfig_cl.py index 63690f478..3f516efe7 100644 --- a/optscale_client/aconfig_cl/aconfig_cl.py +++ b/optscale_client/aconfig_cl/aconfig_cl.py @@ -28,18 +28,28 @@ async def arcee_params(self): Returns :return: """ - branch = await self.read_branch("/mongo") - return (branch['user'], branch['pass'], branch['host'], - branch['port'], 'arcee') + params = self.read_branch('/mongo') + if "url" in params: + return (params["url"], 'arcee') + url = "mongodb://%s:%s@%s:%s" % ( + params['user'], params['pass'], + params['host'], params['port'] + ) + return (url, 'arcee') async def bulldozer_params(self): """ Returns :return: """ - branch = await self.read_branch("/mongo") - return (branch['user'], branch['pass'], branch['host'], - branch['port'], 'bulldozer') + params = self.read_branch('/mongo') + if "url" in params: + return (params["url"], 'bulldozer') + url = "mongodb://%s:%s@%s:%s" % ( + params['user'], params['pass'], + params['host'], params['port'] + ) + return (url, 'bulldozer') async def cluster_secret(self): return await self.get_value("/secret/cluster") diff --git a/optscale_client/config_client/client.py b/optscale_client/config_client/client.py index a6fa5c1dc..e2771f9dc 100644 --- a/optscale_client/config_client/client.py +++ b/optscale_client/config_client/client.py @@ -343,13 +343,14 @@ def increase_and_return(self, key, max_value=50000): raise ConcurrencyException(key) def mongo_params(self): - """ - Get tuple with access args for mongo db (report service) - :return: ('user', 'pass', 'host', 'port', 'database') - """ - params = self.read_branch('/mongo') - return (params['user'], params['pass'], params['host'], - params['port'], params['database']) + params = self.read_branch('/mongo') + if "url" in params: + return (params["url"], params["database"]) + url = "mongodb://%s:%s@%s:%s" % ( + params['user'], params['pass'], + params['host'], params['port'] + ) + return (url, params["database"]) def rabbit_params(self): """ diff --git a/rest_api/rest_api_server/alembic/versions/1418b07142ce_power_schedule_resource_index.py b/rest_api/rest_api_server/alembic/versions/1418b07142ce_power_schedule_resource_index.py index d9983c0d9..8d781b472 100644 --- a/rest_api/rest_api_server/alembic/versions/1418b07142ce_power_schedule_resource_index.py +++ b/rest_api/rest_api_server/alembic/versions/1418b07142ce_power_schedule_resource_index.py @@ -30,8 +30,7 @@ def _get_etcd_config_client(): def _get_restapi_resources_mongo(): config_cl = _get_etcd_config_client() mongo_params = config_cl.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - mongo_client = MongoClient(mongo_conn_string) + mongo_client = MongoClient(mongo_params[0]) return mongo_client.restapi.resources diff --git a/rest_api/rest_api_server/alembic/versions/3575a7a8b8dd_remove_savings_plan_negation_resources.py b/rest_api/rest_api_server/alembic/versions/3575a7a8b8dd_remove_savings_plan_negation_resources.py index fd936578e..8b5b702cb 100644 --- a/rest_api/rest_api_server/alembic/versions/3575a7a8b8dd_remove_savings_plan_negation_resources.py +++ b/rest_api/rest_api_server/alembic/versions/3575a7a8b8dd_remove_savings_plan_negation_resources.py @@ -40,8 +40,7 @@ def _get_etcd_config_client(): def get_mongo_client(): config_cl = _get_etcd_config_client() mongo_params = config_cl.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - return MongoClient(mongo_conn_string) + return MongoClient(mongo_params[0]) def _get_clickhouse_client(): diff --git a/rest_api/rest_api_server/alembic/versions/8992bafc1505_encode_env_properties_for_not_shareable.py b/rest_api/rest_api_server/alembic/versions/8992bafc1505_encode_env_properties_for_not_shareable.py index d9343969f..8a59dcbc4 100644 --- a/rest_api/rest_api_server/alembic/versions/8992bafc1505_encode_env_properties_for_not_shareable.py +++ b/rest_api/rest_api_server/alembic/versions/8992bafc1505_encode_env_properties_for_not_shareable.py @@ -50,8 +50,7 @@ def get_etcd_config_client(): def get_mongo_client(): config_cl = get_etcd_config_client() mongo_params = config_cl.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - mongo_client = MongoClient(mongo_conn_string) + mongo_client = MongoClient(mongo_params[0]) return mongo_client diff --git a/rest_api/rest_api_server/alembic/versions/9cba239b08c7_remove_credit_resources.py b/rest_api/rest_api_server/alembic/versions/9cba239b08c7_remove_credit_resources.py index 2ace0a286..c8140678b 100644 --- a/rest_api/rest_api_server/alembic/versions/9cba239b08c7_remove_credit_resources.py +++ b/rest_api/rest_api_server/alembic/versions/9cba239b08c7_remove_credit_resources.py @@ -36,7 +36,7 @@ def _get_etcd_config_client(): def get_mongo_client(): config_cl = _get_etcd_config_client() mongo_params = config_cl.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] + mongo_conn_string = mongo_params[0] return MongoClient(mongo_conn_string) diff --git a/rest_api/rest_api_server/alembic/versions/a84e2b6e2053_fixed_power_schedule_index.py b/rest_api/rest_api_server/alembic/versions/a84e2b6e2053_fixed_power_schedule_index.py index 105010d9a..fe1c16965 100644 --- a/rest_api/rest_api_server/alembic/versions/a84e2b6e2053_fixed_power_schedule_index.py +++ b/rest_api/rest_api_server/alembic/versions/a84e2b6e2053_fixed_power_schedule_index.py @@ -30,8 +30,7 @@ def _get_etcd_config_client(): def _get_restapi_resources_mongo(): config_cl = _get_etcd_config_client() mongo_params = config_cl.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - mongo_client = MongoClient(mongo_conn_string) + mongo_client = MongoClient(mongo_params[0]) return mongo_client.restapi.resources diff --git a/rest_api/rest_api_server/alembic/versions/b4f668663526_clear_has_metric_flag_from_pods.py b/rest_api/rest_api_server/alembic/versions/b4f668663526_clear_has_metric_flag_from_pods.py index 8b7aa12ab..98e0859dd 100644 --- a/rest_api/rest_api_server/alembic/versions/b4f668663526_clear_has_metric_flag_from_pods.py +++ b/rest_api/rest_api_server/alembic/versions/b4f668663526_clear_has_metric_flag_from_pods.py @@ -48,8 +48,7 @@ def get_etcd_config_client(): def get_resources_collection(): config_cl = get_etcd_config_client() mongo_params = config_cl.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - mongo_client = MongoClient(mongo_conn_string) + mongo_client = MongoClient(mongo_params[0]) return mongo_client.restapi.resources diff --git a/rest_api/rest_api_server/alembic/versions/c333baae923d_remove_cloud_health.py b/rest_api/rest_api_server/alembic/versions/c333baae923d_remove_cloud_health.py index 1747f90a0..6d7405d79 100644 --- a/rest_api/rest_api_server/alembic/versions/c333baae923d_remove_cloud_health.py +++ b/rest_api/rest_api_server/alembic/versions/c333baae923d_remove_cloud_health.py @@ -41,8 +41,7 @@ def _get_etcd_config_client(): def _get_health_collection(config_cl): mongo_params = config_cl.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - mongo_client = MongoClient(mongo_conn_string) + mongo_client = MongoClient(mongo_params[0]) return mongo_client.restapi.health diff --git a/rest_api/rest_api_server/alembic/versions/db6f2740ff70_encode_env_properties.py b/rest_api/rest_api_server/alembic/versions/db6f2740ff70_encode_env_properties.py index e601e7704..a3408c975 100644 --- a/rest_api/rest_api_server/alembic/versions/db6f2740ff70_encode_env_properties.py +++ b/rest_api/rest_api_server/alembic/versions/db6f2740ff70_encode_env_properties.py @@ -52,8 +52,7 @@ def get_etcd_config_client(): def get_mongo_client(): config_cl = get_etcd_config_client() mongo_params = config_cl.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - mongo_client = MongoClient(mongo_conn_string) + mongo_client = MongoClient(mongo_params[0]) return mongo_client diff --git a/rest_api/rest_api_server/alembic/versions/e63b63d4d484_add_cloud_resource_hash_index.py b/rest_api/rest_api_server/alembic/versions/e63b63d4d484_add_cloud_resource_hash_index.py index ef7f1714f..abeebd8a8 100644 --- a/rest_api/rest_api_server/alembic/versions/e63b63d4d484_add_cloud_resource_hash_index.py +++ b/rest_api/rest_api_server/alembic/versions/e63b63d4d484_add_cloud_resource_hash_index.py @@ -32,8 +32,7 @@ def _get_etcd_config_client(): def _get_restapi_resources_mongo(): config_cl = _get_etcd_config_client() mongo_params = config_cl.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - mongo_client = MongoClient(mongo_conn_string) + mongo_client = MongoClient(mongo_params[0]) return mongo_client.restapi.resources diff --git a/rest_api/rest_api_server/controllers/base.py b/rest_api/rest_api_server/controllers/base.py index 547f7bd1d..e1182df85 100644 --- a/rest_api/rest_api_server/controllers/base.py +++ b/rest_api/rest_api_server/controllers/base.py @@ -203,8 +203,7 @@ def __init__(self, *args, **kwargs): def mongo_client(self): if not self._mongo_client: mongo_params = Config().mongo_params - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - self._mongo_client = MongoClient(mongo_conn_string) + self._mongo_client = MongoClient(mongo_params[0]) return self._mongo_client @property diff --git a/risp/risp_worker/migrations/base.py b/risp/risp_worker/migrations/base.py index effd8e416..67dc8de71 100644 --- a/risp/risp_worker/migrations/base.py +++ b/risp/risp_worker/migrations/base.py @@ -26,8 +26,7 @@ def migrations_path(self): def mongo_client(self): if self._mongo_client is None: mongo_params = self.config_client.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - self._mongo_client = MongoClient(mongo_conn_string) + self._mongo_client = MongoClient(mongo_params[0]) return self._mongo_client @property diff --git a/risp/risp_worker/worker.py b/risp/risp_worker/worker.py index 3377f685a..c1db3b215 100644 --- a/risp/risp_worker/worker.py +++ b/risp/risp_worker/worker.py @@ -55,8 +55,7 @@ def rest_cl(self): def mongo_client(self): if self._mongo_client is None: mongo_params = self.config_client.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - self._mongo_client = MongoClient(mongo_conn_string) + self._mongo_client = MongoClient(mongo_params[0]) return self._mongo_client @property diff --git a/trapper/trapper_worker/processor.py b/trapper/trapper_worker/processor.py index d56788365..5d218e3d6 100644 --- a/trapper/trapper_worker/processor.py +++ b/trapper/trapper_worker/processor.py @@ -35,8 +35,7 @@ def rest_cl(self): def mongo_cl(self): if not self._mongo_cl: mongo_params = self.config_cl.mongo_params() - mongo_conn_string = "mongodb://%s:%s@%s:%s" % mongo_params[:-1] - self._mongo_cl = MongoClient(mongo_conn_string) + self._mongo_cl = MongoClient(mongo_params[0]) return self._mongo_cl @property