jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-19 11:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Disable S3 checksums" (#144092) (#144318)

Browse Source
This commit is contained in:
Robert Resch 2025-05-06 12:01:27 +02:00 committed by Franck Nijhof
parent 58f7a8a51e
commit 5f70140e72
No known key found for this signature in database
GPG Key ID: AB33ADACE7101952
2 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
homeassistant/components/s3/__init__.py
View File

@ -7,7 +7,6 @@ from typing import cast
from aiobotocore.client import AioBaseClient as S3Client from aiobotocore.client import AioBaseClient as S3Client
from aiobotocore.session import AioSession from aiobotocore.session import AioSession
from botocore.config import Config
from botocore.exceptions import ClientError, ConnectionError, ParamValidationError from botocore.exceptions import ClientError, ConnectionError, ParamValidationError
from homeassistant.config_entries import ConfigEntry from homeassistant.config_entries import ConfigEntry
@ -33,11 +32,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: S3ConfigEntry) -> bool:
"""Set up S3 from a config entry.""" """Set up S3 from a config entry."""
data = cast(dict, entry.data) data = cast(dict, entry.data)
# due to https://github.com/home-assistant/core/issues/143995
config = Config(
request_checksum_calculation="when_required",
response_checksum_validation="when_required",
)
try: try:
session = AioSession() session = AioSession()
# pylint: disable-next=unnecessary-dunder-call # pylint: disable-next=unnecessary-dunder-call
@ -46,7 +40,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: S3ConfigEntry) -> bool:
endpoint_url=data.get(CONF_ENDPOINT_URL), endpoint_url=data.get(CONF_ENDPOINT_URL),
aws_secret_access_key=data[CONF_SECRET_ACCESS_KEY], aws_secret_access_key=data[CONF_SECRET_ACCESS_KEY],
aws_access_key_id=data[CONF_ACCESS_KEY_ID], aws_access_key_id=data[CONF_ACCESS_KEY_ID],
config=config,
).__aenter__() ).__aenter__()
await client.head_bucket(Bucket=data[CONF_BUCKET]) await client.head_bucket(Bucket=data[CONF_BUCKET])
except ClientError as err: except ClientError as err:

17
tests/components/s3/test_init.py
View File

@ -2,7 +2,6 @@
from unittest.mock import AsyncMock, patch from unittest.mock import AsyncMock, patch
from botocore.config import Config
from botocore.exceptions import ( from botocore.exceptions import (
ClientError, ClientError,
EndpointConnectionError, EndpointConnectionError,
@ -74,19 +73,3 @@ async def test_setup_entry_head_bucket_error(
) )
await setup_integration(hass, mock_config_entry) await setup_integration(hass, mock_config_entry)
assert mock_config_entry.state is ConfigEntryState.SETUP_ERROR assert mock_config_entry.state is ConfigEntryState.SETUP_ERROR
async def test_checksum_settings_present(
hass: HomeAssistant, mock_config_entry: MockConfigEntry
) -> None:
"""Test that checksum validation is set to be compatible with third-party S3 providers."""
# due to https://github.com/home-assistant/core/issues/143995
with patch(
"homeassistant.components.s3.AioSession.create_client"
) as mock_create_client:
await setup_integration(hass, mock_config_entry)
config_arg = mock_create_client.call_args[1]["config"]
assert isinstance(config_arg, Config)
assert config_arg.request_checksum_calculation == "when_required"
assert config_arg.response_checksum_validation == "when_required"