Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 4 deletions storage/digital_ocean_spaces.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def upload_content(
if isinstance(content_to_be_uploaded, str):
f = BytesIO(content_to_be_uploaded.encode())
self._client.upload_fileobj(
f, self._bucket, file_key, ExtraArgs={"ACL": permission}
f, self._bucket, file_key
)
# Explicit cleanup
f.close()
Expand All @@ -110,7 +110,6 @@ def upload_content(
content_to_be_uploaded,
self._bucket,
file_key,
ExtraArgs={"ACL": permission},
)

def upload_file(
Expand All @@ -121,7 +120,7 @@ def upload_file(
) -> None:
logging.debug(f"Uploading {file_key}")
self._client.upload_file(
file_path, self._bucket, file_key, ExtraArgs={"ACL": permission}
file_path, self._bucket, file_key
)

def upload_file_multipart(
Expand All @@ -134,7 +133,7 @@ def upload_file_multipart(
logging.debug(f"Uploading {file_key} with multipart")

multipart_upload = self._client.create_multipart_upload(
Bucket=self._bucket, Key=file_key, ACL=permission
Bucket=self._bucket, Key=file_key
)
upload_id = multipart_upload["UploadId"]

Expand Down
2 changes: 1 addition & 1 deletion tests/digital_ocean_spaces.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,5 +149,5 @@ def test_should_upload_content(self, upload_fileobj_mock, bytesio_mock):
content_to_be_uploaded = "content of bucket"
spaces.upload_content(file_key, content_to_be_uploaded)
upload_fileobj_mock.assert_called_once_with(
sentinel.bytesio, self.BUCKET, file_key, ExtraArgs={"ACL": "public-read"}
sentinel.bytesio, self.BUCKET, file_key
)
Loading