Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 Refactor storage setup functions to avoid errors #6686

Merged
merged 2 commits into from
Nov 8, 2024
Merged

🐛 Refactor storage setup functions to avoid errors #6686

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0a5c60
refactor setup functions
Nov 7, 2024
21a15d5
Merge branch 'master' into pr-osparc-fix-storage-setup
GitHK Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions services/storage/src/simcore_service_storage/s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@


async def setup_s3_client(app) -> AsyncGenerator[None, None]:
with log_context(log, logging.DEBUG, msg=f"setup {__name__}.setup.cleanup_ctx"):
client = None

with log_context(log, logging.DEBUG, msg="setup.s3_client.cleanup_ctx"):
storage_settings: Settings = app[APP_CONFIG_KEY]
storage_s3_settings = storage_settings.STORAGE_S3
assert storage_s3_settings # nosec

client = None
async for attempt in AsyncRetrying(
wait=wait_fixed(RETRY_WAIT_SECS),
before_sleep=before_sleep_log(log, logging.WARNING),
Expand All @@ -45,17 +46,21 @@ async def setup_s3_client(app) -> AsyncGenerator[None, None]:
assert client # nosec
app[APP_S3_KEY] = client

yield
# tear-down
yield

with log_context(log, logging.DEBUG, msg="teardown.s3_client.cleanup_ctx"):
if client:
await client.close()


async def setup_s3_bucket(app: web.Application):
storage_s3_settings = app[APP_CONFIG_KEY].STORAGE_S3
client = get_s3_client(app)
await client.create_bucket(
bucket=storage_s3_settings.S3_BUCKET_NAME, region=storage_s3_settings.S3_REGION
)
with log_context(log, logging.DEBUG, msg="setup.s3_bucket.cleanup_ctx"):
storage_s3_settings = app[APP_CONFIG_KEY].STORAGE_S3
client = get_s3_client(app)
await client.create_bucket(
bucket=storage_s3_settings.S3_BUCKET_NAME,
region=storage_s3_settings.S3_REGION,
)
yield


Expand Down
Loading