rename

Author: Andrei Neagu

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/api/rest/containers.py

@@ -24,8 +24,8 @@
 from ...core.settings import ApplicationSettings
 from ...core.validation import (
     ComposeSpecValidation,
+    get_and_validate_compose_spec,
     parse_compose_spec,
-    validate_compose_spec,
 )
 from ...models.schemas.containers import ContainersComposeSpec
 from ...models.shared_store import SharedStore
@@ -76,10 +76,12 @@ async def store_compose_spec(
     _ = request
 
     async with shared_store:
-        compose_spec_validation: ComposeSpecValidation = await validate_compose_spec(
-            settings=settings,
-            compose_file_content=containers_compose_spec.docker_compose_yaml,
-            mounted_volumes=mounted_volumes,
+        compose_spec_validation: ComposeSpecValidation = (
+            await get_and_validate_compose_spec(
+                settings=settings,
+                compose_file_content=containers_compose_spec.docker_compose_yaml,
+                mounted_volumes=mounted_volumes,
+            )
         )
         shared_store.compose_spec = compose_spec_validation.compose_spec
         shared_store.container_names = compose_spec_validation.current_container_names

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/core/validation.py

@@ -185,7 +185,7 @@ class ComposeSpecValidation(NamedTuple):
     original_to_current_container_names: dict[str, str]
 
 
-async def validate_compose_spec(  # pylint: disable=too-many-statements
+async def get_and_validate_compose_spec(  # pylint: disable=too-many-statements
     settings: ApplicationSettings,
     compose_file_content: str,
     mounted_volumes: MountedVolumes,

services/dynamic-sidecar/tests/unit/test_core_validation.py

@@ -12,8 +12,8 @@
 from servicelib.docker_constants import DEFAULT_USER_SERVICES_NETWORK_NAME
 from simcore_service_dynamic_sidecar.core.validation import (
     _connect_user_services,
+    get_and_validate_compose_spec,
     parse_compose_spec,
-    validate_compose_spec,
 )
 from simcore_service_dynamic_sidecar.modules.mounted_fs import MountedVolumes
 
@@ -174,6 +174,6 @@ async def test_regression_validate_compose_spec(
     no_internet_spec: str,
     fake_mounted_volumes: MountedVolumes,
 ):
-    await validate_compose_spec(
+    await get_and_validate_compose_spec(
         app.state.settings, no_internet_spec, fake_mounted_volumes
     )