Skip to content

Correction de la détection d'objet absent en S3 #82

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

Merged
Dolite merged 3 commits into from
Feb 8, 2024
Merged

Correction de la détection d'objet absent en S3 #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ce5904
Correction de la détection d'objet absent en S3
Dolite Feb 8, 2024
029fca7
Correction de la détection d'objet absent en S3
Dolite Feb 8, 2024
845820e
Merge branch 'hotfix/s3-notfound-detection' of github.com:rok4/core-p…
Dolite Feb 8, 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
7 changes: 5 additions & 2 deletions src/rok4/storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ def __get_cached_data_binary(path: str, ttl_hash: int, range: Tuple[int, int] =
)

except botocore.exceptions.ClientError as e:
if e.response["Error"]["Code"] == "404":
if e.response["Error"]["Code"] == "NoSuchKey":
raise FileNotFoundError(f"{storage_type.value}{path}")
else:
raise StorageError("S3", e)
Expand Down Expand Up @@ -443,6 +443,9 @@ def get_data_binary(path: str, range: Tuple[int, int] = None) -> str:
Returns:
str: Data binary content
"""
print("########################################")
print(f"get_data_binary {path}")
print("########################################")
return __get_cached_data_binary(path, __get_ttl_hash(), range)


Expand Down Expand Up @@ -573,7 +576,7 @@ def exists(path: str) -> bool:
s3_client["client"].head_object(Bucket=bucket_name, Key=base_name)
return True
except botocore.exceptions.ClientError as e:
if e.response["Error"]["Code"] == "404":
if e.response["Error"]["Code"] == "NoSuchKey":
return False
else:
raise StorageError("S3", e)
Expand Down
2 changes: 1 addition & 1 deletion tests/test_storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,7 @@ def test_exists_s3_ok(mocked_s3_client):
assert False, f"S3 exists raises an exception: {exc}"

s3_instance.head_object.side_effect = botocore.exceptions.ClientError(
operation_name="InvalidKeyPair.Duplicate", error_response={"Error": {"Code": "404"}}
operation_name="InvalidKeyPair.Duplicate", error_response={"Error": {"Code": "NoSuchKey"}}
)
try:
assert not exists("s3://bucket/object.ext")
Expand Down