p59342861
/
monkey
forked from p15670423/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Common: Raise exception if AWS metadata requests fail

This commit is contained in:
Mike Salvatore 2022-05-06 04:22:17 -04:00
parent ca38235b8e
commit 8d24b913df
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
monkey/common/aws/aws_metadata.py
View File

@ -14,10 +14,6 @@ logger = logging.getLogger(__name__)
AWS_TIMEOUT = 2 AWS_TIMEOUT = 2
class UnknownAWSInstanceIDError(Exception):
"""Raised if the AWS Instance ID could not be determined"""
def fetch_aws_instance_metadata() -> Tuple[Optional[str], Optional[str], Optional[str]]: def fetch_aws_instance_metadata() -> Tuple[Optional[str], Optional[str], Optional[str]]:
instance_id = None instance_id = None
region = None region = None
@ -31,7 +27,6 @@ def fetch_aws_instance_metadata() -> Tuple[Optional[str], Optional[str], Optiona
requests.RequestException, requests.RequestException,
IOError, IOError,
json.decoder.JSONDecodeError, json.decoder.JSONDecodeError,
UnknownAWSInstanceIDError,
) as err: ) as err:
logger.debug(f"Failed init of AWSInstance while getting metadata: {err}") logger.debug(f"Failed init of AWSInstance while getting metadata: {err}")
return (None, None, None) return (None, None, None)
@ -45,20 +40,19 @@ def _fetch_aws_instance_id() -> Optional[str]:
url, url,
timeout=AWS_TIMEOUT, timeout=AWS_TIMEOUT,
) )
response.raise_for_status()
if not response:
raise UnknownAWSInstanceIDError(f"Failed fetch the AWS Instance ID from {url}")
return response.text return response.text
def _fetch_aws_region() -> Optional[str]: def _fetch_aws_region() -> Optional[str]:
return _parse_region( response = requests.get(
requests.get( AWS_LATEST_METADATA_URI_PREFIX + "meta-data/placement/availability-zone",
AWS_LATEST_METADATA_URI_PREFIX + "meta-data/placement/availability-zone", timeout=AWS_TIMEOUT,
timeout=AWS_TIMEOUT,
).text
) )
response.raise_for_status()
return _parse_region(response.text)
def _parse_region(region_url_response: str) -> Optional[str]: def _parse_region(region_url_response: str) -> Optional[str]:
@ -83,9 +77,10 @@ def _fetch_account_id() -> str:
../dynamic/instance-identity/document ../dynamic/instance-identity/document
:return: The account id :return: The account id
""" """
instance_identity_document = requests.get( response = requests.get(
AWS_LATEST_METADATA_URI_PREFIX + "dynamic/instance-identity/document", AWS_LATEST_METADATA_URI_PREFIX + "dynamic/instance-identity/document",
timeout=AWS_TIMEOUT, timeout=AWS_TIMEOUT,
).text )
response.raise_for_status()
return json.loads(instance_identity_document)[ACCOUNT_ID_KEY] return json.loads(response.text)[ACCOUNT_ID_KEY]

10
monkey/tests/unit_tests/common/aws/test_aws_metadata.py
View File

@ -199,3 +199,13 @@ def test_region_not_found_request(not_found_request_mock_instance):
def test_account_id_not_found_request(not_found_request_mock_instance): def test_account_id_not_found_request(not_found_request_mock_instance):
assert not_found_request_mock_instance[2] is None assert not_found_request_mock_instance[2] is None
def test_instance_id_4xx_error_code():
with requests_mock.Mocker() as m:
# request made to get instance_id
url = f"{AWS_LATEST_METADATA_URI_PREFIX}meta-data/instance-id"
m.get(url, text="1234", status_code=404)
result = fetch_aws_instance_metadata()
assert result[0] is None