big move

Author: sanderegg

services/storage/src/simcore_service_storage/api/rest/simcore_s3.py

@@ -20,7 +20,6 @@
 from servicelib.logging_utils import log_context
 from settings_library.s3 import S3Settings
 
-from ... import sts
 from ..._meta import API_VTAG
 from ...dsm import get_dsm_provider
 from ...models import (
@@ -30,6 +29,7 @@
     SimcoreS3FoldersParams,
     StorageQueryParamsBase,
 )
+from ...modules import sts
 from ...simcore_s3_dsm import SimcoreS3DataManager
 
 _logger = logging.getLogger(__name__)

services/storage/src/simcore_service_storage/core/application.py

@@ -21,7 +21,7 @@
 from ..dsm_cleaner import setup_dsm_cleaner
 from ..long_running_tasks import setup_rest_api_long_running_tasks
 from ..modules.db import setup_db
-from ..redis import setup_redis
+from ..modules.redis import setup_redis
 from ..routes import setup_rest_api_routes
 from ..s3 import setup_s3
 from .settings import Settings

services/storage/src/simcore_service_storage/dsm_cleaner.py

@@ -31,7 +31,7 @@
 from .constants import APP_CONFIG_KEY, APP_DSM_KEY
 from .core.settings import Settings
 from .dsm_factory import DataManagerProvider
-from .redis import get_redis_client
+from .modules.redis import get_redis_client
 from .simcore_s3_dsm import SimcoreS3DataManager
 
 _logger = logging.getLogger(__name__)

services/storage/src/simcore_service_storage/modules/redis.py

@@ -5,9 +5,9 @@
 from servicelib.redis import RedisClientSDK
 from settings_library.redis import RedisDatabase, RedisSettings
 
-from ._meta import APP_NAME
-from .constants import APP_CONFIG_KEY
-from .core.settings import Settings
+from .._meta import APP_NAME
+from ..constants import APP_CONFIG_KEY
+from ..core.settings import Settings
 
 _logger = logging.getLogger(__name__)
 

services/storage/src/simcore_service_storage/sts.py renamed to services/storage/src/simcore_service_storage/modules/sts.py

@@ -8,7 +8,7 @@
 from servicelib.aiohttp.application_keys import APP_CONFIG_KEY
 from settings_library.s3 import S3Settings
 
-from .core.settings import Settings
+from ..core.settings import Settings
 
 
 async def get_or_create_temporary_token_for_user(