Skip to content

Fix condition when no handlers have been defined #182

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.

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

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/cloudformation_cli_python_lib/log_delivery.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ def setup(
return
# filter provider messages from platform
provider = request.resourceType.replace("::", "_").lower()
logging.getLogger().handlers[0].addFilter(ProviderFilter(provider))
if logging.getLogger().handlers:
logging.getLogger().handlers[0].addFilter(ProviderFilter(provider))
log_handler = cls(
group=log_group, stream=stream_name, session=provider_sess
)
Expand Down
18 changes: 18 additions & 0 deletions tests/lib/log_delivery_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,24 @@ def test_setup_with_provider_creds_without_stack_id(setup_patches, mock_session)
assert payload.region in plh.stream


def test_setup_with_provider_creds_without_stack_id_no_handlers(
setup_patches, mock_session
):
payload, _hook_payload, p_logger, p__get_logger, _p__get_hook_logger = setup_patches
payload.stackId = None
root_logger = logging.getLogger()
with p_logger as mock_log, p__get_logger as mock_get:
for _ in root_logger.handlers:
root_logger.removeHandler(_)
mock_get.return_value = None
ProviderLogHandler.setup(payload, mock_session)
mock_session.client.assert_called_once_with("logs")
mock_log.return_value.addHandler.assert_called_once()
plh = mock_log.return_value.addHandler.call_args[0][0]
assert payload.awsAccountId in plh.stream
assert payload.region in plh.stream


def test_setup_with_provider_creds_without_logical_resource_id(
setup_patches, mock_session
):
Expand Down