use _PATH_VERSION in s3 path instead of hardcoding (#4387)
This commit is contained in:
@@ -253,7 +253,7 @@ class S3Storage(BaseStorage):
|
|||||||
self, organization_id: str, browser_session_id: str
|
self, organization_id: str, browser_session_id: str
|
||||||
) -> list[str]:
|
) -> list[str]:
|
||||||
bucket = settings.AWS_S3_BUCKET_ARTIFACTS
|
bucket = settings.AWS_S3_BUCKET_ARTIFACTS
|
||||||
uri = f"s3://{bucket}/v1/{settings.ENV}/{organization_id}/browser_sessions/{browser_session_id}/downloads"
|
uri = f"s3://{bucket}/{self._PATH_VERSION}/{settings.ENV}/{organization_id}/browser_sessions/{browser_session_id}/downloads"
|
||||||
return [f"s3://{bucket}/{file}" for file in await self.async_client.list_files(uri=uri)]
|
return [f"s3://{bucket}/{file}" for file in await self.async_client.list_files(uri=uri)]
|
||||||
|
|
||||||
async def get_shared_downloaded_files_in_browser_session(
|
async def get_shared_downloaded_files_in_browser_session(
|
||||||
@@ -298,14 +298,14 @@ class S3Storage(BaseStorage):
|
|||||||
self, organization_id: str, browser_session_id: str
|
self, organization_id: str, browser_session_id: str
|
||||||
) -> list[str]:
|
) -> list[str]:
|
||||||
bucket = settings.AWS_S3_BUCKET_ARTIFACTS
|
bucket = settings.AWS_S3_BUCKET_ARTIFACTS
|
||||||
uri = f"s3://{bucket}/v1/{settings.ENV}/{organization_id}/browser_sessions/{browser_session_id}/downloads"
|
uri = f"s3://{bucket}/{self._PATH_VERSION}/{settings.ENV}/{organization_id}/browser_sessions/{browser_session_id}/downloads"
|
||||||
files = [f"s3://{bucket}/{file}" for file in await self.async_client.list_files(uri=uri)]
|
files = [f"s3://{bucket}/{file}" for file in await self.async_client.list_files(uri=uri)]
|
||||||
return [file for file in files if file.endswith(BROWSER_DOWNLOADING_SUFFIX)]
|
return [file for file in files if file.endswith(BROWSER_DOWNLOADING_SUFFIX)]
|
||||||
|
|
||||||
async def list_recordings_in_browser_session(self, organization_id: str, browser_session_id: str) -> list[str]:
|
async def list_recordings_in_browser_session(self, organization_id: str, browser_session_id: str) -> list[str]:
|
||||||
"""List all recording files for a browser session from S3."""
|
"""List all recording files for a browser session from S3."""
|
||||||
bucket = settings.AWS_S3_BUCKET_ARTIFACTS
|
bucket = settings.AWS_S3_BUCKET_ARTIFACTS
|
||||||
uri = f"s3://{bucket}/v1/{settings.ENV}/{organization_id}/browser_sessions/{browser_session_id}/videos"
|
uri = f"s3://{bucket}/{self._PATH_VERSION}/{settings.ENV}/{organization_id}/browser_sessions/{browser_session_id}/videos"
|
||||||
return [f"s3://{bucket}/{file}" for file in await self.async_client.list_files(uri=uri)]
|
return [f"s3://{bucket}/{file}" for file in await self.async_client.list_files(uri=uri)]
|
||||||
|
|
||||||
async def get_shared_recordings_in_browser_session(
|
async def get_shared_recordings_in_browser_session(
|
||||||
@@ -492,7 +492,7 @@ class S3Storage(BaseStorage):
|
|||||||
date: str | None = None,
|
date: str | None = None,
|
||||||
) -> str:
|
) -> str:
|
||||||
"""Build the S3 URI for a browser session file."""
|
"""Build the S3 URI for a browser session file."""
|
||||||
base = f"s3://{self.bucket}/v1/{settings.ENV}/{organization_id}/browser_sessions/{browser_session_id}/{artifact_type}"
|
base = f"s3://{self.bucket}/{self._PATH_VERSION}/{settings.ENV}/{organization_id}/browser_sessions/{browser_session_id}/{artifact_type}"
|
||||||
if date:
|
if date:
|
||||||
return f"{base}/{date}/{remote_path}"
|
return f"{base}/{date}/{remote_path}"
|
||||||
return f"{base}/{remote_path}"
|
return f"{base}/{remote_path}"
|
||||||
|
|||||||
Reference in New Issue
Block a user