Skip to content

Commit

Permalink
chore(directoryservice): verify only the message
Browse files Browse the repository at this point in the history
  • Loading branch information
danibarranqueroo committed Feb 5, 2025
1 parent 81463b6 commit 68048c6
Showing 1 changed file with 11 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -130,16 +130,13 @@ def _describe_event_topics(self, regional_client):
)
self.directories[directory.id].event_topics = event_topics
except ClientError as error:
if error.response["Error"]["Code"] == "ClientException":
error_message = error.response["Error"]["Message"]
if "is in Deleting state" in error_message:
logger.warning(
f"{directory.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
)
else:
logger.error(
f"{regional_client.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
)
if (

Check warning on line 133 in prowler/providers/aws/services/directoryservice/directoryservice_service.py

View check run for this annotation

Codecov / codecov/patch

prowler/providers/aws/services/directoryservice/directoryservice_service.py#L132-L133

Added lines #L132 - L133 were not covered by tests
"is in Deleting state"
in error.response["Error"]["Message"]
):
logger.warning(

Check warning on line 137 in prowler/providers/aws/services/directoryservice/directoryservice_service.py

View check run for this annotation

Codecov / codecov/patch

prowler/providers/aws/services/directoryservice/directoryservice_service.py#L137

Added line #L137 was not covered by tests
f"{directory.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
)
else:
logger.error(

Check warning on line 141 in prowler/providers/aws/services/directoryservice/directoryservice_service.py

View check run for this annotation

Codecov / codecov/patch

prowler/providers/aws/services/directoryservice/directoryservice_service.py#L141

Added line #L141 was not covered by tests
f"{regional_client.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
Expand Down Expand Up @@ -226,16 +223,10 @@ def _get_snapshot_limits(self, regional_client):
]["ManualSnapshotsLimitReached"],
)
except ClientError as error:
if error.response["Error"]["Code"] == "ClientException":
error_message = error.response["Error"]["Message"]
if "is in Deleting state" in error_message:
logger.warning(
f"{directory.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
)
else:
logger.error(
f"{regional_client.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
)
if "is in Deleting state" in error.response["Error"]["Message"]:
logger.warning(

Check warning on line 227 in prowler/providers/aws/services/directoryservice/directoryservice_service.py

View check run for this annotation

Codecov / codecov/patch

prowler/providers/aws/services/directoryservice/directoryservice_service.py#L225-L227

Added lines #L225 - L227 were not covered by tests
f"{directory.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
)
else:
logger.error(

Check warning on line 231 in prowler/providers/aws/services/directoryservice/directoryservice_service.py

View check run for this annotation

Codecov / codecov/patch

prowler/providers/aws/services/directoryservice/directoryservice_service.py#L231

Added line #L231 was not covered by tests
f"{regional_client.region} -- {error.__class__.__name__}[{error.__traceback__.tb_lineno}]: {error}"
Expand Down

0 comments on commit 68048c6

Please sign in to comment.