evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix import for new AWS aiobotocore lib (#64769)

Browse source 
* Fix import for new AWS aiobotocore lib

* Fix patch for tests
This commit is contained in:
Simone Chemelli 2022-01-24 13:02:51 +01:00 • committed by GitHub
parent 27cb41a62c
commit 7884de3a31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
homeassistant/components/aws/__init__.py
View file

@ -3,7 +3,7 @@ import asyncio
from collections import OrderedDict
import logging
import aiobotocore
from aiobotocore.session import AioSession
import voluptuous as vol
from homeassistant import config_entries
@ -165,14 +165,14 @@ async def _validate_aws_credentials(hass, credential):
del aws_config[CONF_VALIDATE]
if (profile := aws_config.get(CONF_PROFILE_NAME)) is not None:
session = aiobotocore.session.AioSession(profile=profile)
session = AioSession(profile=profile)
del aws_config[CONF_PROFILE_NAME]
if CONF_ACCESS_KEY_ID in aws_config:
del aws_config[CONF_ACCESS_KEY_ID]
if CONF_SECRET_ACCESS_KEY in aws_config:
del aws_config[CONF_SECRET_ACCESS_KEY]
else:
session = aiobotocore.session.AioSession()
session = AioSession()
if credential[CONF_VALIDATE]:
async with session.create_client("iam", **aws_config) as client:

8
homeassistant/components/aws/notify.py
View file

@ -4,7 +4,7 @@ import base64
import json
import logging
import aiobotocore
from aiobotocore.session import AioSession
from homeassistant.components.notify import (
ATTR_TARGET,
@ -27,7 +27,7 @@ _LOGGER = logging.getLogger(__name__)
async def get_available_regions(hass, service):
"""Get available regions for a service."""
session = aiobotocore.session.get_session()
session = AioSession()
return await session.get_available_regions(service)
@ -83,10 +83,10 @@ async def async_get_service(hass, config, discovery_info=None):
if session is None:
if (profile := aws_config.get(CONF_PROFILE_NAME)) is not None:
session = aiobotocore.session.AioSession(profile=profile)
session = AioSession(profile=profile)
del aws_config[CONF_PROFILE_NAME]
else:
session = aiobotocore.session.AioSession()
session = AioSession()
aws_config[CONF_REGION] = region_name