From e8b7d8aedc689e6e1bd05a9355806fdfc333ceae Mon Sep 17 00:00:00 2001 From: Alessandra Romero Date: Fri, 3 Jan 2025 13:48:36 -0500 Subject: [PATCH] Fix failing tests by using .get() for 'account_id' and removing it from expected_keys list --- botocore/credentials.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/botocore/credentials.py b/botocore/credentials.py index c78ab54011..acb7532ff1 100644 --- a/botocore/credentials.py +++ b/botocore/credentials.py @@ -423,7 +423,7 @@ def create_from_metadata( expiry_time=cls._expiry_datetime(metadata['expiry_time']), method=method, refresh_using=refresh_using, - account_id=metadata['account_id'], + account_id=metadata.get('account_id'), **kwargs, ) return instance @@ -601,7 +601,6 @@ def _set_from_data(self, data): 'secret_key', 'token', 'expiry_time', - 'account_id', ] if not data: missing_keys = expected_keys @@ -619,7 +618,7 @@ def _set_from_data(self, data): self.secret_key = data['secret_key'] self.token = data['token'] self._expiry_time = parse(data['expiry_time']) - self.account_id = data['account_id'] + self.account_id = data.get('account_id') logger.debug( "Retrieved credentials will expire at: %s", self._expiry_time )