Skip to content

Refactor and fix AWS secret manager invalid exception #24898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
potiuk merged 3 commits into from
Jul 8, 2022
Merged

Refactor and fix AWS secret manager invalid exception #24898

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
725115c
Refactor and fix AWS secret manager invalid exception
gitstart Jul 7, 2022
56b07ca
Merge commit 'acaa0635c8477c98ab78da9f6d86e6f1bad2737d' into AF-10
gitstart Jul 8, 2022
e0a41a7
use printf-style string format in logging
gitstart Jul 8, 2022
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
32 changes: 27 additions & 5 deletions airflow/providers/amazon/aws/secrets/secrets_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ def _get_secret(self, path_prefix, secret_id: str) -> Optional[str]:
:param path_prefix: Prefix for the Path to get Secret
:param secret_id: Secret Key
"""
error_msg = "An error occurred when calling the get_secret_value operation"
if path_prefix:
secrets_path = self.build_path(path_prefix, secret_id, self.sep)
else:
Expand All @@ -257,15 +258,36 @@ def _get_secret(self, path_prefix, secret_id: str) -> Optional[str]:
return response.get('SecretString')
except self.client.exceptions.ResourceNotFoundException:
self.log.debug(
"An error occurred (ResourceNotFoundException) when calling the "
"get_secret_value operation: "
"Secret %s not found.",
"ResourceNotFoundException: %s. Secret %s not found.",
error_msg,
secret_id,
)
return None
except self.client.exceptions.AccessDeniedException:
except self.client.exceptions.InvalidParameterException:
self.log.debug(
"An error occurred (AccessDeniedException) when calling the get_secret_value operation",
"InvalidParameterException: %s",
error_msg,
exc_info=True,
)
return None
except self.client.exceptions.InvalidRequestException:
self.log.debug(
"InvalidRequestException: %s",
error_msg,
exc_info=True,
)
return None
except self.client.exceptions.DecryptionFailure:
self.log.debug(
"DecryptionFailure: %s",
error_msg,
exc_info=True,
)
return None
except self.client.exceptions.InternalServiceError:
self.log.debug(
"InternalServiceError: %s",
error_msg,
exc_info=True,
)
return None