undo cluster and fix dv2

Author: pcrespov

services/clusters-keeper/src/simcore_service_clusters_keeper/utils/clusters.py

@@ -1,14 +1,14 @@
 import base64
 import datetime
 import functools
+import json
 from pathlib import Path
 from typing import Any, Final
 
 import arrow
 import yaml
 from aws_library.ec2 import EC2InstanceBootSpecific, EC2InstanceData, EC2Tags
 from aws_library.ec2._models import CommandStr
-from common_library.json_serialization import json_dumps
 from common_library.serialization import model_dump_with_secrets
 from fastapi.encoders import jsonable_encoder
 from models_library.api_schemas_clusters_keeper.clusters import (
@@ -80,7 +80,7 @@ def _convert_to_env_list(entries: list[Any]) -> str:
         return f"[{entries_as_str}]"
 
     def _convert_to_env_dict(entries: dict[str, Any]) -> str:
-        return f"'{json_dumps(jsonable_encoder(entries))}'"
+        return f"'{json.dumps(jsonable_encoder(entries))}'"
 
     assert app_settings.CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES  # nosec
 

services/clusters-keeper/tests/unit/test_utils_clusters.py

@@ -181,7 +181,7 @@ def test_create_deploy_cluster_stack_script(
         "WORKERS_EC2_INSTANCES_CUSTOM_TAGS",
     ]
     assert all(
-        re.search(rf"{i}=\'{{(\".+\":\s*\".*\")+}}\'", deploy_script)
+        re.search(rf"{i}=\'{{(\".+\":\s\".*\")+}}\'", deploy_script)
         for i in dict_settings
     )
 

services/director-v2/tests/unit/test_modules_dynamic_sidecar_client_api_thin.py

@@ -1,11 +1,11 @@
 # pylint:disable=unused-argument
 # pylint:disable=redefined-outer-name
 
-import json
 from collections.abc import AsyncIterable, Callable
 from typing import Any
 
 import pytest
+from common_library.json_serialization import json_dumps
 from faker import Faker
 from fastapi import FastAPI, status
 from httpx import Response
@@ -182,7 +182,7 @@ async def test_get_containers_name(
 ) -> None:
     mock_response = Response(status.HTTP_200_OK)
 
-    encoded_filters = json.dumps(
+    encoded_filters = json_dumps(
         {
             "network": dynamic_sidecar_network_name,
             "exclude": SUFFIX_EGRESS_PROXY_NAME,